Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/component/selectType.vue

@@ -26,7 +26,8 @@ export default {
             setTimeout(() => {
               let nodes = datas1.map(item => ({
                 value: item.ID_,
-                label: item.name_
+                label: item.name_,
+                authority: item.AUTHORITY_NAME
               }));
               // 通过调用resolve将子节点数据返回，通知组件数据加载完成
               resolve(nodes);
@@ -48,6 +49,7 @@ export default {
       this.$emit("change-data", "wenJianLeiXing", nodesInfo.pathNodes[0].label)
       this.$emit("change-data", "wenJianXiLei", xilei.join(' / '))
       this.$emit("change-data", "xiLeiId", nodesInfo.value);
+      this.$emit("change-data", "quanXianLeiXing", nodesInfo.data.authority);
     },
 
   },

src/views/platform/cat/type/edit.vue

@@ -1,85 +1,108 @@
 <template>
   <!--对话框-->
-  <el-dialog
-    v-if="displayType ==='dialog'"
-    :title="title"
-    :visible.sync="dialogVisible"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    append-to-body
-    class="dialog"
-    :class="className"
-    @open="getFormData"
-    @close="closeDialog"
-  >
-    <el-form
-      ref="typeForm"
-      v-loading="dialogLoading"
-      :element-loading-text="$t('common.loading')"
-      :model="type"
-      :rules="rules"
-      :label-width="formLabelWidth"
-      @submit.native.prevent
-    >
+  <el-dialog v-if="displayType ==='dialog'"
+             :title="title"
+             :visible.sync="dialogVisible"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false"
+             append-to-body
+             class="dialog"
+             :class="className"
+             @open="getFormData"
+             @close="closeDialog">
+    <el-form ref="typeForm"
+             v-loading="dialogLoading"
+             :element-loading-text="$t('common.loading')"
+             :model="type"
+             :rules="rules"
+             :label-width="formLabelWidth"
+             @submit.native.prevent>
       <!-- <el-form-item  v-show="!formId" label="父节点名称:">
         <span>{{ parentData.name }}</span>
       </el-form-item> -->
 
-      <el-form-item label="分类名称:" prop="name">
-        <el-input v-model="type.name" v-pinyin="{vm:type,key:'typeKey'}" />
+      <el-form-item label="分类名称:"
+                    prop="name">
+        <el-input v-model="type.name"
+                  v-pinyin="{vm:type,key:'typeKey'}" />
       </el-form-item>
-      <el-form-item label="分类Key:" prop="typeKey">
-        <el-input v-model="type.typeKey" :disabled="$utils.isNotEmpty(formId)" />
+      <el-form-item label="分类Key:"
+                    prop="typeKey">
+        <el-input v-model="type.typeKey"
+                  :disabled="$utils.isNotEmpty(formId)" />
       </el-form-item>
 
-
-
-      <el-form-item v-show="categoryKey==='DIC_TYPE'" label="分类类型:" prop="struType">
+      <el-form-item v-show="categoryKey==='DIC_TYPE'"
+                    label="分类类型:"
+                    prop="struType">
         <el-radio-group v-model="type.struType">
-          <el-radio
-            v-for="option in srtuOptions"
-            :key="option.value"
-            :label="option.value"
-          >{{ option.label }}
+          <el-radio v-for="option in srtuOptions"
+                    :key="option.value"
+                    :label="option.value">{{ option.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>
-    <div slot="footer" class="el-dialog--center">
-      <ibps-toolbar
-        :actions="toolbars"
-        @action-event="handleActionEvent"
-      />
+    <div slot="footer"
+         class="el-dialog--center">
+      <ibps-toolbar :actions="toolbars"
+                    @action-event="handleActionEvent" />
     </div>
   </el-dialog>
   <!--默认形式-->
-  <div v-else class="main-container">
-    <ibps-container type="full" class="page">
+  <div v-else
+       class="main-container">
+    <ibps-container type="full"
+                    class="page">
       <template slot="header">
-        <el-button type="primary" :disabled="readonly" icon="ibps-icon-save" @click="handleSave()">保存</el-button>
+        <el-button type="primary"
+                   :disabled="readonly"
+                   icon="ibps-icon-save"
+                   @click="handleSave()">保存</el-button>
       </template>
-      <el-form ref="typeForm" :model="type" :rules="rules" :label-width="formLabelWidth">
+      <el-form ref="typeForm"
+               :model="type"
+               :rules="rules"
+               :label-width="formLabelWidth">
         <el-form-item label="分类:">
           <span>{{ isPrivateLocal ? '私有分类' : '普通分类' }}</span>
         </el-form-item>
-        <el-form-item v-show="!formId" label="父节点名称:">
+        <el-form-item v-show="!formId"
+                      label="父节点名称:">
           <span>{{ parentData.name }}</span>
         </el-form-item>
-        <el-form-item label="分类名称:" prop="name">
-          <el-input v-if="!readonly" v-model="type.name" v-pinyin="{vm:type,key:'typeKey'}" />
+        <el-form-item label="分类名称:"
+                      prop="name">
+          <el-input v-if="!readonly"
+                    v-model="type.name"
+                    v-pinyin="{vm:type,key:'typeKey'}" />
           <span v-else>{{ type.name }}</span>
         </el-form-item>
-        <el-form-item label="分类Key:" prop="typeKey">
-          <el-input v-if="!readonly" v-model="type.typeKey" :disabled="$utils.isNotEmpty(formId)" />
+        <el-form-item label="分类Key:"
+                      prop="typeKey">
+          <el-input v-if="!readonly"
+                    v-model="type.typeKey"
+                    :disabled="$utils.isNotEmpty(formId)" />
           <span v-else>{{ type.typeKey }}</span>
         </el-form-item>
-        <el-form-item v-show="categoryKey==='DIC_TYPE'" label="字典类型:" prop="struType">
+        <el-form-item label="查阅权限:"
+                      prop="authorityName"
+                      v-show="categoryKey==='FILE_TYPE'">
+          <el-radio-group v-if="!readonly"
+                          v-model="type.authorityName">
+            <el-radio label="公用查阅">公用查阅</el-radio>
+            <el-radio label="部门查阅">部门查阅</el-radio>
+            <el-radio label="受限查阅">受限查阅</el-radio>
+          </el-radio-group>
+          <span v-else>{{ type.authorityName }}</span>
+        </el-form-item>
+        <el-form-item v-show="categoryKey==='DIC_TYPE'"
+                      label="字典类型:"
+                      prop="struType">
           <el-radio-group v-model="type.struType">
-            <el-radio
-              v-for="option in srtuOptions"
-              :key="option.value"
-              :label="option.value"
-            >{{ option.label }}
+            <el-radio v-for="option in srtuOptions"
+                      :key="option.value"
+                      :label="option.value">{{ option.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
@@ -126,7 +149,7 @@ export default {
       dialogVisible: false,
       dialogLoading: false,
       isPrivateLocal: false,
-      topKey:'',
+      topKey: '',
 
       srtuOptions: srtuOptions,
       defaultForm: {},
@@ -134,11 +157,13 @@ export default {
         struType: '1',
         name: '',
         typeKey: '',
-        ownerId: '0'
+        ownerId: '0',
+        authorityName: ''
       },
       rules: {
         name: [{ required: true, message: this.$t('validate.required') }],
-        typeKey: [{ required: true, validator: validateKey }]
+        typeKey: [{ required: true, validator: validateKey }],
+        authorityName: [{ required: true, message: '不得为空' }]
       },
       toolbars: [
         { key: 'save', hidden: () => { return this.readonly } },
@@ -162,12 +187,12 @@ export default {
       }
     },
     visible: {
-      handler: function(val, oldVal) {
+      handler: function (val, oldVal) {
         this.dialogVisible = this.visible
         this.isPrivateLocal = this.isPrivate
       },
       immediate: true
-   },
+    },
     /* formId() {
        if (this.displayType !== 'dialog') {
          this.getFormData()
@@ -175,7 +200,7 @@ export default {
        }
     }, */
     isPrivate: {
-      handler: function(val, oldVal) {
+      handler: function (val, oldVal) {
         this.isPrivateLocal = this.isPrivate
       },
       immediate: true
@@ -259,7 +284,7 @@ export default {
     formValidate() {
       if (this.readonly) return
       this.$nextTick(() => {
-        this.$refs[this.formName].validate(() => {})
+        this.$refs[this.formName].validate(() => { })
       })
     },
     /**

src/views/platform/message/inner/detail/dialog.vue

@@ -136,71 +136,74 @@ export default {
         // 消息确认，受控文件用
         confirmMsg () {
             // TODO
-            this.$confirm('点击确认将在系统信息管理模块查看到所通知文件的具体信息', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-                showClose: false,
-                closeOnClickModal: false
-            }).then(() => {
-                console.log('userInfo', this.$store.getters.userInfo)
-                // TODO 受控文件逻辑处理
-                const perInfosId = this.$store.getters.userInfo.user.id
-                const perInfosName = this.$store.getters.userInfo.user.name
-                // const perInfosorgId = this.$store.getters.userInfo.org.id
-                // const perInfosPositions = this.$store.getters.userInfo.positions
+            // this.$confirm('点击确认将在系统信息管理模块查看到所通知文件的具体信息', '提示', {
+            //     confirmButtonText: '确定',
+            //     cancelButtonText: '取消',
+            //     type: 'warning',
+            //     showClose: false,
+            //     closeOnClickModal: false
+            // }).then(() => {
+            //     console.log('userInfo', this.$store.getters.userInfo)
+            //     // TODO 受控文件逻辑处理
+            //     const perInfosId = this.$store.getters.userInfo.user.id
+            //     const perInfosName = this.$store.getters.userInfo.user.name
+            //     // const perInfosorgId = this.$store.getters.userInfo.org.id
+            //     // const perInfosPositions = this.$store.getters.userInfo.positions
 
-                const sql = "select qian_zi_tu_wen_ FROM t_ryjbqk WHERE parent_id_ = '" + perInfosId + "'"
-                curdPost('sql', sql).then((ryjbqkRes) => {
-                    const ryjbqkDatas = ryjbqkRes.variables.data
-                    if (ryjbqkDatas.length == 0) {
-                        alert('该人并没有签字图文在系统，请先上传系统再进行确认！')
-                        return
-                    }
-                    const tempObj = {
-                        id_: generateUUID(),
-                        parent_id_: this.tableId,
-                        // tong_zhi_bu_men_: this.getId(perInfosPositions),
-                        que_ren_qian_ming: JSON.stringify([{
-                            id: ryjbqkDatas[0].qian_zi_tu_wen_,
-                            fileName: '确认签名'
-                        }]),
-                        que_ren_ri_qi_: this.$common.getDateNow(10),
-                        que_ren_ren_xing_: perInfosName
-                    }
-                    const returnParams = {
-                        tableName: this.tableName.slice(0, this.tableName.indexOf('（')), // 字符串 "表名（发放时间）"
-                        paramWhere: [tempObj]
-                    }
-                    // 获取所发放的文件
-                    const files = this.$refs.innerMessage.form.fileMsg
-                    const addwjcysqbs = []
-                    const { userId = '' } = this.$store.getters
-                    files.split(',').forEach(i => {
-                        const addwjcysqb = {
-                            yong_hu_id_: userId,
-                            wen_jian_id_: i,
-                            shou_quan_: '1',
-                            fa_bu_ri_qi_: this.tableName.slice(this.tableName.indexOf('（') + 1, this.tableName.lastIndexOf('）'))
-                        }
-                        addwjcysqbs.push(addwjcysqb)
-                    })
-                     curdPost('add', JSON.stringify(returnParams)).then(() => { console.log('确认接收到发放文件') }).then(
-                        () => {
-                        this.type = ''
-                        this.getFormData()
-                        }
-                    )
+            //     const sql = "select qian_zi_tu_wen_ FROM t_ryjbqk WHERE parent_id_ = '" + perInfosId + "'"
+            //     curdPost('sql', sql).then((ryjbqkRes) => {
+            //         const ryjbqkDatas = ryjbqkRes.variables.data
+            //         if (ryjbqkDatas.length == 0) {
+            //             alert('该人并没有签字图文在系统，请先上传系统再进行确认！')
+            //             return
+            //         }
+            //         const tempObj = {
+            //             id_: generateUUID(),
+            //             parent_id_: this.tableId,
+            //             // tong_zhi_bu_men_: this.getId(perInfosPositions),
+            //             que_ren_qian_ming: JSON.stringify([{
+            //                 id: ryjbqkDatas[0].qian_zi_tu_wen_,
+            //                 fileName: '确认签名'
+            //             }]),
+            //             que_ren_ri_qi_: this.$common.getDateNow(10),
+            //             que_ren_ren_xing_: perInfosName
+            //         }
+            //         const returnParams = {
+            //             tableName: this.tableName.slice(0, this.tableName.indexOf('（')), // 字符串 "表名（发放时间）"
+            //             paramWhere: [tempObj]
+            //         }
+            //         // 获取所发放的文件
+            //         const files = this.$refs.innerMessage.form.fileMsg
+            //         const addwjcysqbs = []
+            //         const { userId = '' } = this.$store.getters
+            //         files.split(',').forEach(i => {
+            //             const addwjcysqb = {
+            //                 yong_hu_id_: userId,
+            //                 wen_jian_id_: i,
+            //                 shou_quan_: '1',
+            //                 fa_bu_ri_qi_: this.tableName.slice(this.tableName.indexOf('（') + 1, this.tableName.lastIndexOf('）'))
+            //             }
+            //             addwjcysqbs.push(addwjcysqb)
+            //         })
+            //          curdPost('add', JSON.stringify(returnParams)).then(() => { console.log('确认接收到发放文件') }).then(
+            //             () => {
+            //             this.type = ''
+            //             this.getFormData()
+            //             }
+            //         )
 
-                    curdPost('add',
-                        '{"tableName": "t_wjcysqb","paramWhere":' + JSON.stringify(addwjcysqbs) + '}'
-                    ).then(response => {
-                        console.log(response)
-                    }).catch(error => {
-                    })
-                })
-                this.closeDialog()
-            }).catch(() => { })
+            //         curdPost('add',
+            //             '{"tableName": "t_wjcysqb","paramWhere":' + JSON.stringify(addwjcysqbs) + '}'
+            //         ).then(response => {
+            //             console.log(response)
+            //         }).catch(error => {
+            //         })
+            //     })
+            //     this.closeDialog()
+            // }).catch(() => { })
+             this.type = ''
+             this.closeDialog()
+             this.getFormData()
         },
         handleCallback (res) {
             this.$emit('callback', res)