فهرست منبع

政策 联调 work

jiayufei 3 سال پیش
والد
کامیت
a9d3954887

+ 23 - 13
src/views/modules/policy-management/policy-management.vue

@@ -3,7 +3,7 @@
         <div class="control-con-title">
             <div><span class="policy-export-btn">销售政策列表</span></div>
             <div>
-                <span class="add-acount-policy-btn">
+                <span v-if="userInfo().roleName !== '财务'" class="add-acount-policy-btn">
                     <a-button type="primary" @click="handleAddAccountPolicy">创建账户政策</a-button>
                 </span>
             </div>
@@ -38,7 +38,7 @@
                         <a-input v-model="configForm.productName" placeholder="请输入产品名称"/>
                     </a-form-item>
                     <a-form-item label="媒体:">
-                        <a-select v-model="configForm.creativeMedia" style="width: 100px">
+                        <a-select v-model="configForm.creativeMedia" style="width: 100px" allow-clear>
                             <a-select-option
                                 v-for="item in creativeMediaOptions"
                                 :key="item.id"
@@ -49,7 +49,7 @@
                         </a-select>
                     </a-form-item>
                     <a-form-item label="返点类型:">
-                        <a-select v-model="configForm.creativeRebate" style="width: 140px">
+                        <a-select v-model="configForm.creativeRebate" style="width: 140px" allow-clear>
                             <a-select-option
                                 v-for="item in creativeRebateOptions"
                                 :key="item.id"
@@ -74,18 +74,19 @@
                             style="width: 100px"
                             :filter-option="handleFilterOption"
                             show-search
+                            allow-clear
                         >
                             <a-select-option
                                 v-for="item in allSaleListOption"
                                 :key="item.userId"
-                                :value="item.userId"
+                                :value="item.userName"
                             >
                                 {{ item.userName }}
                             </a-select-option>
                         </a-select>
                     </a-form-item>
                     <a-form-item label="运营方式:">
-                        <a-select v-model="configForm.creativeOperate" style="width: 100px">
+                        <a-select v-model="configForm.creativeOperate" style="width: 100px" allow-clear>
                             <a-select-option value="no">不限</a-select-option>
                             <a-select-option :value="0">自运营</a-select-option>
                             <a-select-option :value="1">代运营</a-select-option>
@@ -99,10 +100,11 @@
                         <a-range-picker
                             v-model="configForm.time"
                             format="YYYY-MM-DD"
+                            @change="handleLaunchData"
                         />
                     </a-form-item>
                     <a-form-item label="状态:">
-                        <a-select v-model="configForm.searchStatus" style="width: 100px">
+                        <a-select v-model="configForm.searchStatus" style="width: 100px" allow-clear>
                             <a-select-option
                                 v-for="item in searchStatusOptions"
                                 :key="item.id"
@@ -300,7 +302,7 @@
                         </div>
                         <div class="policy-line-right">
                             <span class="line-left-spn">备注:</span>
-                            <span class="line-right-spn">{{ queryByIdList.remarks }}</span>
+                            <span class="line-right-spn">{{ queryByIdList.remarks || '-' }}</span>
                         </div>
                     </div>
                 </div>
@@ -339,6 +341,7 @@
             :title="addType === 'add' ? '新增政策' : '编辑政策'"
             :visible="policyOperationStatus"
             dialog-class="policy-operation-class"
+            :confirmLoading="confirmLoading"
             @ok="handlePolicyOperationSure"
             @cancel="handlePolicyOperationCancel"
         >
@@ -380,7 +383,7 @@
                             </a-form-model-item>
                         </div>
                         <a-form-model-item label="媒体" prop="mediaType">
-                            <a-select v-model="policyOperationForm.mediaType" placeholder="请选择投放媒体">
+                            <a-select v-model="policyOperationForm.mediaType" placeholder="请选择投放媒体" allow-clear>
                                 <a-select-option :value="1">头条</a-select-option>
                                 <a-select-option :value="2">快手</a-select-option>
                             </a-select>
@@ -391,6 +394,7 @@
                                 style="width: 100px"
                                 :filter-option="handleFilterOption"
                                 show-search
+                                allow-clear
                             >
                                 <a-select-option
                                     v-for="item in saleShowOption"
@@ -402,7 +406,7 @@
                             </a-select>
                         </a-form-model-item>
                         <a-form-model-item label="区域" prop="areaInfo">
-                            <a-select v-model="policyOperationForm.areaInfo" placeholder="请选择区域">
+                            <a-select v-model="policyOperationForm.areaInfo" placeholder="请选择区域" allow-clear>
                                 <a-select-option
                                     v-for="item in addAreaList"
                                     :key="item"
@@ -418,6 +422,7 @@
                                 placeholder="请选择我司主体"
                                 :filter-option="handleFilterOption"
                                 show-search
