Merge remote-tracking branch 'origin/develop' into develop

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

@@ -70,7 +70,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" placeholder="请选择工作组组长"
-                  @click.native="choiceZRR"></el-input>
+                  @click.native="choiceLeader"></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
@@ -306,6 +306,86 @@
         </div>
       </div>
     </el-drawer>
+    <!-- 选择工作组抽屉-->
+    <el-drawer
+      title="选择工作组组长"
+      :visible.sync="workModel"
+      size="900px"
+      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: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="workSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="工作组" class="search-item">
+                  <el-input
+                    v-model="workSearch.workGroupName"
+                    clearable
+                    placeholder="根据工作组进行查找"
+                  />
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    @click="getWorkBtn">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              ref="workGroup"
+              :data="workData"
+              tooltip-effect="dark"
+              border
+              style="width: 100%; flex: auto;"
+              class="drag-table"
+              height="100%"
+              @selection-change="workChange"
+              :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="workGroup"
+                label="工作组"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="workLeader"
+                label="工作组组长"
+                align="center">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
     <!--    多选择责任人-->
     <Role-tree
       :is-title="drawerTitle2"
@@ -345,6 +425,13 @@ export default {
   props: ['message'],
   data(){
     return {
+      workModel: false,
+      workSearch: {
+        workGroupName: "",
+      },
+      total: 0,
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
       QYBZmodal: false,
       TXJGmodal: false,
       modalshowflagZRBM: false,
@@ -353,6 +440,7 @@ export default {
         children: 'children',
         label: 'menuName'
       },
+      workData: [],
       TXJGList: [],
       QYBZList: [],
       QYBZformSelect: [],
@@ -374,6 +462,7 @@ export default {
       modalshowflag: false,
       nodeList2: [],
       nodeList: [],
+      workChangeList: [],
       standSortOptions: [],
       cbcdOptions: [],
       BZList: [],
@@ -460,6 +549,7 @@ export default {
     },
   },
   mounted(){
+    this.getWorkData()
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
@@ -488,6 +578,58 @@ export default {
     }
   },
   methods: {
+    choiceLeader(){
+       this.workModel = true
+    },
+    closeDrawer(){
+     this.workModel = false
+    },
+    OkDrawer(){
+      if(this.workChangeList.length > 1 ){
+        this.$message.warning('您只能选择一条数据进行带入')
+      }else if(this.workChangeList.length < 1 ){
+        this.$message.warning('请至少选择一条数据')
+      }else{
+        this.$set(this.qbfsForm, 'wgLeader', this.workChangeList[0].workLeaderId)
+        this.$set(this.qbfsForm, 'wgLeaderName',  this.workChangeList[0].workLeader)
+        if(this.qbfsForm.wgLeaderName){
+          this.$refs.qbfsForm.validateField('wgLeaderName')
+        }
+        this.workModel = false
+      }
+    },
+    getWorkBtn(){
+     this.page = 1
+      this.getWorkData()
+    },
+    clearSearch(){
+     this.workSearch.workGroupName = ''
+      this.getWorkData()
+    },
+    pageChange(page){
+      this.page = page
+      this.getWorkData()
+    },
+    pageSizeChange(pageSize){
+        this.pageSize = pageSize
+        this.getWorkData()
+    },
+    workChange(data) {
+       this.workChangeList = data
+    },
+    getWorkData() {
+      this.$http.get("workGroup/work-group", {
+        pageSize: this.pageSize,
+        page: this.page,
+        workGroupName: this.workSearch.workGroupName
+      }, {
+        _this: this
+      }, res => {
+        this.workData = res.data.records;
+        this.total = res.data.total;
+      }, e => {
+      });
+    },
     assemble(ids,names){
       let list= new Array();
       let idArray=ids.split(',');

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

@@ -138,7 +138,7 @@
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
               <el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
-                        @click.native="choiceZRR"></el-input>
+                        @click.native="choiceLeader"></el-input>
             </el-form-item>
             <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
               <el-date-picker
@@ -459,6 +459,86 @@
         </div>
       </div>
     </el-drawer>
+    <!-- 选择工作组抽屉-->
+    <el-drawer
+      title="选择工作组组长"
+      :visible.sync="workModel"
+      size="900px"
+      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: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="workSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="工作组" class="search-item">
+                  <el-input
+                    v-model="workSearch.workGroupName"
+                    clearable
+                    placeholder="根据工作组进行查找"
+                  />
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    @click="getWorkBtn">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    @click="clearWorkSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              ref="workGroup"
+              :data="workData"
+              tooltip-effect="dark"
+              border
+              style="width: 100%; flex: auto;"
+              class="drag-table"
+              height="100%"
+              @selection-change="workChange"
+              :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+              >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="workGroup"
+                label="工作组"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="workLeader"
+                label="工作组组长"
+                align="center">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeWorkDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkWorkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
     <!--    多选择责任人-->
     <Role-tree
       :is-title="drawerTitle2"
@@ -499,6 +579,15 @@ export default {
   props: ['message'],
   data(){
     return {
+      workModel: false,
+      workSearch: {
+        workGroupName: "",
+      },
+      totalNo: 0,
+      pageNo: 1,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      workData: [],
+      workChangeList: [],
       QYBZmodal: false,
       TXJGmodal: false,
       QYBZShow: false,
@@ -649,6 +738,58 @@ export default {
     }
   },
   methods: {
+    choiceLeader(){
+      this.workModel = true
+    },
+    closeWorkDrawer(){
+      this.workModel = false
+    },
+    OkWorkDrawer(){
+      if(this.workChangeList.length > 1 ){
+        this.$message.warning('您只能选择一条数据进行带入')
+      }else if(this.workChangeList.length < 1 ){
+        this.$message.warning('请至少选择一条数据')
+      }else{
+        this.$set(this.qbfsForm, 'wgLeader', this.workChangeList[0].workLeaderId)
+        this.$set(this.qbfsForm, 'wgLeaderName',  this.workChangeList[0].workLeader)
+        if(this.qbfsForm.wgLeaderName){
+          this.$refs.qbfsForm.validateField('wgLeaderName')
+        }
+        this.workModel = false
+      }
+    },
+    getWorkBtn(){
+      this.page = 1
+      this.getWorkData()
+    },
+    clearWorkSearch(){
+      this.workSearch.workGroupName = ''
+      this.getWorkData()
+    },
+    pageChangeNo(page){
+      this.pageNo = page
+      this.getWorkData()
+    },
+    pageSizeChangeNo(pageSize){
+      this.pageSizeNo = pageSize
+      this.getWorkData()
+    },
+    workChange(data) {
+      this.workChangeList = data
+    },
+    getWorkData() {
+      this.$http.get("workGroup/work-group", {
+        pageSize: this.pageSizeNo,
+        page: this.pageNo,
+        workGroupName: this.workSearch.workGroupName
+      }, {
+        _this: this
+      }, res => {
+        this.workData = res.data.records;
+        this.total = res.data.total;
+      }, e => {
+      });
+    },
     //体系结构单选
     handleClick(data,checked, node){
       if(checked){