招投标修改

jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue

@@ -114,7 +114,6 @@
         label="招标项目名称"
         align="center"
         prop="bidProjectName"
-        :formatter="projectNameFormat"
         min-width="150"
       />
       <el-table-column
@@ -234,7 +233,8 @@
               v-for="dict in bidProjectNameOptions"
               :key="dict.projectName + dict.id"
               :label="dict.projectName + '[' + dict.projectCode + ']'"
-              :value="dict.projectName + '[' + dict.projectCode + ']'"
+              :value="dict.projectName"
+              @click.native="chooseProject(dict)"
             />
           </el-select>
         </el-form-item>
@@ -440,6 +440,10 @@ export default {
     },
   },
   methods: {
+    chooseProject(data) {
+      // console.log(444, data);
+      this.form.projectCode = data.projectCode;
+    },
     /** 查询资格预审公告列表 */
     getList() {
       this.loading = true;
@@ -543,11 +547,11 @@ export default {
       this.$refs["form"].validate((valid) => {
         // 公告附件
         this.form.noticeAtttachment = JSON.stringify(this.noticeFileList);
-        // 项目编码
+        // // 项目编码
-        this.form.projectCode = this.form.bidProjectName.slice(
+        // this.form.projectCode = this.form.bidProjectName.slice(
-          this.form.bidProjectName.indexOf("[") + 1,
+        //   this.form.bidProjectName.indexOf("[") + 1,
-          this.form.bidProjectName.indexOf("]")
+        //   this.form.bidProjectName.indexOf("]")
-        );
+        // );
         if (valid) {
           if (this.form.id != null) {
             updateBidPrequ(this.form).then((response) => {

jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue

@@ -96,7 +96,6 @@
         label="招标项目名称"
         align="center"
         prop="bidProjectName"
-        :formatter="projectNameFormat"
         min-width="150"
       />
       <el-table-column
@@ -407,7 +406,8 @@
                   v-for="dict in bidProjectNameOptions"
                   :key="dict.projectName + dict.id"
                   :label="dict.projectName + '[' + dict.projectCode + ']'"
-                  :value="dict.projectName + '[' + dict.projectCode + ']'"
+                  :value="dict.projectName"
+                  @click.native="chooseProject(dict)"
                 />
               </el-select>
             </el-form-item>
@@ -1106,6 +1106,10 @@ export default {
     },
   },
   methods: {
+    chooseProject(data) {
+      // console.log(444, data);
+      this.form.projectCode = data.projectCode;
+    },
     /** 查询招标公告列表 */
     getList() {
       this.loading = true;
@@ -1302,10 +1306,10 @@ export default {
         // 附件
         this.form.attachment = JSON.stringify(this.fileList);
         // 项目编码
-        this.form.projectCode = this.form.bidProjectName.slice(
+        // this.form.projectCode = this.form.bidProjectName.slice(
-          this.form.bidProjectName.indexOf("[") + 1,
+        //   this.form.bidProjectName.indexOf("[") + 1,
-          this.form.bidProjectName.indexOf("]")
+        //   this.form.bidProjectName.indexOf("]")
-        );
+        // );
         if (valid) {
           if (this.form.id != null) {
             updateBidNotice(this.form).then((response) => {

jwtech-admin-page/src/views/project/bid/options/biddingFile.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item
+      <!-- <el-form-item
         label="招标项目名称"
         prop="bidProjectName"
         label-width="96px"
@@ -27,18 +27,25 @@
             @click="handleQuery"
           ></el-button>
         </el-input>
-      </el-form-item>
+      </el-form-item> -->
-
+      <el-form-item label="招标项目编码" prop="projectCode" label-width="96px">
-      <!-- <el-form-item label="项目编码" prop="proCode">
         <el-input
-          v-model="queryParams.data.proCode"
+          v-model="queryParams.data.projectCode"
           placeholder="请输入项目编码"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
-      </el-form-item> -->
+          <el-button
-      <el-form-item label="项目编号" prop="proNo">
+            type="primary"
+            slot="append"
+            icon="el-icon-search"
+            size="small"
+            @click="handleQuery"
+          ></el-button>
+        </el-input>
+      </el-form-item>
+      <!-- <el-form-item label="项目编号" prop="proNo">
         <el-input
           v-model="queryParams.data.proNo"
           placeholder="请输入项目编号"
@@ -46,7 +53,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item>
         <!-- <el-button

jwtech-admin-page/src/views/project/bid/options/candidatePage.vue

@@ -9,7 +9,7 @@
     >
       <el-form-item label="公示名称" prop="noticeName">
         <el-input
-          v-model="queryParams.cv.value"
+          v-model="queryParams.data.noticeName"
           placeholder="请输入公示名称"
           clearable
           size="small"
@@ -24,7 +24,23 @@
           ></el-button>
         </el-input>
       </el-form-item>
-
+      <el-form-item label="招标项目编码" prop="projectCode" label-width="96px">
+        <el-input
+          v-model="queryParams.data.projectCode"
+          placeholder="请输入项目编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-button
+            type="primary"
+            slot="append"
+            icon="el-icon-search"
+            size="small"
+            @click="handleQuery"
+          ></el-button>
+        </el-input>
+      </el-form-item>
       <!-- <el-form-item label="招标人" prop="tendererName">
         <el-input
           v-model="queryParams.data.tendererName"
@@ -826,18 +842,18 @@ export default {
           owerDept: null,
           remark: null,
         },
-        // 模糊查询
+        // // 模糊查询
-        cv: {
+        // cv: {
-          type: null,
+        //   type: null,
-          name: null,
+        //   name: null,
-          value: null,
+        //   value: null,
-        },
+        // },
         // 排序方式
         params: {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
       },
       // 公式基础信息表单参数
@@ -992,18 +1008,18 @@ export default {
           owerDept: null,
           remark: null,
         },
-        // 模糊查询
+        // // 模糊查询
-        cv: {
+        // cv: {
-          type: null,
+        //   type: null,
-          name: null,
+        //   name: null,
-          value: null,
+        //   value: null,
-        },
+        // },
         // 排序方式
         params: {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
       };
       this.resetForm("form");

jwtech-admin-page/src/views/project/bid/options/index.vue

@@ -28,7 +28,7 @@
       @tab-click="handleClick"
       style="margin-bottom: 20px"
     >
-      <el-tab-pane label="招标计划" name="bidBasePage">
+      <el-tab-pane label="招标计划" name="bidBasePage" :lazy="true">
         <bidBasePage
           :proNo="formData.proNo"
           :formData="formData"
@@ -39,6 +39,7 @@
         label="资格预审公告"
         name="PreQualificationPage"
         :disabled="!routeList[1].isEdit"
+        :lazy="true"
       >
         <PreQualificationPage :proNo="formData.proNo" />
       </el-tab-pane>
@@ -46,6 +47,7 @@
         label="招标公告"
         name="TenderAnnouncementPage"
         :disabled="!routeList[1].isEdit"
+        :lazy="true"
       >
         <TenderAnnouncementPage
           :proNo="formData.proNo"
@@ -56,6 +58,7 @@
         label="招标文件"
         name="biddingFile"
         :disabled="!routeList[1].isEdit"
+        :lazy="true"
       >
         <biddingFile
           :proNo="formData.proNo"
@@ -67,6 +70,7 @@
         label="中标候选人公示"
         name="candidatePage"
         :disabled="!routeList[1].isEdit"
+        :lazy="true"
       >
         <candidatePage :proNo="formData.proNo" />
       </el-tab-pane>
@@ -74,10 +78,16 @@
         label="中标结果"
         name="winningResultPage"
         :disabled="!routeList[1].isEdit"
+        :lazy="true"
       >
         <winningResultPage :proNo="formData.proNo" />
       </el-tab-pane>
-      <el-tab-pane label="项目合同" name="con" :disabled="!routeList[1].isEdit">
+      <el-tab-pane
+        label="项目合同"
+        name="con"
+        :disabled="!routeList[1].isEdit"
+        :lazy="true"
+      >
         <projectContract :proNo="formData.proNo" />
       </el-tab-pane>
     </el-tabs>

jwtech-admin-page/src/views/project/bid/options/projectContract.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item
+      <!-- <el-form-item
         label="招标项目名称"
         prop="bidProjectName"
         label-width="96px"
@@ -27,28 +27,43 @@
             @click="handleQuery"
           ></el-button>
         </el-input>
-      </el-form-item>
+      </el-form-item> -->
 
-      <!-- <el-form-item label="合同名称" prop="contractName">
+      <el-form-item label="合同名称" prop="contractName">
         <el-input
           v-model="queryParams.data.contractName"
           placeholder="请输入合同名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
-      </el-form-item> -->
+          <el-button
+            type="primary"
+            slot="append"
+            icon="el-icon-search"
+            size="small"
+            @click="handleQuery"
+          ></el-button>
+        </el-input>
+      </el-form-item>
 
-      <el-form-item label="项目编号" prop="proNo">
+      <el-form-item label="招标项目编码" prop="projectCode" label-width="96px">
         <el-input
-          v-model="queryParams.data.proNo"
+          v-model="queryParams.data.projectCode"
-          placeholder="请输入项目编号"
+          placeholder="请输入项目编码"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-button
+            type="primary"
+            slot="append"
+            icon="el-icon-search"
+            size="small"
+            @click="handleQuery"
+          ></el-button>
+        </el-input>
       </el-form-item>
-
       <el-form-item>
         <!-- <el-button
           type="cyan"

jwtech-admin-page/src/views/project/bid/options/winningResultPage.vue

@@ -9,7 +9,7 @@
     >
       <el-form-item label="公告名称" prop="noticeName">
         <el-input
-          v-model="queryParams.cv.value"
+          v-model="queryParams.data.noticeName"
           placeholder="请输入公告名称"
           clearable
           size="small"
@@ -24,6 +24,23 @@
           ></el-button>
         </el-input>
       </el-form-item>
+      <el-form-item label="招标项目编码" prop="projectCode" label-width="96px">
+        <el-input
+          v-model="queryParams.data.projectCode"
+          placeholder="请输入项目编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        >
+          <el-button
+            type="primary"
+            slot="append"
+            icon="el-icon-search"
+            size="small"
+            @click="handleQuery"
+          ></el-button>
+        </el-input>
+      </el-form-item>
       <!-- <el-form-item label="招标人" prop="tendererName">
         <el-input
           v-model="queryParams.data.tendererName"
@@ -114,20 +131,20 @@
         prop="projectCode"
         min-width="120"
       />
-      <!-- <el-table-column label="标段" align="center" prop="lotName" width="180" />
+      <!-- <el-table-column label="标段" align="center" prop="lotName" width="180" /> -->
       <el-table-column
         label="公告名称"
         align="center"
         prop="noticeName"
-        min-width="150"
+        min-width="120"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="招标人"
         align="center"
         prop="tendererName"
         min-width="150"
-      />
+      /> -->
-      <el-table-column
+      <!-- <el-table-column
         label="招标代理"
         align="center"
         prop="biddingAgency"
@@ -562,11 +579,11 @@ export default {
           remark: null,
         },
         // 模糊查询
-        cv: {
+        // cv: {
-          type: null,
+        //   type: null,
-          name: null,
+        //   name: null,
-          value: null,
+        //   value: null,
-        },
+        // },
         // 排序方式
         params: {
           // 按哪个字段排序
@@ -697,11 +714,11 @@ export default {
           remark: null,
         },
         // 模糊查询
-        cv: {
+        // cv: {
-          type: null,
+        //   type: null,
-          name: null,
+        //   name: null,
-          value: null,
+        //   value: null,
-        },
+        // },
         // 排序方式
         params: {
           // 按哪个字段排序
@@ -715,8 +732,8 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.queryParams.cv.type = "like";
+      // this.queryParams.cv.type = "like";
-      this.queryParams.cv.name = "noticeName";
+      // this.queryParams.cv.name = "noticeName";
       this.getList();
     },
     /** 重置按钮操作 */