lilei 2 vuotta sitten
vanhempi
commit
cd129b0a9f
32 muutettua tiedostoa jossa 384 lisäystä ja 137 poistoa
  1. 20 7
      src/views/allocationManagement/matchSendOutOrder/list.vue
  2. 17 2
      src/views/allocationManagement/transferOut/basicInfoModal.vue
  3. 3 2
      src/views/allocationManagement/transferOut/detail.vue
  4. 8 6
      src/views/allocationManagement/transferOut/edit.vue
  5. 7 7
      src/views/allocationManagement/transferOut/list.vue
  6. 17 2
      src/views/allocationManagement/transferReturn/basicInfoModal.vue
  7. 1 0
      src/views/allocationManagement/transferReturn/detail.vue
  8. 9 5
      src/views/allocationManagement/transferReturn/edit.vue
  9. 7 2
      src/views/allocationManagement/transferReturn/editGrp.vue
  10. 22 18
      src/views/allocationManagement/transferReturn/list.vue
  11. 26 13
      src/views/allocationManagement/transfersPrint/list.vue
  12. 3 0
      src/views/allocationManagement/transfersPrint/recordModal.vue
  13. 1 1
      src/views/common/chooseWarehouse.js
  14. 16 1
      src/views/inventoryManagement/inventoryCheck/addModal.vue
  15. 2 1
      src/views/inventoryManagement/inventoryCheck/detail.vue
  16. 22 9
      src/views/inventoryManagement/inventoryCheck/list.vue
  17. 19 6
      src/views/inventoryManagement/inventoryQuery/list.vue
  18. 20 8
      src/views/inventoryManagement/inventoryWarning/list.vue
  19. 21 8
      src/views/inventoryManagement/makeInventory/list.vue
  20. 24 11
      src/views/inventoryManagement/supervisionDisk/list.vue
  21. 12 2
      src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue
  22. 1 0
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  23. 1 0
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  24. 19 6
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  25. 13 2
      src/views/purchasingManagement/purchaseReturn/addModal.vue
  26. 1 0
      src/views/purchasingManagement/purchaseReturn/detailModal.vue
  27. 21 8
      src/views/purchasingManagement/purchaseReturn/list.vue
  28. 3 2
      src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue
  29. 16 1
      src/views/salesReturnManagement/salesReturn/chooseCustomModal.vue
  30. 2 1
      src/views/salesReturnManagement/salesReturn/detail.vue
  31. 19 5
      src/views/salesReturnManagement/salesReturn/list.vue
  32. 11 1
      src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

