yangg 6 сар өмнө
parent
commit
9648ad6810

+ 94 - 93
ui/src/views/system/document/category/components/dataInfo.vue

@@ -2,7 +2,6 @@
   <div class="data-info">
     <el-card>
       <el-form :model="dataForm" label-width="120px">
-
         <el-form-item label="分类名称:">
           <el-input v-model="dataForm.name"></el-input>
         </el-form-item>
@@ -12,114 +11,116 @@
         </el-form-item>
 
         <el-form-item label="分类状态:">
-          <el-select v-model="dataForm.status"  placeholder="请选择分类状态" size="large" style="width:100%;">
-              <el-option
-                v-for="item in statusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+          <el-select
+            v-model="dataForm.status"
+            placeholder="请选择分类状态"
+            size="large"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in statusOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </el-form-item>
-
       </el-form>
     </el-card>
-    <div style="text-align:right; margin-top:20px;">
-        <el-button type="warning" @click="btnSave">确认保存</el-button>
+    <div style="text-align: right; margin-top: 20px">
+      <el-button type="warning" @click="btnSave">确认保存</el-button>
     </div>
   </div>
 </template>
 
 <script>
-  import {createDocumentCategory,updateDocumentCategory,getDocumentCategoryInfo} from'@/api/document'
-  export default{
-    emits:['onClose'],
-    props:{
-      id:{
-        type:Number,
-        default:0
+import {
+  createDocumentCategory,
+  updateDocumentCategory,
+  getDocumentCategoryInfo,
+} from "@/api/document";
+export default {
+  emits: ["onClose"],
+  props: {
+    id: {
+      type: Number,
+      default: 0,
+    },
+  },
+  watch: {
+    id: {
+      handler(v) {
+        let _this = this;
+        if (v == null || v <= 0) return;
+        _this.getInfo(v);
       },
+      immediate: true,
+      deep: true,
     },
-    watch:{
-      id:{
-        handler(v){
-            let _this=this;
-            if(v==null || v<=0)return;
-            _this.getInfo(v);
+  },
+  data() {
+    return {
+      activeName: "base",
+      categoryList: [],
+      dataForm: {
+        id: 0,
+        name: "",
+        intro: "",
+        status: 5,
+      },
+      statusOptions: [
+        {
+          value: "",
+          label: "请选择状态",
         },
-        immediate: true,
-        deep: true
-      }
-    },
-    data(){
-      return{
-        activeName:'base',
-        categoryList:[],
-        dataForm:{
-           id:0,
-           name:'',
-           intro:"",
-           status:5,
+        {
+          value: 5,
+          label: "启用",
+        },
+        {
+          value: 6,
+          label: "停用",
         },
-        statusOptions:[
-         {
-           value:'',
-           label:"请选择状态"
-         },
-         {
-           value:5,
-           label:'启用'
-         },
-         {
-           value:6,
-           label:"停用"
-         },
-        ],
+      ],
+    };
+  },
+  methods: {
+    //保存更新
+    btnSave(e) {
+      let _this = this;
+
+      if (_this.dataForm.id > 0) {
+        updateDocumentCategory(_this.dataForm).then((res) => {
+          if (res.code !== 200) return;
+          _this.$message.success("文档分类更新成功");
+          _this.$emit("onClose");
+          _this.$emit("refresh-list");
+        });
+      } else {
+        createDocumentCategory(_this.dataForm).then((res) => {
+          if (res.code !== 200) return;
+          _this.$message.success("文档分类创建成功");
+          _this.$emit("onClose");
+          _this.$emit("refresh-list");
+        });
       }
     },
-    methods:{
-
-
-      //保存更新
-      btnSave(e){
-          let _this=this;
 
-        if(_this.dataForm.id>0){
-          updateDocumentCategory(_this.dataForm).then(res=>{
-            if(res.status!=200)return;
-            _this.$alert("文档分类更新成功");
-            _this.$emit("onClose")
-          })
-        }else{
-          createDocumentCategory(_this.dataForm).then(res=>{
-
-            if(res.status!=200)return;
-            _this.$alert("文档分类创建成功");
-            _this.$emit("onClose")
-          })
-        }
-
-      },
-
-      //产品详情
-      getInfo(id){
-          let _this=this;
-          let par={
-            id:id,
-          };
-          getDocumentCategoryInfo(par).then(res=>{
-              if(!res)return;
-              if(res.status!=200)return;
-              _this.dataForm=res.data;
-          })
-      },
-
-
-
-    }
-  }
+    //产品详情
+    getInfo(id) {
+      let _this = this;
+      let par = {
+        id: id,
+      };
+      getDocumentCategoryInfo(par).then((res) => {
+        if (res.status != 200) return;
+        _this.dataForm = res.data.data;
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
- @import './dataInfo.scss'
+@import "./dataInfo.scss";
 </style>

+ 4 - 4
ui/src/views/system/document/category/components/dataList.vue

@@ -4,11 +4,11 @@
 
       <el-table :data="dataList" style="width: 100%" header-row-class-name="headerBg" empty-text="没有分类信息">
         <el-table-column prop="id" label="ID" align="center" width="80"/>
-        <el-table-column prop="name" label="分类名称" align="left" width="180"/>
-        <el-table-column prop="intro" label="介绍" align="left" min-width="180"/>
+        <el-table-column prop="name" label="分类名称" align="left" />
+        <el-table-column prop="intro" label="介绍" align="left"/>
 
-        <el-table-column prop="createTime" label="创建时间" align="center" width="180"/>
-        <el-table-column prop="status" label="分类状态" align="center" width="180">
+        <el-table-column prop="create_time" label="创建时间" align="center" />
+        <el-table-column prop="status" label="分类状态" align="center" >
           <template #default="scope">
               <div v-if="scope.row.status==5">启用</div>
               <div v-if="scope.row.status==6">停用</div>

+ 1 - 0
ui/src/views/system/document/category/components/dataSearch.vue

@@ -82,6 +82,7 @@ export default{
 
     onClose(e){
       this.dialogVisible=false;
+      console.log(this.queryForm);
       this.onSubmit();
     },
     //搜索

+ 5 - 3
ui/src/views/system/document/category/search.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="project-search">
-    <dataSearch @bindSetQuery="setQuery"></dataSearch>
-    <dataList :queryForm="queryForm"></dataList>
+    <dataSearch @bindSetQuery="setQuery"  @refresh-list="handleRefreshList"></dataSearch>
+    <dataList ref="docDataList" :queryForm="queryForm"></dataList>
   </div>
 
 </template>
@@ -24,7 +24,9 @@ export default{
     }
   },
   methods:{
-
+    handleRefreshList() {
+      this.$refs.docDataList.refreshList();
+    },
     setQuery(e){
       this.queryForm={...e};
     }

+ 1 - 0
ui/src/views/system/document/create.vue

@@ -2234,6 +2234,7 @@ export default {
       this.$nextTick(() => {
         if (!com.attrs[com.attrs.length - 1].content) {
           this.$set(com.attrs[com.attrs.length - 1], "content", content);
+          console.log(com);
           this.$forceUpdate();
         }
       });

+ 4 - 2
ui/src/views/system/template/category/components/dataInfo.vue

@@ -136,16 +136,18 @@ export default {
       if (_this.dataForm.id > 0) {
         updateTemplateCategory(_this.dataForm).then((res) => {
           if (res.status != 200) return;
-          _this.$alert("模板类别信息更新成功");
+          _this.$message.success("模板类别信息更新成功");
           _this.$emit("onSearch");
           _this.$emit("onClose");
+          _this.$emit("refresh-list")
         });
       } else {
         createTemplateCategory(_this.dataForm).then((res) => {
           if (res.status != 200) return;
-          _this.$alert("模板类别信息创建成功");
+          _this.$message.success("模板类别信息创建成功");
           _this.$emit("onSearch");
           _this.$emit("onClose");
+          _this.$emit("refresh-list")
         });
       }
     },

+ 2 - 2
ui/src/views/system/template/category/components/dataList.vue

@@ -23,10 +23,10 @@
         prop="name"
         label="分类名称"
         align="left"
-        min-width="180"
+       
       >
       </el-table-column>
-      <el-table-column prop="createTime" label="创建时间" align="center" />
+      <el-table-column prop="create_time" label="创建时间" align="center" />
       <el-table-column prop="status" label="分类状态" align="center">
         <template #default="scope">
           <div v-if="scope.row.status == 5">启用</div>

+ 1 - 1
ui/src/views/system/template/category/components/dataSearch.vue

@@ -25,7 +25,7 @@
 
 
     <el-dialog  :visible.sync="dialogVisible" append-to-body v-el-drag-dialog  width="50%" custom-class="prod-verify" title="创建分类">
-         <dataInfo @onClose="onClose"></dataInfo>
+         <dataInfo  @onClose="onClose"></dataInfo>
      </el-dialog>
 
   </div>

+ 5 - 3
ui/src/views/system/template/category/search.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="project-search">
-    <dataSearch @bindSetQuery="setQuery"></dataSearch>
-    <dataList :queryForm="queryForm"></dataList>
+    <dataSearch @bindSetQuery="setQuery" @refresh-list="handleRefreshList"></dataSearch>
+    <dataList ref="dataList" :queryForm="queryForm"></dataList>
   </div>
 
 </template>
@@ -25,7 +25,9 @@ export default{
     }
   },
   methods:{
-
+    handleRefreshList() {
+      this.$refs.dataList.refreshList();
+    },
     setQuery(e){
       this.queryForm=e;
     }

+ 2 - 1
ui/src/views/system/template/components/dataSearch.vue

@@ -284,10 +284,11 @@ export default {
     //搜索
     // 修改 onSubmit 方法
     onSubmit() {
+      this.$emit('refresh-list')
       // 更新查询条件
       this.$emit("bindSetQuery", this.queryForm);
       // 触发刷新列表
-      this.$emit("search");
+     /*  this.$emit("search"); */
     },
   },
 };

+ 29 - 25
ui/src/views/system/template/search.vue

@@ -1,45 +1,49 @@
 <template>
   <div class="project-search">
-    <dataSearch @bindSetQuery="setQuery" @refresh-list="handleRefreshList"></dataSearch>
-    <dataList  ref="dataList" :queryForm="queryForm"></dataList>
+    <dataSearch
+      @bindSetQuery="setQuery"
+      @refresh-list="handleRefreshList"
+    ></dataSearch>
+    <dataList ref="dataList" :queryForm="queryForm"></dataList>
   </div>
-
 </template>
 
 <script>
-import {dataSearch,dataList} from "./components"
-export default{
-  components:{
+import { dataSearch, dataList } from "./components";
+export default {
+  components: {
     dataSearch,
     dataList,
   },
-  data(){
-    return{
-        queryForm:{
-          page:1,
-          pageSize:10,
-          name:'',
-          parent_id:0,
-          status:'',
-        },
-    }
+  data() {
+    return {
+      queryForm: {
+        page: 1,
+        pageSize: 10,
+        name: "",
+        parent_id: 0,
+        status: "",
+      },
+    };
   },
 
   mounted() {
-    this.queryForm.parent_id=this.$route.query.parent_id==undefined?0:this.$route.query.parent_id;
+    this.queryForm.parent_id =
+      this.$route.query.parent_id == undefined
+        ? 0
+        : this.$route.query.parent_id;
   },
-  methods:{
+  methods: {
     handleRefreshList() {
       this.$refs.dataList.refreshList();
     },
-    setQuery(e){
-      this.queryForm=e;
-    }
-
-  }
-}
+    setQuery(e) {
+      this.queryForm = e;
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-@import './search.scss'
+@import "./search.scss";
 </style>