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

pages/handle/process.vue

@@ -144,12 +144,13 @@ export default {
             this.cur = i
           };
           // if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){
-            u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable)
+            // u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable)
+            u.defaultUsers.immutable=u.defaultUsers.immutable||(u.defaultUsers.mutable)//审核人员bug
           // }
         })
         if (this.dataImmut.length > this.cur + 1) {
-          console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length )
-          this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable.concat(this.dataImmut[this.cur + 1].defaultUsers.mutable)
+          // console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length )
+          this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable||(this.dataImmut[this.cur + 1].defaultUsers.mutable)//审核人员bug
         }
       } else {
         this.$Message.error('加载失败')

pages/processDesign/setProcess/index.vue

@@ -322,7 +322,7 @@
       <OrderSendReview ref="orderSendReview"></OrderSendReview>
       <div slot="footer">
         <Button @click="canCelFn">取消</Button>
-        <Button type="primary" @click="upSave">确定送审</Button>
+        <Button type="primary" :disabled='sendDisable' @click="upSave">确定送审</Button>
       </div>
     </Modal>
     <Modal
@@ -423,6 +423,7 @@ export default {
       modal1: false,
       processviewModal: false, //工艺预览
       documentShow: false, //工艺送审
+      sendDisable:false,//料单送审确定按钮
       modalliao: false,
       orderDatadia: false,
       ProductingPreparationPeople: 0,
@@ -1851,10 +1852,10 @@ export default {
     },
     upSave() {
       let operatorIdList = this.$refs.orderSendReview.returnDataList()
-      let itemCode = this.formdata.data01.code
-      // this.dataListRetrunNew.codeList.push(itemCode)
+      let itemCode = this.formdata.data01.code// this.dataListRetrunNew.codeList.push(itemCode)
       this.dataListRetrunNew.code = itemCode
       this.dataListRetrunNew.operatorIdList = operatorIdList
+      this.sendDisable = true//防止多次点击确定送审
       this.$http.order
         .batchOrderStart(this.dataListRetrunNew)
         .then((response) => {
@@ -1869,6 +1870,8 @@ export default {
             this.$Message.error(response.error.message)
           }
           this.modalInfo = false
+          this.sendDisable = false
+          this.loaddata('')
         })
         .catch((err) => {
           console.log(err)

pages/qc/check/waitReview/index.vue

@@ -106,16 +106,18 @@ export default {
               easy: true,
               high: true,
               hide:true,
-            },{
-              key: 'reinspectionDate',
-              title: this.l('reinspectionDate'),
-              align: 'center',
-              render: (h, paras) => {
-                  return h('span', paras.row.reinspectionDate)
-              },
-              high: true,
-              width:180,
-            },{
+            },
+            // {
+            //   key: 'reinspectionDate',
+            //   title: this.l('reinspectionDate'),
+            //   align: 'center',
+            //   render: (h, paras) => {
+            //       return h('span', paras.row.reinspectionDate)
+            //   },
+            //   high: true,
+            //   width:180,
+            // },
+            {
               key: 'remainingAmount',
               title: this.l('remainingAmount'),
               align: 'left',