commit

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

@@ -36,7 +36,7 @@
                   <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">
+                              @click.native="choiceZRR('dockUser', '选择责任部门对接人', roleForm.dockUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -60,12 +60,12 @@
       </div>
     </div>
     <!--    多选择责任人-->
-    <Role-tree
+<!--    <Role-tree-->
-      is-title="选择责任部门对接人"
+<!--      is-title="选择责任部门对接人"-->
-      :is-visible.sync="modalshowflag2"
+<!--      :is-visible.sync="modalshowflag2"-->
-      @checkedRole="checkedRole2"
+<!--      @checkedRole="checkedRole2"-->
-      :nodeList="nodeList2"
+<!--      :nodeList="nodeList2"-->
-    ></Role-tree>
+<!--    ></Role-tree>-->
     <Role-tree
       check-box
       :is-title="drawerTitle"
@@ -132,43 +132,43 @@ export default {
       this.drawerTitle = title;
       this.modalshowflag = true;
     },
-    choiceZRRS() {
+    // choiceZRRS() {
-      this.nodeList2 = [];
+    //   this.nodeList2 = [];
-      if (this.roleForm.dockUser.length > 0) {
+    //   if (this.roleForm.dockUser.length > 0) {
-        this.nodeList2 = this.roleForm.dockUser.split(",");
+    //     this.nodeList2 = this.roleForm.dockUser.split(",");
-      }
+    //   }
-      this.modalshowflag2 = true;
+    //   this.modalshowflag2 = true;
-    },
+    // },
     checkedRole(data) {
       if (this.type === "dockUser") {
-        this.roleForm.dockUser = this.roleRow.id;
+        this.roleForm.dockUser = data[0].id;
-        this.roleForm.dockUserName = this.roleRow.name;
+        this.roleForm.dockUserName = data[0].name;
       } else if (this.type === "directorUser") {
         this.roleForm.directorUser = data[0].id;
         this.roleForm.directorUserName = data[0].name;
       }
       this.modalshowflag = false;
     },
