合并分支 'dev_third_stage' 到 'master'

Dev third stage

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

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

@@ -785,7 +785,7 @@ module.exports = {
   copyParamDetailList: 'Copy Parameter List',
   collectionCompletionTime: 'Collection Completion Time',
   parameterTemplateName: 'Parameter Template Name',
-  onlyThree: 'Only letters, numbers and horizontal bars (-) can be entered',
+  onlyThree: 'Only letters, numbers, dashes (-), and decimal points (.) can be entered.  , left slash, space six kinds of content ',
   templateName: 'Template Name',
   pleaseSelectData: 'Please Select Data',
   templateCopy: 'Template Copy',

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

@@ -800,7 +800,7 @@ module.exports = {
   copyParamDetailList: '复制参数清单',
   collectionCompletionTime: '收集完成时间',
   parameterTemplateName: '参数模板名称',
-  onlyThree: '只能输入字母，数字，横杠（-）三种内容',
+  onlyThree: '只能输入字母，数字，横杠（-），小数点（.），左斜杠，空格六种内容',
   templateName: '模板名称',
   pleaseSelectData: '请选择数据',
   templateCopy: '模板复制',

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

@@ -117,7 +117,7 @@
              @cancel="cancel">
       <a-form-model
         class='tag-module'
-        ref='ruleForm'
+        ref='ruleFormOne'
         :model='Dateline'
         :rules='rules'
         :label-col='labelCol'
@@ -136,6 +136,7 @@
 <!--                </a-select-option>-->
 <!--              </a-select>-->
               <j-dict-select-tag class="box-input" v-model="Dateline.queryzr"
+                                 @input="handleInput('queryzr')"
                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -146,7 +147,7 @@
       <div class="imports-footer">
         <div class="imports-footer-wrap">
 
-          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
+          <a-button class="imports-btn imports-sub" :loading="confirmLoading" type="primary" @click="handleSubmitzr">{{$t('preservation')}}
           </a-button>
           <a-button class="imports-btn" type="primary" @click="cancel">{{$t('cancel')}}</a-button>
         </div>
@@ -278,6 +279,7 @@
         indeterminate: false,
         columns: [],
         content: [],
+        confirmLoading:false,
         selectedRowKeys: [],
         selectedRowrowValue: [],
         dataSource: [],
@@ -348,6 +350,12 @@
           return 'rowClassRed'
         }
       },
+      handleInput(value) {
+        this.$nextTick(() => {
+          this.Dateline = { ...this.Dateline }
+          this.$refs.ruleFormOne.validateField([value])
+        })
+      },
       pageOnChange(page, pageSize) {
         this.pageNo = page
         this.$emit('handlePreservation')
@@ -415,8 +423,9 @@
       handleSubmitzr(record) {
         let _this = this
         let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, }
-        this.$refs.ruleForm.validate(valid => {
+        this.$refs.ruleFormOne.validate(valid => {
           if (valid) {
+            this.confirmLoading = true
             axios({
               url: '/jero-boot/params/collectManifest/updateDutyTerritory',
               method: 'post',
@@ -442,8 +451,10 @@
                 } else {
                   _this.$message.warning(_this.$t('operationFailed'))
                 }
+                this.confirmLoading = false
               })
               .catch((error) => {
+                this.confirmLoading = false
                 console.log(error)
               })
           }
@@ -494,7 +505,7 @@
       },
       cancel(){
         this.areaVisiblezr = false
-        this.$refs['ruleForm'].resetFields()
+        this.$refs['ruleFormOne'].resetFields()
       },
       // 点击工程接口人的详情人员 有权限
       areaOfResponsibility(record) {
@@ -513,7 +524,7 @@
         this.$nextTick(() => {
           this.Dateline = { ...this.Dateline }
           this.getquerySdtId = record.id
-          this.$refs.ruleForm.clearValidate()
+          this.$refs.ruleFormOne.clearValidate()
         })
       },
       dataValueTobeinitiated() {

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',