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

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

@@ -24,7 +24,7 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled">
-                <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择项目</el-button>
+                <el-button :disabled="disabledXX" size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择项目</el-button>
               </el-form-item>
               <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
                 <el-input
@@ -346,7 +346,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { saveTaskFirst, taskDel } from "api/process";
+import { saveTaskFirst, taskDel,queryTaskFirst } from "api/process";
 import file from "@/pages/knowledgeGraph/components/file";
 
 export default {
@@ -706,9 +706,23 @@ export default {
         this.roleForm.statuteMinister = data[0].id;
         this.roleForm.statuteMinisterName = data[0].name;
       }
-    }
+    },
+    getTaskId() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.listForm = JSON.parse(JSON.stringify(mes.form))
+        this.dataList = this.listForm.dataList ? this.listForm.dataList : []
+        this.roleForm = mes.roleForm
+        this.commentText = mes.commentText
+      })
+    },
   },
   mounted() {
+    if(this.$route.query.bpnId){
+      this.getTaskId()
+    }
     this.getProjectData();
     // 查询各下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", "", {

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

@@ -353,7 +353,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {saveTaskFirst} from "api/process";
+import {saveTaskFirst,taskDel,queryTaskFirst} from "api/process";
 
 export default {
   name: "zdrzbzORzchgxxmscStep1",
@@ -475,7 +475,23 @@ export default {
       saveLoading: false,
     }
   },
+  mounted() {
+    if(this.$route.query.bpnId){
+      this.getTaskId()
+    }
+  },
   methods: {
+    getTaskId() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.form = JSON.parse(JSON.stringify(mes.form))
+        this.infoTableDatas = mes.infoTableDatas ? mes.infoTableDatas : []
+        this.roleForm = mes.roleForm
+        this.commentText = mes.commentText
+      })
+    },
     deleteSelectChange(data) {
       console.log('483',data)
       this.deleteSelectedList = []
@@ -683,24 +699,26 @@ export default {
     },
     //保存事件
     handleSave() {
-      this.saveLoading = true;
+      this.isSubmit = true
+      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", "12");
+      _formData.append("prcType", "laws3");
       _formData.append("json", JSON.stringify({
-        taskInfo: "人确认",
         form: this.infoForm,
         roleForm: this.roleForm,
         commentText: this.commentText
       }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false;
+        this.isSubmit = false
+        this.saveLoading = false
         this.$message.success("保存成功");
         this.bpnId = res.result;
       }).catch(e => {
-        this.saveLoading = false;
+        this.isSubmit = false
+        this.saveLoading = false
       });
     },
     //提交事件
@@ -711,12 +729,24 @@ export default {
             this.$refs['Form'].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
+                this.saveLoading = true
                 let infoTableDatas = []
                 infoTableDatas = JSON.stringify(this.infoTableDatas)
                 localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas))
