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

2022-07-15 11:30:58 +08:00
parent 34b32a3057 84e9cea1af
commit 302ee3fb2d
7 changed files with 79 additions and 14 deletions
@@ -165,8 +165,10 @@
      submitData(callback) {
        let dataList = JSON.parse(JSON.stringify(this.dataList))
        for (let i = 0; i < dataList.length; i++) {
-          dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
-          dataList[i].lawsTechnologyEvaluationId = this.getUUID
+          if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) {
+            dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',')
+          }
+          dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID
          if (!dataList[i].evaluationMethods || !dataList[i].evaluatorIds) {
            this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
            return
@@ -226,13 +226,18 @@
      }
    },
    mounted() {
+      document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults')
      this.getList()
    },
    methods: {
      CurrentStandard() {
        let query = {
          firstInitiation: '2',
-          whetherTobring: '1'
+          whetherTobring: '1',
+          processBackground: this.$route.query.processBackground || '',
+          remark: this.$route.query.remark || '',
+          standId: this.$route.query.standId,
+          lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId
        }
        let newUrl = this.$router.resolve({
          path: '/evaluationInitiationProcess',
@@ -110,13 +110,18 @@
      }
    },
    mounted() {
+      document.title = this.$route.query.serialNumber +' '+this.$t('regulatoryTechnicalEvaluationResults')
      this.getList()
    },
    methods: {
      CurrentStandard() {
        let query = {
          firstInitiation: '2',
-          whetherTobring: '2'
+          whetherTobring: '2',
+          processBackground:this.$route.query.processBackground || '',
+          remark:this.$route.query.remark || '',
+          standId:this.$route.query.standId,
+          lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId
        }
        let newUrl = this.$router.resolve({
          path: '/evaluationInitiationProcess',
@@ -99,6 +99,7 @@
                <a-form-model-item class="itemModel" prop="taskExplain">
                  <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
                              v-model="formInline.processBackground"
+                              :disabled="!whetherDisplay"
                              :rows="4"/>
                </a-form-model-item>
              </div>
@@ -113,6 +114,7 @@
                <a-form-model-item class="itemModel" prop="remarks">
                  <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
                              v-model="formInline.remark"
+                              :disabled="!whetherDisplay"
                              :rows="4"/>
                </a-form-model-item>
              </div>
@@ -290,7 +292,6 @@
    },
    mounted() {
      document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
-      this.getList()
      this.getEvaluationMethodTree()
      if (this.$route.query.whetherTobring == '1') {
        this.isTrue = true
@@ -299,8 +300,14 @@
      }
      if (this.$route.query.firstInitiation == '1') {
        this.whetherDisplay = true
+        this.getList()
      } else {
        this.whetherDisplay = false
+        this.formInline.processBackground = this.$route.query.processBackground
+        this.formInline.lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId
+        this.formInline.remark = this.$route.query.remark
+        this.formInline.standId = this.$route.query.standId
+        this.getListOne()
      }
      eventBUs.$on('searchQuery', search => {
        Object.keys(search).forEach(res => {
@@ -333,6 +340,36 @@
        this.pageSize = pageSize
        this.getList()
      },
+      getListOne() {
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          id: this.formInline.standId
+        }
+        this.loading = true
+        let url = ''
+        if (this.isTrue) {
+          url = this.url.addModelListOne
+        } else {
+          url = this.url.addModelList
+        }
+        postAction(url, query).then((res) => {
+          if (res.success) {
+            let content = res.result.records || []
+            this.selectedRowKeysRecord.push({
+              standId: content[0].id,
+              serialNumber: content[0].serial_number,
+              title: content[0].title,
+              technologyTerritory: content[0].technology_territory_id
+            })
+            this.standardDecomposition = content
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
+        })
+      },
      getList() {
        let query = {
          pageNo: this.pageNo,
@@ -463,7 +500,7 @@
        value.startTime = startTime
        value.flowStatus = 'Underway'
        value.taskAffirmDueDate = value.endTime
-        if (!value.lawsTechnologyEvaluationId){
+        if (!value.lawsTechnologyEvaluationId) {
          value.lawsTechnologyEvaluationId = this.getUUID()
        }
        value.regulationOwnerId = this.userInfo().id
@@ -532,7 +569,11 @@
    }
  }
 </script>
-
+<style>
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+</style>
 <style scoped>
  .detail-box {
    padding: 67px 0 0 0;
@@ -369,9 +369,9 @@
              id: row.id,
              processBackground: row.processBackground,
              serialNumber: row.serialNumber,
-              title: row.title,
-              technologyTerritory: row.technologyTerritory,
-              standId: row.standId
+              lawsTechnologyEvaluationId:row.id,
+              standId: row.standId,
+              remark:row.remark
            }
          })
          window.open(newUrl.href, '_blank')
@@ -382,9 +382,8 @@
              id: row.id,
              processBackground: row.processBackground,
              serialNumber: row.serialNumber,
-              title: row.title,
-              technologyTerritory: row.technologyTerritory,
-              standId: row.standId
+              standId: row.standId,
+              remark:row.remark
            }
          })
          window.open(newUrl.href, '_blank')