FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_foton_20240430' into 'master'

Browse Source 
Fix foton 20240430

See merge request laws-foton-slrs/foton-laws-system-front!191
This commit is contained in:
王晓勇
2024-06-11 08:43:37 +00:00
parent 8fe784ce80 3391d11b31
commit 564f0d21fc
8 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/policyRegulation/policy/components/editDrawer.vue
+6
View File
@@ -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,
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+1 -1
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+1 -1
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+2 -2
View File
@@ -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">
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+1 -1
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1 -1
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
+1 -1
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1 -1
View File
@@ -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>