Browse Source

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

bug
lilei 2 years ago
parent
commit
1f1a3edb95

+ 57 - 18
src/views/basicData/warehouse/editModal.vue

@@ -28,19 +28,26 @@
               placeholder="请输入仓库名称(最多30个字符)"
               placeholder="请输入仓库名称(最多30个字符)"
               allowClear />
               allowClear />
           </a-form-model-item>
           </a-form-model-item>
-          <a-form-model-item label="地址" prop="address">
-            <AreaList id="allocationPresentationList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+          <a-form-model-item label="地址" prop="addressInfo">
+            <AreaList
+              id="warehouseEdit-areaList"
+              :value="form.addressInfo"
+              changeOnSelect
+              ref="areaList"
+              @change="areaChange"
+              defValKey="id"></AreaList>
+          </a-form-model-item>
+          <a-form-model-item prop="address" :wrapper-col="{ span: 16, offset: 6 }">
             <a-input
             <a-input
-              style="margin-top:24px;"
               id="warehouseEdit-desc"
               id="warehouseEdit-desc"
-              v-model.trim="form.desc"
+              v-model.trim="form.address"
               placeholder="请输入详细地址"
               placeholder="请输入详细地址"
               allowClear />
               allowClear />
           </a-form-model-item>
           </a-form-model-item>
-          <a-form-model-item label="ERP仓库编码" prop="warehouseCode">
+          <a-form-model-item label="ERP仓库编码" prop="erpWarehouseCode">
             <a-input
             <a-input
               id="warehouseEdit-code"
               id="warehouseEdit-code"
-              v-model.trim="form.code"
+              v-model.trim="form.erpWarehouseCode"
               placeholder="请输入ERP仓库编码"
               placeholder="请输入ERP仓库编码"
               allowClear />
               allowClear />
           </a-form-model-item>
           </a-form-model-item>
@@ -93,19 +100,26 @@ export default {
       form: {
       form: {
         name: '', // 仓库名称
         name: '', // 仓库名称
         address: '',
         address: '',
+        addressInfo: undefined,
         provinceSn: undefined,
         provinceSn: undefined,
+        provinceName: undefined,
         citySn: undefined,
         citySn: undefined,
+        cityName: undefined,
         districtSn: undefined,
         districtSn: undefined,
-        code: undefined// ERP仓库编码
+        districtName: undefined,
+        erpWarehouseCode: undefined// ERP仓库编码
       },
       },
       rules: {
       rules: {
         name: [
         name: [
           { required: true, message: '请输入仓库名称', trigger: 'blur' }
           { required: true, message: '请输入仓库名称', trigger: 'blur' }
         ],
         ],
+        addressInfo: [
+          { required: true, message: '请选择省市区', trigger: 'change' }
+        ],
         address: [
         address: [
-          { required: true, message: '请选择详细地址', trigger: 'change' }
+          { required: true, message: '请输入详细地址', trigger: 'blur' }
         ],
         ],
-        warehouseCode: [
+        erpWarehouseCode: [
           { required: true, message: '请输入ERP仓库编码', trigger: 'blur' }
           { required: true, message: '请输入ERP仓库编码', trigger: 'blur' }
         ]
         ]
       }
       }
@@ -119,16 +133,31 @@ export default {
       str = str.replace(/[\r\n]/g, '')
       str = str.replace(/[\r\n]/g, '')
       this.form.name = str
       this.form.name = str
     },
     },
-    areaChange (val) {
-      this.form.address = val
+    areaChange (val, row) {
+      this.form.addressInfo = val
       this.form.provinceSn = val[0] ? val[0] : ''
       this.form.provinceSn = val[0] ? val[0] : ''
+      this.form.provinceName = row[0] ? row[0].name ? row[0].name : '' : ''
       this.form.citySn = val[1] ? val[1] : ''
       this.form.citySn = val[1] ? val[1] : ''
+      this.form.cityName = row[1] ? row[1].name ? row[1].name : '' : ''
       this.form.districtSn = val[2] ? val[2] : ''
       this.form.districtSn = val[2] ? val[2] : ''
+      this.form.districtName = row[2] ? row[2].name ? row[2].name : '' : ''
     },
     },
     //  详情
     //  详情
     getDetail () {
     getDetail () {
-      this.form = {
-        name: this.nowData && this.nowData.name ? this.nowData.name : ''
+      if (this.nowData) {
+        const addressVal = [this.nowData.provinceSn ? this.nowData.provinceSn : '', this.nowData.citySn ? this.nowData.citySn : '', this.nowData.districtSn ? this.nowData.districtSn : '']
+        this.form = {
+          name: this.nowData.name ? this.nowData.name : '',
+          address: this.nowData.address ? this.nowData.address : '',
+          provinceSn: this.nowData.provinceSn ? this.nowData.provinceSn : '',
+          provinceName: this.nowData.provinceName ? this.nowData.provinceName : '',
+          citySn: this.nowData.citySn ? this.nowData.citySn : '',
+          cityName: this.nowData.cityName ? this.nowData.cityName : '',
+          districtSn: this.nowData.districtSn ? this.nowData.districtSn : '',
+          districtName: this.nowData.districtName ? this.nowData.districtName : '',
+          erpWarehouseCode: this.nowData.erpWarehouseCode ? this.nowData.erpWarehouseCode : '', // ERP仓库编码
+          addressInfo: addressVal
+        }
       }
       }
     },
     },
     //  保存
     //  保存
@@ -137,11 +166,12 @@ export default {
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const params = {
           const params = {
-            warehouseSn: this.itemSn ? this.itemSn : undefined,
-            name: this.form.name //  仓库名称
+            warehouseSn: this.itemSn ? this.itemSn : undefined
           }
           }
+          const newParams = Object.assign(this.form, params)
+          delete newParams.addressInfo
           _this.spinning = true
           _this.spinning = true
-          warehouseSave(params).then(res => {
+          warehouseSave(newParams).then(res => {
             if (res.status == 200) {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$message.success(res.message)
               _this.$emit('ok')
               _this.$emit('ok')
@@ -172,7 +202,16 @@ export default {
         this.$emit('close')
         this.$emit('close')
       } else {
       } else {
         this.form = {
         this.form = {
-          name: ''
+          name: '',
+          address: '',
+          addressInfo: undefined,
+          provinceSn: undefined,
+          provinceName: undefined,
+          citySn: undefined,
+          cityName: undefined,
+          districtSn: undefined,
+          districtName: undefined,
+          erpWarehouseCode: undefined// ERP仓库编码
         }
         }
       }
       }
     },
     },
@@ -185,7 +224,7 @@ export default {
 }
 }
 </script>
 </script>
 
 
-<style lang="less">
+<style lang="less" scoped>
   .warehouseEdit-modal{
   .warehouseEdit-modal{
     .ant-modal-body {
     .ant-modal-body {
     	padding: 40px 40px 24px;
     	padding: 40px 40px 24px;

+ 7 - 3
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -118,8 +118,8 @@
                   </a-form-model-item>
                   </a-form-model-item>
                 </a-col>
                 </a-col>
                 <a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                 <a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
-                  <a-form-model-item label="默认仓库" prop="defaultWarehouse" >
-                    <chooseWarehouse ref="warehouse" value="4" @change="handleWarehouse"></chooseWarehouse>
+                  <a-form-model-item label="默认仓库" prop="defaultWarehouseSn" >
+                    <chooseWarehouse ref="warehouse" :value="form.defaultWarehouseSn" @change="handleWarehouse"></chooseWarehouse>
                   </a-form-model-item>
                   </a-form-model-item>
                 </a-col>
                 </a-col>
               </a-row>
               </a-row>
@@ -471,7 +471,8 @@ export default {
         jgDoorHeaderChangeTime: '',
         jgDoorHeaderChangeTime: '',
         isShowSpecialPrice: 0,
         isShowSpecialPrice: 0,
         remark: '',
         remark: '',
-        kdMidCustomerFnumber: ''
+        kdMidCustomerFnumber: '',
+        defaultWarehouseSn: undefined
       },
       },
       rules: {
       rules: {
         dealerName: [
         dealerName: [
@@ -505,6 +506,9 @@ export default {
         menuMouldId: [
         menuMouldId: [
           { required: true, message: '请选择授权类型', trigger: 'change' }
           { required: true, message: '请选择授权类型', trigger: 'change' }
         ],
         ],
+        defaultWarehouseSn: [
+          { required: true, message: '请选择默认仓库', trigger: 'change' }
+        ],
         dealerTelephone: [
         dealerTelephone: [
           { pattern: /^[0-9-]{11,13}$/, message: '请输入正确的电话号码!' }
           { pattern: /^[0-9-]{11,13}$/, message: '请输入正确的电话号码!' }
         ],
         ],

+ 12 - 2
src/views/salesManagement/backorder/list.vue

@@ -15,6 +15,11 @@
                 <dealerSubareaScopeList ref="custList" id="backorderList-buyerSn" @change="custChange"></dealerSubareaScopeList>
                 <dealerSubareaScopeList ref="custList" id="backorderList-buyerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="出库仓库">
+                <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="backorderList-refresh">查询</a-button>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="backorderList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="backorderList-reset">重置</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="backorderList-reset">重置</a-button>
@@ -58,11 +63,12 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import backorderDetailModal from './detailModal.vue'
 import backorderDetailModal from './detailModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { oosList } from '@/api/oos'
 import { oosList } from '@/api/oos'
 export default {
 export default {
   name: 'BackorderList',
   name: 'BackorderList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, backorderDetailModal, rangeDate },
+  components: { STable, VSelect, dealerSubareaScopeList, backorderDetailModal, rangeDate, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -102,18 +108,22 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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: '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: '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: 'totalCategory', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { 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: '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 : '--') } },
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
       ]
       ]
       if (this.$hasPermissions('M_backorderList_salesPrice')) { //  售价权限
       if (this.$hasPermissions('M_backorderList_salesPrice')) { //  售价权限
-        arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(7, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       }
       return arr
       return arr
     }
     }
   },
   },
   methods: {
   methods: {
+    handleWarehouse (val) {
+
+    },
     //  时间  change
     //  时间  change
     dateChange (date) {
     dateChange (date) {
       this.queryParam.beginDate = date[0]
       this.queryParam.beginDate = date[0]

+ 18 - 7
src/views/salesManagement/examineVerify/list.vue

@@ -60,8 +60,13 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
                 <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                    <Area id="examineVerifyList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-                  </a-form-model-item>
+                  <Area id="examineVerifyList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+                </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>
               </a-col>
               </a-col>
             </template>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -96,7 +101,7 @@
         :scroll="{ y:tableHeight }"
         :scroll="{ y:tableHeight }"
         :defaultLoadData="false"
         :defaultLoadData="false"
         bordered>
         bordered>
-       
+
         <!-- 销售单号 -->
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
         <template slot="salesBillNo" slot-scope="text, record">
           <span class="link-bule" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
           <span class="link-bule" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
@@ -163,11 +168,12 @@ import auditModal from '@/views/common/auditModal.vue'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import auditRejectModal from './auditRejectModal.vue'
 import auditRejectModal from './auditRejectModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { dispatchlBhshList, dispatchQueryBhshCount, dispatchStockUpAduit } from '@/api/dispatch'
 import { dispatchlBhshList, dispatchQueryBhshCount, dispatchStockUpAduit } from '@/api/dispatch'
 export default {
 export default {
   name: 'ExamineVerifyList',
   name: 'ExamineVerifyList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, commonModal, salesDetail, dispatchDetail, auditModal, subarea, auditRejectModal, Area },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, commonModal, salesDetail, dispatchDetail, auditModal, subarea, auditRejectModal, Area, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -189,7 +195,7 @@ export default {
         stockOutNo: '', // 出库单号
         stockOutNo: '', // 出库单号
         printStatus: undefined, //  打印状态
         printStatus: undefined, //  打印状态
         billStatus: undefined, //  业务状态
         billStatus: undefined, //  业务状态
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
@@ -242,6 +248,7 @@ export default {
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '出库单号', dataIndex: 'stockOutNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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: '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: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { 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: '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 || '--' } },
         { title: '备货时间', dataIndex: 'stockUpDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -256,6 +263,10 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 选择出库仓库
+    handleWarehouse (val) {
+
+    },
     custChange (val) {
     custChange (val) {
       this.queryParam.buyerSn = val.key
       this.queryParam.buyerSn = val.key
     },
     },
@@ -264,7 +275,7 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
       this.queryParam.endDate = date[1]
     },
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
@@ -283,7 +294,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.subarea.clearData()
       }
       }
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 29 - 18
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -21,18 +21,18 @@
                   <a-input id="matchSoo-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                   <a-input id="matchSoo-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="备货单号">
+                  <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
+              </a-col>
               <template v-if="advanced">
               <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="备货单号">
-                    <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
-                  </a-form-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                   <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                     <dealerSubareaScopeList ref="shbuyerName" id="matchSoo-shbuyerName" @change="shcustChange" />
                     <dealerSubareaScopeList ref="shbuyerName" id="matchSoo-shbuyerName" @change="shcustChange" />
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="业务状态">
                   <a-form-item label="业务状态">
                     <v-select
                     <v-select
                       v-model="queryParam.billStatus"
                       v-model="queryParam.billStatus"
@@ -43,7 +43,7 @@
                       allowClear></v-select>
                       allowClear></v-select>
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="单据状态">
                   <a-form-item label="单据状态">
                     <v-select
                     <v-select
                       v-model="queryParam.voidFlag"
                       v-model="queryParam.voidFlag"
@@ -54,7 +54,7 @@
                       allowClear></v-select>
                       allowClear></v-select>
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="对单状态">
                   <a-form-item label="对单状态">
                     <v-select
                     <v-select
                       v-model="queryParam.checkStatus"
                       v-model="queryParam.checkStatus"
@@ -70,26 +70,31 @@
                     <rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
                     <rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-model-item label="所在区域">
                   <a-form-model-item label="所在区域">
                     <subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
                     <subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
                   </a-form-model-item>
                   </a-form-model-item>
                 </a-col>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
                   <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
                     <Area id="matchSoo-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                     <Area id="matchSoo-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   </a-form-model-item>
                   </a-form-model-item>
                 </a-col>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-model-item label="出库仓库">
+                    <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                  </a-form-model-item>
+                </a-col>
               </template>
               </template>
-              <a-col :md="6" :sm="24">
-                <span class="table-page-search-submitButtons">
+              <a-col :md="24" :sm="24">
+                <div class="table-page-search-submitButtons" style="text-align:center;">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                   <a @click="advanced=!advanced" style="margin-left: 8px">
                   <a @click="advanced=!advanced" style="margin-left: 8px">
                     {{ advanced ? '收起' : '展开' }}
                     {{ advanced ? '收起' : '展开' }}
                     <a-icon :type="advanced ? 'up' : 'down'"/>
                     <a-icon :type="advanced ? 'up' : 'down'"/>
                   </a>
                   </a>
-                </span>
+                </div>
               </a-col>
               </a-col>
             </a-row>
             </a-row>
           </a-form>
           </a-form>
@@ -154,11 +159,12 @@ import Area from '@/views/common/area.js'
 import { dispatchlList, dispatchCheck } from '@/api/dispatch'
 import { dispatchlList, dispatchCheck } from '@/api/dispatch'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
 import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 export default {
 export default {
   name: 'MatchSendOutOrderList',
   name: 'MatchSendOutOrderList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area, commonModal, salesDetail, dispatchDetail },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area, commonModal, salesDetail, dispatchDetail, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -181,7 +187,7 @@ export default {
         salesBillNo: '', //  销售单号
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
         billStatus: undefined, //  业务状态
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
@@ -218,6 +224,7 @@ export default {
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', 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: '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: 'receiverName', 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: '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 : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -250,6 +257,10 @@ export default {
     },
     },
     shcustChange (val) {
     shcustChange (val) {
       this.queryParam.receiverSn = val.key
       this.queryParam.receiverSn = val.key
+    },
+    // 选择出库仓库
+    handleWarehouse (val) {
+
     },
     },
     // 详情
     // 详情
     handleDetail (row, type) {
     handleDetail (row, type) {
@@ -283,7 +294,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
@@ -305,7 +316,7 @@ export default {
         salesBillNo: '', //  销售单号
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
         billStatus: undefined, //  业务状态
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
@@ -313,7 +324,7 @@ export default {
         shippingAddrProvinceSn: undefined,
         shippingAddrProvinceSn: undefined,
         checkStatus: undefined
         checkStatus: undefined
       }
       }
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.subarea.clearData()
       }
       }
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 17 - 6
src/views/salesManagement/outboundOrder/list.vue

@@ -66,8 +66,13 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
                 <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                    <Area id="outboundOrderList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-                  </a-form-model-item>
+                  <Area id="outboundOrderList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+                </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>
               </a-col>
               </a-col>
             </template>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -180,12 +185,13 @@ import pushOrderDetailModal from '@/views/salesManagement/pushOrderManagement/de
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import sendGoodModal from './sendGoodModal.vue'
 import sendGoodModal from './sendGoodModal.vue'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
 import { getCustomerInfo, validateStockOut } from '@/api/sendBill'
 import { getCustomerInfo, validateStockOut } from '@/api/sendBill'
 export default {
 export default {
   name: 'OutboundOrderList',
   name: 'OutboundOrderList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, pushOrderDetailModal, allocationDetailModal, subarea, Area, sendGoodModal },
+  components: { STable, VSelect, rangeDate, pushOrderDetailModal, allocationDetailModal, subarea, Area, sendGoodModal, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -203,7 +209,7 @@ export default {
         stockOutNo: '',
         stockOutNo: '',
         outBizNo: '',
         outBizNo: '',
         state: undefined, //  状态
         state: undefined, //  状态
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
@@ -246,6 +252,7 @@ export default {
         { title: '业务单号', dataIndex: 'outBizNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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: '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: '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: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { 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: '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 || '--' } },
         { title: '出库时间', dataIndex: 'outTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -273,6 +280,10 @@ export default {
         state = true
         state = true
       }
       }
       return state
       return state
+    },
+    // 选择出库仓库
+    handleWarehouse (val) {
+
     },
     },
     //  时间  change
     //  时间  change
     dateChange (date) {
     dateChange (date) {
@@ -283,7 +294,7 @@ export default {
       this.$refs.table.clearSelected() // 清空表格选中项
       this.$refs.table.clearSelected() // 清空表格选中项
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
@@ -301,7 +312,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.sendFlag = undefined
       this.queryParam.sendFlag = undefined
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.subarea.clearData()
       }
       }
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 18 - 8
src/views/salesManagement/pushOrderManagement/list.vue

@@ -85,16 +85,21 @@
                   <Area id="pushOrder-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   <Area id="pushOrder-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             </template>
-            <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
+            <a-col :md="24" :sm="24">
+              <div class="table-page-search-submitButtons" style="text-align:center;">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">
                 <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
                 </a>
-              </span>
+              </div>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
         </a-form>
         </a-form>
@@ -191,6 +196,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import subarea from '@/views/common/subarea.js'
 import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import Area from '@/views/common/area.js'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
 import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
@@ -199,7 +205,7 @@ import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/di
 export default {
 export default {
   name: 'PushOrderManagementList',
   name: 'PushOrderManagementList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -222,7 +228,7 @@ export default {
         salesBillNo: '', //  销售单号
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
         billStatus: undefined, //  业务状态
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
@@ -273,6 +279,7 @@ export default {
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true },
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '出库仓库', dataIndex: 'warehouse', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品款数', dataIndex: 'totalCategory', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -314,9 +321,12 @@ export default {
         this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
         this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
       }
       }
     },
     },
-    closeDetailModal(){
+    closeDetailModal () {
       this.showDetailModal = false
       this.showDetailModal = false
       this.$store.state.app.curActionPermission = ''
       this.$store.state.app.curActionPermission = ''
+    },
+    handleWarehouse (val) {
+
     },
     },
     // 查看发货说明
     // 查看发货说明
     handleExplainInfo (row) {
     handleExplainInfo (row) {
@@ -343,7 +353,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
@@ -365,7 +375,7 @@ export default {
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.printStatus = undefined
       this.queryParam.printStatus = undefined
       this.queryParam.checkStatus = undefined
       this.queryParam.checkStatus = undefined
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.subarea.clearData()
       }
       }
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 32 - 21
src/views/salesManagement/receiptPrint/list.vue

@@ -19,7 +19,7 @@
                   <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
                   <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="收款单号">
                 <a-form-item label="收款单号">
                   <a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
                   <a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
                 </a-form-item>
@@ -29,7 +29,7 @@
                   <dealerSearchList ref="payerName" id="alesCollectionList-payerName" @change="custChange" />
                   <dealerSearchList ref="payerName" id="alesCollectionList-payerName" @change="custChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
-              <a-col :md="4" :sm="24" v-if="currentTab == 1">
+              <a-col :md="6" :sm="24" v-if="currentTab == 1">
                 <a-form-item label="收款打印状态">
                 <a-form-item label="收款打印状态">
                   <v-select
                   <v-select
                     v-model="queryParam.printStatus"
                     v-model="queryParam.printStatus"
@@ -41,7 +41,7 @@
                   ></v-select>
                   ></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="足额打款">
                 <a-form-item label="足额打款">
                   <v-select
                   <v-select
                     v-model="queryParam.fullPaymentFlag"
                     v-model="queryParam.fullPaymentFlag"
@@ -52,8 +52,13 @@
                     allowClear></v-select>
                     allowClear></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="currentTab==2?4:24" :sm="24">
               <a-col :md="currentTab==2?4:24" :sm="24">
-                <span style="float:right;" class="table-page-search-submitButtons">
+                <span class="table-page-search-submitButtons">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 </span>
                 </span>
@@ -110,7 +115,7 @@
 
 
         <!-- 收款打印 -->
         <!-- 收款打印 -->
         <commonModal modalTit="收款打印预览" width="700pt" :showFooter="false" :openModal="showTipModal" @cancel="closeTipModal">
         <commonModal modalTit="收款打印预览" width="700pt" :showFooter="false" :openModal="showTipModal" @cancel="closeTipModal">
-           <printModel ref="printModel" @cancel="closeTipModal" @printOk="printOk"></printModel>
+          <printModel ref="printModel" @cancel="closeTipModal" @printOk="printOk"></printModel>
         </commonModal>
         </commonModal>
         <!-- 打印记录 -->
         <!-- 打印记录 -->
         <recordModal v-drag ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
         <recordModal v-drag ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
@@ -137,11 +142,12 @@ import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import recordModal from './recordModal.vue'
 import recordModal from './recordModal.vue'
 import printModel from './printModel.vue'
 import printModel from './printModel.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { financeBookDetailList, updateFinanceBookDetail, getBatchLastProcessInstance, checkPrintStatus } from '@/api/financeBook'
 import { financeBookDetailList, updateFinanceBookDetail, getBatchLastProcessInstance, checkPrintStatus } from '@/api/financeBook'
 export default {
 export default {
   name: 'ReceiptPrintList',
   name: 'ReceiptPrintList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSearchList, rangeDate, commonModal, recordModal, printModel },
+  components: { STable, VSelect, dealerSearchList, rangeDate, commonModal, recordModal, printModel, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -156,7 +162,7 @@ export default {
         endDate: '',
         endDate: '',
         bookNo: '',
         bookNo: '',
         payerName: '',
         payerName: '',
-        dealerSn:undefined,
+        dealerSn: undefined,
         subareaSn: undefined,
         subareaSn: undefined,
         billStatus: undefined,
         billStatus: undefined,
         dealerProvinceSn: undefined,
         dealerProvinceSn: undefined,
@@ -206,6 +212,7 @@ export default {
         { title: '收款单号', dataIndex: 'bookNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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: '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: '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: 'dealerEntity.kdMidCustomerFnumber', align: 'left', width: '10%', 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: '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) : '--') },
         { title: '收款金额', dataIndex: 'receiptAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
@@ -223,6 +230,10 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 选择出库仓库
+    handleWarehouse (val) {
+
+    },
     changeTab (v) {
     changeTab (v) {
       this.currentTab = v
       this.currentTab = v
       this.pageInit()
       this.pageInit()
@@ -252,9 +263,9 @@ export default {
       })
       })
 
 
       // 检查是否有已打印数据
       // 检查是否有已打印数据
-      if(this.currentTab == 2){
+      if (this.currentTab == 2) {
         const hasPrintData = await checkPrintStatus(bookDetailSn).then(res => res.data)
         const hasPrintData = await checkPrintStatus(bookDetailSn).then(res => res.data)
-        if(!hasPrintData){
+        if (!hasPrintData) {
           _this.$info({
           _this.$info({
             title: '操作提示',
             title: '操作提示',
             centered: true,
             centered: true,
@@ -263,10 +274,10 @@ export default {
               _this.resetSearchForm()
               _this.resetSearchForm()
             }
             }
           })
           })
-          return 
+          return
         }
         }
       }
       }
-      
+
       const retArr = []
       const retArr = []
       const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
       const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
       console.log(auditInfo)
       console.log(auditInfo)
@@ -305,9 +316,9 @@ export default {
       let auditInfo = null
       let auditInfo = null
       if (type == 0) {
       if (type == 0) {
         // 是否已打印
         // 是否已打印
-        if(this.currentTab == 2){
-          let hasPrintData = await checkPrintStatus([list.bookDetailSn]).then(res => res.data)
-          if(!hasPrintData){
+        if (this.currentTab == 2) {
+          const hasPrintData = await checkPrintStatus([list.bookDetailSn]).then(res => res.data)
+          if (!hasPrintData) {
             _this.$info({
             _this.$info({
               title: '操作提示',
               title: '操作提示',
               centered: true,
               centered: true,
@@ -316,17 +327,17 @@ export default {
                 _this.resetSearchForm()
                 _this.resetSearchForm()
               }
               }
             })
             })
-            return 
+            return
           }
           }
         }
         }
-        
+
         auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': [list.bookSn] }).then(res => res.data)
         auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': [list.bookSn] }).then(res => res.data)
       }
       }
       console.log(auditInfo)
       console.log(auditInfo)
       this.spinning = true
       this.spinning = true
       this.showTipModal = true
       this.showTipModal = true
       let detailItemUseStr = ''
       let detailItemUseStr = ''
-      
+
       this.$nextTick(() => {
       this.$nextTick(() => {
         if (type == 0 && row.detailItemUseList) {
         if (type == 0 && row.detailItemUseList) {
           row.detailItemUseList.map(k => {
           row.detailItemUseList.map(k => {
@@ -339,7 +350,7 @@ export default {
       })
       })
     },
     },
     printOk (res) {
     printOk (res) {
-      if(res){
+      if (res) {
         this.spinning = false
         this.spinning = false
         this.$refs.table.refresh()
         this.$refs.table.refresh()
         this.$refs.table.clearSelected()
         this.$refs.table.clearSelected()
@@ -352,10 +363,10 @@ export default {
     },
     },
     custChange (val) {
     custChange (val) {
       console.log(val)
       console.log(val)
-      if(val.row){
+      if (val.row) {
         this.queryParam.dealerSn = val.row.dealerSn
         this.queryParam.dealerSn = val.row.dealerSn
         this.queryParam.payerName = undefined
         this.queryParam.payerName = undefined
-      }else{
+      } else {
         this.queryParam.dealerSn = undefined
         this.queryParam.dealerSn = undefined
         this.queryParam.payerName = val.key
         this.queryParam.payerName = val.key
       }
       }
@@ -402,7 +413,7 @@ export default {
         endDate: '',
         endDate: '',
         bookNo: '',
         bookNo: '',
         payerName: '',
         payerName: '',
-        dealerSn:undefined,
+        dealerSn: undefined,
         subareaSn: undefined,
         subareaSn: undefined,
         billStatus: undefined,
         billStatus: undefined,
         dealerProvinceSn: undefined,
         dealerProvinceSn: undefined,

+ 16 - 5
src/views/salesManagement/sendOutOrder/list.vue

@@ -63,6 +63,11 @@
                   <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                   <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             </template>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
               <span class="table-page-search-submitButtons">
@@ -152,11 +157,12 @@ import sendGoodModal from '../outboundOrder/sendGoodModal.vue'
 import Area from '@/views/common/area.js'
 import Area from '@/views/common/area.js'
 import subarea from '@/views/common/subarea.js'
 import subarea from '@/views/common/subarea.js'
 import ImportGuideModal from './importGuideModal.vue'
 import ImportGuideModal from './importGuideModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { sendBillQueryPageList, sendBillExcel } from '@/api/sendBill'
 import { sendBillQueryPageList, sendBillExcel } from '@/api/sendBill'
 export default {
 export default {
   name: 'SendOutOrderList',
   name: 'SendOutOrderList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, detailModal, sendGoodModal, Area, subarea, ImportGuideModal },
+  components: { STable, VSelect, rangeDate, detailModal, sendGoodModal, Area, subarea, ImportGuideModal, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -178,7 +184,7 @@ export default {
         bizNos: '', //  业务单号
         bizNos: '', //  业务单号
         transportState: undefined, //  物流状态
         transportState: undefined, //  物流状态
         receiveFlag: undefined, // 收货状态
         receiveFlag: undefined, // 收货状态
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
@@ -221,7 +227,8 @@ export default {
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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: 'provinceName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'customeName', width: '10%', align: 'left', 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: 'sendDate', width: '8%', align: 'center', 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: 'customerCacateName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流电话', dataIndex: 'transportTele', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流电话', dataIndex: 'transportTele', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -239,6 +246,10 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 选择出库仓库
+    handleWarehouse (val) {
+
+    },
     //  时间  change
     //  时间  change
     dateChange (date) {
     dateChange (date) {
       this.queryParam.beginDate = date[0]
       this.queryParam.beginDate = date[0]
@@ -273,7 +284,7 @@ export default {
         _this.spinning = false
         _this.spinning = false
       })
       })
     },
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
@@ -295,7 +306,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
       this.queryParam.provinceSn = undefined
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.subarea.clearData()
       }
       }
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 12 - 5
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -66,6 +66,11 @@
                   <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
                   <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 8px;">
             <a-col :md="6" :sm="24" style="margin-bottom: 8px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsCList-refresh">查询</a-button>
@@ -112,7 +117,7 @@
         :style="{ height: tableHeight+84.5+'px' }"
         :style="{ height: tableHeight+84.5+'px' }"
         size="small"
         size="small"
         :rowKey="(record) => record.no"
         :rowKey="(record) => record.no"
-        rowKeyName = "no"
+        rowKeyName="no"
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
         :defaultLoadData="false"
         :defaultLoadData="false"
@@ -138,11 +143,12 @@ import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import Area from '@/views/common/area.js'
 import ProductType from '@/views/common/productType.js'
 import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import ProductBrand from '@/views/common/productBrand.js'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { oosBuyerList, oosBuyerDetailCount, oosBuyerDetailPageCount, oosDetailExport } from '@/api/oos'
 import { oosBuyerList, oosBuyerDetailCount, oosBuyerDetailPageCount, oosDetailExport } from '@/api/oos'
 export default {
 export default {
   name: 'ShortageStatisticsCList',
   name: 'ShortageStatisticsCList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, subarea, Area, rangeDate, ProductBrand, ProductType },
+  components: { STable, VSelect, dealerSubareaScopeList, subarea, Area, rangeDate, ProductBrand, ProductType, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -152,7 +158,7 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime,
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         endDate: getDate.getCurrMonthDays().endtime,
         buyerSn: undefined,
         buyerSn: undefined,
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
@@ -206,9 +212,10 @@ export default {
       const arr = [
       const arr = [
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, align: 'center' },
+        { 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.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: '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: 'dealerEntity.dealerTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { 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: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
@@ -265,7 +272,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },

+ 16 - 5
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -10,22 +10,27 @@
                 <rangeDate ref="rangeDate" :allowClear="false" :value="time" @change="dateChange" />
                 <rangeDate ref="rangeDate" :allowClear="false" :value="time" @change="dateChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品编码">
               <a-form-item label="产品编码">
                 <a-input id="shortageStatisticsPList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
                 <a-input id="shortageStatisticsPList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品名称">
               <a-form-item label="产品名称">
                 <a-input id="shortageStatisticsPList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 <a-input id="shortageStatisticsPList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="原厂编码">
                 <a-form-item label="原厂编码">
                   <a-input id="shortageStatisticsPList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
                   <a-input id="shortageStatisticsPList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shortageStatisticsPList-refresh">查询</a-button>
@@ -87,11 +92,12 @@ import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { oosProductList, oosProductDetailCount, oosProductDetailPageCount, oosDetailExportByProduct } from '@/api/oos'
 import { oosProductList, oosProductDetailCount, oosProductDetailPageCount, oosDetailExportByProduct } from '@/api/oos'
 export default {
 export default {
   name: 'ShortageStatisticsPList',
   name: 'ShortageStatisticsPList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate },
+  components: { STable, VSelect, rangeDate, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -148,7 +154,8 @@ export default {
         { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '缺货数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { 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: '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: '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 }
       ]
       ]
       if (this.$hasPermissions('M_shortageStatisticsPList_salesPrice')) { //  售价权限
       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) : '--') })
         arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
@@ -229,6 +236,10 @@ export default {
       this.queryParam.productCode = ''
       this.queryParam.productCode = ''
       this.queryParam.origCode = ''
       this.queryParam.origCode = ''
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
+    },
+    // 选择出库仓库
+    handleWarehouse (val) {
+
     },
     },
     pageInit () {
     pageInit () {
       const _this = this
       const _this = this

+ 21 - 14
src/views/salesManagement/stockPrint/list.vue

@@ -19,28 +19,28 @@
                   <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
                   <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                 <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                   <dealerSubareaScopeList ref="dealerSubareaScopeList" id="stockPrint-buyerName" @change="custChange" />
                   <dealerSubareaScopeList ref="dealerSubareaScopeList" id="stockPrint-buyerName" @change="custChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="销售单号">
                 <a-form-item label="销售单号">
                   <a-input id="stockPrint-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                   <a-input id="stockPrint-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="备货单号">
                 <a-form-item label="备货单号">
                   <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
                   <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <template v-if="advanced">
               <template v-if="advanced">
-                <a-col :md="5" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                   <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                     <dealerSubareaScopeList ref="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
                     <dealerSubareaScopeList ref="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="3" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="业务状态">
                   <a-form-item label="业务状态">
                     <v-select
                     <v-select
                       v-model="queryParam.billStatus"
                       v-model="queryParam.billStatus"
@@ -51,7 +51,7 @@
                       allowClear></v-select>
                       allowClear></v-select>
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="3" :sm="24" v-if="currentTab == 1">
+                <a-col :md="6" :sm="24" v-if="currentTab == 1">
                   <a-form-item label="单据状态">
                   <a-form-item label="单据状态">
                     <v-select
                     <v-select
                       v-model="queryParam.voidFlag"
                       v-model="queryParam.voidFlag"
@@ -62,7 +62,7 @@
                       allowClear></v-select>
                       allowClear></v-select>
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="4" :sm="24" v-if="currentTab == 1">
+                <a-col :md="6" :sm="24" v-if="currentTab == 1">
                   <a-form-item label="备货打印状态">
                   <a-form-item label="备货打印状态">
                     <v-select
                     <v-select
                       v-model="queryParam.printStatus"
                       v-model="queryParam.printStatus"
@@ -73,15 +73,20 @@
                       allowClear></v-select>
                       allowClear></v-select>
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
-                <a-col :md="3" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-model-item label="所在区域">
                   <a-form-model-item label="所在区域">
                     <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
                     <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
                   </a-form-model-item>
                   </a-form-model-item>
                 </a-col>
                 </a-col>
-                <a-col :md="3" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
                   <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
-                      <Area id="stockPrint-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-                    </a-form-model-item>
+                    <Area id="stockPrint-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+                  </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>
                 </a-col>
                 </a-col>
               </template>
               </template>
               <a-col :md="5" :sm="24">
               <a-col :md="5" :sm="24">
@@ -198,6 +203,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import sendTypeModal from './sendTypeModal.vue'
 import sendTypeModal from './sendTypeModal.vue'
 import recordModal from './recordModal.vue'
 import recordModal from './recordModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
 import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import explainInfoModal from '@/views/salesManagement/pushOrderManagement/explainInfoModal.vue'
 import explainInfoModal from '@/views/salesManagement/pushOrderManagement/explainInfoModal.vue'
@@ -206,7 +212,7 @@ import { printFun } from '@/libs/JGPrint.js'
 export default {
 export default {
   name: 'StockPrintList',
   name: 'StockPrintList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area, commonModal, salesDetail, dispatchDetail, explainInfoModal },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area, commonModal, salesDetail, dispatchDetail, explainInfoModal, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -227,7 +233,7 @@ export default {
         salesBillNo: '', //  销售单号
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
         billStatus: undefined, //  业务状态
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
@@ -270,6 +276,7 @@ export default {
         { title: '发货编号', dataIndex: 'sendNo', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '80px', align: 'center', ellipsis: true },
         { 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: '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: 'receiverName', width: '100px', 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: '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 : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -387,7 +394,7 @@ export default {
       this.tipData = row
       this.tipData = row
       this.showInfoModal = true
       this.showInfoModal = true
     },
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },

+ 13 - 3
src/views/salesReturnManagement/billOfLading/add.vue

@@ -87,6 +87,11 @@
                 />
                 />
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
+            <a-col :md="24">
+              <a-form-model-item label="出库仓库" :label-col="{span:2}" :wrapper-col="{span:20}">
+                <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
             <a-col :span="24">
             <a-col :span="24">
               <a-form-model-item label="运费" :label-col="{span:2}" :wrapper-col="{span:20}">
               <a-form-model-item label="运费" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <a-input
                 <a-input
@@ -196,11 +201,12 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import logisticsCompany from './logisticsCompany.js'
 import logisticsCompany from './logisticsCompany.js'
 import logisticsPoint from './logisticsPoint'
 import logisticsPoint from './logisticsPoint'
 import chooseDepartUserModal from '../../expenseManagement/expenseReimbursement/chooseDepartUserModal.vue'
 import chooseDepartUserModal from '../../expenseManagement/expenseReimbursement/chooseDepartUserModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 export default {
 export default {
   name: 'ProductInfoEdit',
   name: 'ProductInfoEdit',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { VSelect, Upload, STable, employee, dealerSubareaScopeList, chooseDepartUserModal, selectXtModal, logisticsCompany, logisticsPoint },
+  components: { VSelect, Upload, STable, employee, dealerSubareaScopeList, chooseDepartUserModal, selectXtModal, logisticsCompany, logisticsPoint, chooseWarehouse },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -249,6 +255,10 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 选择出库仓库
+    handleWarehouse (val) {
+
+    },
     custChange (val) {
     custChange (val) {
       this.form.senderSn = val.key
       this.form.senderSn = val.key
       this.form.senderName = val.name
       this.form.senderName = val.name
@@ -262,8 +272,8 @@ export default {
     openSelModal () {
     openSelModal () {
       this.showXtModal = true
       this.showXtModal = true
     },
     },
-    closeModal(){
-      this.openDepartUserModal=false
+    closeModal () {
+      this.openDepartUserModal = false
       this.showXtModal = false
       this.showXtModal = false
       this.spinning = false
       this.spinning = false
     },
     },

+ 15 - 4
src/views/salesReturnManagement/pickUp/list.vue

@@ -48,16 +48,21 @@
                   ></v-select>
                   ></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             </template>
-            <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
+            <a-col :md="24" :sm="24">
+              <div class="table-page-search-submitButtons" style="text-align:center;">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">
                 <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
                 </a>
-              </span>
+              </div>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
         </a-form>
         </a-form>
@@ -115,6 +120,7 @@ import custList from '@/views/common/custList.vue'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import logisticsPoint from '../billOfLading/logisticsPoint'
 import logisticsPoint from '../billOfLading/logisticsPoint'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { pickUpQueryPage, pickUpFinish } from '@/api/pickUp'
 import { pickUpQueryPage, pickUpFinish } from '@/api/pickUp'
 export default {
 export default {
   name: 'PickUpList',
   name: 'PickUpList',
@@ -125,7 +131,8 @@ export default {
     custList,
     custList,
     employee,
     employee,
     rangeDate,
     rangeDate,
-    logisticsPoint
+    logisticsPoint,
+    chooseWarehouse
   },
   },
   data () {
   data () {
     return {
     return {
@@ -183,12 +190,16 @@ export default {
         { title: '发货方', dataIndex: 'dealerEntity.dealerName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货方', dataIndex: 'dealerEntity.dealerName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'receiverName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'receiverName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       ]
       return arr
       return arr
     }
     }
   },
   },
   methods: {
   methods: {
+    handleWarehouse (val) {
+
+    },
     //  审核时间  change
     //  审核时间  change
     dateExamineChange (date) {
     dateExamineChange (date) {
       this.queryParam.auditBeginDate = date[0] ? date[0] : ''
       this.queryParam.auditBeginDate = date[0] ? date[0] : ''

+ 25 - 13
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -10,17 +10,17 @@
                 <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
                 <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="总部销退单号">
               <a-form-item label="总部销退单号">
                 <a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
                 <a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="客户名称">
               <a-form-item label="客户名称">
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="业务状态">
               <a-form-item label="业务状态">
                 <v-select
                 <v-select
                   v-model="queryParam.billStatus"
                   v-model="queryParam.billStatus"
@@ -32,6 +32,11 @@
                   allowClear></v-select>
                   allowClear></v-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="出库仓库">
+                <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
@@ -77,12 +82,12 @@
               v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
               v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
               @click="handleCheck(record)"
               @click="handleCheck(record)"
               id="salesReturn-eexamine-btn">品检</a-button>
               id="salesReturn-eexamine-btn">品检</a-button>
-              <a-button
-                size="small"
-                type="link"
-                class="button-warning"
-                @click="handleOpenPrintModal(record)"
-                id="salesReturn-print-btn">打印</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              @click="handleOpenPrintModal(record)"
+              id="salesReturn-print-btn">打印</a-button>
           </div>
           </div>
         </template>
         </template>
       </s-table>
       </s-table>
@@ -107,6 +112,7 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { salesReturnList } from '@/api/salesReturn'
 import { salesReturnList } from '@/api/salesReturn'
 import printModal from './printModal.vue'
 import printModal from './printModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 export default {
 export default {
   name: 'ReceiveCheckList',
   name: 'ReceiveCheckList',
@@ -118,7 +124,8 @@ export default {
     employee,
     employee,
     rangeDate,
     rangeDate,
     printModal,
     printModal,
-    commonModal
+    commonModal,
+    chooseWarehouse
   },
   },
   data () {
   data () {
     return {
     return {
@@ -159,7 +166,7 @@ export default {
       visibleAudit: false,
       visibleAudit: false,
       auditInfo: null,
       auditInfo: null,
       spinningAudit: false,
       spinningAudit: false,
-      showTipModal:false
+      showTipModal: false
     }
     }
   },
   },
   computed: {
   computed: {
@@ -169,6 +176,7 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -181,6 +189,10 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 选择出库仓库
+    handleWarehouse (val) {
+
+    },
     //  审核时间  change
     //  审核时间  change
     dateExamineChange (date) {
     dateExamineChange (date) {
       this.queryParam.beginAuditDate = date[0]
       this.queryParam.beginAuditDate = date[0]
@@ -225,8 +237,8 @@ export default {
       this.showTipModal = false
       this.showTipModal = false
       this.$refs.printModel.handleCommonCancel()
       this.$refs.printModel.handleCommonCancel()
     },
     },
-    handleOpenPrintModal(row){
-      this.showTipModal=true
+    handleOpenPrintModal (row) {
+      this.showTipModal = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs.printModel.getData(row)
         this.$refs.printModel.getData(row)
       })
       })

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

@@ -52,12 +52,17 @@
         </a-row>
         </a-row>
         <a-row :gutter="15">
         <a-row :gutter="15">
           <a-col :span="20">
           <a-col :span="20">
+<<<<<<< HEAD
           <a-form-model-item label="退货仓库" prop="warehouseSn">
           <a-form-model-item label="退货仓库" prop="warehouseSn">
               <warehouse
               <warehouse
                 v-model="form.warehouseSn"
                 v-model="form.warehouseSn"
                 id="chooseCustom-basicInfo-warehouseSn"
                 id="chooseCustom-basicInfo-warehouseSn"
                 placeholder="请选择退货仓库"
                 placeholder="请选择退货仓库"
               />
               />
+=======
+            <a-form-model-item label="退货仓库" prop="warehouse">
+              <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+>>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
         </a-row>
         </a-row>
@@ -76,10 +81,15 @@ import { VSelect } from '@/components'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import { dealerSubareaScopeList, dealerDetailBySn } from '@/api/dealer'
 import { dealerSubareaScopeList, dealerDetailBySn } from '@/api/dealer'
 import { salesReturnInsert } from '@/api/salesReturn'
 import { salesReturnInsert } from '@/api/salesReturn'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 export default {
 export default {
   name: 'SalesReturnChooseCustomModal',
   name: 'SalesReturnChooseCustomModal',
   mixins: [commonMixin],
   mixins: [commonMixin],
+<<<<<<< HEAD
   components: { VSelect, warehouse },
   components: { VSelect, warehouse },
+=======
+  components: { VSelect, chooseWarehouse },
+>>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
   props: {
   props: {
     show: [Boolean]
     show: [Boolean]
   },
   },
@@ -119,6 +129,10 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 选择退货仓库
+    handleWarehouse (val) {
+
+    },
     // 搜索经销商
     // 搜索经销商
     fetchUser (value) {
     fetchUser (value) {
       console.log('fetching user', value)
       console.log('fetching user', value)

+ 23 - 0
src/views/salesReturnManagement/salesReturn/list.vue

@@ -83,6 +83,11 @@
                     <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                     <Area id="salesReturn-provinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   </a-form-model-item>
                   </a-form-model-item>
               </a-col>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             </template>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
               <span class="table-page-search-submitButtons">
@@ -215,7 +220,11 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import verifyModal from './verifyModal.vue'
 import verifyModal from './verifyModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
+<<<<<<< HEAD
 import warehouse from '@/views/common/chooseWarehouse.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
+=======
+import chooseWarehouse from '@/views/common/chooseWarehouse'
+>>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
 import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnSubmit } from '@/api/salesReturn'
 import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnSubmit } from '@/api/salesReturn'
 import moment from 'moment'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import getDate from '@/libs/getDate.js'
@@ -232,7 +241,11 @@ export default {
     chooseDepartUserModal,
     chooseDepartUserModal,
     Area,
     Area,
     subarea,
     subarea,
+<<<<<<< HEAD
     warehouse
     warehouse
+=======
+    chooseWarehouse
+>>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
   },
   },
   data () {
   data () {
     return {
     return {
@@ -302,8 +315,14 @@ export default {
         { title: '退货仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '是否同步给客户', dataIndex: 'syncFlag', width: '5%', align: 'center', customRender: function (text) { return text ? ['否', '是'][text] : '--' } },
         { title: '是否同步给客户', dataIndex: 'syncFlag', width: '5%', align: 'center', customRender: function (text) { return text ? ['否', '是'][text] : '--' } },
         { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+<<<<<<< HEAD
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '8%', align: 'center' },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '8%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+=======
+        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货仓库', dataIndex: 'warehouse', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+>>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -320,6 +339,10 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 选择退货仓库
+    handleWarehouse (val) {
+    
+    },
     getCount (params) {
     getCount (params) {
       salesReturnQueryCount(params).then(res => {
       salesReturnQueryCount(params).then(res => {
         this.countData = res.data
         this.countData = res.data