[update] 修改流程查看详情进入报任务不存在，市场清单流程类型和国家地区没返回，市场清单子表增加备注字段

2024-07-22 17:50:42 +08:00
parent 70082bb352
commit 6483e07518
9 changed files with 54 additions and 29 deletions
@@ -226,6 +226,7 @@ module.exports = {
  networkTimeout: 'Network Timeout',
  unauthorized: 'Unauthorized, please log in again',
  tableDataDisabledClear: 'The table requires at least one piece of data',
+  autoTakeout: 'Automatic takeout',
  // 树右键
  treeRight: {
    addFolder: 'Create New Folder',
@@ -243,6 +243,7 @@ module.exports = {
  networkTimeout: '网络超时',
  unauthorized: '未授权，请重新登录',
  tableDataDisabledClear: '表格至少需要一条数据',
+  autoTakeout: '自动带出',
  // 标准字段
  standardField: {
    standardEnglishName: '标准英文名称',
@@ -331,6 +331,13 @@ export default {
          width: 180,
          dataIndex: 'requireType_dictText',
          scopedSlots: { customRender: 'text' }
+        },
+        { // 备注
+          title: this.$t('remarks'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'remarks',
+          scopedSlots: { customRender: 'text' }
        }
      ],
      dataSource: [],
@@ -442,6 +442,13 @@ export default {
          dataIndex: 'requireType_dictText',
          scopedSlots: { customRender: 'text' }
        },
+        { // 备注
+          title: this.$t('remarks'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'remarks',
+          scopedSlots: { customRender: 'text' }
+        },
        {
          title: this.$t('operation'),
          scopedSlots: { customRender: 'action' },
@@ -134,6 +134,12 @@
                               dict-code="requirement_type"
                               v-decorator.trim="[ 'requireType', validatorRules.requireType ]" />
          </a-form-item>
+          <!--   备注  -->
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.certifiedDeliverables')">
+            <a-input :placeholder="$t('pleaseEnter') + $t('remarks')"
+                     :maxLength="50"
+                     v-decorator.trim="[ 'remarks', validatorRules.remarks ]" />
+          </a-form-item>
        </a-form>
      </a-spin>
    </div>
@@ -24,7 +24,7 @@
              :wrapperCol="$i18n.locale === EN ? wrapperColEn : wrapperCol"
              :label="$t('processName')"
              :colon="formItemColon">
-              <a-input :placeholder="$t('pleaseEnter') + $t('processName')"
+              <a-input :placeholder="$t('autoTakeout')"
                       disabled
                       :maxLength="50"
                       v-decorator="['processName', validatorRules.processName]" />
@@ -233,14 +233,6 @@ export default {
        }
      }
    })
-    if (this.$route.query.taskId && !this.$route.query.draftId) {
-      // 有流程id说明是从流程中心来的，需要初始化数据
-      this.getProcessData('todo', { taskId: this.$route.query.taskId })
-    }
-    if (this.$route.query.draftId) {
-      // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据
-      this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId })
-    }
    if (this.$route.query.isLook + '' === '1') {
      // 是查看
      this.isLook = true
@@ -248,6 +240,15 @@ export default {
      this.initPersonInfoData(false)
      // 查询数据
      this.getProcessData('look', { snapshotId: this.$route.query.snapshotId })
+    } else {
+      if (this.$route.query.taskId && !this.$route.query.draftId) {
+        // 有流程id说明是从流程中心来的，需要初始化数据
+        this.getProcessData('todo', { taskId: this.$route.query.taskId })
+      }
+      if (this.$route.query.draftId) {
+        // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据
+        this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId })
+      }
    }
    if (this.$route.query.taskName) {
      // 说明是已发起流程
@@ -212,7 +212,7 @@ export default {
          title: this.$t('workCenter.marketListReleaseProcess.applicableCountryRegion'),
          align: 'center',
          width: 180,
-          dataIndex: 'applicableCountryRegion_dictText',
+          dataIndex: 'country_dictText',
          scopedSlots: { customRender: 'text' }
        },
        { // 适用车型
@@ -240,7 +240,7 @@ export default {
          title: this.$t('workCenter.marketListReleaseProcess.type'),
          align: 'center',
          width: 180,
-          dataIndex: 'stanardClass_dictText',
+          dataIndex: 'type_dictText',
          scopedSlots: { customRender: 'text' }
        },
        { // 动力类型
@@ -24,7 +24,7 @@
              :wrapperCol="$i18n.locale === EN ? wrapperColEn : wrapperCol"
              :label="$t('processName')"
              :colon="formItemColon">
-              <a-input :placeholder="$t('pleaseEnter') + $t('processName')"
+              <a-input :placeholder="$t('autoTakeout')"
                       disabled
                       :maxLength="50"
                       v-decorator="['processName', validatorRules.processName]" />
@@ -202,14 +202,6 @@ export default {
        }
      }
    })
-    if (this.$route.query.taskId && !this.$route.query.draftId) {
-      // 有流程id说明是从流程中心来的，需要初始化数据
-      this.getProcessData('todo', { taskId: this.$route.query.taskId })
-    }
-    if (this.$route.query.draftId) {
-      // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据
-      this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId })
-    }
    if (this.$route.query.isLook + '' === '1') {
      // 是查看
      this.isLook = true
@@ -217,6 +209,15 @@ export default {
      this.initPersonInfoData(false)
      // 查询数据
      this.getProcessData('look', { snapshotId: this.$route.query.snapshotId })
+    } else {
+      if (this.$route.query.taskId && !this.$route.query.draftId) {
+        // 有流程id说明是从流程中心来的，需要初始化数据
+        this.getProcessData('todo', { taskId: this.$route.query.taskId })
+      }
+      if (this.$route.query.draftId) {
+        // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据
+        this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId })
+      }
    }
    if (this.$route.query.taskName) {
      // 说明是已发起流程
@@ -24,7 +24,7 @@
              :wrapperCol="$i18n.locale === EN ? wrapperColEn : wrapperCol"
              :label="$t('processName')"
              :colon="formItemColon">
-              <a-input :placeholder="$t('pleaseEnter') + $t('processName')"
+              <a-input :placeholder="$t('autoTakeout')"
                       disabled
                       :maxLength="50"
                       v-decorator="['processName', validatorRules.processName]" />
@@ -296,14 +296,6 @@ export default {
        }
      }
    })
-    if (this.$route.query.taskId && !this.$route.query.draftId) {
-      // 有流程id说明是从流程中心来的，需要初始化数据
-      this.getProcessData('todo', { taskId: this.$route.query.taskId })
-    }
-    if (this.$route.query.draftId) {
-      // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据
-      this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId })
-    }
    if (this.$route.query.isLook + '' === '1') {
      // 是查看
      this.isLook = true
@@ -311,6 +303,15 @@ export default {
      this.initPersonInfoData(false)
      // 查询数据
      this.getProcessData('look', { snapshotId: this.$route.query.snapshotId })
+    } else {
+      if (this.$route.query.taskId && !this.$route.query.draftId) {
+        // 有流程id说明是从流程中心来的，需要初始化数据
+        this.getProcessData('todo', { taskId: this.$route.query.taskId })
+      }
+      if (this.$route.query.draftId) {
+        // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据
+        this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId })
+      }
    }
    if (this.$route.query.taskName) {
      // 说明是已发起流程