Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -385,6 +385,8 @@ export default {
       shipmentObj: this.$attrs.shipmentObj,
       // 抄送人数组
       selectedUsers: [],
+      // 智慧预装
+      smartInstall: 1,
     };
   },
   computed: {
@@ -415,6 +417,7 @@ export default {
     // 查询待预装
     this.handleQuery("toBePre");
     this.handleQuery("pre");
+    this.smartInstall = 0;
   },
   methods: {
     formatDate,
@@ -436,10 +439,10 @@ export default {
       // 已预装单号
       params.orderNo = params.preOrderNo;
       params.shipmentId = this.shipmentObj.id;
+      params.smartInstall = this.smartInstall;
       secGoodsList(params).then((res) => {
         this.preList = res.data;
         this.preLoading = false;
-        this.getPreLoad();
       });
     },
     /* 查询待预装 */
@@ -638,6 +641,7 @@ export default {
     queryAllData() {
       this.pageParam.pageNo = 1;
       this.getSecGoods();
+      this.getPreLoad();
     },
     /* 获取参数 */
     getParams() {