Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

src/pages/config/pages/mechanismManage/index.vue

@@ -107,6 +107,7 @@
               ref="tree2"
               node-key="id"
               class="filter-tree"
+              style="height: 100%; overflow: auto;"
               v-if="modalPost"
               :props="props"
               :data="postList"

src/pages/config/pages/postManage/index.vue

@@ -102,6 +102,7 @@
                     ref="tree"
                     node-key="id"
                     class="filter-tree"
+                    style="height: 100%; overflow: auto;"
                     v-if="modalRole"
                     :props="props"
                     :data="roleList"

src/pages/config/pages/roleManage/index.vue

@@ -206,6 +206,7 @@
                     class="filter-tree1"
                     :data="treeData"
                     :props="defaultProps"
+                    style="height: 100%; overflow: auto;"
                     default-expand-all
                     check-strictly
                     node-key="id"

src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrTreeDetails.vue

@@ -45,9 +45,8 @@
                     class="filter-tree"
                     :props="props"
                     :data="data"
-                    show-checkbox
                     default-expand-all
-                    :expand-on-click-node="false">
+                    >
                       <span class="custom-tree-node" slot-scope="{ node, data }">
                         <span> {{ node.label}} </span>
                         <span>
@@ -1174,7 +1173,6 @@
                             }
                             this.productModelAdd.parentId = res.data.id
                             this.productModelAdd.parentIdsName = idsName
