Skip to content

M
mes-ui
Commit bffec7da authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents c4381697 2162b618
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 62 deletions
pages/handle/examine7/detail.vue
View file @ bffec7da
<template> <template>
<div class="detail" style="width:90%;margin:0 auto"> <div class="detail" style="width:90%;margin:0 auto">
<Row> <Row>
<Filed :span="8" :name="l('unqualifiedCode')">{{entity.unqualified_order_code}}</Filed> <!-- <Filed :span="8" :name="l('unqualifiedCode')">{{entity.unqualified_order_code}}</Filed>
<Filed :span="8" :name="l('department')">{{entity.department_name}}</Filed> <Filed :span="8" :name="l('department')">{{entity.department_name}}</Filed>
<Filed :span="8" :name="l('customer')">{{entity.customer_name}}</Filed> <Filed :span="8" :name="l('customer')">{{entity.customer_name}}</Filed>
<Filed :span="8" :name="l('outsourcing')">{{entity.outsourcing_name}}</Filed> <Filed :span="8" :name="l('outsourcing')">{{entity.outsourcing_name}}</Filed>
...@@ -11,7 +11,21 @@ ...@@ -11,7 +11,21 @@
<Filed :span="8" :name="l('code')">{{entity.code}}</Filed> <Filed :span="8" :name="l('code')">{{entity.code}}</Filed>
<Filed :span="8" :name="l('problemDesc')">{{entity.problem_desc}}</Filed> <Filed :span="8" :name="l('problemDesc')">{{entity.problem_desc}}</Filed>
<Filed :span="8" :name="l('inspectionPerson')">{{entity.inspection_person_name}}</Filed> <Filed :span="8" :name="l('inspectionPerson')">{{entity.inspection_person_name}}</Filed>
<Filed :span="8" :name="l('inspectionDate')">{{entity.inspection_date}}</Filed> <Filed :span="8" :name="l('inspectionDate')">{{entity.inspection_date}}</Filed> -->
<Filed :span="12" :name="l('productName')">{{entity.productName}}</Filed>
<Filed :span="12" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed>
<Filed :span="12" :name="l('status')">
<state code="plan.order.status" ref="state" :value="entity.status" type="text" ></state>
</Filed>
<Filed :span="12" :name="l('mesCode')">{{entity.mesCode}}</Filed>
<Filed :span="12" name="批次号">{{entity.batchNumber}}</Filed>
<Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed>
<Filed :span="12" name="节点日期">{{entity.demandFinishDate}}</Filed>
<Filed :span="12" name="工序名称">{{entity.seqName}}</Filed>
<Filed :span="12" name="问题原因">{{entity.reason}}</Filed>
<Filed :span="12" name="责任归属">{{entity.personLiableId}}</Filed>
<Filed :span="24" name="不合格产品">{{entity.strOder}}</Filed>
<Filed :span="24" name="审理单号">{{entity.code}}</Filed>
</Row> </Row>
</div> </div>
</template> </template>
...@@ -44,6 +58,7 @@ export default { ...@@ -44,6 +58,7 @@ export default {
Api.get({ Id: this.idVal }).then((r) => { Api.get({ Id: this.idVal }).then((r) => {
if (r.success) { if (r.success) {
console.log(r)
let formStr = r.result.formData.replace(/\"/g, '"') let formStr = r.result.formData.replace(/\"/g, '"')
let formStr01 = JSON.parse(formStr) let formStr01 = JSON.parse(formStr)
// console.log(formStr01) // console.log(formStr01)
...@@ -58,7 +73,7 @@ export default { ...@@ -58,7 +73,7 @@ export default {
methods: { methods: {
load(v) {}, load(v) {},
l(key) { l(key) {
key = 'Unqualified' + '.' + key key = 'order_list' + '.' + key
return this.$t(key) return this.$t(key)
} }
}, },
......
pages/materiel/classification/add.vue
View file @ bffec7da
<template> <template>
<div> <div class="p10">
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<!-- <Col :span="12"> <!-- <Col :span="12">
...@@ -29,62 +29,58 @@ ...@@ -29,62 +29,58 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
<h4>属性配置</h4> <h4>扩展属性</h4>
</Col> <Table border :columns="columns" :data="checkList" height="300">
<Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt"> <template slot-scope="{ row, index }" slot="title">
<Table border :columns="columns" :data="checkList" class="tableCommon" height="300"> <div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
<template slot-scope="{ row, index }" slot="title"> <Input
<div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div> v-if="row.fieldType==3"
<Input v-model="row.title"
v-if="row.fieldType==3" placeholder="请输入"
v-model="row.title" @on-blur="setRow(row,index)"
placeholder="请输入" />
@on-blur="setRow(row,index)" </template>
/> <template slot-scope="{ row, index }" slot="note">
</template> <div v-if="row.fieldType==1">{{row.note}}</div>
<template slot-scope="{ row, index }" slot="note"> <Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
<div v-if="row.fieldType==1">{{row.note}}</div> </template>
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else /> <template slot-scope="{ row, index }" slot="dataType">
</template> <state
<template slot-scope="{ row, index }" slot="dataType"> v-if="row.fieldType==1"
<state code="materail.category.dataType"
v-if="row.fieldType==1" :value="row.dataType"
code="materail.category.dataType" type="text"
:value="row.dataType" ></state>
type="text" <Dictionary
></state> v-else
<Dictionary @on-change="setRow(row,index)"
v-else v-model="row.dataType"
@on-change="setRow(row,index)" code="materail.category.dataType"
v-model="row.dataType" type="select"
code="materail.category.dataType" :value="row.dataType"
type="select" :key="row.dataType"
:value="row.dataType" ></Dictionary>
:key="row.dataType" </template>
></Dictionary> <!-- <template slot-scope="{ row, index }" slot="result">
</template>
<!-- <template slot-scope="{ row, index }" slot="result">
<Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" /> <Input v-model="row.result" placeholder="请输入" @on-blur="setRow(row,index)" />
</template>--> </template>-->
<template slot-scope="{ row, index }" slot="required"> <template slot-scope="{ row, index }" slot="required">
<Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.required" @on-change="setRow(row,index)"></Checkbox>
</template> </template>
<template slot-scope="{ row, index }" slot="isUnique"> <template slot-scope="{ row, index }" slot="isUnique">
<Checkbox v-model="row.isUnique" @on-change="setRow(row,index)"></Checkbox> <Checkbox v-model="row.isUnique" @on-change="setRow(row,index)"></Checkbox>
</template> </template>
<template <template
slot-scope="{ row, index }" slot-scope="{ row, index }"
slot="action" slot="action"
v-if="row.fieldType==2||row.fieldType==3" v-if="row.fieldType==2||row.fieldType==3"
> >
<a @click="remove(index,row)" style="color:#FF7A8B">删除</a> <a @click="remove(index,row)" style="color:#FF7A8B">删除</a>
</template> </template>
</Table> </Table>
</Col> <Button type="dashed" long @click="addNew" class="mt10">新增属性</Button>
<Col :span="24" style="margin-bottom:20px;">
<Button type="primary" long @click="addNew" class="mt10">添加</Button>
</Col> </Col>
<Col :span="24" style="text-align: right;"> <Col :span="24" class="tr mt10">
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
...@@ -103,7 +99,7 @@ export default { ...@@ -103,7 +99,7 @@ export default {
entity: { entity: {
upId: 0, upId: 0,
code: 0, code: 0,
status:0, status: 0
}, },
disabled: false, disabled: false,
columns: [ columns: [
...@@ -183,7 +179,7 @@ export default { ...@@ -183,7 +179,7 @@ export default {
} }
]; ];
Api.listTable({ conditions: conditions }).then(r => { Api.listTable({ conditions: conditions ,sortBy:'id',isDesc:false}).then(r => {
if (r.result) { if (r.result) {
var arr = r.result; var arr = r.result;
this.checkList = arr.filter(function(item) { this.checkList = arr.filter(function(item) {
......
pages/materiel/classification/index.vue
View file @ bffec7da
...@@ -90,6 +90,7 @@ export default { ...@@ -90,6 +90,7 @@ export default {
id: 0, id: 0,
ids: [] ids: []
}, },
model8:"",
cityList: [], cityList: [],
keys: "", keys: "",
expand: false, expand: false,
...@@ -143,7 +144,7 @@ export default { ...@@ -143,7 +144,7 @@ export default {
this.title = "新增"; this.title = "新增";
this.detail = () => import("./add"); this.detail = () => import("./add");
this.modal = true; this.modal = true;
this.$refs.chlidren.arr = []; //this.$refs.chlidren.arr = [];
}, },
add() { add() {
this.curId = 0; this.curId = 0;
......
pages/produce/execute/judgment/index.vue
View file @ bffec7da
...@@ -626,7 +626,8 @@ export default { ...@@ -626,7 +626,8 @@ export default {
let orderIds = [] let orderIds = []
this.feilist.map(item=>{ this.feilist.map(item=>{
orderse.push(item.prefix+'.'+item.code) orderse.push(item.prefix+'.'+item.code)
orderIds.push(item.id) // orderIds.push(item.id)
orderIds.push(item.code)//工作流获取数据，暂时传code数组
}) })
let strOder = orderse.join(",") let strOder = orderse.join(",")
this.entity.cause = this.orderForm.question; this.entity.cause = this.orderForm.question;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment