From 38baa9aeff79a04d2041bf49ae23635cffa6119d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 1 Nov 2021 10:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=A0=87=E5=87=86=E5=8C=96?=
 =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E4=BF=A1=E6=81=AF=E5=A4=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/cywbbzzxd/step1.vue    |  14 +-
 .../pages/creatProcess/cywbbzzxd/step2.vue    | 256 +++++++++++++++++-
 .../pages/creatProcess/jrbzhxh/step1.vue      |  34 ++-
 .../pages/creatProcess/jrbzhxh/step2.vue      |  59 +++-
 .../pages/creatProcess/jrbzhxh/step3.vue      |   4 +
 .../pages/creatProcess/jrbzhxh/step4.vue      |   4 +
 .../tabComponents/taskDraft/index.vue         |  34 +++
 7 files changed, 392 insertions(+), 13 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
index 18e8c2297..84c7e41dc 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue
@@ -1,8 +1,8 @@
 <!-- 加入标准化协会信息备案流程-->
 <template>
-  <div class="jrbzhxh-step1">
+  <div class="cywbbz-step1">
     <ProcessHeader>
-      <template slot="proName">参与外部标准制修订信息备案流程</template>
+      <template slot="proName">参与外部标准制修订信息提报流程</template>
       <template slot="proNode">发起流程</template>
     </ProcessHeader>
     <div class="content">
@@ -28,14 +28,14 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择标准化员进行入会信息填报" placement="top"
+            <el-timeline-item timestamp="责任部门对接人选择责任人填写信息" placement="top"
                               :color="roleForm.dockUser ? '#66b1ff' : ''" >
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                  <h4>标准化员</h4>
+                  <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准化员"
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任部门对接人"
                               @click.native="choiceZRRS">
                     </el-input>
                   </div>
@@ -116,7 +116,7 @@ export default {
       },
       roleFormRules: {
         dockUserName: [
-          {required: true, message: "请选择标准化员", trigger: "change"}
+          {required: true, message: "请选择责任部门对接人", trigger: "change"}
         ],
         directorUserName: [
           {required: true, message: "请选择标准法规部部长", trigger: "change"}
@@ -201,7 +201,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.jrbzhxh-step1 {
+.cywbbz-step1 {
   height: 100%;
   position: relative;
   .content {
diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue
index 8448aa369..4b989be1a 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue
@@ -1,13 +1,263 @@
+<!-- 加入标准化协会信息备案流程-->
 <template>
-
+  <div class="cywbbz-step2">
+    <ProcessHeader>
+      <template slot="proName">参与外部标准制修订信息提报流程</template>
+      <template slot="proNode">发起流程</template>
+    </ProcessHeader>
+    <div class="content">
+      <ProcessTitle>
+        <template slot="title">人员信息</template>
+      </ProcessTitle>
+      <div class="block" style="padding-top: 20px; height: 100%">
+        <el-timeline>
+          <el-form
+            ref="Form"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
+                  <h4>标准法规工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
+                              disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="责任部门对接人选择责任人填写信息" placement="top"
+                              :color="roleForm.dockUser ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="dockUserName" style="margin-bottom: 0">
+                  <h4>责任部门对接人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任部门对接人"
+                              @click.native="choiceZRRS" disabled>
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="选择责任工程师填写信息" placement="top"
+                              :color="roleForm.workPeople ? '#66b1ff' : ''" >
+              <el-card>
+                <el-form-item prop="workPeopleName" style="margin-bottom: 0">
+                  <h4>责任工程师</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.workPeople" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.workPeopleName" placeholder="选择责任工程师"
+                              @click.native="choiceZRRS">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审批" placement="top"
+                              :color="roleForm.directorUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                  <h4>标准法规部部长</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择标准法规部部长"
+                              @click.native="choiceZRR('directorUser', '选择标准法规部部长', roleForm.directorUser)" disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <!--    多选择责任人-->
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessTitle from "process/components/ProcessTitle";
+import ProcessFooter from "process/components/ProcessFooter";
+
 export default {
-  name: "cywbbzzxdStep1"
+  name: "cywbbzzxdStep2",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      isSubmit: false,
+      saveLoading: false,
+      modalshowflag: false, // drawer开关
+      modalshowflag2: false,
+      nodeList2: [],
+      drawerTitle: "", //drawer标题
+      nodeList: [],
+      roleForm: {
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+        prcCreateUser: this.$store.getters.userInfo.userId,
+        dockUser: "",
+        directorUser: "",
+        workPeople: "",
+        dockUserName: "",
+        workPeopleName: "",
+        directorUserName: ""
+      },
+      roleFormRules: {
+        dockUserName: [
+          {required: true, message: "请选择标准化员", trigger: "change"}
+        ],
+        workPeopleName: [
+          {required: true, message: '请选择责任工程师', trigger: "change"}
+        ],
+        directorUserName: [
+          {required: true, message: "请选择标准法规部部长", trigger: "change"}
+        ]
+      },
+    };
+  },
+  methods:{
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.roleForm.workPeople.length > 0) {
+        this.nodeList2 = this.roleForm.workPeople.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
+    checkedRole(data) {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = this.roleRow.id;
+        this.roleForm.dockUserName = this.roleRow.name;
+      } else if (this.type === "directorUser") {
+        this.roleForm.directorUser = data[0].id;
+        this.roleForm.directorUserName = data[0].name;
+      } else if(this.type === "workPeople"){
+        this.roleForm.workPeople = data[0].id;
+        this.roleForm.workPeopleName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.roleForm.workPeople = idList;
+      this.roleForm.workPeopleName = nameList;
+    },
+    handleSubmit(){
+      var json = this.roleForm
+      this.$refs["Form"].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$http.post("lawss/activiti/completeTask", {
+                taskIds: res.data,
+                userId: this.$store.getters.userInfo.userId,
+                json: JSON.stringify(json)
+              }, {
+                _this: this
+              }, res => {
+                if (res.success) {
+                  this.$message.success(res.message);
+                  this.$router.push("/processCenter");
+                }
+                this.isSubmit = false
+              });
+            }
+          });
+        } else {
+          return this.$message.warning("请完善人员信息");
+        }
+      });
+
+    },
+    handleSave(){
+
+    },
+  },
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+.cywbbz-step2 {
+  height: 100%;
+  position: relative;
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+    .form-select{
+      display: flex;
+    }
+  }
+  .headerTabs {
+    display: flex;
+    align-items: center;
+    position: absolute;
+    height: 52px;
+    top: 0;
+    right: 10px;
 
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
index e666ae495..b56fdd7dd 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue
@@ -89,6 +89,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
+import { queryTaskFirst, saveTaskFirst } from "api/process";
 
 export default {
   name: "jrbzhxhStep1",
@@ -124,7 +125,22 @@ export default {
       },
     };
   },
