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

2022-03-31 14:56:01 +08:00
parent 304979637b 42f62dc0cd
commit b8c0c19cc4
3 changed files with 42 additions and 24 deletions
@@ -48,6 +48,10 @@ export default {
          label: "项目合规评估流程-项目",
          value: "6"
        },
+        {
+          label: "政策征求意见流程",
+          value: "laws2"
+        },
        {
          label: "未符合项整改流程",
          value: "8"
@@ -80,10 +84,6 @@ export default {
          label: "参与外部标准制修订信息提报流程",
          value: "14"
        },
-        {
-          label: "政策征求意见流程",
-          value: "laws2"
-        },
        {
          label: "重点认证标准/政策合规性项目审查流程",
          value: "laws3"
@@ -183,10 +183,10 @@
        @submit="handleSubmit"
    >
    </ProcessFooter>
-    <!-- 选择标准的弹框 -->
+    <!-- 选择征求意见政策的弹框 -->
    <el-drawer
        ref="standard"
-        title="查询结果"
+        title="征求意见政策"
        size="1000px"
        :visible.sync="standardDrawer"
        direction="rtl"
@@ -328,7 +328,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {saveTaskFirst} from "api/process";
+import { queryTaskFirst, saveTaskFirst } from "api/process";

 export default {
  name: "zczqyjStep1",
@@ -339,6 +339,8 @@ export default {
  },
  data() {
    return {
+      bpnId: '',
+      standardCheckedList: [],
      tableHeight: {
        standardTableHeight: null
      },
@@ -443,12 +445,26 @@ export default {
      saveLoading: false,
    }
  },
+  mounted(){
+    this.bpnId = this.$route.query.bpnId
+    if(this.bpnId){
+      this.getData()
+    }
+  },
  methods: {
+    getData(){
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes);
+        this.form = mes.form
+        this.roleForm = mes.roleForm
+      });
+    },
    handleProcessStandardNext(status) {
      switch (status) {
          // 新增
        case 1:
-          this.selectedList = []
          this.standardCheckedList = []
          this.standardDrawer = false
          this.verifySarStandard = true
@@ -456,13 +472,16 @@ export default {
          break
          // 带入
        case 2:
-          if (this.standardCheckedList.length === 1) {
+          if(!this.standardCheckedList.length){
+            this.$message.warning('请至少选择一条政策信息进行带入')
+          }else if(this.standardCheckedList.length > 1){
+              this.$message.warning('您只能选择一条政策信息进行带入')
+          }else{
            this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
              _this: this
            }, res => {
              if (res && res.data) {
                const bringData = res.data
-
                const json = Object.assign(bringData, bringData.attrInfoMap);
                this.form = JSON.parse(JSON.stringify(json))
                this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : []
@@ -488,16 +507,10 @@ export default {
              }
              console.log("res", res);
            })
-
-          } else if (this.standardCheckedList.length > 1) {
-            this.$message.warning('最多可以带入一条政策信息')
-          } else {
-            this.$message.warning('请选择要带入的政策信息')
          }
          break
          // 取消
        case 3:
-          this.selectedList = []
          this.standardCheckedList = []
          this.standardDrawer = false
          break
@@ -523,10 +536,6 @@ export default {
      window.open(routeUrl.href, '_blank')
    },
    standSelectChange(data) {
-      this.selectedList = []
-      for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id)
-      }
      this.standardCheckedList = data
    },
    //清空搜索条件
@@ -611,20 +620,19 @@ export default {
    handleSave() {
      this.saveLoading = true;
      let _formData = new FormData();
-      _formData.append("id", this.bpnId || "");
+      this.form.commentText = this.commentText
+      this.form.filesId = this.addFjList
      _formData.append("createUser", this.$store.getters.userInfo.userId);
      _formData.append("createUserName", this.$store.getters.userInfo.userName);
      _formData.append("prcType", "12");
      _formData.append("json", JSON.stringify({
-        taskInfo: "人确认",
-        form: this.infoForm,
+        form: this.form,
        roleForm: this.roleForm,
        commentText: this.commentText
      }));
      saveTaskFirst(_formData).then(res => {
        this.saveLoading = false;
        this.$message.success("保存成功");
-        this.bpnId = res.result;
      }).catch(e => {
        this.saveLoading = false;
      });
@@ -724,6 +724,16 @@ export default {
            }
          })
          break
+        case '12':
+          this.$router.push({
+            name: 'zczqyjStep1',
+            query: {
+              type: '12',
+              processName: '政策征求意见流程',
+              bpnId: id
+            }
+          })
+          break
        case '17':
          this.$router.push({
            name: 'zcrhStep1-1',