lilei 1 dag geleden
bovenliggende
commit
3120ea1553

+ 1 - 1
src/api/bizRemove.js

@@ -3,7 +3,7 @@ import { axios } from '@/utils/request'
 // 根据销售退货单号查询客户
 export const salesReturnDetailByNo = (params) => {
   return axios({
-    url: `/salesReturn/findByNo/${params.salesReturnBillNo}`,
+    url: `/bizRemoveConfig/findBizInfo/${params.bizNo}`,
     data: params,
     method: 'get',
     headers: {

+ 19 - 19
src/views/setting/dailyReportSettings/baseModal.vue

@@ -20,21 +20,21 @@
       >
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="销售退货单号" prop="salesReturnBillNo">
+            <a-form-model-item label="业务单号" prop="bizNo">
               <a-input
-                id="base-salesReturnBillNo"
+                id="base-bizNo"
                 :disabled="bizSn"
-                v-model.trim="form.salesReturnBillNo"
+                v-model.trim="form.bizNo"
                 @change="fetchUser"
                 allowClear
-                placeholder="请输入销售退货单号"/>
+                placeholder="请输入业务单号"/>
             </a-form-model-item>
           </a-col>
         </a-row>
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="客户名称" prop="buyerSn">
-              {{ dealerData&&dealerData.buyerName||'--' }}
+            <a-form-model-item label="客户名称" prop="dealerSn">
+              {{ dealerData&&dealerData.dealerName||'--' }}
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -113,8 +113,8 @@ export default {
         wrapperCol: { span: 18 }
       },
       form: {
-        salesReturnBillNo: '',
-        buyerSn: undefined,
+        bizNo: '',
+        dealerSn: undefined,
         configType: 'DAILY_REPORT',
         bizSn: undefined, // bizsn
         dailyPl: undefined,
@@ -123,8 +123,8 @@ export default {
         areaSalesDay: undefined
       },
       rules: {
-        salesReturnBillNo: [{ required: true, message: '请输入销售退货单号', trigger: ['change', 'blur'] }],
-        buyerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
+        bizNo: [{ required: true, message: '请输入业务单号', trigger: ['change', 'blur'] }],
+        dealerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
         dailyPl: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
         countrySalesDay: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
         dailyPljl: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
@@ -137,23 +137,23 @@ export default {
   },
   methods: {
     fetchUser () {
-      if (!this.form.salesReturnBillNo) return
+      if (!this.form.bizNo) return
       this.lastFetchId += 1
       const fetchId = this.lastFetchId
       this.dealerData = null
       this.fetching = true
       this.spinning = true
-      salesReturnDetailByNo({ salesReturnBillNo: this.form.salesReturnBillNo }).then(res => {
+      salesReturnDetailByNo({ bizNo: this.form.bizNo }).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }
         if (res.data) {
           this.dealerData = res.data
-          this.form.buyerSn = res.data.buyerSn
+          this.form.dealerSn = res.data.dealerSn
           this.form.bizSn = res.data.salesReturnBillSn
         } else {
           this.dealerData = null
-          this.form.buyerSn = undefined
+          this.form.dealerSn = undefined
           this.form.bizSn = undefined
         }
         this.spinning = false
@@ -192,8 +192,8 @@ export default {
       this.opened = false
       this.form = {
         configType: 'DAILY_REPORT',
-        salesReturnBillNo: '',
-        buyerSn: undefined,
+        bizNo: '',
+        dealerSn: undefined,
         bizSn: undefined, // bizsn
         dailyPl: undefined,
         countrySalesDay: undefined,
@@ -208,10 +208,10 @@ export default {
     getDetail () {
       bizRemoveConfigDetail({ bizSn: this.bizSn, configType: 'DAILY_REPORT' }).then(res => {
         const { bizSn, bizNo, dealerSn, dealerName, areaSalesDay, countrySalesDay, dailyPl, dailyPljl } = res.data
-        this.dealerData = { buyerName: dealerName }
+        this.dealerData = { dealerName: dealerName }
         this.form = Object.assign(this.form, {
-          salesReturnBillNo: bizNo,
-          buyerSn: dealerSn,
+          bizNo: bizNo,
+          dealerSn: dealerSn,
           bizSn: bizSn,
           dailyPl: dailyPl,
           countrySalesDay: countrySalesDay,

+ 20 - 7
src/views/setting/dailyReportSettings/salesReturnRemove.vue

@@ -16,11 +16,22 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="业务单号">
+                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
+              <a-form-item label="业务类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="bizType"
+                  id="salesReturnRemove-bizType"
+                  code="PRINT_STATUS"
+                  placeholder="请选择业务类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="24" :sm="24" style="text-align: center;margin-bottom: 10px;">
               <span class="table-page-search-submitButtons">
                 <a-button id="salesReturnRemove-search" type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button id="salesReturnRemove-reset" style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
@@ -128,7 +139,8 @@ export default {
         beginDate: getDate.getThreeMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         dealerSn: undefined, //  客户名称
-        bizNo: undefined //  总部销退单号
+        bizNo: undefined, //  业务单号
+        bizType: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -158,10 +170,11 @@ export default {
       const a = ['', '剔除']
       const arr = [
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总部销退单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货状态', dataIndex: 'billStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货日期', dataIndex: 'bizDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '全国销售日报', dataIndex: 'countrySalesDay', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '项目销售日报1', dataIndex: 'dailyPl', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '项目销售日报2', dataIndex: 'dailyPljl', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
@@ -228,7 +241,7 @@ export default {
       this.queryParam.dealerSn = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.bizNo = ''
-
+      this.queryParam.bizType = undefined
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 20 - 20
src/views/setting/salesReturnRemove/baseModal.vue

@@ -20,21 +20,21 @@
       >
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="销售退货单号" prop="salesReturnBillNo">
+            <a-form-model-item label="业务单号" prop="bizNo">
               <a-input
-                id="base-salesReturnBillNo"
+                id="base-bizNo"
                 :disabled="bizSn"
-                v-model.trim="form.salesReturnBillNo"
+                v-model.trim="form.bizNo"
                 @change="fetchUser"
                 allowClear
-                placeholder="请输入销售退货单号"/>
+                placeholder="请输入业务单号"/>
             </a-form-model-item>
           </a-col>
         </a-row>
         <a-row :gutter="15">
           <a-col :span="20">
-            <a-form-model-item label="客户名称" prop="buyerSn">
-              {{ dealerData&&dealerData.buyerName||'--' }}
+            <a-form-model-item label="客户名称" prop="dealerSn">
+              {{ dealerData&&dealerData.dealerName||'--' }}
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -93,16 +93,16 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        salesReturnBillNo: '',
-        buyerSn: undefined,
+        bizNo: '',
+        dealerSn: undefined,
         configType: 'BILLING_REPORT',
         bizSn: undefined, // bizsn
         salesStatsProvince: undefined,
         salesStatsDealer: undefined
       },
       rules: {
-        salesReturnBillNo: [{ required: true, message: '请输入销售退货单号', trigger: ['change', 'blur'] }],
-        buyerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
+        bizNo: [{ required: true, message: '请输入业务单号', trigger: ['change', 'blur'] }],
+        dealerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
         salesStatsProvince: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }],
         salesStatsDealer: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }]
       },
@@ -113,23 +113,23 @@ export default {
   },
   methods: {
     fetchUser () {
-      if (!this.form.salesReturnBillNo) return
+      if (!this.form.bizNo) return
       this.lastFetchId += 1
       const fetchId = this.lastFetchId
       this.dealerData = null
       this.spinning = true
       this.fetching = true
-      salesReturnDetailByNo({ salesReturnBillNo: this.form.salesReturnBillNo }).then(res => {
+      salesReturnDetailByNo({ bizNo: this.form.bizNo }).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }
         if (res.data) {
           this.dealerData = res.data
-          this.form.buyerSn = res.data.buyerSn
-          this.form.bizSn = res.data.salesReturnBillSn
+          this.form.dealerSn = res.data.dealerSn
+          this.form.bizSn = res.data.bizSn
         } else {
           this.dealerData = null
-          this.form.buyerSn = undefined
+          this.form.dealerSn = undefined
           this.form.bizSn = undefined
         }
         this.fetching = false
@@ -149,7 +149,7 @@ export default {
         }
       })
     },
-    // 新建销售退货
+    // 新建业务
     salesSaveFun () {
       const _this = this
       const form = this.form
@@ -168,8 +168,8 @@ export default {
       this.opened = false
       this.form = {
         configType: 'BILLING_REPORT',
-        salesReturnBillNo: '',
-        buyerSn: undefined,
+        bizNo: '',
+        dealerSn: undefined,
         bizSn: undefined, // bizsn
         salesStatsProvince: undefined,
         salesStatsDealer: undefined
@@ -184,8 +184,8 @@ export default {
         const { bizSn, bizNo, dealerSn, dealerName, salesStatsDealer, salesStatsProvince } = res.data
         this.dealerData = { buyerName: dealerName }
         this.form = Object.assign(this.form, {
-          salesReturnBillNo: bizNo,
-          buyerSn: dealerSn,
+          bizNo: bizNo,
+          dealerSn: dealerSn,
           bizSn: bizSn,
           salesStatsProvince: salesStatsProvince,
           salesStatsDealer: salesStatsDealer

+ 20 - 6
src/views/setting/salesReturnRemove/list.vue

@@ -16,11 +16,22 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="业务单号">
+                <a-input id="salesReturnRemove-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
+              <a-form-item label="业务类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="bizType"
+                  id="salesReturnRemove-bizType"
+                  code="PRINT_STATUS"
+                  placeholder="请选择业务类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="24" :sm="24" style="text-align: center;margin-bottom: 10px;">
               <span class="table-page-search-submitButtons">
                 <a-button id="salesReturnRemove-search" type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button id="salesReturnRemove-reset" style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
@@ -131,7 +142,8 @@ export default {
         beginDate: getDate.getThreeMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         dealerSn: undefined, //  客户名称
-        bizNo: undefined //  总部销退单号
+        bizNo: undefined, //  业务单号
+        bizType: undefined
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -161,10 +173,11 @@ export default {
       const a = ['', '剔除']
       const arr = [
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总部销退单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货状态', dataIndex: 'billStatusDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货日期', dataIndex: 'bizDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName', width: '26%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '开单统计(客户)', dataIndex: 'salesStatsDealer', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '开单统计(省份)', dataIndex: 'salesStatsProvince', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -229,6 +242,7 @@ export default {
       this.queryParam.dealerSn = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.bizNo = ''
+      this.queryParam.bizType = undefined
 
       this.$refs.table.refresh(true)
     },