+                                allow-clear
                             >
                                 <a-select-option
                                     v-for="item in addSubjectList"
@@ -452,7 +457,7 @@
                             </a-radio-group>
                         </a-form-model-item>
                         <a-form-model-item label="返点类型:" prop="rebateType">
-                            <a-select v-model="policyOperationForm.rebateType" placeholder="请选择返点类型">
+                            <a-select v-model="policyOperationForm.rebateType" placeholder="请选择返点类型" allow-clear>
                                 <a-select-option :value="0">返现</a-select-option>
                                 <a-select-option :value="1">返货</a-select-option>
                                 <a-select-option :value="2">返现+返货</a-select-option>
@@ -533,6 +538,7 @@ export default {
             this.handleDescRules(value, 5, 100, callback);
         };
         return {
+            confirmLoading: false,
             controlLoading: false,
             allSaleListOption: [],
             creativeMediaOptions: [
@@ -818,6 +824,9 @@ export default {
     methods: {
         ...mapGetters(['userInfo']),
         moment,
+        handleLaunchData(date, dateString) {
+            this.configForm.time = dateString;
+        },
         handleFilterOption(input, option) {
             return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
         },
@@ -830,7 +839,6 @@ export default {
             };
             getAction(urlAcount + '/finance/cwjsPolicyInfo/queryAeraByUserId', paramsData).then(result => {
                 if (result.code === 0) {
-                    console.log(result.result[0], 'result.result[0]--');
                     const defaultList = result.result[0].UserCompany;
                     this.saleShowOption = defaultList;
                     this.addAreaList = defaultList[0].nickName.split(',');
@@ -891,7 +899,7 @@ export default {
                 mediaType: this.configForm.creativeMedia === 'no' ? '' : this.configForm.creativeMedia,
                 rebateType: this.configForm.creativeRebate === 'no' ? '' : this.configForm.creativeRebate,
                 dianPayCompanyName: this.configForm.creativeAdvance,
-                createUserId: this.configForm.creativeSale === 'no' ? '' : this.configForm.creativeSale,
+                createUserName: this.configForm.creativeSale === 'no' ? '' : this.configForm.creativeSale,
                 promotionType: this.configForm.creativeOperate === 'no' ? '' : this.configForm.creativeOperate,
                 approvedStatus: this.configForm.searchStatus === 'no' ? '' : this.configForm.searchStatus,
                 startTime: this.configForm.time[0],
@@ -904,7 +912,6 @@ export default {
                     let defaultList = result.result.list;
                     defaultList.forEach(item => {
                         item.updatePolicyProductName = item.policyProductName.join(',');
-                        item.remarks = item.remarks ? item.remarks : '-';
                         item.updateOperation = item.operation.split('|');
                         item.updateMediaType = this.creativeMediaOptions.filter(val => val.id === item.mediaType)[0].name;
                         item.updateRebateType = this.creativeRebateOptions.filter(val => val.id === item.rebateType)[0].name;
@@ -1096,6 +1103,7 @@ export default {
             };
             this.$refs.policyOperationForm.validate(valid => {
                 if (valid) {
+                    this.confirmLoading = true;
                     if (this.addType === 'add') {
                         this.handleAddSureBtn(paramsData, '/finance/cwjsPolicyInfo/add');
                     }
@@ -1120,6 +1128,8 @@ export default {
                 }
             }).catch(error => {
                 console.log(error, 'eeee');
+            }).finally(() => {
+                this.confirmLoading = false;
             });
         },
         // 新增政策取消按钮

+ 11 - 0
src/views/modules/settlement-information/settlement-information-server.js

@@ -0,0 +1,11 @@
+/**
+ * @file 账户配置API
+ * @author jiayufei
+ */
+
+//  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+ // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+// export const urlAcount = 'http://192.168.1.8:9999'; // 学超
+ 

+ 2 - 0
src/views/modules/settlement-information/settlement-information.vue

@@ -257,8 +257,10 @@
     </div>
 </template>
 <script>
+import {getAction, postAction} from '@/api/manage';
 import moment from 'moment';
 import {mapGetters} from 'vuex';
+import {urlAcount} from './settlement-information-server.js';
 
 import BMF from 'browser-md5-file';
 let COS = require('cos-js-sdk-v5');

+ 2 - 2
vue.config.js

@@ -87,8 +87,8 @@ module.exports = {
 				// target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
 				// target:'http://118.24.244.213:8804',
 				// target: 'http://192.168.1.43:9090', // 子安
-				target: 'http://192.168.1.8:9999', // 学超
-				// target:'http://gateway.tjyourong.com.cn', //测试
+				// target: 'http://192.168.1.8:9999', // 学超
+				target:'http://gateway.tjyourong.com.cn', //测试
 				// target:'http://apipre.tjyourong.com.cn', //预生产
 
 				ws: false,