演练bug修改

src/views/core/materials/index.vue

@@ -28,11 +28,10 @@
             </el-select>
           </el-form-item>
 
-
           <el-form-item label="资料状态" prop="isOpen">
-            <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" clearable>
-              <el-option v-for="item in openOption" :key="item.value" :label="item.label"
-                         :value="item.value"></el-option>
+            <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" style="width: 100%;" clearable>
+              <el-option v-for="dict in dict.type.materials_status" :key="dict.value" :label="dict.label"
+                         :value="parseInt(dict.value)"></el-option>
             </el-select>
           </el-form-item>
 
@@ -53,41 +52,7 @@
             >新增
             </el-button>
           </el-col>
-<!--          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit-outline"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['core:materials:edit']"
-            >修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['core:materials:remove']"
-            >删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['core:materials:export']"
-            >导出
-            </el-button>
-          </el-col>-->
+
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         <!-- 表格数据 -->
@@ -96,19 +61,25 @@
           height="600"
           size="small"
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
-          <el-table-column  label="序号"  type="index" align="center" width="60"/>
-          <el-table-column label="创建机构"  align="left" width="200" prop="orgName"/>
-          <el-table-column label="资料名称"   align="left" width="160" prop="title"/>
+          <el-table-column label="序号" type="index" align="center" width="60"/>
+          <el-table-column label="创建机构" align="left" width="200" prop="orgName"/>
+          <el-table-column label="资料名称" align="left" width="160" prop="title"/>
 
           <el-table-column label="资料类型" align="center" width="180" prop="knowledgeId">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.edu_materials_type" :value="scope.row.knowledgeId"/>
+              <dict-tag :options="dict.type.edu_materials_type" :value="parseInt(scope.row.knowledgeId)"/>
             </template>
           </el-table-column>
           <!-- <el-table-column label="资料附件"  width="200" align="left" prop="fileNames"/> -->
-          <el-table-column label="资料状态" align="center" prop="isOpen">
-            <template slot-scope="r">{{ r.row.isOpen == 0 ? '待发布' : '已发布' }}</template>
+          <!--          <el-table-column label="资料状态" align="center" prop="isOpen">
+                      <template slot-scope="r">{{ r.row.isOpen == 0 ? '待发布' : '已发布' }}</template>
+                    </el-table-column>-->
+          <el-table-column label="资料状态" align="center" header-align="center" prop="isOpen">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.materials_status" :value="scope.row.isOpen"/>
+            </template>
           </el-table-column>
+
           <el-table-column label="创建人" align="center" prop="createBy"/>
           <el-table-column label="创建时间" align="center" prop="createTime"/>
           <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>
@@ -117,7 +88,7 @@
             <template slot-scope="scope">
               <!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button
-                v-if="checkCanEditOpen(scope.row)&&scope.row.isOpen==0"
+                v-if="checkCanEditOpen(scope.row)&&(scope.row.isOpen==0||scope.row.isOpen==2)"
                 size="mini"
                 type="text"
                 icon="el-icon-folder-opened"
@@ -127,7 +98,7 @@
               </el-button>
               <!-- 取消公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于公开状态-->
               <el-button
-                v-if="checkCanEditOpen(scope.row)&&scope.row.isOpen===1"
+                v-if="checkCanEditOpen(scope.row)&&scope.row.isOpen==1"
                 size="mini"
                 type="text"
                 icon="el-icon-folder"
@@ -184,24 +155,20 @@
         </el-form-item>
 
         <el-form-item label="资料类型" prop="knowledgeId">
-<!--          <el-select style="width: 100%" v-model="form.knowledgeId" placeholder="请选择资料类型">
-            <el-option v-for="item in knowledgeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>-->
-
-          <el-select  style="width: 100%"  v-model="form.knowledgeId" placeholder="请选择资料类型">
+          <el-select style="width: 100%" v-model="form.knowledgeId" placeholder="请选择资料类型">
             <el-option v-for="dict in dict.type.edu_materials_type" :key="dict.value" :label="dict.label"
                        :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
 
-<!--        <el-form-item label="资料内容" prop="content">
-          <el-input v-model="form.content" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
-        </el-form-item>-->
+        <!--        <el-form-item label="资料内容" prop="content">
+                  <el-input v-model="form.content" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
+                </el-form-item>-->
 
         <el-form-item label="资料附件" prop="fileList">
-          <K-file-upload  ref="upload" :isShowUploadBtn="title!='知识库详情'"
-          :defaultValue="formFileListDefualtValue"
-          v-model="form.fileList"/>
+          <K-file-upload ref="upload" :isShowUploadBtn="title!='知识库详情'"
+                         :defaultValue="formFileListDefualtValue"
+                         v-model="form.fileList"/>
         </el-form-item>
 
         <el-form-item prop="remark" label="备注">
@@ -237,9 +204,9 @@ import KTextarea from "@/components/common/textarea.vue";
 
 export default {
   name: "Materials",
-  components: {OrgTree, kOrgTree, KFileUpload,KTextarea},
+  components: {OrgTree, kOrgTree, KFileUpload, KTextarea},
   mixins: [tableList],
-  dicts: ["edu_materials_type"],
+  dicts: ["edu_materials_type", 'materials_status'],
   data() {
     return {
       // 遮罩层
@@ -270,10 +237,10 @@ export default {
         children: "children",
         label: "name"
       },
-      formFileListDefualtValue:[],
+      formFileListDefualtValue: [],
       // 查询参数
       queryParams: {
-        checkSub:true,
+        checkSub: true,
         pageNum: 1,
         pageSize: 10,
         title: null,
@@ -296,7 +263,7 @@ export default {
         content: [
           {required: true, message: "资料内容不能为空", trigger: "blur"}
         ],
-        fileList:[
+        fileList: [
           {required: true, message: "资料附件不能为空", trigger: "blur"}
         ],
       },
@@ -377,7 +344,7 @@ export default {
         orgId: this.$store.getters.orgId,
         isOpen: null,
         remark: null,
-        fileNames:null,
+        fileNames: null,
         fileList: [],
       };
       // this.formFileListDefualtValue=[];
@@ -472,7 +439,7 @@ export default {
       const id = row.id || this.ids
       getMaterials(id).then(response => {
         this.form = response.data;
-        this.formFileListDefualtValue=this.form.fileList;
+        this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
         this.title = "修改知识库";
       });
@@ -483,7 +450,7 @@ export default {
       const id = row.id || this.ids
       getMaterials(id).then(response => {
         this.form = response.data;
-        this.formFileListDefualtValue=this.form.fileList;
+        this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
         this.title = "知识库详情";
       });
@@ -532,7 +499,8 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.endItem .el-input__inner{
+
+.endItem .el-input__inner {
   padding-right: 50px;
 }
 </style>