合并分支 'dev_20230216' 到 'master'

Dev 20230216

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

src/pages/details/otherBussStandardDetails/index.vue

@@ -2973,37 +2973,51 @@ export default {
         },e => reject(e));
       })
     },
+    jump(){
+      return new Promise((resolve,reject)=>{
+        this.$http.post('lawss/AskQuestions/jump', {
+          standId: this.$route.params.id,
+          userId : this.$store.getters.userInfo.userId,
+        }, {
+          _this: this
+        }, res => {
+          resolve(res)
+        },e => reject(e));
+      })
+    },
     //标准问答按钮
     knowledgeSharing() {
-      this.selectAskReply()
-          .then((res)=>{
-            if( res && res.data.length === 0){
-              this.$router.push({
-                name: 'MyQuestions3',
-                query: {
-                  activeName: "myQue",
-                  type: this.$route.params.pageType,
-                  id: this.$route.params.id,
-                  dialogVisible: true
-                },
-              })
-            }else{
-              const data = res.data[0].askQuestions
-              this.$router.push({
-                name: 'MyQuestions3',
-                query: {
-                  activeName: "myQue",
-                  type: this.$route.params.pageType,
-                  // classification: data.classification,
-                  id: this.$route.params.id,
-                  dialogVisible: false
-                },
-              })
-            }
-          }).catch(e =>{
-        console.log(e)
+      this.jump().then(res => {
+        let activeName = res.data
+        this.selectAskReply()
+            .then((res)=>{
+              if( res && res.data.length === 0){
+                this.$router.push({
+                  name: 'MyQuestions3',
+                  query: {
+                    activeName,
+                    type: this.$route.params.pageType,
+                    id: this.$route.params.id,
+                    dialogVisible: true
+                  },
+                })
+              }else{
+                const data = res.data[0].askQuestions
+                this.$router.push({
+                  name: 'MyQuestions3',
+                  query: {
+                    activeName,
+                    type: this.$route.params.pageType,
+                    // classification: data.classification,
+                    id: this.$route.params.id,
+                    dialogVisible: false
+                  },
+                })
+              }
+            })
       })
 
+
       // this.$router.push({
       //   // path: '/standQA',
       //   query: {

src/pages/personal/pages/my-questions/index.vue

@@ -824,7 +824,7 @@
           <el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
         </el-form-item>
         <el-form-item label="标准号" class="serch-form-item">
-          {{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }}
+          {{ questionForm.standSortShow }} {{questionForm.standNumber }} {{ questionForm.standYear === '' ? '' : '-' }} {{ questionForm.standYear }}
         </el-form-item>
         <el-form-item label="标准名称" class="serch-form-item">
           {{questionForm.standardName}}

src/pages/personal/pages/my-questions/index2.vue

@@ -98,7 +98,8 @@ export default {
           }, val => {
             this.asdId = val
             this.$http.post('lawss/AskQuestions/selectQuestionReplyInfo',{
-                  id: val
+                  id: val,
+                  userId:this.$store.getters.userInfo.userId
                 },
                 {
                   _this: this

src/pages/personal/pages/my-questions/index3.vue

@@ -824,7 +824,7 @@
           <el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
         </el-form-item>
         <el-form-item label="标准号" class="serch-form-item">
-          {{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }}
+          {{ questionForm.standSortShow }} {{questionForm.standNumber }} {{ questionForm.standYear === '' ? '' : '-' }} {{ questionForm.standYear }}
         </el-form-item>
         <el-form-item label="标准名称" class="serch-form-item">
           {{questionForm.standardName}}

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

@@ -124,11 +124,16 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
+            <el-form-item label="技术委员会评审负责人" prop="wgLeaderName" class="add-form-item form-item-disabled">
+              <template v-slot:label>
+                <el-tooltip content="技术委员会评审负责人" placement="top">
+                  <span>技术委员会评审负责人</span>
+                </el-tooltip>
+              </template>
               <el-input :disabled="disabledXX"
                 readonly
                 v-model="qbfsForm.wgLeaderName"
-                placeholder="请输入工作组组长"
+                placeholder="请选择技术委员会评审负责人"
                 clearable
               ></el-input>
             </el-form-item>
@@ -290,10 +295,10 @@
                 align="center"
                 label="评审责任人">
               </el-table-column>
-              <el-table-column
+                <el-table-column
                 prop="wgLeaderName"
                 align="center"
-                label="工作组组长">
+                label="技术委员会评审负责人">
               </el-table-column>
               <el-table-column
                 prop="draftTime"

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

@@ -132,11 +132,16 @@
                clearable
              ></el-input>
            </el-form-item>
-           <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
+           <el-form-item label="技术委员会评审负责人" prop="wgLeaderName" class="add-form-item form-item-disabled">
+             <template v-slot:label>
+               <el-tooltip content="技术委员会评审负责人" placement="top">
+                 <span>技术委员会评审负责人</span>
+               </el-tooltip>
+             </template>
              <el-input :disabled="disabledXX"
                readonly
                v-model="qbfsForm.wgLeaderName"
-               placeholder="请输入工作组组长"
+               placeholder="请选择技术委员会评审负责人"
                clearable
              ></el-input>
            </el-form-item>
@@ -309,7 +314,7 @@
              <el-table-column
                prop="wgLeaderName"
                align="center"
-               label="工作组组长">
+               label="技术委员会评审负责人">
              </el-table-column>
              <el-table-column
                prop="draftTime"

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

@@ -78,10 +78,16 @@
                   @click.native="choiceZRRS('2')">
         </el-input>
       </el-form-item>
-      <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <!--工作组组长改为技术委员会评审负责人-->
+      <el-form-item prop="wgLeaderName" label="技术委员会评审负责人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <template v-slot:label>
+          <el-tooltip content="技术委员会评审负责人" placement="top">
+            <span>技术委员会评审负责人</span>
+          </el-tooltip>
+        </template>
         <el-input :disabled="disabledXX"  v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
-        <el-input :disabled="disabledXX"  v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
-                  @click.native="choiceLeader"></el-input>
+        <el-input :disabled="disabledXX"  v-model="qbfsForm.wgLeaderName" placeholder="请选择技术委员会评审负责人"
+                  @click.native="workGroupUnfold('workLeader', '选择技术委员会评审负责人', qbfsForm.wgLeader)"></el-input>
       </el-form-item>
       <el-form-item style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
         <template v-slot:label>
@@ -414,6 +420,13 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <!--技术委员会评审负责人-->
+    <Role-tree
+        check-box
+        is-title="选择技术委员会评审负责人"
+        :is-visible.sync="workLeaderVisible"
+        :node-list="workLeaderNodeList"
+        @checkedRole="workLeaderCheckedRole" />
     <Mechanism-tree v-if="!disabledXX"
       is-title="选择起草责任单位"
       :is-visible.sync="modalshowflagZRBM"
@@ -561,7 +574,8 @@ export default {
           { required: true, message: "请输入评审责任人", trigger: "blur" }
         ],
         wgLeaderName: [
-          { required: true, message: "请输入工作组组长", trigger: "blur" }
+          // { required: true, message: "请输入工作组组长", trigger: "blur" }
+          { required: true, message: "请选择技术委员会评审负责人", trigger: "blur" }
         ],
         unitName: [
           { required: true, message: "请选择起草责任单位", trigger: "blur" }
@@ -597,7 +611,9 @@ export default {
           { required: true, validator: validateFsOnlineFile, trigger: 'blur' }
         ],
       },
-
+      //技术委员会评审负责人
+      workLeaderVisible: false,
+      workLeaderNodeList: []
     }
   },
   watch:{
@@ -1039,7 +1055,18 @@ export default {
           this.$message.warning("请完善基础信息");
         }
       })
-    }
+    },
+    workGroupUnfold(type, title, ids){
+      if(ids){
+        this.workLeaderNodeList = ids.split(',')
+      }
+      // 展开弹窗
+      this.workLeaderVisible = true
+    },
+    workLeaderCheckedRole(data){
+      this.qbfsForm.wgLeader = data[0].id
+      this.qbfsForm.wgLeaderName = data[0].name
+    },
   },
 };
 </script>

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

