From b6521775233e7d47420997ee184160b4758124fc Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:06:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=A7=A3=E8=AF=BB=20=E6=96=B0/=E6=97=A7=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue   | 4 ++--
 src/pages/processCenter/pages/creatProcess/bzjd/step5.vue   | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step6.vue   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 009036e53..d0cf3d48e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -432,8 +432,8 @@
                             <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
                           <div style="height: 40px;overflow: auto;display: flex;">
-                            <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
                             <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
+                            <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
                           </div>
                             <div style="overflow: auto;display: flex;" class="BDclass">
                                 <div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 4b39fa155..454d8fe42 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -444,8 +444,8 @@
               <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
               <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
               <div style="height: 40px;overflow: auto;display: flex;">
-                <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
                 <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
+                <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
               </div>
               <div style="overflow: auto;display: flex;" class="BDclass">
                 <div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 837504ccf..b1d76daab 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -385,8 +385,8 @@
                             <div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
                             <div style="height: 40px;overflow: auto;display: flex;">
-                              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
                               <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
+                              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
                             </div>
                             <div style="overflow: auto;display: flex;" class="BDclass">
                                 <div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -483,8 +483,8 @@
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度: {{ similarityDegree }}</div>
           <div style="height: 40px;overflow: auto;display: flex;">
-            <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
             <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
+            <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
           </div>
             <div class="contentCom">
                 <div class="content-left">
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 196b45ca9..047ab7133 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -303,8 +303,8 @@
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 40px;overflow: auto;display: flex;">
-              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
               <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
+              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
             </div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
index 8f36a13d1..9ade242ef 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
@@ -306,8 +306,8 @@
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 40px;overflow: auto;display: flex;">
-              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
               <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
+              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
             </div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index fd37ddc8d..902561212 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -306,8 +306,8 @@
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 40px;overflow: auto;display: flex;">
-              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
               <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
+              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
             </div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>

From c8061aa397371fb6c3108be7d944e8457127557f Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:24:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E8=A7=A3=E8=AF=BB=20=E6=96=B0/=E6=97=A7=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step4.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 667dd8039..5681162f3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -298,8 +298,8 @@
             <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 40px;overflow: auto;display: flex;">
-              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
               <div  style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准-{{form.itemsNum}}</span></div>
+              <div  style="line-height: 20px; margin: 5px;  border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准-{{form.itemsNum1}}</span></div>
             </div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>

From 3391d11b3106f5612be1b94b4e33ba97b48be8fa Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:36:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E5=A4=96=E6=94=BF=E7=AD=96=20=E7=BC=96=E8=BE=91=20=E5=BE=81?=
 =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E5=91=A8=E6=9C=9F=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E6=B8=85=E9=99=A4=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/policyRegulation/policy/components/editDrawer.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue
index 0d20d2132..a93586faa 100644
--- a/src/pages/policyRegulation/policy/components/editDrawer.vue
+++ b/src/pages/policyRegulation/policy/components/editDrawer.vue
@@ -1313,6 +1313,9 @@ export default {
                 if(this.commentCycleDate2 && this.commentCycleDate2.length > 0) {
                   nowstandinfo.commentCycleStart = this.commentCycleDate2[0]
                   nowstandinfo.commentCycleEnd = this.commentCycleDate2[1]
+                }else if (this.commentCycleDate2 === null) {
+                  nowstandinfo.commentCycleStart = null
+                  nowstandinfo.commentCycleEnd = null
                 }
                 this.$http.postData('lawss/sarLawsInfo/updateSarLawsStandInfo', nowstandinfo, {
                   _this: this,
@@ -1354,6 +1357,9 @@ export default {
                 if(this.commentCycleDate2 && this.commentCycleDate2.length > 0) {
                   nowstandinfo.commentCycleStart = this.commentCycleDate2[0]
                   nowstandinfo.commentCycleEnd = this.commentCycleDate2[1]
+                }else if (this.commentCycleDate2 === null) {
+                  nowstandinfo.commentCycleStart = null
+                  nowstandinfo.commentCycleEnd = null
                 }
                 this.$http.postData('lawss/sarLawsInfo/updateSarLawsStandInfo', nowstandinfo, {
                   _this: this,