-                            console.log(this.productModelAdd.parentIdsName)
                             this.$forceUpdate()
                         }else {
                             this.productModelAdd = res.data

src/pages/details/otherStandardDetails/index.vue

@@ -15,8 +15,8 @@
             <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
             <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
             <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
-            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>
+<!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
-            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>
+<!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
           </div>
         </div>
         <div class="basic-information-content">

src/pages/login/index.vue

@@ -90,6 +90,7 @@ export default {
             let userInfoStr = Base64.decode(res.data)
             let userInfo2 = decodeURIComponent(userInfoStr)
             let userInfoObj = JSON.parse(userInfo2)
+            userInfoObj.userId = userInfoObj.usid
             this.setToken(userInfoObj.usid) // vuex存储token
             this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => {
               if (userInfo !== '' && userInfo !== null) {

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -563,7 +563,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"

src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue

@@ -230,7 +230,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -149,7 +149,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"

src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue

@@ -142,7 +142,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -326,7 +326,7 @@
       size="800px">
       <el-tree
         v-if="modalshowflag"
-        style="height: 100%;"
+        style="height: 100%; overflow: auto;"
         node-key="id"
         class="filter-tree"
         :data="treeData"

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -13,6 +13,32 @@
                 @node-click="treeClick"
                 default-expand-all
                 :expand-on-click-node="false">
+                <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
+                        <span> {{ node.label}} </span>
+                        <span>
+                          <el-button
+                                  type="text"
+                                  size="mini"
+                                  v-show="data.show"
+                                  @click="() => append(data)">
+                            新增
+                          </el-button>
+                          <el-button
+                                  type="text"
+                                  size="mini"
+                                  v-show="data.show"
+                                  @click="() => update(data)">
+                            编辑
+                          </el-button>
+                          <el-button
+                                  type="text"
+                                  size="mini"
+                                  v-show="data.showDel"
+                                  @click="() => remove(node, data)">
+                            删除
+                          </el-button>
+                        </span>
+                      </span>
         </el-tree>
       </div>
       <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
@@ -227,7 +253,8 @@
         </el-form>
         <span slot="footer" class="demo-drawer-footer">
           <el-button  size="mini" class="common-button-default" icon="el-icon-close" @click="cancal">取消</el-button>
-          <el-button size="mini" type="primary"  class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
+          <el-button size="mini" type="primary"  class="common-button-primary" icon="el-icon-check" :loading="exportLoading"
+            @click="exportTestItem">提交</el-button>
         </span>
       </el-dialog>
       <!-- 新增国内标准 -->
@@ -821,6 +848,64 @@
           <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="treeCancel">取消</el-button>
         </div>
       </el-drawer>
+        <!-- 新建抽屉 -->
+        <el-drawer
+                :wrapperClosable="false"
+                :title="productTitle"
+                :visible.sync="productModal"
+                size="800px"
+                :before-close="closeDrawer"
+                label-width="130px"
+        >
+            <div class="demo-drawer-content">
+                <el-form :model="productModelAdd"
+                         ref="productModelAdd"
+                         :rules="productRules"
+                         class="label-input-form"
+                         label-width="130px">
+                    <el-row>
+                        <el-col>
+                            <el-form-item label="菜单名称" prop="menuName" class="add-form-item">
+                                <el-input v-model.trim="productModelAdd.menuName" placeholder="请输入菜单名称" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col>
+                            <el-form-item label="排序号" prop="displaySeq" class="add-form-item">
+                                <el-input v-model.number="productModelAdd.displaySeq"
+                                          number
+                                          placeholder="请输入排序号"
+                                          :maxlength="4"
+                                          clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col>
+                            <el-form-item v-if="modalType === 2" label="上级菜单" prop="parentIdsName" class="add-form-item">
+                                <el-input v-model="productModelAdd.parentIdsName" disabled
+                                          clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col>
+                            <el-form-item label="描述" prop="remarks" class="add-form-item">
+                                <el-input v-model.trim="productModelAdd.remarks"
+                                          placeholder="请输入描述"
+                                          clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </div>
+            <div class="demo-drawer-footer">
+                <el-button
+                        class="common-button-primary"
+                        icon="el-icon-check"
+                        type="primary"
+                        @click="saveProduct('productModelAdd')">提交</el-button>
+                <el-button
+                        class="common-button-default"
+                        icon="el-icon-close"
+                        @click="closeModal">取消</el-button>
+            </div>
+        </el-drawer>
       <!--      导入失败-->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -905,7 +990,7 @@
       }"
         @confirm="isTreeOk"
     ></org-table>
-    <loading style="z-index: 2099;" :loading="exportLoading">导入中...</loading>
+    <loading style="z-index: 2099;" :loading="importLoading">导入中...</loading>
   </div>
 </template>
 
@@ -956,20 +1041,70 @@ export default {
         children: 'children'
       },
       treeList: [],
+      exportLoading : false,
       visibleOrgTable: false,
       orgTableVal: '',
       orgTableValName: '',
       twoOptions: [],
       threeOptions: [],
       sarType: 'STAND',
+      productModal: false, // 模态框是否打开
+      modalType: '',
+      productTitle: '', // 模态框标题
       // 收藏标准
       personCollect: {
         collectResId: '',
         collectTitle: '',
         collectType: ''
       },
+        // 规范
+        productRules: {
+            menuName: [
+                {required: true, message: '一级菜单不能为空', trigger: 'blur'},
+                {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
+            ],
+            displaySeq: [
+                {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
+                {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}
+            ],
+            remarks: [
+                {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'}
+            ],
+            dicTypeName: [
+                {required: true, message: '选项不能为空', trigger: 'blur'},
+                {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
+            ],
+            showIndex: [
+                {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
+                {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}
+            ],
+            describes: [
+                {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'}
+            ]
+        },
+      productModelAdd: {
+        id : "",
+        sorDivide : null,
+        menuName : "",
+        parentId : null,
+        parentIds : null,
+        parentIdsName : "",
+        displaySeq : "",
+        validFlag : "",
+        creationTime : "",
+        modifyTime : "",
+        remarks : "",
+        children : [],
+        // 模态框信息
+        dicTypeName: '',
+        showIndex: '',
+        // 描述
+        describes: '',
+        // 唯一辨识
+        dicId: ""
+       },
       loading: false,
-      exportLoading: false,
+      importLoading: false,
       isCollapse: true,
       sideClose: false, // 边栏收展状态
       isAdvancedSearch: false, // 高级检索窗口是否打开
@@ -1463,6 +1598,71 @@ export default {
     }
   },
   methods: {
+      closeModal () {
+          this.productModal = false
+          this.closeDrawer()
+      },
+      // 提交新增/修改
+      saveProduct (name) {
+          this.$refs[name].validate((valid) => {
+              if (valid) {
+                  if (this.modalType === 1) {
+                      this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, {
+                          _this: this
+                      }, res => {
+                          if (res.ok) {
+                              this.selectMenu()
+                              this.productModal = false
+                              this.productModelAdd = {
+                                  // 模态框信息
+                                  dicTypeName: '',
+                                  showIndex: '',
+                                  // 描述
+                                  describes: '',
+                                  // 唯一辨识
+                                  dicId: this.$route.params.id
+                              }
+                          } else {
+                              this.productModal = true
+                          }
+                      }, e => {})
+                  } else if (this.modalType === 2) {
+                      this.$http.putData('sarResource/ts-resource', this.productModelAdd, {
+                          _this: this
+                      }, res => {
+                          this.selectMenu()
+                          this.productModal = false
+                          this.productModelAdd = {
+                              // 模态框信息
+                              dicTypeName: '',
+                              showIndex: '',
+                              // 描述
+                              describes: '',
+                              // 唯一辨识
+                              dicId: this.$route.params.id
+                          }
+                      }, e => {
+                      })
+                  }
+              } else {
+              }
+          })
+      },
+      closeDrawer () {
+          this.$nextTick(() => {
+              this.$refs['productModelAdd'].resetFields()
+              this.productModelAdd = {
+                  // 模态框信息
+                  dicTypeName: '',
+                  showIndex: '',
+                  // 描述
+                  describes: '',
+                  // 唯一辨识
+                  dicId: this.$route.params.id
+              }
+          })
+          this.productModal = false
+      },
     // 树点击
     isTreeOk (checkedList) {
       this.shareStandardSelect = []
@@ -1688,7 +1888,114 @@ export default {
         })
       }
     },
+      // 查询二级菜单
+      selectChildMenu (row) {
+          this.$http.get('sarResource/ts-resource/getMenuById', {
+              menuId: row.id
+          }, {}, res => {
+              if (res.ok) {
+                  if(this.modalType === 1){
+                      let idsName = ""
+                      if(row.parentIds !== null){
+                          if(row.parentIds.indexOf(res.data.id) != -1){
+                              this.productModelAdd.parentIds = row.parentIds
+                          }else {
+                              this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
+                              idsName = row.parentIdsName + ',' + res.data.menuName
+                          }
+                      }else {
+                          this.productModelAdd.parentIds = res.data.id
+                          idsName = res.data.menuName;
+                      }
+                      this.productModelAdd.parentId = res.data.id
+                      this.productModelAdd.parentIdsName = idsName
+                      this.$forceUpdate()
+                  }else {
+                      this.productModelAdd = res.data
+                  }
+              }
+          })
+      },
+      update(data) {
+          this.modalType = 2
+          this.selectChildMenu(data)
+          this.productModal = true
+          // 取消所有的选中效果
+          this.handleSelectAll(false)
+          this.productTitle = '编辑信息'
+          // const newChild = { id: this.id++, label: 'testtest', children: [] };
+          // if (!data.children) {
+          //     this.$set(data, 'children', []);
+          // }
+          // data.children.push(newChild);
+      },
+
+      append(data) {
+          this.modalType = 1
+          this.selectChildMenu(data)
+          this.productModal = true
+          // 取消所有的选中效果
+          this.handleSelectAll(false)
+          this.productTitle = '新增下级菜单信息'
+          this.productModelAdd.dicTypeCode = ''
+          // const newChild = { id: this.id++, label: 'testtest', children: [] };
+          // if (!data.children) {
+          //     this.$set(data, 'children', []);
+          // }
+          // data.children.push(newChild);
+      },
+
+      remove(node, data) {
+          this.$confirm('是否删除菜单?', '提示', {
+              confirmButtonText: '确定',
+              confirmButtonClass: 'common-button-primary',
+              cancelButtonText: '取消',
+              roundButton: true,
+              type: 'warning'
+          }).then(() => {
+              this.$http.delete("sarResource/ts-resource", {
+                  menuId: data.id
+              }, res => {
+              }, e => {
+                  if(e.ok){
+                      this.$message({
+                          type: 'success',
+                          message: "删除成功"
+                      })
+                      this.selectMenu()
+                  }else {
+                      this.$message({
+                          type: 'warning',
+                          message: e.message
+                      })
+                  }
+              })
+          }).catch(() => {
+              this.$refs.selections.clearSelection()
+              this.$message({
+                  type: 'info',
+                  message: '已取消删除'
+              })
+          })
+          // const parent = node.parent;
+          // const children = parent.data.children || parent.data;
+          // const index = children.findIndex(d => d.id === data.id);
+          // children.splice(index, 1);
+      },
+      // 树节点鼠标移入移出
+      mouseenter(data){
+          console.log(data)
+          this.$set(data, 'show', true)
+          if(data.parentId !== null){
+              this.$set(data, 'showDel', true)
+          }
+      },
+      mouseleave(data){
+          this.$set(data, 'show', false)
+          this.$set(data, 'showDel', false)
+      },
     treeClick (treeNode) {
+      this.selectSarMenu = treeNode
       this.standCommonlySearch.menuId = treeNode.id
       this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
       this.sarStandardsSearch.page = 1
@@ -1958,20 +2265,61 @@ export default {
     },
     // 导出确定功能
     exportTestItem () {
-      if (this.saveExportType === 'apart') {
+        this.exportLoading = true
+
+        if (this.saveExportType === 'apart') {
+      // const param = {
+      //     exportType : this.saveExportType,
+      //     exportContent : this.selectedList.join(','),
+      //     exportName : this.exportName,
+      //     standType : this.standType
+      // }
         if (this.selectedList != null && this.selectedList !== '') {
-          const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
+      //
-            'exportType' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType
+      //       this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', param, {
-          window.open(exportURL)
+      //           _this: this
-          this.$message.success('导出信息成功')
+      //       }, res => {
+      //       }, e => {
+      //       })
+      //       this.$message.success('导出信息成功')
+
+
+            const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
+            'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType
+            window.open(exportURL)
+            this.$message.success('导出信息成功')
+          this.exportLoading = false
         }
       } else if (this.saveExportType === 'all') {
         let exportEOStr = JSON.stringify(this.SarExportSearchEo)
-        exportEOStr = exportEOStr.replace(/""/g, null)
+
+          // const paramAll = {
+          //     exportType : this.saveExportType,
+          //     exportContent : exportEOStr,
+          //     exportName : this.exportName,
+          //     standType : this.standType
+          // }
+          // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', paramAll, {
+          //     _this: this,responseType: 'blob',
+          // }, res => {
+          //   console.log(res)
+          //     this.exportLoading = false
+          //   let url = window.URL.createObjectURL(new Blob([res]))
+          //   let link = document.createElement('a')
+          //   link.style.display = 'none'
+          //   link.href = url
+          //   link.setAttribute('download', 'excel.xlsx')
+          //   document.body.appendChild(link)
+          //   link.click()
+          // }, e => {
+          // })
+          // this.$message.success('导出信息成功')
+        //
         window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
-          'exportType' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType)
+          'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType)
         this.$message.success('导出信息成功')
-      }
+          this.exportLoading = false
+        }
       this.exportModelFlag = false
     },
     // 导出取消按钮关闭模态、置空
@@ -3524,7 +3872,7 @@ export default {
   position: relative;
   .tree-content {
     background: #fff;
-    width: 16%;
+    width: 20%;
     position: relative;
     .tree {
       width: calc(~'100% - 15px');