Bläddra i källkod

Merge branch 'develop_fencang' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_fencang

chenrui 2 år sedan
förälder
incheckning
245973d29a

+ 4 - 0
src/views/inventoryManagement/inventoryCheck/addModal.vue

@@ -83,6 +83,10 @@ export default {
       if (!newValue) {
         this.form.warehouseSn = undefined
         this.$emit('close')
+      }else{
+        // 默认仓库
+        const defWareHouse = this.$store.state.app.defWarehouse
+        this.form.warehouseSn = this.isShowWarehouse ? undefined : (defWareHouse?defWareHouse.warehouseSn:undefined)
       }
     }
   }

+ 5 - 7
src/views/inventoryManagement/inventoryCheck/detail.vue

@@ -52,10 +52,8 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
-                    <a-form-model-item style="margin-bottom: 10px;">
-                      <a-button type="primary" @click="getList(1)" :disabled="disabled" id="inventoryCheckDetail-refresh">查询</a-button>
-                      <a-button style="margin-left: 5px" @click="resetSearchForm" id="inventoryCheckDetail-reset">重置</a-button>
-                    </a-form-model-item>
+                    <a-button type="primary" @click="getList(1)" :disabled="disabled" id="inventoryCheckDetail-refresh">查询</a-button>
+                    <a-button style="margin-left: 5px" @click="resetSearchForm" id="inventoryCheckDetail-reset">重置</a-button>
                   </a-col>
                 </a-row>
               </a-form-model>
@@ -189,7 +187,8 @@ export default {
         pageNo: this.paginationProps.current,
         pageSize: this.paginationProps.pageSize,
         checkWarehouseSn: this.$route.params.sn,
-        productCode: this.queryParam.productCode
+        productCode: this.queryParam.productCode,
+        // checkWarehouseSn: this.detail.warehouseSn
       }
       this.loading = true
       checkWarehouseDetailList(params).then(res => {
@@ -242,6 +241,7 @@ export default {
       checkWarehouseDetail({ sn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detail = res.data
+          this.resetSearchForm()
         } else {
           this.detail = null
         }
@@ -274,14 +274,12 @@ export default {
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.resetSearchForm()
       this.getDetail()
     }
   },
   activated () {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
-      this.resetSearchForm()
       this.getDetail()
     }
   },

+ 2 - 3
src/views/inventoryManagement/makeInventory/check.vue

@@ -28,6 +28,7 @@
               <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
@@ -67,10 +68,8 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
-                    <a-form-model-item style="margin-bottom: 10px;">
-                      <a-button type="primary" @click="getList(1)" :disabled="disabled" id="makeInventoryCheck-refresh">查询</a-button>
+                    <a-button type="primary" @click="getList(1)" :disabled="disabled" id="makeInventoryCheck-refresh">查询</a-button>
                       <a-button style="margin-left: 5px" @click="resetSearchForm" id="makeInventoryCheck-reset">重置</a-button>
-                    </a-form-model-item>
                   </a-col>
                 </a-row>
               </a-form-model>

+ 2 - 3
src/views/inventoryManagement/supervisionDisk/check.vue

@@ -28,6 +28,7 @@
               <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="监盘状态">{{ (detail&&detail.checkSuperviseStateDictValue) || '--' }}</a-descriptions-item>
@@ -68,10 +69,8 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
-                    <a-form-model-item style="margin-bottom: 10px;">
-                      <a-button type="primary" @click="getList(1)" :disabled="disabled" id="supervisionDiskCheck-refresh">查询</a-button>
+                    <a-button type="primary" @click="getList(1)" :disabled="disabled" id="supervisionDiskCheck-refresh">查询</a-button>
                       <a-button style="margin-left: 5px" @click="resetSearchForm" id="supervisionDiskCheck-reset">重置</a-button>
-                    </a-form-model-item>
                   </a-col>
                 </a-row>
               </a-form-model>