Merge branch 'develop' into 'FOTON'

Develop See merge request LAWS/laws-system-front-FOTON!329
2022-02-28 09:01:38 +08:00
parent 7c905c9da3 b6c513e756
commit 5a91403536
14 changed files with 38 additions and 13 deletions
@@ -483,11 +483,11 @@ export default {
      this.roleModal2 = false
    },
    pageChange(page) {
-      this.page = page;
+      this.workSearch.page = page
      this.getWorkData()
    },
    pageSizeChange(pageSize) {
-      this.pageSize = pageSize;
+      this.workSearch.pageSize = pageSize
      this.getWorkData()
    }
  }
@@ -781,10 +781,10 @@ export default {
      },
      roleFormRules: {
        dockUserName: [
-          { required: true, message: "请选择会签责任人", trigger: "change" }
+          {required: true, message: "请选择相关业务单位", trigger: "change"}
        ],
        directorUserName: [
-          { required: true, message: "请选择审批责任人", trigger: "change" }
+          {required: true, message: "请选择标准法规部法规分析业务经理", trigger: "change"}
        ]
      },
      dataList: [],//清单里的标准数据
@@ -750,10 +750,10 @@ export default {
      },
      roleFormRules: {
        dockUserName: [
-          {required: true, message: "请选择会签责任人", trigger: "change"}
+          {required: true, message: "请选择相关业务单位", trigger: "change"}
        ],
        directorUserName: [
-          {required: true, message: "请选择审批责任人", trigger: "change"}
+          {required: true, message: "请选择标准法规部法规分析业务经理", trigger: "change"}
        ]
      },
      dataList: [],//清单里的标准数据
@@ -726,7 +726,7 @@ export default {
      this.qcdwOptions = res.data.QCDW // 起草单位
    })
    this.getStandDataBtn()
-
+    this.getWorkData()
  },
  watch:{
    message: {
@@ -312,8 +312,20 @@ export default {
      //必填人员校验规则
      roleFormRules: {
        dockUserName: [
-          { required: true, message: "请选择工作组组长", trigger: "change" }
-        ]
+          { required: true, message: "请选择标准立项单位整车/系统总工", trigger: "change" }
+        ],
+        countersignerName:[
+          {required: true, message:'请选择会签人员',  trigger: "change" }
+        ],
+        examineName:[
+          {required: true, message:'请选择标准体系工作组组长',  trigger: "change" }
+        ],
+        approverName:[
+          {required: true, message:'请选择标准法规部高级经理',  trigger: "change" }
+        ],
+        engineerName:[
+          {required: true, message:'请选择相关单位、工程研究总院标准法规部',  trigger: "change" }
+        ],
      }
    };
  },
@@ -514,6 +514,7 @@ export default {
          this.$refs.qblx_pageData.validateField('wgLeaderName')
        }
        this.workModel = false
+        this.$refs.workGroup.clearSelection()
      }
    },
    getWorkData() {
@@ -279,6 +279,7 @@ export default {
      this.queryProcess()
    },
    dealWith (row) { // 办理
+      this.$store.commit('setDetailMap', this.$route.path)
      this.setHandleInfo(JSON.stringify(row))
      const prcType = row.prcType
      switch(prcType) {
@@ -243,6 +243,7 @@ export default {
      const { prcType, id } = row
      const mes = JSON.parse(row.mes)
      console.log(mes)
+        this.$store.commit('setDetailMap', this.$route.path)
      switch (prcType) {
        // 标准入库、
        case '1':
@@ -1170,10 +1170,14 @@ export default {
      // 国内标准法规可查字段
      if (val === 'INLAND_STAND') {
        this.sarAccessInfo.dataSource = 'INLAND_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '标准名称'
        this.selectLawsStands()
        // 海外标准法规可查字段
      } else if (val === 'FOREIGN_STAND') {
        this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '英文名称'
        this.selectLawsStands()
        // 国内外政策可查字段
      } else if (val === 'FOREIGN_LAWS') {
@@ -767,12 +767,12 @@ export default {
              if (item.xcxssrqgj === "undefined") {
                item.xcxssrqgj = ''
              }
-              if (item.ssrq === "undefined" || item.ssrq === 'null' || item.ssrq) {
+              if (item.ssrq === "undefined" || item.ssrq === 'null' || !item.ssrq) {
                item.ssrq = ''
              }
            });
            this.standinfoList = res.data.records;
-            this.standardFormTotal = res.data.total;
+            this.total = res.data.total;
            this.standinfoList.forEach(item => {
              if (item.standYear === null) {
                item.standNumber = item.standSortShow + " " + item.standNumber;
@@ -1172,10 +1172,14 @@ export default {
      // 国内标准法规可查字段
      if (val === 'INLAND_STAND') {
        this.sarAccessInfo.dataSource = 'INLAND_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '标准名称'
        this.selectLawsStands()
        // 海外标准法规可查字段
      } else if (val === 'FOREIGN_STAND') {
        this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '英文名称'
        this.selectLawsStands()
        // 国内外政策可查字段
      } else if (val === 'FOREIGN_LAWS') {
@@ -1103,10 +1103,14 @@ export default {
      // 国内标准法规可查字段
      if (val === 'INLAND_STAND') {
        this.sarAccessInfo.dataSource = 'INLAND_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '标准名称'
        this.selectLawsStands()
        // 海外标准法规可查字段
      } else if (val === 'FOREIGN_STAND') {
        this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
+        this.standLabelNum = '标准号'
+        this.standLabelName = '英文名称'
        this.selectLawsStands()
        // 国内外政策可查字段
      } else if (val === 'FOREIGN_LAWS') {
@@ -135,7 +135,6 @@
        prop="actualCloseTime"
        width="130"
        align="center"
-        sortable
        label="实际关闭时间">
        <template slot-scope="scope">{{(scope.row.actualCloseTime ? scope.row.actualCloseTime.substring(0, 11): '')}}</template>
      </el-table-column>
@@ -185,7 +185,6 @@
            <el-table-column
              prop="planCloseTime"
              width="150"
-              sortable="custom"
              label="计划关闭时间">
              <template slot-scope="scope">
                {{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}