Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/components/dict/JMultiSelectTagOnlyRz.vue

@@ -2,7 +2,8 @@
   <a-checkbox-group v-if="tagType=='checkbox'" @change="onChange" :value="arrayValue" :disabled="disabled">
     <a-checkbox v-for="(item, key) in dictOptions" :key="key" :value="item.value">
           <span :title='item.text||item.label'>
-      {{ (item.text && item.text.length > 6 ? item.text.slice(0, 14) + '...' : item.text) || (item.label && item.label.length > 6 ? item.label.slice(0, 14) + '...' : item.label) }}
+<!--      {{ (item.text && item.text.length > 6 ? item.text.slice(0, 20) + '...' : item.text) || (item.label && item.label.length > 6 ? item.label.slice(0, 10) + '...' : item.label) }}-->
+      {{ item.text || item.label}}
          </span>
     </a-checkbox>
   </a-checkbox-group>

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

@@ -47,7 +47,7 @@
       </a-table>
     </div>
     <!--  修改工程接口人--->
-    <a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='620px' :footer="null">
+    <a-modal v-model="areaVisible" :title="$t('modifyprojectInterfacePerson')" width='620px' :footer="null" @cancel="cancleImports">
       <a-form-model
         class='tag-module'
         ref='ruleForm'
@@ -55,6 +55,7 @@
         :rules='rules'
         :label-col='labelCol'
         :wrapper-col='wrapperCol'
+
       >
         <a-row :gutter='24'>
           <a-col :span='24'>
@@ -330,12 +331,17 @@
       // 工程接口人 取消
       cancleImports() {
         this.areaVisible = false
+        this.$refs['ruleForm'].resetFields()
       },
       // 点击工程接口人的详情人员 有权限
       ondataValueTobeinitiated(record) {
         this.areaVisible = true
+        // this.$refs.ruleForm.clearValidate()
+        this.$nextTick(() => {
+          this.getquerySdtList(record)
+        })
         this.$refs.ruleForm.clearValidate()
-        this.getquerySdtList(record)
+
       },
       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'))

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

@@ -132,6 +132,7 @@ export default {
       rules: {
         paramsTemplateName:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('templateName'), trigger: 'change' },
+          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
         ],
       },
       visible: false,
@@ -243,6 +244,7 @@ export default {
     },
     hideModal(){
       this.visible = false;
+      this.$refs['ruleForm'].resetFields()
     },
     //批量删除
     handleDel() {

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

@@ -548,7 +548,6 @@ export default {
       })
       console.log(this.arr)
       this.tabList = val.split(',')
-      console.log(this.tabList)
       this.arr.forEach(item => {
         if (!this.tabList.includes(item)) {
           newArray.push(item);
@@ -630,6 +629,7 @@ export default {
     },
     handleCancel() {
       this.visible = false
+      this.$refs['ruleForm'].resetFields()
     },
     handleSubmit() {
       if(this.formInline.certCategory == undefined) {