Merge branch 'master-v32-xwx' into 'master'

Master v32 xwx



See merge request !123

@@ -7853,4 +7853,7 @@ form[lay-filter="activewarning-form"] .layui-inline {
 }
 }
 .info-ali-cloud-ecs span{
 .info-ali-cloud-ecs span{
     width: 16%!important;
     width: 16%!important;
+}
+.layui-logo{
+    pointer-events: none;
 }
 }

@@ -47,18 +47,18 @@
                             <i class="iconfont icon-icon--download"></i>
                             <i class="iconfont icon-icon--download"></i>
                             下载
                             下载
                         </el-button>
                         </el-button>
-                        <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="canAddFolder && !isRecycle">
-                            <i class="iconfont icon-weidaqiadewenjianjia"></i>
-                            新增文件夹
-                        </el-button>
+<!--                        <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="canAddFolder && !isRecycle">-->
+<!--                            <i class="iconfont icon-weidaqiadewenjianjia"></i>-->
+<!--                            新增文件夹-->
+<!--                        </el-button>-->
                         <el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle">
                         <el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle">
                             <i class="iconfont icon-icon--shangchuan"></i>
                             <i class="iconfont icon-icon--shangchuan"></i>
                             上传
                             上传
                         </el-button>
                         </el-button>
-                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')">
-                            <i class="iconfont icon-shanchuwenjianjia"></i>
-                            删除
-                        </el-button>
+<!--                        <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')">-->
+<!--                            <i class="iconfont icon-shanchuwenjianjia"></i>-->
+<!--                            删除-->
+<!--                        </el-button>-->
                         <el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle">
                         <el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle">
                             <i class="iconfont icon-lunxun"></i>
                             <i class="iconfont icon-lunxun"></i>
                             还原
                             还原
@@ -132,7 +132,7 @@
                     <el-input :size="$global.elementSize" v-model="docForm.name" clearable ></el-input>
                     <el-input :size="$global.elementSize" v-model="docForm.name" clearable ></el-input>
                 </el-form-item>
                 </el-form-item>
 
 
-                <div v-if="!isUserFolder">
+               <!-- <div v-if="!isUserFolder">
                     <el-form-item label="文档编号" prop="docNo">
                     <el-form-item label="文档编号" prop="docNo">
                         <el-input :size="$global.elementSize" v-model="docForm.docNo" clearable></el-input>
                         <el-input :size="$global.elementSize" v-model="docForm.docNo" clearable></el-input>
                     </el-form-item>
                     </el-form-item>
@@ -140,7 +140,7 @@
                     <el-form-item label="文档类型" prop="type">
                     <el-form-item label="文档类型" prop="type">
                         <el-input :size="$global.elementSize" v-model="docForm.type" clearable></el-input>
                         <el-input :size="$global.elementSize" v-model="docForm.type" clearable></el-input>
                     </el-form-item>
                     </el-form-item>
-                </div>
+                </div>-->
 
 
 
 
                 <el-form-item label="排序" prop="sort">
                 <el-form-item label="排序" prop="sort">

@@ -414,6 +414,7 @@ export default {
         let addDialogVisible = Vue.ref(false);
         let addDialogVisible = Vue.ref(false);
         let addDialogTitle = Vue.ref('');
         let addDialogTitle = Vue.ref('');
         let docForm = Vue.ref({
         let docForm = Vue.ref({
+            id:'',
             name: '',
             name: '',
             docNo: '',
             docNo: '',
             type: '',
             type: '',
@@ -421,6 +422,7 @@ export default {
         });
         });
         let showFolder = (flg, isUser) => {
         let showFolder = (flg, isUser) => {
             docForm.value = {
             docForm.value = {
+                id:'',
                 name: '',
                 name: '',
                 docNo: '',
                 docNo: '',
                 type: '',
                 type: '',
@@ -428,8 +430,8 @@ export default {
             };
             };
             isUserFolder.value = isUser;
             isUserFolder.value = isUser;
             addDialogVisible.value = flg;
             addDialogVisible.value = flg;
-            let title = `新建树节点“${currentNodeData.value.name}“子文件夹`;
-            if (isUser) {
+            let title = `修改树节点“${currentNodeData.value.name}“子文件夹`;
+            if (addDialogVisible.value) {
                 title = `新建自定义文件夹`;
                 title = `新建自定义文件夹`;
             }
             }
             addDialogTitle.value = title
             addDialogTitle.value = title
@@ -561,7 +563,6 @@ export default {
                 authUsernames: userIds,
                 authUsernames: userIds,
                 authOrgIds: orgInfo
                 authOrgIds: orgInfo
             }
             }
-
             proxy.$http.post(`/inspection-report/file/doc/grant`, params, function (res) {
             proxy.$http.post(`/inspection-report/file/doc/grant`, params, function (res) {
                 if (res && res.success) {
                 if (res && res.success) {
                     proxy.$global.showMsg('授权成功!');
                     proxy.$global.showMsg('授权成功!');

@@ -138,10 +138,19 @@ export default {
             proxy.$http.get("/api-user/org/queryOrgs?searchQuery=", {}, function (res) {
             proxy.$http.get("/api-user/org/queryOrgs?searchQuery=", {}, function (res) {
                 if (res && res.data) {
                 if (res && res.data) {
                     res.data.map(function (v) {
                     res.data.map(function (v) {
+                        let desc = [];
+                        let value = v.value;
+                        let name = v.name;
+                        if (name) {
+                            desc.push(name);
+                        }
+                        if (value) {
+                            desc.push(value);
+                        }
                         orgArr.value.push({
                         orgArr.value.push({
                             value: v.orgId,
                             value: v.orgId,
                             type:'ORG',
                             type:'ORG',
-                            desc: ``,
+                            desc: `${desc.join(' / ')}`,
                             props : v
                             props : v
                         })
                         })
                     });
                     });

@@ -162,7 +162,7 @@
 
 
                 {{#
                 {{#
                 var dataName = layui.setter.response.dataName;
                 var dataName = layui.setter.response.dataName;
-                var fisthref = "";
+                var fisthref = "/index";
                 var defaultMenu = d.str;
                 var defaultMenu = d.str;
                 var defaultModuleid = '';
                 var defaultModuleid = '';
                 var defaultPath = '';
                 var defaultPath = '';