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

src/api/unqualProcess.js

@@ -43,6 +43,14 @@ export function StandardsInfoPage(data) {
   });
 }
 
+export function selectHighLawsById(data) {
+  return axios({
+    url: "api/sarStandardsInfo/sar-standards-info/selectHighLawsById",
+    method: "get",
+    params: data
+  });
+}
+
 // 车型库清单的下拉列表
 export function solostarData(data) {
   return axios({

src/pages/localTool/standCalendar/index.vue

@@ -689,6 +689,10 @@ export default {
       if (data.length > 0) {
         this.editForm.fillPeopleId = data[0].id
         this.editForm.fillPeople = data[0].name
+        this.editForm.fillUnit = data[0].unit
+        this.editForm.fillDept = data[0].institutionName
+        this.editForm.fillTel = data[0].phone
+        this.editForm.fillMail = data[0].email
       }
       this.roleShowflag = false
     },

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

@@ -533,6 +533,10 @@ export default {
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
+      qualityEngineer: '',
+      qualityEngineerName: '',
+      certifiedEngineer: '',
+      certifiedEngineerName: '',
       fileType: "",
       subFlag: 0,
       projectSearch: {
@@ -698,6 +702,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
+      console.log(item);
       this.$nextTick(() => {
         if(item.form){
           this.hisListForm = JSON.parse(JSON.stringify(item.form))
@@ -735,6 +740,10 @@ export default {
           this.roleForm.dockUserName = item.dockUserName
           this.roleForm.ministerUser =  item.ministerUser
           this.roleForm.ministerUserName =  item.ministerUserName
+          this.certifiedEngineer = item.certifiedEngineer
+          this.certifiedEngineerName = item.certifiedEngineerName
+          this.qualityEngineerName = item.qualityEngineerName
+          this.qualityEngineer = item.qualityEngineer
           this.submitFlag = '修改节点'
           this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
           this.$http.get("SarStandItems/sar-stand-items/getFileType", {
@@ -1025,6 +1034,10 @@ export default {
                       }
                     };
                     this.listForm.dataList = this.dataList
+                    this.listForm.qualityEngineer = this.qualityEngineer ?  this.qualityEngineer : this.listForm.qualityEngineer
+                    this.listForm.qualityEngineerName = this.qualityEngineerName ?  this.qualityEngineerName : this.listForm.qualityEngineerName
+                    this.listForm.certifiedEngineer = this.certifiedEngineer ?  this.certifiedEngineer : this.listForm.certifiedEngineer
+                    this.listForm.certifiedEngineerName = this.certifiedEngineerName ?  this.certifiedEngineerName : this.listForm.certifiedEngineerName
                     let json = this.listForm
                     this.$http.post("lawss/activiti/completeTaskNew", {
                       taskIds: this.$route.query.taskIds,

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

@@ -378,6 +378,8 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText2 = data.commentText2 || ''
+          this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
+          this.form.startUser = data.form ? data.form.startUser : data.startUser
           this.form.cid = data.form ? data.form.cid : data.cid
           this.form.endTime = data.form ? data.form.endTime : data.endTime
           this.form.fjList = data.form ? data.form.fjList : data.fjList

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

@@ -704,6 +704,8 @@
                         this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
                         this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
                         this.form.textType = data.form ? data.form.textType : data.textType
+                        this.form.startUser = data.form ? data.form.startUser : data.startUser
+                        this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
                         this.form.cid = data.form ? data.form.cid : data.cid
                         this.form.endTime = data.form ? data.form.endTime : data.endTime
                         this.todoId = res.id

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

@@ -256,9 +256,11 @@
     </div>
       <ProcessFooter
               show-submit
+              show-save
               :submitLoading="isSubmit"
               :saveLoading="saveLoading"
               show-transfer
+              @save="handleSave"
               @transfer="handleTransfer"
               @submit="handleSubmit"
       >
@@ -340,7 +342,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process'
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew, saveTaskForPub } from "api/process";
 import axios from "axios";
 
 export default {
@@ -616,6 +618,29 @@ export default {
     handleTabs(name) {
       this.active = name
     },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      let json = this.json
+      json.info = this.data
+      json.spId = this.form.spId
+      json.spName = this.form.spName
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "3");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: json,
+        commentText: this.commentText4
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
     handleSubmit() {
       this.$refs['bzzqyjForm'].validate((valid) => {
         if (valid) {
@@ -668,6 +693,7 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
+          console.log(data);
           let commitStatus = res.commitStatus
           if(commitStatus && commitStatus > 0){
             this.acceptShow = true
@@ -678,16 +704,18 @@ export default {
           }
           this.commentText4 = data.commentText4 || ''
           this.form.fjList = data.fjList || data.form.fjList
+          this.form.spId = data.form ? data.form.spId :  ''
+          this.form.spName = data.form ? data.form.spName :  ''
+          this.form.startUser = data.form ? data.form.startUser : data.startUser
+          this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
           this.form.cid = data.cid || data.form.cid
           this.form.endTime = data.endTime || data.form.endTime
           this.form.textType = data.textType || data.form.textType
           this.form.modelList = data.modelList || data.form.modelList
-          this.form.spId = data.spId || ''
-          this.form.spName = data.spName || ''
-          this.json = data
+          this.json = data.form ? data.form : data
           this.standId =  data.standId
           this.getItemList(data.standId,data.textType)
-          this.data = data.info || data.data
+          this.data = data.info || data.form.info
         }).catch(e => {
         })
       })

src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue

@@ -181,6 +181,7 @@
               <el-input
                 type="textarea"
                 :rows="3"
+                disabled
                 resize="none"
                 placeholder="请输入意见"
                 v-model="commentText">

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -83,13 +83,18 @@
             width="250"
             label="标准编号/政策编号"
             align="center">
+            <template slot-scope="scope">
+              <a @click="handlePreviewAA(scope.row)" style="cursor: pointer">{{ scope.row.lawCode }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="lawName"
             label="标准名称/政策名称"
             align="center"
-            width="300px"
-          >
+            width="300px">
+            <template slot-scope="scope">
+              <a @click="handlePreviewAA(scope.row)" style="cursor: pointer">{{ scope.row.lawName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="productType"
@@ -893,6 +898,46 @@ export default {
     }
   },
   methods: {
+    handlePreviewAA(item) {
+      if (item.dataSource === "INLAND"){
+        let routeUrlINLAND = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.lawId,
+            pageType: 'INLAND_STAND'
+          }
+        })
+        window.open(routeUrlINLAND.href, '_blank')
+      }else if (item.dataSource === "FOREIGN"){
+        let routeUrlFOREIGN = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.lawId,
+            pageType: 'FOREIGN_STAND'
+          }
+        })
+        window.open(routeUrlFOREIGN.href, '_blank')
+      } else if (item.dataSource !== undefined){
+        let routeUrlLAWS = this.$router.resolve({
+          name: 'OtherLawsStandDetails',
+          params: {
+            id: item.lawId,
+            pageType: 'LAWS_STAND'
+          }
+        })
+        window.open(routeUrlLAWS.href, '_blank')
+      }else {
+        let routeUrlBUSINESS = this.$router.resolve({
+          name: 'OtherBussStandardDetails',
+          params: {
+            id: item.lawId,
+            pageType: 'BUSINESS_STAND'
+          }
+        })
+        window.open(routeUrlBUSINESS.href, '_blank')
+      }
+
+    },
     reImplRequire(row, column, cellValue, index) {
       let str = ''
       this.attrTypeOptions.forEach((item, index) => {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -458,7 +458,7 @@
 import { interfaceUrl } from "@/sysConfig";
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 import CustomSelectArray from "@/components/CustomFormComponents/SelectArray";
-import { StandardsInfoPage } from "api/unqualProcess";
+import { StandardsInfoPage, selectHighLawsById } from "api/unqualProcess";
 
 export default {
   name: "AccessStandardDetails",
@@ -648,24 +648,61 @@ export default {
       }*/
       this.sarAccessInfo = formData
       this.showQueryMore = false
-      this.selectLawsStands()
+      this.selectLawsStands(1)
     },
     // 查询数据搜索 table 数据
-    selectLawsStands() {
+    selectLawsStands(type) {
       if (this.sarAccessInfo.dataSource === 'INLAND_STAND') {
         this.sarAccessInfo.standType = 'INLAND'
-        this.pageInfo()
+        if (type === 1) {
+          this.seniorPageInfo()
+        } else {
+          this.pageInfo()
+        }
       } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
         this.sarAccessInfo.standType = 'FOREIGN'
-        this.pageInfo()
+        if (type === 1) {
+          this.seniorPageInfo()
+        } else {
+          this.pageInfo()
+        }
       } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') {
         this.sarAccessInfo.standType = 'LAWS'
-        this.pageInfo()
+        if (type === 1) {
+          this.seniorPageInfo()
+        } else {
+          this.pageInfo()
+        }
       } else if (this.sarAccessInfo.dataSource === 'BUSINESS') {
         this.sarAccessInfo.standType = 'BUSINESS'
-        this.pageInfo()
+        if (type === 1) {
+          this.seniorPageInfo()
+        } else {
+          this.pageInfo()
+        }
       }
     },
+    seniorPageInfo() {
+      this.sarAccessInfo.standType = ''
+      this.sarAccessInfo.qdFlag = '1'
+      this.sarAccessInfo.qdid = this.$route.params.id
+      selectHighLawsById((this.sarAccessInfo)).then(res => {
+        this.standinfoList = res.data.list
+        this.standinfoList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+          item.zrbm = item.attrInfoCaseMap.zrbm
+          item.sycpx = item.attrInfoCaseMap.sycpx
+          item.typeApplicable = item.attrInfoMap.CLLX
+          item.nylx = item.attrInfoMap.NYLX
+        })
+        this.total = res.data.count
+      }, e => {
+      })
+    },
     pageInfo() {
       if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') {
         StandardsInfoPage((this.sarAccessInfo)).then(res => {