1.修改三期优化点

jero-web/src/common/lang/en-us.js

@@ -1306,4 +1306,5 @@ module.exports = {
   inRecentYear1:'In recent 1 year',
   inRecentYear2:'In recent 2 year',
   selectAll:'Select All',
+  importLocalDisassemblyOrder:'Import local disassembly order',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1407,4 +1407,5 @@ module.exports = {
   inRecentYear1:'近1年内',
   inRecentYear2:'近2年内',
   selectAll:'全选',
+  importLocalDisassemblyOrder:'导入本地拆解单',
 }

jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue

@@ -1,20 +1,93 @@
 <template>
   <div class="box" style="margin-bottom: 20px">
-    <div style="margin-bottom: 10px;text-align: right">
-      <div @click="handleModule" class="operator-text">
-        <a-icon type="download"/>
-        {{$t('templateDownload')}}
+    <a-modal
+      :title="$t('importLocalDisassemblyOrder')"
+      :width="700"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @cancel="visible = false"
+    >
+      <template slot="footer">
+        <a-button key="back" @click="visible = false">
+          {{$t('cancel')}}
+        </a-button>
+      </template>
+      <div style="margin-bottom: 10px;text-align: center">
+        <div @click="handleModule" class="operator-text">
+          <a-icon type="download"/>
+          {{$t('templateDownload')}}
+        </div>
+        <div class="operator-text">
+          <ImportFile :url="url" :isTrue="true" :accept="'.xls'"
+                      @getList="getPersonnelList"/>
+        </div>
       </div>
-      <div class="operator-text">
-        <ImportFile :url="url" :isTrue="true" :accept="'.xls'"
-                    @getList="getPersonnelList"/>
+    </a-modal>
+    <a-modal
+      :title="$t('BatchSetting')"
+      :width="700"
+      :visible="visibleBatch"
+      :confirm-loading="confirmLoadingBatch"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <a-form-model :model="formInline" class="formAdd" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-multi">
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="formInline.evaluationMethods"
+                  :maxTagCount="1"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input-index"
+                  :tree-data="gatherResultList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+                />
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('Assessor')">{{$t('Assessor')}}</span>
+              </div>
+              <a-form-model-item class="itemModel">
+                <PersonnelSelection class="box-input-index"
+                                    :personneQuery="formInline"
+                                    :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor')}"
+                                    :isInput="true"
+                                    @change="evaluationMethodChange"
+                                    v-model="formInline.evaluatorIdsName"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <div style="margin-bottom: 10px;text-align: right">
+      <div @click="BatchSettingClick" class="operator-text">
+        <a-icon type="setting"/>
+        {{$t('BatchSetting')}}
       </div>
     </div>
-
     <a-table
       :columns="columns"
       :scroll="{x: '100%'}"
       :data-source="dataList"
+      rowKey="itemId"
+      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
       :pagination="false"
       :loading="loading">
       <div slot="clauseContent" slot-scope="text,result">
@@ -70,6 +143,8 @@
         url: {
           importZipUrl: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/importItemExcel'
         },
+        selectedRowKeys: [],
+        formInline: {},
         columns: [
           {
             title: this.$t('clauseNo'),
@@ -109,15 +184,55 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        confirmLoading: false,
         dataList: [],
+        visible: false,
         ImportFileData: [],
         dataListData: [],
-        loading: false
+        loading: false,
+        visibleBatch: false,
+        confirmLoadingBatch: false
       }
     },
     mounted() {
     },
     methods: {
+      openData() {
+        this.visible = true
+      },
+      BatchSettingClick() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.visibleBatch = true
+          this.formInline = {}
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
+      },
+      handleOk() {
+        this.dataList.forEach(res => {
+          this.selectedRowKeys.forEach(val => {
+            if (res.itemId == val) {
+              if (this.formInline.evaluationMethods && this.formInline.evaluationMethods.length > 0) {
+                this.$set(res, 'evaluationMethods', this.formInline.evaluationMethods)
+              }
+              if (this.formInline.evaluatorIds) {
+                this.$set(res, 'evaluatorIds', this.formInline.evaluatorIds)
+                this.$set(res, 'evaluatorIdsName', this.formInline.evaluatorIdsName)
+              }
+            }
+          })
+        })
+        this.dataList = [...this.dataList]
+        this.$message.success(this.$t('OperationSuccessful'))
+        this.selectedRowKeys = []
+        this.visibleBatch = false
+      },
+      handleCancel() {
+        this.visibleBatch = false
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
       deleteData(item) {
         this.dataList = this.dataList.filter(res => {
           return res.itemId != item.itemId
@@ -134,6 +249,10 @@
         this.dataList[index][value] = id
         this.dataList = [...this.dataList]
       },
+      evaluationMethodChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
       getData(value) {
         this.dataListData = []
         if (value && value.length > 0) {
@@ -180,7 +299,6 @@
           this.$message.warning(this.$t('pleaseDecompositionStandardOrder'))
           return
         }
-
         callback && callback(dataList)
       },
       handleModule() {
@@ -228,4 +346,38 @@
     white-space: nowrap;
   }
 
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+  }
+
+  .title-text {
+    width: 84px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 42px;
+  }
+
+  .box-input-index {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
 </style>

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue

@@ -179,6 +179,13 @@
             ellipsis: true,
             width: 160
           },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResultName',
+            align: 'center',
+            ellipsis: true,
+            width: 160
+          },
           {
             title: this.$t('nameTechnicalDocument'),
             dataIndex: 'technicalFileName',
@@ -193,13 +200,6 @@
             ellipsis: true,
             width: 260
           },
-          {
-            title: this.$t('complianceResults'),
-            dataIndex: 'complianceResultName',
-            align: 'center',
-            ellipsis: true,
-            width: 160
-          },
           {
             title: this.$t('opinion'),
             dataIndex: 'opinion',

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -65,7 +65,7 @@
             </a-col>
           </a-row>
           <a-row :gutter="24" style="margin-bottom: 10px">
-            <a-col :span="12">
+            <a-col :span="16">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('selectedStandard')">{{$t('selectedStandard')}}</span>
@@ -76,16 +76,21 @@
                   {{selectedRowKeysRecord[0] ?
                   selectedRowKeysRecord[0].serialNumber+'-'+selectedRowKeysRecord[0].title:''}}
                 </div>
-                <div class="title-text-right" v-if="isTrue">
+                <div class="title-text-right title-text-right-index" v-if="isTrue">
                   <span :title="$t('standardDecompositionDocument')" @click="standardDecompositionDocumentClick">
                     {{$t('standardDecompositionDocument')}}
                   </span>
                 </div>
+                <div class="title-text-right" v-if="isTrue">
+                  <span :title="$t('importLocalDisassemblyOrder')" @click="importLocalDisassemblyOrderClick">
+                    {{$t('importLocalDisassemblyOrder')}}
+                  </span>
+                </div>
               </div>
             </a-col>
           </a-row>
           <a-row :gutter="24">
-            <a-col :span="6">
+            <a-col :span="8">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
@@ -103,7 +108,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="6">
+            <a-col :span="8">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="title-text-text"
@@ -343,7 +348,10 @@
             align: 'center',
             ellipsis: true,
             width: 170,
-            scopedSlots: { customRender: 'whetherTheDisassemblySheetIncluded',title:'whetherTheDisassemblySheetIncludedTitle' }
+            scopedSlots: {
+              customRender: 'whetherTheDisassemblySheetIncluded',
+              title: 'whetherTheDisassemblySheetIncludedTitle'
+            }
           }
         ]
       }
