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

pages/mes/prodReport/index.vue

@@ -588,6 +588,7 @@
         <zb-table :columns="tableDetailColumn" :stripe="true" :border="true" :data="tableDataDetail"></zb-table>
       </view>
     </u-modal>
+	//查询图片生产工单
     <u-modal
       title="生产工单"
       @confirm="materialReturnSave()"
@@ -1281,11 +1282,13 @@ export default {
       this.stopReason += e;
     },
     workorderSelect(id, index) {
+      console.log(id, '9999')
       const row = this.feedbackForms[index];
       if(!id){
         row.sizeList = [];
         row.directiveList = [];
         row.workorderSoSizeItemId = '';
+		row.printContents = row.arrangeCode
         row.workorderSoDirectiveId = '';
         return;
       }
@@ -1293,7 +1296,8 @@ export default {
       const items = row.workorderList.find((item) => item.workorderId === id);
       row.workorderCode = items.workorderCode;
       row.printName = items.workorderCode;
-	    row.printContents =row.arrangeCode+row.workorderCode
+	    //row.printContents =row.arrangeCode+row.workorderCode
+		row.printContents =row.workorderCode
       row.sizeList = row.sizeData[id];
       row.directiveList = row.directiveData[id];
       row.packByDirective = items.packByDirective;
@@ -1343,6 +1347,9 @@ export default {
         })
         .then((res) => {
           item.workorderList = res.rows;
+		  if(res.rows.length === 1) {
+			  item.printContents = res.rows[0].workorderCode
+		  }
           //如果只关联一个订单，默认选中
           if(res.rows.length==1){
             item.workorderId = res.rows[0].workorderId;