+ 20 - 7
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -21,6 +21,15 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="4" :sm="24">
+                <a-form-item label="调出仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="allocateBillList-warehouseSn"
+                    placeholder="请选择调出仓库"
+                  />
+                </a-form-item>
+              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select
@@ -114,11 +123,12 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { allocateBillList, allocateBillCheck } from '@/api/allocateBill'
 export default {
   name: 'MatchSendOutOrderAllocationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSearchList, commonModal, allocationDetailModal },
+  components: { STable, VSelect, rangeDate, dealerSearchList, commonModal, allocationDetailModal, warehouse },
   data () {
     return {
       spinning: false,
@@ -134,6 +144,7 @@ export default {
         targetName: '', //  调往对象
         state: undefined, //  业务状态
         allocateNo: '', //  调拨单号
+        warehouseSn: undefined,
         receiverSn: undefined,
         checkStatus: undefined,
         printState: undefined
@@ -169,19 +180,20 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '9%' },
+        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '发货说明', dataIndex: 'explainInfo', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '对单状态', dataIndex: 'checkStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '对单人员', dataIndex: 'checkPersonName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '对单时间', dataIndex: 'checkDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
       return arr
     }
@@ -211,6 +223,7 @@ export default {
       this.queryParam.allocateNo = ''
       this.queryParam.receiverSn = ''
       this.queryParam.receiverName = ''
+      this.queryParam.warehouseSn = undefined
       this.queryParam.checkStatus = undefined
       this.$refs.table.refresh(true)
       this.$refs.receiverSn.resetForm()

+ 17 - 2
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -45,6 +45,15 @@
               <a-input v-else v-model="form.targetName" placeholder="请输入调往对象名称(最多30个字符)" :maxLength="30"></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :md="12" :sm="24" v-if="!isEdit">
+            <a-form-model-item label="调出仓库" prop="warehouseSn">
+              <warehouse
+                v-model="form.warehouseSn"
+                id="allocateBill-basicInfo-warehouseSn"
+                placeholder="请选择调出仓库"
+              />
+            </a-form-model-item>
+          </a-col>
           <a-col :md="12" :sm="24">
             <a-form-model-item label="费用/调拨类型" prop="costTypeSn">
               <AllocateType id="allocateBill-basicInfo-allocateTypeSn" v-model="allocateTypeVal" placeholder="请选择费用/调拨类型" @change="allocateTypeChange"></AllocateType>
@@ -111,11 +120,12 @@ import { getLookUpData } from '@/api/data'
 import ProductBrand from '@/views/common/productBrand.js'
 import productTypeAll from '@/views/common/productTypeAll.js'
 import AllocateType from '@/views/common/allocateType.js'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import department from '@/views/expenseManagement/expenseReimbursement/department.js'
 export default {
   name: 'TransferOutBasicInfoModal',
   mixins: [commonMixin],
-  components: { VSelect, Upload, ProductBrand, productTypeAll, AllocateType, department },
+  components: { VSelect, Upload, ProductBrand, productTypeAll, AllocateType, department, warehouse },
   props: {
     openModal: {
       //  弹框显示状态
@@ -143,6 +153,7 @@ export default {
         costTypeSn: '',
         allocateTypeSn: '',
         allocateSortSn: '',
+        warehouseSn: undefined, // 仓库
         productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
@@ -157,6 +168,7 @@ export default {
         targetType: [{ required: true, message: '请选择调往对象', trigger: 'change' }],
         targetSn: [{ required: true, message: '请选择调往对象名称', trigger: 'change' }],
         costTypeSn: [{ required: true, message: '请选择费用/调拨类型', trigger: 'change' }],
+        warehouseSn: [{ required: true, message: '请选择调出仓库', trigger: 'change' }],
         targetName: [{ required: true, message: '请输入调往对象名称', trigger: 'blur' }]
       },
       fetching: false,
@@ -237,10 +249,11 @@ export default {
         }
       })
     },
-    // 调往对象名称  change
+    // 调往对象名称经销商  change
     handleChange (value) {
       const ind = this.dealerData.findIndex(item => item.dealerSn == value)
       this.form.targetName = this.dealerData[ind].dealerName
+      this.form.warehouseSn = this.dealerData[ind].warehouseSn
     },
     //  保存
     handleSave () {
@@ -272,6 +285,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.form.targetSn = undefined
       this.form.targetName = ''
+      this.form.warehouseSn = undefined
       this.form.targetType = e.target.value
     },
     // 调往对象类型
@@ -312,6 +326,7 @@ export default {
           costTypeSn: '',
           allocateTypeSn: '',
           allocateSortSn: '',
+          warehouseSn: undefined,
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
           productTypeSn2: '', //  产品二级分类

+ 3 - 2
src/views/allocationManagement/transferOut/detail.vue

@@ -53,8 +53,9 @@
       <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
+            <a-descriptions :column="4">
               <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
@@ -85,7 +86,7 @@
                 <span v-else>--</span>
               </a-descriptions-item>
               <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="附件" :span="4">
+              <a-descriptions-item label="附件" :span="3">
                 <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
                   <a
                     target="_blank"

+ 8 - 6
src/views/allocationManagement/transferOut/edit.vue

@@ -46,8 +46,9 @@
       <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont">
         <a-collapse :activeKey="['0']">
           <a-collapse-panel key="0" header="基础信息">
-            <a-descriptions :column="3">
+            <a-descriptions :column="4">
               <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
@@ -55,7 +56,7 @@
               <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
             </a-descriptions>
             <a-divider>以下信息可修改,请点击<span style="color: dodgerblue;font-size: 14px;cursor: pointer;" @click="editRemark = true" ><a-icon type="form" title="编辑基础信息" />编辑</span></a-divider>
-            <a-descriptions :column="3">
+            <a-descriptions :column="4">
               <a-descriptions-item label="费用类型">
                 {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
               </a-descriptions-item>
@@ -80,7 +81,7 @@
                 <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
                 <span v-else>--</span>
               </a-descriptions-item>
-              <a-descriptions-item label="备注">
+              <a-descriptions-item label="备注" :span="3">
                 {{ (basicInfoData&&basicInfoData.remark||'--') }}
               </a-descriptions-item>
               <a-descriptions-item label="附件" :span="4">
@@ -141,6 +142,7 @@
               :columns="columns"
               :customRow="handleClickRow"
               :data="loadData"
+              :defaultLoadData="false"
               :scroll="{ y: 300 }"
               bordered>
               <!-- 调出数量 -->
@@ -382,7 +384,8 @@ export default {
       loadData: parameter => {
         this.disabled = true
         const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
-        return queryStockProductPage(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel })).then(res => {
+        const warehouseSn = this.basicInfoData.warehouseSn
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel, warehouseSn: warehouseSn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -675,6 +678,7 @@ export default {
       allocateBillDetail({ sn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
+          this.resetSearchForm(0)
         } else {
           this.basicInfoData = null
         }
@@ -782,8 +786,6 @@ export default {
     pageInit () {
       this.getDepartmentList()
       this.getDetail()
-      // this.resetSearchForm(1)
-      // this.chooseResetSearchForm(1)
     }
   },
   mounted () {

+ 7 - 7
src/views/allocationManagement/transferOut/list.vue

@@ -45,14 +45,11 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="调出仓库">
-                  <v-select
+                  <warehouse
                     v-model="queryParam.warehouseSn"
-                    ref="printState"
                     id="allocateBillList-warehouseSn"
-                    code="PRINT_STATUS"
                     placeholder="请选择调出仓库"
-                    allowClear
-                  ></v-select>
+                  />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -199,6 +196,7 @@ import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import auditModal from '@/views/common/auditModal.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import { allocateBillList, allocateBillDel, allocateBillAudit, allocateBillExport, allocateBillAblePrint } from '@/api/allocateBill'
 import AllocateType from '@/views/common/allocateType.js'
@@ -207,7 +205,7 @@ import printModal from './printStatusModal.vue'
 export default {
   name: 'TransferOutList',
   mixins: [commonMixin],
-  components: { STable, VSelect, basicInfoModal, printModal, rangeDate, auditModal, AllocateType, dealerSearchList },
+  components: { STable, VSelect, basicInfoModal, printModal, rangeDate, auditModal, AllocateType, dealerSearchList, warehouse },
   data () {
     return {
       spinning: false,
@@ -229,7 +227,8 @@ export default {
         allocateNo: '', //  调拨单号
         receiverSn: undefined,
         checkStatus: undefined,
-        printState: undefined
+        printState: undefined,
+        warehouseSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -335,6 +334,7 @@ export default {
       this.queryParam.allocateNo = ''
       this.queryParam.receiverName = ''
       this.queryParam.receiverSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.allocateTypeVal = []
       this.$refs.receiverSn.resetForm()
       this.$refs.table.refresh(true)

+ 17 - 2
src/views/allocationManagement/transferReturn/basicInfoModal.vue

@@ -58,6 +58,13 @@
             allowClear
             placeholder="请选择"></v-select>
         </a-form-model-item>
+        <a-form-model-item label="调入仓库" :prop="form.grabFlag==0?'warehouseSn':null">
+          <warehouse
+            v-model="form.warehouseSn"
+            id="allocateBill-basicInfo-warehouseSn"
+            placeholder="请选择调入仓库"
+          />
+        </a-form-model-item>
         <a-form-model-item label="备注" prop="remark">
           <a-textarea id="allocateBill-basicInfo-remark" :maxLength="120" v-model="form.remarks" placeholder="请输入备注(最多120个字符)" allowClear />
         </a-form-model-item>
@@ -76,11 +83,12 @@ import debounce from 'lodash/debounce'
 import { VSelect } from '@/components'
 import { allocateReturnSave, allocateReturnQueryBySn } from '@/api/allocateReturn'
 import department from '@/views/expenseManagement/expenseReimbursement/department.js'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { dealerSubareaScopeList } from '@/api/dealer'
 import AllocateType from '@/views/common/allocateType.js'
 export default {
   name: 'TransferOutBasicInfoModal',
-  components: { VSelect, AllocateType, department },
+  components: { VSelect, AllocateType, department, warehouse },
   mixins: [commonMixin],
   props: {
     openModal: {
@@ -106,6 +114,7 @@ export default {
         costTypeSn: undefined,
         allocateSortSn: undefined,
         allocateReturnTypeSn: undefined,
+        warehouse: undefined,
         grabFlag: '1',
         remarks: ''
       },
@@ -114,7 +123,8 @@ export default {
         targetSn: [{ required: true, message: '请选择调往对象名称', trigger: 'change' }],
         targetName: [{ required: true, message: '请输入调往对象名称', trigger: 'blur' }],
         costTypeSn: [{ required: true, message: '请选择费用/调拨退货类型', trigger: 'change' }],
-        grabFlag: [{ required: true, message: '请选择是否抓单', trigger: 'change' }]
+        grabFlag: [{ required: true, message: '请选择是否抓单', trigger: 'change' }],
+        warehouseSn: [{ required: true, message: '请选择调入仓库', trigger: 'change' }]
       },
       fetching: false,
       dealerData: [] //  经销商  下拉数据
@@ -185,6 +195,10 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))
+          if(!form.warehouseSn){
+            _this.$message.error("请选择调入仓库")
+            return false
+          }
           _this.spinning = true
           allocateReturnSave(form).then(res => {
             if (res.status == 200) {
@@ -220,6 +234,7 @@ export default {
         costTypeSn: undefined,
         allocateTypeSn: undefined,
         allocateReturnTypeSn: undefined,
+        warehouse: undefined,
         grabFlag: '1',
         remarks: ''
       }

+ 1 - 0
src/views/allocationManagement/transferReturn/detail.vue

@@ -25,6 +25,7 @@
               <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调入仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="费用类型">
                 {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
               </a-descriptions-item>

+ 9 - 5
src/views/allocationManagement/transferReturn/edit.vue

@@ -19,6 +19,7 @@
               <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调入仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="费用/调拨退货类型">
                 <AllocateType
                   id="allocateEdit-allocateReturnTypeSn"
@@ -286,7 +287,8 @@ export default {
       loadData: parameter => {
         this.disabled = true
         const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
-        return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel })).then(res => {
+        const warehouseSn = this.basicInfoData.warehouseSn
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel, warehouseSn: warehouseSn})).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -362,7 +364,7 @@ export default {
       allocateReturnSave(params).then(res => {
         if (res.status == 200) {
           _this.$message.success(res.message)
-          _this.getDetail(true)
+          _this.getDetail(false)
         } else {
           _this.spinning = false
         }
@@ -390,7 +392,7 @@ export default {
           _this.handleEditRemark()
         },
         onCancel () {
-          _this.getDetail(true)
+          _this.getDetail(false)
         }
       })
     },
@@ -451,7 +453,7 @@ export default {
       this.spinning = true
       fun(params).then(res => {
         if (res.status == 200) {
-          this.getDetail(true)
+          this.getDetail(false)
           this.$message.success(res.message)
           if (isRefresh != 'noRefresh') {
             this.$refs.table.refresh()
@@ -524,6 +526,9 @@ export default {
           if (this.basicInfoData.costTypeSn) {
             this.allocateTypeVal = [this.basicInfoData.costTypeSn, this.basicInfoData.allocateSortSn, this.basicInfoData.allocateReturnTypeSn]
           }
+          if(flag){
+            this.$refs.table.refresh()
+          }
         } else {
           this.basicInfoData = null
         }
@@ -551,7 +556,6 @@ export default {
     // 刷新当前页面
     refashPage () {
       this.getDetail(true)
-      this.$refs.table.refresh()
       this.$refs.chooseTable.refresh()
     },
     pageInit () {

+ 7 - 2
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -19,6 +19,7 @@
               <a-descriptions-item label="调拨退货单号">{{ (basicInfoData&&basicInfoData.allocateReturnNo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调入仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="费用/调拨退货类型">
                 <AllocateType
                   id="allocateEdit-allocateReturnTypeSn"
@@ -194,7 +195,7 @@
           </a-collapse-panel>
         </a-collapse>
       </a-card>
-    <!-- </a-spin> -->
+    <!--</a-spin>-->
     </div>
     <div class="affix-cont">
       <a-button
@@ -275,7 +276,11 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        const otherParams = { allocateBill: { targetType: this.$route.params.targetType, targetSn: this.basicInfoData.targetSn, allocateNo: this.queryParam.allocateNo } }
+        const warehouseSn = this.basicInfoData.warehouseSn
+        const targetSn =  this.basicInfoData.targetSn
+        const targetType = this.$route.params.targetType
+        const allocateNo = this.queryParam.allocateNo
+        const otherParams = { allocateBill: { targetType: targetType , targetSn:targetSn, warehouseSn:warehouseSn, allocateNo: allocateNo } }
         return allocDetailQueryPageForReturn(Object.assign(parameter, this.queryParam, otherParams)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize

+ 22 - 18
src/views/allocationManagement/transferReturn/list.vue

@@ -20,12 +20,21 @@
                 <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="费用/调拨退货类型">
-                <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="费用/调拨退货类型">
+                  <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="调入仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="transferReturn-warehouseSn"
+                    placeholder="请选择调入仓库"
+                  />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select
@@ -137,8 +146,6 @@
 </template>
 
 <script>
-// import moment from 'moment'
-// import getDate from '@/libs/getDate.js'
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
@@ -146,24 +153,20 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import auditModal from '@/views/common/auditModal.vue'
 import { allocateReturnQueryPage, allocateReturnAudit, allocateReturnDelete, allocateReturnExport } from '@/api/allocateReturn'
 import AllocateType from '@/views/common/allocateType.js'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 export default {
   name: 'TransferReturnList',
   mixins: [commonMixin],
-  components: { STable, VSelect, basicInfoModal, rangeDate, auditModal, AllocateType },
+  components: { STable, VSelect, basicInfoModal, rangeDate, auditModal, AllocateType, warehouse },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
-      time: [
-        // moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
-        // moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
-      ],
+      time: [],
       allocateTypeVal: [],
       queryParam: { //  查询条件
-        // beginDate: getDate.getThreeMonthDays().starttime,
-        // endDate: getDate.getCurrMonthDays().endtime,
         beginDate: '',
         endDate: '',
         targetName: '', //  调往对象
@@ -171,6 +174,7 @@ export default {
         allocateSortSn: undefined, //  调拨类别
         allocateReturnTypeSn: undefined, // 调拨退货类型2
         state: undefined, //  业务状态
+        warehouseSn: undefined, 
         allocateReturnNo: '' //  调拨单号
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -207,7 +211,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨退货单号', scopedSlots: { customRender: 'allocateReturnNo' }, align: 'center', width: '8%' },
         { title: '调拨退货对象类型', dataIndex: 'targetTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨退货对象名称', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调拨退货对象名称', dataIndex: 'targetName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '费用类型', dataIndex: 'costTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨退货类型', scopedSlots: { customRender: 'allocateType' }, width: '6%', align: 'center' },
         { title: '是否抓单', dataIndex: 'grabFlagDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -215,8 +219,9 @@ export default {
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调入仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
       if(this.$hasPermissions('M_transferReturnList_salesPrice')){
         arr.splice(11,0,{ title: '退货总金额', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
@@ -239,8 +244,6 @@ export default {
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate('')
-      // this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
-      // this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.targetName = ''
@@ -249,6 +252,7 @@ export default {
       this.queryParam.costTypeSn = undefined
       this.queryParam.allocateSortSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.allocateTypeVal = []
       this.$refs.table.refresh(true)
     },

+ 26 - 13
src/views/allocationManagement/transfersPrint/list.vue

@@ -24,13 +24,13 @@
                   <a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收货客户名称">
+                  <dealerSearchList ref="receiverSn" @change="custChange"/>
+                </a-form-item>
+              </a-col>
               <template v-if="advanced">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="收货客户名称">
-                    <dealerSearchList ref="receiverSn" @change="custChange"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="4" :sm="24">
                   <a-form-item label="业务状态">
                     <v-select
                       v-model="queryParam.state"
@@ -42,12 +42,12 @@
                     ></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="调拨单号">
                     <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
                   </a-form-item>
                 </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="打印状态">
                     <v-select
                       v-model="queryParam.printState"
@@ -59,12 +59,21 @@
                     ></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
+                <a-form-item label="调出仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="allocateBillList-warehouseSn"
+                    placeholder="请选择调出仓库"
+                  />
+                </a-form-item>
+              </a-col>
+                <a-col :md="6" :sm="24">
                   <a-form-item label="所在区域">
                     <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="地区">
                     <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   </a-form-item>
@@ -176,6 +185,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import printModal from '@/views/allocationManagement/transferOut/printModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import recordModal from './recordModal.vue'
 import { allocateBillList, allocateBillDetailPrint, updatePrintState } from '@/api/allocateBill'
@@ -183,7 +193,7 @@ import { printFun } from '@/libs/JGPrint.js'
 export default {
   name: 'TransfersPrintList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, commonModal, allocationDetailModal },
+  components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, commonModal, allocationDetailModal, warehouse },
   data () {
     return {
       spinning: false,
@@ -206,6 +216,7 @@ export default {
         allocateNo: '', //  调拨单号
         receiverSn: undefined,
         checkStatus: undefined,
+        warehouseSn: undefined,
         printState: 'NO_PRINT',
         subareaArea:{
           subareaSn: undefined,
@@ -246,15 +257,16 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '发货说明', dataIndex: 'explainInfo', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印状态', scopedSlots: { customRender: 'printStatus' }, width: '6%', align: 'center' },
         { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -305,6 +317,7 @@ export default {
       this.queryParam.allocateNo = ''
       this.queryParam.receiverName = ''
       this.queryParam.receiverSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined

+ 3 - 0
src/views/allocationManagement/transfersPrint/recordModal.vue

@@ -21,6 +21,9 @@
           <a-descriptions-item label="调往对象">
             {{ tipData&&tipData.targetName }}
           </a-descriptions-item>
+          <a-descriptions-item label="调出仓库">
+            {{ tipData&&tipData.warehouseName }}
+          </a-descriptions-item>
           <a-descriptions-item label="收货客户名称">
             {{ tipData&&tipData.receiverName }}
           </a-descriptions-item>

+ 1 - 1
src/views/common/chooseWarehouse.js

@@ -16,7 +16,7 @@ const warehouse = {
     `,
   props: {
     value: {
-      type: String,
+      type: [String,Array],
       defatut: ''
     },
     id: {

+ 16 - 1
src/views/inventoryManagement/inventoryCheck/addModal.vue

@@ -15,6 +15,13 @@
           <h3>全盘盘点</h3>
           <p>全盘是指所有有过入库记录的产品都参与盘点</p>
           <p>确定创建新的盘点单吗?</p>
+          <p>仓库:<warehouse
+                    style="width:200px;"
+                    v-model="form.warehouseSn"
+                    id="inventoryCheckAddModal-warehouseSn"
+                    placeholder="请选择仓库"
+                  />
+          </p>
         </div>
         <div class="btn-cont">
           <a-button type="primary" id="inventoryCheckAddModal-save" @click="handleSave">确定</a-button>
@@ -27,8 +34,10 @@
 
 <script>
 import { checkWarehouseSave } from '@/api/checkWarehouse'
+import warehouse from '@/views/common/chooseWarehouse.js'
 export default {
   name: 'ProductInfoDetailModal',
+  components:{warehouse},
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -38,14 +47,19 @@ export default {
   data () {
     return {
       spinning: false,
+      form:{warehouseSn:undefined},
       isShow: this.openModal //  是否打开弹框
     }
   },
   methods: {
     // 确定
     handleSave () {
+      if(!this.form.warehouseSn){
+        this.$message.error('请选择仓库')
+        return
+      }
       this.spinning = true
-      checkWarehouseSave({}).then(res => {
+      checkWarehouseSave(this.form).then(res => {
         this.spinning = false
         if (res.status == 200) {
           this.$message.success('盘点单新增成功')
@@ -63,6 +77,7 @@ export default {
     //  重定义的弹框状态
     isShow (newValue, oldValue) {
       if (!newValue) {
+        this.form.warehouseSn = undefined
         this.$emit('close')
       }
     }

+ 2 - 1
src/views/inventoryManagement/inventoryCheck/detail.vue

@@ -13,10 +13,11 @@
       <a-card size="small" :bordered="false" class="inventoryCheckDetail-cont">
         <a-collapse>
           <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="3">
+            <a-descriptions :column="4">
               <a-descriptions-item label="创建人">{{ (detail&&detail.creatorName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="创建时间">{{ (detail&&detail.createDate) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点类型">{{ (detail&&detail.checkTypeDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="仓库">{{ (detail&&detail.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点状态">{{ (detail&&detail.checkStateDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点人">{{ (detail&&detail.checkPersonName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="盘点时间">{{ (detail&&detail.checkTime) || '--' }}</a-descriptions-item>

+ 22 - 9
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -16,7 +16,16 @@
                 <a-input id="inventoryCheckList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="仓库">
+                <warehouse
+                  v-model="queryParam.warehouseSn"
+                  id="inventoryCheckList-warehouseSn"
+                  placeholder="请选择仓库"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
               <a-form-item label="盘点状态">
                 <v-select
                   v-model="queryParam.checkState"
@@ -28,7 +37,7 @@
                 ></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="监盘状态">
                 <v-select
                   v-model="queryParam.checkSuperviseState"
@@ -94,11 +103,12 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import inventoryCheckAddModal from './addModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { checkWarehouseList, checkWarehouseStartCheck } from '@/api/checkWarehouse'
 export default {
   name: 'InventoryCheckList',
   mixins: [commonMixin],
-  components: { STable, VSelect, inventoryCheckAddModal, commonModal },
+  components: { STable, VSelect, inventoryCheckAddModal, commonModal, warehouse },
   data () {
     return {
       spinning: false,
@@ -107,6 +117,7 @@ export default {
         deleteFlag: this.$route.params.type,
         checkWarehouseNo: '',
         checkState: undefined,
+        warehouseSn: undefined,
         checkSuperviseState: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -145,12 +156,13 @@ export default {
       if (this.queryParam.deleteFlag == '0') { // 正常
         arr = [
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-          { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '14%', align: 'center' },
+          { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '10%', align: 'center' },
+          { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '盘点状态', dataIndex: 'checkStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '监盘状态', dataIndex: 'checkSuperviseStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
+          { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '盘点提交时间', dataIndex: 'checkTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
+          { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '监盘提交时间', dataIndex: 'checkSuperviseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '财务确认时间', dataIndex: 'financeAuditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '盘点单创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -159,12 +171,13 @@ export default {
       } else if (this.queryParam.deleteFlag == '1') { // 已作废
         arr = [
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-          { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '14%', align: 'center' },
+          { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '10%', align: 'center' },
+          { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '盘点状态', dataIndex: 'checkStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '监盘状态', dataIndex: 'checkSuperviseStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
+          { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '盘点提交时间', dataIndex: 'checkTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
+          { title: '监盘人', dataIndex: 'checkSupervisePersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '监盘提交时间', dataIndex: 'checkSuperviseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '盘点单创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '盘点单作废时间', dataIndex: 'deleteTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 19 - 6
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -32,6 +32,15 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
+                <a-form-item label="仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="inventoryQueryList-warehouseSn"
+                    placeholder="请选择仓库"
+                  />
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
                 <a-form-item label="库存情况">
                   <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
                 </a-form-item>
@@ -111,11 +120,12 @@ import exportExcelModal from './exportExcelModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { stockList, stockCount, stockExport } from '@/api/stock'
 export default {
   name: 'InventoryQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, inventoryQueryDetailModal, exportExcelModal, ProductType, ProductBrand },
+  components: { STable, VSelect, inventoryQueryDetailModal, exportExcelModal, ProductType, ProductBrand, warehouse },
   data () {
     return {
       spinning: false,
@@ -126,6 +136,7 @@ export default {
         productName: '', //  产品名称
         productOrigCode: '', //  原厂编码
         productBrandSn: undefined, //  产品品牌
+        warehouseSn: undefined, // 仓库
         productTypeSn1: '', //  产品分类1
         productTypeSn2: '', //  产品分类2
         productTypeSn3: '', //  产品分类3
@@ -187,14 +198,15 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '货位编号', dataIndex: 'stackPlaceEntity.stackPlaceCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '最后入库时间', dataIndex: 'lastStockTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '最后入库时间', dataIndex: 'lastStockTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '可用库存数量', dataIndex: 'currentStockQty', width: '10%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
+        { title: '产品品牌', dataIndex: 'productBrandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '可用库存数量', dataIndex: 'currentStockQty', width: '8%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('M_inventoryQueryList_costPrice')) { // 成本价权限
-        arr.splice(7, 0, { title: '可用库存成本', dataIndex: 'currentStockCost', width: '10%', align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '可用库存成本', dataIndex: 'currentStockCost', width: '8%', align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -209,6 +221,7 @@ export default {
       this.queryParam.productCode = ''
       this.queryParam.productOrigCode = ''
       this.queryParam.productName = ''
+      this.queryParam.warehouseSn = undefined
       this.queryParam.zeroQtyFlag = false
       this.productType = []
       this.$refs.table.refresh(true)

+ 20 - 8
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -31,6 +31,15 @@
                   <ProductType id="inventoryWarningList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+              <a-form-item label="仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="inventoryWarningList-warehouseSn"
+                    placeholder="请选择仓库"
+                  />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="预警提示">
                   <v-select
@@ -158,10 +167,11 @@ import { STable, VSelect } from '@/components'
 import { stockWarnList, stockWarnSaveBatch } from '@/api/stock'
 import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
+import warehouse from '@/views/common/chooseWarehouse.js'
 export default {
   name: 'InventoryWarningList',
   mixins: [commonMixin],
-  components: { STable, VSelect, ProductBrand, ProductType },
+  components: { STable, VSelect, ProductBrand, ProductType, warehouse },
   data () {
     return {
       spinning: false,
@@ -175,7 +185,8 @@ export default {
         productTypeSn1: undefined,
         productTypeSn2: undefined,
         productTypeSn3: undefined,
-        stockState: undefined
+        stockState: undefined,
+        warehouseSn: undefined
       },
       exportLoading: false, // 导出loading
       disabled: false, //  查询、重置按钮是否可操作
@@ -183,15 +194,15 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '12.5%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '12%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '10%', align: 'center' },
-        // { title: '实时库存数(个)', scopedSlots: { customRender: 'stockQty' }, width: 110, align: 'center' },
-        { title: '在途数(个)', scopedSlots: { customRender: 'inTransit' }, width: '9.5%', align: 'center' },
-        { title: '总库存数(个)', dataIndex: 'currentStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '最大库存数(个)', scopedSlots: { customRender: 'upperLimit' }, width: '9.5%', align: 'center' },
-        { title: '最小库存数(个)', scopedSlots: { customRender: 'lowerLimit' }, width: '9.5%', align: 'center' },
+        { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '在途数(个)', scopedSlots: { customRender: 'inTransit' }, width: '6%', align: 'center' },
+        { title: '总库存数(个)', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '最大库存数(个)', scopedSlots: { customRender: 'upperLimit' }, width: '6%', align: 'center' },
+        { title: '最小库存数(个)', scopedSlots: { customRender: 'lowerLimit' }, width: '6%', align: 'center' },
         { title: '差异数量', dataIndex: 'differenceNum', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '预警提示', scopedSlots: { customRender: 'stockState' }, width: '6%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
@@ -308,6 +319,7 @@ export default {
       this.queryParam.productTypeSn2 = undefined
       this.queryParam.productTypeSn3 = undefined
       this.queryParam.stockState = undefined
+      this.queryParam.warehouseSn = undefined
       this.productType = []
       this.$refs.table.refresh(true)
     },

+ 21 - 8
src/views/inventoryManagement/makeInventory/list.vue

@@ -10,6 +10,15 @@
                 <a-input id="makeInventoryList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="仓库">
+                <warehouse
+                  v-model="queryParam.warehouseSn"
+                  id="inventoryCheckList-warehouseSn"
+                  placeholder="请选择仓库"
+                />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="makeInventoryList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="makeInventoryList-reset">重置</a-button>
@@ -48,11 +57,12 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { checkWarehouseList } from '@/api/checkWarehouse'
 export default {
   name: 'MakeInventoryList',
   mixins: [commonMixin],
-  components: { STable, VSelect },
+  components: { STable, VSelect, warehouse },
   data () {
     return {
       spinning: false,
@@ -60,17 +70,19 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       queryParam: { //  查询条件
         deleteFlag: '0',
+        warehouseSn: undefined,
         checkWarehouseNo: ''
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '18%', align: 'center' },
-        { title: '盘点状态', dataIndex: 'checkStateDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'productTotalCategory', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存数量', dataIndex: 'totalStockQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点数量', dataIndex: 'checkTotalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点盈亏数量', dataIndex: 'totalProfitLossQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点单创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '12%', align: 'center' },
+        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '盘点状态', dataIndex: 'checkStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品款数', dataIndex: 'productTotalCategory', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存数量', dataIndex: 'totalStockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点数量', dataIndex: 'checkTotalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点盈亏数量', dataIndex: 'totalProfitLossQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点单创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -99,6 +111,7 @@ export default {
       this.$router.push({ path: `/inventoryManagement/makeInventory/check/${row.checkWarehouseSn}` })
     },
     resetSearchForm () {
+      this.queryParam.warehouseSn = undefined
       this.queryParam.checkWarehouseNo = ''
       this.$refs.table.refresh(true)
     },

+ 24 - 11
src/views/inventoryManagement/supervisionDisk/list.vue

@@ -10,6 +10,15 @@
                 <a-input id="supervisionDiskList-checkWarehouseNo" v-model.trim="queryParam.checkWarehouseNo" allowClear placeholder="请输入盘点单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="仓库">
+                <warehouse
+                  v-model="queryParam.warehouseSn"
+                  id="supervisionDiskList-warehouseSn"
+                  placeholder="请选择仓库"
+                />
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supervisionDiskList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="supervisionDiskList-reset">重置</a-button>
@@ -48,11 +57,12 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { checkWarehouseList } from '@/api/checkWarehouse'
 export default {
   name: 'SupervisionDiskList',
   mixins: [commonMixin],
-  components: { STable, VSelect },
+  components: { STable, VSelect, warehouse },
   data () {
     return {
       spinning: false,
@@ -60,21 +70,23 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       queryParam: { //  查询条件
         deleteFlag: '0',
+        warehouseSn: undefined,
         checkWarehouseNo: ''
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '15%', align: 'center' },
-        { title: '盘点状态', dataIndex: 'checkStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '盘点时间', dataIndex: 'checkTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '监盘状态', dataIndex: 'checkSuperviseStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'productTotalCategory', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存数量', dataIndex: 'totalStockQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘点数量', dataIndex: 'checkTotalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '监盘数量', dataIndex: 'checkSuperviseTotalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '10%', align: 'center' },
+        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '盘点状态', dataIndex: 'checkStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '盘点人', dataIndex: 'checkPersonName', align: 'center', width: '8%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '盘点时间', dataIndex: 'checkTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '监盘状态', dataIndex: 'checkSuperviseStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品款数', dataIndex: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存数量', dataIndex: 'totalStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点数量', dataIndex: 'checkTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '监盘数量', dataIndex: 'checkSuperviseTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '监盘盈亏数量', dataIndex: 'totalProfitLossQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -102,6 +114,7 @@ export default {
       this.$router.push({ path: `/inventoryManagement/supervisionDisk/check/${row.checkWarehouseSn}` })
     },
     resetSearchForm () {
+      this.queryParam.warehouseSn = undefined
       this.queryParam.checkWarehouseNo = ''
       this.$refs.table.refresh(true)
     },

+ 12 - 2
src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -28,6 +28,13 @@
             placeholder="请选择入库类型"
             allowClear></v-select>
         </a-form-model-item>
+        <a-form-model-item label="入库仓库" prop="warehouseSn">
+          <warehouse
+            v-model="form.warehouseSn"
+            id="bulkWarehousingOrder-basicInfo-warehouseSn"
+            placeholder="请选择入库仓库"
+          />
+        </a-form-model-item>
         <a-form-model-item label="关联单号" prop="relationNo">
           <a-input
             id="bulkWarehousingOrder-relationNo"
@@ -57,11 +64,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import { sparePartsSave } from '@/api/spareParts'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import supplier from '@/views/common/supplier.js'
 export default {
   name: 'BulkWarehousingOrderBasicInfoModal',
   mixins: [commonMixin],
-  components: { VSelect, supplier },
+  components: { VSelect, supplier, warehouse },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -79,6 +87,7 @@ export default {
       form: {
         supplierSn: undefined, // 供应商
         sparePartsType: undefined, //  散件类型
+        warehouseSn: undefined, // 仓库
         relationNo: '', //  关联单号
         remark: '' // 备注
       },
@@ -88,7 +97,8 @@ export default {
         ],
         sparePartsType: [
           { required: true, message: '请选择入库类型', trigger: 'change' }
-        ]
+        ],
+        warehouseSn: [{ required: true, message: '请选择入库仓库', trigger: 'change' }],
       },
       supplierList: [] //  供应商  下拉数据
     }

+ 1 - 0
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -22,6 +22,7 @@
           <a-descriptions :column="3">
             <a-descriptions-item label="供应商">{{ (productTotal&&productTotal.supplierName) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="入库类型">{{ (productTotal&&productTotal.sparePartsTypeDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="入库仓库">{{ (productTotal&&productTotal.warehouseName) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="入库单号">{{ (productTotal&&productTotal.sparePartsNo) || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>

+ 1 - 0
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -18,6 +18,7 @@
             <a-descriptions :column="3">
               <a-descriptions-item label="供应商">{{ (productTotal&&productTotal.supplierName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="入库类型">{{ (productTotal&&productTotal.sparePartsTypeDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="入库仓库">{{ (productTotal&&productTotal.warehouseName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="入库单号">{{ (productTotal&&productTotal.sparePartsNo) || '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>

+ 19 - 6
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -41,6 +41,15 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="4" :sm="24">
+                <a-form-item label="入库仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="salesReturn-warehouseSn"
+                    placeholder="请选择退货仓库"
+                  />
+                </a-form-item>
+              </a-col>
             <a-col :md="4" :sm="24">
               <a-form-item label="状态">
                 <v-select
@@ -148,6 +157,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import sparePartsDetailModal from './detailModal.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import auditNoPassModal from './auditNoPassModal.vue'
@@ -157,7 +167,7 @@ import { sparePartsList, sparePartsDelete, sparePartsAudit, sparePartsAuditVerif
 export default {
   name: 'BulkWarehousingOrderList',
   mixins: [commonMixin],
-  components: { STable, VSelect, basicInfoModal, sparePartsDetailModal, reportModal, auditNoPassModal, batchAuditNoModal },
+  components: { STable, VSelect, basicInfoModal, sparePartsDetailModal, reportModal, auditNoPassModal, batchAuditNoModal, warehouse },
   data () {
     return {
       spinning: false,
@@ -174,6 +184,7 @@ export default {
         relationNo: '',
         state: undefined,
         sparePartsType: undefined,
+        warehouseSn: undefined,
         sparePartsNo: '',
         supplierName: '',
         kingdeeNo: ''
@@ -206,15 +217,16 @@ export default {
 	  columns () {
 	    const arr = [
 	      { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-	      { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '15%', align: 'center' },
-	      { title: '商户名称', dataIndex: 'supplierName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
+	      { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '10%', align: 'center' },
+	      { title: '商户名称', dataIndex: 'supplierName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
 	      { title: '入库数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
 	      // { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
 	      { title: '入库类型', dataIndex: 'sparePartsTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-	      { title: '关联单号', dataIndex: 'relationNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-	      { title: '金蝶单号', dataIndex: 'kingdeeNo', width: '12.5%', align: 'center', customRender: function (text) { return text || '--' } },
+	      { title: '入库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'relationNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+	      { title: '金蝶单号', dataIndex: 'kingdeeNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
 	      { title: '状态', dataIndex: 'stateDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-	      { title: '备注', dataIndex: 'remark', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+	      { title: '备注', dataIndex: 'remark', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
 	      { title: '操作', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }
 	    ]
 	    if (this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')) { //  成本价权限
@@ -292,6 +304,7 @@ export default {
         relationNo: '',
         state: undefined,
         sparePartsType: undefined,
+        warehouseSn: undefined, // 仓库
         sparePartsNo: '',
         supplierName: '',
         kingdeeNo: ''

+ 13 - 2
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -28,6 +28,13 @@
             placeholder="请选择退货原因"
             allowClear></v-select>
         </a-form-model-item>
+        <a-form-model-item label="退货仓库" prop="warehouseSn">
+          <warehouse
+            v-model="form.warehouseSn"
+            id="purchaseReturn-basicInfo-warehouseSn"
+            placeholder="请选择退货仓库"
+          />
+        </a-form-model-item>
         <a-form-model-item label="补充说明" prop="explainInfo">
           <a-textarea
             id="purchaseReturn"
@@ -63,11 +70,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { VSelect, Upload } from '@/components'
 import supplier from '@/views/common/supplier.js'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { sparePartsReturnSave, sparePartsReturnInfo } from '@/api/sparePartsReturn'
 export default {
   name: 'PurchaseReturnBasicInfoModal',
   mixins: [commonMixin],
-  components: { VSelect, Upload, supplier },
+  components: { VSelect, Upload, supplier, warehouse },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -90,6 +98,7 @@ export default {
         supplierSn: undefined, // 供应商
         returnReason: '', // 退货原因
         explainInfo: '', // 补充说明
+        warehouseSn: undefined,
         attachmentList: ''
       },
       attachList: [], // 附件
@@ -99,7 +108,8 @@ export default {
         ],
         returnReason: [
           { required: true, message: '请选择退货原因', trigger: 'change' }
-        ]
+        ],
+        warehouseSn: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
       },
       attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo'
     }
@@ -147,6 +157,7 @@ export default {
             supplierSn: resultObj.supplierSn,
             returnReason: resultObj.returnReason, // 退货原因
             explainInfo: resultObj.explainInfo, // 补充说明
+            warehouseSn: resultObj.warehouseSn,
             sparePartsReturnSn: this.itemSn
           }
           this.$nextTick(() => {

+ 1 - 0
src/views/purchasingManagement/purchaseReturn/detailModal.vue

@@ -13,6 +13,7 @@
         <a-descriptions-item label="采购退货单号">{{ detailsData&&detailsData.sparePartsReturnNo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="供应商名称">{{ detailsData&&detailsData.supplier&&detailsData.supplier.supplierName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="退货原因">{{ detailsData&&detailsData.returnReasonDictValue || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="创建时间">{{ detailsData&&detailsData.createDate || '--' }}</a-descriptions-item>
         <a-descriptions-item label="出库时间" v-if="detailsData&&detailsData.state!='AUDIT_REJECT'">{{ detailsData&&detailsData.auditDate || '--' }}</a-descriptions-item>
         <a-descriptions-item label="出库时间" v-else>--</a-descriptions-item>

+ 21 - 8
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -31,6 +31,15 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+                <a-form-item label="退货仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="purchaseReturn-warehouseSn"
+                    placeholder="请选择退货仓库"
+                  />
+                </a-form-item>
+              </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="业务状态">
                 <v-select
@@ -152,11 +161,12 @@ import reviewProgressModal from './reviewProgressModal.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 import supplier from '@/views/common/supplier.js'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { sparePartsReturnList, sparePartsReturnDelete, sparePartsReturnExportDetail, againSubmit } from '@/api/sparePartsReturn'
 export default {
   name: 'PurchaseReturnList',
   mixins: [commonMixin],
-  components: { STable, supplier, VSelect, reportModal, detailModal, addModal, chooseDepartUserModal, rangeDate, reviewProgressModal },
+  components: { STable, supplier, VSelect, reportModal, detailModal, addModal, chooseDepartUserModal, rangeDate, reviewProgressModal, warehouse },
   data () {
     return {
       spinning: false,
@@ -174,6 +184,7 @@ export default {
         sparePartsReturnNo: undefined,
         supplierSn: undefined,
         returnReason: undefined,
+        warehouseSn: undefined, // 仓库
         state: undefined
       },
       // 加载数据方法 必须为 Promise 对象
@@ -204,17 +215,18 @@ export default {
       let _this=this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采购退货单号', scopedSlots: { customRender: 'sparePartsReturnNo' }, width: '15%', align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplier.supplierName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '退货原因', dataIndex: 'returnReasonDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购退货单号', scopedSlots: { customRender: 'sparePartsReturnNo' }, width: '9%', align: 'center' },
+        { title: '供应商名称', dataIndex: 'supplier.supplierName', align: 'center', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货原因', dataIndex: 'returnReasonDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', dataIndex: 'totalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('M_purchaseReturnList_costPrice')) { //  售价权限
-        arr.splice(6, 0, { title: '退货金额', dataIndex: 'totalCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(7, 0, { title: '退货金额', dataIndex: 'totalCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
       return arr
     }
@@ -322,6 +334,7 @@ export default {
         sparePartsReturnNo: undefined,
         supplierSn: undefined,
         returnReason: undefined,
+        warehouseSn: undefined, // 仓库
         state: undefined
       }
       this.$refs.rangeDate.resetDate()

+ 3 - 2
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -17,11 +17,12 @@
               <a-icon type="edit" />
               编辑基础信息
             </div>
-            <a-descriptions size="small" :column="3" style="margin-bottom: 10px;">
+            <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
               <a-descriptions-item label="采购退货单号">{{ (detailsData && detailsData.sparePartsReturnNo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="供应商名称">{{ (detailsData && detailsData.supplier && detailsData.supplier.supplierName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="退货原因">{{ (detailsData && detailsData.returnReasonDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="补充说明" :span="3">{{ (detailsData && detailsData.explainInfo) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="补充说明">{{ (detailsData && detailsData.explainInfo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="附件" :span="3">
                 <span v-if="detailsData && detailsData.attachmentList && detailsData.attachmentList.length > 0">
                   <a

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

@@ -50,6 +50,17 @@
             </a-form-model-item>
           </a-col>
         </a-row>
+        <a-row :gutter="15">
+          <a-col :span="20">
+          <a-form-model-item label="退货仓库" prop="warehouseSn">
+              <warehouse
+                v-model="form.warehouseSn"
+                id="chooseCustom-basicInfo-warehouseSn"
+                placeholder="请选择退货仓库"
+              />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
           <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
           <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
@@ -62,12 +73,13 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { dealerSubareaScopeList, dealerDetailBySn } from '@/api/dealer'
 import { salesReturnInsert } from '@/api/salesReturn'
 export default {
   name: 'SalesReturnChooseCustomModal',
   mixins: [commonMixin],
-  components: { VSelect },
+  components: { VSelect, warehouse },
   props: {
     show: [Boolean]
   },
@@ -94,10 +106,12 @@ export default {
         countySn: '', // 区
         countyName: '',
         customerAddr: '', //  详细地址
+        warehouseSn: undefined, // 退货仓库
         syncFlag: undefined // 是否同步
       },
       rules: {
         buyerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
+        warehouseSn: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
         syncFlag: [{ required: true, message: '请选择是否同步', trigger: ['change', 'blur'] }]
       },
       fetching: false,
@@ -189,6 +203,7 @@ export default {
         countySn: '', // 区
         countyName: '',
         customerAddr: '', //  详细地址
+        warehouseSn: undefined, 
         syncFlag: undefined // 是否同步
       }
       this.$refs.ruleForm.resetFields()

+ 2 - 1
src/views/salesReturnManagement/salesReturn/detail.vue

@@ -41,9 +41,10 @@
       <a-card size="small" :bordered="false" class="salesReturnDetail-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions size="small" :column="3">
+            <a-descriptions size="small" :column="4">
               <a-descriptions-item label="单据来源">{{ detailData&&detailData.salesReturnBillSourceDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="销售退货单号">{{ detailData&&detailData.salesReturnBillNo || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货仓库">{{ detailData&&detailData.warehouseName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="客户采退申请单号">{{ detailData&&detailData.purchaseReturnApplyNo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="是否同步给客户">{{ detailData&&detailData.syncFlag ? ['否', '是'][detailData.syncFlag] : '--' }}</a-descriptions-item>

+ 19 - 5
src/views/salesReturnManagement/salesReturn/list.vue

@@ -31,6 +31,15 @@
                   <a-input id="salesReturn-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入客户采退申请单号"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="退货仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="salesReturn-warehouseSn"
+                    placeholder="请选择退货仓库"
+                  />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据来源">
                   <v-select
@@ -206,6 +215,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import verifyModal from './verifyModal.vue'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import { salesReturnList, salesReturnQueryCount, salesReturnDel, salesReturnSubmit } from '@/api/salesReturn'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
@@ -221,7 +231,8 @@ export default {
     verifyModal,
     chooseDepartUserModal,
     Area,
-    subarea
+    subarea,
+    warehouse
   },
   data () {
     return {
@@ -247,6 +258,7 @@ export default {
         purchaseReturnApplyNo: '',
         syncFlag: undefined, // 是否同步给客户
         billStatus: undefined, // 业务状态
+        warehouseSn: undefined, // 仓库
         subareaArea:{
           subareaSn: undefined,
           subareaAreaSn: undefined
@@ -287,10 +299,11 @@ export default {
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: '5%', 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: 'purchaseReturnApplyNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '8%', align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { 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: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -298,10 +311,10 @@ export default {
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '提货单', dataIndex: 'pickUpSalesReturnNum', scopedSlots: { customRender: 'pickUpSalesReturnNum' }, width: '4%', align: 'center' },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if(this.$hasPermissions('M_salesReturnList_salesPrice')){
-        arr.splice(12,0,{ title: '实际退货金额', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(13,0,{ title: '实际退货金额', dataIndex: 'totalAmount', width: '5%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }
@@ -414,6 +427,7 @@ export default {
       this.queryParam.syncFlag = undefined
       this.queryParam.salesReturnBillSource = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
+      this.queryParam.warehouseSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

+ 11 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -6,6 +6,14 @@
         <template slot="subTitle">
           <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
+          <span style="margin: 0 15px;color: #666;" v-if="ordeDetail">
+            退货仓库:<warehouse
+               style="width:200px;"
+                v-model="ordeDetail.warehouseSn"
+                id="basicInfo-warehouseSn"
+                placeholder="请选择退货仓库"
+              />
+          </span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -155,6 +163,7 @@ import queryPart from './queryPart.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import EditableCell from '@/views/common/editInput.js'
 import chooseDepartUserModal from './chooseDepartUserModal.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
 import returnReason from '@/views/common/returnReason'
 import {
   salesReturnDetail,
@@ -182,7 +191,8 @@ export default {
     ImportGuideModal,
     chooseDepartUserModal,
     returnReason,
-    commonModal
+    commonModal,
+    warehouse
   },
   data () {
     return {