布局法规技术评估\

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

@@ -1114,4 +1114,7 @@ module.exports = {
   pleaseSelectStandardFirst:'Please select a standard first',
   RelevantMaterials:'RelevantMaterials',
   evaluatorFeedback:'Evaluator feedback',
+  nameTechnicalDocument:'Name of technical document',
+  chapter:'chapter',
+  problemDescription:'Problem description',
 }

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

@@ -1118,4 +1118,7 @@ module.exports = {
   standardDecompositionDocument:'带入标准分解单',
   pleaseSelectStandardFirst:'请先选择标准',
   evaluatorFeedback:'评估人反馈',
+  nameTechnicalDocument:'技术文件名称',
+  chapter:'章节',
+  problemDescription:'问题说明',
 }

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">
+      <!--      <a-col :span="12">-->
-        <div class="box-title-text">
+      <!--        <div class="box-title-text">-->
-          <div class="title-text">
+      <!--          <div class="title-text">-->
-                <span class="title-text-text"
+      <!--                <span class="title-text-text"-->
-                      :title="$t('releaseDate')">{{$t('releaseDate')}}</span>
+      <!--                      :title="$t('releaseDate')">{{$t('releaseDate')}}</span>-->
-          </div>
+      <!--          </div>-->
-          <a-form-model-item class="itemModel" prop="issueTime">
+      <!--          <a-form-model-item class="itemModel" prop="issueTime">-->
-            <a-input class="box-input"
+      <!--            <a-input class="box-input"-->
-                     :disabled="disabled"
+      <!--                     :disabled="disabled"-->
-                     v-model="formInline.issueTime"
+      <!--                     v-model="formInline.issueTime"-->
-                     :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>
+      <!--                     :placeholder="$t('PleaseEnter')+$t('releaseDate')"/>-->
-          </a-form-model-item>
+      <!--          </a-form-model-item>-->
-        </div>
+      <!--        </div>-->
-      </a-col>
+      <!--      </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/processCenter/components/evaluatorFeedback.vue

@@ -59,31 +59,18 @@
                 <div class="title-text">
                   <span class="Required">*</span>
                   <span class="title-text-text"
-                        :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
+                        :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="issueOrSuggest">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.issueOrSuggest"
-                           :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"/>
+                           :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('reason')">{{$t('reason')}}</span>
-                </div>
-                <a-form-model-item class="itemModel">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model="item.reason"
-                           :placeholder="$t('PleaseEnter')+$t('reason')"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">

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

@@ -6,7 +6,15 @@
       </div>
     </div>
     <div class="content-text">
-
+      <a-table
+        ref="table"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+      </a-table>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
@@ -25,36 +33,73 @@
         type: String,
         default: ''
       },
-      feedbackDataList:{
-        type: Array,
-        default: (()=>{
-          return []
-        })
-      },
     },
     data() {
       return {
-        formInline: {},
         disabled:false,
-        rules: {},
+        loading:false,
         uploadIndex:'',
-        dataList: []
+        dataSource:[],
+        columns:[
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'items_num',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'items_name',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'iterms_conditions',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethod',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'nameTechnicalDocument',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'chapter',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'enclosure',
+            align: 'center',
+            ellipsis: true
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResults',
+            align: 'center',
+            ellipsis: true
+          },
+        ],
       }
     },
     mounted() {
-      if (this.feedbackDataList && this.feedbackDataList.length > 0){
+
-        this.dataList = this.feedbackDataList
-        this.dataList = [...this.dataList]
-      }else{
-        this.dataList = [
-          {
-            relatedSection: '',
-            issueOrSuggest: '',
-            reason: '',
-            accessoryFile: ''
-          }
-        ]
-      }
     },
     methods: {
       clickButtonToUpload(item,index) {
@@ -82,19 +127,6 @@
         this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
         this.dataList = [...this.dataList]
       },
-      addData() {
-        this.dataList.push({
-          relatedSection: '',
-          issueOrSuggest: '',
-          reason: '',
-          accessoryFile: ''
-        })
-        this.dataList = [...this.dataList]
-      },
-      deleteData() {
-        this.dataList.pop()
-        this.dataList = [...this.dataList]
-      }
     }
   }
 </script>

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

@@ -14,10 +14,15 @@
         />
         <evaluatorFeedback
           v-if="isDisplay"
-          ref="feedbackInformationRef"
+          ref="evaluatorFeedbackRef"
           :feedbackDataList="feedbackDataList"
           :title="$t('evaluatorFeedback')"
         />
+        <evaluatorFeedbackList
+          v-if="isDisplay"
+          ref="evaluatorFeedbackListRef"
+          :title="$t('evaluatorFeedback')"
+        />
         <footerProcess
           v-if="isDisplay"
           isPreservation
@@ -38,6 +43,7 @@
   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'
@@ -48,10 +54,10 @@
       standardContent,
       circulationHistory,
       footerProcess,
-      evaluatorFeedback
+      evaluatorFeedback,
+      evaluatorFeedbackList
     },
     data() {
-
       return {
         title: this.$t('collectionOfRegulatoryOpinions'),
         url: {