From 8c62b74893f375e201a34a130e8adca4f1b55fc5 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 18 Jan 2022 16:37:28 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/bzjd/step1-1.vue       | 16 ++++++----
 .../pages/creatProcess/bzjd/step1-6.vue       |  4 +++
 .../pages/creatProcess/bzjd/step1.vue         | 16 ++++++----
 .../pages/creatProcess/bzjd/step2.vue         | 12 ++++++++
 .../pages/creatProcess/bzjd/step3.vue         | 29 +++++++++++++++----
 .../pages/creatProcess/bzjd/step4.vue         | 11 +++++++
 .../pages/creatProcess/bzjd/step5.vue         | 11 +++++++
 .../pages/creatProcess/bzjd/step6.vue         | 11 +++++++
 .../pages/creatProcess/bzzqyj/step2.vue       | 12 ++++++--
 9 files changed, 102 insertions(+), 20 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 70855c5e0..cef2dd46c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -403,7 +403,10 @@
             <div class="demo-drawer-content">
                 <div style="display: flex; height: 100%;">
                     <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
-                        <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
+                        <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
+                            <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+                            <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+                        </div>
                         <div v-else style="height: 100%;">
                             <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
@@ -1085,11 +1088,12 @@
                                         }
                                     }
                                 }
-                                if (num4 > 0) {
-                                    this.$message.warning('请输入新车型实施日期')
-                                } else if (num5 > 0) {
-                                    this.$message.warning('请输入在产车实施日期')
-                                } else if (num6 > 0) {
+                                // if (num4 > 0) {
+                                //     this.$message.warning('请输入新车型实施日期')
+                                // } else if (num5 > 0) {
+                                //     this.$message.warning('请输入在产车实施日期')
+                                // } else
+                                if (num6 > 0) {
                                     this.$message.warning('请选择适用车型')
                                 } else if (b > 0) {
                                     this.$message.warning('请选择责任人')
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index e40c868cf..036b5e14e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -436,6 +436,10 @@ export default {
         newItemId: id2,
         flag: 1
       }
+      if (!id || !id2) {
+        this.$message.warning('暂无找到相似的文本')
+        return
+      }
       this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
         _this: this
       }, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 9324e7561..c5c999eca 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -411,7 +411,10 @@
       <div class="demo-drawer-content">
         <div style="display: flex; height: 100%;">
           <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
-            <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
+            <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
+              <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+              <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+            </div>
             <div v-else style="height: 100%;">
               <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
               <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
@@ -1090,11 +1093,12 @@ export default {
                   }
                 }
               }
-              if (num4 > 0) {
-                this.$message.warning('请输入新车型实施日期')
-              } else if (num5 > 0) {
-                this.$message.warning('请输入在产车实施日期')
-              } else if (num6 > 0) {
+              // if (num4 > 0) {
+              //   this.$message.warning('请输入新车型实施日期')
+              // } else if (num5 > 0) {
+              //   this.$message.warning('请输入在产车实施日期')
+              // } else
+              if (num6 > 0) {
                 this.$message.warning('请选择适用车型')
               } else if (b > 0) {
                 this.$message.warning('请选择责任人')
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index a82367009..06cf69cc4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -54,6 +54,16 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            :picker-options="pickerOptions"
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -312,6 +322,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
                 itemList: []
@@ -493,6 +504,7 @@
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText2 = data.commentText2 || ''
+                        this.form.endTime = data.endTime || data.form.endTime
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 226719b76..8f99d8266 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -54,6 +54,16 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            :picker-options="pickerOptions"
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -357,7 +367,10 @@
             <div class="demo-drawer-content">
                 <div style="display: flex; height: 100%;">
                     <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1">
-                        <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
+                        <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
+                            <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+                            <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+                        </div>
                         <div v-else style="height: 100%;">
                             <div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
@@ -535,6 +548,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
                 idList: []
@@ -832,11 +846,13 @@
                         }
                         if (num3 > 0) {
                             this.$message.warning('请输入符合性要求')
-                        } else if (num4 > 0) {
-                            this.$message.warning('请输入新车型实施日期')
-                        } else if (num5 > 0) {
-                            this.$message.warning('请输入在产车实施日期')
-                        } else if (num6 > 0) {
+                        }
+                        // else if (num4 > 0) {
+                        //     this.$message.warning('请输入新车型实施日期')
+                        // } else if (num5 > 0) {
+                        //     this.$message.warning('请输入在产车实施日期')
+                        // }
+                        else if (num6 > 0) {
                             this.$message.warning('请选择适用车型')
                         } else if (b > 0) {
                             this.$message.warning('请选择责任人')
@@ -870,6 +886,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.endTime = data.endTime || data.form.endTime
                         let commitStatus = res.commitStatus
                         if(commitStatus && commitStatus > 0){
                             this.acceptShow = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 4db3dde4d..1db15f42a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -54,6 +54,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -340,6 +349,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
             }
@@ -496,6 +506,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText4 = data.commentText4 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 701e5c74d..35567373f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -54,6 +54,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -340,6 +349,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
             }
@@ -478,6 +488,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText5 = data.commentText5 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 670443c4e..e6d96adb9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -54,6 +54,15 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.endTime"
+                                            type="date"
+                                            disabled
+                                            placeholder="请选择截止日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -338,6 +347,7 @@
                     itemsName: '',
                     itemsNum1: '',
                     itemsName1: '',
+                    endTime: '',
                 },
                 json: {},
             }
@@ -476,6 +486,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText6 = data.commentText6 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 783410f60..5f120ea66 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -76,7 +76,7 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
+                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled blueClass">
                   <el-input
                     v-model="form.responUserList"
                     style="display: none;"
@@ -404,7 +404,15 @@ export default {
       padding: 0 20px 0;
     }
   }
-
+  .blueClass {
+    background: #1E89FF;
+    /deep/.el-form-item__label {
+      color: #fff;
+    }
+    /deep/.el-input__inner {
+      color: #fff !important;
+    }
+  }
   .fileClass {
     cursor: pointer;
   }