diff --git a/epmet-oper-web/src/views/modules/workPc/guidance/DetailForm.vue b/epmet-oper-web/src/views/modules/workPc/guidance/DetailForm.vue
index 6e50faf..af5b3ec 100644
--- a/epmet-oper-web/src/views/modules/workPc/guidance/DetailForm.vue
+++ b/epmet-oper-web/src/views/modules/workPc/guidance/DetailForm.vue
@@ -25,21 +25,21 @@
                     placeholder="标题"></el-input>
         </el-form-item>
         <el-form-item label="分类"
-                      prop="type">
+                      prop="categoryCode">
           <el-select class="item_width_1"
-                     v-model="dataForm.categoryId"
+                     v-model="dataForm.categoryCode"
                      placeholder="请选择">
             <el-option v-for="item in categoryList"
-                       :key="item.categoryId"
+                       :key="item.categoryCode"
                        :label="item.categoryName"
-                       :value="item.categoryId">
+                       :value="item.categoryCode">
             </el-option>
           </el-select>
 
         </el-form-item>
 
         <el-form-item label="发布单位"
-                      prop="unit">
+                      prop="orgId">
           <el-select class="item_width_1"
                      v-model="dataForm.orgId"
                      placeholder="请选择">
@@ -97,13 +97,16 @@
                         prop="attach">
             <el-upload class="upload-demo"
                        :action="uploadUlr"
-                       :on-success="handleAvatarSuccess"
-                       :on-change="handleChange"
+                       :data="{customerId:customerId}"
+                       :on-success="handleFileSuccess"
+                       :on-remove="handleFileRemove"
+                       :limit="3"
+                       :before-upload="beforeUpload"
                        :file-list="fileList">
               <el-button size="small"
                          type="primary">点击上传</el-button>
               <div slot="tip"
-                   class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+                   class="el-upload__tip">只能上传word、excel、pdf文件</div>
             </el-upload>
           </el-form-item>
         </div>
