From c3bee0a86be506c64a39787b7916acdd207c9efa Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 14 Mar 2022 17:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E6=96=B0=E5=A2=9E=20=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/libraryAddForm/index.vue   | 443 +++++++++---------
 1 file changed, 219 insertions(+), 224 deletions(-)

diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue
index c98b26cc5..0030a8382 100644
--- a/jero-web/src/components/libraryAddForm/index.vue
+++ b/jero-web/src/components/libraryAddForm/index.vue
@@ -2,223 +2,226 @@
   <a-spin :spinning="confirmLoading">
     <a-form-model :model="formInline" v-if="isFormInline" class="formAdd" :rules="rules" ref="ruleForm">
 
-      <div v-for="(val,index) in headerText" :key="index">
-        <div class="header-text">
-          &nbsp;{{val.text}}
-        </div>
-        <a-row :gutter="24">
-          <div v-for="item in val.content">
-            <a-col :span="12" v-if="item.field_show_type === '1' || item.field_show_type === '11'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-input class="box-input"
-                           :disabled="disabled"
-                           v-model="formInline[item.db_field_name]"
-                           :placeholder="$t('PleaseEnter')+item.db_field_txt"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === '2'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-input-number class="box-input"
-                                  :placeholder="$t('PleaseEnter')+item.db_field_txt"
-                                  :disabled="disabled"
-                                  v-model="formInline[item.db_field_name]" :min="1" :max="99999999"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === '3'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                     :disabled="disabled"
-                                     @input="handleInput(item.db_field_name)"
-                                     :placeholder="$t('PleaseSelect')+item.db_field_txt"
-                                     :type="'select'"
-                                     :triggerChange="false" :dictCode="item.dict_field"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === '4'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                      :disabled="disabled"
-                                      :placeholder="$t('PleaseSelect')+item.db_field_txt"
-                                      :type="'select'"
-                                      :triggerChange="false" :dictCode="item.dict_field"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12" v-else-if="item.field_show_type === '5'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-date-picker class="box-input"
-                                 :placeholder="$t('PleaseSelect')+item.db_field_txt"
-                                 @change="dateChange(item)"
-                                 :disabledDate="disabledDate"
-                                 format="YYYY-MM-DD"
-                                 v-model="formInline[item.db_field_name]"
-                                 :disabled="disabled"
-                                 style="width: 100%"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12" v-else-if="item.field_show_type === '6'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
-                                  :placeholder="$t('PleaseSelect')+item.db_field_txt"
-                                  :disabled="disabled"
-                                  @change="onChange(item.db_field_name)"></a-range-picker>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === '7'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload(item.db_field_name)">
-                    {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
-                    formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                    }}
-                  </a-button>
-                  <!--                  <span class="button-text-text" v-if="formInline[item.db_field_name]">-->
-                  <!--                    {{formInline[item.db_field_name].split(',').length}}-->
-                  <!--                  </span>-->
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="24" v-else-if="item.field_show_type === '8'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-textarea
-                    :placeholder="$t('PleaseEnter')+item.db_field_txt"
-                    :disabled="disabled"
-                    v-model="formInline[item.db_field_name]" :rows="4"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="24" v-else-if="item.field_show_type === '9'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <PersonnelSelection :query="item"
-                                      :disabled="disabled"
-                                      v-model="formInline[item.db_field_name]"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="24" v-else-if="item.field_show_type === '10'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <Standardselection :query="item"
-                                     @change="StandardselectionChange"
-                                     :disabled="disabled"
-                                     :standard="formInline"
-                                     v-model="formInline[item.db_field_name]"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === 'RADIO'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <j-dict-select-tag v-model="formInline[item.db_field_name]"
-                                     :disabled="disabled"
-                                     @input="handleInput(item.db_field_name)"
-                                     :placeholder="$t('selectStatus')"
-                                     :type="'radio'" :triggerChange="false" :dictCode="item.dict_field"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === '0'">
-              <div class="box-title-text" :title="item.db_field_txt">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <a-tree-select
-                    v-model="formInline[item.db_field_name]"
-                    :maxTagCount="1"
-                    style="width: 100%"
-                    :tree-data="item.tree"
-                    tree-checkable
-                    :placeholder="$t('PleaseSelect')+item.db_field_txt"
-                  />
-                </a-form-model-item>
-              </div>
-            </a-col>
-
-            <a-col :span="12" v-else-if="item.field_show_type === 'CHECKBOX'">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="Required" v-if="item.field_must_input == 1">*</span>
-                  <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
-                </div>
-                <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                  <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                      :disabled="disabled"
-                                      :placeholder="$t('selectStatus')" :type="'checkbox'"
-                                      :triggerChange="false" :dictCode="item.dict_field"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
+      <div v-for="(val,index) in dataList" :key="index">
+        <div v-for="(ol,indexOne) in Object.keys(val)">
+          <div class="header-text"  >
+            &nbsp;{{ol}}
           </div>
