From cdd5a096b36600538191f88dff0fa4c1feef1e60 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 27 Sep 2023 09:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85-=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=87=BA=E7=8E=B0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=9C=AA=E6=89=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          |  1 +
 .../components/addModelconformance.vue        | 48 +++++++++++++++----
 .../components/nonConformance.vue             |  2 +-
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index f88f7421e..38997122e 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2002,6 +2002,7 @@
               status = '2'
             }
           }
+          console.log(status)
           if(status == '1'){
             this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
           }else{
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
index decbb240e..0bdd14ac0 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModelconformance.vue
@@ -84,24 +84,25 @@
                 <div class="title-text">
                   <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
-                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
+                        :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select allowClear
                             class="box-input"
-                            v-model="formInline.problemState"
+                            v-model="formInline.projectId"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
+                            mode="multiple"
                             optionFilterProp="label"
                             :autoClearSearchValue="false"
-                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
-                    <a-select-option v-for="(item, key) in ProblemstateList"
-                                     :label='item'
+                            :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                    <a-select-option v-for="(item, key) in projectNameList"
                                      :key="key"
-                                     :value="item">
-                  <span style="display: inline-block;width: 100%" :title=" item">
-                    {{ item }}
-                  </span>
+                                     :label="item.projectName"
+                                     :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
                     </a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -137,7 +138,34 @@
                 </a-form-model-item>
               </div>
             </a-col>
-
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <!--                  <span class="Required">*</span>-->
+                  <span class="title-text-text"
+                        :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="contentTemplate">
+                  <a-select allowClear
+                            class="box-input"
+                            v-model="formInline.problemState"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            showSearch
+                            optionFilterProp="label"
+                            :autoClearSearchValue="false"
+                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
+                                     :key="key"
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </div>
+            </a-col>
           </a-row>
           <a-row :gutter="24">
             <a-col :span="24">
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
index b742f6763..1270d9913 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/nonConformance.vue
@@ -451,7 +451,7 @@ export default {
       this.$confirm({
         content: _this.$t('ConfirmDelete'),
         onOk() {
-          deleteAction('/platform/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => {
+          deleteAction('/project/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => {
             if (res.success) {
               _this.$message.success(_this.$t('OperationSuccessful'))
               _this.getList()