From 00c18837551c18e5cff973a603edc70fee7811fb Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Thu, 17 Nov 2022 10:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E3=80=81=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E5=89=8D=E7=AB=AF=E6=B7=BB=E5=8A=A0=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/initiatingProcess.vue          | 29 +++++++++++++++++++
 .../collectionOfRegulatoryOpinions/index.vue  | 18 ++++++++++++
 .../components/initiatingProcess.vue          | 27 +++++++++++++++++
 .../technologyAssessment/index.vue            | 18 ++++++++++++
 4 files changed, 92 insertions(+)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 8981f9504..63514d4b2 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -100,6 +100,20 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('brand')">
+                  <span class="Required">*</span>
+                  <span  class="title-text-text">{{$t('brand')}}</span>
+                </div>
+                <a-form-model-item class="itemModel propbox" prop="brands">
+                <j-multi-select-tag class="box-input" v-model="formInline.brands"
+                                    :placeholder="$t('PleaseSelect')+$t('brand')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'brand'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
           </a-row>
         </a-form-model>
         <footerProcess
@@ -164,6 +178,13 @@
               trigger: 'change'
             }
           ],
+          brands: [
+            {
+              required: true,
+              message: this.$t('brand') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           taskExplain: [
             {
               max: 300,
@@ -326,6 +347,11 @@
               this.$message.warning(this.$t('pleaseSelectStandard'))
             } else {
               this.JLoading = true
+              Object.keys(this.formInline).forEach(val => {
+                if (this.formInline[val] instanceof Array) {
+                  this.formInline[val] = this.formInline[val].join(',')
+                }
+              })
               let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0])
               value.standId = value.id
               value.taskAffirmDueDate = value.endTime
@@ -398,6 +424,9 @@
 </script>
 
 <style scoped>
+  /deep/.propbox .ant-form-explain{
+    margin-top: -17px !important;
+  }
   .detail-box {
     padding: 67px 0 0 0;
     background: #ffffff;
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 4f9789fa2..e46e0071b 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -59,6 +59,17 @@
                 </a-select>
               </div>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('brand')">
+                  <span>{{$t('brand')}}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.brands"
+                                    :placeholder="$t('PleaseSelect')+$t('brand')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'brand'"/>
+              </div>
+            </a-col>
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -200,6 +211,13 @@
             ellipsis: true,
             dataIndex: 'createBy'
           },
+          {
+            title: this.$t('brand'),
+            align: 'center',
+            ellipsis: true,
+            width: 140,
+            dataIndex: 'brand'
+          },
           {
             title: this.$t('dateOfInitiation'),
             align: 'center',
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 2170b8b73..97dfbd9de 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -64,6 +64,23 @@
               </div>
             </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="8">
+              <div class="box-title-text" style="height: 60px">
+                <div class="title-text" :title="$t('brand')">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('brand')">{{$t('brand')}}</span>
+                </div>
+                <a-form-model-item class="itemModel propbox" prop="brands">
+                <j-multi-select-tag class="box-input" v-model="formInline.brands"
+                                    :placeholder="$t('PleaseSelect')+$t('brand')"
+                                    :type="'select'"
+                                    style="width: 100%"
+                                    :triggerChange="false" :dictCode="'brand'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
           <a-row :gutter="24" style="margin-bottom: 10px">
             <a-col :span="16">
               <div class="box-title-text">
@@ -281,6 +298,13 @@
               trigger: 'change'
             }
           ],
+          brands: [
+            {
+              required: true,
+              message: this.$t('brand') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           processBackground: [
             {
               max: 300,
@@ -674,6 +698,9 @@
   }
 </style>
 <style scoped>
+  /deep/.propbox .ant-form-explain{
+    margin-top: -17px !important;
+  }
   .detail-box {
     padding: 67px 0 0 0;
     background: #ffffff;
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index bac006983..8d9f5c322 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -60,6 +60,17 @@
                 </a-select>
               </div>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('brand')">
+                  <span>{{$t('brand')}}</span>
+                </div>
+                <j-multi-select-tag class="box-input" v-model="queryParam.brands"
+                                    :placeholder="$t('PleaseSelect')+$t('brand')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'brand'"/>
+              </div>
+            </a-col>
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -269,6 +280,13 @@
             ellipsis: true,
             dataIndex: 'createBy'
           },
+          {
+            title: this.$t('brand'),
+            align: 'center',
+            ellipsis: true,
+            width: 140,
+            dataIndex: 'brand'
+          },
           {
             title: this.$t('dateOfInitiation'),
             align: 'center',