浏览代码

销售管理

chenrui 2 年之前
父节点
当前提交
343b206030

+ 19 - 4
src/views/basicData/warehouse/editModal.vue

@@ -44,6 +44,16 @@
               placeholder="请输入详细地址"
               allowClear />
           </a-form-model-item>
+          <a-form-model-item label="仓库类型" prop="warehouseType">
+            <v-select
+              v-model="form.warehouseType"
+              ref="state"
+              id="allocateBillList-state"
+              code="WAREHOUSE_TYPE"
+              placeholder="请选择仓库类型"
+              allowClear
+            ></v-select>
+          </a-form-model-item>
           <a-form-model-item label="ERP仓库编码" prop="erpWarehouseCode">
             <a-input
               id="warehouseEdit-code"
@@ -63,13 +73,13 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { STable } from '@/components'
+import { STable, VSelect } from '@/components'
 import { warehouseSave } from '@/api/warehouse'
 import AreaList from '@/views/common/areaList.js'
 export default {
   name: 'WarehouseEditModal',
   mixins: [commonMixin],
-  components: { STable, AreaList },
+  components: { STable, AreaList, VSelect },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -107,7 +117,8 @@ export default {
         cityName: undefined,
         districtSn: undefined,
         districtName: undefined,
-        erpWarehouseCode: undefined// ERP仓库编码
+        erpWarehouseCode: undefined, // ERP仓库编码
+        warehouseType: undefined
       },
       rules: {
         name: [
@@ -121,6 +132,9 @@ export default {
         ],
         erpWarehouseCode: [
           { required: true, message: '请输入ERP仓库编码', trigger: 'blur' }
+        ],
+        warehouseType: [
+          { required: true, message: '请选择仓库类型', trigger: 'change' }
         ]
       }
     }
@@ -211,7 +225,8 @@ export default {
           cityName: undefined,
           districtSn: undefined,
           districtName: undefined,
-          erpWarehouseCode: undefined// ERP仓库编码
+          erpWarehouseCode: undefined, // ERP仓库编码
+          warehouseType: undefined
         }
       }
     },

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

