Merge branch 'sckj' into 'master'

Sckj

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

src/pages/main/iptv/planApproval.vue

@@ -12,7 +12,7 @@
                         :row-style="tableRowClassName"
                         tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
                     <el-table-column prop="itemName" label="申请事项" width="200"></el-table-column>
-                    <el-table-column prop="planPurpose" label="策划目的" ></el-table-column>
+                    <el-table-column prop="planPurpose" label="策划目的" :formatter="formatter" ></el-table-column>
                     <el-table-column prop="createTime" label="申请时间" width="150"></el-table-column>
                     <el-table-column prop="createName" label="申请人" width="100"></el-table-column>
                     <el-table-column prop="queryStatus" label="状态" width="100">
@@ -52,7 +52,7 @@
                             <el-form-item prop="itemName" class="form-item">
                                 <el-input v-if="this.formStatus!=2 && '06'.includes(infolist.status)"
                                 v-model.trim="infolist.itemName" placeholder="请输入申请事项内容"
-                                          :disabled="disableStatus" >
+                                          :disabled="disableStatus" maxlength="61">
                                 </el-input>
                                 <div v-if="this.formStatus===2 || !'06'.includes(infolist.status)"
                                  class="el-descriptions">{{infolist.itemName}}</div>
@@ -75,7 +75,7 @@
                             <el-form-item prop="otherName" class="form-item">
                                 <el-input v-if="this.formStatus!=2 && '06'.includes(infolist.status)"
                                  v-model.trim="infolist.otherName"
-                                :disabled="disableStatus" placeholder="请输入其他频道名称"  ></el-input>
+                                :disabled="disableStatus" placeholder="请输入其他频道名称"  maxlength="17" ></el-input>
                                 <div v-if="this.formStatus===2 || !'06'.includes(infolist.status)"
                                  class="el-descriptions">{{infolist.otherName}}</div>
                             </el-form-item>
@@ -244,6 +244,39 @@ export default {
             }
 
         }
+
+        const itemNameRule = (rule, value, callback) => {
+            if(value) {
+                let  trimValue = value.replace(/^\s+|\s+$/gm,'');
+                if (!trimValue) {
+                    callback(new Error('不能为空'))
+                } else {
+                    if (value.length>60){
+                        callback(new Error('不能超过60个字'))
+                    }
+                    callback()
+                }
+            }else{
+                callback(new Error('不能为空'))
+            }
+        }
+
+        const otherNameRule = (rule, value, callback) => {
+            if(value) {
+                let  trimValue = value.replace(/^\s+|\s+$/gm,'');
+                if (!trimValue) {
+                    callback(new Error('不能为空'))
+                } else {
+                    if (value.length>16){
+                        callback(new Error('不能超过16个字'))
+                    }
+                    callback()
+                }
+            }else{
+                callback(new Error('不能为空'))
+            }
+        }
+
         const urls = {
             uploadUrl:'/market/iptv/upload',
             downfileUrl:'/market/iptv/downfile'
@@ -300,7 +333,7 @@ export default {
                 itemName: [{
                     required: true,
                     trigger: 'change',
-                    validator: nullRule
+                    validator: itemNameRule
                 }],
                 channelName: [{
                     required: true,
@@ -310,7 +343,7 @@ export default {
                 otherName: [{
                     required: true,
                     trigger: 'change',
-                    validator: nullRule
+                    validator: otherNameRule
                 }],
                 planPurpose: [{
                     required: true,
@@ -525,7 +558,11 @@ export default {
                 }
                 if(this.infolist.status==='2') this.nextStep="[分管副总]";
                 if(this.infolist.status==='6') this.nextStep="[频道负责人]";
-
+                if (this.infolist.channelName==='其他'){
+                    this.isOther = true;
+                }else{
+                    this.isOther = false;
+                }
                 this.loading = false;
             });
         },
@@ -700,6 +737,18 @@ export default {
                 return stylejson;
             }
             return ''
+        },
+        formatter(row, column) {
+            if (row.planPurpose){
+                if (row.planPurpose.length>100){
+                    return row.planPurpose.slice(1,100)+"......";
+                }else{
+                    return row.planPurpose;
+                }
+            }else{
+                return row.planPurpose;
+            }
+
         }
     },
     mounted() {