From 00f0f76862922c4aaf070d401de15f4ac0c7433e Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 27 Apr 2022 16:15:32 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   6 +
 jero-web/src/common/lang/zh-cn.js             |   6 +
 .../src/components/dict/JMultiSelectTag.vue   |  11 +-
 .../parameterlist/components/addModel.vue     | 236 +++++++++++++++++-
 4 files changed, 252 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 322abaa9c..7d8371890 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -706,6 +706,12 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'enclosure',
   // 认证
+  attachmentTemplate: 'attachment Template',
+  controlAlternatives: 'control Alternatives',
+  controlVerification: 'control Verification',
+  controlType: 'control Type',
+  certificationCategory: 'certification Category',
+  parameterBatch: 'parameter Batch',
   releaseVersion: 'release Version',
   parameterTemplate: 'parameter Template',
   contentDescription: 'content Description',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 4e58b9bbb..5357eeb32 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -712,6 +712,12 @@ module.exports = {
   uploadTime:'上传时间',
   enclosure:'附件',
   // 认证
+  attachmentTemplate: '附件模板',
+  controlAlternatives: '控件备选值',
+  controlVerification: '控件校验',
+  controlType: '控件类型',
+  certificationCategory: '认证类别',
+  parameterBatch: '参数批次',
   releaseVersion: '发布版本',
   parameterTemplate: '参数模板',
   contentDescription: '内容说明',
diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue
index 463626e24..2f17d8662 100644
--- a/jero-web/src/components/dict/JMultiSelectTag.vue
+++ b/jero-web/src/components/dict/JMultiSelectTag.vue
@@ -94,8 +94,15 @@
             })
             this.content=item.join(',')
           })
-
-          console.log('value111',this.content)
+          let arrayLabel = []
+          this.dictOptions.forEach((item) => {
+            this.arrayValue.forEach((val) => {
+               if(item.value === val) {
+                 arrayLabel.push(item)
+               }
+            })
+          })
+          this.$emit('changelabel', arrayLabel);
         }
       }
     },
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 6d699a2e0..e27d3359b 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -33,8 +33,8 @@
               <a-form-model-item class="itemModel" prop="state">
                 <a-select :placeholder="$t('PleaseSelect')+$t('Required')">
                   <a-select-option v-for="(item, key) in isRequired" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
-                      {{ item.text || item.label }}
+                    <span style="display: inline-block;width: 100%" :title=" item.label ">
+                      {{ item.label }}
                     </span>
                   </a-select-option>
                 </a-select>
@@ -76,6 +76,192 @@
             </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('parameterBatch')">{{$t('parameterBatch')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <j-dict-select-tag class="box-input" v-model="formInline.state"
+                                   :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>
+              </div>
+              <a-form-model-item class="itemModel" prop="technologyTerritory">
+                <j-dict-select-tag class="box-input" v-model="formInline.state"
+                                   :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">
+                <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.paramsTemplateName"
+                         :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">
+                <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="stateOne"
+                                    @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">
+                <span class="title-text-text"
+                      :title="$t('controlType')">{{$t('controlType')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-select :placeholder="$t('PleaseSelect')+$t('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>
+              </div>
+              <a-form-model-item class="itemModel" prop="technologyTerritory">
+                <a-select :placeholder="$t('PleaseSelect')+$t('controlVerification')">
+                  <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">
+                <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.paramsTemplateName"
+                         :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">
+                <span class="title-text-text"
+                      :title="$t('attachmentTemplate')">{{$t('attachmentTemplate')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                <a-input class="box-input"
+                         :disabled="disabled"
+                         v-model="formInline.paramsTemplateName"
+                         :placeholder="$t('PleaseEnter')+$t('attachmentTemplate')"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <a-tabs default-active-key="1">
+              <a-tab-pane  v-for='(item,index) in tabCertificationCategory' :key='index' key="1" :tab="item.text">
+                <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="paramsTemplateName">
+                                <a-input class="box-input"
+                                         :disabled="disabled"
+                                         v-model="formInline.paramsTemplateName"
+                                         :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('controlVerification')">{{$t('controlVerification')}}</span>
+                          </div>
+                          <a-form-model-item class="itemModel" prop="technologyTerritory">
+                            <a-input class="box-input"
+                                     :disabled="disabled"
+                                     v-model="formInline.paramsTemplateName"
+                                     :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+                      </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">
+                      <span class="title-text-text"
+                            :title="$t('controlType')">{{$t('controlType')}}</span>
+                            </div>
+                            <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                              <a-input class="box-input"
+                                       :disabled="disabled"
+                                       v-model="formInline.paramsTemplateName"
+                                       :placeholder="$t('PleaseEnter')+$t('NiONumber')"/>
+                      </a-form-model-item>
+                    </div>
+                  </a-col>
+                </a-row>
+              </a-tab-pane>
+            </a-tabs>
+          </a-col>
+        </a-row>
       </a-form-model>
     </a-spin>
     <div class="drawer-bootom-button">
@@ -96,11 +282,35 @@ export default {
   props: ['url'],
   data() {
     return {
-      isRequired: [
+      isRequired: [ // 是否必填
         {value:1, label: '是' },
         {value:0, label: '否' }
       ],
-      CategoryTreeList: [],
+      controlType: [ // 控件类型
+        {value:1, label: '文本' },
+        {value:2, label: '下拉单选' },
+        {value:3, label: '下拉多选' },
+        {value:4, label: '附件' },
+        {value:5, label: '文本+下拉单选' },
+        {value:6, label: '文本+下拉多选' },
+        {value:7, label: '文本+附件' },
+        {value:8, label: '下拉单选+附件' },
+        {value:9, label: '下拉多选+附件' },
+        {value:10, label: '文本+下拉单选+附件' },
+      ],
+      controlVerification: [ // 控件校验
+        {value:1, label: '无' },
+        {value:2, label: '中文' },
+        {value:3, label: '正整数' },
+        {value:4, label: '正浮点数' },
+        {value:5, label: '整数或小数' },
+        {value:6, label: '一位小数' },
+        {value:7, label: '两位小数' },
+        {value:8, label: '三位小数' },
+        {value:9, label: '四位小数' },
+      ],
+      CategoryTreeList: [], // 技术领域
+      tabCertificationCategory: [], // 认证类别得tab栏
       formInline: {},
       confirmLoading: false,
       visible: false,
@@ -126,7 +336,8 @@ export default {
       },
       disabled: false,
       projectNameList: [],
-      title: ''
+      title: '',
+      stateOne: ''
     }
   },
   mounted() {
@@ -134,6 +345,21 @@ export default {
     this.getSysCategoryTree()
   },
   methods: {
+    Onchangelabel(val) {
+      console.log(val,'val。。。')
+      if(val.length > 0) {
+         this.tabCertificationCategory = val
+      } else {
+         this.tabCertificationCategory = []
+        console.log(this.tabCertificationCategory,'this.tabCertificationCategorythis.tabCertificationCategory')
+      }
+    },
+    Onchange() {
+
+    },
+    callback() {
+
+    },
     getSysCategoryTree() {
       getAction('/sys/category/getSysCategoryTree', {}).then((res) => {
         if (res.success) {