Browse Source

修改bug

chenrui 8 months ago
parent
commit
ed1efd3dcf

+ 17 - 10
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -39,14 +39,14 @@
                   <a-input id="iQWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单据号"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="仓库">
+                  <a-select id="iQWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
+                    <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
               <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="仓库">
-                    <a-select id="iQWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
-                      <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据审核时间">
                     <rangeDate id="iQWarehouseDetail-time" ref="rangeDate" @change="dateChange" />
@@ -68,8 +68,13 @@
                       allowClear></v-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="批次号">
+                    <a-input id="iQWarehouseDetail-stockBatchNo" v-model.trim="queryParam.stockBatchNo" allowClear placeholder="请输入批次号"/>
+                  </a-form-item>
+                </a-col>
               </template>
-              <a-col :md="6" :sm="24">
+              <a-col :md="24" :sm="24" style="text-align:center;margin-bottom:10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="iQWarehouseDetail-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="iQWarehouseDetail-reset">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px" id="iQWarehouseDetail-advanced">
@@ -153,7 +158,8 @@ export default {
         flowType: undefined, // 入库or出库
         unitNameCurrent: '', // 单位名称
         warehouseSn: undefined, // 仓库sn
-        state: undefined// 单据状态
+        state: undefined, // 单据状态
+        stockBatchNo: ''// 批次号
       },
       disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
@@ -240,6 +246,7 @@ export default {
       this.queryParam.unitNameCurrent = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.state = undefined
+      this.queryParam.stockBatchNo = ''
       this.$refs.table.refresh(true)
     },
     //  返回列表
@@ -268,7 +275,7 @@ export default {
     // 表格计算高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 298
+      this.tableHeight = window.innerHeight - tableSearchH - 288
     }
   },
   watch: {

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -521,7 +521,7 @@ export default {
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {
-            this.$message.warning('成本价不能为空!')
+            this.$message.warning('成本价不能为空!(注:请联系【供应商】完善定价)')
             return
           }
         } else {
@@ -534,7 +534,7 @@ export default {
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {
-            this.$message.warning('成本价、终端会员价、车主零售价不能为空!')
+            this.$message.warning('成本价、终端会员价、车主零售价不能为空!(注:请联系【供应商】完善定价)')
             return
           }
         }