-        </a-row>
+          <a-row :gutter="24">
+            <div v-for="item in val[ol]">
+              <a-col :span="12" v-if="item.field_show_type === '1' || item.field_show_type === '11'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <a-input class="box-input"
+                             :disabled="disabled"
+                             v-model="formInline[item.db_field_name]"
+                             :placeholder="$t('PleaseEnter')+item.db_field_txt"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="12" v-else-if="item.field_show_type === '2'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <a-input-number class="box-input"
+                                    :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                                    :disabled="disabled"
+                                    v-model="formInline[item.db_field_name]" :min="1" :max="99999999"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="12" v-else-if="item.field_show_type === '3'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
+                                       :disabled="disabled"
+                                       @input="handleInput(item.db_field_name)"
+                                       :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                       :type="'select'"
+                                       :triggerChange="false" :dictCode="item.dict_field"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="12" v-else-if="item.field_show_type === '4'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
+                                        :disabled="disabled"
+                                        :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                        :type="'select'"
+                                        :triggerChange="false" :dictCode="item.dict_field"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12" v-else-if="item.field_show_type === '5'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <a-date-picker class="box-input"
+                                   :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                   @change="dateChange(item)"
+                                   :disabledDate="disabledDate"
+                                   format="YYYY-MM-DD"
+                                   v-model="formInline[item.db_field_name]"
+                                   :disabled="disabled"
+                                   style="width: 100%"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+              <a-col :span="12" v-else-if="item.field_show_type === '6'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
+                                    :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                                    :disabled="disabled"
+                                    @change="onChange(item.db_field_name)"></a-range-picker>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="12" v-else-if="item.field_show_type === '7'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <a-button type="primary" class="button-text"
+                              @click="clickButtonToUpload(item.db_field_name)">
+                      {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
+                      formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                      }}
+                    </a-button>
+                    <!--                  <span class="button-text-text" v-if="formInline[item.db_field_name]">-->
+                    <!--                    {{formInline[item.db_field_name].split(',').length}}-->
+                    <!--                  </span>-->
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="24" v-else-if="item.field_show_type === '8'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <a-textarea
+                      :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                      :disabled="disabled"
+                      v-model="formInline[item.db_field_name]" :rows="4"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="24" v-else-if="item.field_show_type === '9'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <PersonnelSelection :query="item"
+                                        :disabled="disabled"
+                                        v-model="formInline[item.db_field_name]"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="24" v-else-if="item.field_show_type === '10'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <Standardselection :query="item"
+                                       @change="StandardselectionChange"
+                                       :disabled="disabled"
+                                       :standard="formInline"
+                                       v-model="formInline[item.db_field_name]"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="12" v-else-if="item.field_show_type === 'RADIO'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <j-dict-select-tag v-model="formInline[item.db_field_name]"
+                                       :disabled="disabled"
+                                       @input="handleInput(item.db_field_name)"
+                                       :placeholder="$t('selectStatus')"
+                                       :type="'radio'" :triggerChange="false" :dictCode="item.dict_field"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="12" v-else-if="item.field_show_type === '0'">
+                <div class="box-title-text" :title="item.db_field_txt">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <a-tree-select
+                      v-model="formInline[item.db_field_name]"
+                      :maxTagCount="1"
+                      style="width: 100%"
+                      :tree-data="item.tree"
+                      tree-checkable
+                      :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                    />
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+              <a-col :span="12" v-else-if="item.field_show_type === 'CHECKBOX'">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="Required" v-if="item.field_must_input == 1">*</span>
+                    <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
+                    <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
+                                        :disabled="disabled"
+                                        :placeholder="$t('selectStatus')" :type="'checkbox'"
+                                        :triggerChange="false" :dictCode="item.dict_field"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </div>
+          </a-row>
+        </div>
+
       </div>
       <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
     </a-form-model>
@@ -440,14 +443,6 @@
             this.ruleList = res.result
             this.IntegrateData()
             callBack && callBack()
-            this.headerText.forEach((res) => {
-              res.content = []
-              this.dataList.forEach(val => {
-                if (res.text === val.area) {
-                  res.content.push(val)
-                }
-              })
-            })
           }
         })
       },