@@ -128,7 +131,7 @@ let loading// 加载动画
 export default {
   data () {
     return {
-
+      customerId: '',
       formType: '', // 操作类型A/U  D(详情)
       guideId: '', // 父组件传来功能id
       categoryList: [],
@@ -137,7 +140,7 @@ export default {
       dataForm: {
         guideId: '',
         title: '',
-        categoryId: '',
+        categoryCode: '',
         orgId: '',
         orgType: '',
         orgName: '',
@@ -158,19 +161,21 @@ export default {
       moduleArray: [],
       selTabIndex: 0,
 
-      fileList: [{
-        name: 'food.jpeg',
-        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
-      }, {
-        name: 'food2.jpeg',
-        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
-      }],
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+      fileList: [
+        // {
+        //   name: 'food.jpeg',
+        //   url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
+        // }, {
+        //   name: 'food2.jpeg',
+        //   url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'
+        // }
+      ],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/upload-guide-file',
 
     }
   },
   mounted () {
-
+    this.customerId = localStorage.getItem('customerId')
   },
 
   methods: {
@@ -182,7 +187,12 @@ export default {
       if (type === 'A') {
         this.resetData()
 
+      } else if (type === 'D') {
+
+        this.guideId = guideId
+        this.loadFormData()
       } else {
+        this.guideId = guideId
         this.dataForm.guideId = guideId
         this.loadFormData()
       }
@@ -192,8 +202,8 @@ export default {
     },
 
     async getcategory () {
-      // const url = '/gov/guide/guideccategory/getcategory'
-      const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guidecategory/getcategory'
+      const url = '/gov/voice/guidecategory/getcategory'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guidecategory/getcategory'
 
       const params = {
         queryOrigin: 'saveorupdate'
@@ -208,8 +218,8 @@ export default {
     },
 
     async loadOrg () {
-      // const url = '/gov/org/staff/orgList'
-      const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/staff/orgList'
+      const url = '/gov/org/staff/orgList'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/staff/orgList'
 
       const params = {}
       const { data, code, msg } = await requestPost(url, params)
@@ -228,8 +238,8 @@ export default {
 
     //获取模块tab
     async loadModule () {
-      // const url = '/gov/voice/guidemodule/list'
-      const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guidemodule/list'
+      const url = '/gov/voice/guidemodule/list'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guidemodule/list'
 
       const params = {}
       const { data, code, msg } = await requestPost(url, params)
@@ -270,12 +280,11 @@ export default {
     },
 
     async loadFormData () {
-      const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guide/detail'
-      // const url = '/gov/voice/guide/detail'
-      let _data = {
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guide/detail'
+      const url = '/gov/voice/guide/detail'
+      let params = {
         guideId: this.guideId
       }
-      const params = {}
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.dataForm = data
@@ -286,7 +295,6 @@ export default {
     },
 
     saveForm () {
-
       this.dataForm.moduleList = []
       this.moduleArray.forEach(element => {
         if (element.moduleContent) {
@@ -306,9 +314,20 @@ export default {
         })
       }
 
+      if (this.fileList.length > 0) {
+        this.dataForm.attachmentList = this.fileList
+      }
+
+      if (this.moduleArray.length === 0 && this.dataForm.externalLinks.length === 0 && this.fileList.length === 0) {
+        this.$message({
+          type: 'error',
+          message: '文档内容、外链、附件至少填写一样'
+        })
+        return false
+      }
+
       console.log(this.dataForm)
 
-      return false
       this.$refs['dataForm'].validate((valid, messageObj) => {
 
         if (!valid) {
@@ -317,11 +336,11 @@ export default {
           let url = ''
 
           if (this.type === 'U') {
-            //  url = '/gov/voice/guide/update'
-            url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guide/update'
+            url = '/gov/voice/guide/update'
+            // url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guide/update'
           } else {
-            // url="/gov/voice/guide/add"
-            url = "http://yapi.elinkservice.cn/mock/102/gov/voice/guide/add"
+            url = "/gov/voice/guide/add"
+            // url = "http://yapi.elinkservice.cn/mock/102/gov/voice/guide/add"
 
 
           }
@@ -331,8 +350,8 @@ export default {
                 type: 'success',
                 message: '保存成功'
               })
-              this.$emit('dialogOk')
-              this.visible = false
+              this.$emit('refresh')
+              this.$emit('cancleBack')
             },
             (rspMsg, data) => {
               this.endLoading()
@@ -342,14 +361,12 @@ export default {
       })
     },
 
-    handleClose () {
-      this.visible = false
-    },
+
     resetData () {
       this.dataForm = {
         guideId: '',
         title: '',
-        categoryId: '',
+        categoryCode: '',
         orgId: '',
         orgType: '',
         orgName: '',
@@ -364,15 +381,44 @@ export default {
       this.$emit('cancleBack')
     },
 
-    handleChange (file, fileList) {
-      this.fileList = fileList.slice(-3);
+
+    beforeUpload (file) {
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+
+      if (extension !== 'xls'
+        && extension !== 'xlsx'
+        && extension !== 'doc'
+        && extension !== 'docx'
+        && extension !== 'pdf') {
+        this.$message.error('只能上传word、excel、pdf文件！')
+        return false
+      }
+
+      // if (!isLt2M) {
+      //   this.$message.warning('上传模板大小不能超过 5MB!')
+      //   return
+      // }
+
+      // return false // 返回false不会自动上传
+    },
+
+    handleFileRemove (file) {
+
+      if (file && file.status === "success") {
+        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+      }
     },
 
-    handleAvatarSuccess (res, file) {
+    handleFileSuccess (res, file) {
+      // debugger
       if (res.code === 0 && res.msg === 'success') {
-        this.dataForm2.logo = res.data.url
+        file.url = res.data.url
+        this.fileList.push(file)
+        console.log(this.fileList)
       } else this.$message.error(res.msg)
     },
+
     // 开启加载动画
     startLoading () {
       loading = Loading.service({
@@ -397,10 +443,10 @@ export default {
   computed: {
     dataRule () {
       return {
-        type: [
+        categoryCode: [
           { required: true, message: '分类不能为空', trigger: 'blur' }
         ],
-        unit: [
+        orgId: [
           { required: true, message: '发布单位不能为空', trigger: 'blur' }
 
         ],
diff --git a/epmet-oper-web/src/views/modules/workPc/guidance/categoryList.vue b/epmet-oper-web/src/views/modules/workPc/guidance/categoryList.vue
index 064f742..730477a 100644
--- a/epmet-oper-web/src/views/modules/workPc/guidance/categoryList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/guidance/categoryList.vue
@@ -79,6 +79,7 @@
         <span> 分类名称 </span>
         <el-input style="margin-top:20px"
                   type="textarea"
+                  maxlength="10"
                   :rows="2"
                   v-model="categoryName"></el-input>
         <div class="div_btn">
diff --git a/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue b/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue
index 5a7f4a8..ef7dfd2 100644
--- a/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/epmet-oper-web/src/views/modules/workPc/guidance/guidanceList.vue
@@ -21,13 +21,13 @@
           <div>
             <el-form-item label="问题分类"
                           :label-width="labelWidth">
-              <el-select v-model="tableParams.categoryId"
+              <el-select v-model="tableParams.categoryCode"
                          placeholder="问题分类"
                          clearable>
                 <el-option v-for="item in categoryList"
-                           :key="item.categoryId"
+                           :key="item.categoryCode"
                            :label="item.categoryName"
-                           :value="item.categoryId">
+                           :value="item.categoryCode">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -44,7 +44,8 @@
               <el-button @click="loadData()"
                          type="primary">查询</el-button>
             </el-form-item>
-            <el-form-item style="margin-left:10px">
+            <el-form-item v-if="isStaff"
+                          style="margin-left:10px">
               <el-button @click="add()"
                          type="primary">新增</el-button>
             </el-form-item>
@@ -61,7 +62,7 @@
                  :tableHeight="tableHeight"
                  @detail="detail"
                  @edit="edit"
-                 @del="del">
+                 @confirmDel="confirmDel">
         </c-table>
       </div>
 
@@ -87,6 +88,8 @@ const customerId = localStorage.getItem('customerId')
 export default {
   data () {
     return {
+      userId: '',
+      isStaff: false,
       //查询条件标题宽度
       labelWidth: '70px',
       formShow: false,
@@ -286,11 +289,11 @@ export default {
 
 
       // 列表相关
-      // tableUrl: '/gov/guide/guide/list',
-      tableUrl: 'http://yapi.elinkservice.cn/mock/102/gov/voice/guide/list',
+      tableUrl: '/gov/voice/guide/list',
+      // tableUrl: 'http://yapi.elinkservice.cn/mock/102/gov/voice/guide/list',
       tableParams: {
         agencyId: '', //
-        categoryId: '', //分类
+        categoryCode: '', //分类
         guideTitle: '' //标题
       },
 
@@ -331,7 +334,7 @@ export default {
           type: 'text',
           slot: '',
           plain: false,
-          methodName: 'del', // 回调方法名称
+          methodName: 'confirmDel', // 回调方法名称
           isShow: (row) => {
             return true
           }
@@ -366,6 +369,16 @@ export default {
       await this.getAgencylist()//获取组织级别
       await this.getcategory()//获取分类
       await this.loadData()//获取指南列表
+
+      let roleList = localStorage.getItem('roleList')
+      this.userId = this.$store.state.user.id
+      console.log(this.userId)
+      if (roleList.indexOf('staff') > -1) {
+        this.isStaff = true
+      } else {
+        this.isStaff = true
+      }
+
       this.endLoading()
     },
 
@@ -381,6 +394,7 @@ export default {
 
     // 详情
     detail (row) {
+
       this.formShow = true
       this.$refs['ref_edit_form'].initData(row.guideId, "D")
     },
@@ -389,17 +403,28 @@ export default {
       this.formShow = true
       this.$refs['ref_edit_form'].initData(row.guideId, "U")
     },
+
+    confirmDel (row) {
+      this.$confirm('确认删除当前指南', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        this.del(row)
+      })
+    },
     async del (row) {
-      // const url = '/gov/voice/guidecategory/delete'
-      const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guidecategory/delete'
+      const url = '/gov/voice/guide/del'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guidecategory/delete'
 
       const params = {
-        categoryId: row.guideId
+        guideId: row.guideId
       }
 
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.$message.success("删除成功")
+        this.loadData()
 
       } else {
         this.$message.error(msg)
@@ -411,8 +436,8 @@ export default {
     },
 
     async getAgencylist () {
-      // const url = '/gov/org/agency/agencylist'
-      const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
+      const url = '/gov/org/customeragency/agencylist'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist'
 
       const params = {}
       const { data, code, msg } = await requestPost(url, params)
@@ -426,8 +451,8 @@ export default {
     },
 
     async getcategory () {
-      // const url = '/gov/guide/guideccategory/getcategory'
-      const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guidecategory/getcategory'
+      const url = '/gov/voice/guidecategory/getcategory'
+      // const url = 'http://yapi.elinkservice.cn/mock/102/gov/voice/guidecategory/getcategory'
 
       const params = {
         queryOrigin: 'query'