lilei 3 일 전
부모
커밋
f5604144ae

+ 2 - 2
src/views/setting/dailyReportSettings/salesReturnRemove.vue

@@ -6,7 +6,7 @@
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="退货日期">
+              <a-form-item label="业务时间">
                 <rangeDate ref="rangeCreateDate" id="salesReturnRemove-createDate" :value="createDate" @change="dateCreateChange" />
               </a-form-item>
             </a-col>
@@ -174,7 +174,7 @@ export default {
         { 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: 'billStatusName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货日期', dataIndex: 'bizDate', 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: '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] } },

+ 8 - 8
src/views/setting/removeSetting/erpBaseModal.vue

@@ -75,14 +75,14 @@ export default {
       form: {
         bizNo: '',
         dealerSn: undefined,
-        configType: 'TIRE_SUBSIDY',
+        configType: 'SALES_RETURN_SYNC',
         bizSn: undefined, // bizsn
-        tireSubsidyYf: '1'
+        salesReturnSyncErp: '1'
       },
       rules: {
         bizNo: [{ required: true, message: '请输入业务单号', trigger: ['change', 'blur'] }],
         dealerSn: [{ required: true, message: '请选择客户', trigger: ['change', 'blur'] }],
-        tireSubsidyYf: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }]
+        salesReturnSyncErp: [{ required: true, message: '请选择', trigger: ['change', 'blur'] }]
       },
       fetching: false,
       dealerData: null,
@@ -97,7 +97,7 @@ export default {
       this.dealerData = null
       this.spinning = true
       this.fetching = true
-      salesReturnDetailByNo({ bizNo: this.form.bizNo, configType: 'TIRE_SUBSIDY' }).then(res => {
+      salesReturnDetailByNo({ bizNo: this.form.bizNo, configType: 'SALES_RETURN_SYNC' }).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }
@@ -145,11 +145,11 @@ export default {
     cancel () {
       this.opened = false
       this.form = {
-        configType: 'TIRE_SUBSIDY',
+        configType: 'SALES_RETURN_SYNC',
         bizNo: '',
         dealerSn: undefined,
         bizSn: undefined, // bizsn
-        tireSubsidyYf: '1'
+        salesReturnSyncErp: '1'
       }
       this.bizSn = undefined
       this.dealerData = null
@@ -157,14 +157,14 @@ export default {
       this.$emit('cancel')
     },
     getDetail () {
-      bizRemoveConfigDetail({ bizSn: this.bizSn, configType: 'TIRE_SUBSIDY' }).then(res => {
+      bizRemoveConfigDetail({ bizSn: this.bizSn, configType: 'SALES_RETURN_SYNC' }).then(res => {
         const { bizSn, bizNo, dealerSn, dealerName } = res.data
         this.dealerData = { dealerName: dealerName }
         this.form = Object.assign(this.form, {
           bizNo: bizNo,
           dealerSn: dealerSn,
           bizSn: bizSn,
-          tireSubsidyYf: '1'
+          salesReturnSyncErp: '1'
         })
       })
     },

+ 9 - 18
src/views/setting/removeSetting/erpList.vue

@@ -64,13 +64,6 @@
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record, index">
             <div>
-              <a-button
-                size="small"
-                type="link"
-                class="button-info"
-                v-if="record.show&&$hasPermissions('B_srr_edit')"
-                @click="handleEdit(record)"
-                :id="'salesReturnRemove-edit-btn'+index">编辑</a-button>
               <a-button
                 size="small"
                 type="link"
@@ -116,17 +109,14 @@ export default {
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
-      createDate: [
-        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
-        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
-      ], //  创建时间
+      createDate: [], //  创建时间
       openModal: false, // 选择客户弹框是否显示
       openDepartUserModal: false,
       // 查询参数
       queryParam: {
-        configType: 'TIRE_SUBSIDY',
-        beginDate: getDate.getThreeMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
+        configType: 'SALES_RETURN_SYNC',
+        beginDate: undefined,
+        endDate: undefined,
         dealerSn: undefined, //  客户名称
         bizNo: undefined, //  业务单号
         bizType: undefined
@@ -143,7 +133,7 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              data.list[i].show = new Date(data.list[i].bizDate).getMonth() == new Date().getMonth()
+              data.list[i].show = data.list[i].billStatus != 'FINISH' && data.list[i].billStatus != 'CANCEL'
             }
             this.disabled = false
           }
@@ -207,7 +197,7 @@ export default {
         centered: true,
         onOk () {
           _this.spinning = true
-          bizRemoveConfigDelete({ bizSn: row.bizSn, configType: 'TIRE_SUBSIDY' }).then(res => {
+          bizRemoveConfigDelete({ bizSn: row.bizSn, configType: 'SALES_RETURN_SYNC' }).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()
@@ -219,9 +209,10 @@ export default {
     },
     // 重置查询
     resetSearchForm () {
+      this.createDate = []
       this.$refs.rangeCreateDate.resetDate(this.createDate)
-      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      this.queryParam.beginDate = undefined
+      this.queryParam.endDate = undefined
       this.queryParam.dealerSn = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.bizNo = ''

+ 2 - 2
src/views/setting/salesReturnRemove/list.vue

@@ -6,7 +6,7 @@
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="退货日期">
+              <a-form-item label="业务时间">
                 <rangeDate ref="rangeCreateDate" id="salesReturnRemove-createDate" :value="createDate" @change="dateCreateChange" />
               </a-form-item>
             </a-col>
@@ -173,7 +173,7 @@ export default {
         { 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: 'billStatusName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货日期', dataIndex: 'bizDate', 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: '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] } },