lilei 2 年之前
父节点
当前提交
990795da68

+ 29 - 24
src/views/dataExport/exportCheck/list.vue

@@ -2,19 +2,18 @@
   <a-card size="small" :bordered="false" class="exportCheckList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
+      <div ref="tableSearch">
         <a-form-model
           id="exportCheckList-form"
           ref="ruleForm"
           class="form-model-con"
-          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
-            <a-col :md="10" :sm="24">
+            <a-col :md="12" :sm="24">
               <a-form-model-item label="选择盘点单" prop="checkWarehouseSn">
                 <a-select id="exportCheckList-print" v-model="queryParam.checkWarehouseSn" placeholder="请选择盘点单" allowClear>
                   <a-select-option v-for="item in checkList" :value="item.checkWarehouseSn" :key="item.checkWarehouseSn">
@@ -23,16 +22,28 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-button
+          </a-row>
+          <a-row :gutter="15">
+            <a-col :md="12" :sm="24">
+              <a-form-model-item label="选择仓库" prop="warehouseSn">
+              <warehouse
+                v-model="queryParam.warehouseSn"
+                id="exportCheckList-warehouseSn"
+                placeholder="请选择仓库"
+              />
+            </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }">
+            <a-button
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
                 id="exportCheckList-export">导出</a-button>
-            </a-col>
-          </a-row>
+            <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">重置</a-button>
+          </a-form-model-item>
         </a-form-model>
       </div>
     </a-spin>