+  mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getData()
+    }
+  },
   methods:{
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.roleForm = mes.roleForm
+      });
+    },
+
     choiceZRR(type, title, id) {
       this.nodeList = [];
       this.nodeList.push(id);
@@ -194,7 +210,23 @@ export default {
 
     },
     handleSave(){
-
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
+      _formData.append("prcType", "15");
+      _formData.append("json", JSON.stringify({
+        taskInfo: '备案任务下发',
+        roleForm: this.roleForm,
+      }));
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
   },
 };
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index e23460f88..4012ab90e 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -329,7 +329,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
-import { inboundLiaisonDetail } from "api/process";
+import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, saveTaskForPub } from "api/process";
 
 export default {
   name: "jrbzhxhStep2",
@@ -353,6 +353,7 @@ export default {
       nodeList: [],
       uploadFileListPath: "api/att/attFile/upload", // 上传的地址
       fileInfoList: [], // 上传的附件
+      fileName:'',
       userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       dlFlag: '', // 1为通过 0为不通过
@@ -416,6 +417,18 @@ export default {
       }, e => {
       });
     },
+    getDatas() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes);
+        console.log(mes);
+        this.wbbzform = mes.form
+        this.associationData = mes.form.associationData
+        this.getFileInfo();
+        this.processTable();
+      });
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -430,6 +443,27 @@ export default {
         });
       });
     },
+    // 请求上传的文件信息
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        this.$nextTick(() => {
+          res.data.map(item => {
+            // 赋值要回显的上传文件内容
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
+          });
+        });
+      }, e => {
+      });
+    },
     /**
      * @description: 动态表单读取
      */
@@ -506,11 +540,28 @@ export default {
       });
     },
     //流程保存
-    handleSave() {},
+    handleSave() {
+      this.saveLoading = true
+      this.wbbzform.fileName = this.fileInfoList
+      let _formData = new FormData()
+      _formData.append('taskIds', this.taskIds)
+      _formData.append('json', JSON.stringify({
+        roleList: this.roleForm,
+        wbbzform: this.wbbzform,
+      }))
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     //流程提交
     handleSubmit() {
       this.isSubmit = true
       this.wbbzform.dlFlag = '1',
+      this.wbbzform.fileName = this.fileInfoList
       this.wbbzform.passUser = this.$store.getters.userInfo.userId,
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
@@ -634,6 +685,10 @@ export default {
     },
   },
   mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getDatas()
+    }
     this.getData()
     this.processTable()
   },
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
index c1ebc0c98..ed7a190c6 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
@@ -484,6 +484,10 @@ export default {
         this.wbbzform = JSON.parse(JSON.stringify(item));
         this.associationData = item.associationData
         this.participantsData = item.participantsData
+        item.fileName.forEach(itemId => {
+          this.fileIds = itemId.id
+          this.getFileInfo();
+        });
       });
     },
     // 请求上传的文件信息
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
index 1258d603e..320410b88 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
@@ -484,6 +484,10 @@ export default {
         this.wbbzform = JSON.parse(JSON.stringify(item));
         this.associationData = item.associationData
         this.participantsData = item.participantsData
+        item.fileName.forEach(itemId => {
+          this.fileIds = itemId.id
+          this.getFileInfo();
+        });
       });
     },
     // 请求上传的文件信息
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 221de273f..6388b651e 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -389,6 +389,40 @@ export default {
             }
           })
           break
+        case '15':
+          if(mes !== null && mes.taskInfo !== null){
+            if (mes.taskInfo === '备案任务下发') {
+              this.$router.push({
+                name: 'jrbzhxhStep1',
+                query: {
+                  type: '15',
+                  processName: '加入标准化协会信息提报流程',
+                  bpnId: id,
+                  verifySarStandard: true,
+                }
+              })
+            }else if(mes.taskInfo === '入会信息填报'){
+              this.$router.push({
+                name: 'jrbzhxhStep2',
+                query: {
+                  type: '15',
+                  processName: '加入标准化协会信息提报流程',
+                  bpnId: id,
+                }
+              })
+            }
+            }else{
+
+            }
+          this.$router.push({
+            name: 'jrbzhxhStep1',
+            query: {
+              type: '15',
+              processName: '加入标准化协会信息提报流程',
+              bpnId: id
+            }
+          })
+          break
         case '20':
           this.$router.push({
             name: 'bzrhStep1',