ソースを参照

Merge branch 'feature/work-test' of http://git.tjyourong.com.cn/ctop/adsp-vue into feature/work-test

朱鑫波 3 年 前
コミット
d142f0facb

+ 23 - 6
src/views/modules/advertiser/modules/ProjectModal.vue

@@ -57,7 +57,7 @@
         <div v-show="model.mediaId == '2' || model.mediaId == '4'">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优化目标">
             <a-select @change="bidTypeChange($event)" @deselect="bidtypedeselect"
-              v-decorator="['bidType', { rules: [{ required: true, message: '请选择优化目标' }], initialValue: 2 }]"
+              v-decorator="['bidType', { rules: [{ required: true, message: '请选择优化目标' }],}]"
               mode="multiple">
               <a-select-option :value="2">点击数</a-select-option>
               <a-select-option :value="10">OCPM</a-select-option>
@@ -84,7 +84,7 @@
             </a-form-item>
 
             <div v-if="Array.isArray(getFormFieldValue('ocpxActionType'))">
-              <a-form-item v-show="getFormFieldValue('ocpxActionType').length > 0" :labelCol="labelCol"
+              <a-form-item v-if="getFormFieldValue('ocpxActionType').length > 0" :labelCol="labelCol"
                 :wrapperCol="wrapperCol" v-for="(item, index) in ocpxActionTypeArray" :key="index"
                 :label="item.ocpxName+'最高出价'">
                 <a-input @input="maxValueInput"
@@ -344,10 +344,17 @@
 
       ...mapGetters(['nickname', 'avatar', 'userInfo']),
       onChange(e) {
+        console.log(this.ocpxActionTypeArray);
         console.log(e);
+        
         if (e.target.value == 1 || e.target.value == 3) {
-          this.ocpxActionTypeArray = [];
-          this.depthArray = [];
+         console.log(this.model.maxBid);
+         this.$nextTick(()=>{
+           this.form.setFieldsValue({maxBid:this.model.maxBid})
+         })
+          
+          // this.form.maxBid = this.model.maxBid ? this.model.maxBid / 1000 : 0
+          // console.log(this.form.getFieldValue('maxBid'));
         }
         console.log(`checked = ${e.target.value}`)
         // this.form.resetFields([])
@@ -574,11 +581,21 @@
               }
               var data = values.advertiserId
               let formData = Object.assign(this.model, values)
-              //   if(this.model.mediaId)
+                if (this.model.mediaId == 1 || this.model.mediaId == 3) {
+                  this.ocpxActionTypeArray = [];
+                  this.depthArray = [];
+                  formData.bidType = [];
+                }
+                
               if (this.maxBidShow) {
                 formData.maxBid = formData.maxBid * 1000
               }else{
-                formData.maxBid = 0
+               if (this.model.mediaId == 1 || this.model.mediaId == 3) {
+                formData.maxBid = formData.maxBid * 1000
+               }else{
+                 formData.maxBid = 0
+               }
+                
               }
               // formData.maxBid = formData.maxBid * 1000
               formData.maxDeepCpaBid = formData.maxDeepCpaBid * 1000

+ 2 - 2
src/views/modules/advertiser/modules/projectListModal.vue

@@ -46,9 +46,9 @@
           :wrapperCol="wrapperCol" label="最高出价">
           <a-input placeholder="请输入最高出价" v-decorator="['maxBid', validatorRules.maxBid]" addonAfter="元" />
         </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="最高转化出价">
+        <!-- <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="最高转化出价">
           <a-input placeholder="最高转化出价" v-decorator="['maxDeepCpaBid']" addonAfter="元" />
-        </a-form-item>
+        </a-form-item> -->
         <div v-if="showDian">
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优化目标">
             <a-select v-decorator="['bidType', { initialValue: 2 }]" mode="multiple" @change="bidTypeChange($event)" @deselect="bidtypedeselect">