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

App.vue

@@ -6,21 +6,19 @@ export default {
     plus.screen.lockOrientation('landscape-primary');
     // #endif
   },
-  onShow: function () {
-  },
-  onHide: function () {
-  }
-}
+  onShow: function () {},
+  onHide: function () {}
+};
 </script>
 
 <style lang="scss">
 /*每个页面公共css */
-@import "@/uview-ui/index.scss";
+@import '@/uview-ui/index.scss';
 /deep/ .uni-select__selector-scroll {
-  max-height: 100px !important;
+  max-height: 70px !important;
 }
 
 /deep/ .times .uni-date-picker__container {
-    height: 275px !important;
+  height: 275px !important;
 }
 </style>

pages/mes/prodReport/index.vue

@@ -152,7 +152,8 @@
             </u-col>
             <u-col span="6">
               <u-form-item label="生产工单" prop="workorderId">
-                <uni-data-select v-model="feedback.workorderId" :localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select>
+                <uni-data-select v-model="feedback.workorderId"
+                                 :localdata="feedback.workorderOption" @change="workorderSelect($event, i)"></uni-data-select>
               </u-form-item>
             </u-col>
           </u-row>
@@ -202,7 +203,7 @@
           <u-row>
             <u-col span="6">
               <u-form-item label="净重(KG)" prop="netWeight">
-                <u-number-box :min="0" :positive-integer="false" v-model="feedback.netWeight"></u-number-box>
+                <u-number-box :min="0" :positive-integer="false" :input-width="190" v-model="feedback.netWeight"></u-number-box>
               </u-form-item>
             </u-col>
           </u-row>
@@ -1319,6 +1320,29 @@ userTempVisible: false,
         })
         .then((res) => {
           item.workorderList = res.rows;
+          //如果只关联一个订单，默认选中
+          if(res.rows.length==1){
+            item.workorderId = res.rows[0].workorderId;
+            item.workorderCode = res.rows[0].workorderCode;
+            if(res.rows[0].sizeList2!=null){
+              item.sizeList = res.rows[0].sizeList2.map(temp2=>{
+                return {
+                  value: temp2.workorderSoSizeItemId,
+                  text: temp2.standardSize
+                }
+              });
+            }
+            if(res.rows[0].saleDirectiveList!=null){
+              item.directiveList = res.rows[0].saleDirectiveList.map(temp2=>{
+                return {
+                  value: temp2.workorderSoDirectiveId,
+                  text: temp2.clientCmd
+                }
+              });
+            }
+            item.packByDirective = res.rows[0].packByDirective;
+            item.packBySize = res.rows[0].packBySize;
+          }
           item.workorderOption = res.rows.map((temp) => {
             if(temp.saleDirectiveList!=null){
               item.directiveData[temp.workorderId] = temp.saleDirectiveList.map(temp2=>{