-    checkedRole2(data) {
+    // checkedRole2(data) {
-      var idList = "";
+    //   var idList = "";
-      var nameList = "";
+    //   var nameList = "";
-      data.forEach(item => {
+    //   data.forEach(item => {
-        if (nameList.length > 0) {
+    //     if (nameList.length > 0) {
-          nameList += ",";
+    //       nameList += ",";
-          idList += ",";
+    //       idList += ",";
-        }
+    //     }
-        idList += item.id;
+    //     idList += item.id;
-        nameList += item.name;
+    //     nameList += item.name;
-      });
+    //   });
-      this.roleForm.dockUser = idList;
+    //   this.roleForm.dockUser = idList;
-      this.roleForm.dockUserName = nameList;
+    //   this.roleForm.dockUserName = 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.$http.get("lawss/activiti/startProcess", {type: "14"}, {
             _this: this
           }, res => {
             if (res.ok) {

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

@@ -50,7 +50,7 @@
                   <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">
+                              @click.native="choiceZRR('workPeople', '选择责任工程师', roleForm.workPeople)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -103,6 +103,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessTitle from "process/components/ProcessTitle";
 import ProcessFooter from "process/components/ProcessFooter";
+import { inboundLiaisonDetail } from "api/process";
 
 export default {
   name: "cywbbzzxdStep2",
@@ -131,19 +132,44 @@ export default {
         directorUserName: ""
       },
       roleFormRules: {
-        dockUserName: [
+        // dockUserName: [
-          {required: true, message: "请选择标准化员", trigger: "change"}
+        //   {required: true, message: "请选择标准化员", trigger: "change"}
-        ],
+        // ],
-        workPeopleName: [
+        // workPeopleName: [
-          {required: true, message: '请选择责任工程师', trigger: "change"}
+        //   {required: true, message: '请选择责任工程师', trigger: "change"}
-        ],
+        // ],
-        directorUserName: [
+        // directorUserName: [
-          {required: true, message: "请选择标准法规部部长", trigger: "change"}
+        //   {required: true, message: "请选择标准法规部部长", trigger: "change"}
-        ]
+        // ]
       },
     };
   },
+  mounted() {
+    this.getData();
+  },
   methods:{
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.roleForm = item
+      });
+    },
     choiceZRR(type, title, id) {
       this.nodeList = [];
       this.nodeList.push(id);
@@ -186,33 +212,31 @@ export default {
       this.roleForm.workPeopleName = nameList;
     },
     handleSubmit(){
-      var json = this.roleForm
+      if(this.roleForm.workPeople !== undefined){
-      this.$refs["Form"].validate((valid) => {
+        var json = this.roleForm
-        if (valid) {
+        this.$refs["Form"].validate((valid) => {
-          this.isSubmit = true
+          if (valid) {
-          this.$http.get("lawss/activiti/startProcess", {type: "15"}, {
+            this.isSubmit = true
-            _this: this
+            this.$http.post("lawss/activiti/completeTask", {
-          }, res => {
+              taskIds: this.$route.query.taskIds,
-            if (res.ok) {
+              userId: this.$store.getters.userInfo.userId,
-              this.$http.post("lawss/activiti/completeTask", {
+              json: JSON.stringify(json)
-                taskIds: res.data,
+            }, {
-                userId: this.$store.getters.userInfo.userId,
+              _this: this
-                json: JSON.stringify(json)
+            }, res => {
-              }, {
+              if (res.success) {
-                _this: this
+                this.$message.success(res.message);
-              }, res => {
+                this.$router.push("/processCenter");
-                if (res.success) {
+              }
-                  this.$message.success(res.message);
+              this.isSubmit = false
-                  this.$router.push("/processCenter");
+            });
-                }
+          } else {
-                this.isSubmit = false
+            return this.$message.warning("请完善人员信息");
-              });
+          }
-            }
+        });
-          });
+      }else{
-        } else {
+        this.$message.warning('请选择责任工程师')
-          return this.$message.warning("请完善人员信息");
+      }
-        }
-      });
 
     },
     handleSave(){

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

@@ -38,9 +38,9 @@
                     clearable>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="主持或参与" prop="personnelRole" class="add-form-item ">
+                <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
                   <div class="form-select">
-                    <el-select v-model="wbbzform.personnelRole" placeholder="请选择主持或参与">
+                    <el-select v-model="wbbzform.hostOrTask" placeholder="请选择主持或参与">
                       <el-option
                         v-for="item in associationOptions"
                         :key="item.value"
@@ -50,26 +50,27 @@
                     </el-select>
                   </div>
                 </el-form-item>
-                <el-form-item label="参与人" prop="standNumber" class="add-form-item ">
+                <el-form-item label="参与人" prop="participants" class="add-form-item ">
                   <el-input
-                    v-model="wbbzform.standNumber"
+                    v-model="wbbzform.participants"
                     placeholder="请选择参与人"
                     clearable>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="标准制定机构" prop="standNumber" class="add-form-item ">
+                <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
                   <el-input
-                    v-model="wbbzform.standNumber"
+                    v-model="wbbzform.standMechanism"
                     placeholder="请选择标准制定机构"
                     clearable>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="参与时间" prop="reportingUnit" class="add-form-item form-item-disabled">
+                <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
                   <el-date-picker
-                    v-model="wbbzform.membershipTime"
+                    v-model="wbbzform.partakeTime"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="请选择入会时间">
                   </el-date-picker>
                 </el-form-item>
@@ -80,9 +81,9 @@
                     clearable>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="标准类型" prop="personnelRole" class="add-form-item ">
+                <el-form-item label="标准类型" prop="standType" class="add-form-item ">
                   <div class="form-select">
-                    <el-select v-model="wbbzform.personnelRole" placeholder="请选择标准类型">
+                    <el-select v-model="wbbzform.standType" placeholder="请选择标准类型">
                       <el-option
                         v-for="item in associationOptions"
                         :key="item.value"
@@ -92,9 +93,9 @@
                     </el-select>
                   </div>
                 </el-form-item>
-                <el-form-item label="标准制修订" prop="personnelRole" class="add-form-item ">
+                <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
                   <div class="form-select">
-                    <el-select v-model="wbbzform.personnelRole" placeholder="请选择标准制修订">
+                    <el-select v-model="wbbzform.standRevise" placeholder="请选择标准制修订">
                       <el-option
                         v-for="item in associationOptions"
                         :key="item.value"
@@ -104,17 +105,20 @@
                     </el-select>
                   </div>
                 </el-form-item>
-                <el-form-item label="标准(拟)发布时间" prop="reportingUnit" class="add-form-item form-item-disabled">
+                <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
                   <el-date-picker
-                    v-model="wbbzform.membershipTime"
+                    v-model="wbbzform.releaseTime"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="请选择标准(拟)发布时间">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
           </div>
-          <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
+          <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+                     @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+          </el-button>
         </el-form>
         <ProcessTitle>
           <template slot="title">项目信息</template>
@@ -134,17 +138,17 @@
          fontWeight: 'bold', height: '48px'}"
                   @selection-change="handleSelectionChange1"
                   row-key="id">
-          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column type="selection" width="55" align="center" />
           <el-table-column
             prop="projectNumber"
             label="项目编号"
             align="center">
             <template slot-scope="scope">
-               <el-input
+              <el-input
-                 v-model="scope.row.projectNumber"
+                v-model="scope.row.projectNumber"
-                 placeholder="请输入项目编号"
+                placeholder="请输入项目编号"
-               >
+              >
-               </el-input>
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -256,8 +260,11 @@
     <ProcessFooter
       show-save
       show-submit
+      show-record
+      :recordLoading="recordLoading"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      @record="handleRecord"
       @save="handleSave"
       @submit="handleSubmit"
     >
@@ -283,34 +290,44 @@ export default {
       active: "1",
       foldFormFlag: true,
       isSubmit: false,
+      recordLoading: false,
       saveLoading: false,
       loading: false,
       detailData: [],  //审批历史信息
       wbbzform: {
-        reportingUnit:'',
+        reportingUnit: "",
-        associationName: '',
+        standNumber: "",
-        committee:'',
+        hostOrTask: "",
-        workingGroup:'',
+        participants: "",
-        personnelRole:'',
+        standMechanism: "",
-        membershipTime:'',
+        partakeTime: "",
+        standName: "",
+        standType: "",
+        standRevise: "",
+        releaseTime: ""
       },
-      formRules: {},
+      formRules: {
-      participantsData: [{
+        reportingUnit: [
-        projectNumber: '',
+          { required: true, message: "请输入提报单位", trigger: "change" }
-        projectName: '',
+        ]
-        expenses: '',
+      },
-        costBudget:'',
+      participantsData: [],
-      }], //参与人表格信息
+      // participantsData: [{
+      //   projectNumber: '',
+      //   projectName: '',
+      //   expenses: '',
+      //   costBudget:'',
+      // }], //参与人表格信息
       associationOptions: [{
-        value: '选项1',
+        value: "选项1",
-        label: '1'
+        label: "1"
       }, {
-        value: '选项2',
+        value: "选项2",
-        label: '2'
+        label: "2"
-      },{
+      }, {
-        value: '选项3',
+        value: "选项3",
-        label: '3'
+        label: "3"
-      }],
+      }]
     };
   },
   methods: {
@@ -332,35 +349,73 @@ export default {
       this.active = type;
     },
     foldForm() {
-      this.foldFormFlag = !this.foldFormFlag
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    handleSave() {
+    },
+    //不备案
+    handleRecord(){
+
     },
-    handleSave() {},
     handleSubmit() {
-      console.log(this.wbbzform);
+      if (this.participantsData.length < 1) {
+        this.$message.warning("项目信息不能为空");
+      } else {
+        this.participantsData.forEach(item => {
+          if (item.projectNumber === undefined) {
+            this.$message.warning("请完善项目信息");
+          }
+        });
+        this.wbbzform.commentText = this.commentText;
+        let json = {
+          participantsData: this.participantsData,
+          wbbzform: this.wbbzform,
+          dlFlag: '1',
+        };
+        this.$refs["wbbzForm"].validate((valid) => {
+          if (valid) {
+            this.$http.post("lawss/activiti/completeTask", {
+              taskIds: this.$route.query.taskIds,
+              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("请完善基础信息");
+          }
+        });
+      }
     },
     //添加按鈕事件
-    addProject(){
+    addProject() {
-       var list = {
+      var list = {
-         projectNumber: this.projectNumber,
+        projectNumber: this.projectNumber,
-         projectName: this.projectName,
+        projectName: this.projectName,
-         expenses: this.expenses,
+        expenses: this.expenses,
-         costBudget: this.costBudget
+        costBudget: this.costBudget
-       }
+      };
-      this.participantsData.push(list)
+      this.participantsData.push(list);
     },
     //批量刪除按鈕事件
-    deleteProject(){
+    deleteProject() {
 
     },
-    handleSelectionChange1(data){
+    handleSelectionChange1(data) {
 
-    },
+    }
   },
   computed: {
     listNoDataText() {
       return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
     }
-  },
+  }
 };
 </script>
 
@@ -368,15 +423,18 @@ export default {
 .wbbz-step1 {
   height: 100%;
   position: relative;
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
-    .form-select{
+
+    .form-select {
       display: flex;
     }
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -392,6 +450,7 @@ export default {
       }
     }
   }
+
   .headerTabs {
     display: flex;
     align-items: center;

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

@@ -0,0 +1,477 @@
+<!--  参与外部标准制修订流程-->
+<template>
+  <div class="wbbz-step1">
+    <ProcessHeader>
+      <template slot="proName">参与外部标准制修订信息提报流程</template>
+      <template slot="proNode">责任部门对接人审核</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div>
+        <el-form
+          ref="wbbzForm"
+          :model="wbbzform"
+          :rules="formRules"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border" v-if="foldFormFlag">
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.reportingUnit"
+                    placeholder="请输入提报单位"
+                    readonly
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standNumber"
+                    readonly
+                    placeholder="请输入标准编号"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.hostOrTask"
+                    readonly
+                    placeholder="请选择主持或参与"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="参与人" prop="participants" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.participants"
+                    readonly
+                    placeholder="请选择参与人"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standMechanism"
+                    placeholder="请选择标准制定机构"
+                    readonly
+                    clearable>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="wbbzform.partakeTime"
+                    readonly
+                    placeholder="请选择参与时间"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="standName" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standName"
+                    placeholder="请输入标准名称"
+                    readonly
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="标准类型" prop="standType" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standType"
+                    readonly
+                    placeholder="请选择标准类型"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standRevise"
+                    readonly
+                    placeholder="请选择标准制修订"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="wbbzform.releaseTime"
+                    readonly
+                    placeholder="请选择标准(拟)发布时间"
+                    clearable>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+                     @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+          </el-button>
+        </el-form>
+        <ProcessTitle>
+          <template slot="title">项目信息</template>
+        </ProcessTitle>
+        <div class="tableTitle">
+          <div class="tableButton">
+          </div>
+        </div>
+        <el-table border
+                  ref="selection"
+                  :data="participantsData"
+                  tooltip-effect="dark"
+                  style="width: 100%;"
+                  :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                  row-key="id">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column
+            prop="projectNumber"
+            label="项目编号"
+            align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.projectNumber"
+                placeholder="请输入项目编号"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            label="项目名称"
+            align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.projectName"
+                placeholder="请输入项目名称"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="expenses"
+            label="费用支出项"
+            align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.expenses"
+                placeholder="请输入费用支出项"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="costBudget"
+            label="费用预算"
+            align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.costBudget"
+                placeholder="请输入费用预算"
+              >
+              </el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-save
+      show-submit
+      show-record
+      :recordLoading="recordLoading"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @record="handleRecord"
+      @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";
+import { inboundLiaisonDetail } from "api/process";
+
+export default {
+  name: "cywbbzzxdStep4",
+  components: {
+    ProcessHeader,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      //切换tab
+      active: "1",
+      foldFormFlag: true,
+      isSubmit: false,
+      recordLoading: false,
+      saveLoading: false,
+      loading: false,
+      detailData: [],  //审批历史信息
+      wbbzform: {
+        reportingUnit: "",
+        standNumber: "",
+        hostOrTask: "",
+        participants: "",
+        standMechanism: "",
+        partakeTime: "",
+        standName: "",
+        standType: "",
+        standRevise: "",
+        releaseTime: ""
+      },
+      formRules: {
+        reportingUnit: [
+          { required: true, message: "请输入提报单位", trigger: "change" }
+        ]
+      },
+      participantsData: [],
+      // participantsData: [{
+      //   projectNumber: '',
+      //   projectName: '',
+      //   expenses: '',
+      //   costBudget:'',
+      // }], //参与人表格信息
+      associationOptions: [{
+        value: "选项1",
+        label: "1"
+      }, {
+        value: "选项2",
+        label: "2"
+      }, {
+        value: "选项3",
+        label: "3"
+      }]
+    };
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+      });
+    },
+    //审批历史信息
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    handleTabs(type) {
+      this.active = type;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    handleSave() {
+    },
+    //不备案
+    handleRecord(){
+
+    },
+    handleSubmit() {
+      if (this.participantsData.length < 1) {
+        this.$message.warning("项目信息不能为空");
+      } else {
+        this.participantsData.forEach(item => {
+          if (item.projectNumber === undefined) {
+            this.$message.warning("请完善项目信息");
+          }
+        });
+        this.wbbzform.commentText = this.commentText;
+        let json = {
+          participantsData: this.participantsData,
+          wbbzform: this.wbbzform,
+          dlFlag: '1',
+        };
+        this.$refs["wbbzForm"].validate((valid) => {
+          if (valid) {
+            this.$http.post("lawss/activiti/completeTask", {
+              taskIds: this.$route.query.taskIds,
+              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("请完善基础信息");
+          }
+        });
+      }
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.wbbz-step1 {
+  height: 100%;
+  position: relative;
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .form-select {
+      display: flex;
+    }
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+
+  .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>

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

@@ -157,8 +157,8 @@ export default {
     },
     checkedRole(data) {
       if (this.type === "dockUser") {
-        this.roleForm.dockUser = this.roleRow.id;
+        this.roleForm.dockUser = data[0].id;
-        this.roleForm.dockUserName = this.roleRow.name;
+        this.roleForm.dockUserName = data[0].name;
       } else if (this.type === "directorUser") {
         this.roleForm.directorUser = data[0].id;
         this.roleForm.directorUserName = data[0].name;

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

@@ -634,46 +634,84 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      if (this.dataList.length < 1) {
+      if(this.$route.query.prcNum === undefined){
-        this.$message.warning("标准不能为空");
+        if (this.dataList.length < 1) {
-      } else {
+          this.$message.warning("标准不能为空");
-        this.dataList.forEach(item => {
+        } else {
-         if( item.workPeople === ''){
+          this.dataList.forEach(item => {
-            this.$message.warning('请选择推荐署名人及单位')
+            if( item.workPeople === ''){
-         }
+              this.$message.warning('请选择推荐署名人及单位')
-        })
+            }
-        let json = {
+          })
-          commentText: this.commentText,
+          let json = {
-          roleForm: this.roleForm,
+            commentText: this.commentText,
-          dataList: this.dataList,
+            roleForm: this.roleForm,
-        }
+            dataList: this.dataList,
-        this.$refs["Form"].validate((valid) => {
-          if (valid) {
-            this.isSubmit = true
-            this.$http.get("lawss/activiti/startProcess", {type: "16"}, {
-              _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("请完善人员信息");
           }
-        });
+          this.$refs["Form"].validate((valid) => {
+            if (valid) {
+              this.isSubmit = true
+              this.$http.get("lawss/activiti/startProcess", {type: "16"}, {
+                _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("请完善人员信息");
+            }
+          });
+        }
+      }else{
+        if (this.dataList.length < 1) {
+          this.$message.warning("标准不能为空");
+        } else {
+          this.dataList.forEach(item => {
+            if( item.workPeople === ''){
+              this.$message.warning('请选择推荐署名人及单位')
+            }
+          })
+          let json = {
+            commentText: this.commentText,
+            roleForm: this.roleForm,
+            dataList: this.dataList,
+          }
+          this.$refs["Form"].validate((valid) => {
+            if (valid) {
+              this.isSubmit = true
+              this.$http.post("lawss/activiti/completeTask", {
+                taskIds: this.$route.query.taskIds,
+                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("请完善人员信息");
+            }
+          });
+        }
       }
+
     },
     // 流程阶段负责人选择
     choiceZRR(type, title, id) {

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -894,6 +894,43 @@ export default {
             })
           }
           break
+        case '14':
+          //参与外部标准制修订信息提报
+          if (row.taskInfo === '下发责任工程师') {
+            this.$router.push({
+              name: 'cywbbzzxdStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '填写备案信息'){
+            this.$router.push({
+              name: 'cywbbzzxdStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '责任部门对接人审核'){
+            this.$router.push({
+              name: 'cywbbzzxdStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
         case '15':
           //加入标准化协会信息备案流程
           if (row.taskInfo === '填写入会信息') {

src/router/index.js

@@ -1177,6 +1177,15 @@ const routes = [
           title: '参与外部标准制修订信息提报流程'
         }
       },
+      {
+        path: '/cywbbzzxdStep4',
+        name: 'cywbbzzxdStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
       {
         path: '/jrbzhxhStep1',
         name: 'jrbzhxhStep1',