From 1be73a29e9d3716dc72499e442434299e3926cca Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Wed, 19 Apr 2023 19:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=9C=80=E6=B1=82=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92/=E6=8B=9B=E6=A0=87=E7=AE=A1=E7=90=86/=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/materialManagement.js       |  39 +
 src/store/index.js                            |  16 +-
 .../biddingManagement.vue                     | 840 +++++++++++-------
 .../materialSupplierManagement.vue            | 259 ++----
 .../purchasingManagement/purchasing.vue       | 146 +--
 5 files changed, 681 insertions(+), 619 deletions(-)
 create mode 100644 src/assets/js/api/materialManagement.js

diff --git a/src/assets/js/api/materialManagement.js b/src/assets/js/api/materialManagement.js
new file mode 100644
index 00000000..91292a53
--- /dev/null
+++ b/src/assets/js/api/materialManagement.js
@@ -0,0 +1,39 @@
+/**
+ * api接口统一管理
+ */
+import {
+  post,
+  get
+} from '../http'
+
+//采购管理_采购需求计划
+export const addMaterialPurchaseDemandApi = data => post('/xmgl/gt/gtMaterialPurchaseDemandPlanning/add', data);
+export const deleteMaterialPurchaseDemandApi = data => post('/xmgl/gt/gtMaterialPurchaseDemandPlanning/delete', data);
+export const editMaterialPurchaseDemandApi = data => post('/xmgl/gt/gtMaterialPurchaseDemandPlanning/edit', data);
+export const getMaterialPurchaseDemandPageApi = data => get('/xmgl/gt/gtMaterialPurchaseDemandPlanning/page', data);
+
+
+//招采管理_招标管理
+export const addGtMaterialTenderApi = data => post('/xmgl/gt/gtMaterialTender/add', data);
+export const deleGtMaterialTenderApi = data => post('/xmgl/gt/gtMaterialTender/delete', data);
+export const editGtMaterialTenderApi = data => post('/xmgl/gt/gtMaterialTender/edit', data);
+export const getTMaterialTenderApi = data => get('/xmgl/gt/gtMaterialTender/page', data);
+
+//招采管理_招标管理_投标记录
+export const addGtMaterialTenderRecordApi = data => post('/xmgl/gt/gtMaterialTenderRecord/add', data);
+export const deletGtMaterialTenderRecordApi = data => post('/xmgl/gt/gtMaterialTenderRecord/delete', data);
+export const editGtMaterialTenderRecordApi = data => post('/xmgl/gt/gtMaterialTenderRecord/edit', data);
+export const getGtMaterialTenderRecordPageApi = data => get('/xmgl/gt/gtMaterialTenderRecord/page', data);
+
+//招采管理_招标管理_招标清单
+export const addGtMaterialTenderBidApi = data => post('/xmgl/gt/gtMaterialTenderBid/add', data);
+export const deletGtMaterialTenderBidApi = data => post('/xmgl/gt/gtMaterialTenderBid/delete', data);
+export const editGtMaterialTenderBidApi = data => post('/xmgl/gt/gtMaterialTenderBid/edit', data);
+export const getGtMaterialTenderBidPageApi = data => get('/xmgl/gt/gtMaterialTenderBid/page', data);
+
+
+//招采管理_供应商管理
+export const addGtMaterialVendorApi = data => post('/xmgl/gt/gtMaterialVendor/add', data);
+export const deletGtMaterialVendorApi = data => post('/xmgl/gt/gtMaterialVendor/delete', data);
+export const editGtMaterialVendorApi = data => post('/xmgl/gt/gtMaterialVendor/edit', data);
+export const gettGtMaterialVendorPageApi = data => get('/xmgl/gt/gtMaterialVendor/page', data);
diff --git a/src/store/index.js b/src/store/index.js
index 25d42a8c..4236c85e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -48,12 +48,12 @@ export default new Vuex.Store({
     BASEURL: baseUrl
       ? baseUrl
       : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    UPLOADURL:
-      window.location.protocol +
-      "//" +
-      window.location.host +
-      "/upload/image", //正式环境
-    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    // UPLOADURL:
+    //   window.location.protocol +
+    //   "//" +
+    //   window.location.host +
+    //   "/upload/image", //正式环境
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl
@@ -87,8 +87,8 @@ export default new Vuex.Store({
     // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
     // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
     // FILEURL: 'http://182.90.224.147:100/image/',//演示平台
-    // UPLOADURL: 'http://116.169.63.183:7070/upload/image',//三江集团
-    // FILEURL: 'http://116.169.63.183:7070/image/',//三江集团
+    UPLOADURL: 'http://192.168.34.221:8070/upload/image',//郭圣雄本地
+    FILEURL: 'http://192.168.34.221:8070/image/',//郭圣雄本地
     // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
     // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
 
diff --git a/src/views/projectFront/procurementManagement/biddingManagement.vue b/src/views/projectFront/procurementManagement/biddingManagement.vue
index 0240c236..41da8ba4 100644
--- a/src/views/projectFront/procurementManagement/biddingManagement.vue
+++ b/src/views/projectFront/procurementManagement/biddingManagement.vue
@@ -10,7 +10,7 @@
       >
         <el-form-item label="招标名称">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.tenderName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
@@ -28,49 +28,52 @@
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List" @row-click="showDetailFn">
         <el-table-column
-          prop="warehouseName"
+          prop="tenderName"
           label="招标名称"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="warehousePos"
+          prop="tenderUnit"
           align="center"
           label="招标单位"
         ></el-table-column>
         <el-table-column
-          prop="header"
+          prop="tenderMethod"
           align="center"
           label="招标方式"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="tenderType"
           align="center"
           label="招标类型"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="tenderDay"
           align="center"
-          label="招采时间（天）"
+          label="招采天数"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="releaseTime"
           align="center"
           label="发布时间"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="planContractAmount"
           align="center"
           label="计划合同金额"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="state"
           align="center"
           label="状态"
         ></el-table-column>
         <el-table-column prop="remark" label="备注" align="center">
         </el-table-column>
-        <el-table-column prop="remark" label="附件" align="center">
-        </el-table-column>
+        <!-- <el-table-column prop="annex" label="附件" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.annex}}
+          </template>
+        </el-table-column> -->
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns" style="margin-left: 10px !important">
@@ -117,71 +120,66 @@
       <div class="dialog_content">
         <el-form
           size="medium"
-          ref="addEditForm"
-          :model="addEditForm"
-          :rules="addEditRules"
+          ref="addInviteForm"
+          :model="addInviteForm"
+          :rules="addInviteFormRules"
           label-width="120px"
           class="dialogFormBox"
         >
-          <el-form-item label="招标名称" prop="warehouseName">
+          <el-form-item label="招标名称" prop="tenderName">
             <el-input
-              v-model="addEditForm.warehouseName"
+              v-model="addInviteForm.tenderName"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="招标单位" prop="warehousePos">
+          <el-form-item label="招标单位" prop="tenderUnit">
             <el-input
-              v-model="addEditForm.warehousePos"
+              v-model="addInviteForm.tenderUnit"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="招标方式" prop="header">
+          <el-form-item label="招标方式" prop="tenderMethod">
             <el-input
-              v-model="addEditForm.header"
+              v-model="addInviteForm.tenderMethod"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="招标类型" prop="headerPhone">
+          <el-form-item label="招标类型" prop="tenderType">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="addInviteForm.tenderType"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="招采天数" prop="remark">
+          <el-form-item label="招采天数" prop="tenderDay">
             <el-input
-              v-model="addEditForm.remark"
+              v-model="addInviteForm.tenderDay"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="发布时间" prop="remark">
+          <el-form-item label="发布时间" prop="remreleaseTimeark">
             <el-date-picker
-              v-model="addEditForm.remark"
+              v-model="addInviteForm.releaseTime"
               type="date"
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="计划合同金额" prop="remark">
+          <el-form-item label="计划合同金额" prop="planContractAmount">
             <el-input
-              v-model="addEditForm.remark"
+              v-model="addInviteForm.planContractAmount"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="状态" prop="remark">
-            <el-select v-model="value" placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
+          <el-form-item label="状态" prop="state">
+            <el-input
+              v-model="addInviteForm.state"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
           <el-form-item label="备注" prop="remark">
             <el-input
-              v-model="addEditForm.remark"
+              v-model="addInviteForm.remark"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -190,13 +188,15 @@
               class="upload-demo"
               name="files"
               :action="$store.state.UPLOADURL"
-              :on-remove="(file, fileList) => handleRemove(file, fileList)"
+              :on-remove="(file, fileList) => handleRemove(file, fileList, 1)"
               :multiple="false"
-              :on-success="(res, file) => handleSuccess(res, file)"
+              :on-success="(res, file) => handleSuccess(res, file, 1)"
               :file-list="surveySchemeList"
               accept=".doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf"
             >
-              <el-button size="medium" type="primary" plain> 上传附件 </el-button>
+              <el-button size="medium" type="primary" plain>
+                上传附件
+              </el-button>
             </el-upload>
           </el-form-item>
 
@@ -211,7 +211,7 @@
             <el-button
               type="primary"
               icon="el-icon-circle-check"
-              @click="submit"
+              @click="submitOne"
               size="medium"
               >{{ $t('message.deviceManage.save') }}
             </el-button>
@@ -236,65 +236,41 @@
           :inline="true"
         >
           <el-form-item label="招标名称" prop="orderNumber">
-            <el-input
-              disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
-            ></el-input>
+            <el-input disabled v-model="detailData.tenderName"></el-input>
           </el-form-item>
           <el-form-item label="招标单位" prop="orderNumber">
-            <el-input
-              disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
-            ></el-input>
+            <el-input disabled v-model="detailData.tenderUnit"></el-input>
           </el-form-item>
           <el-form-item label="招标方式" prop="buyerName">
-            <el-input
-              disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
-            ></el-input>
+            <el-input disabled v-model="detailData.tenderMethod"></el-input>
           </el-form-item>
           <el-form-item label="招标类型" prop="receivingAddr">
-            <el-input
-              disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
-            ></el-input>
+            <el-input disabled v-model="detailData.tenderType"></el-input>
           </el-form-item>
           <el-form-item label="招采天数" prop="receivingAddr">
-            <el-input
-              disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
-            ></el-input>
+            <el-input disabled v-model="detailData.tenderDay"></el-input>
           </el-form-item>
 
           <el-form-item label="发布时间" prop="remarks">
-            <el-input
-              disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
-            ></el-input>
+            <el-input disabled v-model="detailData.releaseTime"></el-input>
           </el-form-item>
 
           <el-form-item label="状态" prop="remarks">
-            <el-input
-              disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
-            ></el-input>
+            <el-input disabled v-model="detailData.state"></el-input>
           </el-form-item>
           <el-form-item label="备注" prop="remarks">
-            <el-input
-              disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
-            ></el-input>
+            <el-input disabled v-model="detailData.remark"></el-input>
           </el-form-item>
           <el-form-item label="计划合同金额" prop="remarks" label-width="100px">
             <el-input
               disabled
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              v-model="detailData.planContractAmount"
             ></el-input>
           </el-form-item>
           <el-form-item label="附件" prop="remarks">
             <!-- 下载附件 -->
             <el-button
-              @click.stop="download(scope.row.fileUploadUrl, '附件')"
+              @click.stop="download(detailData.annex,4)"
               type="primary"
               plain
               size="small"
@@ -319,30 +295,60 @@
         <div class="importMaterialBox" v-show="dialogSteps == 0">
           <el-table
             class="tables"
-            :data="orderMaterialList"
+            :data="ListRecord"
             height="360"
             style="min-height: auto"
           >
             <el-table-column
               label="投标单位"
-              prop="materialName"
+              prop="tenderUnit"
               align="center"
             ></el-table-column>
             <el-table-column
               label="商务文件"
-              prop="materialName"
+              prop="businessDocument"
               align="center"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <el-button
+                  @click="download(scope.row.businessDocument, 1)"
+                  type="text"
+                  size="small"
+                  >下载附件</el-button
+                >
+              </template>
+            </el-table-column>
             <el-table-column
               label="技术文件"
-              prop="materialSpecifications"
+              prop="technicalDocument"
               align="center"
-            ></el-table-column>
-            <el-table-column label="价格文件" prop="computeUnit" align="center">
+            >
+              <template slot-scope="scope">
+                <el-button
+                  @click="download(scope.row.technicalDocument, 2)"
+                  type="text"
+                  size="small"
+                  >下载附件</el-button
+                >
+              </template>
             </el-table-column>
-            <el-table-column label="上传时间" prop="materialNum" align="center">
+            <el-table-column
+              label="价格文件"
+              prop="technicalDocument"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  @click="download(scope.row.priceFile, 3)"
+                  type="text"
+                  size="small"
+                  >下载附件</el-button
+                >
+              </template>
             </el-table-column>
-            <el-table-column label="状态" prop="materialNum" align="center">
+            <el-table-column label="上传时间" prop="uploadTime" align="center">
+            </el-table-column>
+            <el-table-column label="状态" prop="state" align="center">
             </el-table-column>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
@@ -355,7 +361,7 @@
                     />
                     <span>编辑</span>
                   </div>
-                  <div @click="deleteDev(scope.row)" class="operationText">
+                  <div @click="delet(scope.row)" class="operationText">
                     <img
                       src="@/assets/images/icon-delete.png"
                       width="15px"
@@ -371,30 +377,34 @@
         <div class="importMaterialBox" v-show="dialogSteps == 1">
           <el-table
             class="tables"
-            :data="orderMaterialList"
+            :data="inventoryList"
             height="360"
             style="min-height: auto"
           >
             <el-table-column
               label="物品名称"
-              prop="materialName"
+              prop="itemName"
               align="center"
             ></el-table-column>
             <el-table-column
               label="规格型号"
-              prop="materialName"
+              prop="specificationAndModel"
               align="center"
             ></el-table-column>
             <el-table-column
               label="计量单位"
-              prop="materialSpecifications"
+              prop="measureUnit"
               align="center"
             ></el-table-column>
-            <el-table-column label="估算数量" prop="computeUnit" align="center">
+            <el-table-column
+              label="估算数量"
+              prop="estimateQuantity"
+              align="center"
+            >
             </el-table-column>
             <el-table-column
               label="物资采购单位"
-              prop="materialNum"
+              prop="materialProcurementUnit"
               align="center"
             >
             </el-table-column>
@@ -410,7 +420,7 @@
                     />
                     <span>编辑</span>
                   </div>
-                  <div @click="deleteDev(scope.row)" class="operationText">
+                  <div @click="delet(scope.row)" class="operationText">
                     <img
                       src="@/assets/images/icon-delete.png"
                       width="15px"
@@ -432,11 +442,7 @@
             size="medium"
             >{{ $t('message.deviceManage.cancel') }}
           </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-circle-check"
-            @click="submit"
-            size="medium"
+          <el-button type="primary" icon="el-icon-circle-check" size="medium"
             >{{ $t('message.deviceManage.save') }}
           </el-button>
         </div>
@@ -453,72 +459,79 @@
       <div class="dialog_content">
         <el-form
           size="medium"
-          ref="addEditForm"
-          :model="tenderRecordsForm"
+          ref="recordsForm"
+          :model="recordsForm"
+          :rules="recordsRules"
           label-width="120px"
           class="dialogFormBox"
         >
-          <el-form-item label="投标单位" prop="warehouseName">
+          <el-form-item label="投标单位" prop="tenderUnit">
             <el-input
-              v-model="addEditForm.warehouseName"
+              v-model="recordsForm.tenderUnit"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="上传时间" prop="header">
+          <el-form-item label="上传时间" prop="uploadTime">
             <el-date-picker
-              v-model="addEditForm.remark"
+              v-model="recordsForm.uploadTime"
               type="date"
               placeholder="选择日期"
               value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="状态" prop="headerPhone">
+          <el-form-item label="状态" prop="state">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="recordsForm.state"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="商务文件" prop="warehousePos">
+          <el-form-item label="商务文件" prop="businessDocument">
             <el-upload
               class="upload-demo"
               name="files"
               :action="$store.state.UPLOADURL"
-              :on-remove="(file, fileList) => handleRemove(file, fileList)"
+              :on-remove="(file, fileList) => handleRemove(file, fileList, 2)"
               :multiple="false"
-              :on-success="(res, file) => handleSuccess(res, file)"
-              :file-list="tenderRecordsList"
+              :on-success="(res, file) => handleSuccess(res, file, 2)"
+              :file-list="commercialAffairsList"
               accept=".doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf"
             >
-              <el-button size="medium" type="primary" plain> 上传附件 </el-button>
+              <el-button size="medium" type="primary" plain>
+                上传附件
+              </el-button>
             </el-upload>
           </el-form-item>
-          <el-form-item label="技术文件" prop="warehousePos">
+          <el-form-item label="技术文件" prop="technicalDocument">
             <el-upload
               class="upload-demo"
               name="files"
               :action="$store.state.UPLOADURL"
-              :on-remove="(file, fileList) => handleRemove(file, fileList)"
+              :on-remove="(file, fileList) => handleRemove(file, fileList, 3)"
               :multiple="false"
-              :on-success="(res, file) => handleSuccess(res, file)"
-              :file-list="tenderRecordsList"
+              :on-success="(res, file) => handleSuccess(res, file, 3)"
+              :file-list="technologyList"
               accept=".doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf"
             >
-              <el-button size="medium" type="primary" plain> 上传附件 </el-button>
+              <el-button size="medium" type="primary" plain>
+                上传附件
+              </el-button>
             </el-upload>
           </el-form-item>
-          <el-form-item label="价格文件" prop="warehousePos">
+          <el-form-item label="价格文件" prop="priceFile">
             <el-upload
               class="upload-demo"
               name="files"
               :action="$store.state.UPLOADURL"
-              :on-remove="(file, fileList) => handleRemove(file, fileList)"
+              :on-remove="(file, fileList) => handleRemove(file, fileList, 4)"
               :multiple="false"
-              :on-success="(res, file) => handleSuccess(res, file)"
-              :file-list="tenderRecordsList"
+              :on-success="(res, file) => handleSuccess(res, file, 4)"
+              :file-list="priceList"
               accept=".doc, .docx, .xls, .xlsx, .ppt, .pptx, .pdf"
             >
-              <el-button size="medium" type="primary" plain> 上传附件 </el-button>
+              <el-button size="medium" type="primary" plain>
+                上传附件
+              </el-button>
             </el-upload>
           </el-form-item>
 
@@ -528,14 +541,14 @@
               @click="tenderRecordsShow = false"
               icon="el-icon-circle-close"
               size="medium"
-              >{{ $t('message.deviceManage.cancel') }}
+              >取消
             </el-button>
             <el-button
               type="primary"
               icon="el-icon-circle-check"
-              @click="submit"
               size="medium"
-              >{{ $t('message.deviceManage.save') }}
+              @click="saveBtn(1)"
+              >保存
             </el-button>
           </div>
         </el-form>
@@ -552,39 +565,40 @@
       <div class="dialog_content">
         <el-form
           size="medium"
-          ref="addEditForm"
+          ref="tenderListForm"
           :model="tenderListForm"
+          :rules="tenderListFormRules"
           label-width="120px"
           class="dialogFormBox"
         >
-          <el-form-item label="物品名称" prop="warehouseName">
+          <el-form-item label="物品名称" prop="itemName">
             <el-input
-              v-model="addEditForm.warehouseName"
+              v-model="tenderListForm.itemName"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="规格型号" prop="header">
+          <el-form-item label="规格型号" prop="specificationAndModel">
             <el-input
-              v-model="addEditForm.header"
+              v-model="tenderListForm.specificationAndModel"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="计量单位" prop="headerPhone">
+          <el-form-item label="计量单位" prop="measureUnit">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="tenderListForm.measureUnit"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="估算数量" prop="headerPhone">
+          <el-form-item label="估算数量" prop="estimateQuantity">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="tenderListForm.estimateQuantity"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-         
-          <el-form-item label="物资采购单位" prop="headerPhone">
+
+          <el-form-item label="物资采购单位" prop="materialProcurementUnit">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="tenderListForm.materialProcurementUnit"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -594,14 +608,14 @@
               @click="tenderListShow = false"
               icon="el-icon-circle-close"
               size="medium"
-              >{{ $t('message.deviceManage.cancel') }}
+              >取消
             </el-button>
             <el-button
               type="primary"
               icon="el-icon-circle-check"
-              @click="submit"
               size="medium"
-              >{{ $t('message.deviceManage.save') }}
+              @click="saveBtn(2)"
+              >保存
             </el-button>
           </div>
         </el-form>
@@ -611,39 +625,96 @@
 </template>
 <script>
 import {
-  addStuffWarehouseApi,
-  deleteStuffWarehouseApi,
-  editStuffWarehouseApi,
-  getStuffWarehousePageApi
-} from '@/assets/js/api/warehouseManagement.js'
+  addGtMaterialTenderApi,//招标管理
+  deleGtMaterialTenderApi,
+  editGtMaterialTenderApi,
+  getTMaterialTenderApi,
+  addGtMaterialTenderRecordApi,//招标管理_投标记录
+  deletGtMaterialTenderRecordApi,
+  editGtMaterialTenderRecordApi,
+  getGtMaterialTenderRecordPageApi,
+  addGtMaterialTenderBidApi,//招标管理_投标记录
+  deletGtMaterialTenderBidApi,
+  editGtMaterialTenderBidApi,
+  getGtMaterialTenderBidPageApi
+} from '@/assets/js/api/materialManagement.js'
 export default {
-  mounted() {
+  created() {
     this.getList()
+    this.getRecordList()
+    this.getTendersList()
   },
   data() {
     return {
+      uploadaurl: '',
+      addInviteForm: {
+        tenderName: "",
+        tenderUnit: '',
+        tenderMethod: '',
+        tenderType: '',
+        tenderDay: '',
+        releaseTime: '',
+        planContractAmount: '',
+        state: '',
+        remark: '',
+        annex: '',
+      },//招标管理
+
+      recordsForm: {
+        tenderUnit: "",
+        uploadTime: "",
+        state: "",
+        businessDocument: "",//商务文件
+        technicalDocument: "",//技术文件
+        priceFile: "",//技术文件
+        gtMaterialTenderId: '',
+      },//招标管理
+      gtMaterialTenderId: '',//招标id
+
+      surveySchemeList: [],
+      addInviteFormRules: {},
+      recordsRules: {},
+      contractFormRules: {},
+      searchForm: {
+        tenderName: '',
+      },
+      pagInfo: {
+        pageNo: 1, //页数
+        pageSize: 10, //条数
+        total: 0 //总条数
+      },
+      List: [],
+      title: "",
+      dialogShow: false,
+      detailData: {},
+      ListRecord: [],
+      inventoryList: [],
+      commercialAffairsList: [],
+      technologyList: [],
+      priceList: [],
+      //----------------
       tenderListShowtitle: '',//详情-招标清单
       tenderListShow: false,//详情-招标清单
-      tenderListForm: {},//详情-招标清单
+      tenderListForm: {
+        itemName: '',
+        specificationAndModel: '',
+        estimateQuantity: '',
+        measureUnit: '',
+        materialProcurementUnit: '',
+      },//详情-招标清单
+      tenderListFormRules: {},
       tenderRecordStitle: '',//详情-投标记录
       tenderRecordsShow: false,//详情-投标记录
       tenderRecordsForm: {},//详情-投标记录
       tenderRecordsList: [],//详情-投标记录
-      orderMaterialList: [
-        {
-          materialName: '佳信捷招标',
-          materialSpecifications: '文件',
-          computeUnit: 'wenj',
-          materialNum: '1111'
-        }
-      ],
       detailData: {},
       dialogSteps: 0,
       contractForm: {},
       contractFormRules: {},
       addOrEditDialog: false,
-      surveySchemeList: [],
+
       value: '',
+      id: '',
       options: [
         {
           label: '发标', value: 0
@@ -655,15 +726,8 @@ export default {
           label: '中标', value: 2
         },
       ],
-      //------------
-      title: "",
-      dialogShow: false,
-      pagInfo: {
-        pageNo: 1, //页数
-        pageSize: 10, //条数
-        total: 0 //总条数
-      },
-      List: [],
+
+
       addEditForm: {
         warehouseName: '',//仓库名称
         warehousePos: '',//warehousePos
@@ -671,161 +735,45 @@ export default {
         headerPhone: '',//负责人电话
         remark: '',//备注
       },
-      addEditRules: {
-        warehouseName: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        warehousePos: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        header: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        headerPhone: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
 
-      },
-      searchForm: {
-        warehouseName: '',
-        warehouseNumber: '',
-        warehousePos: '',
-      },
     }
   },
   methods: {
-    //详情新增弹框
-    addDetails() {
-      if (this.dialogSteps == 0) {
-        this.tenderRecordStitle = '新增记录'
-        this.tenderRecordsShow = true
-      }else{
-        this.tenderListShow=true
-        this.tenderListShowtitle = '新增清单'
-
-      }
-    },
-    //详情编辑弹框
-    editComponent(obj) {
-      if (this.dialogSteps == 0) {
-        this.tenderRecordStitle = '编辑记录'
-        this.tenderRecordsShow = true
-        this.addEditForm = JSON.parse(JSON.stringify(obj))
-      }else{
-        this.tenderListShow=true
-        this.tenderListShowtitle = '编辑清单'
-        this.addEditForm = JSON.parse(JSON.stringify(obj))
-
-      }
-    },
-    //显示检查详细弹框
-    showDetailFn(row) {
-      // this.getRectifyRecordList(row.id)
-      // this.replyData = {
-      //   additionalRemarks: '',
-      //   fileList: []
-      // }
-      this.detailData = row
-      this.addOrEditDialog = true
-    },
-    //下载附件
-    download(url, name) {
-      // window.location.href = url;
-    },
-    // 删除文件
-    handleRemove(file, fileList) {
-      this.surveySchemeList = fileList
-      // console.log(this.surveySchemeList)
-      // this.$confirm(`确定移除 ${ file.name }？`);
-    },
-    handleSuccess(res, file) {
-      if (res.status == 'SUCCESS') {
-        // 上传成功！
-        this.$message.success(this.$t('message.deepFoundConfig.uploadSuccess'))
-        this.surveySchemeList.push({
-          name: file.name,
-          url: this.$store.state.FILEURL + file.response.data[0].imageUrl
-        })
-      }
-    },
-    //查询仓库数据
-    getList() {
-      getStuffWarehousePageApi({
-        pageNo: this.pagInfo.pageNo,
-        pageSize: this.pagInfo.pageSize,
-        projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
-        warehousePos: this.searchForm.warehousePos,
-      }).then((result) => {
-        if (result.success) {
-          this.List = result.result.records
-          this.pagInfo.total = result.result.total
-        }
-      })
-    },
-
     add() {
-      this.title = '新增仓库'
+      this.title = '新增招标'
       this.dialogShow = true
+      this.surveySchemeList = []
       this.close()
     },
 
     edit(obj) {
-      this.title = '编辑仓库'
+      this.title = '编辑招标'
       this.dialogShow = true
-      this.addEditForm = JSON.parse(JSON.stringify(obj))
+      this.addInviteForm = JSON.parse(JSON.stringify(obj))
+      this.surveySchemeList = obj.annex == '' ? obj.annex : []
+      if (typeof obj.annex === 'string') {
+        this.addInviteForm.annex = JSON.parse(obj.annex)
+        this.surveySchemeList = this.addInviteForm.annex
+
+      }
+
     },
-    submit() {
-      let params = JSON.parse(JSON.stringify(this.addEditForm))
+    //招标新增/编辑提交
+    submitOne() {
+      let params = JSON.parse(JSON.stringify(this.addInviteForm))
+      params.annex = JSON.stringify(this.surveySchemeList)
       params.projectSn = this.$store.state.projectSn
-      this.$refs.addEditForm.validate((valid) => {
+      this.$refs.addInviteForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增仓库') {
-            addStuffWarehouseApi(params).then((result) => {
+          if (this.title == '新增招标') {
+            addGtMaterialTenderApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑仓库') {
-            console.log('编辑信息', this.addEditForm)
-            editStuffWarehouseApi(params).then((result) => {
+          } else if (this.title === '编辑招标') {
+            editGtMaterialTenderApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -845,7 +793,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+          deleGtMaterialTenderApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({
@@ -868,12 +816,290 @@ export default {
         });
     },
 
-    close() {
-      this.addEditForm = {}
-      this.$nextTick(() => {
-        this.$refs.addEditForm.clearValidate()
+    //查询招标列表
+    getList() {
+      getTMaterialTenderApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+        tenderName: this.searchForm.tenderName,
+      }).then((result) => {
+        if (result.success) {
+          this.List = result.result.records
+          this.pagInfo.total = result.result.total
+        }
       })
     },
+
+    close() {
+      this.addInviteForm = {}
+      this.surveySchemeList = []
+      this.recordsForm = {}
+      this.tenderListForm = {}
+      this.commercialAffairsList = []
+      this.technologyList  = []
+      this.priceList   = []
+    },
+    //显示检查详细弹框
+    showDetailFn(row) {
+      console.log('row==========',row);
+      this.detailData = row
+      this.gtMaterialTenderId = this.detailData.id
+      this.addOrEditDialog = true
+      this.getRecordList()
+      this.getTendersList()
+    },
+    //查询投标记录
+    getRecordList() {
+      getGtMaterialTenderRecordPageApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+        gtMaterialTenderId: this.gtMaterialTenderId
+      }).then((result) => {
+        if (result.success) {
+          this.ListRecord = result.result.records
+          this.pagInfo.total = result.result.total
+        }
+      })
+    },
+    //查询招标清单
+    getTendersList() {
+      getGtMaterialTenderBidPageApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+        gtMaterialTenderId: this.gtMaterialTenderId
+      }).then((result) => {
+        if (result.success) {
+          this.inventoryList = result.result.records
+          this.pagInfo.total = result.result.total
+        }
+      })
+    },
+    //记录详情新增弹框
+    addDetails() {
+      if (this.dialogSteps == 0) {
+        this.tenderRecordStitle = '新增记录'
+        this.tenderRecordsShow = true
+        this.close()
+      } else {
+        this.tenderListShow = true
+        this.tenderListShowtitle = '新增清单'
+
+      }
+    },
+    //记录详情编辑弹框
+    editComponent(obj) {
+      if (this.dialogSteps == 0) {
+        this.tenderRecordStitle = '编辑记录'
+        this.tenderRecordsShow = true
+        this.recordsForm = JSON.parse(JSON.stringify(obj))
+        this.commercialAffairsList = obj.businessDocument
+
+        this.technologyList = obj.technicalDocument
+        this.priceList = obj.priceFile
+
+        if (typeof obj.businessDocument === 'string') {
+          this.recordsForm.businessDocument = JSON.parse(obj.businessDocument)
+          this.commercialAffairsList = this.recordsForm.businessDocument
+        }
+        if (typeof obj.technicalDocument === 'string') {
+          this.recordsForm.technicalDocument = JSON.parse(obj.technicalDocument)
+          this.technologyList = this.recordsForm.technicalDocument
+        }
+        if (typeof obj.priceFile === 'string') {
+          this.recordsForm.priceFile = JSON.parse(obj.priceFile)
+          this.priceList = this.recordsForm.priceFile
+        }
+
+      } else {
+        this.tenderListShow = true
+        this.tenderListShowtitle = '编辑清单'
+        this.tenderListForm = JSON.parse(JSON.stringify(obj))
+      }
+    },
+    //新增/编辑提交
+    saveBtn(type) {
+      if (type == 1) {
+        let params = JSON.parse(JSON.stringify(this.recordsForm))
+        params.projectSn = this.$store.state.projectSn
+        params.gtMaterialTenderId = this.gtMaterialTenderId
+        params.businessDocument = JSON.stringify(this.commercialAffairsList)
+        params.technicalDocument = JSON.stringify(this.technologyList)
+        params.priceFile = JSON.stringify(this.priceList)
+        this.$refs.recordsForm.validate((valid) => {
+          if (valid) {
+            if (this.tenderRecordStitle == '新增记录') {
+              addGtMaterialTenderRecordApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getRecordList()
+
+                }
+              })
+            } else if (this.tenderRecordStitle == '编辑记录') {
+              editGtMaterialTenderRecordApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getRecordList()
+
+                }
+              })
+            }
+            this.tenderRecordsShow = false
+          } else {
+            return false
+          }
+        })
+      } else {
+        let params = JSON.parse(JSON.stringify(this.tenderListForm))
+        params.projectSn = this.$store.state.projectSn
+        params.gtMaterialTenderId = this.gtMaterialTenderId
+        this.$refs.tenderListForm.validate((valid) => {
+          if (valid) {
+            if (this.tenderListShowtitle == '新增清单') {
+              addGtMaterialTenderBidApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getTendersList()
+
+                }
+              })
+            } else if (this.tenderListShowtitle == '编辑清单') {
+              editGtMaterialTenderBidApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getTendersList()
+
+                }
+              })
+            }
+            this.tenderListShow = false
+          } else {
+            return false
+          }
+        })
+      }
+
+    },
+    delet(obj) {
+      if (this.dialogSteps == 0) {
+        this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deletGtMaterialTenderRecordApi({ id: obj.id }).then((res) => {
+              if (res.success) {
+                this.getRecordList()
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+              } else {
+                this.$message({
+                  type: "error",
+                  message: res.message,
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+
+      } else {
+        this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deletGtMaterialTenderBidApi({ id: obj.id }).then((res) => {
+              if (res.success) {
+                this.getTendersList()()
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+              } else {
+                this.$message({
+                  type: "error",
+                  message: res.message,
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      }
+    },
+    //下载附件
+    download(item, type) {
+      if(item){
+        let arr = []
+      arr = JSON.parse(item)
+      arr.forEach(element => {
+        window.location.href = element.url;
+      });
+      }else{
+        this.$message.success('未查询到附件')
+      }
+     
+    
+    },
+    // 删除文件
+    handleRemove(file, fileList, type) {
+      if (type == 1) {
+        this.surveySchemeList = fileList
+      }
+      else if (type == 2) {
+        this.commercialAffairsList = fileList
+      }
+      else if (type == 3) {
+        this.technologyList = fileList
+      }
+      else if (type == 4) {
+        this.priceList = fileList
+      }
+    },
+    handleSuccess(res, file, type) {
+      if (res.status == 'SUCCESS') {
+        if (type == 1) {
+          this.surveySchemeList.push({
+            name: file.name,
+            url: this.$store.state.FILEURL + file.response.data[0].imageUrl
+          })
+        } else if (type == 2) {
+          this.commercialAffairsList.push({
+            name: file.name,
+            url: this.$store.state.FILEURL + file.response.data[0].imageUrl
+          })
+        }
+        else if (type == 3) {
+          this.technologyList.push({
+            name: file.name,
+            url: this.$store.state.FILEURL + file.response.data[0].imageUrl
+          })
+        }
+        else if (type == 4) {
+          this.priceList.push({
+            name: file.name,
+            url: this.$store.state.FILEURL + file.response.data[0].imageUrl
+          })
+        }
+      }
+      this.$message.success(this.$t('message.deepFoundConfig.uploadSuccess'))
+    },
     SizeChange(val) {
       this.pagInfo.pageSize = val
       this.getList()
diff --git a/src/views/projectFront/procurementManagement/materialSupplierManagement.vue b/src/views/projectFront/procurementManagement/materialSupplierManagement.vue
index d3047df5..3b77121b 100644
--- a/src/views/projectFront/procurementManagement/materialSupplierManagement.vue
+++ b/src/views/projectFront/procurementManagement/materialSupplierManagement.vue
@@ -8,47 +8,37 @@
         :model="searchForm"
         size="medium"
       >
-        <el-form-item
-          label="助查码"
-        >
+        <el-form-item label="助查码">
           <el-input
             v-model="searchForm.lookupCode"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <el-form-item
-          label="供应商名称"
-        >
+        <el-form-item label="供应商名称">
           <el-input
             v-model="searchForm.vendorName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <el-form-item
-          label="纳税人识别号"
-        >
+        <el-form-item label="纳税人识别号">
           <el-input
             v-model="searchForm.taxpayerIdentificationNumber"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <el-form-item
-          label="联系电话"
-        >
+        <el-form-item label="联系电话">
           <el-input
             v-model="searchForm.contactNumber"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <el-form-item
-          label="联系人"
-        >
+        <el-form-item label="联系人">
           <el-input
             v-model="searchForm.contact"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-       
+
         <el-form-item>
           <el-button type="primary" plain @click="getList">{{
             $t('message.energyManage.waybill.query')
@@ -83,46 +73,19 @@
           align="center"
           label="地址"
         ></el-table-column>
-        <el-table-column
-          prop="contact"
-          label="联系人"
-          align="center"
-        >
+        <el-table-column prop="contact" label="联系人" align="center">
         </el-table-column>
-        <el-table-column
-          prop="contactNumber"
-          label="电话"
-          align="center"
-        >
+        <el-table-column prop="contactNumber" label="电话" align="center">
         </el-table-column>
-        <el-table-column
-          prop="mail"
-          label="邮件"
-          align="center"
-        >
+        <el-table-column prop="mail" label="邮件" align="center">
         </el-table-column>
-        <el-table-column
-          prop="mail"
-          label="法人代表"
-          align="center"
-        >
+        <el-table-column prop="mail" label="法人代表" align="center">
         </el-table-column>
-        <el-table-column
-          prop="mail"
-          label="开户银行"
-          align="center"
-        >
+        <el-table-column prop="mail" label="开户银行" align="center">
         </el-table-column>
-        <el-table-column
-          prop="mail"
-          label="银行账号"
-          align="center"
-        >
+        <el-table-column prop="mail" label="银行账号" align="center">
         </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-        >
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns">
               <div @click="edit(scope.row)" class="operationText">
@@ -174,21 +137,13 @@
           label-width="120px"
           class="dialogFormBox"
         >
-          
-         
-          <el-form-item
-            label="助查码"
-            prop="lookupCode"
-          >
+          <el-form-item label="助查码" prop="lookupCode">
             <el-input
               v-model="addEditForm.lookupCode"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="供应商名称"
-            prop="vendorName"
-          >
+          <el-form-item label="供应商名称" prop="vendorName">
             <el-input
               v-model="addEditForm.vendorName"
               placeholder="请输入"
@@ -203,64 +158,43 @@
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="地址"
-            prop="address"
-          >
+          <el-form-item label="地址" prop="address">
             <el-input
               v-model="addEditForm.address"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="联系人"
-            prop="contact"
-          >
+          <el-form-item label="联系人" prop="contact">
             <el-input
               v-model="addEditForm.contact"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="联系电话"
-            prop="contactNumber"
-          >
+          <el-form-item label="联系电话" prop="contactNumber">
             <el-input
               v-model="addEditForm.contactNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="邮件"
-            prop="mail"
-          >
+          <el-form-item label="邮件" prop="mail">
             <el-input
               v-model="addEditForm.mail"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="法人代表"
-            prop="legalRepresentative"
-          >
+          <el-form-item label="法人代表" prop="legalRepresentative">
             <el-input
               v-model="addEditForm.legalRepresentative"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="开户银行"
-            prop="accountOpenedBank"
-          >
+          <el-form-item label="开户银行" prop="openedBankAccount">
             <el-input
-              v-model="addEditForm.accountOpenedBank"
+              v-model="addEditForm.openedBankAccount"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="银行账号"
-            prop="bankAccount"
-          >
+          <el-form-item label="银行账号" prop="bankAccount">
             <el-input
               v-model="addEditForm.bankAccount"
               placeholder="请输入"
@@ -289,11 +223,11 @@
 </template>
 <script>
 import {
-  addStuffVendorApi,
-  deleteStuffVendorApi,
-  editStuffVendorApi,
-  getStuffVendorPageApi
-} from '@/assets/js/api/warehouseManagement.js'
+  addGtMaterialVendorApi,
+  deletGtMaterialVendorApi,
+  editGtMaterialVendorApi,
+  gettGtMaterialVendorPageApi
+} from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
     // this.getFeedUnitList()
@@ -311,126 +245,39 @@ export default {
       },
       List: [],
       addEditForm: {
-        lookupCode:'',//助查码
-        vendorName:'',//供应商名称
-        taxpayerIdentificationNumber:'',//纳税人识别号
-        address:'',//地址
-        contact:'',//联系人
-        contactNumber:'',//联系电话
-        mail:'',//邮件
-        legalRepresentative:'',//法人代表
-        accountOpenedBank:'',//开户银行
-        bankAccount:'',//银行账号
+        lookupCode: '',
+        vendorName: '',
+        taxpayerIdentificationNumber: '',
+        address: '',
+        contact: '',
+        contactNumber: '',
+        mail: '',
+        legalRepresentative: '',
+        openedBankAccount: '',
+        bankAccount: '',
       },
-       addEditRules: {},
-      // addEditRules: {
-      //   lookupCode: [
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'blur'
-      //     },
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'change'
-      //     }
-      //   ],
-      //   vendorName: [
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'blur'
-      //     },
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'change'
-      //     }
-      //   ],
-      //   taxpayerIdentificationNumber: [
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'blur'
-      //     },
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'change'
-      //     }
-      //   ],
-      //   address: [
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'blur'
-      //     },
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'change'
-      //     }
-      //   ],
-      //   contact: [
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'blur'
-      //     },
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'change'
-      //     }
-      //   ],
-      //   mail: [
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'blur'
-      //     },
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'change'
-      //     }
-      //   ],
-      //   contactNumber: [
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'blur'
-      //     },
-      //     {
-      //       required: true,
-      //       message: this.$t('message.carManage.required'),
-      //       trigger: 'change'
-      //     }
-      //   ],
-
-      // },
+      addEditRules: {},
       searchForm: {
-        lookupCode:'',
-        vendorName:'',
-        taxpayerIdentificationNumber:'',
-        contactNumber:'',
-        contact:'',
+        lookupCode: '',
+        vendorName: '',
+        contactNumber: '',
+        taxpayerIdentificationNumber: '',
+        contact: '',
       },
     }
   },
   methods: {
     //查询仓库数据
     getList() {
-      getStuffVendorPageApi({
+      gettGtMaterialVendorPageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        lookupCode:this.searchForm.lookupCode,
-        vendorName:this.searchForm.vendorName,
-        taxpayerIdentificationNumber:this.searchForm.taxpayerIdentificationNumber,
-        contactNumber:this.searchForm.contactNumber,
-        contact:this.searchForm.contact,
+        lookupCode: this.searchForm.lookupCode,
+        vendorName: this.searchForm.vendorName,
+        contactNumber: this.searchForm.contactNumber,
+        taxpayerIdentificationNumber: this.searchForm.taxpayerIdentificationNumber,
+        contact: this.searchForm.contact,
       }).then((result) => {
         console.log('result====', result);
         if (result.success) {
@@ -457,7 +304,7 @@ export default {
       this.$refs.addEditForm.validate((valid) => {
         if (valid) {
           if (this.title == '新增仓库') {
-            addStuffVendorApi(params).then((result) => {
+            addGtMaterialVendorApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -465,7 +312,7 @@ export default {
             })
           } else if (this.title === '编辑仓库') {
             console.log('编辑信息', this.addEditForm)
-            editStuffVendorApi(params).then((result) => {
+            editGtMaterialVendorApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -485,7 +332,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffVendorApi({ id: obj.id }).then((res) => {
+          deletGtMaterialVendorApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({
diff --git a/src/views/projectFront/purchasingManagement/purchasing.vue b/src/views/projectFront/purchasingManagement/purchasing.vue
index 478b277d..9d44607f 100644
--- a/src/views/projectFront/purchasingManagement/purchasing.vue
+++ b/src/views/projectFront/purchasingManagement/purchasing.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="fullHeight whiteBlock">
     <div style="padding: 15px 15px 0">
-      <p class="pageTitle">采购管理</p>
+      <p class="pageTitle">采购需求计划</p>
       <el-form
         :inline="true"
         ref="searchForm"
@@ -10,14 +10,14 @@
       >
         <el-form-item label="物料名称">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.materialName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-       
+
         <el-form-item label="规格型号">
           <el-input
-            v-model="searchForm.warehousePos"
+            v-model="searchForm.specificationAndModel"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
@@ -36,32 +36,32 @@
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List">
         <el-table-column
-          prop="warehouseName"
+          prop="materialName"
           label="物料名称"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="warehousePos"
+          prop="specificationAndModel"
           align="center"
           label="规格型号"
         ></el-table-column>
         <el-table-column
-          prop="header"
+          prop="projectPlanUsage"
           align="center"
           label="项目计划用量"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="inventoryNumber"
           align="center"
           label="库存数"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="safetyStockNumber"
           align="center"
           label="安全库存数"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="purchasedQuantity"
           align="center"
           label="需采购数量"
         ></el-table-column>
@@ -69,7 +69,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <div class="tableBtns" style="margin-left: 60px !important;">
+            <div class="tableBtns" style="margin-left: 60px !important">
               <div @click="edit(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-edit.png"
@@ -115,43 +115,42 @@
           size="medium"
           ref="addEditForm"
           :model="addEditForm"
-          :rules="addEditRules"
           label-width="120px"
           class="dialogFormBox"
         >
-          <el-form-item label="物料名称" prop="warehouseName">
+          <el-form-item label="物料名称" prop="materialName">
             <el-input
-              v-model="addEditForm.warehouseName"
+              v-model="addEditForm.materialName"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="规格型号" prop="warehousePos">
+          <el-form-item label="规格型号" prop="specificationAndModel">
             <el-input
-              v-model="addEditForm.warehousePos"
+              v-model="addEditForm.specificationAndModel"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="项目计划用量" prop="header">
+          <el-form-item label="项目计划用量" prop="projectPlanUsage">
             <el-input
-              v-model="addEditForm.header"
+              v-model="addEditForm.projectPlanUsage"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="库存数" prop="headerPhone">
+          <el-form-item label="库存数" prop="inventoryNumber">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="addEditForm.inventoryNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="安全库存数" prop="remark">
+          <el-form-item label="安全库存数" prop="safetyStockNumber">
             <el-input
-              v-model="addEditForm.remark"
+              v-model="addEditForm.safetyStockNumber"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="需采购数量" prop="remark">
+          <el-form-item label="需采购数量" prop="purchasedQuantity">
             <el-input
-              v-model="addEditForm.remark"
+              v-model="addEditForm.purchasedQuantity"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -185,11 +184,11 @@
 </template>
 <script>
 import {
-  addStuffWarehouseApi,
-  deleteStuffWarehouseApi,
-  editStuffWarehouseApi,
-  getStuffWarehousePageApi
-} from '@/assets/js/api/warehouseManagement.js'
+  addMaterialPurchaseDemandApi,
+  deleteMaterialPurchaseDemandApi,
+  editMaterialPurchaseDemandApi,
+  getMaterialPurchaseDemandPageApi
+} from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
     this.getList()
@@ -205,79 +204,30 @@ export default {
       },
       List: [],
       addEditForm: {
-        warehouseName: '',//仓库名称
-        warehousePos: '',//warehousePos
-        header: '',//负责人
-        headerPhone: '',//负责人电话
-        remark: '',//备注
-      },
-      addEditRules: {
-        warehouseName: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        warehousePos: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        header: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        headerPhone: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-
+        materialName: "",//物料名称
+        specificationAndModel: "",//规格型号
+        projectPlanUsage: "",//项目计划用量
+        inventoryNumber: "",//库存数
+        safetyStockNumber: "",//安全库存数
+        purchasedQuantity: "",//需采购数量
+        remark: "",//备注
       },
+     
       searchForm: {
-        warehouseName: '',
-        warehouseNumber: '',
-        warehousePos: '',
+        materialName:"",
+        specificationAndModel:"",
       },
     }
   },
   methods: {
     //查询仓库数据
     getList() {
-      getStuffWarehousePageApi({
+      getMaterialPurchaseDemandPageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
-        warehousePos: this.searchForm.warehousePos,
+        materialName: this.searchForm.materialName,
+        specificationAndModel: this.searchForm.specificationAndModel,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -287,13 +237,13 @@ export default {
     },
 
     add() {
-      this.title = '新增仓库'
+      this.title = '新增计划'
       this.dialogShow = true
       this.close()
     },
 
     edit(obj) {
-      this.title = '编辑仓库'
+      this.title = '编辑计划'
       this.dialogShow = true
       this.addEditForm = JSON.parse(JSON.stringify(obj))
     },
@@ -302,16 +252,16 @@ export default {
       params.projectSn = this.$store.state.projectSn
       this.$refs.addEditForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增仓库') {
-            addStuffWarehouseApi(params).then((result) => {
+          if (this.title == '新增计划') {
+            addMaterialPurchaseDemandApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑仓库') {
+          } else if (this.title === '编辑计划') {
             console.log('编辑信息', this.addEditForm)
-            editStuffWarehouseApi(params).then((result) => {
+            editMaterialPurchaseDemandApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -331,7 +281,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+          deleteMaterialPurchaseDemandApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({