Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

pages/mes/prodReport/index.vue

@@ -543,12 +543,12 @@
       cancel-text="返回"
       :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
       v-model="material"
-      width="1300rpx"
+      width="680px"
     >
       <view class="list-bar">
         <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
-          <view>
-            <image v-for="(line, index) in viewSop" class="u-avatar-demo" :src="line" mode="aspectFill"></image>
+          <view style="display: flex;justify-content: space-between;flex-wrap: wrap;">
+            <image v-for="(line, index) in viewSop" @click="onPreviewTap(line)" style="padding:10px;" class="u-avatar-demo" :src="line" mode="aspectFill"></image>
           </view>
         </scroll-view>
       </view>
@@ -916,6 +916,12 @@ export default {
     uni.$off('taskStatusChanged');
   },
   methods: {
+    onPreviewTap(url){
+      uni.previewImage({
+          current: url,
+          urls: this.viewSop
+      })
+    },
     cellClick(row, index, column) {
       if (column.name === 'arrangeCode') {
         this.tableDataDetail = row.proWorkorderList;
@@ -938,9 +944,18 @@ export default {
           this.getTaskList();
           break;
         case 'StartTask':
+          let status = false
           this.tableSelectData.forEach((item) => {
-            this.changeStatus(item.taskId, 'BEGINNING');
+            if(item.status === 'BEGINNING') {
+               status = true
+            } else {
+              this.changeStatus(item.taskId, 'BEGINNING');
+            }
           });
+          if (status) {
+            this.$u.toast('该任务已开工，请勿重复开工')
+            return
+          }
           this.getTaskList();
           break;
         case 'StopTask':
@@ -999,12 +1014,13 @@ export default {
       const records = await this.$u.api.dModel.getRecordsByProcessIdAndArrangeCode(params);
       // 如果有数据
       if (records?.data && records.data.length) {
-        return this.$u.toast('该刀模版具不属于该工单');
-      } else {
         this.dModelData = records.data;
         this.knifeTempVisible = true;
         return;
-      }
+      } 
+      // else {
+      //   return this.$u.toast('该刀模版具不属于该工单');
+      // }
       this.addDModelRecord(params);
     },
     async upDownGetList() {
@@ -1061,6 +1077,7 @@ export default {
       this.tableSelectData = arr;
     },
     toggleRowSelection(checked, arr) {
+      console.log(this.tableSelectData, 'this.tableSelectData')
       this.tableSelectData = arr;
     },
     knifeTemp() {
@@ -1463,7 +1480,7 @@ export default {
       this.curTaskInfo.workorderOption = this.curTaskInfo.proWorkorderList.map((s) => {
         return { value: s.workorderCode, text: s.workorderCode };
       });
-      this.$u.api.listMaterialReturn({ taskId: taskInfo.taskId }).then((res) => {
+      this.$u.api.listMaterialReturn({ taskId: taskInfo.taskId, workorderCode: ''}).then((res) => {
         if (res.code === 200) {
           t.materialReturnList = res.data;
         }
@@ -1480,12 +1497,19 @@ export default {
     },
     materialReturnWorkorderChange(s) {
       this.materialReturnFormData.workorderCode = s;
+      const t = this;
+      const taskInfo = this.tableSelectData[0];
+      this.$u.api.listMaterialReturn({ taskId: taskInfo.taskId, workorderCode: s}).then((res) => {
+        if (res.code === 200) {
+          t.materialReturnList = res.data;
+        }
+      });
     },
     materialReturnFormShow(line) {
       this.materialReturnFormVisible = true;
       this.materialReturnFormData = {
         itemName: line.itemName,
-        orkorderCode: this.materialReturnFormData.workorderCode,
+        workorderCode: this.materialReturnFormData.workorderCode,
         isQualified: 1
       };
       this.materialReturnSelected = line;