测试迭代

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

@@ -90,28 +90,30 @@
             </template>
           </el-table-column>
           <el-table-column label="操作" width="280" header-align="center" align="center">
+            <!-- 只有下架可编辑、删除,只有通过可上架、下架 -->
             <template slot-scope="scope" >
                <div class="table-btn-group">
                 <el-tooltip content="修改" placement="top">
-                  <el-button circle @click="openEdit(scope.row)">
+                  <el-button circle :disabled="scope.row.published" @click="openEdit(scope.row)">
                     <i class="icon-table icon-edit"></i>
                   </el-button>
                 </el-tooltip>
+                <el-tooltip content="删除"  placement="top">
+                  <el-button circle :disabled="scope.row.published" @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip>
                 <el-tooltip content="上架" placement="top">
-                  <el-button circle :disabled="!!scope.row.published" @click="handlePublish(scope.row,true)">
+                  <el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'"  v-show="!scope.row.published" @click="handlePublish(scope.row,true)">
                     <i class="icon-table icon-enable"></i>
                   </el-button>
                 </el-tooltip>
                  <el-tooltip content="下架" placement="top">
-                  <el-button circle :disabled="!scope.row.published" @click="handlePublish(scope.row,false)">
+                  <el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'" v-show="scope.row.published" @click="handlePublish(scope.row,false)">
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
-                <el-tooltip content="删除" placement="top">
-                  <el-button circle @click="handleDelete(scope.row)">
-                    <i class="icon-table icon-del"></i>
-                  </el-button>
-                </el-tooltip>
+                
                 <el-tooltip content="详情" placement="top">
                   <el-button circle @click="displayInfo(scope.row)">
                     <i class="icon-table icon-detail"></i>
@@ -284,6 +286,7 @@ export default {
     },
     // 上下架
     handlePublish(row ,isPublish) {
+      let _isPublish = isPublish
       let _this = this;
       _this
             .$https({
@@ -294,10 +297,23 @@ export default {
             _this.$qs.stringify({isPublish:isPublish}))
             .then(
               res => {
-                _this.msgInfo = {
-                  type: "wait",
-                  des: `申请已提交，待审核…`,
-                };
+                // _this.msgInfo = {
+                //   type: "wait",
+                //   des: `申请已提交，待审核…`,
+                // };
+                 if(res.data.resultCode === "200"){
+                   if(_isPublish){
+                     this.$message({ type: "success", message: "上架申请已提交,待审核！" });
+                   }else{
+                     this.$message({ type: "success", message: "下架申请已提交,待审核！" });
+                   }
+                   
+                
+                _this.Search();
+              }else{
+                this.$message({ type: "error", message: res.data.message });
+              }
+
                 _this.onSearch();
               },
               error => {

src/page/content/learn/content/index.vue

@@ -5,7 +5,7 @@
         <el-form-item>
           <el-input
             placeholder="请输入学习内容名称"
-            v-model="form.name"
+            v-model="form.nameOrCode"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
@@ -102,8 +102,9 @@
           </el-table-column>
           <el-table-column label="使用状态" prop="published">
             <template slot-scope="scope">
-              <span v-if="scope.row.published">禁用</span>
-              <span v-else>启用</span>
+              <!-- {{scope.row.published}} -->
+              <span v-if="scope.row.published">启用</span>
+              <span v-else>禁用</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -138,12 +139,12 @@
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="启用" placement="top">
-                  <el-button circle @click="handlePublish(scope.row, 'True')">
+                  <el-button circle v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
                     <i class="icon-table icon-enable"></i>
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="禁用" placement="top">
-                  <el-button circle @click="handlePublish(scope.row, 'False')">
+                  <el-button circle  v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
@@ -401,7 +402,7 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name,
+        nameOrCode: _this.form.nameOrCode,
         startDate: this.value1 ? this.value1[0] : "",
         endDate: this.value1 ? this.value1[1] : "",
       };

src/page/content/video/content/add.vue

@@ -199,7 +199,7 @@ export default {
       },
       rules: {
         name: [
-          { required: true, message: "请输入版权方名称", trigger: "blur" }
+          { required: true, message: "请输入视频名称", trigger: "blur" }
           // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
         ],
         videoContentCopyrightOwnerId:[