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

2022-08-11 16:58:34 +08:00
parent 58a1f5571e 9cc24924ec
commit d81a824a9c
24 changed files with 173 additions and 72 deletions
@@ -361,6 +361,8 @@
        })
      },
      completeTask(value, taskId, isTrue) {
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        value.operatorTime = handlingTime
        Object.keys(value).forEach(res => {
          if (value[res] && value[res] instanceof String) {
            value[res] = value[res].replace(/\"/g, '“')
@@ -109,12 +109,14 @@
            title: this.$t('chapterContents'),
            align: 'center',
            dataIndex: 'memoriesChapterName',
+            ellipsis: true,
            width: 170
          },
          {
            title: this.$t('chineseTitle'),
            align: 'center',
            dataIndex: 'titleCn',
+            ellipsis: true,
            width: 170
          },
          {
@@ -164,16 +164,22 @@
      },
      submitData(callback) {
        let dataList = JSON.parse(JSON.stringify(this.dataList))
-        for (let i = 0; i < dataList.length; i++) {
-          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
+        if (dataList && dataList.length > 0) {
+          for (let i = 0; i < dataList.length; i++) {
+            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].evaluatorIds) {
+              this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator'))
+              return
+            }
          }
+        } else {
+          this.$message.warning(this.$t('pleaseDecompositionStandardOrder'))
+          return
        }
+
        callback && callback(dataList)
      },
      handleModule() {
@@ -202,4 +208,23 @@
    text-justify: inter-ideograph;
    word-break: break-all
  }
+
+  ::v-deep .ant-select-tree-treenode-switcher-close {
+    width: 255px;
+  }
+
+  ::v-deep .ant-select-tree-node-content-wrapper {
+    text-align: left;
+    float: right;
+    margin-top: -2px !important;
+  }
+
+  ::v-deep .ant-select-tree-title {
+    width: 100%;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
 </style>
@@ -100,7 +100,6 @@
                <a-form-model-item class="itemModel" prop="processBackground">
                  <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
                              v-model="formInline.processBackground"
-                              :disabled="!whetherDisplay"
                              :rows="4"/>
                </a-form-model-item>
              </div>
@@ -115,7 +114,6 @@
                <a-form-model-item class="itemModel" prop="remark">
                  <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
                              v-model="formInline.remark"
-                              :disabled="!whetherDisplay"
                              :rows="4"/>
                </a-form-model-item>
              </div>
@@ -258,6 +256,7 @@
        },
        searchParmes: {},
        selectedRowKeysRecord: [],
+        standardList: [],
        whetherDisplay: false,
        columns: [
          {
@@ -436,15 +435,21 @@
      },
      standardDecompositionDocumentClick() {
        if (this.standardDecomposition && this.standardDecomposition.length > 0) {
-          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])))
+          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])), this.standardList)
        } else {
          this.$message.warning(this.$t('pleaseSelectStandardFirst'))
        }
      },
      standardDecompositionSheetForm(value) {
+        this.standardList = JSON.parse(JSON.stringify(value))
        this.$refs.TermInformationRef.getData(JSON.parse(JSON.stringify(value)))
      },
      TermInformationRefForm(value) {
+        if (value && value.itemId) {
+          this.standardList = this.standardList.filter(res => {
+            return value.itemId != res.id
+          })
+        }
        this.$refs.standardDecompositionSheetRef.getRowList(JSON.parse(JSON.stringify(value)))
      },
      clickButtonToUpload(item) {
@@ -49,7 +49,7 @@
      </div>
      <a-table
        :columns="columns"
-        rowKey="id"
+        :rowKey="(record)=>JSON.stringify(record)"
        :scroll="{x: '100%'}"
        :data-source="dataList"
        :pagination="false"
@@ -150,7 +150,8 @@
        fieldList: [],
        queryConditionVOList: [],
        info_id: '',
-        selectedRowKeysData: []
+        selectedRowKeysData: [],
+        standardList: ''
      }
    },
    methods: {
@@ -160,7 +161,16 @@
      standardDocumentsChange(value) {
        this.replacePage()
      },
-      getData(row) {
+      getData(row, standardList) {
+        this.selectedRowKeys = []
+        this.selectedRowKeysData = []
+        this.standardList = JSON.parse(JSON.stringify(standardList))
+        if (this.standardList && this.standardList.length > 0) {
+          this.standardList.forEach(val => {
+            this.selectedRowKeys.push(JSON.stringify(val))
+          })
+          this.selectedRowKeysData = this.standardList
+        }
        this.total = 0
        this.dataList = []
        this.standData = row
@@ -169,15 +179,16 @@
        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
        this.visible = true
        if (this.queryParam.info_id) {
+          this.pageNo = 1
          this.replacePage()
        }
      },
      getRowList(value) {
        if (value && value.itemId) {
-          this.selectedRowKeys =  this.selectedRowKeys.filter(res=>{
-             return value.itemId != res
+          this.selectedRowKeys = this.selectedRowKeys.filter(res => {
+            return !res.includes(value.itemId)
          })
-          this.selectedRowKeysData =  this.selectedRowKeysData.filter(res=>{
+          this.selectedRowKeysData = this.selectedRowKeysData.filter(res => {
            return value.itemId != res.id
          })
        }
@@ -232,15 +243,23 @@
      },
      handleSubmit() {
        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.$emit('standardDecompositionSheetForm', this.selectedRowKeysData)
+          this.$emit('standardDecompositionSheetForm', JSON.parse(JSON.stringify(this.selectedRowKeysData)))
          this.visible = false
        } else {
          this.$message.warning(this.$t('PleaseSelectData'))
        }
      },
      onSelectChange(value, record) {
+        console.log(value)
+        this.selectedRowKeysData = []
        this.selectedRowKeys = value
-        this.selectedRowKeysData = record
+        console.log(this.selectedRowKeys)
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.selectedRowKeys.forEach(res => {
+            this.selectedRowKeysData.push(JSON.parse(res))
+          })
+        }
+        // this.selectedRowKeysData = record
      }
    }
  }