@@ -152,10 +152,15 @@
                         @click.native="choiceZRRS('1')">
               </el-input>
             </el-form-item>
-            <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
+            <el-form-item prop="wgLeaderName" label="技术委员会评审负责人" class="add-form-item form-item-disabled">
+              <template v-slot:label>
+                <el-tooltip content="技术委员会评审负责人" placement="top">
+                  <span>技术委员会评审负责人</span>
+                </el-tooltip>
+              </template>
               <el-input :disabled="disabledXX"  v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
-              <el-input :disabled="disabledXX"  v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
-                        @click.native="choiceLeader"></el-input>
+              <el-input :disabled="disabledXX"  v-model="qbfsForm.wgLeaderName" placeholder="请选择技术委员会评审负责人"
+                        @click.native="workGroupUnfold('workLeader', '选择技术委员会评审负责人', qbfsForm.wgLeader)"></el-input>
             </el-form-item>
             <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
               <el-date-picker :disabled="disabledXX"
@@ -308,7 +313,7 @@
               <el-table-column
                 prop="wgLeaderName"
                 align="center"
-                label="工作组组长">
+                label="技术委员会评审负责人">
               </el-table-column>
               <el-table-column
                 prop="draftTime"
@@ -572,6 +577,13 @@
       :nodeList="nodeList"
     ></Role-tree>
     <loading :loading="formLoading">数据加载中...</loading>
