展板内容管理修改

src/page/content/display/content/add.vue

@@ -27,7 +27,7 @@
                 
               </el-form-item> -->
               <el-form-item label="展板名称" prop="name" class="w100">
-                <el-input oninput="value = value.trim()" v-model="ruleForm.name"></el-input>
+                <el-input oninput="value = value.trim()" v-model="ruleForm.name" maxlength="30"></el-input>
               </el-form-item>
 
               <el-form-item label="展板版权方" class="w50" prop="boardCopyrightOwnerId">
@@ -67,7 +67,7 @@
                 <upload-qrcode :fileList="ruleForm.qrcodeList" @qrcodeUrl="qrcodeUrl" ></upload-qrcode>
               </el-form-item>
               <el-form-item label="展板简介" style="width:100%" prop="remarks">
-                <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
+                <el-input type="textarea" v-model="ruleForm.remarks" maxlength="2000"></el-input>
               </el-form-item>
             </el-form>
           </el-collapse-item>
@@ -200,7 +200,7 @@ export default {
       rules: {
         name: [
           { required: true, message: "请输入版权方名称", trigger: "blur" },
-          { min: 1, max: 20, message: "请输入1到20个字" },
+          { min: 1, max: 30, message: "请输入1到30个字" },
         ],
         boardCopyrightOwnerId: [
           { required: true, message: "请选择展板版权方", trigger: "change" }
@@ -208,15 +208,15 @@ export default {
         exhibitionBoardCatId: [
           { required: true, message: "请选择展板分类", trigger: "change" }
         ],
-        videoContentCopyrightOwnerId: [
-          { required: true, message: "请选择视频版权方", trigger: "change" }
-        ],
-        videoContentCatId: [
-          { required: true, message: "请选择视频分类", trigger: "change" }
-        ],
-        videoContentId: [
-          { required: true, message: "请选择视频", trigger: "change" }
-        ],
+        // videoContentCopyrightOwnerId: [
+        //   { required: true, message: "请选择视频版权方", trigger: "change" }
+        // ],
+        // videoContentCatId: [
+        //   { required: true, message: "请选择视频分类", trigger: "change" }
+        // ],
+        // videoContentId: [
+        //   { required: true, message: "请选择视频", trigger: "change" }
+        // ],
         audioIdList:[
           { required: true, message: "请上传音频", trigger: "blur" }
         ],
@@ -313,6 +313,11 @@ export default {
     submitForm(formName) {
       // console.log(this.ruleForm)
       this.$refs[formName].validate(valid => {
+        if (this.ruleForm.videoContentCopyrightOwnerId !== '' && this.ruleForm.videoContentCatId === '') {
+              this.$message({type: "error", message: '请选择视频分类！' })
+            }else if(this.ruleForm.videoContentCopyrightOwnerId !== '' && this.ruleForm.videoContentCatId !== '' && this.ruleForm.videoContentId ==='') {
+              this.$message({type: "error", message: '请选择视频！' })
+            }else{
         if (valid) {
           this.$https(
             {
@@ -322,6 +327,7 @@ export default {
             },
             this.$qs.stringify(this.ruleForm)
           ).then(res => {
+            
              if(res.data.resultCode === "200"){
                 this.$message({ type: "success", message: "新增展板申请已提交,待审核！" });
                 history.go(-1);
@@ -331,7 +337,7 @@ export default {
           }).catch(function(err) {
               console.log(err);
           });
-        }
+        }}
       });
     },
     // 修改

src/page/content/display/content/index.vue

@@ -221,7 +221,7 @@ export default {
         .then(res => {
           let data = res.data.data;
           vm.page.total = data.total;
-          vm.tableData = data.records;
+          vm.tableData = data.records; 
         })
         .catch(function(err) {
           console.log(err);

src/page/content/learn/content/add.vue

@@ -21,8 +21,11 @@
           <el-form-item label="学习内容名称" prop="name" class="w50" style="padding-right: 100px">
             <el-input oninput="value = value.trim()" v-model="ruleForm.name"></el-input>
           </el-form-item>
-          <el-form-item label="适用范围">
-            <span v-show="userType === '1'">全平台</span>
+          <el-form-item label="适用范围" prop="applicableScope">
+            <!-- <span v-show="userType === '1'" value="ALL_PLAT">全平台</span> -->
+            <el-radio-group v-show="userType === '1'" v-model="ruleForm.applicableScope">
+              <el-radio v-show="userType === '1'" label="ALL_PLAT">全平台</el-radio>
+            </el-radio-group>
             <el-radio-group v-show="userType !== '1'" v-model="ruleForm.applicableScope">
               <el-radio label="THIS_ORGAN">仅本单位</el-radio>
               <el-radio label="THIS_ORGAN_SUB">本单位及下属单位</el-radio>
@@ -218,7 +221,7 @@ export default {
       tableData: [],
       ruleForm: {
         name: "", //学习内容名称
-        applicableScope: "ALL_PLAT", //适用范围
+        applicableScope: "", //适用范围
         cover: "", //宣传图
         projectId: '',
         learningProjectId: "", //所属学习项目
@@ -231,6 +234,12 @@ export default {
           { required: true, message: "请输入学习内容名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        applicableScope: [
+          {
+            required: true,
+            message: "请选择适用范围"
+          }
+        ],
         cover: [
           {
             required: true,

src/page/content/learn/content/details.vue

@@ -51,7 +51,7 @@
               </el-form-item>
             </el-form>
           </el-collapse-item>
-          <el-collapse-item title="展板列表" name="3">
+          <el-collapse-item title="展板列表" name="10">
               <!-- {{tableData}} -->
             <div class="party-table">
               <!-- {{tableData[0]}} -->