From bf581ae28bf79acd9d122beb11e4bc10378dc717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Dec 2021 17:10:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/cancel.vue            | 14 ++---
 .../qbzxdjhgk/component/delay.vue             | 14 ++---
 .../qbzxdjhgk/component/establish.vue         | 54 +++++++++----------
 .../qbzxdjhgk/component/merge.vue             | 43 +++++++++------
 .../qbzxdjhgk/component/rename.vue            | 14 ++---
 5 files changed, 78 insertions(+), 61 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 6eda29949..98a8e70c5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -97,12 +97,14 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.unit"
-                placeholder="请输入起草责任单位"
-                clearable
-              ></el-input>
+              <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.unit"
+                  placeholder="请输入起草责任单位"
+                  clearable
+                ></el-input>
+              </el-tooltip>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 1be7ffa08..9f728ce76 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -105,12 +105,14 @@
              </el-date-picker>
            </el-form-item>
            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-             <el-input
-               readonly
-               v-model="qbfsForm.unit"
-               placeholder="请输入起草责任单位"
-               clearable
-             ></el-input>
+             <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+               <el-input
+                 readonly
+                 v-model="qbfsForm.unit"
+                 placeholder="请输入起草责任单位"
+                 clearable
+               ></el-input>
+             </el-tooltip>
            </el-form-item>
            <el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
              <el-date-picker
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 85df5d07d..cb6d77167 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -64,33 +64,33 @@
           placeholder="请选择计划标准发布时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >
-        <div style="display: flex;justify-content: space-between;align-items: center;">
-            <el-input
-              clearable
-              v-model="qbfsForm.unit"
-              placeholder="选择或输入起草单位">
-            </el-input>
-          <div>
-            <el-button
-              size="mini"
-              type="primary"
-              @click="QCDWClick"
-              class="common-button-primary">手动查找</el-button>
-          </div>
-        </div>
-      </el-form-item>
-<!--      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">-->
-<!--        <el-select v-model="qbfsForm.unit" filterable multiple  clearable>-->
-<!--          <el-option-->
-<!--            v-for="item in qcdwOptions"-->
-<!--            placeholder="请选择起草责任单位"-->
-<!--            :key="item.value"-->
-<!--            :value="item.label"-->
-<!--            :label="item.label"-->
-<!--          ></el-option>-->
-<!--        </el-select>-->
+<!--      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
+<!--        <div style="display: flex;justify-content: space-between;align-items: center;">-->
+<!--            <el-input-->
+<!--              clearable-->
+<!--              v-model="qbfsForm.unit"-->
+<!--              placeholder="选择或输入起草单位">-->
+<!--            </el-input>-->
+<!--          <div>-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="primary"-->
+<!--              @click="QCDWClick"-->
+<!--              class="common-button-primary">手动查找</el-button>-->
+<!--          </div>-->
+<!--        </div>-->
 <!--      </el-form-item>-->
+      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.unit" filterable multiple  clearable>
+          <el-option
+            v-for="item in qcdwOptions"
+            placeholder="请选择起草责任单位"
+            :key="item.value"
+            :value="item.label"
+            :label="item.label"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
         <el-input
           type="textarea"
@@ -185,7 +185,7 @@ export default {
       },
       qbfsFormRules: {
         unit: [
-          {required: true, message: '请输入单位', trigger: 'blur'},
+          {required: true, message: '请选择起草单位', trigger: 'change'},
         ],
         esName: [
           {required: true, message: '请输入企标名称', trigger: 'blur'},
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index b47e87d86..cffc1c0cc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -81,22 +81,33 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >
-              <div style="display: flex;justify-content: space-between;align-items: center;">
-                  <el-input
-                    clearable
-                    v-model="qbfsForm.unit"
-                    placeholder="选择或输入起草单位">
-                  </el-input>
-                <div>
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    @click="QCDWClick"
-                    class="common-button-primary">手动查找</el-button>
-                </div>
-              </div>
+            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>
+                <el-option
+                  v-for="item in qcdwOptions"
+                  placeholder="请选择起草责任单位"
+                  :key="item.value"
+                  :value="item.label"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
             </el-form-item>
+<!--            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
+<!--              <div style="display: flex;justify-content: space-between;align-items: center;">-->
+<!--                  <el-input-->
+<!--                    clearable-->
+<!--                    v-model="qbfsForm.unit"-->
+<!--                    placeholder="选择或输入起草单位">-->
+<!--                  </el-input>-->
+<!--                <div>-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="primary"-->
+<!--                    @click="QCDWClick"-->
+<!--                    class="common-button-primary">手动查找</el-button>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-form-item>-->
           </el-col>
           <el-col :span="12">
             <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -340,7 +351,7 @@ export default {
           {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
         ],
         unit: [
-          {required: true, message: '请输入单位', trigger: 'blur'},
+          {required: true, message: '请选择起草单位', trigger: 'change'},
         ],
         esName: [
           {required: true, message: '请输入企标名称', trigger: 'blur'},
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 923dfb9f3..93cf24ad0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -96,12 +96,14 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.unit"
-                placeholder="请输入起草责任单位"
-                clearable
-              ></el-input>
+              <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                <el-input
+                  readonly
+                  v-model="qbfsForm.unit"
+                  placeholder="请输入起草责任单位"
+                  clearable
+                ></el-input>
+              </el-tooltip>
             </el-form-item>
             <el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
               <el-input

From 3960a1df16a73021b08679a28afa9cbf51b07c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Dec 2021 17:23:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creatProcess/qbzxdjhgk/component/cancel.vue    | 14 ++++++++++++--
 .../creatProcess/qbzxdjhgk/component/delay.vue     | 14 ++++++++++++--
 .../creatProcess/qbzxdjhgk/component/rename.vue    | 14 ++++++++++++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 98a8e70c5..caa388024 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -97,14 +97,24 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+              <div v-if="qbfsForm.unit.length > 0">
+                <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.unit"
+                    placeholder="请输入起草责任单位"
+                    clearable
+                  ></el-input>
+                </el-tooltip>
+              </div>
+              <div v-else>
                 <el-input
                   readonly
                   v-model="qbfsForm.unit"
                   placeholder="请输入起草责任单位"
                   clearable
                 ></el-input>
-              </el-tooltip>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 9f728ce76..17c7c00a7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -105,14 +105,24 @@
              </el-date-picker>
            </el-form-item>
            <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-             <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+             <div v-if="qbfsForm.unit.length > 0">
+               <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                 <el-input
+                   readonly
+                   v-model="qbfsForm.unit"
+                   placeholder="请输入起草责任单位"
+                   clearable
+                 ></el-input>
+               </el-tooltip>
+             </div>
+             <div v-else>
                <el-input
                  readonly
                  v-model="qbfsForm.unit"
                  placeholder="请输入起草责任单位"
                  clearable
                ></el-input>
-             </el-tooltip>
+             </div>
            </el-form-item>
            <el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
              <el-date-picker
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 93cf24ad0..cdd97966a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -96,14 +96,24 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
-              <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+             <div v-if="qbfsForm.unit.length > 0">
+               <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
+                 <el-input
+                   readonly
+                   v-model="qbfsForm.unit"
+                   placeholder="请输入起草责任单位"
+                   clearable
+                 ></el-input>
+               </el-tooltip>
+             </div>
+              <div v-else>
                 <el-input
                   readonly
                   v-model="qbfsForm.unit"
                   placeholder="请输入起草责任单位"
                   clearable
                 ></el-input>
-              </el-tooltip>
+              </div>
             </el-form-item>
             <el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
               <el-input