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

pages/handle/examine7/detail.vue

 <template>
   <div class="detail" style="width:90%;margin:0 auto">
     <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('customer')">{{entity.customer_name}}</Filed>
       <Filed :span="8" :name="l('outsourcing')">{{entity.outsourcing_name}}</Filed>
@@ -11,7 +11,21 @@
       <Filed :span="8" :name="l('code')">{{entity.code}}</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('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>
   </div>
 </template>
@@ -44,6 +58,7 @@ export default {
 
     Api.get({ Id: this.idVal }).then((r) => {
       if (r.success) {
+         console.log(r)
         let formStr = r.result.formData.replace(/\"/g, '"')
         let formStr01 = JSON.parse(formStr)
         // console.log(formStr01)
@@ -58,7 +73,7 @@ export default {
   methods: {
     load(v) {},
     l(key) {
-      key = 'Unqualified' + '.' + key
+      key = 'order_list' + '.' + key
       return this.$t(key)
     }
   },

pages/materiel/classification/add.vue

 <template>
-  <div>
+  <div class="p10">
     <Form ref="form" :model="entity" :rules="rules" :label-width="90">
       <Row>
         <!-- <Col :span="12">
@@ -29,10 +29,8 @@
           </FormItem>
         </Col>
         <Col :span="24">
-          <h4>属性配置</h4>
-        </Col>
-        <Col :span="24" style="padding:20px 0 0px 10px;margin-bottom:10px;" class="table-solt">
-          <Table border :columns="columns" :data="checkList" class="tableCommon" height="300">
+         <h4>扩展属性</h4>
+            <Table border :columns="columns" :data="checkList" height="300">
               <template slot-scope="{ row, index }" slot="title">
                 <div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
                 <Input
@@ -80,11 +78,9 @@
                 <a @click="remove(index,row)" style="color:#FF7A8B">删除</a>
               </template>
             </Table>
+            <Button type="dashed" long @click="addNew" class="mt10">新增属性</Button>
         </Col>
-        <Col :span="24" style="margin-bottom:20px;">
-          <Button type="primary" long @click="addNew" class="mt10">添加</Button>
-        </Col>
-        <Col :span="24" style="text-align: right;">
+        <Col :span="24" class="tr mt10">
           <FormItem>
             <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
             <Button @click="handleClose" class="ml20">取消</Button>
@@ -103,7 +99,7 @@ export default {
       entity: {
         upId: 0,
         code: 0,
-        status:0,
+        status: 0
       },
       disabled: false,
       columns: [
@@ -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) {
           var arr = r.result;
           this.checkList = arr.filter(function(item) {

pages/materiel/classification/index.vue

@@ -90,6 +90,7 @@ export default {
         id: 0,
         ids: []
       },
+      model8:"",
       cityList: [],
       keys: "",
       expand: false,
@@ -143,7 +144,7 @@ export default {
       this.title = "新增";
       this.detail = () => import("./add");
       this.modal = true;
-      this.$refs.chlidren.arr = [];
+      //this.$refs.chlidren.arr = [];
     },
     add() {
       this.curId = 0;

pages/produce/execute/judgment/index.vue

@@ -626,7 +626,8 @@ export default {
       let orderIds = []
       this.feilist.map(item=>{
         orderse.push(item.prefix+'.'+item.code)
-        orderIds.push(item.id)
+        // orderIds.push(item.id)  
+        orderIds.push(item.code)//工作流获取数据，暂时传code数组
       })
       let strOder = orderse.join(",")
       this.entity.cause =  this.orderForm.question;