From 51f76eb92975d31c4a73911bc54d5ca53efde8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 7 May 2022 13:32:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdlx/step1.vue      | 60 +++++++++----------
 .../pages/creatProcess/qbzxdlx/step2.vue      |  1 -
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index b8b0ad24e..2995bc6b1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -6,7 +6,6 @@
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -14,7 +13,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
           <el-form class="label-input-form prc-content-border" label-width="150px" ref="qblx_pageData" :model="qblx_pageData" :rules="qblxRule">
-            <el-form-item label="流程名称" class="add-form-item form-item-disabled">
+            <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
               <el-input
                 style="width: 90%"
                 clearable
@@ -75,9 +74,9 @@
           <el-table-column prop="drafterName" label="起草人" width="150" align="center"></el-table-column>
           <el-table-column prop="resPersonName" label="评审责任人" width="150" align="center"></el-table-column>
           <el-table-column prop="wgLeaderName" label="工作组组长" width="150" align="center"></el-table-column>
-          <el-table-column prop="draftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
-          <el-table-column prop="releaseTime" label="标准发布时间"  width="150" align="center"></el-table-column>
-          <el-table-column prop="endTime" label="截止日期"  align="center"></el-table-column>
+          <el-table-column prop="draftTime" label="计划标准初稿完成时间" min-width="180" align="center"></el-table-column>
+          <el-table-column prop="releaseTime" label="计划标准发布时间"  width="150" align="center"></el-table-column>
+          <el-table-column prop="endTime" label="立项完成时间" min-width="150"  align="center"></el-table-column>
           <el-table-column label="操作" align="center" width="80" fixed="right">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="editRow('edit','编辑信息',scope.row)">编辑</el-button>
@@ -104,7 +103,6 @@
         <el-timeline>
           <el-form
             ref="roleForm"
-            :rules="roleFormRules"
             :model="roleForm"
             class="label-input-form">
             <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
@@ -226,9 +224,10 @@
     </el-drawer>
     <!-- 选择工作组抽屉-->
     <el-drawer
+      class="drawer-table"
       title="选择工作组组长"
       :visible.sync="workModel"
-      size="900px"
+      size="600px"
       @close="closeWorkDrawer"
       custom-class="demo-drawer"
     >
@@ -415,18 +414,14 @@ export default {
         qblxData: [],
       },
       commentText: '',
-      qblxRule: {},
-
+      qblxRule: {
+        processName: [
+          {required: true, message:'请输入流程名称', trigger: 'blur'}
+        ]
+      },
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
-        dockUser: '',
-        dockUserName: '',
-      },
-      roleFormRules:{
-        dockUserName: [
-          {required: true, message: '请选择责任工程师', trigger: 'change'},
-        ],
       },
       // 上传路径
       uploadPath: 'api/att/attFile/uploadNew',
@@ -474,9 +469,9 @@ export default {
         // releaseTime: [
         //   {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
         // ],
-        // drafterName: [
-        //   {required: true, message: '请选择起草人', trigger: 'change'},
-        // ],
+        drafterName: [
+          {required: true, message: '请选择起草人', trigger: 'change'},
+        ],
       },
       isSubmit: false,
       saveLoading: false,
@@ -739,7 +734,6 @@ export default {
         this.qblx_pageData = mes.form ? mes.form : mes.qblx_pageData
         this.fileInfoList = mes.form ? mes.form.qblxFile :  mes.qblx_pageData.qblxFile
         this.commentText = mes.commentText
-        this.roleForm = mes.roleForm
       });
     },
 
@@ -803,14 +797,9 @@ export default {
     },
     // 选人组件确认
     drawerCheck(data) {
-      if(this.type === '1' ){
-        this.addQblxData.dutyPeopleId = data[0].id
-        this.addQblxData.dutyPeople = data[0].name
-      }else{
-        this.roleForm.dockUser = data[0].id
-        this.roleForm.dockUserName = data[0].name
-      }
-      this.modalshowflag = false
+     this.addQblxData.dutyPeopleId = data[0].id
+     this.addQblxData.dutyPeople = data[0].name
+     this.modalshowflag = false
     },
 
     /** 新增按钮 */
@@ -931,7 +920,6 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "26");
       _formData.append("json", JSON.stringify({
-        roleForm: this.roleForm,
         qblx_pageData: this.qblx_pageData,
         commentText: this.commentText
       }));
@@ -944,15 +932,19 @@ export default {
       })
     },
     listSubmit (item) {
+      console.log(item);
       return new Promise((resolve, reject) => {
         let newForm = Object.assign(this.roleForm, item,this.qblx_pageData);
+        newForm.startUserName = this.$store.getters.userInfo.userName
+        newForm.startUser  = this.$store.getters.userInfo.userId
+        newForm.dockUser = item.drafter
+        newForm.dockUserName = item.drafterName
         this.$http.post('lawss/activiti/startProcessRollBack',{
           createUser: this.$store.getters.userInfo.userId,
           createUserName: this.$store.getters.userInfo.userName,
           type: '26',
           json: JSON.stringify({
             form: newForm,
-            roleForm: this.roleForm,
             commentText: this.commentText
           })
         },{
@@ -1130,6 +1122,14 @@ export default {
     height: calc(~'100% - 65px');
     overflow: auto;
   }
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+    /deep/.demo-drawer-content{
+      overflow-y: hidden;
+    }
+  }
 }
 
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index e9fc3c681..cc61b2324 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -917,7 +917,6 @@ export default {
           this.fileIds = itemId.id
           this.getFileInfo();
         });
-        console.log(item.area.join(','));
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })