From 145a9468b5fdb1fd4ffc8e5c9671a9db0998fb27 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 28 Apr 2022 16:37:07 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8]=20=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue     | 399 +++++++++---------
 .../views/parameter/parameterlist/index.vue   |   8 +-
 2 files changed, 214 insertions(+), 193 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 4cabb8809..bc9786b51 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -1,220 +1,219 @@
 <template>
-  <a-drawer
-    :title="title"
-    :maskClosable="false"
-    :width="1000"
-    placement="right"
-    :closable="true"
-    @close="handleCancel"
-    :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <a-spin :spinning="confirmLoading">
-      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
+  <div>
+    <a-drawer
+      :title="title"
+      :maskClosable="false"
+      :width="1000"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
                 <span class="title-text-text"
                       :title="$t('NiONumber')">{{$t('NiONumber')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="formInline.nioNumber"
+                           :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.nioNumber"
-                         :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('Required')">{{$t('Required')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="state">
-                <a-select :placeholder="$t('PleaseSelect')+$t('Required')" v-model="formInline.isMust">
-                  <a-select-option v-for="(item, key) in isRequired" :key="key" :value="item.value">
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('Required')">{{$t('Required')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="state">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('Required')" v-model='formInline.isMust'>
+                    <a-select-option v-for="(item, key) in isRequired" :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>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
+                    </a-select-option>
+                  </a-select>
+                </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('ParameterName')">{{$t('ParameterName')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="formInline.paramsName"
+                           :placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.paramsName"
-                         :placeholder="$t('PleaseEnter')+$t('ParameterName')"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('technicalField')">{{$t('technicalField')}}</span>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('technicalField')">{{$t('technicalField')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="technologyTerritory">
+                  <a-tree-select
+                    v-model="formInline.technologyTerritory"
+                    :maxTagCount="1"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="CategoryTreeList"
+                    tree-checkable
+                    :placeholder="$t('PleaseSelect')+$t('technicalField')"
+                  />
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="technologyTerritory">
-                <a-tree-select
-                  v-model="formInline.technologyTerritory"
-                  :maxTagCount="1"
-                  class="box-input"
-                  style="width: 100%"
-                  :tree-data="CategoryTreeList"
-                  tree-checkable
-                  :placeholder="$t('PleaseSelect')+$t('technicalField')"
-                />
-              </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">
+            </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('parameterBatch')">{{$t('parameterBatch')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <j-dict-select-tag class="box-input" v-model="formInline.paramsBatch"
+                                     :disabled="disabled"
+                                     :placeholder="$t('PleaseSelect')+$t('parameterBatch')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'params_batch'"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                <j-dict-select-tag class="box-input" v-model="formInline.paramsBatch"
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('parameterBatch')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'params_batch'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="technologyTerritory">
+                  <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                     :disabled="disabled"
+                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="technologyTerritory">
-                <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'duty_territory'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <div class="box-title-text">
-              <div class="title-text">
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
                 <span class="title-text-text"
                       :title="$t('ParameterDescription')">{{$t('ParameterDescription')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="formInline.description"
+                           :placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.description"
-                         :placeholder="$t('PleaseEnter')+$t('ParameterDescription')"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <div class="box-title-text">
-              <div class="title-text">
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
                 <span class="title-text-text"
                       :title="$t('ParameterName')">{{$t('certificationCategory')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <j-multi-select-tag class="box-input" v-model="formInline.certCategory"
+                                      @change='Onchange'
+                                      v-on:changelabel='Onchangelabel'
+                                      :disabled="disabled"
+                                      :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                      :type="'checkbox'"
+                                      :triggerChange="false" :dictCode="'cert_category'"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                <j-multi-select-tag class="box-input" v-model="formInline.certCategory"
-                                    @change='Onchange'
-                                    v-on:changelabel='Onchangelabel'
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                   :type="'checkbox'"
-                                   :triggerChange="false" :dictCode="'cert_category'"/>
-              </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">
+            </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('controlType')">{{$t('controlType')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="controlType">
-                <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
-                  <a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
+                </div>
+                <a-form-model-item class="itemModel" prop="controlType">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('controlType')" v-model="formInline.controlType">
+                    <a-select-option v-for="(item, key) in controlType" :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>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('controlVerification')">{{$t('controlVerification')}}</span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="technologyTerritory">
-                <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.controlVerify">
-                  <a-select-option v-for="(item, key) in controlVerification" :key="key" :value="item.value">
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('controlVerification')">{{$t('controlVerification')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="technologyTerritory">
+                  <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model="formInline.controlVerify">
+                    <a-select-option v-for="(item, key) in controlVerification" :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>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
+                    </a-select-option>
+                  </a-select>
+                </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('controlAlternatives')">{{$t('controlAlternatives')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="formInline.controlValues"
+                           :placeholder="$t('PleaseEnter')+$t('controlAlternatives')"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.controlValues"
-                         :placeholder="$t('PleaseEnter')+$t('controlAlternatives')"/>
-              </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">
+            </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('attachmentTemplate')">{{$t('attachmentTemplate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <a-button type="primary" class="button-text"
+                            @click="clickButtonToUpload()">
+                      {{ (formInline.fileTemplateConnectId === 'null' || formInline.fileTemplateConnectId === '' ||
+                      formInline.fileTemplateConnectId == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+                  </a-button>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="paramsTemplateName">
-                <a-button type="primary" class="button-text"
-                          @click="clickButtonToUpload(item)">
-<!--                  {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||-->
-<!--                  formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')-->
-<!--                  }}-->
-                  {{ $t('clickUpload') }}
-                </a-button>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24" >
-            <a-tabs>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24" >
+              <a-tabs>
                 <a-tab-pane v-for='(item,index) in certCategoryParamsInfoEOList' :tab="item.textVal" :key="index + 1">
                   <a-row :gutter="24">
                     <a-col :span="12">
@@ -262,24 +261,28 @@
                     </a-col>
                   </a-row>
                 </a-tab-pane>
-            </a-tabs>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </a-spin>
-    <div class="drawer-bootom-button">
-      <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>
-  </a-drawer>
+              </a-tabs>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <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>
+    </a-drawer>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
+  </div>
 </template>
 
 <script>
 import PersonnelSelection from '@/components/PersonnelSelection/index'
 import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+import uploadFile from '@/components/uploadFile/file'
 export default {
   name: 'addModel',
   components: {
+    uploadFile,
     PersonnelSelection
   },
   props: ['url'],
@@ -348,10 +351,22 @@ export default {
     this.getSysCategoryTree()
   },
   methods: {
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      this.$refs.uploadFile.visible = false
+      /** 赋值给当前对应的表单文件 */
+      this.formInline.fileTemplateConnectId = attIdList.join(',')
+      this.formInline = { ...this.formInline }
+    },
     clickButtonToUpload(item) {
       // this.$refs.uploadFile.perentHandleFunc()
       // this.$refs.uploadFile.state = item.flag
-      // this.$refs.uploadFile.visible = true
+      this.$refs.uploadFile.visible = true
       // this.uploadName = item.db_field_name
       // getAction('sys/common/getFileInfos', { id: this.formInline[item.db_field_name] }).then((res) => {
       //   if (res.success) {
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index 9ad5f77dd..f964d48c9 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -113,6 +113,7 @@ export default {
       dataSource: [],
       confirmLoading: false,
       url: {
+        queryById: 'params/paramsInfo/queryById',
         list: 'params/paramsInfo/page',
         add: 'params/paramsInfo/add',
         edit: 'params/paramsInfo/edit',
@@ -227,7 +228,12 @@ export default {
     },
     //编辑
     edit(item) {
-      this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
+      let _this = this
+      getAction(_this.url.queryById, { id: item.id }).then((res) => {
+        if (res.success) {
+          this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(res.result)))
+        }
+      })
     },
     //删除
     deleteLib(val) {

From ec2176a2bba05cd0b5019710a9218168a253c505 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 28 Apr 2022 17:16:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=93=8D=E4=BD=9C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B=20=E7=BC=96=E8=BE=91=E6=97=B6=E6=94=BE=E5=BC=80?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=20=E8=B0=83=E5=8F=96?=
 =?UTF-8?q?=E5=AE=8C=E4=B9=8B=E5=90=8E=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentTools/virtualList/components/editModel.vue      | 4 ++--
 jero-web/src/views/documentTools/virtualList/index.vue      | 6 +++---
 .../src/views/projectManagement/components/transferList.vue | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 062459ea3..d6c41ada0 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -129,7 +129,7 @@
                                @change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"
                                format="YYYY-MM-DD"
                                v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
-                               :disabled="true"
+                               :disabled="false"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -148,7 +148,7 @@
                                @change="dateChange({db_field_name:'implementTime'})"
                                format="YYYY-MM-DD"
                                v-model="formInline.implementTime"
-                               :disabled="true"
+                               :disabled="false"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index e483e773b..5f50148c6 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -56,15 +56,15 @@
           <a @click="VirtualListNameClick(record)">{{text}}</a>
         </span>
         <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
+           <a class="text-operation" @click="edit(record)" :disabled="record.state == 1?true:false">{{$t('edit')}}</a>
            <a class="text-operation" @click="withdraw(record)">
              {{record.state == 2 ? $t('release') : $t('withdraw')}}
            </a>
-           <a class="text-operation" @click="maintenanceList(record)">{{$t('maintenanceList')}}</a>
+           <a class="text-operation" :disabled="record.state == 1?true:false" @click="maintenanceList(record)">{{$t('maintenanceList')}}</a>
            <a class="text-operation" :disabled="record.state == 2?true:false" @click="subscribe(record)">
                {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
            </a>
-           <a class="text-operation" :disabled="record.state == 2?true:false" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+           <a class="text-operation" :disabled="record.state == 1?true:false" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
       </a-table>
     </div>
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index c860838df..790eaa136 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -172,7 +172,7 @@
               this.$message.success(this.$t('OperationSuccessful'))
               this.visible = false
               this.selectedRowKeys = []
-              this.$emit('addModelList')
+              this.$emit('transferListForm')
             } else {
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false

From beb7521eb0eb3db2db7c21936bad8dc3de18399d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 28 Apr 2022 17:45:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonnelSelection/index.vue   | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 3228a68df..c03f72ed7 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -32,10 +32,9 @@
           checkable
           :loading="loading"
           :tree-data="gData"
-          v-model:checkedKeys="selectedKey"
-          @select="onSelect"
           @check="onCheck"
           @expand="onExpand"
+          v-model:checkedKeys="defaultCheckedKeys"
           :defaultCheckedKeys="defaultCheckedKeys"
           :defaultExpandedKeys="defaultExpandedKeys"
         >
@@ -86,9 +85,10 @@
         this.queryDepartUserTreeList()
         this.visible = true
       },
-      onSelect(selectedKeys, info) {
-        this.selectedKey = selectedKeys
-      },
+      // onSelect(selectedKeys, info) {
+      //   console.log(selectedKeys)
+      //   this.selectedKey = selectedKeys
+      // },
 
       onCheck(checkedKeys, info) {
         this.userIds = []
@@ -167,30 +167,25 @@
           if (res.success) {
             this.gData = res.result
             this.defaultExpandedKeys = [this.departId]
-            if (this.personneQuery[this.query.db_field_name + '_id']) {
-              this.defaultCheckedKeys = this.personneQuery[this.query.db_field_name + '_id'].split(',')
-              this.selectedKey = this.personneQuery[this.query.db_field_name + '_id'].split(',')
-            } else if (this.personneQuery[this.query.db_field_name]) {
-              this.defaultCheckedKeys = this.personneQuery[this.query.db_field_name].split(',')
-              this.selectedKey = this.personneQuery[this.query.db_field_name].split(',')
-            } else {
-              this.defaultCheckedKeys = []
-              this.selectedKey = []
+            if (this.userName && this.userName.length == 0) {
+              if (this.personneQuery[this.query.db_field_name + 'Name']) {
+                this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
+              } else if (this.personneQuery[this.query.db_field_name]) {
+                this.userName = this.personneQuery[this.query.db_field_name].split(',')
+              } else {
+                this.userName = []
+              }
             }
-            if (this.personneQuery[this.query.db_field_name + 'Name']) {
-              this.userName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
-            } else if (this.personneQuery[this.query.db_field_name]) {
-              this.userName = this.personneQuery[this.query.db_field_name].split(',')
-            } else {
-              this.userName = []
-            }
-            if (this.personneQuery[this.query.db_field_name + '_id']) {
-              this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',')
-            } else if (this.personneQuery[this.query.db_field_name]) {
-              this.userIds = this.personneQuery[this.query.db_field_name].split(',')
-            } else {
-              this.userIds = []
+            if (this.userIds && this.userIds.length == 0) {
+              if (this.personneQuery[this.query.db_field_name + '_id']) {
+                this.userIds = this.personneQuery[this.query.db_field_name + '_id'].split(',')
+              } else if (this.personneQuery[this.query.db_field_name]) {
+                this.userIds = this.personneQuery[this.query.db_field_name].split(',')
+              } else {
+                this.userIds = []
+              }
             }
+            this.defaultCheckedKeys = this.userIds
             this.treeVisible = true
           } else {
             this.gData = []

From de60f0d8e7cf0aca30ed960c19bbc0a8a91a789d Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 28 Apr 2022 18:00:44 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8]=20=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../parameterlist/components/addModel.vue     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index bc9786b51..6ed2adc1b 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -33,10 +33,9 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="state">
                   <a-select :placeholder="$t('PleaseSelect')+$t('Required')" v-model='formInline.isMust'>
-                    <a-select-option v-for="(item, key) in isRequired" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.label ">
-                      {{ item.label }}
-                    </span>
+                    <a-select-option :key="'1'" :value="'1'">{{$t('yes')}}
+                    </a-select-option>
+                    <a-select-option :key="'0'" :value="'0'">{{$t('not')}}
                     </a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -214,7 +213,7 @@
           <a-row :gutter="24">
             <a-col :span="24" >
               <a-tabs>
-                <a-tab-pane v-for='(item,index) in certCategoryParamsInfoEOList' :tab="item.textVal" :key="index + 1">
+                <a-tab-pane v-for='(item,index) in tt' :tab="item.textVal" :key="index + 1">
                   <a-row :gutter="24">
                     <a-col :span="12">
                       <div class="box-title-text">
@@ -225,7 +224,7 @@
                         <a-form-model-item class="itemModel" prop="paramsTemplateName">
                           <a-input class="box-input"
                                    :disabled="disabled"
-                                   v-model="item.textVal"
+                                   v-model="item.paramsNumber"
                                    :placeholder="$t('PleaseEnter')+$t('standard')"/>
                         </a-form-model-item>
                       </div>
@@ -343,7 +342,8 @@ export default {
       disabled: false,
       projectNameList: [],
       title: '',
-      stateOne: ''
+      stateOne: '',
+      tt : []
     }
   },
   mounted() {
@@ -377,17 +377,16 @@ export default {
       // })
     },
     Onchangelabel(val) {
-      this.certCategoryParamsInfoEOList = []
-      console.log(val,'val。。。')
+
+      // this.formInline.certCategoryParamsInfoEOList = []
       val.forEach((item) => {
-        let _tt = {
+        this.tt.push({
           textVal: item.text, // tab
           certCategory: '', // 所属认证类别
           paramsNumber: '', // 编号
           paramsName: '', // 参数名称
           description: ''// 参数说明
-        }
-        this.certCategoryParamsInfoEOList.push(_tt)
+        })
       })
     },
     Onchange() {
@@ -442,11 +441,14 @@ export default {
             Action = postAction
           }
           let query = JSON.parse(JSON.stringify(this.formInline))
+          console.log(query,'queryqueryqueryquery')
           Object.keys(query).forEach(res => {
             if (query[res] && query[res] instanceof Array) {
               query[res] = query[res].join(',')
             }
           })
+          let querytt = JSON.parse(JSON.stringify(this.tt))
+          query.certCategoryParamsInfoEOList = querytt
           this.confirmLoading = true
           Action(url, query).then((res) => {
             if (res.success) {