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
@@ -1134,7 +1134,7 @@ module.exports = {
  feedbackEvaluation: 'Feedback Evaluation',
  clauseEvaluation: 'Clause Evaluation',
  standardDocuments: 'Standard Documents',
-  pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluation method or evaluator in the list',
+  pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluator in the list',
  reviewComments: 'Review comments',
  PleaseCompleteList: 'Please complete the compliance results in the list',
  sponsorFeedback: 'Sponsor feedback',
@@ -1256,4 +1256,5 @@ module.exports = {
  HaveReleased:'Have released',
  forward:'Forward',
  issuedBy:'Issued by',
+  pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order',
 }
@@ -1139,7 +1139,6 @@ module.exports = {
  feedbackEvaluation: '反馈评估',
  clauseEvaluation: '条款评估',
  standardDocuments: '标准文件',
-  pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人',
  reviewComments: '审核意见',
  PleaseCompleteList: '请补全列表中符合性结果',
  sponsorFeedback: '发起人反馈',
@@ -1240,7 +1239,7 @@ module.exports = {
  feedbackEvaluation: '反馈评估',
  clauseEvaluation: '条款评估',
  standardDocuments: '标准文件',
-  pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人',
+  pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估人',
  reviewComments: '审核意见',
  PleaseCompleteList: '请补全列表中符合性结果',
  sponsorFeedback: '发起人反馈',
@@ -1359,4 +1358,5 @@ module.exports = {
  HaveReleased:'已发布',
  forward:'转发',
  issuedBy:'发布人',
+  pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单',
 }
@@ -124,7 +124,7 @@
              } else {
                eventBUs.$emit('searchReset')
              }
-              this.$message.success(info.file.response.message || `${info.file.name} 文件导入成功`)
+              this.$message.success(this.$t('OperationSuccessful'))
            }
            this.spinning = false
          } else {
@@ -187,7 +187,7 @@
            }
            this.spinning = false
          } else {
-            this.$message.error(`文件导入失败: ${info.file.msg} `)
+            this.$message.error(this.$t('operationFailed'))
            this.spinning = false
          }
        }
@@ -712,4 +712,7 @@
  /deep/ .ant-calendar-picker{
    display: block;
  }
+  ::v-deep .ant-modal-body{
+    overflow-y: visible!important;
+  }
 </style>
@@ -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
      }
    }
  }
@@ -122,6 +122,11 @@
              required: true,
              message: this.$t('publishComment') + this.$t('cannotEmpty'),
              trigger: 'blur'
+            },
+            {
+              max: 500,
+              message: this.$t('publishComment') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
            }
          ],
          replyContent: [
@@ -129,6 +134,11 @@
              required: true,
              message: this.$t('replyToComments') + this.$t('cannotEmpty'),
              trigger: 'blur'
+            },
+            {
+              max: 500,
+              message: this.$t('replyToComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+              trigger: 'blur'
            }
          ]
        }
@@ -286,6 +296,7 @@
    display: inline-block;
    margin-top: 22px;
    margin-left: 40px;