-                this.$http.get('lawss/activiti/startProcess', {
+                this.$http.post('lawss/activiti/startProcessRollBack', {
+                  createUser: this.$store.getters.userInfo.userId,
+                  createUserName: this.$store.getters.userInfo.userName,
                   type: 'laws3',
-                }, {_this: this}, res => {
+                  json: JSON.stringify({
+                    form: this.form,
+                    roleForm: this.roleForm,
+                    commentText: this.commentText,
+                    infoTableDatas: infoTableDatas,
+
+                  })
+                }, {
+                  _this: this
+                }, res => {
                   if (res.ok) {
                     var json = Object.assign(this.form, this.roleForm)
                     json.commentText = this.commentText
@@ -730,16 +760,27 @@ export default {
                     }, {_this: this}, res => {
                       if (res.success) {
                         this.$message.success('流程发起成功')
+                        if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
+                          let taskId = {
+                            id: this.$route.query.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
                         this.$router.push('/processCenter')
                         this.isSubmit = false
+                        this.saveLoading = false
                       } else {
                         this.$message.warning('流程启动失败')
                         this.isSubmit = false
-                      }
+                        this.saveLoading = false
+                        }
                     })
                   } else {
                     this.$message.warning('流程启动失败')
                     this.isSubmit = false
+                    this.saveLoading = false
                   }
                 })
               } else {

src/pages/processCenter/pages/processDetail/index.vue

@@ -209,11 +209,11 @@ export default {
       let prcType = this.detailData[index].prcType // 流程类型
       console.log(prcType);
       // 判断当前流程是否已全部办理完成
-      this.detailData.map(item => {
+      // this.detailData.map(item => {
-        if (!item.endTime) {
+      //   if (!item.endTime) {
-          isEnd = false
+      //     isEnd = false
-        }
+      //   }
-      })
+      // })
       if (isEnd) {
         if (this.$store.state.detailMap !== '') {
           let lastDetailMap = this.$store.getters.getLastDetailMap
@@ -225,16 +225,18 @@ export default {
         this.setHandleInfo((JSON.stringify(row)))
         this.setPrcLastDetail((JSON.stringify(row)))
         // 根据type判断跳转具体流程页面
-        // 根据type判断跳转具体流程页面
         if (prcType === '1') {
           // 标准入库流程数据
-          this.toProcessDetail('bzrkStep5',row)
+          this.toProcessDetail('bzrkStep1',row)
         }else if(prcType === 'laws1'){
           //政策入库
-          this.toProcessDetail('zcrkStep5',row)
+          this.toProcessDetail('zcrkStep1',row)
         }else if(prcType === 'laws2'){
-          //政策入库
+          //政策征求意见流程
-          this.toProcessDetail('zczqyjStep9Detil',row)
+          this.toProcessDetail('zczqyjStep1',row)
+        }else if(prcType === 'laws3'){
+          //重点认证标准/政策合规性项目审查流程
+          this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
         }else if(prcType === 'buss1'){
           //企标入库
           this.toProcessDetail('bussLibrary1',row)
@@ -242,144 +244,70 @@ export default {
           //企标入库
           this.toProcessDetail('bussLibraryProduct1',row)
         }else if(prcType === 'buss3'){
-          //企标复审
+        //企标复审
-          this.toProcessDetail('qbfsStep1',row)
+        this.toProcessDetail('qbfsStep1',row)
         }else if(prcType === '4'){
           //标准清单发布流程数据
-          this.toProcessDetail('bzqdfbStep1-4',row)
+          this.toProcessDetail('bzqdfbStep1',row)
         }else if (prcType === '5'){
           //标准项目合规评估
-          this.toProcessDetail('bzpgStep8-1',row)
+            this.toProcessDetail('bzpgStep1',row)
         }else if(prcType === '6'){
           //标准项目合规评估 项目维度
-          this.toProcessDetail('xmpgStep1-5',row)
+          this.toProcessDetail('xmpg2Step1',row)
         } else if (prcType === '8') {
           // 未符合项整改
-          this.toProcessDetail('wfhxzgStep5-1',row)
+          this.toProcessDetail('wfhxzgStep1',row)
         } else if(prcType === '9'){
-          this.toProcessDetail('bzjdStep1-6',row)
+          this.toProcessDetail('bzjdStep1',row)
           //标准调研流程
         }else if(prcType === '2'){
-          this.toProcessDetail('bzdyStep1-9',row)
+          this.toProcessDetail('bzdyStep1',row)
         }else if(prcType === '3'){
           //标准征求意见
-          this.toProcessDetail('bzzqyjStep1-9',row)
+          this.toProcessDetail('bzzqyjStep1',row)
         }else if(prcType === '10'){
           //项目清单确认
-          this.toProcessDetail('xmqdqrStep1-4',row, 'unShowReceipt')
+          this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt')
+        }else if(prcType === '14'){
+          //加入标准化协会信息备案流程
+          this.toProcessDetail('cywbbzzxdStep1',row,)
+        }else if(prcType === '15'){
+          //加入标准化协会信息备案流程
+          this.toProcessDetail('jrbzhxhStep1',row,)
         } else if(prcType === '16'){
           //外部署名
-          this.toProcessDetail('wbsmStep1-5',row)
+          this.toProcessDetail('wbsmStep1',row)
         }else if(prcType === '20') {
           // 入会流程
-          this.toProcessDetail('bzrhStep6-1',row)
+          this.toProcessDetail('bzrhStep1',row)
         } else if(prcType === '21') {
           // 参会流程
-          this.toProcessDetail('bzchStep6-1',row)
+          this.toProcessDetail('bzchStep1',row)
         } else if(prcType === '23'){
           //企标复审
-          this.toProcessDetail('qbfsStep1-4',row)
+          this.toProcessDetail('qbfsStep1',row)
         }else if(prcType === '24'){
           //企标废止
-          this.toProcessDetail('qbfzStep1-7',row)
+          this.toProcessDetail('qbfzStep1',row)
         }else if(prcType === '25'){
           //企标制修订计划管控
-          this.toProcessDetail('qbzxdjhgkStep1-5',row)
+          this.toProcessDetail('qbzxdjhgkStep1',row)
         }else if(prcType === '26'){
           //企标制修订计划立项
-          this.toProcessDetail('qbzxdlxStep1-2',row)
+          this.toProcessDetail('qbzxdlxStep1',row)
+        }else if(prcType === '17'){
+          //政策课题入会发起流程
+          this.toProcessDetail('zcrhStep1',row)
+        }else if(prcType === '18'){
+          //政策课题参会发起流程
+          this.toProcessDetail('zcchStep1',row)
+        }else if(prcType === '12'){
+          //政策课题参会发起流程
+          this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
         }
-        // if (prcType === '1') {
-        //   // 标准入库流程数据
-        //   this.toProcessDetail('bzrkStep1',row)
-        // }else if(prcType === 'laws1'){
-        //   //政策入库
-        //   this.toProcessDetail('zcrkStep1',row)
-        // }else if(prcType === 'laws2'){
-        //   //政策征求意见流程
-        //   this.toProcessDetail('zczqyjStep1',row)
-        // }else if(prcType === 'buss1'){
-        //   //企标入库
-        //   this.toProcessDetail('bussLibraryDetail',row)
-        // }else if(prcType === 'buss2'){
-        //   //企标入库
-        //   this.toProcessDetail('bussLibraryProductDetail',row)
-        // }else if(prcType === 'buss3'){
-        // //企标复审
-        // this.toProcessDetail('qbfsStep1',row)
-        // }else if(prcType === '4'){
-        //   //标准清单发布流程数据
-        //   this.toProcessDetail('bzqdfbStep1',row)
-        // }else if (prcType === '5'){
-        //   //标准项目合规评估
-        //     this.toProcessDetail('bzpgStep1',row)
-        // }else if(prcType === '6'){
-        //   //标准项目合规评估 项目维度
-        //   this.toProcessDetail('xmpg2Step1',row)
-        // } else if (prcType === '8') {
-        //   // 未符合项整改
-        //   this.toProcessDetail('wfhxzgStep1',row)
-        // } else if(prcType === '9'){
-        //   this.toProcessDetail('bzjdStep1',row)
-        //   //标准调研流程
-        // }else if(prcType === '2'){
-        //   this.toProcessDetail('bzdyStep1',row)
-        // }else if(prcType === '3'){
-        //   //标准征求意见
-        //   this.toProcessDetail('bzzqyjStep1',row)
-        // }else if(prcType === '10'){
-        //   //项目清单确认
-        //   this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt')
-        // }else if(prcType === '14'){
-        //   //加入标准化协会信息备案流程
-        //   this.toProcessDetail('cywbbzzxdStep1',row,)
-        // }else if(prcType === '15'){
-        //   //加入标准化协会信息备案流程
-        //   this.toProcessDetail('jrbzhxhStep1',row,)
-        // } else if(prcType === '16'){
-        //   //外部署名
-        //   this.toProcessDetail('wbsmStep1',row)
-        // }else if(prcType === '20') {
-        //   // 入会流程
-        //   this.toProcessDetail('bzrhStep1',row)
-        // } else if(prcType === '21') {
-        //   // 参会流程
-        //   this.toProcessDetail('bzchStep1',row)
-        // } else if(prcType === '23'){
-        //   //企标复审
-        //   this.toProcessDetail('qbfsStep1',row)
-        // }else if(prcType === '24'){
-        //   //企标废止
-        //   this.toProcessDetail('qbfzStep1',row)
-        // }else if(prcType === '25'){
-        //   //企标制修订计划管控
-        //   this.toProcessDetail('qbzxdjhgkStep1',row)
-        // }else if(prcType === '26'){
-        //   //企标制修订计划立项
-        //   this.toProcessDetail('qbzxdlxStep1',row)
-        // }else if(prcType === '17'){
-        //   //政策课题入会发起流程
-        //   this.toProcessDetail('zcrhStep1',row)
-        // }else if(prcType === '18'){
-        //   //政策课题参会发起流程
-        //   this.toProcessDetail('zcchStep1',row)
-        // }else if(prcType === '12'){
-        //   //政策课题参会发起流程
-        //   this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
-        // }
       } else {
-        if(prcType === 'buss1'){
+        this.$message.warning('当前流程未全部办理完成，无法查看')
-          //企标入库
-          this.toProcessDetail('bussLibrary1',row)
-        }else if(prcType === 'buss2'){
-          //企标入库
-          this.toProcessDetail('bussLibraryProduct1',row)
-        }else if(prcType === 'buss3'){
-          //企标复审
-          this.toProcessDetail('qbfsStep1',row)
-        }else {
-          this.$message.warning('当前流程未全部办理完成，无法查看')
-        }
       }
     },
     toProcessDetail(componentName,row,unShowReceipt) {

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -81,9 +81,9 @@
             <el-date-picker
               v-model="dataCenterSearch.dataUploadTime"
               clearable
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
               size="small"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -666,8 +666,13 @@ export default {
     },
     searchInfo() {
       this.loading = true
-      this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
+      if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
-      this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
+        this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
+        this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
+      }else{
+        this.dataCenterSearch.startDataUploadTime =''
+        this.dataCenterSearch.endDataUploadTime = ''
+      }
       this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
         _this: this
       }, res => {

src/pages/regulatoryRepository/standQA/index.vue

@@ -671,6 +671,9 @@ export default {
         case '查看':
           this.handleDetail(command[0])
           break
+        case '订阅':
+          this.subscribe(command[0])
+          break
       }
     },
     handleDetail(row){
@@ -686,6 +689,16 @@ export default {
       }, e => {
       })
     },
+    subscribe(row){
+      this.$http.postData('lawss/Subscription/insertSubscription',{
+        askId: row.id,
+        usId: this.$store.getters.userInfo.userId,
+      },{
+        _this: this
+      }, res => {
+        console.log(res);
+      })
+    },
     refreshStandMap(){
       this.standMap = new Map()
       this.standList.forEach(item=>{