yumeng 1 年間 前
コミット
0b18643d42

ファイルの差分が大きいため隠しています
+ 861 - 819
src/views/modules/advertiser/modules/ProjectModal.vue


ファイルの差分が大きいため隠しています
+ 905 - 848
src/views/modules/advertiser/modules/projectListModal.vue


+ 1 - 1
src/views/modules/material/videoMaterial.vue

@@ -1028,7 +1028,7 @@ a {
                         <a-menu-item
                           key="1"
                           v-show="active != '3'"
-                          v-if="userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'"
+                          v-if="items.userId == userInfo().id || role.roleCode == 'designTeamLeader'|| userInfo().id == 'e9ca23d68d884d4ebb19d07889727dae'"
                         >
                           <a
                             href="javascript:;"

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

@@ -1,11 +1,11 @@
-/**
- * @file 政策管理模块配置API
- * @author jiayufei
- */
-
- export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
-//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-//  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
-//  export const urlAcount = 'http://192.168.0.195:9999'; // 测试
-//  export const urlAcount = 'http://192.168.1.181:7005'; //  西安
+/**
+ * @file 政策管理模块配置API
+ * @author jiayufei
+ */
+
+ export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+//  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
+//  export const urlAcount = 'http://192.168.0.195:9999'; // 测试
+//  export const urlAcount = 'http://192.168.1.181:7005'; //  西安
  

+ 29 - 2
src/views/modules/policy-management/policy-management.vue

@@ -359,6 +359,10 @@
                             <span class="line-left-spn">集团简称:</span>
                             <span class="line-right-spn-else">{{ queryByIdList.groupAbbreviation || '-' }}</span>
                         </div>
+                        <div class="policy-line-left">
+                            <span class="line-left-spn">预估利润:</span>
+                            <span class="line-right-spn-else">{{ queryByIdList.estimatedProfit || '-' }}</span>
+                        </div>
                     </div>
                     <div class="line-quen-right">
                         <div class="policy-line-right">
@@ -791,6 +795,16 @@
                                 @change="handleRemarksChange"
                             />
                         </a-form-model-item>
+
+
+                        <a-form-model-item label="预估利润" prop="estimatedProfit">
+                            <a-input
+                                v-model="policyOperationForm.estimatedProfit"
+                                placeholder="请输入预估利润"
+                                allow-clear
+                            />
+                        </a-form-model-item>
+
                     </a-row>
                 </a-form-model>
             </div>
@@ -1058,7 +1072,8 @@
                     dianPayCompanyName: '',
                     dianPayCompanyRebateRate: '',
                     addTimes: [],
-                    remarks: ''
+                    remarks: '',
+                    estimatedProfit: ''
                 },
                 voidId: undefined,
                 reasonForm: {
@@ -1264,6 +1279,17 @@
                         width: 190,
                         scopedSlots: {customRender: 'remarks'}
                     },
+
+
+                    {
+                        title: '预估利润',
+                        align: 'center',
+                        dataIndex: 'estimatedProfit',
+                        width: 190,
+                        scopedSlots: {customRender: 'estimatedProfit'}
+                    },
+
+
                     {
                         title: '操作',
                         dataIndex: 'action',
@@ -1860,7 +1886,7 @@
             },
             // 新增政策确定按钮
             handlePolicyOperationSure() {
-                const {companyName, advancePay, advertiserName, rebateType, mediaType, defaultFormList, customerFlag, addTimes, saleId, areaInfo, companySubjectName, promotionType, groupAbbreviation, rebateRate, accountingPeriod, isDianPay, dianPayCompanyName, dianPayCompanyRebateRate, remarks, id} = this.policyOperationForm;
+                const {companyName, advancePay, advertiserName, rebateType, mediaType, defaultFormList, customerFlag, addTimes, saleId, areaInfo, companySubjectName, promotionType, groupAbbreviation, rebateRate, accountingPeriod, isDianPay, dianPayCompanyName, dianPayCompanyRebateRate, remarks, id, estimatedProfit} = this.policyOperationForm;
                 const paramsData = {
                     policyProductName: defaultFormList.map(item => item.value),
                     policyStartDate: addTimes[0],
@@ -1883,6 +1909,7 @@
                     dianPayCompanyName,
                     dianPayCompanyRebateRate,
                     remarks,
+                    estimatedProfit,
                     createUserName: this.saleShowOption[0].userName || ''
                 };
                 this.$refs.policyOperationForm.validate(valid => {

ファイルの差分が大きいため隠しています
+ 1454 - 1454
src/views/modules/stockWatch/modules/new-keepManage/group-keepManage.vue