Merge branch 'fengcang' into busUser

src/views/business/stockOrderDelSearch.vue

@@ -584,7 +584,7 @@ export default {
             }
         },
         detailHandleCurrentChange(val) {
-            this.query.page = val;
+            this.detailQuery.page = val;
             this.getStockOrderDetailList();
         },
         // 刷新表单
@@ -697,9 +697,7 @@ export default {
                 .then((response) => {
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
-                    /*this.detailList.forEach(data => {
+                    this.detailTotal = response.data.total;
-                       data['edit'] = false;
-                    });*/
                 })
                 .catch(() => {
                     this.detailLoading = false;

src/views/inout/IOAddOrder.vue

@@ -343,6 +343,12 @@
                     show-overflow-tooltip
                 ></el-table-column>
 
+                <el-table-column
+                    label="实际数量"
+                    prop="reCount"
+                    show-overflow-tooltip
+                ></el-table-column>
+
                 <el-table-column label="操作" fixed="right" width="250">
                     <template slot-scope="scope">
                         <el-button

src/views/inout/IOCheckErrorOrder.vue

@@ -409,11 +409,13 @@
             :visible.sync="addDialogVisible"
             width="80%"
             v-if="addDialogVisible"
+
         >
             <selectErpOrder
                 v-on:closeManuDialog="closeManuDialog"
                 :orderId="orderId"
                 :orderAction="billAction"
+                :curLocInv="curLocInv"
             ></selectErpOrder>
         </el-dialog>
 
@@ -577,6 +579,7 @@ export default {
             index: null,
             formName: null,
             orderId: "",
+            curLocInv: null,
             formMap: {
                 add: "新增",
                 edit: "编辑",
@@ -1087,6 +1090,7 @@ export default {
         importOrder(row) {
             this.orderId = row.id;
             this.billAction = row.action;
+            this.curLocInv = row.locStorageCode;
             this.addDialogVisible = true;
         },
         invChange() {

src/views/inout/editCode.vue

@@ -83,6 +83,17 @@
                                   :disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input>
                     </el-form-item>
                 </el-col>
+
+                <el-col :span="3">
+                    <div class="ao-text">
+                        <span>是否以使用单元数量入库：</span>
+                    </div>
+                </el-col>
+                <el-col :span="7">
+                    <el-form-item>
+                        <el-checkbox v-model="isUseDyCheck" disabled></el-checkbox>
+                    </el-form-item>
+                </el-col>
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="17">
@@ -129,6 +140,7 @@ export default {
     data() {
         return {
             xlhEnable: false,
+            isUseDyCheck: false
         };
     },
 
@@ -162,6 +174,9 @@ export default {
                         if (response.data.scbssfbhxlh == "否") {
                             this.xlhEnable = true;
                         }
+                        if (response.data.zxxsbzbhsydysl > 1) {
+                            this.isUseDyCheck = true;
+                        }
                     } else {
                     }
                     this.loading = false;

src/views/inventory/InvProducts.vue

@@ -242,6 +242,7 @@ export default {
     },
     onSubmit() {
       this.loading = true;
+      this.filterQuery.page = 1;
       this.getList();
     },
     handleSizeChange(val) {
@@ -265,7 +266,6 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.filterQuery.page = 1;
       this.filterQuery.customerId = store.getters.customerId;
       filterProducts(this.filterQuery)
           .then((response) => {

src/views/inventory/InvProductsDetail.vue

@@ -82,7 +82,7 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="searchCode"
                     >查询
                     </el-button
                     >
@@ -144,6 +144,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next,total"
             :total="total"
+            :current-page="query.page"
         >
         </el-pagination>
     </div>
@@ -219,7 +220,10 @@ export default {
             this.query.page = val;
             this.getCodeList();
         },
-
+        searchCode() {
+            this.query.page = 1;
+            this.getCodeList();
+        },
         getCodeList() {
             this.loading = true;
             this.query.productIdFk = this.idQuery.relIdFk;