@@ -648,6 +656,9 @@
       },
       onChange(event) {
         this.isTrue = event.target.value == '1' ? true : false
+      },
+      importLocalDisassemblyOrderClick() {
+        this.$refs.TermInformationRef.openData()
       }
     }
   }
@@ -737,7 +748,7 @@
 
   .title-text-content {
     display: inline-block;
-    width: calc(100% - 334px);
+    width: calc(100% - 530px);
     text-align: center;
     border: 1px solid #d9d9d9;
     line-height: 38px;
@@ -769,9 +780,14 @@
     cursor: pointer;
   }
 
+  .title-text-right-index {
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+  }
+
   .title-text-content-one {
     border-bottom-right-radius: 5px;
     border-top-right-radius: 5px;
-    width: calc(100% - 128px);
+    width: calc(100% - 132px);
   }
 </style>

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -102,8 +102,9 @@
       >
         <!--         -->
         <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
-           <a class="text-operation" v-if="record.flowStatus == 'Completed'"
+<!--           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>-->
+          <!--           v-if="record.flowStatus == 'Completed'"-->
+           <a class="text-operation"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
           <a class="text-operation"
              v-if="(record.flowStatus == 'Completed' && userInfoQuery.username == record.createBy) || administrators"
@@ -286,7 +287,7 @@
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 320,
+            width: 220,
             scopedSlots: { customRender: 'operation' }
           }
         ],

jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue

@@ -164,6 +164,13 @@
             width: 180,
             ellipsis: true
           },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResult',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'complianceResults' }
+          },
           {
             title: this.$t('nameTechnicalDocument'),
             dataIndex: 'technicalFileName',
@@ -192,13 +199,6 @@
             width: 180,
             scopedSlots: { customRender: 'enclosure' }
           },
-          {
-            title: this.$t('complianceResults'),
-            dataIndex: 'complianceResult',
-            align: 'center',
-            width: 180,
-            scopedSlots: { customRender: 'complianceResults' }
-          },
           {
             title: this.$t('sponsorFeedback'),
             dataIndex: 'sponsorFeedback',
@@ -237,6 +237,14 @@
             width: 180,
             ellipsis: true
           },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResult',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'Results' }
+          },
           {
             title: this.$t('nameTechnicalDocument'),
             dataIndex: 'technicalFileName',
@@ -266,14 +274,6 @@
             ellipsis: true,
             scopedSlots: { customRender: 'accessoryFile' }
           },
-          {
-            title: this.$t('complianceResults'),
-            dataIndex: 'complianceResult',
-            align: 'center',
-            width: 180,
-            ellipsis: true,
-            scopedSlots: { customRender: 'Results' }
-          },
           {
             title: this.$t('sponsorFeedback'),
             dataIndex: 'sponsorFeedback',