@@ -542,9 +542,6 @@ export default {
     }
   },
   methods: {
-    handleWarehouse (val) {
-
-    },
     bankAccountChange (e) {
       const { value } = e.target
       console.log(value, value.replace(/\s*/g, ''))

+ 4 - 5
src/views/salesManagement/backorder/list.vue

@@ -76,7 +76,8 @@ export default {
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',
-        buyerSn: undefined
+        buyerSn: undefined,
+        warehouseSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
@@ -108,7 +109,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓库', dataIndex: 'warehouse', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '缺货款数', dataIndex: 'totalCategory', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '缺货数量', dataIndex: 'totalQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -121,9 +122,6 @@ export default {
     }
   },
   methods: {
-    handleWarehouse (val) {
-
-    },
     //  时间  change
     dateChange (date) {
       this.queryParam.beginDate = date[0]
@@ -138,6 +136,7 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.buyerSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.$refs.custList.resetForm()
       this.$refs.table.refresh(true)
     },

+ 5 - 8
src/views/salesManagement/examineVerify/list.vue

@@ -199,7 +199,8 @@ export default {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
-        shippingAddrProvinceSn: undefined
+        shippingAddrProvinceSn: undefined,
+        warehouseSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       selectedRowKeys: [], // Check here to configure the default column
@@ -263,16 +264,12 @@ export default {
       }
       // 仓库管理权限设置是否显示 (当客户有且只有一条仓库管理权限时,不显示仓库信息)
       if (this.isShowWarehouse) {
-        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouse', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }
   },
   methods: {
-    // 选择仓库
-    handleWarehouse (val) {
-
-    },
     custChange (val) {
       this.queryParam.buyerSn = val.key
     },
@@ -293,13 +290,13 @@ export default {
       this.queryParam.buyerSn = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.salesBillNo = ''
-      this.queryParam.dispatchBillNo = '' // 备货单号
+      this.queryParam.dispatchBillNo = '备货单号'
       this.queryParam.stockOutNo = '' // 出库单号
       this.queryParam.billStatus = undefined
       this.queryParam.printStatus = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
-      this.queryParam.shippingAddrProvinceSn = undefined
+      this.queryParam.warehouseSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

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

@@ -193,7 +193,8 @@ export default {
         },
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
-        checkStatus: undefined
+        checkStatus: undefined,
+        warehouseSn: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -227,7 +228,7 @@ export default {
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '仓库', dataIndex: 'warehouse', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '仓库', dataIndex: 'warehouseName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -243,7 +244,7 @@ export default {
         arr.splice(9, 0, { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       if (this.isShowWarehouse) {
-        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouse', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }
@@ -263,10 +264,6 @@ export default {
     },
     shcustChange (val) {
       this.queryParam.receiverSn = val.key
-    },
-    // 选择仓库
-    handleWarehouse (val) {
-
     },
     // 详情
     handleDetail (row, type) {
@@ -328,7 +325,8 @@ export default {
         },
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
-        checkStatus: undefined
+        checkStatus: undefined,
+        warehouseSn: undefined
       }
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 5 - 7
src/views/salesManagement/outboundOrder/list.vue

@@ -214,7 +214,8 @@ export default {
           subareaAreaSn: undefined
         },
         shippingAddrProvinceSn: undefined,
-        sendFlag: undefined
+        sendFlag: undefined,
+        warehouseSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       loading: false,
@@ -255,7 +256,7 @@ export default {
         { title: '业务单号', dataIndex: 'outBizNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'demanderName', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'productTotalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '出库时间', dataIndex: 'outTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -267,7 +268,7 @@ export default {
         arr.splice(7, 0, { title: '售价', dataIndex: 'productTotalPrice', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       if (this.isShowWarehouse) {
-        arr.splice(6, 0, { title: '仓库', dataIndex: 'warehouse', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(6, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }
@@ -286,10 +287,6 @@ export default {
         state = true
       }
       return state
-    },
-    // 选择仓库
-    handleWarehouse (val) {
-
     },
     //  时间  change
     dateChange (date) {
@@ -318,6 +315,7 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.sendFlag = undefined
+      this.queryParam.warehouseSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

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

@@ -86,7 +86,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库">
+                <a-form-model-item label="出库仓库">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
@@ -235,7 +235,8 @@ export default {
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         printStatus: undefined,
-        checkStatus: undefined
+        checkStatus: undefined,
+        warehouseSn: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -279,7 +280,7 @@ export default {
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -324,9 +325,6 @@ export default {
     closeDetailModal () {
       this.showDetailModal = false
       this.$store.state.app.curActionPermission = ''
-    },
-    handleWarehouse (val) {
-
     },
     // 查看发货说明
     handleExplainInfo (row) {
@@ -375,6 +373,8 @@ export default {
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.printStatus = undefined
       this.queryParam.checkStatus = undefined
+      this.queryParam.warehouseSn = undefined
+
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

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

@@ -167,6 +167,7 @@ export default {
         billStatus: undefined,
         dealerProvinceSn: undefined,
         fullPaymentFlag: undefined,
+        warehouseSn: undefined,
         printStatus: 'NO_PRINT'
       },
       totalData: {
@@ -215,7 +216,7 @@ export default {
         { title: '收款单号', dataIndex: 'bookNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款日期', dataIndex: 'receiptDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'payerName', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '仓库', dataIndex: 'warehouse', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '仓库', dataIndex: 'warehouseName', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '财务编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'left', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订单金额', dataIndex: 'orderAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '收款金额', dataIndex: 'receiptAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
@@ -230,16 +231,12 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(5, 0, { title: '仓库', dataIndex: 'warehouse', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(5, 0, { title: '仓库', dataIndex: 'warehouseName', align: 'left', width: '14%', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }
   },
   methods: {
-    // 选择仓库
-    handleWarehouse (val) {
-
-    },
     changeTab (v) {
       this.currentTab = v
       this.pageInit()
@@ -285,7 +282,7 @@ export default {
       }
 
       const retArr = []
-      const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
+      const auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': bookSns }).then(res => res.data)
       console.log(auditInfo)
       bookSns.map(item => {
         // 授信明细
@@ -337,7 +334,7 @@ export default {
           }
         }
 
-        auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': [list.bookSn] }).then(res => res.data)
+        auditInfo = await getBatchLastProcessInstance({ 'businessType': 'FINANCE_BOOK', 'businessSnList': [list.bookSn] }).then(res => res.data)
       }
       console.log(auditInfo)
       this.spinning = true
@@ -424,6 +421,7 @@ export default {
         billStatus: undefined,
         dealerProvinceSn: undefined,
         fullPaymentFlag: undefined,
+        warehouseSn: undefined,
         printStatus: this.currentTab == 2 ? 'NO_PRINT' : undefined
       }
       this.$refs.table.refresh(true)

+ 4 - 7
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -33,8 +33,8 @@
           {{ chooseAddr }}
           <a-button type="link" :disabled="!form.buyerSn" id="chooseCustom-chooseAddr" @click="handleChoose">{{ addressVal }} >></a-button>
         </a-form-model-item>
-        <a-form-model-item label="出库仓库" prop="warehouse">
-          <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+        <a-form-model-item label="出库仓库" prop="warehouseSn">
+          <chooseWarehouse ref="warehouse" v-model="form.warehouseSn"></chooseWarehouse>
         </a-form-model-item>
         <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>
@@ -85,13 +85,13 @@ export default {
         shippingAddr: '', // 详细地址
         consigneeTel: '', // 联系电话
         consigneeName: '', // 联系人名称
-        warehouse: undefined
+        warehouseSn: undefined
       },
       rules: {
         buyerSn: [ { required: true, message: '请选择客户', trigger: ['change', 'blur'] } ],
         settleStyleSn: [ { required: true, message: '请选择支付方式', trigger: ['change', 'blur'] } ],
         consigneeTel: [ { required: true, message: '请选择收货地址', trigger: ['change', 'blur'] } ],
-        warehouse: [ { required: true, message: '请选择出库仓库', trigger: ['change', 'blur'] } ]
+        warehouseSn: [ { required: true, message: '请选择出库仓库', trigger: ['change', 'blur'] } ]
       },
       addressVal: '选择地址', //  选择地址/更换地址
       chooseAddr: '', //  当前已选地址信息
@@ -99,10 +99,7 @@ export default {
     }
   },
   methods: {
-    // 选择出库仓库
-    handleWarehouse (val) {
 
-    },
     // 客户 change
     custChange (val) {
       if (val && val.key) {

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -55,7 +55,7 @@
               <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货人">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货电话">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="出库仓库">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="出库仓库">{{ detailData&&detailData.warehouseName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
               <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>

+ 5 - 6
src/views/salesManagement/salesQuery/list.vue

@@ -82,7 +82,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -303,7 +303,8 @@ export default {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
-        shippingAddrProvinceSn: undefined
+        shippingAddrProvinceSn: undefined,
+        warehouseSn: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -372,7 +373,7 @@ export default {
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
         { title: '提交时间', dataIndex: 'submitDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '出库仓库', dataIndex: 'warehouse', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
         // { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '已下推数量', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -399,9 +400,6 @@ export default {
     }
   },
   methods: {
-    handleWarehouse (val) {
-
-    },
     //  导出
     handleExport () {
       const _this = this
@@ -544,6 +542,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
+      this.queryParam.warehouseSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

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

@@ -188,7 +188,8 @@ export default {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
-        provinceSn: undefined
+        provinceSn: undefined,
+        warehouseSn: undefined
       },
       totalData: {
         totalAmount: 0,
@@ -231,7 +232,7 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '地区', dataIndex: 'provinceName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'customeName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '仓库', dataIndex: 'warehouse', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        // { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'customerCacateName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流电话', dataIndex: 'transportTele', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -246,16 +247,12 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouse', width: '10%', align: 'left', customRender: function (text) { return text || '--' } })
+        arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } })
       }
       return arr
     }
   },
   methods: {
-    // 选择仓库
-    handleWarehouse (val) {
-
-    },
     //  时间  change
     dateChange (date) {
       this.queryParam.beginDate = date[0]
@@ -312,6 +309,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
+      this.queryParam.warehouseSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

+ 4 - 2
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -172,7 +172,8 @@ export default {
         dealerType: undefined,
         brandType: undefined,
         productBrandSn: undefined,
-        state: undefined
+        state: undefined,
+        warehouseSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -215,7 +216,7 @@ export default {
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 130, align: 'center' },
         { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 80, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓库', dataIndex: 'warehouse', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'dealerEntity.dealerTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
@@ -299,6 +300,7 @@ export default {
       this.queryParam.brandType = undefined
       this.queryParam.productBrandSn = undefined
       this.queryParam.state = undefined
+      this.queryParam.warehouseSn = undefined
       this.productType = []
       this.$refs.table.refresh(true)
     },

+ 2 - 1
src/views/salesReturnManagement/billOfLading/add.vue

@@ -111,7 +111,7 @@
             </a-col>
             <a-col :spna="24">
               <a-form-model-item label="出库仓库" :label-col="{span:2}" :wrapper-col="{span:20}" prop="warehouseSn">
-                <chooseWarehouse ref="warehouse" v-model="form.warehouseSn" @change="handleWarehouse"></chooseWarehouse>
+                <chooseWarehouse ref="warehouse" :disabled="$route.params.sn" v-model="form.warehouseSn" @change="handleWarehouse"></chooseWarehouse>
               </a-form-model-item>
             </a-col>
             <a-col :spna="24">
@@ -419,6 +419,7 @@ export default {
       if (this.$route.params.sn) {
         this.form.theme = ''
         this.getDetail()
+        this.getReturnOrderList(this.$route.params.wSn)
       } else {
         this.chooseData = []
         // 从销售退货列表过来的数据

+ 7 - 7
src/views/salesReturnManagement/billOfLading/list.vue

@@ -20,18 +20,18 @@
                 <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
-           
+
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-              <a-form-item label="申请人">
+                <a-form-item label="申请人">
                   <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                  <a-form-item label="物流点">
-                    <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
-                  </a-form-item>
-                </a-col>
+                <a-form-item label="物流点">
+                  <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="发货方">
                   <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
@@ -240,7 +240,7 @@ export default {
     },
     // 编辑
     handleEdit (row) {
-      this.$router.push({ name: 'billOfLadingEdit', params: { sn: row.pickUpSn } })
+      this.$router.push({ name: 'billOfLadingEdit', params: { sn: row.pickUpSn, wSn: row.warehouseSn } })
     },
     // 详情
     handleDetail (row) {

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

@@ -119,10 +119,6 @@ export default {
     }
   },
   methods: {
-    // 选择退货仓库
-    handleWarehouse (val) {
-
-    },
     // 搜索经销商
     fetchUser (value) {
       console.log('fetching user', value)

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

@@ -325,10 +325,6 @@ export default {
     }
   },
   methods: {
-    // 选择退货仓库
-    handleWarehouse (val) {
-    
-    },
     getCount (params) {
       salesReturnQueryCount(params).then(res => {
         this.countData = res.data