From 0caf687e2dc0176b02dc2106c7cea769c3fb5760 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 16 Jul 2024 16:00:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=BA=93=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index b6c598ce0..18f37219c 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -5406,6 +5406,10 @@ export default {
           formData.menuId = this.parentNode.id
         }
       }
+      if(formData.QCDW){
+        let arry=formData.QCDW.split('-')
+        formData.QCDW = arry[arry.length-1]
+      }
       // 处理我的收藏和个性化标签传参
       if (this.selectSarMenu.id === 'qbwdsc') {
         formData.labelMenuId = undefined
@@ -5452,12 +5456,23 @@ export default {
               }else {
                 val = value
               }
-              advanceSearchVOList.push({
-                connect: 'and',
-                field: item.attrField || '',
-                type: 'like',
-                value: val
-              });
+              if(item.attrField=='QCDW') {
+                let arry= val.split('-')
+                advanceSearchVOList.push({
+                  connect: 'and',
+                  field: item.attrField || '',
+                  type: 'like',
+                  value: arry[arry.length-1]
+                });
+              }else{
+                advanceSearchVOList.push({
+                  connect: 'and',
+                  field: item.attrField || '',
+                  type: 'like',
+                  value: val
+                });
+              }
+
             }
           })
         }

From 69c20e52d4f8c214ae61c634b20719596f7304ce Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 16 Jul 2024 16:00:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?=
 =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E8=8A=82=E7=82=B9=E6=89=B9=E9=87=8F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzjd/step3.vue           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 13bf828bd..86a651de6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -193,7 +193,8 @@
                 </el-table-column>
                 <el-table-column
                         label="操作"
-                        width="240"
+                        width="200"
+                        fixed="right"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
@@ -829,13 +830,13 @@
                 for( let a = 0; a < this.itemList.length; a++) {
                     for ( let b = 0; b < this.idList.length; b++) {
                         if (this.itemList[a].id === this.idList[b]) {
-                            this.itemList[a].technicalRequir = this.plForm.technicalRequir
-                            this.itemList[a].changePoint = this.plForm.changePoint
-                            this.itemList[a].complianceRequir = this.plForm.complianceRequir
-                            this.itemList[a].complianceState = this.plForm.complianceState
-                            this.itemList[a].newData = this.plForm.newData
-                            this.itemList[a].onlineData = this.plForm.onlineData
-                            this.itemList[a].applyArctic = this.plForm.applyArctic
+                            this.itemList[a].technicalRequir = this.plForm.technicalRequir ||this.itemList[a].technicalRequir
+                            this.itemList[a].changePoint = this.plForm.changePoint|| this.itemList[a].changePoint
+                            this.itemList[a].complianceRequir = this.plForm.complianceRequir||this.itemList[a].complianceRequir
+                            this.itemList[a].complianceState = this.plForm.complianceState||this.itemList[a].complianceState
+                            this.itemList[a].newData = this.plForm.newData|| this.itemList[a].newData
+                            this.itemList[a].onlineData = this.plForm.onlineData|| this.itemList[a].onlineData
+                            this.itemList[a].applyArctic = this.plForm.applyArctic|| this.itemList[a].applyArctic
                         }
                     }
                 }