From 3f91811690205edb7ef927eb5cb877f49db9b2aa Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 4 Jul 2022 11:38:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  16 +--
 .../src/components/CollectionType/index.vue   |  15 ++-
 .../components/ReferenceParameter/index.vue   |   8 +-
 .../ParameterItemCollectionList.vue           | 108 ++++++++++++++----
 4 files changed, 105 insertions(+), 42 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 5f80bd61b..49b1d4003 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -942,14 +942,14 @@ module.exports = {
   reportNotUploaded: 'Report not uploaded',
   position: 'position',
 //  认证权限状态
-  CollectionInitiated: 'Collection to be initiated',
-  handledInterface: 'To be handled by the project interface',
-  ReturnedPerson: 'Returned by project contact person',
-  completed: 'To be completed',
-  Filledreturn: 'Filled by return',
-  Submitted: 'Submitted',
-  ReturnedEngineer: 'Returned by Certification Engineer',
-  SynchronizedLibrary: 'Synchronized to the upper reporting Library',
+  CollectionInitiated: 'Wait Collect',
+  handledInterface: 'Wait Sdt',
+  ReturnedPerson: 'Sdt Back',
+  completed: 'Wait Fill',
+  Filledreturn: 'Dre Back',
+  Submitted: 'Submit',
+  ReturnedEngineer: 'Cert Back',
+  SynchronizedLibrary: 'Sync Report',
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
   and: 'and',
diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index f3b7439c7..40d2d66c3 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -28,7 +28,8 @@
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       event.returnValue="false"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -179,9 +180,10 @@
             <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
+                       event.returnValue="false"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -274,9 +276,10 @@
             <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
+                       event.returnValue="false"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -381,9 +384,10 @@
             <div v-else-if="item.controlVerify == '2'">
               <a-input class="box-input inputWid"
                        :maxLength="1000"
+                       event.returnValue="false"
                        :disabled="item.isLock == '1' ? true: false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
@@ -544,8 +548,9 @@
               <a-input class="box-input inputWid"
                        :disabled="item.isLock == '1' ? true: false"
                        :maxLength="1000"
+                       event.returnValue="false"
                        :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                        v-model="item.dataValue"/>
             </div>
             <!--         正整数  -->
diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue
index ebaf4c6e5..cdcc74cde 100644
--- a/jero-web/src/components/ReferenceParameter/index.vue
+++ b/jero-web/src/components/ReferenceParameter/index.vue
@@ -81,7 +81,7 @@
         </a-row>
       </a-form-model>
     </a-spin>
-    <div class='drawer-bootom-button'>
+    <div class='drawer-bootom-button' style="margin-top: 4px">
       <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>
@@ -284,9 +284,9 @@
 <style lang='less' scoped>
   @import '~@assets/less/common.less';
 
-  /deep/ .ant-form-explain {
-    padding-left: 62px;
-  }
+  /*/deep/ .ant-form-explain {*/
+  /*  padding-left: 62px;*/
+  /*}*/
 
   .diolag-area {
     .table-area {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 3184fb619..5105d2427 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -64,6 +64,26 @@
                                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>
+                    </div>
+                  </a-col>
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -180,29 +200,29 @@
     <!--  冻结配置--->
     <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
       <a-spin :spinning="confirmLoading">
-      <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('FreezeConfiguration')" prop='region'>
-              <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
-                        allowClear mode="multiple">
-                <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
+        <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('FreezeConfiguration')" prop='region'>
+                <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
+                          allowClear mode="multiple">
+                  <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
                     </span>
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
       </a-spin>
       <div style='padding-left: 60px;color: red'>
         {{$t('Attentionfreeze')}}
@@ -387,6 +407,44 @@
       SynchronousSubmissionLibrary
     },
     data() {
+      this.statusList = [
+        {
+          value:'1',
+          name:this.$t('CollectionInitiated')
+        },
+        {
+          value:'2',
+          name:this.$t('handledInterface')
+        },
+        {
+          value:'3',
+          name:this.$t('ReturnedPerson')
+        },
+        {
+          value:'4',
+          name:this.$t('completed')
+        },
+        {
+          value:'5',
+          name:this.$t('Filledreturn')
+        },
+        {
+          value:'6',
+          name:this.$t('Submitted')
+        },
+        {
+          value:'7',
+          name:this.$t('ReturnedEngineer')
+        },
+        {
+          value:'8',
+          name:this.$t('SynchronizedLibrary')
+        },
+        {
+          value:'9',
+          name:this.$t('alteration')
+        }
+      ]
       return {
         // 认证工程师 homo
         // 工程接口人 sdt
@@ -464,7 +522,7 @@
         templatetitleId: '',
         rowId: '',
         version: 0,
-        confirmLoading:false,
+        confirmLoading: false,
         itemId: '',
         selectedRowKeysValue: [], // table列表所选得数据
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -856,7 +914,7 @@
         this.Dateline = {}
         //  获取冻结配置数据
         this.confirmLoading = true
-        this.getFreeze(()=> {
+        this.getFreeze(() => {
           this.getLockedConfigIdList()
         })
       },
@@ -865,8 +923,8 @@
           { paramsManifestId: this.paramsManifest.id }).then((res) => {
           if (res.success) {
             this.Dateline.paramsConfig = res.result
-            this.Dateline = {...this.Dateline}
-          }else{
+            this.Dateline = { ...this.Dateline }
+          } else {
             this.Dateline.paramsConfig = []
           }
           this.confirmLoading = false
@@ -1342,7 +1400,7 @@
                   if (res.data.success) {
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.selectedRowKeys = []
-                    _this.$refs.CollectionTabel.getData()
+                    // _this.$refs.CollectionTabel.getData()
                     _this.$refs.CollectionTabel.getTableList()
                     _this.textLoading = false
                   } else {