合并分支 'develop_new' 到 'develop'

Develop new

查看合并请求 laws-foton-slrs/foton-laws-system-front!1

src/components/roleTree/index.vue

@@ -26,6 +26,7 @@
               </el-form-item>
             </el-form>
             <div class="divTree">
+                <!-- 当前tree展示全部人员 -->
                 <el-tree
                         v-if="open1 && isVisible"
                         node-key="id"
@@ -50,6 +51,7 @@
                       <span> {{ node.label }} </span>
                   </span>
                 </el-tree>
+                <!-- 当前tree展示搜索出的人员 -->
                 <el-tree
                         v-if="!open1 && isVisible"
                         node-key="id"
@@ -67,7 +69,8 @@
                         @check="drawerCheck"
                         show-checkbox
                         ref="tree"
-                        :lazy="false">
+                        :lazy="false"
+                        :key="treeKey">
                   <span class="custom-tree-node" slot-scope="{ node, data }">
                       <span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
                       <span> {{ node.label }} </span>
@@ -113,7 +116,7 @@
         props: {
             checkBox: { // 单选/多选
                 type: Boolean,
-                default: false,
+                default: false,//默认false多选
             },
             isTitle: { // 标题
                 type: String
@@ -135,16 +138,17 @@
         },
         data () {
             return {
-                defaultKey: [],
+                treeKey:1,
+                defaultKey: [],//默认展开的节点的 key 的数组
                 visible: false,
                 selectList: [],
-                nodeList2: [],
+                nodeList2: [],//默认勾选的节点的 key 的数组
                 delList: [],
                 roleList: [],
                 filterText: '',
-                defaultProps: {
-                    children: 'children',
-                    label: 'name',
+                defaultProps: {//配置选项
+                    children: 'children',//指定子树为节点对象的某个属性值
+                    label: 'name',//指定节点标签为节点对象的某个属性值
                 },
                 treeData1: [],
                 treeData: [],
@@ -198,8 +202,9 @@
                 )
             },
           searchChange(){
+              // 查询
             if (this.filterText.length) {
-              this.open1 = false
+              this.open1 = false // 显示第二个tree
               this.treeLoading = true
               this.defaultKey = []
               this.$http.get('SarInstitution/institution/getNextTwo', {
@@ -211,8 +216,7 @@
                 })
                 this.treeLoading = false
               })
-
-
+              // this.treeKey++
 
 
               // this.$http.get('SarInstitution/institution/institutionAndUser', {
@@ -265,6 +269,7 @@
                 }
             },
             checkChange (row, type, c) {
+               //节点选中状态发生变化时的回调(传递给 data 属性的数组中该节点所对应的对象、节点本身是否被选中、节点的子树中是否有被选中的节点)
                 if (this.checkBox) {
                 } else {
                     if (type) {
@@ -328,7 +333,8 @@
                 }
                 this.open1 = true
             },
-            drawerCheck (data) {
+            drawerCheck (data) {//当复选框被点击的时候触发
+              //共两个参数，依次为：传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象，包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性
                 if (this.checkBox) { // 单选
                     // 单选判断
                     let getlist = this.$refs.tree.getCheckedNodes()
@@ -363,6 +369,7 @@
                 }
             },
             loadNode(node, resolve) {
+              //加载子树数据的方法，仅当 lazy 属性为true 时生效
                 if (node.level === 0) {
                     return resolve(this.treeData);
                 }

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

@@ -896,6 +896,14 @@ export default {
     getTree2() {
       this.$http.get('lawss/sarMenu', {}, {}, res => {
         if (res.ok) {
+          res.data.forEach(item => {
+            if (item.id && item.id == 'asdfadf') {
+              item.disabled = true;
+              // if (item.childNodes && item.childNodes.length !== 0) {
+              //   this.addAttr(item.childNodes);
+              // }
+            }
+          })
           this.treeData2 = res.data
           this.twoLoading = false
         }

src/pages/home2/components/releaseZL/index.vue

@@ -35,9 +35,9 @@
           label="资料标题"
           :show-overflow-tooltip="true"
           align="center">
-<!--          <template slot-scope="scope">-->
-<!--            <span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span>-->
-<!--          </template>-->
+          <template slot-scope="scope">
+            <span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           prop="dataUploadTime"
@@ -114,6 +114,14 @@ export default {
     getDate (date) {
       return date != null ? date.substring(0, date.indexOf(' ')) : ''
     },
+    toDetail(row){
+      this.$router.push({
+        name: "dataCenterDetail",
+        query: {
+          id: row.id
+        }
+      });
+    },
     //获取数据
     getAdvice() {
         this.loading = true

src/pages/processCenter/pages/creatProcess/bzdy/step4.vue

@@ -388,7 +388,7 @@
                         this.isSubmit = false
                     })
                 } else {
-                    this.$message.warning('请输入反馈意见')
+                    this.$message.warning('请输入审批意见')
                 }
             },
             getData() {

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -415,7 +415,7 @@
                         this.isSubmit = false
                     })
                 } else {
-                    this.$message.warning('请输入反馈意见')
+                    this.$message.warning('请输入审批意见')
                 }
             },
             getData() {

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -263,6 +263,8 @@
                 show-transfer
                 @transfer="handleTransfer"
                 submitBTNText="同意"
+                showOver2
+                @over2="handleSubmitNo"
         >
         </ProcessFooter>
         <Role-tree

src/pages/processCenter/pages/creatProcess/bzpg/step4.vue

@@ -434,12 +434,15 @@ export default {
        this.dataList.map(item => {
         delete item.termsConditions
       })
-      this.dataList.forEach(item => {
-        if(item.implementer){
-          comFlag = true
-          return
-        }
-      })
+      console.log( this.dataList)
+      // this.dataList.forEach(item => {
+      //   if(item.implementer){
+      //     comFlag = true
+      //     return
+      //   }
+      // })
+      if(this.dataList.every(item => item.implementer)) comFlag = true
+
       if(!comFlag){
         this.$message.warning('请选择落实人')
       }else{
@@ -520,11 +523,13 @@ export default {
       this.selectProject = data
     },
     choiceZRRS(row, type, index) {
+      let _index = this.dataList.findIndex(item => item.id===row.id&&item.projectName===row.projectName)
       localStorage.setItem('selectProject', JSON.stringify(this.selectProject))
       this.type = type;
       if (type === 1) {
         this.nodeList2 = [];
-        this.lsIndex = index;
+        // this.lsIndex = index;
+        this.lsIndex = _index;
         if (row.implementerId) {
           this.nodeList2 = row.implementerId.split(",");
         } else {

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

@@ -2390,17 +2390,26 @@
     clearFormData(data) {
       this.form = {
         // 基础信息
+        standInData:  '0', // 标准来源
+        standSort:  '', // 标准类别
+        country:  '', // 国家
+        standSystem:  '', // 标准体系
+        standNumber: '', // 标准编号
+        standNature: '', // 标准性质
+        standEnName: '', // 英文名称
+        standName: '', // 中文名称
+        signFlag: '1', // 是否需要会签
         textStatus: '', // 文本状态
         standYear: '', // 标准年份
-        standInData: data.standInData ? data.standInData : '0', // 标准类型
-        standSort: data.standSort ? data.standSort : '', // 标准类别
-        country: data.country ? data.country : '', // 国家
-        standSystem: data.standSystem ? data.standSystem : '', // 标准体系
-        standNumber: data.standNumber ? data.standNumber : '', // 标准编号
-        standNature: data.standNature ? data.standNature : '', // 标准性质
-        standEnName: data.standEnName ? data.standEnName : '', // 英文名称
-        standName: data.standName ? data.standName : '', // 中文名称
-        signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
+        // standInData: data.standInData ? data.standInData : '0', // 标准类型
+        // standSort: data.standSort ? data.standSort : '', // 标准类别
+        // country: data.country ? data.country : '', // 国家
+        // standSystem: data.standSystem ? data.standSystem : '', // 标准体系
+        // standNumber: data.standNumber ? data.standNumber : '', // 标准编号
+        // standNature: data.standNature ? data.standNature : '', // 标准性质
+        // standEnName: data.standEnName ? data.standEnName : '', // 英文名称
+        // standName: data.standName ? data.standName : '', // 中文名称
+        // signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
         issueTime: '', // 发布时间
         isRelateAccess: '', // 是否纳入认证清单
         standSystemName: '',// 标准体系名称
@@ -2465,6 +2474,20 @@
         treeListName: ''
       } // 标准信息
     },
+    clearFileListData(){
+      // 文本信息文件
+      this.xgdFileList =[] // 修改单
+      this.FBGBJBDFileList=[]//发布稿 原文
+      this.FBGYWBDFileList=[]// 发布稿 译文
+      this.ssgFileList=[]// 送审稿
+      this.caFileList=[]// 草案
+      this.zbjbdFileList=[]// 增补件
+      this.xdbFileList=[]//修订本
+      this.kwjFileList=[]// 勘误件
+      this.jdwjFileList=[]//相关文件
+      this.bpgFileList=[]//报批稿
+      this.zqyjgFileList=[]//征求意见稿
+    },
     handleProcessStandardNext(status) {
       this.submitType = status
       switch (status) {
@@ -2475,7 +2498,9 @@
           this.standardCheckedList = []
           this.standardDrawer = false
           this.verifySarStandard = true
-          this.clearFormData(this.form)
+          // this.clearFormData(this.form)
+          this.clearFormData()
+          this.clearFileListData()
           break
         // 带入（确认）
         case 2:

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

@@ -1337,7 +1337,8 @@ export default {
       }, res => {
         if (res.success) {
           if (this.formTongGuo.approvalOpinion == "1") {
-            this.$message.warning("驳回成功");
+            // this.$message.warning("驳回成功");
+            this.$message.success("驳回成功");
             this.isSubmit = false;
             this.formTongGuo.commentText = "";
             // 流程提交之后，应该流转至待办任务页面

src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue

@@ -426,9 +426,15 @@
 <!--                        </span>-->
 <!--                    </div>-->
 <!--                </el-form-item>-->
-                <el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled">
+<!--                <el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled">-->
+<!--                    <el-input-->
+<!--                            v-model="form.reviewUserName" :disabled="disabledState"-->
+<!--                            clearable-->
+<!--                    ></el-input>-->
+<!--                </el-form-item>-->
+              <el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled">
                     <el-input
-                            v-model="form.reviewUserName" :disabled="disabledState"
+                            :value="cutChinese(form.bussFsSubUser2Name)" :disabled="disabledState"
                             clearable
                     ></el-input>
                 </el-form-item>
@@ -878,6 +884,25 @@ export default {
               })
           })
       },
+      cutChinese(str){
+        // 截取中文 张兰英(zhanglanying),陈春梅(chenchunmei) => 张兰英,陈春梅
+        let result = '', flag = false
+        if(str){
+          for(let i = 0 ; i < str.length ; i++){
+            if(str[i]==='('){
+              flag = true
+              i++
+            }
+            if(str[i]===')'){
+              flag = false
+              if(i===str.length-1) break
+              i++
+            }
+            if(!flag) result+= str[i]
+          }
+        }
+        return result
+      }
   },
   mounted () {
     if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){

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

@@ -24,7 +24,8 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="选择标准" prop="orgName" class="add-form-item form-item-disabled">
-                <el-button :disabled="disabledXX"  size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称、类别查询</el-button>
+<!--                <el-button :disabled="disabledXX"  size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称、类别查询</el-button>-->
+                <el-button :disabled="disabledXX"  size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称查询</el-button>
               </el-form-item>
               <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
                 <el-input :disabled="disabledXX"

src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue

@@ -964,7 +964,7 @@
                         { required: false, message: '请选择企标发布日期', trigger: 'change' }
                     ],
                     FBGBUSSName: [
-                        { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
+                        { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
                     BZSMBUSSName: [
                         { required: true, message: '请上传编制说明',validator: validateBZSMBUSS, trigger: 'blur' }

src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue

@@ -1482,6 +1482,7 @@
                             zrDeptIdName:this.$store.getters.userInfo.institutionName,
                             children:[],
                         };
+                        if(!this.form.modelData) this.form.modelData=[]
                         this.form.modelData.push(list);
                         this.$message.success("新增成功")
                         this.showForm.modelNum = ""

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue

@@ -119,7 +119,7 @@
   <ProcessTitle v-show="verifySarStandard">
     <template slot="title">过程稿件</template>
   </ProcessTitle>
-  <div class="prc-content-border"  v-show="verifySarStandard">
+  <div class="prc-content-border process-manuscript"  v-show="verifySarStandard">
     <el-row :gutter="24">
       <el-col :span="12">
         <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
@@ -1016,4 +1016,7 @@ export default {
   /deep/ .fileClass{
     line-height: 22px !important;
   }
+  .process-manuscript /deep/ .el-form-item__error{
+    right:45px !important;
+  }
 </style>

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

@@ -144,7 +144,7 @@
         <ProcessTitle v-show="verifySarStandard">
           <template slot="title">过程稿件</template>
         </ProcessTitle>
-        <div class="prc-content-border"  v-show="verifySarStandard">
+        <div class="prc-content-border process-manuscript"  v-show="verifySarStandard">
           <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
@@ -3315,4 +3315,7 @@ export default {
     }
   }
 }
+.process-manuscript /deep/ .el-form-item__error{
+  right:45px !important;
+}
 </style>

src/pages/processCenter/pages/creatProcess/qbrk/step4.vue

@@ -2264,7 +2264,10 @@
                                 this.$message.success(res.message)
                             }
                         })
-              }})
+                    }else{
+                      this.$message.warning("请输入意见")
+                    }
+                })
             },
             busVsFunc(){
                 this.$http.get('sarVppsTree/list', '', {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -200,7 +200,8 @@
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+<!--        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">-->
+        <div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
               <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -239,7 +240,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              height="calc(100% - 64px)"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectListChange"
@@ -438,6 +439,9 @@ export default {
         //   }
         // })
         this.total = this.standinfoList.length
+        this.$nextTick(()=>{
+          this.$refs.selection.doLayout();
+        })
       })
 
     },

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -216,7 +216,8 @@
      custom-class="demo-drawer"
    >
      <div class="demo-drawer-content">
-       <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+<!--       <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">-->
+       <div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
            <div class="left">
              <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -255,7 +256,7 @@
              tooltip-effect="dark"
              style="width: 100%"
              border
-             height="100%"
+             height="calc(100% - 64px)"
              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
              @selection-change="selectListChange"
@@ -457,6 +458,9 @@ export default {
         //   }
         // })
         this.total = this.standinfoList.length
+        this.$nextTick(()=>{
+          this.$refs.selection.doLayout();
+        })
       })
 
     },

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -541,7 +541,8 @@ export default {
           { required: true, message: "请选择代替企标编号", trigger: "blur" }
         ],
         area: [
-          { required: true, message: "请选择适用车型", trigger: "change" }
+          // { required: true, message: "请选择适用车型", trigger: "change" }
+          { required: true, message: "请选择适用车型", trigger: "blur" }
         ],
         reviseStatus: [
           { required: true, message: "请选择制修订类型", trigger: "blur" }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -214,7 +214,8 @@
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+<!--        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">-->
+        <div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
               <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -254,7 +255,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              height="calc(100% - 64px)"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectListChange"
@@ -1095,6 +1096,9 @@ export default {
         // })
         this.total = this.standinfoList.length
         this.replaceLoading = false
+        this.$nextTick(()=>{
+          this.$refs.selection.doLayout();
+        })
       })
 
     },

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -207,7 +207,8 @@
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+<!--        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">-->
+        <div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
               <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -246,7 +247,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              height="calc(100% - 64px)"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectListChange"
