朱鑫波 4 éve
szülő
commit
aaae00a902

BIN
src/assets/touxiang.png


+ 175 - 51
src/views/modules/Statistics/imageStatics/imageCostReport.vue

@@ -33,17 +33,19 @@
         
     </div>
     <div class="timeDiv">
-      <div style="margin-right:30px">
+      <div style="margin-right:30px;display:flex;align-items: center;">
         <span>时间范围:</span>
 
-        <a-range-picker
+        <!-- <a-range-picker
           :disabled-date="disabledDate"
           format="YYYY-MM-DD"
           style="width: 250px;"
           @change="dateChange"
           v-model="dateRange"
-        />
-        
+        /> -->
+        <span  @click="opendate">
+          <DatePicker :openOptions='openOptions'  :parentDate='dateValue' left='-100px'></DatePicker>
+        </span> 
       </div>
       <div>
         <span>图片ID:</span>
@@ -82,19 +84,32 @@
             />
         </div>
         <span slot="cost" slot-scope="text">{{ text | decimalsHandle }}</span>
-        <span slot="charge" slot-scope="text">{{ text | decimalsHandle }}</span>
-        <span slot="activation" slot-scope="text">{{ text | decimalsHandle }}</span>
-        <span slot="eventRegister" slot-scope="text">{{ text | decimalsHandle }}</span>
-        <span slot="eventPay" slot-scope="text">{{ text | decimalsHandle }}</span>
-        <span slot="formCount" slot-scope="text">{{ text | decimalsHandle }}</span>
-        <span slot="eventJinJianApp" slot-scope="text">{{ text | decimalsHandle }}</span>
-        <span slot="eventCreditGrantApp" slot-scope="text">{{ text | decimalsHandle }}</span>
+        <span slot="cost" slot-scope="text">{{ text | decimalsHandle }}</span>
+        <span slot="convertCost" slot-scope="text">{{ text | decimalsHandle }}</span>
+        <span slot="photoShowCost" slot-scope="text">{{ text | decimalsHandle }}</span>
+        <span slot="aclickCost" slot-scope="text">{{ text | decimalsHandle }}</span>
+  
+        <span slot="activation" slot-scope="text">{{ text | formatCurrency }}</span>
+        <span slot="eventRegister" slot-scope="text">{{ text | formatCurrency }}</span>
+        <span slot="eventPay" slot-scope="text">{{ text | formatCurrency }}</span>
+        <span slot="formCount" slot-scope="text">{{ text | formatCurrency }}</span>
+        <span slot="eventJinJianApp" slot-scope="text">{{ text | formatCurrency }}</span>
+        <span slot="eventCreditGrantApp" slot-scope="text">{{ text | formatCurrency }}</span>
         <span slot="photoClick" slot-scope="text">{{ text | formatCurrency }}</span>
         <span slot="photoShow" slot-scope="text">{{ text | formatCurrency }}</span>
         <span slot="click" slot-scope="text">{{ text | formatCurrency }}</span>
         <span slot="showNum" slot-scope="text">{{ text | formatCurrency }}</span>
         <span slot="convert" slot-scope="text">{{ text | formatCurrency }}</span>
+        <span slot="bclick" slot-scope="text">{{ text | formatCurrency }}</span>
+        <span slot="aclick" slot-scope="text">{{ text | formatCurrency }}</span>
+
+        <span slot="clickRate" slot-scope="text">{{ text +'%'}}</span>
+        <span slot="convertRate" slot-scope="text">{{ text +'%'}}</span>
+        <span slot="bclickRate" slot-scope="text">{{ text +'%'}}</span>
+        <span slot="photoClickRate" slot-scope="text">{{ text +'%'}}</span>
         
+
+
         <span slot="operation" slot-scope="text">
          {{ text || '未绑定' }}
         </span>
@@ -127,7 +142,7 @@ import { getAction, postAction, downFile, downFilePost } from '@/api/manage'
 
 import { TreeSelect } from 'ant-design-vue';
 const SHOW_PARENT = TreeSelect.SHOW_PARENT;
