chenrui 2 vuotta sitten
vanhempi
commit
00a7112f0b

+ 13 - 3
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -33,6 +33,9 @@
           {{ 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>
         <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>
@@ -50,11 +53,12 @@ import { VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
 import { dealerRecevieAddrQuery } from '@/api/dealerRecevieAddr'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { salesSave } from '@/api/sales'
 export default {
   name: 'SalesChooseCustomModal',
   mixins: [commonMixin],
-  components: { VSelect, dealerSubareaScopeList, chooseAddressModal },
+  components: { VSelect, dealerSubareaScopeList, chooseAddressModal, chooseWarehouse },
   props: {
     show: [Boolean]
   },
@@ -80,12 +84,14 @@ export default {
         shippingAddrCountyName: '', // 区
         shippingAddr: '', // 详细地址
         consigneeTel: '', // 联系电话
-        consigneeName: '' // 联系人名称
+        consigneeName: '', // 联系人名称
+        warehouse: undefined
       },
       rules: {
         buyerSn: [ { required: true, message: '请选择客户', trigger: ['change', 'blur'] } ],
         settleStyleSn: [ { required: true, message: '请选择支付方式', trigger: ['change', 'blur'] } ],
-        consigneeTel: [ { required: true, message: '请选择收货地址', trigger: ['change', 'blur'] } ]
+        consigneeTel: [ { required: true, message: '请选择收货地址', trigger: ['change', 'blur'] } ],
+        warehouse: [ { required: true, message: '请选择出库仓库', trigger: ['change', 'blur'] } ]
       },
       addressVal: '选择地址', //  选择地址/更换地址
       chooseAddr: '', //  当前已选地址信息
@@ -93,6 +99,10 @@ export default {
     }
   },
   methods: {
+    // 选择出库仓库
+    handleWarehouse (val) {
+
+    },
     // 客户 change
     custChange (val) {
       if (val && val.key) {

+ 8 - 7
src/views/salesManagement/salesQuery/detail.vue

@@ -55,6 +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.auditDate || '--' }}</a-descriptions-item>
               <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
@@ -309,7 +310,7 @@ export default {
       }
 
       const ind = this.$hasPermissions(this.authCode + '_costPrice') ? 5 : 4
-      if(this.$hasPermissions(this.authCode + '_provincePrice')){
+      if (this.$hasPermissions(this.authCode + '_provincePrice')) {
         arr.splice(ind, 0, { title: '省级价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       // 是否勾选市级价格
@@ -416,7 +417,7 @@ export default {
       })
     },
     // 打印导出
-    handlePrint (type,authCode) {
+    handlePrint (type, authCode) {
       const _this = this
       _this.$store.state.app.curActionPermission = authCode
       // 销售分类导出
@@ -425,8 +426,8 @@ export default {
           salesBillSn: this.bizSn || this.$route.params.sn
         }
         _this.spinning = true
-        exportExcel(salesDetailTypeExcel, params, '销售分类' + moment().format('YYYYMMDDHHmmss'), () => { 
-          _this.spinning = false 
+        exportExcel(salesDetailTypeExcel, params, '销售分类' + moment().format('YYYYMMDDHHmmss'), () => {
+          _this.spinning = false
           _this.$store.state.app.curActionPermission = ''
         })
       } else {
@@ -435,7 +436,7 @@ export default {
         this.openModal = true
       }
     },
-    closePrint(){
+    closePrint () {
       console.log(9)
       this.$store.state.app.curActionPermission = ''
       this.openModal = false
@@ -448,13 +449,13 @@ export default {
       delete params.type
       _this.spinning = true
       if (this.nowType == 'export') { //  导出
-        exportExcel(salesDetailExcel, params, '销售' + moment().format('YYYYMMDDHHmmss'), () => { 
+        exportExcel(salesDetailExcel, params, '销售' + moment().format('YYYYMMDDHHmmss'), () => {
           _this.spinning = false
           _this.$store.state.app.curActionPermission = ''
         })
       } else { //  打印
         const taskName = this.nowType == 'SALES_BILL' ? '销售单' : '销售分类'
-        printFun(salesDetailPrint, params, objs.type, taskName, () => { 
+        printFun(salesDetailPrint, params, objs.type, taskName, () => {
           _this.spinning = false
           _this.$store.state.app.curActionPermission = ''
         })

+ 6 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -6,6 +6,10 @@
         <template slot="subTitle">
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
+          <div style="width:420px;display:inline-block;color: #666;">
+            <span>出库仓库:</span>
+            <chooseWarehouse style="width:80%" ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+          </div>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="salesEdit-cont">
@@ -223,12 +227,13 @@ import queryPart from './queryPart.vue'
 import queryPromotable from './queryPromotable.vue'
 import ChooseActive from './chooseActive.vue'
 import ImportGuideModal from './importGuideModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { salesDetailBySn, salesWriteSubmit, getPromoacActiveList, deleteAll } from '@/api/sales'
 import { salesDetailStockList, salesDetailInsert, salesDetailUpdateQty, salesDetailDel, salesDetailBatchDel, salesDetailDelAll, addPromoGoods, salesBatchInsert } from '@/api/salesDetail'
 export default {
   name: 'SalesEdit',
   mixins: [commonMixin],
-  components: { STable, VSelect, queryPart, queryPromotable, ChooseActive, ImportGuideModal },
+  components: { STable, VSelect, queryPart, queryPromotable, ChooseActive, ImportGuideModal, chooseWarehouse },
   data () {
     return {
       spinning: false,

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

@@ -80,6 +80,11 @@
                   <Area id="salesManagementList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="出库仓库">
+                  <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -262,12 +267,13 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import { salesList, salesDel, salesCount } from '@/api/sales'
 import { hdExportExcel } from '@/libs/exportExcel'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import { findBySalesBillSn, dispatchBatchPrintStatus, queryBySalesBillSn } from '@/api/dispatch'
 import { salesDetailExport } from '@/api/salesBillReport'
 export default {
   name: 'SalesQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal },
+  components: { STable, VSelect, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -293,7 +299,7 @@ export default {
         billStatus: undefined, //  业务状态
         financialStatus: undefined, //  财务状态
         salesBillSource: undefined,
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
@@ -366,6 +372,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: '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 : '--') } },
@@ -392,6 +399,9 @@ export default {
     }
   },
   methods: {
+    handleWarehouse (val) {
+
+    },
     //  导出
     handleExport () {
       const _this = this