+    <!--技术委员会评审负责人-->
+    <Role-tree
+        check-box
+        is-title="选择技术委员会评审负责人"
+        :is-visible.sync="workLeaderVisible"
+        :node-list="workLeaderNodeList"
+        @checkedRole="workLeaderCheckedRole" />
   </div>
 </template>
 
@@ -669,7 +681,8 @@ export default {
           {required: true, message: '请输入评审责任人', trigger: 'blur'},
         ],
         wgLeaderName: [
-          {required: true, message: '请输入工作组组长', trigger: 'blur'},
+          // {required: true, message: '请输入工作组组长', trigger: 'blur'},
+          { required: true, message: "请选择技术委员会评审负责人", trigger: "blur" }
         ],
         draftTime: [
           {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
@@ -727,6 +740,9 @@ export default {
         reviewDate: '',
         abolishCause:'',
       },
+      //技术委员会评审负责人
+      workLeaderVisible: false,
+      workLeaderNodeList: []
     }
   },
   mounted() {
@@ -1147,6 +1163,17 @@ export default {
       console.log(data);
       this.selectList = data
     },
+    workGroupUnfold(type, title, ids){
+      if(ids){
+        this.workLeaderNodeList = ids.split(',')
+      }
+      // 展开弹窗
+      this.workLeaderVisible = true
+    },
+    workLeaderCheckedRole(data){
+      this.qbfsForm.wgLeader = data[0].id
+      this.qbfsForm.wgLeaderName = data[0].name
+    },
   }
 };
 </script>

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

@@ -131,11 +131,16 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
+            <el-form-item label="技术委员会评审负责人" prop="wgLeaderName" class="add-form-item form-item-disabled">
+              <template v-slot:label>
+                <el-tooltip content="技术委员会评审负责人" placement="top">
+                  <span>技术委员会评审负责人</span>
+                </el-tooltip>
+              </template>
               <el-input :disabled="disabledXX"
                 readonly
                 v-model="qbfsForm.wgLeaderName"
-                placeholder="请输入工作组组长"
+                placeholder="请选择技术委员会评审负责人"
                 clearable
               ></el-input>
             </el-form-item>
@@ -300,7 +305,7 @@
               <el-table-column
                 prop="wgLeaderName"
                 align="center"
-                label="工作组组长">
+                label="技术委员会评审负责人">
               </el-table-column>
               <el-table-column
                 prop="draftTime"

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

@@ -75,11 +75,16 @@
               placeholder="请输入评审责任人"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+          <el-form-item prop="wgLeaderName" label="技术委员会评审负责人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <template v-slot:label>
+              <el-tooltip content="技术委员会评审负责人" placement="top">
+                <span>技术委员会评审负责人</span>
+              </el-tooltip>
+            </template>
             <el-input
               disabled
               v-model="qbfsForm.wgLeaderName"
-              placeholder="请输入工作组组长"
+              placeholder="请选择技术委员会评审负责人"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">

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

@@ -75,12 +75,17 @@
               placeholder="请输入评审责任人"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+          <el-form-item prop="wgLeaderName" label="技术委员会评审负责人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <template v-slot:label>
