合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!90

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

@@ -35,10 +35,10 @@
                         </div>
                         <PersonnelSelection class="box-input"
                                             :personneQuery="queryParam"
-                                            :query="{db_field_name:'evaluators',db_field_txt:$t('Assessor')}"
+                                            :query="{db_field_name:'evaluatorId',db_field_txt:$t('Assessor')}"
                                             :isInput="true"
                                             @change="PersonnelSelectionChange"
-                                            v-model="queryParam.evaluatorsName"/>
+                                            v-model="queryParam.evaluatorIdName"/>
                       </div>
                     </a-col>
                     <a-col :md="6" :sm="8">
@@ -167,7 +167,7 @@
           },
           {
             title: this.$t('Assessor'),
-            dataIndex: 'Assessor',
+            dataIndex: 'evaluatorName',
             align: 'center',
             ellipsis: true,
             width: 160

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

@@ -347,15 +347,15 @@
           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) => {
+        // let url = ''
+        // if (this.isTrue) {
+        //   url = this.url.addModelListOne
+        // } else {
+        //   url = this.url.addModelList
+        // }
+        postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/queryPageDummyById', query).then((res) => {
           if (res.success) {
-            let content = res.result.records || []
+            let content = res.result || []
             this.selectedRowKeysRecord.push({
               standId: content[0].id,
               serialNumber: content[0].serial_number,

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

@@ -275,7 +275,7 @@
   }
 
   .title-text {
-    width: 33px;
+    width: 73px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;

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

@@ -382,6 +382,7 @@
               id: row.id,
               processBackground: row.processBackground,
               serialNumber: row.serialNumber,
+              lawsTechnologyEvaluationId:row.id,
               standId: row.standId,
               remark:row.remark
             }

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

@@ -376,7 +376,7 @@ export default {
           { required: true, message: this.$t('PleaseEnter')+this.$t('NiONumber'), trigger: 'blur' },
           { min:1, max: 15, message: this.$t('cantExeed')+'15'+this.$t('characters'), trigger: 'blur' },
           {
-            pattern: /^[0-9a-zA-Z-]{1,}$/,
+            pattern: /^[0-9a-zA-Z-/. ]{1,}$/,
             message: this.$t('onlyThree'),
             trigger: 'blur'
           }
@@ -385,7 +385,7 @@ export default {
           // { required: true, message: this.$t('pleaseSelect')+this.$t('certificationCategory'), type: 'array', trigger: 'change' },
         ],
         isMust: [
-          { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' },
+          { required: true, message: this.$t('PleaseEnter')+this.$t('Required'), trigger: 'change' },
         ],
         paramsName: [
           { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'blur' },
@@ -669,7 +669,7 @@ export default {
       }
       let falg = 1
       this.contentList.forEach((item,index) => {
-        let reg = /^[0-9a-zA-Z-]{1,}$/
+        let reg = /^[0-9a-zA-Z-/. ]{1,}$/
         // 编号的限制
         if(item.paramsNumber == '' || item.paramsNumber === undefined) {
           this.$message.warning(this.$t('standard')+this.$t('cannotEmpty'))

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

@@ -170,13 +170,11 @@ export default {
         {
           title: this.$t('standard'),
           align: 'center',
-          width: '10%',
           dataIndex: 'standard'
         },
         {
           title: this.$t('title'),
           align: 'center',
-          width: '10%',
           dataIndex: 'title'
         },
         {
@@ -184,11 +182,11 @@ export default {
           align: 'center',
           dataIndex: 'status'
         },
-        {
-          title: this.$t('category'),
-          align: 'center',
-          dataIndex: 'category'
-        },
+        // {
+        //   title: this.$t('category'),
+        //   align: 'center',
+        //   dataIndex: 'category'
+        // },
         {
           title: this.$t('technicalField'),
           align: 'center',