Merge branch 'hjw-advert' into 'master'

广告设计工单编号优化

See merge request spfm/spfm-market-front!161

src/pages/main/terminal/advertincrease.vue

@@ -33,7 +33,7 @@
                         </el-form-item> -->
                         <el-form-item prop="num">
                             <span>文件编号</span>
-                            <el-input v-model="infolist.num" placeholder="文件编号" :disabled="disableStatus"></el-input>
+                            <el-input v-model="infolist.num" placeholder="文件编号" :disabled="true"></el-input>
                         </el-form-item>
                         <el-form-item prop="overtime">
                             <span>完成时间</span>
@@ -194,13 +194,13 @@
                     callback()
                 }
             }
-            const num = (rule, value, callback) => {
-                if (!this.infolist.num) {
-                    callback(new Error('不能为空'))
-                } else {
-                    callback()
-                }
-            }
+            // const num = (rule, value, callback) => {
+            //     if (!this.infolist.num) {
+            //         callback(new Error('不能为空'))
+            //     } else {
+            //         callback()
+            //     }
+            // }
             const overtime = (rule, value, callback) => {
                 if (!this.infolist.overtime) {
                     callback(new Error('不能为空'))
@@ -263,11 +263,11 @@
                         trigger: 'change',
                         validator: time
                     }],
-                    num: [{
-                        required: true,
-                        trigger: 'blur',
-                        validator: num
-                    }],
+                    // num: [{
+                    //     required: true,
+                    //     trigger: 'blur',
+                    //     validator: num
+                    // }],
                     overtime: [{
                         required: true,
                         trigger: 'change',
@@ -501,6 +501,15 @@
             this.getTermianl();
             this.getUser();
             this.getlist();
+            var _this = this;
+            let yy = new Date().getFullYear();
+            let mm = new Date().getMonth()+1;
+            let dd = new Date().getDate();
+            let hh = new Date().getHours();
+            let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
+            let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
+            _this.gettime = yy+""+mm+""+dd+""+hh+""+mf+""+ss;
+            this.infolist.num=_this.gettime
         },
         created() {
 

src/pages/main/terminal/components/advert.vue

@@ -38,13 +38,23 @@
                     </el-form-item>
                 </div>
                 <div class="info-line">
+                     <el-form-item>
+                        <span>工单编号</span>
+                        <el-date-picker disabled v-model="infoApply.num" type="date"
+                            placeholder="工单编号">
+                        </el-date-picker>
+                    </el-form-item>
                     <el-form-item>
                         <span>完成时间</span>
                         <el-date-picker disabled v-model="infoApply.overtime" type="date"
                             placeholder="完成时间">
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item>
+                   
+                </div>
+
+                <div class="info-line">
+                     <el-form-item>
                         <span>紧急程度</span>
                         <el-select disabled clearable v-model="infoApply.urgent" placeholder="紧急程度">
                             <el-option v-for="items in fireopt" :key="items.dataCode" :label="items.dataName"
@@ -52,9 +62,6 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                </div>
-
-                <div class="info-line">
                     <el-form-item>
                         <span>素材类型</span>
                         <el-select disabled clearable v-model="infoApply.materType" placeholder="素材类型">