+              <el-tooltip content="技术委员会评审负责人" placement="top">
+                <span>技术委员会评审负责人</span>
+              </el-tooltip>
+            </template>
             <el-input
-              disabled
-              v-model="qbfsForm.wgLeaderName"
-              placeholder="请输入工作组组长"
-              :maxlength="500"/>
+                disabled
+                v-model="qbfsForm.wgLeaderName"
+                placeholder="请选择技术委员会评审负责人"
+                :maxlength="500"/>
           </el-form-item>
           <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
             <el-date-picker

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

@@ -75,12 +75,17 @@
               placeholder="请输入评审责任人"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+          <el-form-item prop="wgLeaderName" label="技术委员会评审负责人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <template v-slot:label>
+              <el-tooltip content="技术委员会评审负责人" placement="top">
+                <span>技术委员会评审负责人</span>
+              </el-tooltip>
+            </template>
             <el-input
-              disabled
-              v-model="qbfsForm.wgLeaderName"
-              placeholder="请输入工作组组长"
-              :maxlength="500"/>
+                disabled
+                v-model="qbfsForm.wgLeaderName"
+                placeholder="请选择技术委员会评审负责人"
+                :maxlength="500"/>
           </el-form-item>
           <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
             <el-date-picker

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue

@@ -75,12 +75,17 @@
               placeholder="请输入评审责任人"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+          <el-form-item prop="wgLeaderName" label="技术委员会评审负责人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <template v-slot:label>
+              <el-tooltip content="技术委员会评审负责人" placement="top">
+                <span>技术委员会评审负责人</span>
+              </el-tooltip>
+            </template>
             <el-input
-              disabled
-              v-model="qbfsForm.wgLeaderName"
-              placeholder="请输入工作组组长"
-              :maxlength="500"/>
+                disabled
+                v-model="qbfsForm.wgLeaderName"
+                placeholder="请选择技术委员会评审负责人"
+                :maxlength="500"/>
           </el-form-item>
           <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
             <el-date-picker

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

@@ -224,7 +224,7 @@
         <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
           <el-input :disabled="disabledXX"  v-model="addQblxData.wgLeader" style="display: none;"></el-input>
           <el-input :disabled="disabledXX"  v-model="addQblxData.wgLeaderName" placeholder="请选择工作组组长"
-                    @click.native="choiceLeader"></el-input>
+                    @click.native="workGroupUnfold('workLeader', '选择工作组组长', addQblxData.wgLeader)"></el-input>
         </el-form-item>
         <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
           <el-date-picker :disabled="disabledXX"
@@ -411,6 +411,13 @@
         </div>
       </el-upload>
     </el-dialog>
+    <!--工作组组长-->
+    <Role-tree
+        check-box
+        is-title="请选择工作组组长"
+        :is-visible.sync="workLeaderVisible"
+        :node-list="workLeaderNodeList"
+        @checkedRole="workLeaderCheckedRole" />
   </div>
 </template>
 
@@ -585,7 +592,10 @@ export default {
         disabledDate(date) {
           return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
         }
-      }
+      },
+      //工作组组长
+      workLeaderVisible: false,
+      workLeaderNodeList: []
     }
   },
 
@@ -1152,6 +1162,17 @@ export default {
         this.$message.warning('立项列表不能为空')
       }
     },
+    workGroupUnfold(type, title, ids){
+      if(ids){
+        this.workLeaderNodeList = ids.split(',')
+      }
+      // 展开弹窗
+      this.workLeaderVisible = true
+    },
+    workLeaderCheckedRole(data){
+      this.addQblxData.wgLeader = data[0].id
+      this.addQblxData.wgLeaderName = data[0].name
+    },
   }
 }
 </script>

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

@@ -99,7 +99,7 @@
           <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
             <el-input v-model="qbfsForm.wgLeaderName" clearable placeholder="请选择工作组组长"
-                      @click.native="choiceLeader"></el-input>
+                      @click.native="workGroupUnfold('workLeader', '选择工作组组长', qbfsForm.wgLeader)"></el-input>
           </el-form-item>
           <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
             <el-date-picker
@@ -572,6 +572,13 @@
       @checkedRole="checkedRolePeople"
       :nodeList="nodeList"
     ></Role-tree>