@@ -43,11 +54,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { checkWarehouseExcelList, checkWarehouseExport } from '@/api/checkWarehouse'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 export default {
   name: 'ExportCheckList',
   mixins: [commonMixin],
-  components: { STable, VSelect },
+  components: { STable, VSelect, warehouse },
   data () {
     return {
       spinning: false,
@@ -55,10 +67,12 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       queryParam: { //  查询条件
-        checkWarehouseSn: undefined
+        checkWarehouseSn: undefined,
+        warehouseSn: undefined
       },
       rules: {
-        'checkWarehouseSn': [{ required: true, message: '请选择盘点单', trigger: 'change' }]
+        checkWarehouseSn: [{ required: true, message: '请选择盘点单', trigger: 'change' }],
+        warehouseSn: [{ required: true, message: '请选择仓库', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -93,23 +107,14 @@ export default {
         }
       })
     },
-    pageInit () {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
+    cancel(){
       this.queryParam.checkWarehouseSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.$refs.ruleForm.resetFields()
-      this.getList()
     },
-    setTableH () {
-      const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 238
-    }
-  },
-  watch: {
-    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.setTableH()
+    pageInit () {
+      this.cancel()
+      this.getList()
     }
   },
   mounted () {

+ 15 - 2
src/views/productManagement/shelfNoManage/list.vue

@@ -31,6 +31,15 @@
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="shelfNoMan-productType"></productTypeAll>
                 </a-form-item>
               </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="仓库">
+                  <warehouse
+                    v-model="queryParam.product.warehouseSn"
+                    id="shelfNoMan-warehouseSn"
+                    placeholder="请选择仓库"
+                  />
+                </a-form-item>
+              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="产品状态">
                   <v-select code="PRODUCT_STATUS" id="shelfNoMan-state" v-model="queryParam.product.state" allowClear placeholder="请选择产品状态"></v-select>
@@ -138,11 +147,12 @@ import productTypeAll from '@/views/common/productTypeAll.js'
 import { exportExcel } from '@/libs/JGPrint.js'
 import ImportGuideModal from './importGuideModal.vue'
 import changeRecordModal from './changeRecordModal.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { queryStackPlaceQueryPage, stackPlaceExport, stackPlaceInsertImport } from '@/api/product'
 export default {
   name: 'ProductInfoList',
   mixins: [commonMixin],
-  components: { STable, VSelect, editHwModal, ProductBrand, productTypeAll, ImportGuideModal, changeRecordModal },
+  components: { STable, VSelect, editHwModal, ProductBrand, productTypeAll, ImportGuideModal, changeRecordModal, warehouse },
   data () {
     return {
       spinning: false,
@@ -160,6 +170,7 @@ export default {
           productTypeSn1: '', //  产品一级分类
           productTypeSn2: '', //  产品二级分类
           productTypeSn3: '', //  产品三级分类
+          warehouseSn: undefined, // 仓库
           state: undefined //  产品状态
         }
       },
@@ -169,10 +180,11 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'productVO.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productVO.name', align: 'center', width: '30%', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productVO.name', align: 'center', width: '20%', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productVO.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productVO.productBrandName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
+        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品状态', dataIndex: 'productVO.stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '货位编号', dataIndex: 'stackPlaceCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
@@ -226,6 +238,7 @@ export default {
           productTypeSn1: '', //  产品一级分类
           productTypeSn2: '', //  产品二级分类
           productTypeSn3: '', //  产品三级分类
+          warehouseSn: undefined, // 仓库
           state: undefined //  产品状态
         }
       }

+ 3 - 3
src/views/salesManagement/backorder/list.vue

@@ -16,8 +16,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="出库仓库">
-                <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+              <a-form-model-item label="仓库">
+                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -108,7 +108,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouse', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '缺货款数', dataIndex: 'totalCategory', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '缺货数量', dataIndex: 'totalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 4 - 4
src/views/salesManagement/examineVerify/list.vue

@@ -64,8 +64,8 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -248,7 +248,7 @@ export default {
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '出库单号', dataIndex: 'stockOutNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouse', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'totalAmount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '备货时间', dataIndex: 'stockUpDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -263,7 +263,7 @@ export default {
     }
   },
   methods: {
-    // 选择出库仓库
+    // 选择仓库
     handleWarehouse (val) {
 
     },

+ 4 - 4
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -81,8 +81,8 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item label="出库仓库">
-                    <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                  <a-form-model-item label="仓库">
+                    <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                   </a-form-model-item>
                 </a-col>
               </template>
@@ -224,7 +224,7 @@ export default {
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouse', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -258,7 +258,7 @@ export default {
     shcustChange (val) {
       this.queryParam.receiverSn = val.key
     },
-    // 选择出库仓库
+    // 选择仓库
     handleWarehouse (val) {
 
     },

+ 4 - 4
src/views/salesManagement/outboundOrder/list.vue

@@ -70,8 +70,8 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -252,7 +252,7 @@ export default {
         { title: '业务单号', dataIndex: 'outBizNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'demanderName', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'productTotalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '出库时间', dataIndex: 'outTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -281,7 +281,7 @@ export default {
       }
       return state
     },
-    // 选择出库仓库
+    // 选择仓库
     handleWarehouse (val) {
 
     },

+ 2 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -86,8 +86,8 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>

+ 4 - 4
src/views/salesManagement/receiptPrint/list.vue

@@ -53,8 +53,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="currentTab==2?4:24" :sm="24">
@@ -212,7 +212,7 @@ export default {
         { title: '收款单号', dataIndex: 'bookNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款日期', dataIndex: 'receiptDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'payerName', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouse', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '财务编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订单金额', dataIndex: 'orderAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '收款金额', dataIndex: 'receiptAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
@@ -230,7 +230,7 @@ export default {
     }
   },
   methods: {
-    // 选择出库仓库
+    // 选择仓库
     handleWarehouse (val) {
 
     },

+ 4 - 4
src/views/salesManagement/sendOutOrder/list.vue

@@ -64,8 +64,8 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -228,7 +228,7 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '地区', dataIndex: 'provinceName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'customeName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouse', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'customerCacateName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流电话', dataIndex: 'transportTele', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -246,7 +246,7 @@ export default {
     }
   },
   methods: {
-    // 选择出库仓库
+    // 选择仓库
     handleWarehouse (val) {
 
     },

+ 3 - 3
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -67,8 +67,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -215,7 +215,7 @@ export default {
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 130, align: 'center' },
         { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 80, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouse', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'dealerEntity.dealerTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },

+ 6 - 8
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -27,8 +27,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -108,7 +108,8 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         productName: '',
         productCode: '',
-        origCode: ''
+        origCode: '',
+        warehouseSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -155,7 +156,7 @@ export default {
         { title: '缺货数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '客户名称', dataIndex: 'buyerName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('M_shortageStatisticsPList_salesPrice')) { //  售价权限
         arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
@@ -235,11 +236,8 @@ export default {
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
       this.queryParam.origCode = ''
+      this.queryParam.warehouseSn = undefined
       this.$refs.table.refresh(true)
-    },
-    // 选择出库仓库
-    handleWarehouse (val) {
-
     },
     pageInit () {
       const _this = this

+ 5 - 3
src/views/salesManagement/stockPrint/list.vue

@@ -84,8 +84,8 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item label="出库仓库">
-                    <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                  <a-form-model-item label="仓库">
+                    <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                   </a-form-model-item>
                 </a-col>
               </template>
@@ -233,6 +233,7 @@ export default {
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
+        warehouseSn: undefined,
         subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
@@ -276,7 +277,7 @@ export default {
         { title: '发货编号', dataIndex: 'sendNo', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '80px', align: 'center', ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '100px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -415,6 +416,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.voidFlag = this.currentTab == 1 ? '' : '0'
+      this.queryParam.warehouseSn = undefined
       this.queryParam.printStatus = this.currentTab == 1 ? '' : 'NO_PRINT'
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 0 - 1
src/views/salesReturnManagement/salesReturn/chooseCustomModal.vue

@@ -76,7 +76,6 @@ import { VSelect } from '@/components'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import { dealerSubareaScopeList, dealerDetailBySn } from '@/api/dealer'
 import { salesReturnInsert } from '@/api/salesReturn'
-import chooseWarehouse from '@/views/common/chooseWarehouse'
 export default {
   name: 'SalesReturnChooseCustomModal',
   mixins: [commonMixin],