广告设计: 1. 定稿后显示的工单数与实际不符 2.需求提交时只能选择当天+3天之后的日期。3.两处选择素材类型二者保留一个

src/pages/main/terminal/advcheck.vue

@@ -49,7 +49,7 @@
                 </div>
             </el-dialog>
 
-            <el-dialog title="定稿素材" :visible.sync="dialogStatusc" width="50%" :destroy-on-close="true"
+            <!-- <el-dialog title="定稿素材" :visible.sync="dialogStatusc" width="50%" :destroy-on-close="true"
                 :modal-append-to-body="false" :close-on-click-modal="false">
                 <el-form>
                     <el-form-item class="info-line online">
@@ -65,7 +65,7 @@
                     <el-button @click="dialogCli(1)" type="primary">确 定</el-button>
                     <el-button @click="dialogCli(2)">取 消</el-button>
                 </div>
-            </el-dialog>
+            </el-dialog> -->
 
         </div>
     </fullscreen>
@@ -201,15 +201,10 @@
             },
             advSure(v) {
                 let _this = this;
-                this.dialogStatusc = true;
+                // this.dialogStatusc = true;
                 this.dgid = v.id;
                 this.getSts(v);
-            },
-            dialogCli(v) {
-                let _this = this;
-
-                if (v == 1) {
-                    let advTypeName = '';
+                let advTypeName = '';
                     for (let i = 0; i < this.typeList.length; i++) {
                         if (this.typeList[i].dataCode == this.advtype) {
                             advTypeName = this.typeList[i].dataName;
@@ -223,7 +218,7 @@
                     let gdParam = {
                         woNo: this.dgid,
                         advTypeName: advTypeName,
-                        advType: this.advtype
+                        // advType: this.advtype
                     }
                     
                     this.shParam.params.terminalRes = JSON.stringify(Object.assign(JSON.parse(this.shParam.params.terminalRes) , gdParam))
@@ -252,7 +247,57 @@
                             _this.getList(_this.params, _this.pageSize);
                         }
                     });
-                }
+                    this.advtype = '';
+                
+            },
+            dialogCli(v) {
+                let _this = this;
+
+                // if (v == 1) {
+                //     let advTypeName = '';
+                //     for (let i = 0; i < this.typeList.length; i++) {
+                //         if (this.typeList[i].dataCode == this.advtype) {
+                //             advTypeName = this.typeList[i].dataName;
+                //         }
+                //     }
+                //     // let param = {
+                //     //     woNo: this.dgid,
+                //     //     advTypeName: advTypeName,
+                //     //     advType: this.advtype
+                //     // }
+                //     let gdParam = {
+                //         woNo: this.dgid,
+                //         advTypeName: advTypeName,
+                //         advType: this.advtype
+                //     }
+                    
+                //     this.shParam.params.terminalRes = JSON.stringify(Object.assign(JSON.parse(this.shParam.params.terminalRes) , gdParam))
+                    
+                //     let param = this.shParam
+
+                //     this.$http({
+                //         // url: "/market/cadv/mkConfirmAdv",
+                //         url: "/bpm/api/submitTask",
+                //         method: "post",
+                //         headers: {
+                //             "Content-Type": "application/json",
+                //         },
+                //         data: param,
+                //     }).then((res) => {
+                //         if (res.data.result === 1) {
+                //             _this.$message({
+                //                 message: res.data.desc,
+                //                 type: 'error'
+                //             });
+                //         } else {
+                //             _this.$message({
+                //                 message: '成功',
+                //                 type: 'success'
+                //             });
+                //             _this.getList(_this.params, _this.pageSize);
+                //         }
+                //     });
+                // }
                 this.dialogStatusc = false;
                 this.advtype = '';
                 return

src/pages/main/terminal/advertincrease.vue

@@ -37,7 +37,7 @@
                         </el-form-item>
                         <el-form-item prop="overtime">
                             <span>完成时间</span>
-                            <el-date-picker v-model="infolist.overtime" type="date" placeholder="完成时间">
+                            <el-date-picker v-model="infolist.overtime" type="date" placeholder="完成时间" :pickerOptions = "pickerOptions">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item prop="urgent">
@@ -343,6 +343,21 @@
                 depttype: 0,
             }
         },
+        computed:{
+             pickerOptions:function(){
+                 return {
+                     disabledDate(time) {
+                        // if(time.getTime() < Date.now() - 8.64e7 || (time.getTime() > Date.now() && time.getTime() < Date.now() + 8.64e7*3) ){
+                        //     return true
+                        // }
+                        if(time.getTime() < Date.now() + 8.64e7*3){
+                            return true
+                        }
+                        
+                    }
+                 }
+             }
+        },
         methods: {
             deletes() {
             	this.treeListonly = {};

src/pages/main/terminal/advertisement.vue

@@ -18,7 +18,8 @@
 
                     <div class="adv-tit" @click="jumpadv('2')">
                         <i class="el-icon-notebook-1"></i>
-                        <span>定稿 <em>{{info.designNum||0}}</em></span>
+                        <!-- <span>定稿 <em>{{info.designNum||0}}</em></span> -->
+                        <span>定稿 <em>{{info.finalNum||0}}</em></span>
                     </div>
                     <div class="adv-tit" @click="jumpinfo">
                         <span>广告设计费明细</span>