From dcd2ce4975fca6202d1ba3d9e83731020e056e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 10 Jan 2022 16:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=E5=8F=8A?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=E7=BD=B2=E5=90=8D=E6=B5=81=E7=A8=8B=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/wbsm/step1.vue    | 10 +++++-----
 .../components/EnterpriseStandardDatabase.vue          | 10 +++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
index 7c1bab24d..68dd068cc 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue
@@ -162,15 +162,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="工程研究总院院长/FU/BU/SBU领导审批" placement="top"
+            <el-timeline-item timestamp="工程研究总院院长" placement="top"
                               :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="presidentName" style="margin-bottom: 0">
-                  <h4>工程研究总院院长/FU/BU/SBU领导</h4>
+                  <h4>工程研究总院院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.president" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentName" placeholder="选择工程研究总院院长/FU/BU/SBU领导"
-                              @click.native="choiceZRR('president', '工程研究总院院长/FU/BU/SBU领导', roleForm.president)"></el-input>
+                    <el-input v-model="roleForm.presidentName" placeholder="选择工程研究总院院长"
+                              @click.native="choiceZRR('president', '工程研究总院院长', roleForm.president)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -420,7 +420,7 @@ export default {
           {required: true, message: "请选择技术管理中心主任", trigger: "change"}
         ],
         presidentName: [
-          {required: true, message: "请选择工程研究总院院长/FU/BU/SBU领导", trigger: "change"}
+          {required: true, message: "请选择工程研究总院院长", trigger: "change"}
         ]
       },
     }
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 6a3408093..12180b323 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -3921,20 +3921,16 @@ export default {
                     advanceSearchVOList.push({
                       connect: advanceSearchVOList.length > 0 ? "and" : "",
                       field: item.attrField || "",
-                      type: "like",
-                      value: value
+                      type: "between",
+                      value: value.join(',')
                     });
                   }
                 })
             }
-          // formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+          formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
           this.SarExportSearchEo = formData;
           formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null;
           formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null;
-          formData.startFSRQBUSS = formData.FSRQBUSS ? formData.FSRQBUSS[0] : null;
-          formData.endFSRQBUSS = formData.FSRQBUSS ? formData.FSRQBUSS[1] : null;
-          formData.startFZRQBUSS = formData.FZRQBUSS ? formData.FZRQBUSS[0] : null;
-          formData.endFZRQBUSS = formData.FZRQBUSS ? formData.FZRQBUSS[1] : null;
           formData.startPutTime = formData.putTime ? formData.putTime[0] : null;
           formData.endPutTime = formData.putTime ? formData.putTime[1] : null;
           formData.FSRQBUSS = null;