+    <!--工作组组长-->
+    <Role-tree
+        check-box
+        is-title="工作组组长"
+        :is-visible.sync="workLeaderVisible"
+        :node-list="workLeaderNodeList"
+        @checkedRole="workLeaderCheckedRole" />
   </div>
 </template>
 
@@ -785,7 +792,9 @@ export default {
           {required: true, message: '请输入采用标准', trigger: 'blur'},
         ],
       },
-
+      //工作组组长
+      workLeaderVisible: false,
+      workLeaderNodeList: []
     }
   },
   mounted() {
@@ -1374,7 +1383,18 @@ export default {
       this.roleForm.countersignerName = nameList;
       this.qbfsForm.resPerson = idList;
       this.qbfsForm.resPersonName = nameList;
-    }
+    },
+    workGroupUnfold(type, title, ids){
+      if(ids){
+        this.workLeaderNodeList = ids.split(',')
+      }
+      // 展开弹窗
+      this.workLeaderVisible = true
+    },
+    workLeaderCheckedRole(data){
+      this.qbfsForm.wgLeader = data[0].id
+      this.qbfsForm.wgLeaderName = data[0].name
+    },
   },
 };
 </script>

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -346,14 +346,21 @@
                                                     :maxlength="500"/>
                                             <el-input :disabled="DrawerType === 'see'" v-model="addForm.resPersonName" placeholder="请选择评审责任人" readonly="readonly"  @click.native="choiceZRRS('resPerson', '选择评审责任人', addForm.resPerson)"></el-input>
                                         </el-form-item>
-                                        <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <el-input
-                                                    style="display: none;"
-                                                    v-model="addForm.wgLeader"
-                                                    :maxlength="500"/>
-                                            <el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly"  @click.native="workGroup(addForm.wgLeader)"></el-input>
-<!--                                            <el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly"  @click.native="choiceZRR('wgLeader', '选择工作组组长', addForm.wgLeader)"></el-input>-->
-                                        </el-form-item>
+                                      <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-input
+                                            style="display: none;"
+                                            v-model="addForm.wgLeader"
+                                            :maxlength="500"/>
+                                        <el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly"  @click.native="workGroupUnfold('workLeader', '选择工作组组长', addForm.wgLeader)"></el-input>
+                                      </el-form-item>
+                                        <!--<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">-->
+                                        <!--    <el-input-->
+                                        <!--            style="display: none;"-->
+                                        <!--            v-model="addForm.wgLeader"-->
+                                        <!--            :maxlength="500"/>-->
+                                        <!--    <el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly"  @click.native="workGroup(addForm.wgLeader)"></el-input>-->
+                                        <!--    &lt;!&ndash; <el-input :disabled="DrawerType === 'see'" v-model="addForm.wgLeaderName" placeholder="请选择工作组组长" readonly="readonly"  @click.native="choiceZRR('wgLeader', '选择工作组组长', addForm.wgLeader)"></el-input>&ndash;&gt;-->
+                                        <!--</el-form-item>-->
                                         <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-date-picker
                                                     v-model="addForm.draftTime"
@@ -482,6 +489,13 @@
                     @checkedRole="checkedRole"
                     :nodeList="nodeList"
             ></Role-tree>
+            <!--工作组组长-->
+            <Role-tree
+                check-box
+                is-title="选择工作组组长"
+                :is-visible.sync="workLeaderVisible"
+                :node-list="workLeaderNodeList"
+                @checkedRole="workLeaderCheckedRole" />
             <el-dialog
                     :visible.sync="QCDWmodal"
                     width="500px"
@@ -876,7 +890,9 @@
                 },
                 total: 0,
                 data: [],
-
+                // 工作组组长
+                workLeaderVisible: false,
+                workLeaderNodeList: []
             }
         },
         props: {},
@@ -1175,6 +1191,17 @@
                 }
                 this.modalshowflag2 = true
             },
+            workGroupUnfold(type, title, ids){
+              if(ids){
+                this.workLeaderNodeList = ids.split(',')
+              }
+              // 展开弹窗
+              this.workLeaderVisible = true
+            },
+            workLeaderCheckedRole(data){
+              this.addForm.wgLeader = data[0].id
+              this.addForm.wgLeaderName = data[0].name
+            },
             checkedRole2 (data) {
 
                 let idList = ''