Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -121,6 +121,7 @@
         <div class="plck">
           <h3>包件信息</h3>
           <div>
+            <el-button icon="el-icon-refresh" @click="packsearchChange" circle></el-button>
             <el-button type="primary" @click="allhandleQRCode">批量查看二维码</el-button>
             <el-button type="primary" @click="handleMaterialList()">补充物料信息</el-button>
           </div>
@@ -275,7 +276,7 @@
           </el-form-item>
           <el-form-item label="物料单位" prop="orderCode">
             <!--            <el-input v-model="formMaterial.unit" placeholder="请输入物料单位"/>-->
-            <el-select v-model="formMaterial.materialUnit" clearable placeholder="请选择单位">
+            <el-select v-model="formMaterial.materialUnit" clearable placeholder="请选择单位" disabled>
               <el-option
                 v-for="item in logpmUnit"
                 :key="item.dictKey"
@@ -286,7 +287,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="SKU" prop="mallName">
-            <el-input v-model="formMaterial.sku" placeholder="请输入SKU" />
+            <el-input v-model="formMaterial.sku" placeholder="请输入SKU" disabled/>
           </el-form-item>
           <el-form-item label="规格">
             <el-input
@@ -636,7 +637,7 @@ export default {
       } else {
         this.queryPage[row.prop] = index;
       }
-      this.onLoadOwn(this.page);
+      this.package()
     },
     timesc(index, row) {
       console.log(index, row);
@@ -647,12 +648,12 @@ export default {
       if (!index) {
         delete this.queryPage[row.prop];
       }
-      this.onLoadOwn(this.page);
+      this.package()
     },
     inputsc(index, row) {
       this.queryPage[row.prop] = index;
       if (!index) delete this.queryPage[row.prop];
-      this.onLoadOwn(this.page);
+      this.package()
     },
     printTemplate() {
       const orderNodeList = document.querySelectorAll('.print_QRCode>div>div');
@@ -691,7 +692,7 @@ export default {
       console.log('>>>', asm);
       updateParcelList(asm).then(() => {
         this.materialBox = false;
-        this.onLoadOwn(this.page);
+        this.package();
         this.$message({
           type: 'success',
           message: '操作成功!',
@@ -972,6 +973,9 @@ export default {
       handleClearTableQuery(zerocolumnList);
       this.onLoadOwn();
     },
+    packsearchChange(){
+      this.package()
+    },
     searchReset() {
       this.query = {};
       this.page.currentPage = 1;
@@ -1232,11 +1236,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-      this.onLoadOwn(this.page);
+      this.package()
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-      this.onLoadOwn(this.page);
+      this.package()
     },
     onLoad(page, params = {}) {
       try {
@@ -1297,6 +1301,7 @@ export default {
           current: this.page.currentPage,
           size: this.page.pageSize,
           stockArticleId: this.$route.query.id,
+          ... this.queryPage,
         };
         let _res = await getPackageList(_data);
         console.log(_res, '包件信息');

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -747,7 +747,7 @@ export default {
         this.forkliftData = fo;
       });
       // await this.getStorageArea();
-      await this.getTeam();
+      // await this.getTeam();
     },
     //查询班组
     async getTeam() {