@@ -444,6 +445,9 @@ export default {
         //   }
         // })
         this.total = this.standinfoList.length
+        this.$nextTick(()=>{
+          this.$refs.selection.doLayout()
+        })
       })
 
     },

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -68,7 +68,7 @@
             <!--              v-model="dataCenterSearch.dataType"-->
             <!--              placeholder="请输入类型"-->
             <!--            ></el-input>-->
-            <el-select ref="treeSelect" class="tree-select" v-model="dataCenterSearch.treeId" value-key="id" placeholder="请选择类型">
+            <el-select ref="treeSelect" class="tree-select" filterable clearable v-model="dataCenterSearch.treeId" @clear="setValueNull" value-key="id" placeholder="请选择类型">
               <el-option class="tree-select-option" :value="dataCenterSearch.treeId" :label="dataCenterSearch.dataType">
                 <el-tree
                   ref="tree"
@@ -766,6 +766,9 @@ export default {
     },
     handlePreview(file) {
     },
+    setValueNull(){
+      this.dataCenterSearch.dataType = ''
+    },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 50 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
@@ -815,6 +818,9 @@ export default {
         this.loading = false
         return
       }
+      if(this.dataCenterSearch.treeId){
+        delete this.dataCenterSearch.treeId
+      }
       this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
         _this: this
       }, res => {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -6524,4 +6524,7 @@ export default {
     }
   }
 }
+.search-area /deep/ input.el-input__inner {
+  width: 168px !important;
+}
 </style>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -1233,6 +1233,9 @@ export default {
           this.xmztOptions = this.notProjectStatus
           this.total = res.data.notMaintenance.total;
         }
+        this.$nextTick(() => {
+            this.$refs.multipleTable.doLayout();
+        })
       }, e => {
       });
       // this.$refs.selection.selectAll(false)
@@ -1266,6 +1269,9 @@ export default {
           this.xmztOptions = this.notProjectStatus
           this.total = res.data.notMaintenance.total;
         }
+        this.$nextTick(() => {
+            this.$refs.multipleTable.doLayout();
+        })
       }, e => {
       });
       // this.$refs.selection.selectAll(false)
@@ -1727,4 +1733,10 @@ export default {
     }
   }
 }
+/deep/ .el-table__fixed{
+  height:100% !important;
+}
+/deep/ .el-table__fixed-right{
+  height:100% !important;
+}
 </style>

src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue

@@ -111,6 +111,7 @@
                                 this.opinionContent.newText = ''
                                 // this.opinionContent.cause = ''
                                 this.opinionContent.chapterName = ''
+                                this.$message.success(res.message)
                             }
                         })
                     }