Merge remote-tracking branch 'origin/dev' 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;
@@ -1011,9 +1017,10 @@ export default {
         this.dModelData = records.data;
         this.knifeTempVisible = true;
         return;
-      } else {
-        return this.$u.toast('该刀模版具不属于该工单');
       } 
+      // else {
+      //   return this.$u.toast('该刀模版具不属于该工单');
+      // }
       this.addDModelRecord(params);
     },
     async upDownGetList() {
@@ -1254,6 +1261,8 @@ export default {
           quantityUnqualify: 0,
           printName: false,
           nickName: this.vuex_user.nicfeedbackkName,
+		  workorderId: 0,
+		  workorderCode: null,
           workorderList: []
         };
         this.stopWorkorder(feedback);