From 870b47472f99c9c1ca34433c09d65c27d7040023 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Wed, 11 Oct 2023 10:09:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E6=9C=9F=E6=9D=BF=E5=9D=97=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bid/options/TenderAnnouncementPage.vue    | 65 +++++++++++--------
 .../project/bid/options/candidatePage.vue     | 11 +++-
 .../project/bid/options/winningResultPage.vue |  5 +-
 .../src/views/project/report/index.vue        | 17 -----
 .../views/project/special/options/index.vue   | 33 +++++++---
 5 files changed, 72 insertions(+), 59 deletions(-)

diff --git a/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue b/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
index b9396ca0..d3e4e890 100644
--- a/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
@@ -441,22 +441,6 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="招标范围及规模" prop="bidScope">
-              <el-input
-                v-model="form.bidScope"
-                placeholder="请输入招标范围及规模"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="招标内容" prop="bidContent">
-              <el-input
-                v-model="form.bidContent"
-                placeholder="请输入招标内容"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="工期" prop="deliveryTime">
               <!-- <el-date-picker
@@ -486,6 +470,40 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="招标范围及规模" prop="bidScope">
+              <el-input
+                type="textarea"
+                :rows="4"
+                v-model="form.bidScope"
+                placeholder="请输入招标范围及规模"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="招标内容" prop="bidContent">
+              <el-input
+                type="textarea"
+                :rows="4"
+                v-model="form.bidContent"
+                placeholder="请输入招标内容"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item
+              label="投标资格能力要求"
+              prop="bidCapabilityRequirements"
+            >
+              <el-input
+                type="textarea"
+                :rows="4"
+                v-model="form.bidCapabilityRequirements"
+                placeholder="请输入投标资格能力要求"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item
               label="是否接受联合体投标"
@@ -505,17 +523,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="投标资格能力要求"
-              prop="bidCapabilityRequirements"
-            >
-              <el-input
-                v-model="form.bidCapabilityRequirements"
-                placeholder="请输入投标资格能力要求"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item
               label="是否采用电子招标投标方式"
@@ -711,12 +718,14 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item
               label="其他依法应当载明的内容"
               prop="otherLawContents"
             >
               <el-input
+                type="textarea"
+                :rows="4"
                 v-model="form.otherLawContents"
                 placeholder="请输入其他依法应当载明的内容"
               />
diff --git a/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue b/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
index e036132d..09f6cb18 100644
--- a/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/candidatePage.vue
@@ -470,7 +470,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="工期" prop="deliveryTime">
-              <el-date-picker
+              <!-- <el-date-picker
                 clearable
                 size="small"
                 style="width: 100%"
@@ -478,8 +478,13 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择工期"
-              >
-              </el-date-picker>
+              > 
+              </el-date-picker> -->
+
+              <el-input
+                v-model="candidateForm.deliveryTime"
+                placeholder="请输入工期"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue b/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue
index 218a8ce2..cc087684 100644
--- a/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue
+++ b/jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue
@@ -291,7 +291,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="工期" prop="deliveryTime">
-              <el-date-picker
+              <!-- <el-date-picker
                 clearable
                 size="small"
                 style="width: 100%"
@@ -300,7 +300,8 @@
                 value-format="yyyy-MM-dd"
                 placeholder="选择工期"
               >
-              </el-date-picker>
+              </el-date-picker> -->
+              <el-input v-model="form.deliveryTime" placeholder="请输入工期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/jwtech-admin-page/src/views/project/report/index.vue b/jwtech-admin-page/src/views/project/report/index.vue
index c5765172..7cf208ff 100644
--- a/jwtech-admin-page/src/views/project/report/index.vue
+++ b/jwtech-admin-page/src/views/project/report/index.vue
@@ -319,23 +319,6 @@
             </el-form-item>
           </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="是否属于规划内" prop="isBelongPlanning">
-              <el-select
-                v-model="form.isBelongPlanning"
-                placeholder="是否属于规划内"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="dict in IS"
-                  :key="dict"
-                  :label="dict"
-                  :value="dict"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="上报时间" prop="reportTime">
               <el-date-picker
diff --git a/jwtech-admin-page/src/views/project/special/options/index.vue b/jwtech-admin-page/src/views/project/special/options/index.vue
index afd74f46..0de310ab 100644
--- a/jwtech-admin-page/src/views/project/special/options/index.vue
+++ b/jwtech-admin-page/src/views/project/special/options/index.vue
@@ -1,14 +1,26 @@
 <template>
   <div class="app-container">
-    <!-- 面包屑 -->
-    <el-breadcrumb separator="/" style="margin-bottom: 20px">
-      <el-breadcrumb-item
-        v-for="(item, index) in routeList"
-        :key="item + index"
-        :to="routeList.length !== index + 1 ? { path: item.path } : undefined"
-        >{{ item.routeName }}</el-breadcrumb-item
-      >
-    </el-breadcrumb>
+    <el-row>
+      <el-col :span="24">
+        <!-- 面包屑 -->
+        <el-breadcrumb separator="/" style="margin-bottom: 20px">
+          <el-breadcrumb-item
+            v-for="(item, index) in routeList"
+            :key="item + index"
+            :to="
+              routeList.length !== index + 1 ? { path: item.path } : undefined
+            "
+            >{{ item.routeName }}</el-breadcrumb-item
+          >
+        </el-breadcrumb>
+      </el-col>
+      <!-- <el-col :span="12">
+        <el-button type="primary">返回</el-button>
+      </el-col> -->
+      <!-- <el-col :span="24">
+        <el-page-header @back="goBack" content="详情页面"></el-page-header>
+      </el-col> -->
+    </el-row>
 
     <el-tabs
       v-model="activeName"
@@ -127,6 +139,9 @@ export default {
     this.getList();
   },
   methods: {
+    goBack() {
+      this.$router.back();
+    },
     /** 查询专题项目前期背景信息列表 */
     getList() {
       this.queryParams.data.id = this.$route.query.baseDataId;