commit

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

@@ -92,7 +92,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="textarea">
+              v-model="commentText">
             </el-input>
           </div>
         </el-collapse-item>
@@ -348,7 +348,7 @@ export default {
   name: "wbsmStep1",
   data() {
     return {
-      textarea: '', // 意见
+      commentText: '', // 意见
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
@@ -389,6 +389,8 @@ export default {
       roleForm: {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         prcCreateUser: this.$store.getters.userInfo.userId,
+        passUserName: this.$store.getters.userInfo.userName,
+        passUser: this.$store.getters.userInfo.userId,
         dockUser: "",
         ministerUser: "" ,
         directorUser: "",
@@ -529,6 +531,9 @@ export default {
           if (newStand) {
             this.$message.warning("请勿重复添加数据");
           } else {
+            this.$set(item, "workPeople", '');
+            this.$set(item, "reason", '');
+            this.$set(item, "expenses", '');
             this.dataList.push(item);
             exits.push(item.id);
           }
@@ -604,6 +609,46 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
+      if (this.dataList.length < 1) {
+        this.$message.warning("标准不能为空");
+      } else {
+        this.dataList.forEach(item => {
+         if( item.workPeople === ''){
+            this.$message.warning('请选择推荐署名人及单位')
+         }
+        })
+        this.roleForm.commentText = this.commentText
+        let json = {
+          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("请完善人员信息");
+          }
+        });
+      }
     },
     // 流程阶段负责人选择
     choiceZRR(type, title, id) {
@@ -629,7 +674,7 @@ export default {
       }else{
         const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
         newRow.workPeopleId = data[0].id;
-        newRow.workPeople = data[0].name;
+        newRow.workPeople = data[0].name + '(' + data[0].institutionName + ')';
         this.$set(this.dataList, this.zrIndex, newRow);
       }
       this.modalshowflag = false;

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

@@ -17,41 +17,46 @@
           :data="dataList"
           border
           ref="entryTable"
-          height="94%"
+          height="90%"
-          style="width: 100%; margin-top: 10px; "
+          style="width: 100%"
           :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 prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
+          <el-table-column
+            prop="code"
+            width="180px"
+            align="center"
+            label="标准号">
             <template slot-scope="scope">
-              <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a v-if="scope.row.standYear" class="table-jump"
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                  scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                {{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
-          <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
+          <el-table-column
+            prop="standName"
+            label="标准名称"
+            align="center"
+          >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
-          <el-table-column prop="productName" label="标准类别" align="center" show-overflow-tooltip>
+          <el-table-column prop="standSortShow" label="标准类别" align="center" show-overflow-tooltip>
-<!--            <template>-->
-<!--              <el-select v-model="dataList.productName" placeholder="请选择标准类别">-->
-<!--                <el-option-->
-<!--                  v-for="item in standOptions"-->
-<!--                  :key="item.value"-->
-<!--                  :label="item.label"-->
-<!--                  :value="item.value">-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </template>-->
-          </el-table-column>
-          <el-table-column prop="itemsNum" label="推荐署名人及单位" align="center"/>
-          <el-table-column prop="itemsName" label="署名人所在单位" align="center"/>
-          <el-table-column prop="planCloseTime" label="推荐署名原因" align="center">
             <template slot-scope="scope">
-              <el-input></el-input>
+              <a>{{ scope.row.standSortShow }}</a>
             </template>
           </el-table-column>
-          <el-table-column prop="itemsNum" label="费用" align="center"/>
+
+          <el-table-column prop="workPeople" label="推荐署名人及单位" align="center">
+          </el-table-column>
+          <el-table-column prop="reason" label="推荐署名原因" align="center">
+          </el-table-column>
+          <el-table-column prop="expenses" label="费用" align="center">
+          </el-table-column>
         </el-table>
       </div>
       <el-collapse accordion>
@@ -62,7 +67,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="textarea">
+              v-model="commentText">
             </el-input>
           </div>
         </el-collapse-item>
@@ -180,8 +185,9 @@ export default {
       passInfo: 0,
       detailData: [],
       loading: false,
-      textarea: '', // 意见
+      commentText: '', // 意见
       title: '', // 新增编辑抽屉标题
+      isTransfer: false,
       ListModel: false, // 新增编辑抽屉开关
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
@@ -283,26 +289,34 @@ export default {
       })
     },
     getData() {
-      const params = {
+      return new Promise((resolve, reject) => {
-        taskIds: this.taskIds,
+        inboundLiaisonDetail({
-        pId: this.pId,
+          taskIds: this.$route.query.taskIds,
-        // standId: '', // 标准号/名称
+          pId: this.$route.query.prcId
-        // productName: '', // 项目名称
+        }).then(res => {
-        // responsibleUnit: '' // 责任部门
+          if (res) {
-      }
+            const processForm = JSON.parse(res.mesg);
-      inboundLiaisonDetail(params).then(res => {
+            this.getFormFieldList(processForm);
-        const processForm = JSON.parse(res.mesg)
+          }
-        this.getFormFieldList(processForm)
+        }).catch(e => {
-      })
+        });
+      });
     },
-    getFormFieldList (item) {
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
-        if (item.passInfo !== undefined) {
+        this.dataList = item.dataList
-          this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
+        // if(!item.directorUser){
-        }
+        //   this.wbbzform = JSON.parse(JSON.stringify(item));
-        this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
+        //   this.associationData = item.associationData
-        this.textarea = JSON.parse(JSON.stringify(item)).commentText
+        //   this.participantsData = item.participantsData
-      })
+        // }else{
+        //
+        // }
+      });
     },
     // 批量选择分发责任人
     dutyEngineerList(id) {
@@ -410,30 +424,6 @@ export default {
       }
       this.modalshowflag = false
     },
-    //查询按钮
-    /*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
-        this.realList = this.dataList.filter(item => {
-          let matchId = true; // 标准号 筛选
-          let matchName = true; // 项目名称 筛选
-          let matchUnit = true; // 部门 筛选
-
-          if (standId) {
-            const keysId = standId
-              .toUpperCase() // 转大写
-              .replace(' ', '') // 删掉空格
-              .split('') // 切割成 单个字
-            matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
-          }
-          if (productName) {
-            matchName = item.productName === productName;
-          }
-          if (responsibleUnit) {
-            matchUnit = item.responsibleUnit === responsibleUnit;
-          }
-          return matchId && matchName && matchUnit;
-        })
-        this.dataList = this.realList
-      },*/
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({

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

@@ -931,6 +931,44 @@ export default {
             })
           }
           break
+        case '16':
+          //外部署名推荐审批流程
+          if (row.taskInfo === '会签') {
+            this.$router.push({
+              name: 'wbsmStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          // else if(row.taskInfo === '标准法规工程师审核'){
+          //   this.$router.push({
+          //     name: 'jrbzhxhStep3',
+          //     query: {
+          //       taskIds: row.taskIds,
+          //       prcId: row.prcId,
+          //       prcNum: row.prcNum,
+          //       prcName: row.prcName,
+          //       prcType: row.prcType
+          //     }
+          //   })
+          // }else if(row.taskInfo === '标准法规部部长批准'){
+          //   this.$router.push({
+          //     name: 'jrbzhxhStep4',
+          //     query: {
+          //       taskIds: row.taskIds,
+          //       prcId: row.prcId,
+          //       prcNum: row.prcNum,
+          //       prcName: row.prcName,
+          //       prcType: row.prcType
+          //     }
+          //   })
+          // }
+          break
         // 外部标准化协会入会流程
         case '20':
           if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') {