-
+import DatePicker from '@/components/DatePicker'
 // import selectComponent from './selectComponent'
 // import Treeselect from '../components/Treeselect'
 const TTcolumns = [
@@ -165,12 +180,12 @@ const TTcolumns = [
   },
   
   {
-    title: '消耗',
+    title: '消耗(元)',
     dataIndex: 'cost',
 
     scopedSlots: { customRender: 'cost' },
     align: 'center',
-    // sorter: () => {}
+    sorter: () => {}
   },
   {
     title: '点击数',
@@ -178,7 +193,16 @@ const TTcolumns = [
     align: 'center',
 
     scopedSlots: { customRender: 'click' },
-    // sorter: () => {}
+    sorter: () => {}
+    // (a, b) => a.clickMaterial - b.clickMaterial
+  },
+  {
+    title: '点击率',
+    dataIndex: 'clickRate',
+    align: 'center',
+
+    scopedSlots: { customRender: 'clickRate' },
+    sorter: () => {}
     // (a, b) => a.clickMaterial - b.clickMaterial
   },
   {
@@ -187,7 +211,7 @@ const TTcolumns = [
     align: 'center',
 
     scopedSlots: { customRender: 'showNum' },
-    // sorter: () => {}
+    sorter: () => {}
   },   
   {
     title: '转化数',
@@ -195,7 +219,23 @@ const TTcolumns = [
     align: 'center',
 
     scopedSlots: { customRender: 'convert' },
-    // sorter: () => {}
+    sorter: () => {}
+  },
+  {
+    title: '转化成本',
+    dataIndex: 'convertCost',
+    align: 'center',
+
+    scopedSlots: { customRender: 'convertCost' },
+    sorter: () => {}
+  },
+  {
+    title: '转化率',
+    dataIndex: 'convertRate',
+    align: 'center',
+
+    scopedSlots: { customRender: 'convertRate' },
+    sorter: () => {}
   },
   // {
   //   title: '上传时间',
@@ -241,36 +281,85 @@ const KScolumns = [
   
   {
     title: '消耗',
-    dataIndex: 'charge',
+    dataIndex: 'cost',
 
-    scopedSlots: { customRender: 'charge' },
+    scopedSlots: { customRender: 'cost' },
     align: 'center',
-    // sorter: () => {}
+    sorter: () => {}
   },
   {
-    title: '点击数',
+    title: '封面点击数',
     dataIndex: 'photoClick',
     align: 'center',
 
     scopedSlots: { customRender: 'photoClick' },
-    // sorter: () => {}
+    sorter: () => {}
     // (a, b) => a.clickMaterial - b.clickMaterial
   },
   {
-    title: '展示数',
+    title: '封面点击率',
+    dataIndex: 'photoClickRate',
+    align: 'center',
+
+    scopedSlots: { customRender: 'photoClickRate' },
+    sorter: () => {}
+    // (a, b) => a.clickMaterial - b.clickMaterial
+  },
+  {
+    title: '封面曝光数',
     dataIndex: 'photoShow',
     align: 'center',
 
     scopedSlots: { customRender: 'photoShow' },
-    // sorter: () => {}
-  },   
+    sorter: () => {}
+  }, 
+  {
+    title: '素材曝光数',
+    dataIndex: 'aclick',
+    align: 'center',
+
+    scopedSlots: { customRender: 'aclick' },
+    sorter: () => {}
+  }, 
+  {
+    title: '行为数',
+    dataIndex: 'bclick',
+    align: 'center',
+
+    scopedSlots: { customRender: 'bclick' },
+    sorter: () => {}
+  }, 
+  {
+    title: '行为率',
+    dataIndex: 'bclickRate',
+    align: 'center',
+
+    scopedSlots: { customRender: 'bclickRate' },
+    sorter: () => {}
+  }, 
+  {
+    title: '平均千次封面曝光花费',
+    dataIndex: 'photoShowCost',
+    align: 'center',
+
+    scopedSlots: { customRender: 'photoShowCost' },
+    sorter: () => {}
+  }, 
+  {
+    title: '平均千次素材曝光花费',
+    dataIndex: 'aclickCost',
+    align: 'center',
+
+    scopedSlots: { customRender: 'aclickCost' },
+    sorter: () => {}
+  }, 
   {
     title: '激活数',
     dataIndex: 'activation',
     align: 'center',
 
     scopedSlots: { customRender: 'activation' },
-    // sorter: () => {}
+    sorter: () => {}
   },
   {
     title: '注册数',
@@ -278,7 +367,7 @@ const KScolumns = [
     align: 'center',
 
     scopedSlots: { customRender: 'eventRegister' },
-    // sorter: () => {}
+    sorter: () => {}
   },
   {
     title: '付费数',
@@ -286,7 +375,7 @@ const KScolumns = [
     align: 'center',
 
     scopedSlots: { customRender: 'eventPay' },
-    // sorter: () => {}
+    sorter: () => {}
   },
   {
     title: '表单提交数',
@@ -294,7 +383,7 @@ const KScolumns = [
     align: 'center',
 
     scopedSlots: { customRender: 'formCount' },
-    // sorter: () => {}
+    sorter: () => {}
   },
   {
     title: '完件数',
@@ -302,7 +391,7 @@ const KScolumns = [
     align: 'center',
 
     scopedSlots: { customRender: 'eventJinJianApp' },
-    // sorter: () => {}
+    sorter: () => {}
   },
   {
     title: '授信数',
@@ -310,7 +399,7 @@ const KScolumns = [
     align: 'center',
 
     scopedSlots: { customRender: 'eventCreditGrantApp' },
-    // sorter: () => {}
+    sorter: () => {}
   },
   // {
   //   title: '上传时间',
@@ -327,6 +416,12 @@ let show = 0
 export default {
   data() {
     return {
+        type:0,
+        dateValue:[moment().subtract(1,'days'),moment().subtract(1,'days')],
+        openOptions:false,
+        order:'desc',
+        target:'cost',
+
         tabKeys:1,
         
         accountIds:[],
@@ -402,6 +497,7 @@ export default {
   components: {
     // selectComponent,
     // Treeselect
+    DatePicker,
   },
     methods: {
         tabChange(val){
@@ -411,10 +507,14 @@ export default {
           if(this.tabKeys==1){
                 this.treeData=this.TTaccountList;
                 this.columns=this.TTcolumns;
+                this.target='cost';
+                this.scrollX=0;
                 this.HttpPost('/image/bytedance/cost')
             }else if (this.tabKeys==2){
                 this.treeData=this.KSaccountList;
                 this.columns=this.KScolumns
+                this.target='cost'
+                this.scrollX=2500
                 this.HttpPost('/image/kuaishou/cost')
             } 
         },
@@ -472,13 +572,16 @@ export default {
         },
         sort(pagination, filters, sorter, { currentDataSource }){
             console.log(pagination, filters, sorter)
-            if(sorter.order == 'ascend'){
-                this.HttpPost(sorter.columnKey+'+')
-                return 
-            }else if(sorter.order == 'descend'){
-                this.HttpPost(sorter.columnKey+'-')
-                return 
-            }
+            if(sorter.order == 'ascend'){            
+              this.order='asc'
+              this.target=sorter.columnKey;
+          }else if(sorter.order == 'descend'){
+              this.order='desc'    
+              this.target=sorter.columnKey;
+          }else{            
+                this.target=this.tabKeys==1?'cost':'cost',
+                this.order='desc'           
+          }   
             this.ipagination.current=pagination.current
             this.ipagination.pageSize= pagination.pageSize;
 
@@ -532,13 +635,14 @@ export default {
           this.data=[]
           show = 0
           postAction(url, {
-              startDate: this.timedata[0],
-              endDate: this.timedata[1],        
+              startDate: this.dateValue[0].format('YYYY-MM-DD'),
+              endDate: this.dateValue[1].format('YYYY-MM-DD'),        
               code: this.videoID,
               pageNumber:this.ipagination.current,
               pageSize:this.ipagination.pageSize,
               accountList:this.accountIds,
-              // sort:sort?sort:''
+              order:this.order,
+              target:this.target,
           }).then(res => {
               let resArr = []
               this.loading=false;
@@ -578,10 +682,13 @@ export default {
         }
             
         downFilePost(url, {
-            startDate: this.timedata[0],
-              endDate: this.timedata[1],        
+              
+              startDate: this.dateValue[0].format('YYYY-MM-DD'),
+              endDate: this.dateValue[1].format('YYYY-MM-DD'),        
               code: this.videoID,
               accountList:this.accountIds,
+              order:this.order,
+              target:this.target,
         }).then(res => {
          
             let blob = new Blob([res], {
@@ -679,6 +786,17 @@ export default {
                 }
             })
         },
+
+        opendate(){
+          this.openOptions=!this.openOptions;
+            //  console.log(this.openOptions)
+        },
+        opendateClose(){
+              this.openOptions=false;
+              //  console.log(this.openOptions)
+        },
+
+
   },
   // watch:{
   //     'ipagination.current':function(n,o){
@@ -690,8 +808,7 @@ export default {
   filters: {
     
     toshowTime(val) {
-      // console.log(val, this.timedata)
-      // return this.timedata[0] + '~' + this.timedata[1]
+     
       return val
     },
     toPercentage(val) {
@@ -782,15 +899,22 @@ export default {
           
       }
   },
-
+  watch:{
+    dateValue:{
+        deep:true,
+        handler(){
+            if(this.tabKeys==1){               
+                this.HttpPost('/image/bytedance/cost')
+            }else if (this.tabKeys==2){
+                this.HttpPost('/image/kuaishou/cost')
+            } 
+        }
+      }
+  },
 
   mounted() {
     
-    //进入页面默认展示昨天到今天的数据
-    this.dateRange=[moment().subtract(1,'days'),moment()]
-    this.timedata=[moment().subtract(1
-    ,'days').format('YYYY-MM-DD'),moment().format('YYYY-MM-DD')]
-    // this.loading=true;
+   
    
     this.HttpPost('/image/bytedance/cost')
     this.accountHttp(1);

+ 2 - 1
src/views/modules/Statistics/newPlanStatic/newPlanStatic.vue

@@ -1099,7 +1099,8 @@ export default {
         this.$message.error('请选择具体账户或者运营')
       }
       
-    }
+    },
+    
   },
   watch: {
     dateValue(newName,oldName){

+ 324 - 74
src/views/modules/autoRules/newBlankRule.vue

@@ -17,12 +17,12 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                             <a-form-model-item ref="applyObject"  prop="applyObject">
-                                <a-radio-group v-model="form.applyObject" @change="applyObjChange">
+                             <a-form-model-item ref="eventRuleLevel"  prop="eventRuleLevel">
+                                <a-radio-group v-model="form.eventRuleLevel" @change="applyObjChange">
                                     <a-radio-button value="ACCOUNT">账户</a-radio-button>
-                                    <!-- <a-radio-button value="CAMPAIGN">计划</a-radio-button>
+                                    <a-radio-button value="CAMPAIGN">计划</a-radio-button>
                                     <a-radio-button value="UNIT">组</a-radio-button>
-                                    <a-radio-button value="CREATE">创意</a-radio-button> -->
+                                    <!-- <a-radio-button value="CREATE">创意</a-radio-button> -->
                                 </a-radio-group>
                             </a-form-model-item>
                         </div>
@@ -30,58 +30,58 @@
                     <div class="row-item" >
                         <div class="hint-item"></div>
                         <div class="label-item">
-                            <div class="text-item">应用范围</div>
+                            <div class="text-item">应用账户</div>
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item" > 
-                             <a-form-model-item ref="applyRange" prop="applyRange" v-if="form.applyObject!='ACCOUNT'">
-                                <a-radio-group v-model="form.applyRange">
-                                    <a-radio-button value="ACCORDINGTO_STATUS">按状态筛选</a-radio-button>
-                                    <a-radio-button value="APPOINT">指定</a-radio-button>
-                                </a-radio-group>
-                            </a-form-model-item>
 
-                            <a-form-model-item ref="applyAccount" prop="applyAccount" v-if="form.applyObject=='ACCOUNT'">
+                            <a-form-model-item ref="applyAccount" prop="applyAccount" >
                                 <Treeselect :appId.sync="form.applyAccount" :multiple="false" request="2,4"  ref="treeSelect" />
-
                             </a-form-model-item>
                         </div>
                     </div>
-                    <div class="row-item">
+                    <div class="row-item" v-if="form.eventRuleLevel=='UNIT'">
                         <div class="hint-item"></div>
                         <div class="label-item">
-                            <div class="text-item">规则字段</div>
+                            <div class="text-item">应用计划</div>
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item" > 
-                            <a-form-model-item ref="metricValueCode"  prop="metricValueCode">
-                                 <a-select
-                                    v-model="form.metricValueCode"
-                                    show-search
-                                    placeholder="选择规则字段"
-                                    option-filter-prop="children"
-                                    style="width: 200px"
-                                    :filter-option="filterOption"
-                                    @change="handleChange"
-                                >
-                                    <a-select-option  v-for="item in rulesFieldList" :key="item.id" :value='item.metricValueCode'>
-                                        {{item.metricValueName}}
+
+                            <a-form-model-item ref="campaignId" prop="campaignId" >
+                                <a-select  style="width: 500px" v-model="form.campaignId" allowClear  placeholder="选择具体的计划">
+                                    <a-select-option v-for="item in campaignList" :key='item.id' :value='item.campaignId'>
+                                        {{item.campaignName}}
                                     </a-select-option>
-                                   
                                 </a-select>
                             </a-form-model-item>
-
                         </div>
                     </div>
-                    <div class="row-item" v-if="form.applyRange=='ACCORDINGTO_STATUS'&&form.applyObject!='ACCOUNT'">
+                    <div class="row-item" v-if="form.eventRuleLevel!='ACCOUNT'">
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                            <div class="text-item">应用方式</div>
+                            <div class="required-item"></div>
+                        </div>
+                        <div class="input-item" > 
+                            <a-form-model-item ref="applyRange" prop="applyRange" >
+                                <a-radio-group v-model="form.applyRange" @change="applyRangeChange">
+                                    <a-radio-button value="ACCORDINGTO_STATUS">按状态筛选</a-radio-button>
+                                    <a-radio-button value="APPOINT">指定</a-radio-button>
+                                </a-radio-group>
+                            </a-form-model-item>
+                        </div>
+                    </div>
+                   
+                    <div class="row-item" v-if="form.applyRange=='ACCORDINGTO_STATUS'&&form.eventRuleLevel!='ACCOUNT'">
                         <div class="hint-item"></div>
                         <div class="label-item">
                             <div class="text-item">选择状态</div>
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item" > 
-                            <a-form-model-item ref="status"  prop="status">
-                                <a-select  style="width: 300px" v-model="form.status">
+                            <a-form-model-item ref=" appStatus"  prop=" appStatus">
+                                <a-select  style="width: 300px" v-model="form. appStatus" >
                                     <a-select-option v-for="item in statusList" :key="item.id" :value='item.value'>
                                         {{item.title}}
                                     </a-select-option>
@@ -90,10 +90,10 @@
 
                         </div>
                     </div>
-                    <div class="row-item" v-if="form.applyRange=='APPOINT'&&form.applyObject!='ACCOUNT'">
+                    <div class="row-item" v-if="form.applyRange=='APPOINT'&&form.eventRuleLevel!='ACCOUNT'">
                         <div class="hint-item"></div>
                         <div class="label-item">
-                            <div class="text-item">具体{{form.applyObject | handlerApplyObj}}</div>
+                            <div class="text-item">具体{{form.eventRuleLevel | handlerApplyObj}}</div>
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item" > 
@@ -108,10 +108,16 @@
                                             </a-checkbox>
                                             <div class="inventory-tags-lists-name"><strong>列表</strong></div>
                                         </div>
-                                        <div class="inventory-tags-lists-container">
-                                            <a-checkbox-group v-model="checkedList" :options="plainOptions" @change="onChange" >
-                                                <span></span>
-                                            </a-checkbox-group>
+                                        <div class="inventory-tags-lists-container" v-if="form.applyAccount">
+                                            <a-spin :spinning="spinning">
+                                                <a-checkbox-group v-model="checkedList" :options="plainOptions" @change="onChange" v-show='plainOptions.length'></a-checkbox-group>
+                                                <div style="text-align: center;padding-top:30px" v-show="!plainOptions.length">
+                                                    暂无数据
+                                                </div>
+                                             </a-spin>
+                                        </div>
+                                        <div class="inventory-tags-lists-container" style="text-align: center;padding-top:30px" v-else>
+                                            选择具体账户后,可查看
                                         </div>
                                     </div>
                                     <div class="fenye" v-if="totalPage">
@@ -122,6 +128,32 @@
 
                         </div>
                     </div>
+                    <div class="row-item">
+                        <div class="hint-item"></div>
+                        <div class="label-item">
+                            <div class="text-item">规则字段</div>
+                            <div class="required-item"></div>
+                        </div>
+                        <div class="input-item" > 
+                            <a-form-model-item ref="metricValueCode"  prop="metricValueCode">
+                                 <a-select
+                                    v-model="form.metricValueCode"
+                                    show-search
+                                    placeholder="选择规则字段"
+                                    option-filter-prop="children"
+                                    style="width: 200px"
+                                    :filter-option="filterOption"
+                                    @change="handleChange"
+                                >
+                                    <a-select-option  v-for="item in rulesFieldList" :key="item.id" :value='item.metricValueCode'>
+                                        {{item.metricValueName}}
+                                    </a-select-option>
+                                   
+                                </a-select>
+                            </a-form-model-item>
+
+                        </div>
+                    </div>
                     <div class="row-item" >
                         <div class="hint-item">
                             <a-tooltip>
@@ -164,6 +196,7 @@
                                                 </span>
                                                 
                                             </div>
+                                            <template v-if="form.metricValueCode!='campaignStatus'&&form.metricValueCode!='unitStatus'">
                                             <div class="rules-list-item-subject" >
                                                 <a-select  v-model="item.dataRange">
                                                     <a-select-option  value='CURRENT_DAY_DATA'>当天数据</a-select-option>
@@ -197,7 +230,7 @@
                                                <a-input-number :min="0" style="width:100%" :max="9999999.99" :step="1" v-model="item.threshold" placeholder="请输入" />
                                                <span style="margin-left:8px;line-height:32px">{{item.metricValueCode | handlerDANWEI }}</span>
                                             </div>
-
+                                            </template>
 
                                             <!-- <div class="rules-list-item-subject" v-if="item.judgeType=='DAY_BUDGET'&&item.judgeMethod!='BETWEEN'">
                                                 <a-select   v-model="item.budgetMultiple">
@@ -234,6 +267,31 @@
                                             <!-- <div class="rules-list-item-delete" @click="deleteRulesListItem(item,index)">
                                                 <a-icon type="delete" style="font-size:16px;position: relative;top: 4px;" />
                                             </div> -->
+                                            <div class="rules-list-item-subject" v-if="form.metricValueCode=='campaignStatus'">
+                                                <a-select   v-model="item.campaignStatus" placeholder="请输入具体状态">
+                                                    <a-select-option  value='-1'>不限</a-select-option>
+                                                    <a-select-option  value='1'>已暂停</a-select-option>
+                                                    <a-select-option  value='3'>计划超预算</a-select-option>
+                                                    <a-select-option  value='4'>有效</a-select-option>
+                                                    <a-select-option  value='5'>已删除</a-select-option>
+                                                    <a-select-option  value='6'>余额不足</a-select-option>
+                                                </a-select>
+                                            </div>
+                                            <div class="rules-list-item-subject" v-if="form.metricValueCode=='unitStatus'">
+                                                <a-select   v-model="item.unitStatus" placeholder="请输入具体状态">
+                                                    <a-select-option  value='-1'>不限</a-select-option>
+                                                    <a-select-option  value='1'>计划已暂停</a-select-option>
+                                                    <a-select-option  value='3'>计划超预算</a-select-option>
+                                                    <a-select-option  value='6'>余额不足</a-select-option>
+                                                    <a-select-option  value='11'>审核中</a-select-option>
+                                                    <a-select-option  value='12'>审核未通过</a-select-option>
+                                                    <a-select-option  value='14'>已结束</a-select-option>
+                                                    <a-select-option  value='15'>已暂停</a-select-option>
+                                                    <a-select-option  value='17'>组超预算</a-select-option>
+                                                    <a-select-option  value='19'>未达投放时间</a-select-option>
+                                                    <a-select-option  value='20'>有效</a-select-option>
+                                                </a-select>
+                                            </div>
 
                                         </div>
                                         
@@ -348,36 +406,37 @@ import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 import { Switch } from 'ant-design-vue';
 import Treeselect from '@/views/modules/Statistics/components/Treeselect.vue'
 let statusList=[
-    {
-        id:1,
-        value:'STATUS_ALL',
-        title:'所有',
-    },
+    // {
+    //     id:1,
+    //     value:'STATUS_ALL',
+    //     title:'所有',
+    // },
+    // STATUS_DELIVERY_OK
     {
         id:2,
-        value:'STATUS_DELIVERY_OK',
+        value:"1",
         title:'所有投放中',
     },
-    {
-        id:3,
-        value:'STATUS_CREATE',
-        title:'所有新建',
-    },
-    {
-        id:4,
-        value:'STATUS_DISABLE',
-        title:'所有已暂停',
-    },
-    {
-        id:5,
-        value:'STATUS_AUDIT',
-        title:'所有新建审核',
-    },
-    {
-        id:6,
-        value:'STATUS_DONE',
-        title:'所有已完成',
-    },
+    // {
+    //     id:3,
+    //     value:'STATUS_CREATE',
+    //     title:'所有新建',
+    // },
+    // {
+    //     id:4,
+    //     value:'STATUS_DISABLE',
+    //     title:'所有已暂停',
+    // },
+    // {
+    //     id:5,
+    //     value:'STATUS_AUDIT',
+    //     title:'所有新建审核',
+    // },
+    // {
+    //     id:6,
+    //     value:'STATUS_DONE',
+    //     title:'所有已完成',
+    // },
 ]
 
 
@@ -469,6 +528,7 @@ export default {
     },
     data() {
         return {
+            campaignList:[],
             currentRuleId:'',
             rulesFieldList:[],
             accountID:undefined,
@@ -490,10 +550,11 @@ export default {
             accountList:[],    
             form: {
                 eventRuleName: `空白规则_${moment().format('YYYY_MM_DD_hh:mm:ss')}`,
-                applyObject:'ACCOUNT',
+                eventRuleLevel:'ACCOUNT',
                 applyAccount:'',
+                campaignId:undefined,
                 applyRange:'ACCORDINGTO_STATUS',
-                status:'STATUS_DELIVERY_OK',               
+                appStatus:'1',               
                 sendMessage:1,                
                 checkFrequency:'HOUR',
                 causalCondition:'MEET_ALL', //因果条件 满足所有/满足任意
@@ -524,6 +585,8 @@ export default {
                     judgeType:'MONEY',
                     threshold:0,
                     minThreshold:0,
+                    campaignStatus:undefined,
+                    unitStatus:undefined,
                     // budgetMultiple:0.5,
                     // budgetMultipleMin:0.5,
                     // budgetMultipleMax:0.8,
@@ -534,7 +597,94 @@ export default {
             ]
         }
     },
+    watch:{
+       'form.applyAccount'(n,o){
+           this.campaignList=[];
+           this.form.campaignid=''
+           if(n){
+               this.spinning=true;
+               if(this.form.eventRuleLevel=='CAMPAIGN'){
+                   this.getCampaignList()
+               }else if(this.form.eventRuleLevel=='UNIT'){
+                   this.getCampaignList()
+                    this.getUnitList()
+               }
+
+               
+           }else if(!n){
+               this.plainOptions=[];
+           }
+       },
+       'form.campaignId'(n,o){
+           
+                this.spinning=true;               
+                this.getUnitList()
+
+       }
+    },
     methods: {
+        // 应用方式改变
+        applyRangeChange(e){
+            console.log(e.target.value)
+            this.checkedList=[];
+            this.checkAll=false;
+            this.indeterminate=false;
+            if(e.target.value=='ACCORDINGTO_STATUS'){
+                this.form.appStatus=1;
+            }else{
+                this.form.appStatus=null;
+            }
+
+        },
+        // 获取计划列表
+        getCampaignList(){
+            getAction('/kuaishou/batch/getCampaignList',{
+                accountId:this.form.applyAccount,
+                putStatus:1,
+                pageNo:1,
+                pageSize:100000,
+            }).then(res=>{
+                console.log(res);
+                this.plainOptions=[];
+                this.spinning=false;
+                if(res.success){
+                    if(this.form.eventRuleLevel=='CAMPAIGN'){
+                        this.plainOptions=res.result.records.map(item=>{
+                            return {
+                                ...item,
+                                label:item.campaignName,
+                                value:item.campaignId
+                            }
+                        })
+                    }
+                    
+                    this.campaignList=res.result.records
+                }
+            })
+        },
+        // 获取计划列表
+        getUnitList(){
+            getAction('/kuaishou/batch/getUnitList',{
+                accountId:this.form.applyAccount,
+                campaignId:this.form.campaignId,
+                pageNo:1,
+                pageSize:100000,
+            }).then(res=>{
+                console.log(res);
+                this.plainOptions=[];
+                this.spinning=false;
+                if(res.success){
+                    this.plainOptions=res.result.records.map(item=>{
+                        return {
+                            ...item,
+                            label:item.unitName+'_('+item.reviewDetail+')',
+                            value:item.unitId
+                        }
+                    })
+                }
+            })
+        },
+
         inputCheck(val){
             console.log(val)
         },
@@ -568,6 +718,8 @@ export default {
                     judgeType:'MONEY',
                     threshold:undefined,
                     minThreshold:undefined,
+                    campaignStatus:undefined,
+                    unitStatus:undefined,
                 })
             })
         },
@@ -601,7 +753,8 @@ export default {
                 budgetMultiple:0.5,
                 budgetMultipleMin:0.5,
                 budgetMultipleMax:0.8,
-                
+                campaignStatus:undefined,
+                unitStatus:undefined,
                 threshold:0,
                 maxNumber:0,
             })
@@ -627,12 +780,30 @@ export default {
             item.specificMoneyMax=undefined;
             item.threshold=undefined;
             item.maxNumber=undefined;
+            item.campaignStatus=undefined;
+            item.unitStatus=undefined;
         },
 
         applyObjChange(e){
+            // console.log(e.target.value)
+            this.plainOptions=[]
+            this.checkedList=[];
+            this.checkAll=false;
+            this.indeterminate=false;
             if(e.target.value=='ACCOUNT'){
                 this.form.processMethod='SEND'
             }   
+            if(this.form.applyAccount){
+                if(e.target.value=='CAMPAIGN'){
+                    this.spinning=true;
+                    this.getCampaignList()
+                }else if(e.target.value=='UNIT'){
+                    this.spinning=true;
+                    this.getCampaignList()
+                    this.getUnitList()
+                }
+            }
+            
         },
 
         saveHandler(){
@@ -642,7 +813,53 @@ export default {
                     console.log(valid,this.form);
                     
                     this.saveLoading=true;
-                    let params ={accountId:this.form.applyAccount,alarmEventMetric:this.rulesList,...this.form}
+                    let rel=[]
+                    if(this.form.eventRuleLevel=='CAMPAIGN'){
+                       
+                        rel=this.checkedList.map(item=>{
+                            return {
+                                campaignId:item,
+                                unitId:'',
+                            }
+                        })
+                        
+                    }else if(this.form.eventRuleLevel=='UNIT'){
+                        let checkedList=[];
+                        this.checkedList.forEach(item=>{
+                            this.plainOptions.forEach(ele=>{
+                                if(ele.unitId==item){
+                                    checkedList.push({
+                                        campaignId:ele.campaignId|| '',
+                                        unitId:item
+                                    })
+                                }
+                            })
+                        })
+                        // console.log(checkedList)
+                        rel=this.checkedList.map(item=>{
+                            return {
+                                campaignId:this.form.campaignId|| '',
+                                unitId:item
+                            }
+                        })
+                    }
+                    // console.log(rel)
+                    if(this.form.metricValueCode=='unitStatus'){
+                        // console.log(1)
+                        this.rulesList[0].threshold=this.rulesList[0].unitStatus;
+                        this.rulesList[0].judgeMethod='EQ'
+                    }else if(this.form.metricValueCode=='campaignStatus'){
+                         this.rulesList[0].threshold=this.rulesList[0].campaignStatus
+                         this.rulesList[0].judgeMethod='EQ'
+                    }
+
+                    let params ={
+                        accountId:this.form.applyAccount,
+                        alarmEventMetric:this.rulesList,
+                        rel,
+                        ...this.form
+                    }
+                    console.log(params)
                     if(this.currentRuleId){
                         postAction('/alarm/alarmEventRule/edit',params).then(res=>{
                         console.log(res);
@@ -695,8 +912,8 @@ export default {
         },
 
         onChange(checkedList) {
-            this.indeterminate = !!checkedList.length && checkedList.length < plainOptions.length;
-            this.checkAll = checkedList.length === plainOptions.length;
+            this.indeterminate = !!checkedList.length && checkedList.length < this.plainOptions.length;
+            this.checkAll = checkedList.length === this.plainOptions.length;
         },
         onCheckAllChange(e) {
             let valueOption = [];
@@ -741,7 +958,7 @@ export default {
             return showVal
         },
         handlerDANWEI(val){
-            console.log(val.indexOf("RATE") != -1)
+            // console.log(val.indexOf("RATE") != -1)
 
             let returnVal='';
             
@@ -776,12 +993,42 @@ export default {
                 console.log(res);
                 if(res.success){
                     this.form={
-                        applyObject:'ACCOUNT',
                         causalCondition:'MEET_ALL', //因果条件 满足所有/满足任意
                         applyAccount:res.result.accountId,
                         ...res.result
                     }
-                    this.rulesList=res.result.alarmEventMetrics
+                    this.rulesList=res.result.alarmEventMetrics.map(item=>{
+                        if(item.metricValueCode=='unitStatus_value'){
+                            return {
+                                ...item,
+                                unitStatus:item.threshold
+                            }
+                        }else if(item.metricValueCode=='campaignStatus_value'){
+                            return {
+                                ...item,
+                                campaignStatus:item.threshold
+                            }
+                        }else {
+                            return {
+                                ...item,
+                            }
+                        }
+                        
+                    });
+                    if(res.result.rel){
+                        this.form.applyRange='APPOINT'
+                        this.checkedList=res.result.rel.map(item=>{
+                            if(item.eventRuleLevel=='CAMPAIGN'){
+                                return item.campaignId
+                            }else if (item.eventRuleLevel=='UNIT'){
+                                return item.unitId
+                            }
+                            
+                        })
+                        this.onChange(this.checkedList)
+                    }else{
+                        this.form.applyRange='ACCORDINGTO_STATUS'
+                    }
                     console.log(this.form)
                 }
                 
@@ -1007,6 +1254,9 @@ export default {
           height: 100%;
           padding: 4px 0px;
           border-radius: 0 0 4px 4px;
+          height: 300px;
+          overflow: auto;
+          
         }
 
         .inventory-tags-lists-item {

+ 22 - 3
src/views/modules/workBench/index.vue

@@ -4,7 +4,7 @@
             <p class="breadcrumb">工作台</p>
             <div class="bottom">
                 <div class="touxiang">
-                    <img src="" alt="">
+                    <img src="@/assets/touxiang.png"  alt="">
                 </div>  
                 <div class='tip'>
                     <p class="greet">早安,吴永前,祝你开心每一天!</p>
@@ -196,6 +196,7 @@ import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
 export default {
     data() {
         return {
+            touxiang:'@/assets/touxiang.png',
             // 订单进度
             orderProgressList:[
                 {},
@@ -212,7 +213,8 @@ export default {
             // 分页参数
             totalPage:0,
             currentPage:1,
-
+            userInfo:{},
+            roleCode:''
         }
     },
     methods: {
@@ -222,14 +224,23 @@ export default {
         },
         // 全部订单
         allOrder() {
-            
+            this.$router.push('/workBench/orderList')
         },
         // 发起订单
         sendOrder(){
             this.$router.push('/workBench/placeOrder')
         },
     },
+    mounted(){
+        let userInfo=localStorage.getItem('pro__Login_Userinfo');
+        if(userInfo){
+            this.userInfo=JSON.parse(userInfo).value
+        }
+        this.roleCode=localStorage.getItem('roleCode')
+       
+    }
 }
+
 </script>
 
 <style lang="scss" scoped>
@@ -262,6 +273,14 @@ export default {
             .touxiang{
                 width: 72px;
                 height: 72px;
+                margin-right: 20px;
+                border-radius: 50%;
+                overflow: hidden;
+                img{
+                    width: 100%;
+                    height: 100%;
+                    border-radius: 50%;
+                }
             }
             .tip{
                 .greet{

+ 54 - 65
src/views/modules/workBench/orderList.vue

@@ -104,6 +104,16 @@
 
     }
     .section{
+        background: white;
+        padding:20px ;
+        .breadcrumb{
+            height: 22px;
+            font-size: 12px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #000000;
+            line-height: 22px;
+        }
         .sectionBody{
             
             p{
@@ -277,67 +287,22 @@
 </style>
 <template>
     <div class="orderDetail ">
-        <div class="topBody">
-            <p class="breadcrumb">
+        
+        <div class="section">
+             <p class="breadcrumb">
                 <a-breadcrumb style="display:block;width:100%">
                     <a-breadcrumb-item><router-link to="/workBench">工作台</router-link></a-breadcrumb-item>
                     <a-breadcrumb-item>订单列表</a-breadcrumb-item>
                 </a-breadcrumb>
             </p>
-            <div class="bottom">
-                <div class="left" style="display:flex;width:70%">
-                     <div class="orderIcon">
-                        <img src="@/assets/orderIcon.png" alt="">
-                    </div>  
-                    <div class='tip'>
-                        <p class="greet">订单标题</p>
-                        <p class="descPosition">
-                        <ul>
-                            <li>
-                                <span>订单发起人:{{}}</span>
-                                <span>关联项目:{{}}</span>
-                            </li>
-                            <li>
-                                <span>创建时间:{{}}</span>
-                                <span>设计负责人:{{}}</span>
-                            </li>
-                            <li>
-                                <span>订单周期:{{}}</span>
-                            </li>
-                        </ul>
-                        </p>
-                    </div>
-                </div>
-               
-                <div class="optBody">
-                    <div class="btnBody">
-                        <a-button type='default' style="margin-right:15px" @click="withdrawOrder">撤回订单</a-button>
-                        <a-dropdown>
-                            <a-menu slot="overlay" @click="handleMenuClick">
-                                <a-menu-item key="1">1</a-menu-item>
-                                <a-menu-item key="2">2</a-menu-item>
-                                <a-menu-item key="3">3</a-menu-item>
-                            </a-menu>
-                            <a-button> 更多 <a-icon type="down" /> </a-button>
-                        </a-dropdown>
-                    </div>
-                    <div class="orderInfo">
-                        <div>
-                            <p class="markName">状态</p>
-                            <p class="big">{{ orderInfo.status || '待确定'}}</p>
-                        </div>
-                        <div>
-                            <p class="markName">订单进度</p>
-                            <p class="big">{{orderInfo.progress|| 0 }}%</p>
-                        </div>
-                    </div>
-                </div>
-                
-            </div>
-        </div>
-        <div class="section">
             <div class="sectionBody">
-                
+                <div class="tabBody">
+                    <a-tabs v-model="activeKey" @change='tabChange'>
+                        <a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title" v-if="pane.role=='all'||pane.role==roleCode" >
+                            <!-- {{ pane.content }}{{pane.role+'-'+roleCode}} -->
+                        </a-tab-pane>
+                    </a-tabs>
+                </div>
                 <!-- 素材列表 -->
                 <div class="section-item">
                     <div class="tabBox">
@@ -572,7 +537,22 @@ let marterialData=[
 ]
 export default {
     data() {
+        const panes = [
+            { title: '全部订单', content: '', key: '1' , role:'all' },
+            { title: '我发起的', content: '', key: '2' , role:'all' },
+            { title: '下给我的', content: '', key: '3' , role:'design' },
+            { title: '我参与的', content: '', key: '4' , role:'all' },
+            { title: '待审核的', content: '', key: '5' , role:'all' },
+            { title: '已完成的', content: '', key: '6' , role:'all' },
+            { title: '被驳回的', content: '', key: '7' , role:'all' },
+
+        ];
         return {
+            userInfo:{},
+            roleCode:'',
+
+            panes,
+            activeKey: panes[0].key,
             orderInfo:{
 
             },
@@ -615,6 +595,10 @@ export default {
         }
     },
     methods: {
+        tabChange(key){
+            console.log(key)
+
+        },
         handleChange(value) {
             console.log(`selected ${value}`);
         },
@@ -674,14 +658,14 @@ export default {
         
 
         // tabqiehuan
-        tabChange(key){
-            console.log(key);
-            if(key==1){
-                this.columns=[...materialColumns]
-            }else{
-                this.columns=[...scriptColumns]
-            }
-        },
+        // tabChange(key){
+        //     console.log(key);
+        //     if(key==1){
+        //         this.columns=[...materialColumns]
+        //     }else{
+        //         this.columns=[...scriptColumns]
+        //     }
+        // },
 
         // 素材通过审核
         approved(){
@@ -703,8 +687,13 @@ export default {
             this.orderSponsor='';
         },
     },
-    created(){
-        
+    mounted(){
+        let userInfo=localStorage.getItem('pro__Login_Userinfo');
+        if(userInfo){
+            this.userInfo=JSON.parse(userInfo).value
+        }
+        this.roleCode=localStorage.getItem('roleCode')
+       
     }
 }
 </script>

+ 44 - 51
src/views/modules/workBench/placeOrder.vue

@@ -202,15 +202,8 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                             <a-form-model-item ref="name"  prop="name">
-                               <a-input
-                                    v-model="form.name"
-                                    @blur="
-                                    () => {
-                                        $refs.name.onFieldBlur();
-                                    }
-                                    "
-                                />
+                             <a-form-model-item ref="orderTitle"  prop="orderTitle">
+                               <a-input    v-model="form.orderTitle" />
                             </a-form-model-item>
                         </div>
                     </div>
@@ -221,8 +214,8 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                             <a-form-model-item ref="designLeader"  prop="designLeader">
-                               <a-select  style="width: 300px" v-model="form.designLeader" mode="multiple" placeholder="请选择设计组长">
+                             <a-form-model-item ref="design"  prop="design">
+                               <a-select  style="width: 300px" v-model="form.design" mode="multiple" placeholder="请选择设计组长">
                                     <a-select-option v-for="item in designLeaderList" :key="item.id" :value='item.value'>
                                         {{item.title}}
                                     </a-select-option>
@@ -237,9 +230,9 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                             <a-form-model-item ref="designLeader"  prop="designLeader">
-                               <a-select  style="width: 300px" v-model="form.associatedProject" mode="multiple" placeholder="请选择设计组长">
-                                    <a-select-option v-for="item in associatedProjectList" :key="item.id" :value='item.value'>
+                             <a-form-model-item ref="project"  prop="project">
+                               <a-select  style="width: 300px" v-model="form.project" mode="multiple" placeholder="请选择关联项目">
+                                    <a-select-option v-for="item in projectList" :key="item.id" :value='item.value'>
                                         {{item.title}}
                                     </a-select-option>
                                 </a-select>
@@ -253,28 +246,28 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="deliverySystem"  prop="deliverySystem">
-                                <a-radio-group v-model="form.deliverySystem" @change="deliverySystemChange">
-                                     <a-radio-button value="NONE">不限</a-radio-button>
-                                    <a-radio-button value="IOS">IOS</a-radio-button>
-                                    <a-radio-button value="ANDROID">安卓</a-radio-button> 
+                            <a-form-model-item ref="sysName"  prop="sysName">
+                                <a-radio-group v-model="form.sysName" @change="sysNameChange">
+                                     <a-radio-button :value="3">不限</a-radio-button>
+                                    <a-radio-button :value="1">IOS</a-radio-button>
+                                    <a-radio-button :value="2">安卓</a-radio-button> 
                                 </a-radio-group>
                             </a-form-model-item>
                         </div>
                     </div>
-                    <div class="row-item" v-if="form.deliverySystem=='ANDROID'">
+                    <div class="row-item" v-if="form.sysName==2">
                         <div class="hint-item"></div>
                         <div class="label-item">
                             <div class="text-item">APK链接</div>
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="APKLink"  prop="APKLink">
+                            <a-form-model-item ref="sysPackage"  prop="sysPackage">
                                 <a-input
-                                    v-model="form.APKLink"
+                                    v-model="form.sysPackage"
                                     @blur="
                                     () => {
-                                        $refs.APKLink.onFieldBlur();
+                                        $refs.sysPackage.onFieldBlur();
                                     }
                                     "
                                 />
@@ -300,8 +293,8 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="totalMaterial"  prop="totalMaterial">
-                                <a-input-number :min="1" :max="500"  @change="totalMaterialChange" v-model="form.totalMaterial" />
+                            <a-form-model-item ref="materialAmount"  prop="materialAmount">
+                                <a-input-number :min="1" :max="500"  @change="materialAmountChange" v-model="form.materialAmount" />
                             </a-form-model-item>
                         </div>
                     </div>
@@ -312,8 +305,8 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="averageDayMaterial"  prop="averageDayMaterial">
-                                <a-input-number :min="1" :max="500"  @change="averageDayMaterialChange" v-model="form.averageDayMaterial" />
+                            <a-form-model-item ref="materialAmountDay"  prop="materialAmountDay">
+                                <a-input-number :min="1" :max="500"  @change="materialAmountDayChange" v-model="form.materialAmountDay" />
                             </a-form-model-item>
                         </div>
                     </div>
@@ -342,8 +335,8 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="realPeoleNum"  prop="realPeoleNum">
-                                 <a-input-number :min="1" :max="500"  @change="averageDayMaterialChange" v-model="form.realPeoleNum" />
+                            <a-form-model-item ref="realAmount"  prop="realAmount">
+                                 <a-input-number :min="1" :max="500"  @change="realAmountChange" v-model="form.realAmount" />
                             </a-form-model-item>
                         </div>
                     </div>
@@ -354,8 +347,8 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="clipNum"  prop="clipNum">
-                                 <a-input-number :min="1" :max="500"  @change="averageDayMaterialChange" v-model="form.clipNum" />
+                            <a-form-model-item ref="cutAmount"  prop="cutAmount">
+                                 <a-input-number :min="1" :max="500"  @change="materialAmountDayChange" v-model="form.cutAmount" />
                             </a-form-model-item>
                         </div>
                     </div>
@@ -366,9 +359,9 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="orderNote"  prop="orderNote">
+                            <a-form-model-item ref="orderRemark"  prop="orderRemark">
                                 <a-textarea
-                                    v-model="form.orderNote"
+                                    v-model="form.orderRemark"
                                     placeholder="请输入订单备注"
                                     :auto-size="{ minRows: 3,  }"
                                 />
@@ -382,7 +375,7 @@
                             <div class="required-item"></div>
                         </div>
                         <div class="input-item"> 
-                            <a-form-model-item ref="orderNote"  prop="orderNote">
+                            <a-form-model-item ref="orderRemark"  prop="orderRemark">
                                 <a-upload
                                     action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
                                     :default-file-list="defaultFileList"
@@ -416,26 +409,26 @@ export default {
             defaultFileList:[],
             saveLoading:false,
             form: {
-                name: '',               
-                designLeader:undefined,
-                associatedProject:undefined,
-                deliverySystem:'NONE',
-                APKLink:'',
+                orderTitle: '',               
+                design:undefined,
+                project:undefined,
+                sysName:3,
+                sysPackage:'',
                 dataValue:[],
-                totalMaterial:undefined,
-                averageDayMaterial:undefined,
+                materialAmount:undefined,
+                materialAmountDay:undefined,
                 materialType:'NONE',
-                realPeoleNum:undefined,
-                clipNum:undefined,
-                orderNote:'',
+                realAmount:undefined,
+                cutAmount:undefined,
+                orderRemark:'',
 
             },
             rules: {
-                name: [
+                orderTitle: [
                     { required: true, message: '请填写订单名称', trigger: 'blur' },
                     { min: 2, message: '长度不得小于2', trigger: 'blur' },
                 ],
-                APKLink: [
+                sysPackage: [
                     { required: true, message: '请输入APK链接', trigger: 'blur' },
                     { min: 2, message: '长度不得小于2', trigger: 'blur' },
                 ],
@@ -447,7 +440,7 @@ export default {
             },
             // 操作记录
             designLeaderList:[],
-            associatedProjectList:[],
+            projectList:[],
 
             // 本周项目燃尽图
             burnDownChart:[],
@@ -483,14 +476,14 @@ export default {
         pageChange(page, pageSize){
 
         },
-        deliverySystemChange(val){
+        sysNameChange(val){
             console.log(val);
-            this.form.APKLink='';
+            this.form.sysPackage='';
         },
-        totalMaterialChange(e){
+        materialAmountChange(e){
             console.log(e.target.value)
         },
-        averageDayMaterialChange(){
+        materialAmountDayChange(){
 
         },
         materialTypeChange(val){

+ 1 - 1
vue.config.js

@@ -73,7 +73,7 @@ module.exports = {
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
 
-        // target: 'http://192.168.1.74:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        // target: 'http://192.168.1.43:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
 
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