Browse Source

政策 模块 联调

jiayufei 3 years ago
parent
commit
767b911d8b

+ 2 - 2
src/views/modules/policy-management/policy-management-server.js

@@ -4,8 +4,8 @@
  */
 
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
- // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
  // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
- // export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+//  export const urlAcount = 'http://139.186.165.84:8808'; // 测试
  export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

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

@@ -3,8 +3,9 @@
         <div class="control-con-title">
             <div><span class="policy-export-btn">销售政策列表</span></div>
             <div>
-                <!-- <span><a-button type="default" @click="handlePolicyExport">政策导出</a-button></span> -->
-                <span class="add-acount-policy-btn"><a-button type="primary" @click="handleAddAccountPolicy">创建账户政策</a-button></span>
+                <span class="add-acount-policy-btn">
+                    <a-button type="primary" @click="handleAddAccountPolicy">创建账户政策</a-button>
+                </span>
             </div>
         </div>
         <div class="control-con-header">
@@ -204,6 +205,7 @@
             title="审核政策"
             :visible="auditPolicyStatus"
             :closable="false"
+            :footer="queryByIdList.updateOperation.includes('审核拒绝')"
             okText="审核通过"
             cancelText="审核拒绝"
             dialog-class="audit-policy-class"
@@ -256,7 +258,7 @@
                         </div>
                         <div class="policy-line-left">
                             <span class="line-left-spn">集团简称:</span>
-                            <span class="line-right-spn">{{ queryByIdList.groupAbbreviation }}</span>
+                            <span class="line-right-spn">{{ queryByIdList.groupAbbreviation || '-' }}</span>
                         </div>
                     </div>
                     <div class="line-quen-right">
@@ -379,8 +381,8 @@
                         </div>
                         <a-form-model-item label="媒体" prop="mediaType">
                             <a-select v-model="policyOperationForm.mediaType" placeholder="请选择投放媒体">
-                                <a-select-option :value="1">快手</a-select-option>
-                                <a-select-option :value="2">头条</a-select-option>
+                                <a-select-option :value="1">头条</a-select-option>
+                                <a-select-option :value="2">快手</a-select-option>
                             </a-select>
                         </a-form-model-item>
                         <a-form-model-item label="销售" prop="createUserId">
@@ -612,7 +614,7 @@ export default {
                 advancePay: 0,
                 advertiserName: '',
                 rebateType: undefined,
-                mediaType: 1,
+                mediaType: 2,
                 createUserId: undefined,
                 areaInfo: undefined,
                 companySubjectName: undefined,
@@ -766,7 +768,7 @@ export default {
                     width: 190
                 },
                 {
-                    title: '操作', // operation
+                    title: '操作',
                     dataIndex: 'action',
                     align: 'center',
                     width: 250,
@@ -774,7 +776,7 @@ export default {
                     scopedSlots: {customRender: 'action'}
                 },
                 {
-                    title: '审核理由', // approvalContent
+                    title: '审核理由',
                     dataIndex: 'reason',
                     align: 'center',
                     width: 150,
@@ -1060,10 +1062,6 @@ export default {
             };
             this.policyOperationForm = Object.assign({}, list, originChange);
         },
-        // 政策导出按钮
-        handlePolicyExport() {
-            console.log('政策导出按钮');
-        },
         // 新增政策按钮
         handleAddAccountPolicy() {
             this.addType = 'add';
@@ -1092,7 +1090,8 @@ export default {
                 isDianPay,
                 dianPayCompanyName,
                 dianPayCompanyRebateRate,
-                remarks
+                remarks,
+                createUserName: this.saleShowOption[0].userName || ''
             };
             this.$refs.policyOperationForm.validate(valid => {
                 if (valid) {
@@ -1121,9 +1120,6 @@ export default {
             }).catch(error => {
                 console.log(error, 'eeee');
             });
-            // .finally(() => {
-            //     this.handlePolicyOperationCancel();
-            // });
         },
         // 新增政策取消按钮
         handlePolicyOperationCancel() {
@@ -1138,7 +1134,7 @@ export default {
                 advancePay: 0,
                 advertiserName: '',
                 rebateType: undefined,
-                mediaType: 1,
+                mediaType: 2,
                 createUserId: undefined,
                 areaInfo: undefined,
                 companySubjectName: undefined,

+ 1 - 1
src/views/modules/settlement-information/settlement-information.vue

@@ -57,7 +57,7 @@
                     </a-form-item>
                 </a-row>
                 <a-row>
-                    <a-form-item label="负责人:">
+                    <a-form-item label="媒体:">
                         <a-select v-model="configForm.creativeMedia" style="width: 100px">
                             <a-select-option :value="2">不限</a-select-option>
                             <a-select-option value="CREATIVE_IMAGE_MODE_VIDEO_VERTICAL">快手</a-select-option>