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

src/pages/home2/components/solicitopinions/index.vue

@@ -83,11 +83,11 @@ export default {
       });
     },
     standForComments(item) {
-      this.$store.commit("setDetailMap", this.$router.path);
+        this.$store.commit("setDetailMap", this.$router.path);
       this.$router.push({
         name: "consultationDetails",
         query: {
-          item: item
+          item: JSON.stringify(item)
         }
       });
     }

src/pages/home2/components/todoList/index.vue

@@ -970,6 +970,18 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if (row.taskInfo === '重新起草') {
+            this.$router.push({
+              name: 'wfhxzgStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }else {
             this.$router.push({
               name: 'wfhxzgStep5',

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

@@ -380,7 +380,7 @@ export default {
     }
   },
   mounted(){
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     //查询下拉框数据

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

@@ -401,7 +401,7 @@ export default {
     }
   },
   mounted(){
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     //查询下拉框数据

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

@@ -550,7 +550,7 @@ export default {
   },
   mounted(){
     this.getWorkData()
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     //查询下拉框数据

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

@@ -712,7 +712,7 @@ export default {
     }
   },
   mounted() {
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     //查询下拉框数据

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

@@ -389,7 +389,7 @@ export default {
     }
   },
   mounted(){
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     this.$http.get('sys/dictype/getDicTypeListCode', '',{

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

@@ -128,11 +128,11 @@
                               :color="roleForm.approver ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="approverName" style="margin-bottom: 0">
-                  <h4>标准法规部高级经理</h4>
+                  <h4>总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.approver" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.approverName" placeholder="选择标准法规部高级经理"
+                    <el-input v-model="roleForm.approverName" placeholder="选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长"
-                              @click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
+                              @click.native="choiceZRR('approver', '选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', roleForm.approver)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -321,7 +321,7 @@ export default {
           {required: true, message:'请选择标准体系工作组组长',  trigger: "change" }
         ],
         approverName:[
-          {required: true, message:'请选择标准法规部高级经理',  trigger: "change" }
+          {required: true, message:'请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长',  trigger: "change" }
         ],
         engineerName:[
           {required: true, message:'请选择相关单位、工程研究总院标准法规部',  trigger: "change" }
@@ -333,7 +333,7 @@ export default {
    this.taskId = this.$route.query.taskIds
     this.bpnId = this.$route.query.bpnId
     if (this.bpnId !== undefined) {
-      this.getDatas()
+      this.getData()
     }
     if(this.taskId){
       this.approvalFlag = true
@@ -368,25 +368,20 @@ export default {
     getData() {
       this.formLoading = true
       this.showFlag = false
-      return new Promise((resolve, reject) => {
+      queryTaskFirst({
-        inboundLiaisonDetail({
+        bpnId: this.$route.query.bpnId
-          taskIds: this.$route.query.taskIds,
+      }).then(res => {
-          pId: this.$route.query.prcId
+        let mes = JSON.parse(res.mes)
-        }).then(res => {
+        this.getFormFieldList(mes);
-          if (res) {
-            const processForm = JSON.parse(res.mesg);
-            this.getFormFieldList(processForm);
-          }
-        }).catch(e => {
-        });
       });
     },
     /**
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      let type = item.qbfsForm.type
       this.$nextTick(() => {
-        switch (item.type){
+        switch (type){
           case '1':
             this.comName = "merge"
             break
@@ -403,18 +398,18 @@ export default {
             this.comName = "establish"
             break
         }
-        this.qbfsForm = item;
+        this.qbfsForm = item.qbfsForm;
         this.formLoading = false;
-        this.roleForm.dockUser = item.dockUser;
+        this.roleForm.dockUser = item.roleForm.dockUser;
-        this.roleForm.dockUserName = item.dockUserName;
+        this.roleForm.dockUserName = item.roleForm.dockUserName;
-        this.roleForm.countersigner = item.countersigner;
+        this.roleForm.countersigner = item.roleForm.countersigner;
-        this.roleForm.countersignerName = item.countersignerName;
+        this.roleForm.countersignerName = item.roleForm.countersignerName;
-        this.roleForm.approver = item.approver;
+        this.roleForm.approver = item.roleForm.approver;
-        this.roleForm.approverName = item.approverName;
+        this.roleForm.approverName = item.roleForm.approverName;
-        this.roleForm.engineer = item.engineer;
+        this.roleForm.engineer = item.roleForm.engineer;
-        this.roleForm.engineerName = item.engineerName;
+        this.roleForm.engineerName = item.roleForm.engineerName;
-        this.roleForm.examine = item.examine;
+        this.roleForm.examine = item.roleForm.examine;
-        this.roleForm.examineName = item.examineName;
+        this.roleForm.examineName = item.roleForm.examineName;
       });
     },
     handleTabs(name) {
@@ -437,6 +432,7 @@ export default {
     //流程保存
     handleSave() {
       let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+      qbzxdFrom.type = this.toggleType
       this.saveLoading = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')

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

@@ -324,7 +324,15 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js'
+import {
+  startProcess,
+  completeTask,
+  saveTaskFirst,
+  queryTaskFirst,
+  taskDel,
+  processBack,
+  inboundLiaisonDetail
+} from "@/api/process.js";
 import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js'
 
 export default {
@@ -332,6 +340,7 @@ export default {
   data() {
     return {
       loading: false,
+      submitFlag: '', //是否是修改节点
       commentText: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
@@ -367,6 +376,7 @@ export default {
         dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
       },
       nodeList: [],
+      hisListForm:{},
       drawerTitle: '', //drawer标题
       modalshowflag: false, // drawer开关
       treeData: [], // 人员数据
@@ -388,8 +398,39 @@ export default {
     if (this.bpnId !== undefined) {
       this.getData()
     }
+    if(this.$route.query.taskIds){
+      //被驳回时调用
+      this.getHistoryData()
+    }
   },
   methods: {
+    getHistoryData() {
+      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) {
+      item.commentText = ''
+      this.$nextTick(() => {
+        this.hisListForm =  JSON.parse(JSON.stringify(item))
+        this.submitFlag = '修改节点'
+        this.dataList = item.dockUserList[0].standardInfoList
+        this.roleForm.dockUserName = this.dataList[0].engineer
+        this.roleForm.dockUser = this.dataList[0].engineerId
+      })
+    },
     getData() {
       queryTaskFirst({
         bpnId: this.$route.query.bpnId
@@ -557,6 +598,7 @@ export default {
         prcCreateUser: this.$store.getters.userInfo.userId,
         prcCreateUserName: this.$store.getters.userInfo.userName,
         engineer: this.roleForm.dockUser,
+        engineerName: this.roleForm.dockUserName,
         standardInfoList: this.dataList,
         commentText: this.commentText
       }
@@ -566,43 +608,86 @@ export default {
         if (this.roleForm.dockUserName === '') {
           this.$message.warning('请完善人员信息')
         } else {
-          this.$refs['roleForm'].validate((valid) => {
+          if(!this.submitFlag){
-            if (valid) {
+            this.$refs['roleForm'].validate((valid) => {
-              this.isSubmit = true
+              if (valid) {
-              let paramsInfo = new FormData()
+                this.isSubmit = true
-              // paramsInfo.append('id', this.bpnId || '')
+                let paramsInfo = new FormData()
-              paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
+                // paramsInfo.append('id', this.bpnId || '')
-              paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
+                paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
-              paramsInfo.append('type', '8')
+                paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
-              paramsInfo.append('json', JSON.stringify({
+                paramsInfo.append('type', '8')
-                roleForm: this.roleForm,
+                paramsInfo.append('json', JSON.stringify({
-                dataList: this.dataList,
+                  roleForm: this.roleForm,
-                commentText: this.commentText
+                  dataList: this.dataList,
-              }))
+                  commentText: this.commentText
-              processBack(paramsInfo).then(res => {
+                }))
-                this.taskID = res.data
+                processBack(paramsInfo).then(res => {
-                const params = new FormData();
+                  this.taskID = res.data
-                params.set('json', JSON.stringify(json))
+                  const params = new FormData();
-                params.set('userId', this.$store.getters.userInfo.userId)
+                  params.set('json', JSON.stringify(json))
-                params.set('taskIds', this.taskID)
+                  params.set('userId', this.$store.getters.userInfo.userId)
-                completeTask(params).then(res => {
+                  params.set('taskIds', this.taskID)
-                  if (res.success === true) {
+                  completeTask(params).then(res => {
-                    this.$message.success('提交成功')
+                    if (res.success === true) {
-                    if (this.bpnId !== '') {
+                      this.$message.success('提交成功')
+                      if (this.bpnId !== '') {
+                        let taskId = {
+                          id: this.bpnId
+                        }
+                        taskDel(taskId).then(res => {
+                          return res
+                        })
+                      }
+                      this.$router.push("/processCenter");
+                    }
+                    this.isSubmit = false
+                  })
+                })
+              }
+            })
+          }else{
+            this.$refs["roleForm"].validate((valid) => {
+              if (valid) {
+                let specialJson = {
+                  createUser: this.$store.getters.userInfo.userId,
+                  createUserName: this.$store.getters.userInfo.userName,
+                  type: "8",
+                  json: {
+                    standardInfoList: this.dataList,
+                    roleForm: this.roleForm,
+                    commentText: this.commentText
+                  }
+                };
+                this.$http.post("lawss/activiti/completeTaskNew", {
+                  taskIds: this.$route.query.taskIds,
+                  userId: this.$store.getters.userInfo.userId,
+                  json: JSON.stringify(json),
+                  specialJson: JSON.stringify(specialJson)
+                }, {
+                  _this: this
+                }, res => {
+                  if (res.success) {
+                    this.$message.success(res.message);
+                    if (this.bpnId !== "") {
                       let taskId = {
                         id: this.bpnId
-                      }
+                      };
                       taskDel(taskId).then(res => {
-                        return res
+                        return res;
-                      })
+                      });
                     }
                     this.$router.push("/processCenter");
                   }
-                  this.isSubmit = false
+                  this.isSubmit = false;
-                })
+                });
-              })
+              } else {
-            }
+                this.isSubmit = false;
-          })
+                return this.$message.warning("请完善人员信息");
+              }
+            });
+          }
+
         }
       }
     },

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

@@ -150,9 +150,11 @@
       show-save
       show-submit
       show-transfer
+      show-back
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :transferLoading="turnLoading"
+      @back="beforeBack"
       @transfer="handleTurnTo"
       @save="handleSave"
       @submit="handleSubmit"
@@ -277,6 +279,7 @@ export default {
       })
     },
     getFormFieldList (item) {
+      console.log(item);
       this.$nextTick(() => {
         if (item.passInfo !== undefined) {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
@@ -336,6 +339,50 @@ export default {
         this.saveLoading = false
       })
     },
+    //驳回按钮
+    beforeBack(){
+      if(!this.commentInfo){
+      this.$message.warning('请填写审批意见')
+      }else{
+        let zqa = new Map();
+        for (let lastDataListElement of this.dataList) {
+          let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
+          if( a == null){
+            a = {
+              id: lastDataListElement.dutyPeopleInfoId,
+              name: lastDataListElement.dutyPeopleInfo,
+              standardInfoList: []
+            }
+          }
+          a.standardInfoList.push(lastDataListElement);
+          zqa.set(a.id, a);
+        }
+        let list = [];
+        for(let item of zqa) {
+          list.push(item[1])
+        }
+        let json = {
+          dockUserList: list,
+          passInfo: this.passInfo,
+          passFlag: '1',
+          commentText: this.commentInfo
+        }
+        const params = new FormData();
+        params.set('json', JSON.stringify(json))
+        params.set('userId', this.$store.getters.userInfo.userId)
+        params.set('taskIds', this.taskIds)
+        completeTask(params).then(res => {
+          if(res.success === true) {
+            this.$message.success('提交成功')
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false
+        }).catch(e => {
+          this.isSubmit = false
+        })
+      }
+
+    },
     // 提交按钮
     handleSubmit() {
       this.isSubmit = true
@@ -359,6 +406,7 @@ export default {
       let json = {
         dockUserList: list,
         passInfo: this.passInfo,
+        passFlag: '0',
         commentText: this.commentInfo
       }
       let flag=false

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

@@ -152,7 +152,6 @@
     <ProcessFooter
       show-save
       show-submit
-      show-back
       show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"

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

@@ -862,6 +862,7 @@ export default {
         }else{
           for (let i = 0; i < this.dataList.length; i++) {
             if (this.dataList[i].complianceReasons !== "" || (this.dataList[i].noCompliance !== "" && this.dataList[i].countermeasures !== "" && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance === "" && this.dataList[i].countermeasures === "" && this.dataList[i].completionTime === undefined)) {
+              this.comFlag = 0;
             } else {
               this.comFlag++;
             }

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

@@ -1212,6 +1212,18 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if (row.taskInfo === '重新起草') {
+            this.$router.push({
+              name: 'wfhxzgStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }else {
             this.$router.push({
               name: 'wfhxzgStep5',

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -355,7 +355,7 @@
                                                 </el-input>
                                             </div>
                                         </el-form-item>
-                                        <el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
+                                        <el-form-item label="采用国内外标准情况" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
                                                 <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
                                                     <el-radio label="是" value="是"></el-radio>

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -190,7 +190,7 @@
               label="标准名称">
             </el-table-column>
             <el-table-column
-              v-if="sarProject.position === '1'"
+              v-if="sarProject.position === '1' && !itemType"
               prop="lastVersionNumber"
               label="上一版本标准编号">
             </el-table-column>

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -170,18 +170,6 @@
               width="100"
               label="责任工程师">
             </el-table-column>
-            <el-table-column
-              prop="authEngineer"
-              width="150"
-              show-overflow-tooltip
-              label="认证工程师">
-            </el-table-column>
-            <el-table-column
-              prop="qaEngineer"
-              width="150"
-              show-overflow-tooltip
-              label="质量工程师">
-            </el-table-column>
             <el-table-column
               prop="planCloseTime"
               width="150"
@@ -255,12 +243,6 @@
                 <el-form-item class="add-form-item" label="责任工程师:">
                   <div class="seeItem">{{ historySeeForm.dutyEngineerName }}</div>
                 </el-form-item>
-                <el-form-item class="add-form-item" label="认证工程师:">
-                  <div class="seeItem">{{ historySeeForm.authEngineer }}</div>
-                </el-form-item>
-                <el-form-item class="add-form-item" label="质量工程师:">
-                  <div class="seeItem">{{ historySeeForm.qaEngineer }}</div>
-                </el-form-item>
                 <el-form-item class="add-form-item" label="整改完成时间:">
                   <div class="seeItem">
                     {{ historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : "-" }}
@@ -514,22 +496,6 @@
                       @click.native="choiceZRR"
                     />
                   </el-form-item>
-                  <el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      v-model="addForm.authEngineer"
-                      placeholder="请输入认证工程师"
-                      @click.native="choiceMore('authEngineer','选择认证工程师',addForm.authEngineer)"
-                    />
-                  </el-form-item>
-                  <el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
-                                class="add-form-item">
-                    <el-input
-                      v-model="addForm.qaEngineer"
-                      placeholder="请输入质量工程师"
-                      @click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
-                    />
-                  </el-form-item>
                   <el-form-item prop="planCloseTime" label="整改完成时间" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-date-picker
@@ -773,8 +739,6 @@ export default {
         reason: "", //不合规项目
         responsibleUnit: "", //责任部门
         dutyEngineer: "", //责任工程师
-        authEngineer: "", //认证工程师
-        qaEngineer: "", //质量工程师
         planCloseTime: "" //整改完成时间
       }, //表单数据
       formRules: {