Merge branch 'master' into 'fix_bug_first_stage'

# Conflicts:
#   jero-web/src/common/lang/en-us.js

jero-web/src/api/manage.js

@@ -202,6 +202,10 @@ export function downloadFile(url, fileName, parameter, callback) {
         }
       } catch (e) {
         if (!data || data.size === 0) {
+          index.showDrawer({
+            loading: false,
+            isTrue: isTrue
+          })
           Vue.prototype['$message'].warning('文件下载失败')
           return
         }

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

@@ -388,7 +388,8 @@ module.exports = {
   StandardDetails: 'Standard Details',
   whole: 'Whole',
   DocumentLibrary: 'Document Library',
-  GeneralExportInformation:'General export Information',
+  GeneralExportInformation:'General export information',
+  CustomizeExportInformation:'Customize export information',
   DocumentComparisonLibrary: 'Document comparison Library',
   weekly: 'Weekly',
   SyncLibrary: 'Sync to doc. library',
@@ -1054,6 +1055,7 @@ module.exports = {
   NcontrolType: 'Control Type',
   NcontrolVerification: 'Control Verify',
   NcontrolAlternatives: 'Control Values',
+  DefaultValue: 'Default Value',
   NattachmentTemplate: 'File Template',
   Ntext: 'Text',
   NDropdownradio: 'Pull Single',
@@ -1065,6 +1067,7 @@ module.exports = {
   Dtext: 'Pull single+File',
   Etext: 'Pull more+File',
   Ftext: 'Text+Pull single+File',
+  Gtext: 'Title',
   Nnothing: 'Null',
   Nchinese: 'Chinese',
   NpositiveInteger: 'Integer',
@@ -1106,4 +1109,46 @@ module.exports = {
   PreHomoNotification:'Pre-Homo Notification',
   ValidationComplianceNotification:'Validation Compliance Notification',
   RegulationTaskConfirmationNotification:'Regulation Task Confirmation Notification',
+  evaluationMethod:'Evaluation method',
+  uploadRelevantMaterials:'Upload relevant materials',
+  processBackground:'Process background',
+  selectedStandard:'Selected standard',
+  standardDecompositionDocument:'Standard decomposition document',
+  pleaseSelectStandardFirst:'Please select a standard first',
+  RelevantMaterials:'RelevantMaterials',
+  evaluatorFeedback:'Evaluator feedback',
+  nameTechnicalDocument:'Name of technical document',
+  chapter:'chapter',
+  problemDescription:'Problem description',
+  filingExternalOpinions:'Filing of external opinions',
+  regulatoryTechnicalEvaluationResults:'Regulatory technical evaluation results',
+  initiateProcessForCurrentStandard:'Initiate process for current standard',
+  engineerFeedbackResults:'Engineer feedback results',
+  fileExport:'File export',
+  feedbackTime:'Feedback time',
+  regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process',
+  feedbackEvaluation:'Feedback evaluation',
+  clauseEvaluation:'Clause evaluation',
+  standardDocuments:'Standard documents',
+  pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
+  reviewComments:'Review comments',
+  PleaseCompleteList:'Please complete the compliance results in the list',
+  sponsorFeedback:'Sponsor feedback',
+  processNumber:'Process number',
+  processName:'Process Name',
+  feedbackResults:'Feedback results',
+  theDoesNotSupportPreview:'The current file format does not support Preview',
+  releaseSituation:'Release situation',
+  comparisonResults:'Comparison results',
+  Published:'Published',
+  initiateComparison:'Initiate comparison',
+  translationLanguage:'Translation language',
+  translationResults:'Translation results',
+  conversionTime:'Conversion time',
+  category:'Category',
+  RegulatoryProcessEvaluationResults :'Regulatory Process Evaluation Results',
+  ViewConformanceResults:'View Conformance Results',
+  CommentsCollectionResultsForReference:'Comments Collection Results For Reference',
+  TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference',
+  ComplianceConfirmationRecord:'Compliance Confirmation Record',
 }

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

@@ -394,6 +394,7 @@ module.exports = {
   whole: '全部',
   DocumentLibrary: '文档库',
   GeneralExportInformation:'常规导出信息',
+  CustomizeExportInformation:'自定义导出信息',
   DocumentComparisonLibrary: '文档对比库',
   weekly: '周报',
   SyncLibrary: '同步至文档库',
@@ -1021,6 +1022,7 @@ module.exports = {
   closingDate: '截止日期',
   viewProcess: '查看流程',
   evaluationResults: '评估结果',
+  regulatoryTechnicalEvaluationResults:'法规技术评估结果',
   Assessor:'评估人',
   collectionOfRegulatoryOpinions:'法规意见收集',
   collectionOfRegulatoryOpinionsProcess:'法规意见收集流程',
@@ -1063,6 +1065,7 @@ module.exports = {
   NcontrolType: '控件类型',
   NcontrolVerification: '控件校验',
   NcontrolAlternatives: '控件备选值',
+  DefaultValue: '默认值',
   NattachmentTemplate: '附件模板',
   Ntext: '文本',
   NDropdownradio: '下拉单选',
@@ -1074,6 +1077,7 @@ module.exports = {
   Dtext: '下拉单选+附件',
   Etext:'下拉多选+附件',
   Ftext: '文本+下拉单选+附件',
+  Gtext: '标题',
   Nnothing: '无',
   Nchinese: '中文',
   NpositiveInteger: '整数',
@@ -1110,4 +1114,45 @@ module.exports = {
   PreHomoNotification:'Pre-Homo通知',
   ValidationComplianceNotification:'验证符合性通知',
   RegulationTaskConfirmationNotification:'任务确认通知',
+  evaluationMethod:'评估方式',
+  uploadRelevantMaterials:'相关资料上传',
+  RelevantMaterials:'相关资料',
+  processBackground:'流程背景',
+  selectedStandard:'所选标准',
+  standardDecompositionDocument:'带入标准分解单',
+  pleaseSelectStandardFirst:'请先选择标准',
+  evaluatorFeedback:'评估人反馈',
+  nameTechnicalDocument:'技术文件名称',
+  chapter:'章节',
+  problemDescription:'问题说明',
+  filingExternalOpinions:'对外意见归档',
+  initiateProcessForCurrentStandard:'针对当前标准发起流程',
+  engineerFeedbackResults:'工程师反馈结果',
+  fileExport:'文件导出',
+  feedbackTime:'反馈时间',
+  regulatoryTechnologyAssessmentProcess:'法规技术评估流程',
+  feedbackEvaluation:'反馈评估',
+  clauseEvaluation:'条款评估',
+  standardDocuments:'标准文件',
+  pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人',
+  reviewComments:'审核意见',
+  PleaseCompleteList:'请补全列表中符合性结果',
+  sponsorFeedback:'发起人反馈',
+  processNumber:'流程编号',
+  processName:'流程名称',
+  feedbackResults:'反馈结果',
+  theDoesNotSupportPreview:'当前文件格式不支持预览',
+  releaseSituation:'发布情况',
+  comparisonResults:'对比结果',
+  Published:'已发布',
+  initiateComparison:'发起对比',
+  translationLanguage:'翻译语言',
+  translationResults:'翻译结果',
+  conversionTime:'转换时间',
+  category:'类别',
+  RegulatoryProcessEvaluationResults :'法规流程评估结果',
+  ViewConformanceResults:'查看符合性结果',
+  CommentsCollectionResultsForReference:'意见收集结果参考',
+  TechnicalEvaluationResultsForReference:'技术评估结果参考',
+  ComplianceConfirmationRecord:'符合性确认记录',
 }

jero-web/src/components/CollectionType/index.vue

@@ -96,6 +96,31 @@
           </div>
         </div>
       </div>
+      <!--      默认值-->
+      <div v-if='detailDate.controlType === "11"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="text"'>
+            <!--            文本校验  分情况-->
+            <!--            1 无-->
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div>
+              <a-input class="box-input inputWid"
+                       :maxLength="1000"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue"/>
+            </div>
+          </div>
+        </div>
+      </div>
       <!--      纯下拉单选-->
       <div v-else-if='detailDate.controlType === "2"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>

jero-web/src/components/ImportFile/index.vue

@@ -120,7 +120,7 @@
             })
             } else {
               if (this.isTrue) {
-                this.$emit('getList')
+                this.$emit('getList',info.file.response.result)
               } else {
                 eventBUs.$emit('searchReset')
               }

jero-web/src/components/layouts/TabLayout.vue

@@ -97,6 +97,10 @@
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||
+          this.$route.path == '/evaluationProcess' ||
+          this.$route.path == '/evaluationResultsClause' ||
+          this.$route.path == '/evaluationResultsWhole' ||
+          this.$route.path == '/evaluationInitiationProcess' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||
           this.$route.path == '/processDetails') {

jero-web/src/components/tableCollection/index.vue

@@ -31,7 +31,7 @@
            <span
              v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
              <span
-               @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
+               @click='areaOfResponsibility(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
              <span v-else>
              <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
@@ -41,6 +41,23 @@
              <span @click='dataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
          </span>
+        <span slot="operationzr" slot-scope="record">
+           <span v-if='currentPersonRole === "homo"'>
+<!--           认证工程师  -->
+           <span
+             v-if='record.state == "待发起收集" || record.state == "工程接口人退回"'>
+             <span :title='record.dataValue'
+               @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+             <span v-else>
+             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+           </span>
+           <span v-else>
+             <span :title='record.dataValue' @click='dataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
+           </span>
+         </span>
+
         <span slot="detailClick" slot-scope="text,record">
           <collection-type :detailDate='text'/>
         </span>
@@ -95,6 +112,46 @@
         </div>
       </div>
     </a-modal>
+    <!--  修改责任领域--->
+    <a-modal v-model="areaVisiblezr" :title="$t('areaOfResponsibility')" width='620px' :footer="null"
+             @cancel="cancel">
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='Dateline'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+
+      >
+        <a-row :gutter='24'>
+          <a-col :span='24'>
+            <a-form-model-item ref='region' :label="$t('areaOfResponsibility')" prop='queryzr'>
+<!--              <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
+<!--                        v-model="Dateline.querySdt">-->
+<!--                <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">-->
+<!--                    <span style="display: inline-block;width: 100%" :title=" item.label ">-->
+<!--                      {{ item.label }}-->
+<!--                    </span>-->
+<!--                </a-select-option>-->
+<!--              </a-select>-->
+              <j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+      <div class="imports-footer">
+        <div class="imports-footer-wrap">
+
+          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
+          </a-button>
+          <a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
+        </div>
+      </div>
+    </a-modal>
     <!--  配置信息--->
     <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
       <div class="content-text">
@@ -161,6 +218,10 @@
         type: Object,
         default: true
       },
+      queryParamQuery: {
+        type: Object,
+        default: true
+      },
       currentPersonRole: {
         type: String,
         default: true
@@ -232,6 +293,7 @@
         sdt: 0, // 工程接口人
         dre: 0, // 填写人
         areaVisible: false,
+        areaVisiblezr:false,
         form: {},
         rules: {
           querySdt: [
@@ -240,6 +302,13 @@
               message: this.$t('PleaseSelect') + this.$t('engineeringInterfacePerson'),
               trigger: 'change'
             }
+          ],
+          queryzr: [
+            {
+              required: true,
+              message: this.$t('PleaseSelect') + this.$t('areaOfResponsibility'),
+              trigger: 'change'
+            }
           ]
         },
         wrapperCol: {
@@ -294,8 +363,15 @@
       onClickSee(val) {
         let _this = this
         this.areaVisibleView = true
+        let url = ''
+        if (this.$route.query.it === undefined) {
+          url = `/jero-boot/params/config/getById?id=${val.db_field_name}`
+        } else {
+          // 历史版本
+          url = `/jero-boot/params/collectManifestHistory/getConfigById?id=${val.db_field_name}`
+        }
         axios({
-          url: `/jero-boot/params/config/getById?id=${val.db_field_name}`,
+          url: url,
           method: 'get',
           transformRequest: [function(data) {
             let ret = ''
@@ -312,8 +388,9 @@
           .then((res) => {
             console.log(res)
             if (res.data.success) {
-              this.configDetail = res.data.result
+              this.configDetail = res.data.result || {}
             } else {
+              this.configDetail = {}
               _this.$message.warning(res.data.result)
             }
           })
@@ -334,6 +411,44 @@
           }
         })
       },
+      // 责任领域 保存
+      handleSubmitzr(record) {
+        let _this = this
+        let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            axios({
+              url: '/jero-boot/params/collectManifest/updateDutyTerritory',
+              method: 'post',
+              data: param,
+              transformRequest: [function(data) {
+                let ret = ''
+                for (let it in data) {
+                  ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                }
+                return ret
+              }],
+              headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-Access-Token': _this.token
+              }
+            })
+              .then((res) => {
+                console.log(res)
+                if (res.data.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.areaVisiblezr = false
+                  this.getLoginUserType()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+              .catch((error) => {
+                console.log(error)
+              })
+          }
+        })
+      },
       // 工程接口人 保存
       handleSubmit(record) {
         let _this = this
@@ -377,8 +492,12 @@
         this.areaVisible = false
         this.$refs['ruleForm'].resetFields()
       },
+      cancel(){
+        this.areaVisiblezr = false
+        this.$refs['ruleForm'].resetFields()
+      },
       // 点击工程接口人的详情人员 有权限
-      ondataValueTobeinitiated(record) {
+      areaOfResponsibility(record) {
         this.areaVisible = true
         // this.$refs.ruleForm.clearValidate()
         this.$nextTick(() => {
@@ -387,9 +506,22 @@
           this.$refs.ruleForm.clearValidate()
         })
       },
+      // 点击责任领域的详情人员 有权限
+      ondataValueTobe(record) {
+        this.areaVisiblezr = true
+        // this.$refs.ruleForm.clearValidate()
+        this.$nextTick(() => {
+          this.Dateline = { ...this.Dateline }
+          this.getquerySdtId = record.id
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
       dataValueTobeinitiated() {
         this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
       },
+      dataValueTobe() {
+        this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('toHavePermission'))
+      },
       // 点击工程接口人的详情人员 无权限
       ondataValueNot() {
         this.$message.warning(this.$t('operatethisbutton'))
@@ -479,9 +611,15 @@
                   sorter: res.sort,
                   width: 160
                 })
+                console.log(res)
                 this.columns[index].scopedSlots = {
                   customRender: 'titleName'
                 }
+                if(res.click1){
+                  this.columns[index].scopedSlots = {
+                    customRender: 'operationzr'
+                  }
+                }
                 if (res.click) {
                   // 工程接口人列表修改
                   this.columns[index].scopedSlots = {
@@ -499,14 +637,28 @@
         console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii')
       },
       getTableListReset() {
+        this.formInline = {}
         let params = {
           paramsManifestId: this.$route.query.id,
-          userTypes: this.currentPersonRole
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          // userTypes: this.currentPersonRole
         }
+        let url
         this.loading = true
         this.$emit('listReset', '')
         // todo
-        getAction(this.url.tableList, params).then((res) => {
+        if (this.$route.query.it === undefined) {
+          // 页面跳转
+          url = this.url.tableList
+          params.paramsManifestId = this.$route.query.id
+          params.userTypes = this.currentPersonRole
+        } else {
+          // 历史版本
+          url = 'params/collectManifestHistory/list'
+          params.paramsManifestId = this.$route.query.it
+        }
+        getAction(url, params).then((res) => {
           if (res.success) {
             let tt = []
             if (this.currentPersonRole !== 'dre') {
@@ -570,7 +722,8 @@
           pageSize: this.pageSize,
           userTypes: this.currentPersonRole || currentPersonRole,
           paramsManifestId: paramsManifestid,
-          ...this.formInline
+          ...this.formInline,
+          ...currentPersonRole
         }
         this.loading = true
         getAction(url, params).then((res) => {

jero-web/src/components/tableCollection/index1.vue

@@ -96,7 +96,7 @@
       </div>
     </a-modal>
     <!--  配置信息--->
-    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
+    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal">
       <div class="content-text">
         <div class="text-field">
           <span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -290,12 +290,16 @@
         this.$emit('handlePreservation')
         this.getTableList()
       },
+      hideModal(){
+        this.areaVisibleView = false
+      },
       // 查看配置详细信息
       onClickSee(val) {
+        console.log(val)
         let _this = this
         this.areaVisibleView = true
         axios({
-          url: `/jero-boot/params/config/getById?id=${val.db_field_name}`,
+          url: `/jero-boot/report/detail/getConfig?id=${val.db_field_name}`,
           method: 'get',
           transformRequest: [function(data) {
             let ret = ''

jero-web/src/config/router.config.js

@@ -342,6 +342,21 @@ export const constantRouterMap = [
     name: 'initiatingProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess')
   },
+  {
+    path: '/evaluationInitiationProcess',
+    name: 'evaluationInitiationProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/initiatingProcess')
+  },
+  {
+    path: '/evaluationResultsWhole',
+    name: 'evaluationResultsWhole',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/evaluationResultsWhole')
+  },
+  {
+    path: '/evaluationResultsClause',
+    name: 'evaluationResultsClause',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/evaluationResultsClause')
+  },
   // {
   //   path: '/ParameterItemCollection',
   //   name: 'ParameterItemCollection',
@@ -362,6 +377,11 @@ export const constantRouterMap = [
     name: 'taskListProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/taskListProcess/index')
   },
+  {
+    path: '/evaluationProcess',
+    name: 'evaluationProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/evaluationProcess/index')
+  },
   {
     path: '/handshakeProcess',
     name: 'handshakeProcess',

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -44,13 +44,13 @@
         />
       </div>
       <div>
-        <span class="text">对外意见归档:</span>
-        <div @click="clickButtonToUpload('opinionArchiveId')"
+        <span class="text">{{$t('filingExternalOpinions')}}:</span>
+        <div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
              v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
           <a-icon type="cloud-upload" />
           {{$t('clickUpload')}}
         </div>
-        <div @click="seeFileClick(formInline.opinionArchiveId)" class="operator-text">
+        <div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
           <a-icon type="eye" />
           {{$t('viewFile')}}
         </div>
@@ -92,6 +92,7 @@
             title: this.$t('relevantSections'),
             align: 'center',
             dataIndex: 'relatedSection',
+            ellipsis: true,
             width: 180
           },
           {
@@ -177,11 +178,13 @@
       //导出
       handleExport() {
         let query = {
+          pageSize:this.pageSize,
+          pageNo:this.pageNo,
           lawsOpinionGatherId: this.lawsOpinionGatherId,
           actiProcInstId: this.actiProcInstId
         }
         downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
-          this.$t('evaluationResults') + '.xls', query)
+          this.$t('evaluationResults') + '.zip', query)
       },
       getData(row) {
         this.visible = true
@@ -206,7 +209,9 @@
       getList() {
         let query = {
           lawsOpinionGatherId: this.lawsOpinionGatherId,
-          actiProcInstId: this.actiProcInstId
+          actiProcInstId: this.actiProcInstId,
+          pageSize:this.pageSize,
+          pageNo:this.pageNo
         }
         this.loading = true
         getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => {

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

@@ -260,9 +260,11 @@
         this.selectedRowKeys = value
         if (this.selectedRowKeys.length > 1) {
           this.selectedRowKeys.shift()
-          record.shift()
         }
-        this.selectedRowKeysRecord = record
+        this.selectedRowKeysRecord = record.filter(res=>{
+          return res.id == this.selectedRowKeys[0]
+        })
+        this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()

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

@@ -168,7 +168,7 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'technologyTerritory'
+            dataIndex: 'technologyTerritoryName'
           },
           {
             title: this.$t('collectResults'),

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -26,10 +26,10 @@
         <a-icon type="cloud-upload"/>
         {{$t('uploadMonthly')}}
       </div>
-      <div @click="BatchDeleteClick" class="operator-text">
-        <a-icon type="delete"/>
-        {{$t('BatchDelete')}}
-      </div>
+      <!--      <div @click="BatchDeleteClick" class="operator-text">-->
+      <!--        <a-icon type="delete"/>-->
+      <!--        {{$t('BatchDelete')}}-->
+      <!--      </div>-->
     </div>
     <div>
       <a-table
@@ -46,13 +46,21 @@
           <span slot="language" slot-scope="text,record">
                 <span>{{text == 1?$t('chinese'):$t('English')}}</span>
           </span>
+        <span slot="RegulationMonthlyName" slot-scope="text,record">
+             <a @click="preview(record)">{{text}}</a>
+          </span>
         <span slot="operation" slot-scope="text,record">
            <a class="text-operation"
+              v-if="record.createBy == userData.username"
               @click="withdraw(record)">
              {{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
            </a>
            <a class="text-operation"
+              v-if="record.createBy == userData.username && record.issueStatus == 2"
               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+           <a class="text-operation"
+              v-if="record.createBy == userData.username || record.issueStatus == 1"
+              @click="download(record)">{{$t('download')}}</a>
         </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
@@ -75,7 +83,9 @@
 <script>
   import eventBUs from '../../../../common/event'
   import managementAdd from './modules/managementAdd'
-  import { getAction, postAction } from '@/api/manage'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import { mapGetters } from 'vuex'
+  import { Base64 } from 'js-base64'
 
   export default {
     name: 'RegulationMonthlyManagement',
@@ -97,13 +107,16 @@
         pageSize: 10,
         pageNo: 1,
         queryParam: {},
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        userData: {},
         columns: [
           {
             title: this.$t('RegulationMonthlyName'),
             align: 'center',
             dataIndex: 'name',
             width: 190,
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'RegulationMonthlyName' }
           },
           {
             title: this.$t('monthlyLanguage'),
@@ -146,8 +159,10 @@
     },
     mounted() {
       this.getList()
+      this.userData = this.userInfo()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       searchQuery() {
         this.pageNo = 1
         this.getList()
@@ -191,6 +206,30 @@
           }
         })
       },
+      preview(item) {
+        let fileName = item.name
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix === '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          if (item.createBy == this.userInfo().username){
+            downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+          }else{
+            this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          }
+        }
+      },
+      download(item) {
+        downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+      },
       uploadMonthlyClick() {
         this.$refs.managementAddRef.add()
       },

jero-web/src/views/businessSupport/regulationReport/components/modules/addModel.vue

@@ -207,7 +207,7 @@
           queryConditionVOList: JSON.stringify(queryConditionVOList)
         }
         this.loading = true
-        postAction('/dummy/dummyInventoryInfoEO/queryPageDummy', query).then((res) => {
+        postAction('/report/lawsMonthlyReportWriteEO/queryPageDocument', query).then((res) => {
           if (res.success) {
             this.dataList = res.result.records || []
             this.total = res.result.total

jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue

@@ -135,20 +135,20 @@
       </a-col>
     </a-row>
     <a-row :gutter="24">
-      <a-col :span="12">
-        <div class="box-title-text">
-          <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('releaseDate')">{{$t('releaseDate')}}</span>
-          </div>
-          <a-form-model-item class="itemModel" prop="issueTime">
-            <a-input class="box-input"
-                     :disabled="disabled"
-                     v-model="formInline.issueTime"
-                     :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>
-          </a-form-model-item>
-        </div>
-      </a-col>
+      <!--      <a-col :span="12">-->
+      <!--        <div class="box-title-text">-->
+      <!--          <div class="title-text">-->
+      <!--                <span class="title-text-text"-->
+      <!--                      :title="$t('releaseDate')">{{$t('releaseDate')}}</span>-->
+      <!--          </div>-->
+      <!--          <a-form-model-item class="itemModel" prop="issueTime">-->
+      <!--            <a-input class="box-input"-->
+      <!--                     :disabled="disabled"-->
+      <!--                     v-model="formInline.issueTime"-->
+      <!--                     :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>-->
+      <!--          </a-form-model-item>-->
+      <!--        </div>-->
+      <!--      </a-col>-->
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
@@ -163,8 +163,6 @@
           </a-form-model-item>
         </div>
       </a-col>
-    </a-row>
-    <a-row :gutter="24">
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
@@ -180,6 +178,9 @@
         </div>
       </a-col>
     </a-row>
+    <!--    <a-row :gutter="24">-->
+
+    <!--    </a-row>-->
     <a-row :gutter="24">
       <a-col :span="24">
         <div class="box-title-text">
@@ -391,8 +392,21 @@
     methods: {
       ...mapGetters(['userInfo']),
       getStandData(value) {
+        console.log(value)
         this.formInline.titleCn = value.serial_number + ' ' + value.title
         this.formInline.titleEn = value.serial_number + ' ' + value.title_en
+        this.formInline.technologyTerritory = value.technology_territory_dict
+        this.formInline.applyCar = value.shi4_yong4_che1_xing2_dict
+        this.formInline.applyScope = value.shi4_yong4_fan4_wei2_dict
+        this.formInline.state = value.state_dict
+        this.formInline.newCarImplementTime = value.xin1_che1_xing2_shi2_shi1_ri4_qi1
+        this.formInline.productionCarImplementTime = value.implement_time
+        var curPath = window.document.location.href
+        var pathname = window.document.location.pathname
+        var pos = curPath.indexOf(pathname)
+        var localhostPath = curPath.substring(0, pos)
+        this.formInline.link = localhostPath + '/docManage/library/detail?id=' + value.id
+        this.formInline = {...this.formInline}
       },
       getSysCategoryTree() {
         getAction('/sys/category/getSysCategoryTree', {}).then((res) => {

jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue

@@ -50,6 +50,7 @@
                     v-model="formInline.memoriesChapter"
                     :maxTagCount="1"
                     :disabled="disabled"
+                    @change="changeTree"
                     :getPopupContainer="triggerNode=> triggerNode.parentNode"
                     class="box-input"
                     style="width: 100%"
@@ -187,6 +188,9 @@
         getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => {
           if (res.success) {
             this.chapterContentsList = res.result || []
+            this.chapterContentsList.forEach(val => {
+              val.disabled = true
+            })
           } else {
             this.chapterContentsList = []
           }
@@ -245,6 +249,13 @@
       handleCancel() {
         this.visible = false
       },
+      changeTree(value, node, extra) {
+        if (value.length > 1) {
+          value.shift()
+        }
+        this.formInline.memoriesChapter = value
+        this.formInline = { ...this.formInline }
+      },
       handleSubmit() {
         this.$refs.ruleForm.validate(valid => {
           if (valid) {

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -28,9 +28,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="moveUpClick(record)">{{$t('moveUp')}}</a>
-           <a class="text-operation" @click="moveDownClick(record)">{{$t('moveDown')}}</a>
+        <span slot="operation" slot-scope="text,record,index">
+           <a class="text-operation" @click="moveUpClick(record,index)">{{$t('moveUp')}}</a>
+           <a class="text-operation" @click="moveDownClick(record,index)">{{$t('moveDown')}}</a>
            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
@@ -69,6 +69,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        sortList: [],
         total: 0,
         columns: [
           {
@@ -146,11 +147,49 @@
           }
         })
       },
-      moveUpClick() {
-
+      moveUpClick(row, index) {
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != 0) {
+            this.sortList.push(content[0].children[index - 1])
+          }
+        } else {
+          if (index != 0) {
+            this.sortList.push(this.dataSource[index - 1])
+          }
+        }
+        this.move()
       },
-      moveDownClick() {
-
+      moveDownClick(row, index) {
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != (content[0].children.length - 1)) {
+            this.sortList.push(content[0].children[index + 1])
+          }
+        } else {
+          if (index != (this.dataSource.length - 1)) {
+            this.sortList.push(this.dataSource[index + 1])
+          }
+        }
+        this.move()
+      },
+      move() {
+        postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       },
       deleteLib(val) {
         let _this = this
@@ -185,6 +224,7 @@
     text-align: right;
     margin-bottom: 16px;
   }
+
   .text-operation {
     margin-right: 8px;
   }

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

@@ -0,0 +1,205 @@
+<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')}}
+      </div>
+      <div class="operator-text">
+        <ImportFile :url="url" :isTrue="true" :accept="'.xls'"
+                    @getList="getPersonnelList"/>
+      </div>
+    </div>
+
+    <a-table
+      :columns="columns"
+      :scroll="{x: '100%'}"
+      :data-source="dataList"
+      :pagination="false"
+      :loading="loading">
+      <div slot="clauseContent" slot-scope="text,result">
+        <a-tooltip placement="topLeft">
+          <template slot="title">
+            <span v-html="text"></span>
+          </template>
+          <div class="clauseContent-text" v-html="text"></div>
+        </a-tooltip>
+      </div>
+      <span slot="evaluationMethod" slot-scope="text,result">
+         <a-tree-select
+           tree-node-filter-prop="title"
+           v-model="result.evaluationMethods"
+           :maxTagCount="1"
+           :getPopupContainer="triggerNode=> triggerNode.parentNode"
+           class="box-input"
+           style="width: 80%;"
+           :tree-data="gatherResultList"
+           tree-checkable
+           :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+         />
+      </span>
+      <span slot="Assessor" slot-scope="text,result,index">
+          <PersonnelSelection class="box-input"
+                              :personneQuery="result"
+                              :query="{db_field_name:'evaluatorIds',db_field_txt:$t('Assessor'),subscript:index}"
+                              :isInput="true"
+                              @change="PersonnelSelectionChange"
+                              v-model="result.evaluatorIdsName"/>
+      </span>
+      <span slot="operation" slot-scope="text,result">
+            <a @click="deleteData(result)">{{$t('delete')}}</a>
+      </span>
+    </a-table>
+  </div>
+</template>
+
+<script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import ImportFile from '@/components/ImportFile/index'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+
+  export default {
+    name: 'TermInformation',
+    components: {
+      PersonnelSelection,
+      ImportFile
+    },
+    props: ['gatherResultList'],
+    data() {
+      return {
+        url: {
+          importZipUrl: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/importItemExcel'
+        },
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'itemNum',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'itemName',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'itemContent',
+            align: 'center',
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethods',
+            align: 'center',
+            scopedSlots: { customRender: 'evaluationMethod' }
+          },
+          {
+            title: this.$t('Assessor'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            scopedSlots: { customRender: 'Assessor' }
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            width: 100,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        dataList: [],
+        ImportFileData: [],
+        dataListData: [],
+        loading: false
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      deleteData(item) {
+        this.dataList = this.dataList.filter(res => {
+          return res.itemId != item.itemId
+        })
+        this.dataListData = this.dataListData.filter(res => {
+          return res.itemId != item.itemId
+        })
+        this.ImportFileData = this.ImportFileData.filter(res => {
+          return res.itemId != item.itemId
+        })
+        this.$emit('TermInformationRefForm', item)
+      },
+      PersonnelSelectionChange(value, id, index) {
+        this.dataList[index][value] = id
+        this.dataList = [...this.dataList]
+      },
+      getData(value) {
+        this.dataListData = []
+        if (value && value.length > 0) {
+          value.forEach(res => {
+            this.dataListData.push({
+              itemId: res.id,
+              itemNum: res.items_num,
+              itemName: res.items_name,
+              itemContent: res.iterms_conditions
+            })
+          })
+        }
+        this.dataList = this.ImportFileData.concat(this.dataListData)
+        this.dataList = [...this.dataList]
+      },
+      getPersonnelList(res) {
+        this.ImportFileData = this.ImportFileData.concat(res)
+        this.dataList = this.dataListData.concat(this.ImportFileData)
+        this.dataList = [...this.dataList]
+      },
+      getUUID() {
+        var str = []
+        var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
+        for (var i = 0; i < 36; i++) {
+          str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
+        }
+        str[0] = str[8] = str[13] = str[18] = str[23] = '-'
+        return str.join('')
+      },
+      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
+          }
+        }
+        callback && callback(dataList)
+      },
+      handleModule() {
+        downloadFile('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/exportItemTemplate', this.$t('clauseEvaluation') + '.xls', {})
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+  }
+
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+</style>

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

@@ -0,0 +1,440 @@
+<template>
+  <div class="doc-detail">
+    <div class="doc-detail-wrap">
+      <div class="doc-detail-header" style="position: fixed;top: 0">
+        <div class="doc-detail-title">
+          <!--          <span style="line-height: 66px;display: inline-block;float: left">-->
+          <!--            <a-icon type="home" style="margin-right: 6px;"/>-->
+          <!--          </span>-->
+          {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
+        </div>
+      </div>
+      <div style="padding-top: 68px;background: #fff">
+        <div class="detail-content">
+          <div class="content-box">
+            <div class="header-text">
+              {{$t('processBackground')}}
+              <a-button class="box-button-top" type="primary" @click="CurrentStandard">
+                {{$t('initiateProcessForCurrentStandard')}}
+              </a-button>
+            </div>
+            <div class="processBackground-text">
+              {{$route.query.processBackground}}
+            </div>
+            <div class="header-text">
+              {{$t('engineerFeedbackResults')}}
+            </div>
+            <a-card :bordered="false" class="box-clause">
+              <div class="table-page-search-wrapper">
+                <a-form layout="inline" @keyup.enter.native="searchQuery">
+                  <a-row :gutter="24">
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('Assessor')">
+                          <span>{{$t('Assessor')}}</span>
+                        </div>
+                        <PersonnelSelection class="box-input"
+                                            :personneQuery="queryParam"
+                                            :query="{db_field_name:'evaluators',db_field_txt:$t('Assessor')}"
+                                            :isInput="true"
+                                            @change="PersonnelSelectionChange"
+                                            v-model="queryParam.evaluatorsName"/>
+                      </div>
+                    </a-col>
+                    <a-col :md="6" :sm="8">
+                      <div class="box-title-text">
+                        <div class="title-text" :title="$t('complianceResults')">
+                          <span>{{$t('complianceResults')}}</span>
+                        </div>
+                        <a-select :placeholder="$t('PleaseSelect')+$t('complianceResults')"
+                                  class="box-input"
+                                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                  v-model="queryParam.complianceResult">
+                          <a-select-option v-for="(item, key) in complianceResultsList"
+                                           :key="key"
+                                           :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title="item.name ">
+                           {{ item.name }}
+                     </span>
+                          </a-select-option>
+                        </a-select>
+                      </div>
+                    </a-col>
+                    <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+                </span>
+                  </a-row>
+                </a-form>
+              </div>
+              <div class="table-operator">
+                <div @click="fileExportClick" class="operator-text">
+                  <a-icon type="export" :rotate="-90"/>
+                  {{$t('fileExport')}}
+                </div>
+              </div>
+              <div>
+                <a-table
+                  ref="table"
+                  size="middle"
+                  :loading="loading"
+                  :pagination="false"
+                  :scroll="{x: '100%',y:'calc(100vh - 100px)'}"
+                  rowKey="id"
+                  :data-source="dataSource"
+                  :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+                  :columns="columns"
+                >
+                  <div slot="clauseContent" slot-scope="text,result">
+                    <a-tooltip placement="topLeft">
+                      <template slot="title">
+                        <span v-html="text"></span>
+                      </template>
+                      <div class="clauseContent-text" v-html="text"></div>
+                    </a-tooltip>
+                  </div>
+                  <span slot="accessoryFile" slot-scope="text,result">
+                      <a v-if="text" @click="accessoryFileClick(text)">
+                          {{ $t('viewFile') }}
+                       </a>
+                    <span v-else>--</span>
+                     </span>
+                </a-table>
+              </div>
+            </a-card>
+          </div>
+        </div>
+      </div>
+    </div>
+    <viewFileModel ref="viewFileModelRef"/>
+  </div>
+</template>
+
+<script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import viewFileModel from '@/components/viewFileModel/index'
+
+  export default {
+    name: 'evaluationResultsClause',
+    components: {
+      PersonnelSelection,
+      viewFileModel
+    },
+    data() {
+      return {
+        queryParam: {},
+        dataSource: [],
+        selectedRowKeys: [],
+        complianceResultsList: [
+          {
+            name: this.$t('accord'),
+            value: 'Compliance'
+          },
+          {
+            name: this.$t('nonConformity'),
+            value: 'Non-Compliance'
+          }
+        ],
+        loading: false,
+        url: {
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list',
+          exportData: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/exportZip'
+        },
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'itemNum',
+            align: 'center',
+            ellipsis: true,
+            width: 160
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'itemName',
+            align: 'center',
+            ellipsis: true,
+            width: 160
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'itemContent',
+            align: 'center',
+            width: 260,
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('Assessor'),
+            dataIndex: 'Assessor',
+            align: 'center',
+            ellipsis: true,
+            width: 160
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethodsName',
+            align: 'center',
+            ellipsis: true,
+            width: 160
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'technicalFileName',
+            align: 'center',
+            ellipsis: true,
+            width: 260
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'section',
+            align: 'center',
+            ellipsis: true,
+            width: 260
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResultName',
+            align: 'center',
+            ellipsis: true,
+            width: 160
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            ellipsis: true,
+            width: 260
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'accessoryFile',
+            align: 'center',
+            ellipsis: true,
+            width: 160,
+            scopedSlots: { customRender: 'accessoryFile' }
+          },
+          {
+            title: this.$t('feedbackTime'),
+            dataIndex: 'createTime',
+            align: 'center',
+            ellipsis: true,
+            width: 160
+          }
+        ]
+      }
+    },
+    mounted() {
+      document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults')
+      this.getList()
+    },
+    methods: {
+      CurrentStandard() {
+        let query = {
+          firstInitiation: '2',
+          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',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      searchQuery() {
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.getList()
+      },
+      getList() {
+        let query = {
+          lawsTechnologyEvaluationId: this.$route.query.id,
+          ...this.queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result || []
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
+        })
+      },
+      fileExportClick() {
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ...this.queryParam,
+          ids: selectedRowKeys.join(','),
+          lawsTechnologyEvaluationId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') + '.zip',
+          query, this.Deselect)
+      },
+      Deselect() {
+        this.selectedRowKeys = []
+      },
+      PersonnelSelectionChange(value, id) {
+        this.queryParam[value] = id
+        this.queryParam = { ...this.queryParam }
+      },
+      accessoryFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .doc-detail-wrap {
+      .doc-detail-header {
+        width: 100%;
+        height: 68px;
+        line-height: 68px;
+        padding: 0 0 0 32px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px #eff1f3 solid;
+        z-index: 1000;
+        background: #fff;
+
+        .doc-detail-title {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          font-size: 20px;
+          font-weight: 400;
+          color: #040B29;
+          line-height: 68px;
+        }
+
+        .doc-detail-right {
+          width: 800px;
+          line-height: 68px;
+          display: flex;
+
+          .doc-detail-btn {
+            margin-left: 10px;
+          }
+        }
+      }
+
+      .content-box {
+        padding: 0 32px;
+        box-sizing: border-box;
+      }
+
+      .header-text {
+        font-size: 16px;
+        font-weight: 400;
+        height: 80px;
+        color: #000F16;
+        line-height: 80px;
+      }
+
+      .processBackground-text {
+        font-size: 16px;
+        color: #000F16;
+      }
+    }
+  }
+
+  .box-button-top {
+    float: right;
+    margin-top: 28px;
+    height: 38px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 70px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+</style>
+<style>
+  .box-clause .ant-card-body {
+    padding: 0;
+  }
+
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+</style>

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

@@ -0,0 +1,288 @@
+<template>
+  <div class="doc-detail">
+    <div class="doc-detail-wrap">
+      <div class="doc-detail-header" style="position: fixed;top: 0">
+        <div class="doc-detail-title">
+          <!--          <span style="line-height: 66px;display: inline-block;float: left">-->
+          <!--            <a-icon type="home" style="margin-right: 6px;"/>-->
+          <!--          </span>-->
+          {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
+        </div>
+      </div>
+      <div style="padding-top: 68px;background: #fff">
+        <div class="detail-content">
+          <div class="content-box">
+            <div class="header-text">
+              {{$t('processBackground')}}
+              <a-button class="box-button-top" type="primary" @click="CurrentStandard">
+                {{$t('initiateProcessForCurrentStandard')}}
+              </a-button>
+            </div>
+            <div class="processBackground-text">
+              {{$route.query.processBackground}}
+            </div>
+            <!--            <div class="header-text">-->
+            <!--              {{$t('engineerFeedbackResults')}}-->
+            <!--            </div>-->
+            <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="(item,index) in dataSource">
+              <div class="table-operator">
+                <div class="operator-text" style="float: left;font-size: 16px">
+                  {{$t('engineer')+item.createBy+$t('feedbackResults')}}
+                </div>
+                <div @click="fileExportClick" v-if="index == 0" class="operator-text">
+                  <a-icon type="export" :rotate="-90"/>
+                  {{$t('fileExport')}}
+                </div>
+              </div>
+              <div>
+                <a-table
+                  ref="table"
+                  size="middle"
+                  :loading="loading"
+                  :pagination="false"
+                  :scroll="{x: '100%',y:350}"
+                  :data-source="item.lawsTechnologyEvaluationResultEOList"
+                  :columns="columns"
+                >
+                   <span slot="accessoryFile" slot-scope="text,result">
+                      <a v-if="text" @click="accessoryFileClick(text)">
+                          {{ $t('viewFile') }}
+                       </a>
+                    <span v-else>--</span>
+                     </span>
+                </a-table>
+              </div>
+              <div class="text-results">
+                {{$t('complianceResults')}}：{{item.complianceResultName}}
+              </div>
+            </a-card>
+          </div>
+        </div>
+      </div>
+    </div>
+    <viewFileModel ref="viewFileModelRef"/>
+  </div>
+</template>
+
+<script>
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import viewFileModel from '@/components/viewFileModel/index'
+
+  export default {
+    name: 'evaluationResultsWhole',
+    components: {
+      PersonnelSelection,
+      viewFileModel
+    },
+    data() {
+      return {
+        queryParam: {},
+        dataSource: [],
+        url: {
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
+          exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip'
+        },
+        selectedRowKeys: [],
+        loading: false,
+
+        columns: [
+          {
+            title: this.$t('relevantSections'),
+            dataIndex: 'relatedSection',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('problemDescription'),
+            dataIndex: 'issueOrSuggest',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'accessoryFile',
+            align: 'center',
+            ellipsis: true,
+            scopedSlots: { customRender: 'accessoryFile' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      document.title = this.$route.query.serialNumber +' '+this.$t('regulatoryTechnicalEvaluationResults')
+      this.getList()
+    },
+    methods: {
+      CurrentStandard() {
+        let query = {
+          firstInitiation: '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',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      onSelectChange(value) {
+
+      },
+      fileExportClick() {
+        let query = {
+          lawsTechnologyEvaluationId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') + '.zip', query)
+      },
+      getList() {
+        let query = {
+          lawsTechnologyEvaluationId: this.$route.query.id
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result || []
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.loading = false
+          }
+        })
+      },
+      accessoryFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .doc-detail-wrap {
+      .doc-detail-header {
+        width: 100%;
+        height: 68px;
+        z-index: 1000;
+        line-height: 68px;
+        padding: 0 0 0 32px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px #eff1f3 solid;
+        background: #fff;
+
+        .doc-detail-title {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          font-size: 20px;
+          font-weight: 400;
+          color: #040B29;
+          line-height: 68px;
+        }
+
+        .doc-detail-right {
+          width: 800px;
+          line-height: 68px;
+          display: flex;
+
+          .doc-detail-btn {
+            margin-left: 10px;
+          }
+        }
+      }
+
+      .content-box {
+        padding: 0 32px;
+        box-sizing: border-box;
+      }
+
+      .header-text {
+        font-size: 16px;
+        font-weight: 400;
+        height: 80px;
+        color: #000F16;
+        line-height: 80px;
+      }
+
+      .processBackground-text {
+        font-size: 16px;
+        color: #000F16;
+      }
+    }
+  }
+
+  .box-button-top {
+    float: right;
+    margin-top: 28px;
+    height: 38px;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 70px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .text-results {
+    font-size: 14px;
+    margin-top: 10px;
+  }
+</style>
+<style>
+  .box-clause .ant-card-body {
+    padding: 0;
+  }
+</style>

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

@@ -0,0 +1,688 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 20px">
+        <div class="table-page-search-wrapper" v-if="whetherDisplay">
+          <search ref="searchRef"
+                  :flag="'1'"
+                  :url="url"/>
+        </div>
+        <div v-if="whetherDisplay">
+          <a-table
+            ref="table"
+            size="middle"
+            :loading="loading"
+            :pagination="false"
+            :scroll="{x: '100%'}"
+            rowKey="id"
+            :data-source="dataSource"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange ,columnTitle:' '}"
+            :columns="columns"
+          >
+          </a-table>
+          <div class="page" v-if="dataSource && dataSource.length > 0">
+            <a-pagination
+              :show-total="total => $t('total')+` ${total} `+$t('strip')"
+              show-quick-jumper
+              :page-size.sync="pageSize"
+              :total="total"
+              :current="pageNo"
+              @change="pageOnChange"
+              @showSizeChange="SizeChange"
+            />
+          </div>
+        </div>
+
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24" style="margin-bottom: 10px">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('selectedStandard')">{{$t('selectedStandard')}}</span>
+                </div>
+                <div class="title-text-content"
+                     :class="{'title-text-content-one':!isTrue}">
+                  {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}}
+                </div>
+                <div class="title-text-right" v-if="isTrue">
+                  <span @click="standardDecompositionDocumentClick">
+                    {{$t('standardDecompositionDocument')}}
+                  </span>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="endTime">
+                  <a-date-picker class="box-input"
+                                 :placeholder="$t('PleaseSelect')+$t('closingDate')"
+                                 @change="dateChange('endTime')"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 format="YYYY-MM-DD"
+                                 v-model="formInline['endTime']"
+                                 style="width: 100%"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('uploadRelevantMaterials')">{{$t('uploadRelevantMaterials')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessory_id">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('relatedDataFileId')">
+                    {{ (formInline.relatedDataFileId === 'null' || formInline.relatedDataFileId === '' ||
+                    formInline.relatedDataFileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </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('processBackground')">{{$t('processBackground')}}</span>
+                </div>
+                <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>
+            </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('remarks')">{{$t('remarks')}}</span>
+                </div>
+                <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>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24" v-if="!isTrue">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="gatherResult">
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="formInline.evaluationMethods"
+                    :maxTagCount="1"
+                    @change="evaluationMethodsChange"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="gatherResultList"
+                    tree-checkable
+                    :placeholder="$t('PleaseSelect')+$t('evaluationMethod')"
+                  />
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('Assessor')">{{$t('Assessor')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="evaluatorsName">
+                  <PersonnelSelection class="box-input"
+                                      :personneQuery="formInline"
+                                      :query="{db_field_name:'evaluators',db_field_txt:$t('Assessor')}"
+                                      :isInput="true"
+                                      @change="PersonnelSelectionChange"
+                                      v-model="formInline.evaluatorsName"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+
+        <TermInformation
+          ref="TermInformationRef"
+          @TermInformationRefForm="TermInformationRefForm"
+          :gatherResultList="gatherResultList"
+          v-if="isTrue"/>
+
+        <footerProcess
+          @submit="submit"
+          :isSubmit="true"
+        />
+      </div>
+    </div>
+    <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
+    <standardDecompositionSheet ref="standardDecompositionSheetRef"
+                                @standardDecompositionSheetForm="standardDecompositionSheetForm"/>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../../processCenter/components/headerProcess'
+  import search from '@/components/search/index'
+  import uploadFile from '@/components/uploadFile/file'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
+  import footerProcess from '../../../processCenter/components/footerProcess'
+  import standardDecompositionSheet from './standardDecompositionSheet'
+  import TermInformation from './TermInformation'
+  import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
+  import eventBUs from '../../../../common/event'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'evaluationInitiationProcess',
+    components: {
+      headerProcess,
+      search,
+      uploadFile,
+      footerProcess,
+      PersonnelSelection,
+      standardDecompositionSheet,
+      TermInformation
+    },
+    data() {
+      return {
+        title: this.$t('regulatoryEngineer') + this.$t('initiatingProcess'),
+        //url传参严格按照当前命名
+        url: {
+          seachList: 'document/bussDocumentLibraryEO/queryCondition',   //搜索字段
+          addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy',
+          addModelListOne: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/queryPageDummy'
+        },
+        loading: false,
+        JLoading: false,
+        isTrue: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        formInline: {},
+        standardDecomposition: [],
+        gatherResultList: [],
+        rules: {
+          endTime: [
+            {
+              required: true,
+              message: this.$t('closingDate') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          evaluatorsName: [
+            {
+              required: true,
+              message: this.$t('Assessor') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        searchParmes: {},
+        selectedRowKeysRecord: [],
+        whetherDisplay: false,
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serial_number',
+            width: 170,
+            scopedSlots: { customRender: 'serial_number' }
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170,
+            scopedSlots: { customRender: 'titleName' }
+          },
+          {
+            title: this.$t('status'),
+            align: 'center',
+            width: 140,
+            ellipsis: true,
+            dataIndex: 'state'
+          },
+          {
+            title: this.$t('zoneOfApplication'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'region'
+          },
+          {
+            title: this.$t('technicalField'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'technology_territory'
+          },
+          {
+            title: this.$t('correspondingStandard'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'corresponding_standard'
+          }
+        ]
+      }
+    },
+    mounted() {
+      document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
+      this.getEvaluationMethodTree()
+      if (this.$route.query.whetherTobring == '1') {
+        this.isTrue = true
+      } else {
+        this.isTrue = false
+      }
+      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 => {
+          if (search[res] instanceof Array) {
+            search[res] = search[res].join(',')
+          }
+        })
+        this.pageNo = 1
+        this.searchParmes = search
+        this.getList()
+      })
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getEvaluationMethodTree() {
+        getAction('/sys/category/getEvaluationMethodTree').then((res) => {
+          if (res.success) {
+            this.gatherResultList = res.result
+          } else {
+            this.gatherResultList = []
+          }
+        })
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        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,
+          pageSize: this.pageSize,
+          ...this.searchParmes
+        }
+        this.loading = true
+        let url = ''
+        if (this.$route.query.whetherTobring == '1') {
+          url = this.url.addModelListOne
+        } else {
+          url = this.url.addModelList
+        }
+        postAction(url, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataSource = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value, record) {
+        this.selectedRowKeys = value
+        this.selectedRowKeysRecord = []
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.shift()
+        }
+        let content = record.filter(res => {
+          return res.id == this.selectedRowKeys[0]
+        })
+        if (content && content.length > 0) {
+          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
+      },
+      standardDecompositionDocumentClick() {
+        if (this.standardDecomposition && this.standardDecomposition.length > 0) {
+          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])))
+        } else {
+          this.$message.warning(this.$t('pleaseSelectStandardFirst'))
+        }
+      },
+      standardDecompositionSheetForm(value) {
+        this.$refs.TermInformationRef.getData(JSON.parse(JSON.stringify(value)))
+      },
+      TermInformationRefForm(value) {
+        this.$refs.standardDecompositionSheetRef.getRowList(JSON.parse(JSON.stringify(value)))
+      },
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      },
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
+      evaluationMethodsChange(key, name) {
+        this.formInline.evaluationMethods = key
+        this.formInline.evaluationMethodsName = []
+        this.formInline.evaluationMethodsName = name
+      },
+      dateChange(item) {
+        this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : ''
+      },
+      getUUID() {
+        var str = []
+        var Chars = '0123456789abcdefghijklmnopqrstuvwxyz'
+        for (var i = 0; i < 36; i++) {
+          str[i] = Chars.substr(Math.floor(Math.random() * 16), 1)
+        }
+        str[0] = str[8] = str[13] = str[18] = str[23] = '-'
+        return str.join('')
+      },
+      submit(startTime) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            if (this.selectedRowKeysRecord && this.selectedRowKeysRecord.length == 0) {
+              this.$message.warning(this.$t('pleaseSelectStandard'))
+            } else {
+              if (this.isTrue) {
+                this.$refs.TermInformationRef.submitData((dataList) => {
+                  this.submitData(startTime, dataList)
+                })
+              } else {
+                this.submitData(startTime)
+              }
+            }
+          }
+        })
+      },
+      submitData(startTime, dataList) {
+        this.JLoading = true
+        let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
+        if (this.isTrue) {
+          value.evaluationType = 'Item evaluation'
+        } else {
+          value.evaluationType = 'Feedback evaluation'
+        }
+        value.startTime = startTime
+        value.flowStatus = 'Underway'
+        value.taskAffirmDueDate = value.endTime
+        if (!value.lawsTechnologyEvaluationId) {
+          value.lawsTechnologyEvaluationId = this.getUUID()
+        }
+        value.regulationOwnerId = this.userInfo().id
+        value.regulationOwnerName = this.userInfo().username
+        Object.keys(value).forEach(res => {
+          if (value[res] && value[res] instanceof Array) {
+            value[res] = value[res].join(',')
+          }
+          if (value[res] && value[res] instanceof String) {
+            value[res] = value[res].replace(/\"/g, '“')
+            value[res] = value[res].replace(/\'/g, '‘')
+          }
+        })
+        this.startProcess(value, dataList)
+      },
+      startProcess(value, dataList) {
+        let query = {}
+        if (this.isTrue) {
+          query = {
+            type: 6,
+            ...value,
+            firstInitiation: this.$route.query.firstInitiation,
+            msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
+          }
+        } else {
+          query = {
+            type: 6,
+            ...value,
+            firstInitiation: this.$route.query.firstInitiation,
+            msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
+          }
+        }
+        postAction('/workFlow/startProcess', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.JLoading = false
+            this.$router.push({
+              path: '/technologyAssessment'
+            })
+            // this.completeTask(value, res.result)
+          } else {
+            this.JLoading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
+      completeTask(value, taskId) {
+        let query = {
+          userid: this.userInfo().id,
+          taskId: taskId,
+          json: JSON.stringify(value).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.JLoading = false
+            this.$router.push({
+              path: '/technologyAssessment'
+            })
+          } else {
+            this.JLoading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      }
+    }
+  }
+</script>
+<style>
+  .ant-input-disabled {
+    color: rgba(0, 0, 0, 0.65) !important;
+  }
+</style>
+<style scoped>
+  .detail-box {
+    padding: 67px 0 0 0;
+    background: #ffffff;
+    height: 100%;
+    overflow: auto;
+  }
+
+  #examineBox {
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    position: relative;
+    height: 100%;
+    overflow-y: auto;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    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: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .formAdd {
+    margin-top: 20px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .title-text-content {
+    display: inline-block;
+    width: calc(100% - 334px);
+    text-align: center;
+    border: 1px solid #d9d9d9;
+    line-height: 38px;
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .title-text-right {
+    width: 200px;
+    text-align: center;
+    border: 1px solid #d9d9d9;
+    line-height: 38px;
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    border-left: none;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #21c9cc;
+    cursor: pointer;
+  }
+
+  .title-text-content-one {
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    width: calc(100% - 128px);
+  }
+</style>

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

@@ -0,0 +1,141 @@
+<template>
+  <a-modal
+    :title="$t('circulationHistory')"
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    @cancel="visible = false"
+  >
+    <template slot="footer">
+      <a-button key="back" @click="visible = false">
+        {{$t('cancel')}}
+      </a-button>
+    </template>
+    <a-table
+      class="table"
+      :columns="columns"
+      :pagination="false"
+      :scroll="{x:700,y: 400}"
+      :data-source="dataSource"
+      :loading="loading"
+    >
+        <span slot="fileOperation" slot-scope="record">
+           <a class="text" @click="preview(record)">
+             {{$t('See')}}
+          </a>
+        </span>
+    </a-table>
+    <div class="page" v-if="dataSource && dataSource.length > 0">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+  </a-modal>
+</template>
+
+<script>
+  import { getAction, putAction, downloadFile } from '@/api/manage'
+
+  export default {
+    name: 'processInformation',
+    data() {
+      return {
+        dataSource: [],
+        loading: false,
+        visible: false,
+        pageSize: 10,
+        total: 0,
+        pageNo: 1,
+        lawsTechnologyEvaluationId: '',
+        columns: [
+          {
+            title: this.$t('processNumber'),
+            dataIndex: 'prcNum',
+            align: 'center',
+            width: 160,
+            ellipsis: true
+          },
+          {
+            title: this.$t('processName'),
+            dataIndex: 'prcName',
+            align: 'center',
+            width: 160,
+            ellipsis: true
+          },
+          {
+            title: this.$t('Assessor'),
+            dataIndex: 'evaluatorName',
+            align: 'center',
+            width: 160,
+            ellipsis: true
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            width: 130,
+            scopedSlots: { customRender: 'fileOperation' }
+          }
+        ]
+      }
+    },
+    methods: {
+      preview(row) {
+        let newUrl = this.$router.resolve({
+          path: '/processDetails',
+          query: {
+            prcNum: row.prcNum,
+            prcType: 6,
+            prcId: row.actiProcInstId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getData(row) {
+        this.visible = true
+        this.lawsTechnologyEvaluationId = row.id
+        this.getList()
+      },
+      getList() {
+        let query = {
+          lawsTechnologyEvaluationId: this.lawsTechnologyEvaluationId,
+          pageSize: this.pageSize,
+          pageNo: this.pageNo
+        }
+        this.loading = true
+        getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationFlowDetailEO/page', query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+            this.dataSource = []
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+</style>

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

@@ -0,0 +1,313 @@
+<template>
+  <a-drawer
+    :title="$t('StandardBreakdown')"
+    :maskClosable="false"
+    :width="1200"
+    placement="right"
+    :closable="true"
+    @close="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <div style="margin-bottom: 60px">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('standardDocuments')">
+                  <span>{{$t('standardDocuments')}}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('standardDocuments')"
+                          class="box-input"
+                          @change="standardDocumentsChange"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="queryParam.info_id">
+                  <a-select-option v-for="(item, key) in sarFileSplitInfoList"
+                                   :key="key"
+                                   :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.fileName ">
+                           {{ item.fileName }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+            <!--            <span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">-->
+            <!--               <a-col :md="12" :sm="24">-->
+            <!--                   <div @click="handleModule" class="operator-text">-->
+            <!--                       <a-icon type="download"/>-->
+            <!--                      {{$t('templateDownload')}}-->
+            <!--                    </div>-->
+            <!--                    <div class="operator-text">-->
+            <!--                      <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"-->
+            <!--                                  @getList="getPersonnelList"/>-->
+            <!--                     </div>-->
+            <!--                    </a-col>-->
+            <!--            </span>-->
+          </a-row>
+        </a-form>
+      </div>
+      <a-table
+        :columns="columns"
+        rowKey="id"
+        :scroll="{x: '100%'}"
+        :data-source="dataList"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :loading="loading">
+        <div slot="clauseContent" slot-scope="text,result">
+          <a-tooltip placement="topLeft">
+            <template slot="title">
+              <span v-html="text"></span>
+            </template>
+            <div class="clauseContent-text" v-html="text"></div>
+          </a-tooltip>
+        </div>
+      </a-table>
+      <div class="page" v-if="dataList.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+`${total}`+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="onChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+
+    <div class="drawer-bootom-button">
+      <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import ImportFile from '@/components/ImportFile/index'
+
+  export default {
+    name: 'standardDecompositionSheet',
+    components: {
+      ImportFile
+    },
+    data() {
+      return {
+        visible: false,
+        queryParam: {},
+        confirmLoading: false,
+        selectedRowKeys: [],
+        sarFileSplitInfoList: [],
+        url: {
+          list: '/split/sarFileSplitItems/getSplitItemsByPage'
+        },
+        columns: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('technicalField'),
+            dataIndex: 'technology_territory',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('informationCategory'),
+            dataIndex: 'information_category',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          }
+        ],
+        dataList: [],
+        content: [],
+        loading: false,
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        standData: {},
+        fieldList: [],
+        queryConditionVOList: [],
+        info_id: '',
+        selectedRowKeysData: []
+      }
+    },
+    methods: {
+      handleModule() {
+
+      },
+      standardDocumentsChange(value) {
+        this.replacePage()
+      },
+      getData(row) {
+        this.total = 0
+        this.dataList = []
+        this.standData = row
+        this.sarFileSplitInfoList = this.standData.sarFileSplitInfoList || []
+        this.sarFileSplitInfoList = [...this.sarFileSplitInfoList]
+        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
+        this.visible = true
+        if (this.queryParam.info_id) {
+          this.replacePage()
+        }
+      },
+      getRowList(value) {
+        if (value && value.itemId) {
+          this.selectedRowKeys =  this.selectedRowKeys.filter(res=>{
+             return value.itemId != res
+          })
+          this.selectedRowKeysData =  this.selectedRowKeysData.filter(res=>{
+            return value.itemId != res.id
+          })
+        }
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      searchReset() {
+        this.pageNo = 1
+        this.queryParam = {}
+        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
+        this.replacePage()
+      },
+      onChange(page, pageSize) {
+        this.pageNo = page
+        this.replacePage()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.replacePage()
+      },
+      getPersonnelList() {
+        this.pageNo = 1
+        this.replacePage()
+      },
+      replacePage() {
+        let pageNo = JSON.parse(JSON.stringify(this.pageNo))
+        let pageSize = JSON.parse(JSON.stringify(this.pageSize))
+        let query = {
+          pageNo: pageNo + '',
+          pageSize: pageSize + '',
+          info_id: this.queryParam.info_id,
+          menu_id: ''
+        }
+        this.loading = true
+        postAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataList = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.dataList = []
+            this.total = 0
+            this.loading = false
+          }
+        })
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      handleSubmit() {
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+          this.$emit('standardDecompositionSheetForm', this.selectedRowKeysData)
+          this.visible = false
+        } else {
+          this.$message.warning(this.$t('PleaseSelectData'))
+        }
+      },
+      onSelectChange(value, record) {
+        this.selectedRowKeys = value
+        this.selectedRowKeysData = record
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 100;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 33px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 100%;
+    height: 38px;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+</style>

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

@@ -0,0 +1,457 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('technicalField')">
+                <span>{{$t('technicalField')}}</span>
+              </div>
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="queryParam.technologyTerritory"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="CategoryTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('technicalField')"
+              />
+            </div>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('ProcessStatus')">
+                  <span>{{$t('ProcessStatus')}}</span>
+                </div>
+                <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="queryParam.flowStatus">
+                  <a-select-option v-for="(item, key) in gatherResultList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </div>
+            </a-col>
+          </template>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                   <a @click="handleToggleSearch" style="margin-left: 8px">
+                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                 </a>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiatingProcess')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <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'"
+              @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+    <a-modal
+      :title="$t('initiatingProcess')"
+      :width="600"
+      :visible="visible"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="visible = false"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text" style="margin-top: -18px">
+                <span class="Required">*</span>
+                <span class="title-text-text"
+                      :title="$t('standardDecompositionDocument')">{{$t('standardDecompositionDocument')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="whetherTobring">
+                <a-select :placeholder="$t('PleaseSelect')+$t('standardDecompositionDocument')"
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="formInline.whetherTobring">
+                  <a-select-option v-for="(item, key) in whetherTobringList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+    <processInformation ref="processInformationRef"/>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import processInformation from './components/processInformation'
+
+  export default {
+    name: 'index',
+    components: {
+      processInformation
+    },
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
+          getSysCategoryTree: '/sys/category/getSysCategoryTree'
+        },
+        visible: false,
+        loading: false,
+        toggleSearchStatus: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        CategoryTreeList: [],
+        queryParam: {},
+        formInline: {},
+        rules: {
+          whetherTobring: [
+            {
+              required: true,
+              message: this.$t('standardDecompositionDocument') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ]
+        },
+        whetherTobringList: [
+          {
+            value: '1',
+            name: this.$t('yes')
+          },
+          {
+            value: '2',
+            name: this.$t('not')
+          }
+        ],
+        gatherResultList: [
+          {
+            value: 'Underway',
+            name: this.$t('inProgress')
+          },
+          {
+            value: 'Completed',
+            name: this.$t('Finished')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('technicalField'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'technologyTerritoryName'
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'evaluationMethodsName'
+          },
+          {
+            title: this.$t('ProcessStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'flowStatusName'
+          },
+          {
+            title: this.$t('dateOfInitiation'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'startTime'
+          },
+          {
+            title: this.$t('closingDate'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'endTime'
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'remark'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+      this.getSysCategoryTree()
+    },
+    methods: {
+      getSysCategoryTree() {
+        getAction(this.url.getSysCategoryTree, {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
+      handleToggleSearch() {
+        this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      handleOk() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.visible = false
+            this.formInline.firstInitiation = '1'
+            let newUrl = this.$router.resolve({
+              path: '/evaluationInitiationProcess',
+              query: this.formInline
+            })
+            // let newUrl = this.$router.resolve({
+            //   path: '/evaluationProcess'
+            // })
+            window.open(newUrl.href, '_blank')
+          }
+        })
+      },
+      initiatingProcessClick() {
+        this.visible = true
+        this.formInline = {}
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
+      },
+      viewProcessClick(row) {
+        this.$refs.processInformationRef.getData(JSON.parse(JSON.stringify(row)))
+      },
+      evaluationResultsClick(row) {
+        if (row.evaluationType == 'Feedback evaluation') {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationResultsWhole',
+            query: {
+              id: row.id,
+              processBackground: row.processBackground,
+              serialNumber: row.serialNumber,
+              lawsTechnologyEvaluationId:row.id,
+              standId: row.standId,
+              remark:row.remark
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        } else {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationResultsClause',
+            query: {
+              id: row.id,
+              processBackground: row.processBackground,
+              serialNumber: row.serialNumber,
+              standId: row.standId,
+              remark:row.remark
+            }
+          })
+          window.open(newUrl.href, '_blank')
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+  .tree-select .ant-select-tree-dropdown {
+    height: 298px !important;
+  }
+</style>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>

jero-web/src/views/dashboard/components/monthlyReportRegulations.vue

@@ -2,60 +2,98 @@
   <div class="monthlyReportRegulations-box">
     <div class="header-text">
       <div class="header-text-left">{{this.$t('monthlyReportRegulations')}}</div>
-      <div class="header-text-right">
+      <div class="header-text-right" @click="moreClick">
         More
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
-    <div class="monthlyReportRegulations-box-content">
-      <div class="monthlyReportRegulations-text" v-for="item in monthlyReportRegulationsList">
+    <div class="monthlyReportRegulations-box-content" v-if="monthlyReportRegulationsList.length > 0">
+      <div class="monthlyReportRegulations-text" v-for="item in monthlyReportRegulationsList" @click="preview(item)">
         <div class="yuan"></div>
         <div class="text" :title="item.name">{{item.name}}</div>
-        <div class="time">{{item.time}}</div>
+        <div class="time">{{item.createTime}}</div>
       </div>
     </div>
+    <div v-else style="height: 300px;position: relative">
+      <JNoData/>
+    </div>
+    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
 <script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { Base64 } from 'js-base64'
+  import { mapGetters } from 'vuex'
+
   export default {
     name: 'monthlyReportRegulations',
     data() {
       return {
-        monthlyReportRegulationsList: [
-          {
-            name: '蔚来汽车法规月报_202201_主页面 CN.docx',
-            time: '2022-01-01 13:24:36'
-          },
-          {
-            name: '蔚来汽车法规月报_202202_主页面 CN.docx',
-            time: '2022-02-01 15:50:06'
-          },
-          {
-            name: '蔚来汽车法规月报_202203_主页面 CN.docx',
-            time: '2022-03-01 13:56:20'
-          },
-          {
-            name: '蔚来汽车法规月报_202204_主页面 CN.docx',
-            time: '2022-04-01 16:24:45'
-          },
-          {
-            name: '蔚来汽车法规月报_202205_主页面 CN.docx',
-            time: '2022-06-01 17:24:06'
-          },
-          {
-            name: '蔚来汽车法规月报_202206_主页面 CN.docx',
-            time: '2022-06-01 17:24:06'
+        monthlyReportRegulationsList: [],
+        loading: false,
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        url: {
+          list: '/report/lawsMonthlyReportManageEO/page'
+        }
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getList() {
+        let query = {
+          pageNo: 1,
+          pageSize: 6,
+          issueStatus: '1'
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.monthlyReportRegulationsList = res.result.records || []
+            this.loading = false
+          } else {
+            this.loading = false
           }
-        ]
+        })
+      },
+      moreClick() {
+        this.$router.push({
+          path: '/monthlyRegulationReport'
+        })
+      },
+      preview(item) {
+        let fileName = item.name
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix === '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          if (item.createBy == this.userInfo().username){
+            downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+          }else{
+            this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          }
+        }
       }
     }
+
   }
 </script>
 
 <style scoped lang="less">
   .monthlyReportRegulations-box {
     width: 100%;
+    position: relative;
 
     .header-text {
       width: 100%;
@@ -73,6 +111,7 @@
         font-weight: 400;
         color: #9B9DA9;
         margin-top: 6px;
+        cursor: pointer;
       }
     }
 

jero-web/src/views/dashboard/components/myList.vue

@@ -86,8 +86,8 @@
         })
       },
       prcClick(row) {
-        let index = row.taskIds.lastIndexOf(',')
-        row.taskIds = row.taskIds.slice(0, index)
+        // let index = row.taskIds.lastIndexOf(',')
+        // row.taskIds = row.taskIds.slice(0, index)
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
@@ -100,6 +100,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        }else if (row.prcType == '6') {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       }
     }

jero-web/src/views/documentTools/documentComparison/index.vue

@@ -0,0 +1,340 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('releaseSituation')">
+                <span>{{$t('releaseSituation')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowStatus">
+                <a-select-option v-for="(item, key) in gatherResultList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiateComparison')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+           <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
+           <a class="text-operation"
+              @click="subscribe(record)">
+            {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
+           </a>
+          <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
+          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          deleteBatch:'',
+        },
+        loading: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        gatherResultList: [
+          {
+            value: '1',
+            name: this.$t('draft')
+          },
+          {
+            value: '2',
+            name: this.$t('Published')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard') + 1,
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title') + 1,
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatus'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileName'
+          },
+          {
+            title: this.$t('standard') + 2,
+            align: 'center',
+            dataIndex: 'serialNumberTwo',
+            width: 170
+          },
+          {
+            title: this.$t('title') + 2,
+            align: 'center',
+            dataIndex: 'titleTwo',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatusTwo'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileNameTwo'
+          },
+          {
+            title: this.$t('releaseSituation'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'releaseSituation'
+          },
+          {
+            title: this.$t('remarks'),
+            align: 'center',
+            ellipsis: true,
+            width: 170,
+            dataIndex: 'remark'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      comparisonResultsClick() {
+
+      },
+      subscribe() {
+
+      },
+      edit(){
+
+      },
+      initiatingProcessClick(){
+
+      },
+      deleteData(val){
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -0,0 +1,330 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{$t('standard')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text tree-select">
+              <div class="title-text" :title="$t('releaseSituation')">
+                <span>{{$t('releaseSituation')}}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('releaseSituation')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="queryParam.flowStatus">
+                <a-select-option v-for="(item, key) in gatherResultList"
+                                 :key="key"
+                                 :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+      </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <div @click="initiatingProcessClick" class="operator-text">
+        <a-icon type="apartment"/>
+        {{$t('initiateComparison')}}
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <!--         -->
+        <span slot="operation" slot-scope="text,record">
+          <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
+          <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>
+                     <a class="text-operation"
+                        @click="subscribe(record)">
+            {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
+           </a>
+          <a class="text-operation" @click="downloadData(record)">{{$t('download')}}</a>
+          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
+    </div>
+  </a-card>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+
+  export default {
+    name: 'index',
+    components: {},
+    data() {
+      return {
+        //url传参严格按照当前命名
+        url: {
+          list: '',
+          deleteBatch:'',
+        },
+        loading: false,
+        dataSource: [],
+        selectedRowKeys: [],
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
+        queryParam: {},
+        gatherResultList: [
+          {
+            value: '1',
+            name: this.$t('draft')
+          },
+          {
+            value: '2',
+            name: this.$t('Published')
+          }
+        ],
+        columns: [
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            dataIndex: 'serialNumber',
+            width: 170
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            dataIndex: 'title',
+            width: 170
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'TextStatus'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'fileName'
+          },
+          {
+            title: this.$t('translationLanguage'),
+            align: 'center',
+            dataIndex: 'translationLanguage',
+            width: 170
+          },
+          {
+            title: this.$t('translationResults'),
+            align: 'center',
+            dataIndex: 'translationResults',
+            width: 170
+          },
+          {
+            title: this.$t('conversionTime'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'conversionTime'
+          },
+          {
+            title: this.$t('releaseSituation'),
+            align: 'center',
+            width: 170,
+            ellipsis: true,
+            dataIndex: 'releaseSituation'
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 260,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      searchQuery() {
+        this.pageNo = 1
+        this.getList()
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.pageNo = 1
+        this.getList()
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        let query = {
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          ...queryParam
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      onSelectChange(value) {
+        this.selectedRowKeys = value
+      },
+      viewClick(row) {
+
+      },
+      checkClick(row){
+
+      },
+      downloadData(){
+
+      },
+      subscribe() {
+
+      },
+      initiatingProcessClick(){
+
+      },
+      deleteData(val){
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            getAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+</style>

jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue

@@ -17,6 +17,7 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('configure')">
+                    <span class="Required">*</span>
                     <span>{{$t('configure')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="configIds">
@@ -41,14 +42,23 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text" :title="$t('CustomTemplateName')">
+                    <span class="Required">*</span>
                     <span>{{$t('CustomTemplateName')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="certCategory">
-                    <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                       :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')"
-                                       :type="'select'"
-                                       @input="certCategoryName"
-                                       :triggerChange="false" :dictCode="'cert_category'"/>
+                  <a-form-model-item class="itemModel" prop="exportTemplateId">
+                    <a-select v-model="formInline.exportTemplateId" class="box-input"  :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')">
+                      <a-select-option
+                        v-for="mode in exportTemplatetOptions"
+                        :key="mode.value"
+                        :value="mode.value">
+                        {{ mode.label }}
+                      </a-select-option>
+                    </a-select>
+<!--                    <j-dict-select-tag class="box-input" v-model="formInline.exportTemplateId"-->
+<!--                                       :placeholder="$t('PleaseSelect')+$t('CustomTemplateName')"-->
+<!--                                       :type="'select'"-->
+<!--                                       @input="certCategoryName"-->
+<!--                                       :triggerChange="false" :dictCode="'cert_category'"/>-->
                   </a-form-model-item>
 
                 </div>
@@ -87,6 +97,7 @@ export default {
       confirmLoading: false,
       description:false,
       dictOptions:[],
+      exportTemplatetOptions:[],
       visible: false,
       required:false,
       disabled:false,
@@ -110,8 +121,8 @@ export default {
         description:[
           { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
         ],
-        status: [
-          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        exportTemplateId: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' },
         ],
         fileConnectId: [
           { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' },
@@ -160,9 +171,9 @@ export default {
       this.visible = true
       this.title = this.$t('CustomExport')
       this.formInline = {}
-      this.formInline.separator = ','
       this.formInline = {...this.formInline}
       this.getConfigure()
+      this.getexportTemplateId()
 
       this.$nextTick(() => {
         this.$refs['ruleForm'].clearValidate()
@@ -172,7 +183,7 @@ export default {
       let pram = {
         paramsManifestId: this.$route.query.id
       }
-      getAction('report/detail/getConfigLabelList', pram).then((res) => {
+      getAction('report/detail/getConfigLabelListCustom', pram).then((res) => {
         if (res.success) {
           console.log(res.result)
           this.dictOptions = res.result
@@ -181,6 +192,16 @@ export default {
         }
       })
     },
+    getexportTemplateId(){
+      getAction('report/detail/getTemplateLabelList', {}).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.exportTemplatetOptions = res.result
+        } else {
+          // this.$refs.uploadFile.perentHandleFunc()
+        }
+      })
+    },
     editModel(value) {
       this.visible = true
       this.title = '编辑'
@@ -213,17 +234,17 @@ export default {
           let url = this.url.ConventionalExport
           let Action = getAction
           let query = JSON.parse(JSON.stringify(this.formInline))
-          Object.keys(query).forEach(res => {
-            if (query[res] && query[res] instanceof Array) {
-              query[res] = query[res].join(',')
-            }
-          })
-          if(this.contentListStart){
-            query.certCategoryName = this.contentListStart
-          }
+          // Object.keys(query).forEach(res => {
+          //   if (query[res] && query[res] instanceof Array) {
+          //     query[res] = query[res].join(',')
+          //   }
+          // })
+          // if(this.contentListStart){
+          //   query.certCategoryName = this.contentListStart
+          // }
           query.paramsManifestId = this.$route.query.id
           this.confirmLoading = true
-          downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query)
+          downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query)
           this.confirmLoading = false
         }
       })

jero-web/src/views/parameter/managementdetails/index.vue

@@ -1,4 +1,5 @@
 <template>
+
   <a-card :bordered="false">
     <div class="table-page-search-wrapper doc-detail">
       <div class="Virtual-detail-header" style="top: 0">
@@ -225,6 +226,7 @@ export default {
   mounted() {
     // this.Getlist()
     this.getTableList()
+    document.title = this.$t('ParameterViewPage')
   },
   methods:{
     Getlist() {

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -60,24 +60,39 @@
                 </a-form-model-item>
               </div>
             </a-col>
+<!--            <a-col :span="12">-->
+<!--              <div class="box-title-text">-->
+<!--                <div class="title-text">-->
+<!--                  <span class="Required">*</span>-->
+<!--                  <span class="title-text-text" :title="$t('NtechnicalField')">{{$t('NtechnicalField')}}</span>-->
+<!--                </div>-->
+<!--                <a-form-model-item class="itemModel" prop="technologyTerritory">-->
+<!--                  <a-tree-select-->
+<!--                    tree-node-filter-prop="title"-->
+<!--                    v-model="formInline.technologyTerritory"-->
+<!--                    :maxTagCount="1"-->
+<!--                    class="box-input"-->
+<!--                    :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                    style="width: 100%"-->
+<!--                    :tree-data="CategoryTreeList"-->
+<!--                    tree-checkable-->
+<!--                    :placeholder="$t('PleaseSelect')+$t('NtechnicalField')"-->
+<!--                  />-->
+<!--                </a-form-model-item>-->
+<!--              </div>-->
+<!--            </a-col>-->
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('NtechnicalField')">{{$t('NtechnicalField')}}</span>
+                  <span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="technologyTerritory">
-                  <a-tree-select
-                    tree-node-filter-prop="title"
-                    v-model="formInline.technologyTerritory"
-                    :maxTagCount="1"
-                    class="box-input"
-                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                    style="width: 100%"
-                    :tree-data="CategoryTreeList"
-                    tree-checkable
-                    :placeholder="$t('PleaseSelect')+$t('NtechnicalField')"
-                  />
+                <a-form-model-item class="itemModel" prop="dutyTerritory">
+                  <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                     :disabled="disabled"
+                                     :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -99,21 +114,7 @@
                 </a-form-model-item>
               </div>
             </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required">*</span>
-                  <span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="dutyTerritory">
-                  <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                     :disabled="disabled"
-                                     :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="'duty_territory'"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
+
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
@@ -162,7 +163,9 @@
                       :title="$t('NcontrolType')">{{$t('NcontrolType')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="controlType">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('NcontrolType')" allowClear v-model="formInline.controlType">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('NcontrolType')"
+                            @change="controlTypeChange"
+                            allowClear v-model="formInline.controlType">
                     <a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -190,6 +193,23 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12" v-else-if='this.formInline.controlType =="11"'>
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('DefaultValue')">{{$t('DefaultValue')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="titleDefaultValue">
+                  <a-input class="box-input"
+                           style="height:33px"
+                           :disabled="disabled"
+                           :maxlength="100"
+                           v-model="formInline.titleDefaultValue"
+                           :placeholder="$t('PleaseEnter')+$t('DefaultValue')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
           </a-row>
 <!--          控件备选值-->
           <a-row :gutter="24">
@@ -209,6 +229,8 @@
                 </a-form-model-item>
               </div>
             </a-col>
+
+
 <!--          附件模板-->
             <a-col :span="12" v-if='this.formInline.controlType =="4" || this.formInline.controlType =="7" || this.formInline.controlType =="8" || this.formInline.controlType =="9" || this.formInline.controlType =="10"'>
               <div class="box-title-text">
@@ -273,6 +295,7 @@
                                    style='height: 95px; width: 100%'
                                    :disabled="disabled"
                                    type="textarea"
+                                   :maxLength="1000"
                                    v-model="item.description"
                                    :placeholder="$t('PleaseEnter')+$t('NParameterDescription')"/>
                         </a-form-model-item>
@@ -330,6 +353,7 @@ export default {
         {value:'8', label: this.$t('Dtext') },
         {value:'9', label: this.$t('Etext') },
         {value:'10', label: this.$t('Ftext') },
+        {value:'11', label: this.$t('Gtext') },
       ],
       controlVerification: [ // 控件校验
         {value:'1', label: this.$t('Nnothing') },
@@ -377,7 +401,7 @@ export default {
           { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' },
         ],
         description: [
-          { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+          { min:1, max: 1000, message: this.$t('cantExeed')+'1000'+this.$t('characters'), trigger: 'blur' },
         ],
         controlType: [
           { required: true, message: this.$t('pleaseSelect')+this.$t('controlType'), trigger: 'change' },
@@ -389,6 +413,10 @@ export default {
           { required: true, message: this.$t('PleaseEnter')+this.$t('controlAlternatives'), trigger: 'blur' },
           { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' },
         ],
+        titleDefaultValue: [
+          { required: true, message: this.$t('PleaseEnter')+this.$t('DefaultValue'), trigger: 'blur' },
+          { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' },
+        ],
       },
       rulesItem: {
         paramsNumber: [
@@ -440,6 +468,9 @@ export default {
         }
       })
     },
+    controlTypeChange(value){
+         this.$refs.ruleForm.clearValidate(['controlVerify','titleDefaultValue','controlValues'])
+    },
     uploadSuccess(data) {
       let attIdList = []
       if (data && data.length > 0) {
@@ -602,11 +633,11 @@ export default {
       this.contentList = []
       this.contentListed = []
       this.visible = true
-      if(value.technologyTerritory.split(',').length === 1){
-        value.technologyTerritory = value.technologyTerritory
-      } else {
-        value.technologyTerritory = value.technologyTerritory.split(',')
-      }
+      // if(value.technologyTerritory.split(',').length === 1){
+      //   value.technologyTerritory = value.technologyTerritory
+      // } else {
+      //   value.technologyTerritory = value.technologyTerritory.split(',')
+      // }
       this.formInline = value
       this.title = this.$t('edit')
       this.flag = 0
@@ -665,8 +696,8 @@ export default {
         }
         if(item.description !== undefined && item.description !== null){
           // 参数说明的限制
-          if(item.description.length > 200){
-            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'200'+this.$t('Characters'))
+          if(item.description.length > 1000){
+            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'1000'+this.$t('Characters'))
             falg = 0
             return
           }

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

@@ -0,0 +1,398 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{title}}
+      </div>
+    </div>
+    <div class="content-text">
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required" v-if="!disabled">*</span>
+                <span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
+              </div>
+              <div class="title-text-right" v-if="disabled">
+                {{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}}
+              </div>
+              <a-form-model-item class="itemModel" v-if="!disabled" :prop="!disabled?'complianceResult':''">
+                <a-radio-group style="margin-top: 2px" class="box-input"
+                               v-model="formInline.complianceResult">
+                  <a-radio value="Compliance">
+                    {{$t('accord')}}
+                  </a-radio>
+                  <a-radio value="Non-Compliance">
+                    {{$t('nonConformity')}}
+                  </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <div v-for="(item,index) in formInline.dataList" :key="index">
+          <div class="feedbackPoint">
+            {{$t('feedbackPoint')+(index+1)}}
+            <a-icon class="icon-size"
+                    @click="addData"
+                    v-if="(formInline.dataList.length-1) == index && !disabled"
+                    type="plus-circle"/>
+            <a-icon class="icon-size"
+                    @click="deleteData"
+                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
+                    type="minus-circle"/>
+          </div>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="!disabled">*</span>
+                  <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
+                </div>
+                <div class="title-text-right" :title="item.relatedSection" v-if="disabled">
+                  {{item.relatedSection}}
+                </div>
+                <a-form-model-item class="itemModel" v-if="!disabled"
+                                   :prop="'dataList.'+index+'.relatedSection'"
+                                   :rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="item.relatedSection"
+                           :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required" v-if="!disabled">*</span>
+                  <span class="title-text-text"
+                        :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
+                </div>
+                <div class="title-text-right" :title="item.issueOrSuggest" v-if="disabled">
+                  {{item.issueOrSuggest}}
+                </div>
+                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
+                                   :rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('problemDescription') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="item.issueOrSuggest"
+                           :placeholder="$t('PleaseEnter')+$t('problemDescription')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('enclosure')">{{$t('enclosure')}}</span>
+                </div>
+                <div class="title-text-right" v-if="disabled">
+                  <span style="color: #21c9cc;cursor: pointer"
+                        v-if="item.accessoryFile" @click="viewUploadedFilesClick(item.accessoryFile)">
+                     {{$t('viewFile')}}
+                  </span>
+                  <span v-else>
+                     --
+                  </span>
+                </div>
+                <a-form-model-item class="itemModel" prop="accessoryFile" v-if="!disabled">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (item.accessoryFile === 'null' || item.accessoryFile === '' ||
+                    item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+        <div class="box-text" style="margin-top: 10px" v-if="disabled">
+          <div class="header-text">
+            {{$t('sponsorReview')}}
+          </div>
+        </div>
+        <a-row :gutter="24" v-if="disabled">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="approvalOpinion">
+                <a-textarea :placeholder="$t('pleaseEnter')+$t('reviewComments')" v-model="formInline.approvalOpinion"
+                            :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </div>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+    <viewFileModel ref="viewFileModelRef"/>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  import viewFileModel from '@/components/viewFileModel/index'
+
+  export default {
+    name: 'evaluatorFeedback',
+    components: {
+      uploadFile,
+      viewFileModel
+    },
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      feedbackDataList: {
+        type: Array,
+        default: (() => {
+          return []
+        })
+      },
+      complianceResult: {
+        type: Object,
+        default: {}
+      }
+    },
+    data() {
+      return {
+        formInline: {},
+        rules: {
+          complianceResult: [
+            {
+              required: true,
+              message: this.$t('complianceResults') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
+          approvalOpinion: [
+            {
+              required: true,
+              message: this.$t('reviewComments') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          relatedSection: [
+            {
+              required: true,
+              message: this.$t('relevantSections') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('relevantSections') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          issueOrSuggest: [
+            {
+              required: true,
+              message: this.$t('problemDescription') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
+            {
+              max: 300,
+              message: this.$t('problemDescription') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ]
+        },
+        disabled: false,
+        uploadIndex: '',
+        dataList: []
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        if (this.feedbackDataList && this.feedbackDataList.length > 0) {
+          this.formInline.dataList = this.feedbackDataList
+        } else {
+          this.formInline.dataList = [
+            {
+              relatedSection: '',
+              issueOrSuggest: '',
+              reason: '',
+              accessoryFile: ''
+            }
+          ]
+        }
+        if (this.complianceResult.complianceResult) {
+          this.formInline.complianceResult = this.complianceResult.complianceResult
+        }
+        this.formInline = { ...this.formInline }
+      })
+      if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+        this.disabled = false
+      } else {
+        this.disabled = true
+      }
+    },
+    methods: {
+      clickButtonToUpload(item, index) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        this.uploadIndex = index
+        getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      },
+      viewUploadedFilesClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      },
+      addData() {
+        this.formInline.dataList.push({
+          relatedSection: '',
+          issueOrSuggest: '',
+          reason: '',
+          accessoryFile: ''
+        })
+        this.formInline = { ...this.formInline }
+      },
+      deleteData() {
+        this.formInline.dataList.pop()
+        this.formInline = { ...this.formInline }
+      },
+      submitData(callBack) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callBack && callBack(this.formInline)
+          }
+        })
+      },
+      preservationData(callBack) {
+        callBack && callBack(this.formInline)
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 60px;
+    line-height: 40px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    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: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 110px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .title-text-right {
+    display: inline-block;
+    width: calc(100% - 130px);
+    padding-top: 12px;
+    font-size: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #000F16;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .feedbackPoint {
+    font-size: 16px;
+    font-weight: 400;
+    color: #000F16;
+    margin-bottom: 10px;
+  }
+
+  .icon-size {
+    font-size: 18px;
+    margin-left: 8px;
+    cursor: pointer;
+  }
+</style>

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

@@ -0,0 +1,443 @@
+<template>
+  <div class="box">
+    <div class="box-text">
+      <div class="header-text">
+        {{title}}
+      </div>
+    </div>
+    <div class="content-text">
+      <a-table
+        ref="table"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+        <div slot="clauseContent" slot-scope="text,result">
+          <a-tooltip placement="topLeft">
+            <template slot="title">
+              <span v-html="text"></span>
+            </template>
+            <div class="clauseContent-text" v-html="text"></div>
+          </a-tooltip>
+        </div>
+
+        <span slot="nameTechnicalDocument" slot-scope="text,result">
+              <a-input class="box-input"
+                       :maxLength="100"
+                       v-model="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"
+                       :maxLength="300"
+                       :rows="2"/>
+        </span>
+        <span slot="opinion" slot-scope="text,result">
+          <a-textarea :placeholder="$t('pleaseEnter')+$t('opinion')"
+                      v-model="result.opinion"
+                      :maxLength="300"
+                      :rows="2"/>
+        </span>
+        <span slot="enclosure" slot-scope="text,result,index">
+                    <a-button type="primary" class="button-text"
+                              @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (result.accessoryFile === 'null' || result.accessoryFile === '' ||
+                    result.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+        </span>
+        <span slot="complianceResults" slot-scope="text,result">
+              <a-select :placeholder="$t('PleaseSelect')+$t('complianceResults')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="result.complianceResult">
+                  <a-select-option v-for="(item, key) in complianceResultsList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title="item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+        </span>
+        <span slot="accessoryFile" slot-scope="text,result">
+               <a v-if="text" @click="accessoryFileClick(text)">
+                    {{ $t('viewFile') }}
+               </a>
+               <span v-else>--</span>
+        </span>
+        <span slot="Results" slot-scope="text,result">
+           {{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
+        </span>
+        <span slot="sponsorFeedback" slot-scope="text,result">
+             <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
+                         v-model="result.sponsorFeedback"
+                         :maxLength="300"
+                         :rows="2"/>
+        </span>
+      </a-table>
+    </div>
+    <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+    <viewFileModel ref="viewFileModelRef"/>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import uploadFile from '@/components/uploadFile/file'
+  import viewFileModel from '@/components/viewFileModel/index'
+
+  export default {
+    name: 'evaluatorFeedback',
+
+    components: {
+      uploadFile,
+      viewFileModel
+    },
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      evaluatorFeedbackList: {
+        type: Array,
+        default: (() => {
+          return []
+        })
+      }
+    },
+    data() {
+      return {
+        disabled: false,
+        loading: false,
+        uploadIndex: '',
+        dataSource: [],
+        complianceResultsList: [
+          {
+            name: this.$t('accord'),
+            value: 'Compliance'
+          },
+          {
+            name: this.$t('nonConformity'),
+            value: 'Non-Compliance'
+          }
+        ],
+        columnsTwo: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'itemNum',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'itemName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'itemContent',
+            align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethodsName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'technicalFileName',
+            align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'nameTechnicalDocument' }
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'section',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'chapter' }
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'opinion' }
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'accessoryFile',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'enclosure' }
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResult',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'complianceResults' }
+          }
+        ],
+        columnsThree: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'itemNum',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'itemName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'itemContent',
+            align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethodsName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'technicalFileName',
+            align: 'center',
+            width: 280,
+            ellipsis: true
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'section',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'accessoryFile',
+            align: 'center',
+            width: 180,
+            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',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'sponsorFeedback' }
+          }
+        ]
+      }
+    },
+    mounted() {
+      if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) {
+        this.dataSource = this.evaluatorFeedbackList
+        if (this.$route.query.taskDefinitionKey != 'pgrqr') {
+          this.dataSource.forEach(res => {
+            res.sponsorFeedback = ''
+          })
+          this.dataSource = [...this.dataSource]
+        }
+      }
+    },
+    computed: {
+      columns() {
+        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+          return this.columnsTwo
+        } else {
+          return this.columnsThree
+        }
+      }
+    },
+    methods: {
+      clickButtonToUpload(item, index) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        this.uploadIndex = index
+        getAction('sys/common/getFileInfos', { id: this.dataSource[this.uploadIndex][this.uploadName] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.dataSource[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataSource = [...this.dataSource]
+      },
+      submitData(callBack) {
+        for (let i = 0; i < this.dataSource.length; i++) {
+          if (!this.dataSource[i].complianceResult) {
+            this.$message.warning(this.$t('PleaseCompleteList'))
+            return
+          }
+        }
+        callBack && callBack(this.dataSource)
+      },
+      preservationData(callBack) {
+        callBack && callBack(this.dataSource)
+      },
+      accessoryFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .box {
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .box-text {
+    display: flex;
+    justify-content: space-between;
+    height: 60px;
+    line-height: 40px;
+
+    .header-text {
+      font-size: 16px;
+      font-weight: 400;
+      color: #000F16;
+    }
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 88px;
+    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: 48px;
+    color: #000F16;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 130px);
+    display: inline-block;
+    margin-top: 2px;
+    margin-bottom: 12px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+  .button-text {
+    height: 38px;
+    width: calc(100%);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
+
+  .feedbackPoint {
+    font-size: 14px;
+    font-weight: 400;
+    color: #000F16;
+    margin-bottom: 10px;
+  }
+
+  .icon-size {
+    font-size: 18px;
+    margin-left: 8px;
+    cursor: pointer;
+  }
+
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
+
+</style>
+<style>
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
+</style>

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

@@ -7,16 +7,16 @@
     </div>
     <div class="content-text">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-        <div v-for="(item,index) in dataList" :key="index">
+        <div v-for="(item,index) in formInline.dataList" :key="index">
           <div class="feedbackPoint">
             {{$t('feedbackPoint')+(index+1)}}
             <a-icon class="icon-size"
                     @click="addData"
-                    v-if="(dataList.length-1) == index"
+                    v-if="(formInline.dataList.length-1) == index"
                     type="plus-circle"/>
             <a-icon class="icon-size"
                     @click="deleteData"
-                    v-if="dataList.length > 1 && (dataList.length - 1) == index"
+                    v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
                     type="minus-circle"/>
           </div>
           <a-row :gutter="24">
@@ -26,7 +26,11 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="relatedSection">
+                <a-form-model-item class="itemModel"
+                                   :prop="'dataList.'+index+'.relatedSection'"
+                                   :rules="[{ required: true, message: $t('relevantSections') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('relevantSections') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.relatedSection"
@@ -41,7 +45,10 @@
                   <span class="title-text-text"
                         :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="issueOrSuggest">
+                <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'"
+                                   :rules="[{ required: true, message: $t('questionsSuggestions') + $t('cannotEmpty'), trigger: 'blur'},
+                                   {max: 300,message: $t('questionsSuggestions') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.issueOrSuggest"
@@ -101,44 +108,48 @@
         type: String,
         default: ''
       },
-      feedbackDataList:{
+      feedbackDataList: {
         type: Array,
-        default: (()=>{
-           return []
+        default: (() => {
+          return []
         })
-      },
+      }
     },
     data() {
       return {
         formInline: {},
-        disabled:false,
+        disabled: false,
         rules: {},
-        uploadIndex:'',
+        uploadIndex: '',
         dataList: []
       }
     },
     mounted() {
-       if (this.feedbackDataList && this.feedbackDataList.length > 0){
-         this.dataList = this.feedbackDataList
-         this.dataList = [...this.dataList]
-       }else{
-         this.dataList = [
-           {
-             relatedSection: '',
-             issueOrSuggest: '',
-             reason: '',
-             accessoryFile: ''
-           }
-         ]
-       }
+      this.$nextTick(() => {
+        if (this.feedbackDataList && this.feedbackDataList.length > 0) {
+          this.formInline.dataList = this.feedbackDataList
+          this.formInline = { ...this.formInline }
+        } else {
+          this.formInline.dataList = [
+            {
+              relatedSection: '',
+              issueOrSuggest: '',
+              reason: '',
+              accessoryFile: ''
+            }
+          ]
+        }
+        this.formInline = { ...this.formInline }
+      })
+
     },
     methods: {
-      clickButtonToUpload(item,index) {
+      clickButtonToUpload(item, index) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
         this.uploadIndex = index
-        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+        getAction('sys/common/getFileInfos', { id: this.formInline.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {
@@ -155,21 +166,28 @@
           })
         }
         /** 赋值给当前对应的表单文件 */
-        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
-        this.dataList = [...this.dataList]
+        this.formInline.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
       },
       addData() {
-        this.dataList.push({
+        this.formInline.dataList.push({
           relatedSection: '',
           issueOrSuggest: '',
           reason: '',
           accessoryFile: ''
         })
-        this.dataList = [...this.dataList]
+        this.formInline = { ...this.formInline }
       },
       deleteData() {
-        this.dataList.pop()
-        this.dataList = [...this.dataList]
+        this.formInline.dataList.pop()
+        this.formInline = { ...this.formInline }
+      },
+      submitData(callBack) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callBack && callBack(this.formInline.dataList)
+          }
+        })
       }
     }
   }

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

@@ -68,7 +68,7 @@
       getList() {
         let query = {
           actiProcInstId: this.$route.query.prcId,
-          flowType: '5'
+          flowType: this.$route.query.prcType
         }
         getAction('/lawsOpinionGather/lawsProcessHistoryEO/list', query).then((res) => {
           if (res.success) {

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -0,0 +1,348 @@
+<template>
+  <div id="examineBox">
+    <headerProcess
+      :title="title"
+    />
+    <div class="detail-box">
+      <div class="detail-content" style="padding: 10px 0 0 0">
+        <standardContent
+          v-if="isDisplay"
+          :title="$t('essentialInformation')"
+          :standardContentList="standardContentList"
+          :url="url"
+          :standardContentQuery="queryProject"
+        />
+        <evaluatorFeedback
+          v-if="isDisplay && !isTrue"
+          ref="evaluatorFeedbackRef"
+          :complianceResult="complianceResult"
+          :feedbackDataList="feedbackDataList"
+          :title="$t('evaluatorFeedback')"
+        />
+        <evaluatorFeedbackList
+          v-if="isDisplay && isTrue"
+          :evaluatorFeedbackList="evaluatorFeedbackList"
+          ref="evaluatorFeedbackListRef"
+          :title="$t('evaluatorFeedback')"
+        />
+        <footerProcess
+          v-if="isDisplay"
+          :isPreservation="isPreservation"
+          :isSubmit="true"
+          :isSendBack="isSendBack"
+          @preservation="preservation"
+          @submit="submit"
+          @sendBack="sendBack"
+        />
+        <circulationHistory v-if="isDisplay"/>
+      </div>
+    </div>
+    <JLoading :loading="loading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+  </div>
+</template>
+
+<script>
+  import headerProcess from '../../components/headerProcess'
+  import standardContent from '../../components/standardContent'
+  import circulationHistory from '../../components/regulatoryCirculationHistory'
+  import footerProcess from '../../components/footerProcess'
+  import evaluatorFeedback from '../../components/evaluatorFeedback'
+  import evaluatorFeedbackList from '../../components/evaluatorFeedbackList'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import moment from 'moment'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'evaluationProcess',
+    components: {
+      headerProcess,
+      standardContent,
+      circulationHistory,
+      footerProcess,
+      evaluatorFeedback,
+      evaluatorFeedbackList
+    },
+    data() {
+      return {
+        title: this.$t('collectionOfRegulatoryOpinions'),
+        url: {
+          queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
+          list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/queryEvaluationResultAndComplianceResult'
+        },
+        loading: false,
+        isDisplay: true,
+        feedbackDataList: [],
+        queryProject: {},
+        evaluatorFeedbackList: [],
+        complianceResult: {},
+        isPreservation: false,
+        isSendBack: false,
+        isTrue: false,
+        standardContentList: [],
+        standardContent: [
+          {
+            title: this.$t('standard'),
+            value: 'serialNumber'
+          },
+          {
+            title: this.$t('title'),
+            value: 'title'
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            value: 'regulationOwnerName'
+          },
+          {
+            title: this.$t('closingDate'),
+            value: 'endTime'
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            value: 'evaluationMethodsName'
+          },
+          {
+            title: this.$t('RelevantMaterials'),
+            value: 'relatedDataFileId',
+            type: 2
+          },
+          {
+            title: this.$t('processBackground'),
+            value: 'processBackground'
+          }
+        ],
+        evaluatorFeedback: [
+          {
+            title: this.$t('standard'),
+            value: 'serialNumber'
+          },
+          {
+            title: this.$t('title'),
+            value: 'title'
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            value: 'regulationOwnerName'
+          },
+          {
+            title: this.$t('closingDate'),
+            value: 'endTime'
+          },
+          {
+            title: this.$t('RelevantMaterials'),
+            value: 'relatedDataFileId',
+            type: 2
+          },
+          {},
+          {
+            title: this.$t('processBackground'),
+            value: 'processBackground'
+          }
+        ]
+      }
+    },
+    mounted() {
+      this.isDisplay = false
+      if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+        this.isPreservation = true
+        this.isSendBack = false
+      } else {
+        this.isPreservation = false
+        this.isSendBack = true
+      }
+      this.queryTaskDetailByTask()
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      queryTaskDetailByTask() {
+        this.loading = true
+        getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
+          if (res instanceof String) {
+            this.queryProject = JSON.parse(res) || {}
+          } else {
+            this.queryProject = res || {}
+          }
+          this.isTrue = this.queryProject.evaluationType == 'Feedback evaluation' ? false : true
+          if (this.isTrue) {
+            this.standardContentList = this.evaluatorFeedback
+            this.lawsTechnologyEvaluationItem()
+          } else {
+            this.standardContentList = this.standardContent
+            this.lawsOpinionAssessmentResult()
+          }
+        })
+      },
+      lawsTechnologyEvaluationItem() {
+        getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', {
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          actiProcInstId: this.$route.query.prcId
+        }).then((res) => {
+          if (res.success) {
+            this.evaluatorFeedbackList = res.result || []
+            this.loading = false
+          } else {
+            this.evaluatorFeedbackList = []
+            this.loading = false
+          }
+          this.isDisplay = true
+        })
+      },
+      lawsOpinionAssessmentResult() {
+        getAction(this.url.list, {
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          actiProcInstId: this.$route.query.prcId
+        }).then((res) => {
+          if (res.success) {
+            this.complianceResult = res.result.complianceResult || {}
+            this.feedbackDataList = res.result.evaluationResultEOList || []
+            this.loading = false
+          } else {
+            this.feedbackDataList = []
+            this.complianceResult = {}
+            this.loading = false
+          }
+          this.isDisplay = true
+        })
+      },
+      preservation() {
+        this.loading = true
+        if (this.isTrue) {
+          this.$refs.evaluatorFeedbackListRef.preservationData((res) => {
+            this.batchUpdate(res, 1)
+          })
+        } else {
+          this.$refs.evaluatorFeedbackRef.preservationData((res) => {
+            this.insertBatch(res, 1)
+          })
+        }
+      },
+      batchUpdate(val, num) {
+        let query = {
+          actiProcInstId: this.$route.query.prcId,
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          itemResultList: val
+        }
+        postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/batchUpdate', query).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.loading = false
+            } else {
+              if (this.queryProject.msg) {
+                delete this.queryProject.msg
+              }
+              this.completeTask()
+            }
+          } else {
+            if (num == 1) {
+              this.loading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
+        })
+      },
+      insertBatch(val, num) {
+        let query = {
+          actiProcInstId: this.$route.query.prcId,
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          complianceResult: val.complianceResult,
+          evaluationResultList: val.dataList
+        }
+        postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/evaluatorSaveResult', query).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.loading = false
+            } else {
+              this.completeTask()
+            }
+          } else {
+            if (num == 1) {
+              this.loading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
+        })
+      },
+      sendBack() {
+        if (this.isTrue) {
+          this.$refs.evaluatorFeedbackListRef.preservationData((res) => {
+            this.loading = true
+            this.queryProject.flag = '2'
+            this.batchUpdate(res, 2)
+          })
+        } else {
+          this.$refs.evaluatorFeedbackRef.preservationData((res) => {
+            this.loading = true
+            this.queryProject.approvalOpinion = res.approvalOpinion
+            this.queryProject.flag = '2'
+            this.completeTask()
+          })
+        }
+      },
+      submit() {
+        if (this.isTrue) {
+          this.$refs.evaluatorFeedbackListRef.submitData((res) => {
+            if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+              this.loading = true
+              this.batchUpdate(res, 2)
+            } else {
+              this.loading = true
+              this.queryProject.flag = '1'
+              this.batchUpdate(res, 2)
+            }
+          })
+        } else {
+          this.$refs.evaluatorFeedbackRef.submitData((res) => {
+            if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+              this.loading = true
+              this.insertBatch(res, 2)
+            } else {
+              this.loading = true
+              this.queryProject.approvalOpinion = res.approvalOpinion
+              this.queryProject.flag = '1'
+              this.completeTask()
+            }
+          })
+        }
+      },
+      completeTask() {
+        let query = {
+          userid: this.userInfo().id,
+          taskId: this.$route.query.taskIds,
+          flag: this.queryProject.flag,
+          json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
+        }
+        postAction('/workFlow/completeTask', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.loading = false
+            this.$router.push({
+              path: '/technologyAssessment'
+            })
+          } else {
+            this.loading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .detail-box {
+    padding: 67px 0 0 0;
+    background: #ffffff;
+    height: 100%;
+    overflow: auto;
+  }
+
+  #examineBox {
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    position: relative;
+    height: 100%;
+    overflow-y: auto;
+  }
+</style>

jero-web/src/views/processCenter/processForm/processDetails/index.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="action-bar">
     </div>
-    <regulatoryCirculationHistory v-if="$route.query.prcType == '5'"/>
+    <regulatoryCirculationHistory v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
     <circulationHistory v-else/>
   </div>
 </template>

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -134,7 +134,7 @@
       },
       preservation() {
         this.loading = true
-        let dataList = this.$refs.feedbackInformationRef.dataList
+        let dataList = this.$refs.feedbackInformationRef.formInline.dataList
         this.insertBatch(dataList, 1)
       },
       insertBatch(list, num) {
@@ -142,13 +142,13 @@
           res.lawsOpinionGatherId = this.queryProject.id
           res.actiProcInstId = this.$route.query.prcId
         })
-        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList: list }).then((res) => {
           if (res.success) {
             if (num == 1) {
               this.$message.success(this.$t('OperationSuccessful'))
-              this.$router.push({
-                path: '/collectionOfRegulatoryOpinions'
-              })
+              // this.$router.push({
+              //   path: '/collectionOfRegulatoryOpinions'
+              // })
               this.loading = false
             } else {
               this.completeTask()
@@ -162,8 +162,12 @@
         })
       },
       submit() {
-        let dataList = this.$refs.feedbackInformationRef.dataList
-        this.insertBatch(dataList, 2)
+        this.$refs.feedbackInformationRef.submitData((res) => {
+          this.loading = true
+          this.insertBatch(res, 2)
+        })
+        // let dataList = this.$refs.feedbackInformationRef.formInline.dataList
+        // this.insertBatch(dataList, 2)
       },
       completeTask() {
         let query = {

jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue

@@ -51,7 +51,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {

jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue

@@ -52,7 +52,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {

jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue

@@ -52,7 +52,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {

jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue

@@ -50,7 +50,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {
@@ -154,8 +155,8 @@
         })
       },
       dealWith(row) {
-        let index = row.taskIds.lastIndexOf(',')
-        row.taskIds = row.taskIds.slice(0, index)
+        // let index = row.taskIds.lastIndexOf(',')
+        // row.taskIds = row.taskIds.slice(0, index)
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
@@ -168,6 +169,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.prcType == '6') {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       },
       onChange(page, pageSize) {

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -20,8 +20,8 @@
                       <div class="title-text" :title="$t('newNiONumber')">
                         <span>{{$t('newNiONumber')}}</span>
                       </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
-                               v-model="formInline.nioNumber"></a-input>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('newNiONumber')"
+                               v-model="formInline.nioNumber"></j-input>
                     </div>
                   </a-col>
                   <a-col :md="6" :sm="8">
@@ -29,21 +29,21 @@
                       <div class="title-text" :title="$t('ParameterName')">
                         <span>{{$t('ParameterName')}}</span>
                       </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
-                               v-model="formInline.paramsName"></a-input>
-                    </div>
-                  </a-col>
-                  <a-col :md="6" :sm="8">
-                    <div class="box-title-text">
-                      <div class="title-text" :title="$t('certificationCategory')">
-                        <span>{{$t('certificationCategory')}}</span>
-                      </div>
-                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                         :type="'select'"
-                                         :triggerChange="false" :dictCode="'cert_category'"/>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
+                               v-model="formInline.paramsName"></j-input>
                     </div>
                   </a-col>
+<!--                  <a-col :md="6" :sm="8">-->
+<!--                    <div class="box-title-text">-->
+<!--                      <div class="title-text" :title="$t('certificationCategory')">-->
+<!--                        <span>{{$t('certificationCategory')}}</span>-->
+<!--                      </div>-->
+<!--                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"-->
+<!--                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"-->
+<!--                                         :type="'select'"-->
+<!--                                         :triggerChange="false" :dictCode="'cert_category'"/>-->
+<!--                    </div>-->
+<!--                  </a-col>-->
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
                       <div class="title-text" :title="$t('areaOfResponsibility')">
@@ -60,33 +60,38 @@
                       <div class="title-text" :title="$t('completedBy')">
                         <span>{{$t('completedBy')}}</span>
                       </div>
-                      <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
-                               v-model="formInline.dre"></a-input>
-                    </div>
-                  </a-col>
-                  <a-col :md="6" :sm="8">
-                    <div class="box-title-text">
-                      <div class="title-text" :title="$t('status')">
-                        <span>{{$t('status')}}</span>
-                      </div>
-                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"
-                                class="box-input"
-                                allowClear
-                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                                v-model="formInline.state">
-                        <a-select-option v-for="(item, key) in statusList"
-                                         :key="key"
-                                         :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name}}
-                     </span>
-                        </a-select-option>
-                      </a-select>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
+                               v-model="formInline.dre"></j-input>
                     </div>
                   </a-col>
+<!--                  <a-col :md="6" :sm="8">-->
+<!--                    <div class="box-title-text">-->
+<!--                      <div class="title-text" :title="$t('status')">-->
+<!--                        <span>{{$t('status')}}</span>-->
+<!--                      </div>-->
+<!--                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
+<!--                                class="box-input"-->
+<!--                                allowClear-->
+<!--                                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                                v-model="formInline.state">-->
+<!--                        <a-select-option v-for="(item, key) in statusList"-->
+<!--                                         :key="key"-->
+<!--                                         :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+<!--                           {{ item.name}}-->
+<!--                     </span>-->
+<!--                        </a-select-option>-->
+<!--                      </a-select>-->
+<!--                    </div>-->
+<!--                  </a-col>-->
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
+<!--                 v-if="this.$route.query.it === undefined"-->
+                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                </a-col>
@@ -187,7 +192,7 @@
           <div style="width: 100%">
             <!-- 表格-10控件-->
             <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                              :formInline='formInline' :currentPersonRole='currentPersonRole'
+                              :formInline='formInline' :queryParamQuery='queryParamQuery' :currentPersonRole='currentPersonRole'
                               @getDataSource="getDataSource"
                               @handlePreservation="handlePreservation"
                               @value='value'
@@ -391,6 +396,7 @@
   import TableCollection from '@/components/tableCollection/index'
   import { getAction, postAction } from '../../../api/manage'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
   import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
   import TaskCutOffTime from '@/components/TaskCutOffTime/index'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
@@ -408,45 +414,55 @@
       AssignedBy,
       TaskCutOffTime,
       ReferenceParameter,
-      SynchronousSubmissionLibrary
+      SynchronousSubmissionLibrary,
+      globalAdvancedQuery
     },
     data() {
       this.statusList = [
         {
           value: '1',
-          name: this.$t('CollectionInitiated')
+          title: this.$t('CollectionInitiated'),
+          key:'1',
         },
         {
           value: '2',
-          name: this.$t('handledInterface')
+          title: this.$t('handledInterface'),
+          key:'2',
         },
         {
           value: '3',
-          name: this.$t('ReturnedPerson')
+          title: this.$t('ReturnedPerson'),
+          key:'3',
         },
         {
           value: '4',
-          name: this.$t('completed')
+          title: this.$t('completed'),
+          key:'4',
         },
         {
           value: '5',
-          name: this.$t('Filledreturn')
+          title: this.$t('Filledreturn'),
+          key:'5',
         },
         {
           value: '6',
-          name: this.$t('Submitted')
+          title: this.$t('Submitted'),
+          key:'6',
         },
         {
           value: '7',
-          name: this.$t('ReturnedEngineer')
+          title: this.$t('ReturnedEngineer'),
+          key:'7',
         },
         {
           value: '8',
-          name: this.$t('SynchronizedLibrary')
+          title: this.$t('SynchronizedLibrary'),
+          key:'8',
         },
         {
           value: '9',
-          name: this.$t('alteration')
+          title: this.$t('alteration'),
+          key:'9',
         }
       ]
       return {
@@ -502,9 +518,24 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        fieldList: [
+          {
+            type: '',
+            value: 'certCategory',
+            text: this.$t('certificationCategory'),
+            dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: '',
+            value: 'state',
+            text: this.$t('status'),
+            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+        ],
         selectedRowKeys: [],
         textLoading: false,
         formInline: {},
+        queryParamQuery:{},
         url: {
           tableHeader: 'params/collectManifest/getHeader',
           tableList: 'params/collectManifest/list',
@@ -577,6 +608,8 @@
     },
     mounted() {
       this.GetgetLoginUserType()
+      console.log(this.currentPersonRole)
+      // this.LoginUserType()
       setTimeout(() => {
         if (this.currentPersonRole == 'dre') {
           this.handlePreservation()
@@ -740,6 +773,20 @@
           return flag
         }
       },
+      // 高级搜索
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          sqp['superQueryParams'] = ''
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+          sqp['superQueryMatchType'] = matchType
+        }
+        this.queryParamQuery = sqp
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
       // 认证工程师 批量删除 权限
       // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
       homoJurisdictionBatchdelete() {
@@ -1133,11 +1180,12 @@
             selectedRowKeysValue.push(res)
           }
         })
+        console.log(selectedRowKeysValue)
         for (let i = 0; i < selectedRowKeysValue.length; i++) {
           let postDateobj = {}
           let itemIn = Object.keys(selectedRowKeysValue[i])
           for (let j = 0; j < itemIn.length; j++) {
-            if (itemIn[j] !== 'sdt') {
+            if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
               if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
                 postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
                 for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
@@ -1196,7 +1244,7 @@
           let postDateobj = {}
           let itemIn = Object.keys(selectedRowKeysValue[i])
           for (let j = 0; j < itemIn.length; j++) {
-            if (itemIn[j] !== 'sdt') {
+            if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
               if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
                 postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
                 for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
@@ -1391,7 +1439,10 @@
         this.$refs.CollectionTabel.getTableList()
       },
       searchReset() {
+        this.formInline = {}
         this.$refs.CollectionTabel.getTableListReset()
+        this.$refs.globalAdvancedQueryRef.handleReset()
+        // this.$refs.globalAdvancedQueryRef.emitCallback()
       },
       // 批量删除 -- 与下发收集一致
       handleDelJurisdiction() {

jero-web/src/views/regulationsKanban/components/addModel.vue

@@ -0,0 +1,382 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='formData'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24'>
+          <a-col :span='9'>
+            <a-form-model-item :label="$t('areaOfResponsibility')">
+              <j-dict-select-tag class="box-input" v-model="formData.areaOfResponsibility"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+            <a-form-model-item :label="$t('RelatedItems')" prop='ListTitle'>
+              <a-select class="box-input" v-model="formData.RelatedItems"
+                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                <a-select-option v-for="(element,index) in item.RelatedItemList" :key="element.value" :value="element.value">
+                  {{element.label}}
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='6' style='margin-top: 4px;'>
+            <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="table-operator" style='float: right;margin-top: -20px'>
+      <a-button type="primary" icon="download" @click="handleExportXls()">{{ $t('export') }}</a-button>
+    </div>
+<!--    :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'-->
+    <a-table
+      class='table-area'
+      ref='table'
+      size='middle'
+      rowKey='id'
+      :columns='columns'
+      :dataSource='areaTable'
+      :pagination='false'
+      :loading='loading'
+      :scroll='{x: 600}'
+
+      @change='handleTableChange'>
+
+<!--      <template slot="file" slot-scope="text, record">-->
+<!--        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)" v-has="'bqnrzdpzxlbj'">{{record.exportFileName}}</a>-->
+<!--      </template>-->
+    </a-table>
+<!--    <div class="page" style='display: flex;justify-content: flex-end;'>-->
+<!--      <a-pagination-->
+<!--        :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+<!--        show-quick-jumper-->
+<!--        show-size-changer-->
+<!--        :page-size.sync="pageSize"-->
+<!--        :total="total"-->
+<!--        :current="pageNo"-->
+<!--        @change="pageOnChange"-->
+<!--        @showSizeChange="SizeChange"-->
+<!--      />-->
+<!--    </div>-->
+    <div class="table-operator" >
+      <a-button type="primary"  @click="handleExportXls()">{{ $t('CommentsCollectionResultsForReference') }}</a-button>
+      <a-button type="primary"  @click="handleExportXls()">{{ $t('TechnicalEvaluationResultsForReference') }}</a-button>
+    </div>
+    <!--    <div class='drawer-bootom-button'>-->
+    <!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+    <!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+    <!--    </div>-->
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction ,downloadFile } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      RelatedItemList:[],
+      columns: [
+        {
+          title: this.$t('areaOfResponsibility'),
+          dataIndex: 'areaOfResponsibility',
+          width: 120,
+          align: 'center',
+          ellipsis: true
+        },
+        {
+          title: this.$t('RelatedItems'),
+          align: 'center',
+          width: 120,
+          dataIndex: 'RelatedItems',
+          ellipsis: true
+        },
+        {
+          title: this.$t('designComplianceReview'),
+          align: 'center',
+          width: 250,
+          dataIndex: 'designComplianceReview',
+          ellipsis: true
+        },
+        {
+          title: this.$t('preHomeConfirmation'),
+          align: 'center',
+          width: 270,
+          dataIndex: 'preHomeConfirmation',
+          ellipsis: true
+        },
+        {
+          title: this.$t('verificationComplianceReview'),
+          align: 'center',
+          width: 270,
+          dataIndex: 'verificationComplianceReview',
+          scopedSlots: { customRender: 'file' },
+          ellipsis: true
+        }
+      ],
+      newVisible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      formData: {
+        projectName:'',
+      },
+      rules: {
+        title: [
+          { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
+        ]
+      },
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      pageNo: 1,
+      pageSize: 10,
+      listVisible: false,
+      listVisibleRowDate: {}
+    }
+  },
+  props: {
+    version: {
+      type: Number,
+      default: '',
+      required: false
+    },
+    projectId: {
+      type: String,
+      default: '',
+      require: true
+    },
+    item: {
+      type: String,
+      default: '',
+      require: true
+    },
+    paramsManifestId: {
+      type: Object,
+      default: '',
+      require: true
+    },
+    url: {
+      type: Object,
+      default: '',
+      require: true
+    }
+  },
+  mounted() {
+    this.loadData()
+    console.log(this.item)
+  },
+  methods: {
+    // 清单列表传出数据
+    listVisibleRow(val) {
+      this.selectedRowKeys = []
+      let newAreaTable=JSON.parse(JSON.stringify(this.areaTable))
+      newAreaTable.forEach((item, index) => {
+        if( item.id == this.listVisibleRowDate.id ) {
+          let _obj = {...item}
+          _obj.paramsTemplateId = val[0].id
+          _obj.paramsTemplateName = val[0].paramsTemplateName
+          this.areaTable.splice(index, 1,_obj)
+        }
+      })
+      console.log(this.areaTable,'this.areaTable')
+      this.listVisible = false
+    },
+    // 下载文件
+    editArea(val) {
+      // this.listVisibleRowDate = val
+      console.log(val)
+      // this.listVisible = true
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.loadData()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.loadData()
+    },
+    dowloadfile(item){
+      let query = {
+        id: item.exportFileId
+      }
+      downloadFile('/sys/common/downLoadFile', item.exportFileName, query, this.Deselect)
+    },
+    loadData() {
+      let _this = this
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        paramsManifestId:this.paramsManifestId,
+        ...this.formData
+      }
+      getAction('params/report/exportHistoryPage', params).then((res) => {
+        if (res.success) {
+          this.areaTable = res.result.records
+          this.total = res.result.total
+        }
+      })
+    },
+    //导出
+    handleExportXls(){
+
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.formData = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisible', false)
+    },
+    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
+      this.selectedRowKeysDate = selectedRowKeysDate
+      this.selectedRowKeys = selectedRowKeys
+    },
+    handleTableChange(val) {
+      console.log(',,,')
+    },
+    showModal() {
+      this.title = this.$t('add')
+      this.newVisible = true
+      this.form = {}
+    },
+    //新增
+    handleSubmit() {
+      let _this = this
+      if (this.selectedRowKeys.length == 0) {
+        this.$message.warning(this.$t('pleaseSelectData'))
+      } else if (this.selectedRowKeys.length > 1) {
+        this.$message.warning(this.$t('OnlyOneSelected'))
+      } else {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            this.flag = true
+            this.spinLoading = true
+            this.confirmLoading = true
+            let _tt = {
+              paramsTemplateId: this.selectedRowKeysDate[0].paramsTemplateId,
+              projectId: this.selectedRowKeysDate[0].projectId,
+              title: this.selectedRowKeysDate[0].title,
+              paramsTemplatePublishVersion: this.selectedRowKeysDate[0].paramsTemplatePublishVersion,
+              sourceManifestId: this.selectedRowKeysDate[0].id,
+            }
+            axios({
+              url: `/jero-boot/params/manifest/copy`,
+              method: 'post',
+              data: _tt,
+              transformRequest: [function (data) {
+                let ret = ''
+                for (let it in data) {
+                  ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                }
+                return ret
+              }],
+              headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-Access-Token':_this.token
+              }
+            })
+              .then( (res) =>{
+                if (res.data.success) {
+                  _this.$emit('copysubmit')
+                  _this.$message.success(res.data.message)
+                  _this.flag = false
+                  _this.spinLoading = false
+                  _this.confirmLoading = false
+                }else{
+                  _this.$message.warning(res.data.message)
+                  _this.flag = false
+                  _this.spinLoading = false
+                  _this.confirmLoading = false
+                }
+              })
+              .catch( (error) =>{
+                console.log(error);
+              });
+          } else {
+            return false
+          }
+        })
+      }
+    },
+  },
+  watch: {
+    selectedRowKeyS(val) {
+      this.selectedRowKeys = val
+    }
+  }
+
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>

jero-web/src/views/regulationsKanban/index.vue

@@ -0,0 +1,452 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{ $t('standard') }}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.projectName"></j-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('status')">
+                <span>{{ $t('status') }}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                 :placeholder="$t('PleaseSelect')+$t('status')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('technicalField')">
+                <span>{{ $t('technicalField') }}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                        @handleSuperQuery="handleSuperQuery"
+                                        :fieldList="fieldList"/>
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px"
+                            @click="searchReset">{{ $t('reset') }}</a-button>
+               </a-col>
+            </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: true}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <span slot="projectName" slot-scope="text,record" :title="text">
+          <a @click="entryNameClick(record)">
+            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+          </a>
+        </span>
+        <span slot="operation" slot-scope="text,record">
+            <a class="text-operation" @click="handlecody(record)">{{$t('ViewConformanceResults')}}</a>
+        </span>
+      </a-table>
+    </div>
+    <div class="page">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+    <!--     导出历史模板-->
+    <a-modal class="show-drawer" :title="titleTag" width="1200px" v-model="drawerVisible" :footer="null">
+      <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false' :paramsManifestId='paramsManifestId' :item='item'></export-history>
+    </a-modal>
+  </a-card>
+</template>
+
+<script>
+import ExportHistory from './components/addModel'
+import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+import axios from 'axios'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+// import eventBUs from '../../../common/event'
+import Vue from 'vue'
+
+export default {
+  name: 'index',
+  components: {
+    ExportHistory,
+    globalAdvancedQuery
+  },
+  data() {
+    return {
+      token: Vue.ls.get(ACCESS_TOKEN),
+      loading: false,
+      toggleSearchStatus: false,
+      selectedRowKeys: [],
+      paramsManifestId:'',
+      item:{},
+      selectedRowKeysArray: '',
+      formInline: {},
+      rules: {
+        paramsTemplateName: [
+          { required: true, message: this.$t('PleaseEnter') + this.$t('templateName'), trigger: 'change' }
+        ]
+      },
+      fieldList: [
+        {
+          type: 'string',
+          value: 'standard',
+          text: this.$t('standard')
+        },
+        {
+          type: 'string',
+          value: 'title',
+          text: this.$t('title')
+        },
+        {
+          type: '',
+          value: 'status',
+          text: this.$t('status'),
+          dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+        {
+          type: 'string',
+          value: 'category',
+          text: this.$t('category')
+        },
+        {
+          type: '',
+          value: 'technicalField',
+          text: this.$t('technicalField'),
+          dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+        },
+      ],
+      visible: false,
+      dataSource: [],
+      confirmLoading: false,
+      url: {
+        list: 'params/report/page'
+      },
+      total: 0,
+      pageSize: 10,
+      pageNo: 1,
+      title: '新增',
+      columns: [
+        {
+          title: this.$t('standard'),
+          align: 'center',
+          width: '10%',
+          dataIndex: 'standard'
+        },
+        {
+          title: this.$t('title'),
+          align: 'center',
+          width: '10%',
+          dataIndex: 'title'
+        },
+        {
+          title: this.$t('status'),
+          align: 'center',
+          dataIndex: 'status'
+        },
+        {
+          title: this.$t('category'),
+          align: 'center',
+          dataIndex: 'category'
+        },
+        {
+          title: this.$t('technicalField'),
+          align: 'center',
+          dataIndex: 'technicalField'
+        },
+        {
+          title: this.$t('RegulatoryProcessEvaluationResults'),
+          align: 'center',
+          fixed: 'right',
+          width: 250,
+          scopedSlots: { customRender: 'operation' }
+        }
+      ],
+      queryParam: {},
+      areaVisible: false,
+      paramsTemplateName: '',
+      drawerVisible: false,
+      titleTag: ''
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    handleCancel() {
+      this.areaVisible = false
+    },
+    handleSubmit() {
+      if (this.formInline.paramsTemplateName !== undefined) {
+        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {
+            if (res.success) {
+              this.areaVisible = false
+              this.$message.success(res.message)
+              this.selectedRowKeys = []
+              this.getList()
+            } else {
+              this.$message.warning(res.message)
+            }
+          })
+        }
+      })
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    onSelectChange(value) {
+      this.selectedRowKeys = value
+      this.selectedRowKeysArray = this.selectedRowKeys.join(',')
+    },
+    // 导出历史
+    handlecody(e) {
+      this.drawerVisible = true
+      this.titleTag = e.standard + this.$t('ComplianceConfirmationRecord')
+      this.paramsManifestId = e.id
+      this.item = {...e}
+    },
+    hideModal() {
+      this.visible = false
+    },
+    //编辑
+    edit(item) {
+      this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
+    },
+    //删除
+    deleteLib(val) {
+      let newUrl = this.$router.resolve({
+        path: '/managementdetails',
+        query: val
+      })
+      window.open(newUrl.href, '_blank')
+    },
+    //虚拟清单名称事件
+    entryNameClick(item) {
+      this.$router.push({
+        path: '/ParameterTemplateList',
+        query: item
+      })
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.getList()
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.$refs.globalAdvancedQueryRef.resetLine()
+      this.$refs.globalAdvancedQueryRef.emitCallback()
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.getList()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.getList()
+    },
+    addModelList() {
+      this.pageNo = 1
+      this.getList()
+    },
+    PersonnelSelectionChange(value, id) {
+      this.queryParam[value] = id
+      this.queryParam = { ...this.queryParam }
+    },
+    handleSuperQuery(params, matchType) {
+      let sqp = {}
+      if (!params || (params && params.length == 0)) {
+        sqp['superQueryParams'] = ''
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+      } else {
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+        sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+        sqp['superQueryMatchType'] = matchType
+      }
+      this.queryParamQuery = sqp
+      this.getList()
+    },
+    getList() {
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        ...this.queryParamQuery,
+        ...this.queryParam
+      }
+      this.loading = true
+      getAction(this.url.list, query).then((res) => {
+        if (res.success) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.pageNo = res.result.current - 1
+            this.getList()
+            return
+          }
+          this.dataSource = res.result.records || []
+
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+@import '~@assets/less/common.less';
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.add-input {
+  width: 82%;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+
+.text-operation {
+  margin-right: 8px;
+}
+
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+}
+
+.title-text-add {
+  width: 114px;
+  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;
+  margin-top: 3px;
+}
+
+.box-input-add {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.add-text-text {
+  margin-top: -14px;
+}
+</style>