+    word-break: break-word;
  }

  .title-text {
@@ -28,10 +28,12 @@
                        style="margin-left: 20px;float: left"></a-checkbox>
            <div class="detail-content-header-content">
              <div class="detail-content-header-content-left"
+                   :title="resultData.serialNumberLeft + resultData.fileNameLeft"
                   :class="{'detail-content-header-content-left-active':isDisplay}">
                {{$t('selectedStandard')}}：{{resultData.serialNumberLeft}} {{resultData.fileNameLeft}}
              </div>
              <div class="detail-content-header-content-content"
+                   :title="resultData.serialNumberRight + resultData.fileNameRight"
                   :class="{'detail-content-header-content-left-active':isDisplay}">
                {{$t('selectedStandard')}}：{{resultData.serialNumberRight}} {{resultData.fileNameRight}}
              </div>
@@ -87,8 +89,8 @@
            <div class="detail-content-content-text">
              <div class="detail-content-content-text-left"
                   :class="{'detail-content-content-text-dis':isDisplay}">
-                <div class="detail-content-content-text-left-text">
-                  {{$t('fullTextComments')}}: {{resultData.comments}}
+                <div class="detail-content-content-text-left-text" :title="resultData.comments">
+                  <span>{{$t('fullTextComments')}}:</span> {{resultData.comments}}
                </div>
              </div>
              <div class="detail-content-content-text-right" v-if="!isDisplay">
@@ -307,8 +309,8 @@
          this.rulesText = {
            comment: [
              {
-                max: 300,
-                message: this.$t('fullTextComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+                max: 500,
+                message: this.$t('fullTextComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
                trigger: 'blur'
              }
            ]
@@ -326,8 +328,8 @@
          this.rulesText = {
            comment: [
              {
-                max: 300,
-                message: this.$t('comparativeComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+                max: 500,
+                message: this.$t('comparativeComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
                trigger: 'blur'
              }
            ]
@@ -572,6 +574,7 @@
    font-size: 14px;
    font-weight: 400;
    color: #040B29;
+    word-break: break-word;
  }

  .detail-content-content-text-left-text {
@@ -586,8 +589,7 @@
    -webkit-box-orient: vertical;
    -webkit-line-clamp: 3;
    /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
-    word-break: break-all
+    word-break: break-word;
  }

  .box-title-text-Remarks {
@@ -30,7 +30,7 @@
        <div class="detail-content" style="padding-bottom: 20px">
          <div style="width: 100%;height: auto;overflow: hidden">
            <div class="detail-content-left">
-              <div class="detail-content-left-header">
+              <div class="detail-content-left-header" :title="resultData.serialNumberLeft + resultData.fileNameLeft">
                {{this.resultData.serialNumberLeft}}&nbsp;
                {{this.resultData.fileNameLeft}}
              </div>
@@ -56,14 +56,15 @@
            </div>
            <div class="detail-content-right">
              <div class="detail-content-left-header">
-                <span class="detail-content-left-header-text">
+                <span class="detail-content-left-header-text"
+                      :title="resultData.serialNumberRight + resultData.fileNameRight">
                   {{this.resultData.serialNumberRight}}&nbsp;
                   {{this.resultData.fileNameRight}}
                </span>
-                <span class="detail-content-left-header-text-right">
-<!--                    <span style="color: #9B9DA9">相似度:</span>-->
-                  <!--                    <span style="color: #E83030">98%</span>-->
-                 </span>
+                <!--                <span class="detail-content-left-header-text-right">-->
+                <!--                    <span style="color: #9B9DA9">相似度:</span>-->
+                <!--                    <span style="color: #E83030">98%</span>-->
+                <!--                 </span>-->
              </div>
              <div class="detail-content-content-left">
                <a-tree
@@ -154,8 +155,8 @@
        rules: {
          comment: [
            {
-              max: 300,
-              message: this.$t('comparativeComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 500,
+              message: this.$t('comparativeComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
              trigger: 'blur'
            }
          ]
@@ -163,8 +164,8 @@
        rulesText: {
          comment: [
            {
-              max: 300,
-              message: this.$t('fullTextComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 500,
+              message: this.$t('fullTextComments') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
              trigger: 'blur'
            }
          ]
@@ -578,7 +579,7 @@
  }

  .detail-content-left-header-text {
-    width: calc(100% - 200px);
+    width: 100%;
    white-space: nowrap;
    overflow: hidden;
    text-overflow: ellipsis;
@@ -20,8 +20,8 @@
                      <div class="title-text" :title="$t('standard')">
                        <span>{{$t('standard')}}</span>
                      </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                               v-model="queryParamLeft.serialNumber"></j-input>
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                               v-model="queryParamLeft.serialNumber"></a-input>
                    </div>
                  </a-col>
                  <a-col :md="8" :sm="8">
@@ -29,8 +29,8 @@
                      <div class="title-text" :title="$t('title')">
                        <span>{{$t('title')}}</span>
                      </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                               v-model="queryParamLeft.title"></j-input>
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                               v-model="queryParamLeft.title"></a-input>
                    </div>
                  </a-col>
                  <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
@@ -84,8 +84,8 @@
                      <div class="title-text" :title="$t('standard')">
                        <span>{{$t('standard')}}</span>
                      </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                               v-model="queryParamRight.serialNumber"></j-input>
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                               v-model="queryParamRight.serialNumber"></a-input>
                    </div>
                  </a-col>
                  <a-col :md="8" :sm="8">
@@ -93,8 +93,8 @@
                      <div class="title-text" :title="$t('title')">
                        <span>{{$t('title')}}</span>
                      </div>
-                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                               v-model="queryParamRight.title"></j-input>
+                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                               v-model="queryParamRight.title"></a-input>
                    </div>
                  </a-col>
                  <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
@@ -348,6 +348,7 @@
        let query = {
          pageNo: this.pageNoLeft,
          pageSize: this.pageSizeLeft,
+          fileId:'1',
          ...queryParam
        }
        this.loadingLeft = true
@@ -371,6 +372,7 @@
        let query = {
          pageNo: this.pageNoRight,
          pageSize: this.pageSizeRight,
+          fileId:'1',
          ...queryParam
        }
        this.loadingRight = true
@@ -57,7 +57,7 @@
        size="middle"
        :loading="loading"
        :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:'calc(100vh - 280px)'}"
        rowKey="id"
        :data-source="dataSource"
        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -10,7 +10,7 @@
        ref="table"
        :loading="loading"
        :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:500}"
        :data-source="dataSource"
        :columns="columns"
      >
@@ -26,18 +26,21 @@
        <span slot="nameTechnicalDocument" slot-scope="text,result">
              <a-input class="box-input"
                       :maxLength="100"
-                       v-model="result.technicalFileName"
+                       onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
+                       v-model.trim="result.technicalFileName"
                       :placeholder="$t('PleaseEnter')+$t('nameTechnicalDocument')"/>
        </span>
        <span slot="chapter" slot-scope="text,result">
           <a-textarea :placeholder="$t('pleaseEnter')+$t('chapter')"
-                       v-model="result.section"
+                       v-model.trim="result.section"
+                       onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                       :maxLength="300"
                       :rows="2"/>
        </span>
        <span slot="opinion" slot-scope="text,result">
          <a-textarea :placeholder="$t('pleaseEnter')+$t('opinion')"
-                      v-model="result.opinion"
+                      v-model.trim="result.opinion"
+                      onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                      :maxLength="300"
                      :rows="2"/>
        </span>
@@ -75,7 +78,8 @@
        </span>
        <span slot="sponsorFeedback" slot-scope="text,result">
             <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
-                         v-model="result.sponsorFeedback"
+                         v-model.trim="result.sponsorFeedback"
+                         onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                         :maxLength="300"
                         :rows="2"/>
        </span>
@@ -308,6 +308,8 @@
      },
      completeTask() {
        let value = JSON.parse(JSON.stringify(this.queryProject))
+        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, '“')
@@ -89,7 +89,7 @@
          {
            title: this.$t('taskDescription'),
            value: 'taskExplain',
-            type:4,
+            type: 4
          }
          // {
          //   title: this.$t('remarks'),
@@ -121,7 +121,8 @@
      lawsOpinionAssessmentResult() {
        getAction(this.url.list, {
          lawsOpinionGatherId: this.queryProject.id,
-          actiProcInstId: this.$route.query.prcId
+          actiProcInstId: this.$route.query.prcId,
+          createBy: this.userInfo().username
        }).then((res) => {
          if (res.success) {
            this.feedbackDataList = res.result || []
@@ -50,8 +50,8 @@
        selectedRowKeys: [],
        prcTypeName: {
          1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
-          6:this.$t('regulatoryTechnologyAssessmentProcess')
+          5: this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6: this.$t('regulatoryTechnologyAssessmentProcess')
        },
        columns: [
          {
@@ -92,13 +92,10 @@
          },
          {
            title: this.$t('createTime'),
-            dataIndex: 'createTime',
+            dataIndex: 'creatTime',
            align: 'center',
            width: 180,
-            ellipsis: true,
-            customRender: function(t, r, index) {
-              return moment(t).format('YYYY-MM-DD HH:mm:ss')
-            }
+            ellipsis: true
          },
          {
            title: this.$t('cutoffTime'),