diff --git a/src/assets/js/api/materialManagement.js b/src/assets/js/api/materialManagement.js
index 91292a53..d1d49e70 100644
--- a/src/assets/js/api/materialManagement.js
+++ b/src/assets/js/api/materialManagement.js
@@ -37,3 +37,28 @@ export const addGtMaterialVendorApi = data => post('/xmgl/gt/gtMaterialVendor/ad
 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);
+
+//合同管理_基本信息
+export const addGtMaterialContractApi = data => post('/xmgl/gt/gtMaterialContract/add', data);
+export const deletGtMaterialContractApi = data => post('/xmgl/gt/gtMaterialContract/delete', data);
+export const editGtMaterialContractApi = data => post('/xmgl/gt/gtMaterialContract/edit', data);
+export const gettGtMaterialContractPageApi = data => get('/xmgl/gt/gtMaterialContract/page', data);
+
+//合同管理_基本信息_付款记录
+export const addGtMaterialContractPaymentRecordApi = data => post('/xmgl/gt/gtMaterialContractPaymentRecord/add', data);
+export const deletGtMaterialContractPaymentRecordApi = data => post('/xmgl/gt/gtMaterialContractPaymentRecord/delete', data);
+export const editGtMaterialContractPaymentRecordApi = data => post('/xmgl/gt/gtMaterialContractPaymentRecord/edit', data);
+export const getGtMaterialContractPaymentRecordPageApi = data => get('/xmgl/gt/gtMaterialContractPaymentRecord/list', data);
+
+//合同管理_基本信息_到货验收
+export const addGtMaterialContractArrivalAcceptanceApi = data => post('/xmgl/gt/gtMaterialContractArrivalAcceptance/add', data);
+export const deletGtMaterialContractArrivalAcceptanceApi = data => post('/xmgl/gt/gtMaterialContractArrivalAcceptance/delete', data);
+export const editGtMaterialContractArrivalAcceptanceApi = data => post('/xmgl/gt/gtMaterialContractArrivalAcceptance/edit', data);
+export const gettGMaterialContractArrivalAcceptancePageApi = data => get('/xmgl/gt/gtMaterialContractArrivalAcceptance/list', data);
+
+
+//合同管理_供应商评价记录
+export const addGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/add', data);
+export const deletGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/delete', data);
+export const editGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/edit', data);
+export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/gt/gtMaterialSupplierEvaluationRecord/page', data);
\ No newline at end of file
diff --git a/src/views/projectFront/contractManagement/basicInformation.vue b/src/views/projectFront/contractManagement/basicInformation.vue
index 11912b76..e68a2319 100644
--- a/src/views/projectFront/contractManagement/basicInformation.vue
+++ b/src/views/projectFront/contractManagement/basicInformation.vue
@@ -10,7 +10,7 @@
       >
         <el-form-item label="合同名称">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.contractName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
@@ -21,51 +21,53 @@
           <el-button type="warning" plain @click="refresh">{{
             $t('message.deviceManage.refresh')
           }}</el-button>
-          <el-button type="primary" size="medium" @click="add">新增</el-button>
+          <el-button type="primary" size="medium" @click="add(1)"
+            >新增</el-button
+          >
         </el-form-item>
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List" @row-click="showDetailFn">
         <el-table-column
-          prop="warehouseName"
+          prop="contractName"
           label="合同名称"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="warehousePos"
+          prop="contractNumber"
           align="center"
           label="合同编号"
         ></el-table-column>
         <el-table-column
-          prop="header"
+          prop="partyAUnits"
           align="center"
           label="甲方单位"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="partyBUnit"
           align="center"
           label="乙方单位"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="contractAmount"
           align="center"
           label="合同金额"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="paymentMethod"
           align="center"
           label="付款方式"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="advancePayment"
           align="center"
           label="预付款"
         ></el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns" style="margin-left: 40px !important">
-              <div @click.stop="edit(scope.row)" class="operationText">
+              <div @click.stop="edit(scope.row, 1)" class="operationText">
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
@@ -73,7 +75,7 @@
                 />
                 <span>编辑</span>
               </div>
-              <div @click.stop="deleteDev(scope.row)" class="operationText">
+              <div @click.stop="deleteDev(scope.row, 1)" class="operationText">
                 <img
                   src="@/assets/images/icon-delete.png"
                   width="15px"
@@ -113,103 +115,134 @@
           label-width="70px"
           :inline="true"
         >
-          <el-form-item label="签订日期" prop="orderNumber">
-            <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          <el-form-item label="签订日期" prop="signDate">
+            <el-date-picker
+              v-model="baseInfoFrom.signDate"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="合同编号" prop="orderNumber">
+          <el-form-item label="合同编号" prop="contractNumber">
             <el-input
+              v-model="baseInfoFrom.contractNumber"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="合同名称" prop="buyerName">
+          <el-form-item label="合同名称" prop="contractName">
             <el-input
+              v-model="baseInfoFrom.contractName"
               style="width: 485px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="合同类型" prop="receivingAddr">
+          <el-form-item label="合同类型" prop="contractType">
             <el-input
+              v-model="baseInfoFrom.contractType"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="开始时间" prop="receivingAddr">
-            <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              v-model="baseInfoFrom.startTime"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="结束时间" prop="receivingAddr">
-            <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker
+              v-model="baseInfoFrom.endTime"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="合同金额" prop="remarks">
+          <el-form-item label="合同金额" prop="contractAmount">
             <el-input
+              v-model="baseInfoFrom.contractAmount"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
 
           <el-form-item
             label="金额（大写）"
-            prop="remarks"
+            prop="amount"
             label-width="100px !important"
           >
             <el-input
+              v-model="baseInfoFrom.amount"
               style="width: 457px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="甲方单位" prop="remarks">
+          <el-form-item label="甲方单位" prop="partyAUnits">
             <el-input
+              v-model="baseInfoFrom.partyAUnits"
               style="width: 480px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="乙方单位" prop="remarks" label-width="70px">
+          <el-form-item label="乙方单位" prop="partyBUnit" label-width="70px">
             <el-input
+              v-model="baseInfoFrom.partyBUnit"
               style="width: 488px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="税点" prop="remarks">
+          <el-form-item label="税点" prop="taxPoint">
             <el-input
+              v-model="baseInfoFrom.taxPoint"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="签订人" prop="remarks">
+
+          <el-form-item label="签订人" prop="signatory">
             <el-input
+              v-model="baseInfoFrom.signatory"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="付款方式" prop="remarks">
+          <el-form-item label="付款方式" prop="paymentMethod">
             <el-input
+              v-model="baseInfoFrom.paymentMethod"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="结算方式" prop="remarks">
+          <el-form-item label="结算方式" prop="billingMethod">
             <el-input
+              v-model="baseInfoFrom.billingMethod"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="预付款" prop="remarks">
+          <el-form-item label="预付款" prop="advancePayment">
             <el-input
+              v-model="baseInfoFrom.advancePayment"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="保证金" prop="remarks">
+          <el-form-item label="保证金" prop="deposit">
             <el-input
+              v-model="baseInfoFrom.deposit"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="付款条件" prop="remarks">
+          <el-form-item label="付款条件" prop="paymentTerm">
             <el-input
+              v-model="baseInfoFrom.paymentTerm"
               style="width: 1330px"
               type="textarea"
               :rows="2"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="收款条件" prop="remarks">
+          <el-form-item label="收款条件" prop="receivingCondition">
             <el-input
+              v-model="baseInfoFrom.receivingCondition"
               style="width: 1330px"
               type="textarea"
               :rows="4"
@@ -218,6 +251,7 @@
           </el-form-item>
           <el-form-item label="备注" prop="remarks">
             <el-input
+              v-model="baseInfoFrom.remark"
               style="width: 1330px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
@@ -234,7 +268,7 @@
           <el-button
             type="primary"
             icon="el-icon-circle-check"
-            @click="submit"
+            @click="submit(1)"
             size="medium"
             >{{ $t('message.deviceManage.save') }}
           </el-button>
@@ -258,118 +292,161 @@
           label-width="70px"
           :inline="true"
         >
-          <el-form-item label="签订日期" prop="orderNumber">
-            <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          <el-form-item label="签订日期">
+            <el-date-picker
+              v-model="detailData.signDate"
+              disabled
+              type="date"
+              placeholder="选择日期"
+            >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="合同编号" prop="orderNumber">
+          <el-form-item label="合同编号">
             <el-input
+              v-model="detailData.contractNumber"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="合同名称" prop="buyerName">
+          <el-form-item label="合同名称">
             <el-input
+              v-model="detailData.contractName"
+              disabled
               style="width: 485px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="合同类型" prop="receivingAddr">
+          <el-form-item label="合同类型">
             <el-input
+              v-model="detailData.contractType"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="开始时间" prop="receivingAddr">
-            <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          <el-form-item label="开始时间">
+            <el-date-picker
+              v-model="detailData.startTime"
+              disabled
+              type="date"
+              placeholder="选择日期"
+            >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="结束时间" prop="receivingAddr">
-            <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+          <el-form-item label="结束时间">
+            <el-date-picker
+              v-model="detailData.endTime"
+              disabled
+              type="date"
+              placeholder="选择日期"
+            >
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="合同金额" prop="remarks">
+          <el-form-item label="合同金额">
             <el-input
+              v-model="detailData.contractAmount"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
 
-          <el-form-item
-            label="金额（大写）"
-            prop="remarks"
-            label-width="100px !important"
-          >
+          <el-form-item label="金额（大写）" label-width="100px !important">
             <el-input
+              v-model="detailData.amount"
+              disabled
               style="width: 457px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="甲方单位" prop="remarks">
+          <el-form-item label="甲方单位">
             <el-input
+              v-model="detailData.partyAUnits"
+              disabled
               style="width: 480px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="乙方单位" prop="remarks" label-width="70px">
+          <el-form-item label="乙方单位" label-width="70px">
             <el-input
+              v-model="detailData.partyBUnit"
+              disabled
               style="width: 488px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="税点" prop="remarks">
+          <el-form-item label="税点">
             <el-input
+              v-model="detailData.partyBUnit"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="签订人" prop="remarks">
+          <el-form-item label="签订人">
             <el-input
+              v-model="detailData.signatory"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="付款方式" prop="remarks">
+          <el-form-item label="付款方式">
             <el-input
+              v-model="detailData.paymentMethod"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="结算方式" prop="remarks">
+          <el-form-item label="结算方式">
             <el-input
+              v-model="detailData.billingMethod"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="预付款" prop="remarks">
+          <el-form-item label="预付款">
             <el-input
+              v-model="detailData.advancePayment"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="保证金" prop="remarks">
+          <el-form-item label="保证金">
             <el-input
+              v-model="detailData.deposit"
+              disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="付款条件" prop="remarks">
+          <el-form-item label="付款条件">
             <el-input
+              v-model="detailData.paymentTerm"
+              disabled
               style="width: 1330px"
               type="textarea"
               :rows="2"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="收款条件" prop="remarks">
+          <el-form-item label="收款条件">
             <el-input
+              v-model="detailData.receivingCondition"
+              disabled
               style="width: 1330px"
               type="textarea"
               :rows="4"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="备注" prop="remarks">
+          <el-form-item label="备注">
             <el-input
+              v-model="detailData.remark"
+              disabled
               style="width: 1330px"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
         </el-form>
         <div class="btnAdd">
-          <el-button type="primary" size="medium" @click="addDetails"
+          <el-button type="primary" size="medium" @click="add(2)"
             >新增</el-button
           >
         </div>
@@ -391,57 +468,108 @@
           >
             <el-table-column
               label="申请付款金额"
-              prop="materialName"
+              prop="requestPaymentAmount"
               align="center"
             ></el-table-column>
             <el-table-column
               label="申请付款时间"
-              prop="materialName"
+              prop="requestPaymentTime"
               align="center"
             ></el-table-column>
             <el-table-column
               label="付款人"
-              prop="materialSpecifications"
+              prop="payer"
               align="center"
             ></el-table-column>
-            <el-table-column label="付款状态" prop="computeUnit" align="center">
+            <el-table-column
+              label="付款状态"
+              prop="paymentStatus"
+              align="center"
+            >
             </el-table-column>
             <el-table-column
               label="实际付款金额"
-              prop="materialNum"
+              prop="actualPaymentAmount"
               align="center"
             >
             </el-table-column>
             <el-table-column
               label="实际付款时间"
-              prop="materialNum"
+              prop="actualPaymentTime"
               align="center"
             >
             </el-table-column>
-            <el-table-column label="付款凭证" prop="materialNum" align="center">
+            <el-table-column
+              label="付款凭证"
+              prop="paymentProof"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <img
+                  :preview="
+                    scope.row.invoiceVoucher[0]
+                      ? scope.row.invoiceVoucher[0].url
+                      : []
+                  "
+                  :src="
+                    scope.row.invoiceVoucher[0]
+                      ? scope.row.invoiceVoucher[0].url
+                      : []
+                  "
+                  alt=""
+                  width="50px"
+                />
+              </template>
             </el-table-column>
-            <el-table-column label="开票金额" prop="materialNum" align="center">
+            <el-table-column
+              label="开票金额"
+              prop="invoiceAmount"
+              align="center"
+            >
             </el-table-column>
-            <el-table-column label="税点" prop="materialNum" align="center">
+            <el-table-column label="税点" prop="taxPoint" align="center">
             </el-table-column>
             <el-table-column
               label="发票开具状态"
-              prop="materialNum"
+              prop="invoicingStatus"
               align="center"
             >
             </el-table-column>
-            <el-table-column label="发票凭证" prop="materialNum" align="center">
+            <el-table-column
+              label="发票凭证"
+              prop="invoiceVoucher"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <img
+                  :preview="
+                    scope.row.paymentProof[0]
+                      ? scope.row.paymentProof[0].url
+                      : []
+                  "
+                  :src="
+                    scope.row.paymentProof[0]
+                      ? scope.row.paymentProof[0].url
+                      : []
+                  "
+                  alt=""
+                  width="50px"
+                />
+              </template>
             </el-table-column>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
-                <div class="tableBtns" style="
+                <div
+                  class="tableBtns"
+                  style="
                     position: absolute;
                     width: 200px;
                     right: -65%;
                     top: 28% !important;
-                  ">
+                  "
+                >
                   <div
-                    @click="editComponent(scope.row)"
+                    @click="edit(scope.row, 2)"
                     class="operationText"
                     style="margin-right: 20px !important"
                   >
@@ -452,7 +580,7 @@
                     />
                     <span>编辑</span>
                   </div>
-                  <div @click="deleteDev(scope.row)" class="operationText">
+                  <div @click="deleteDev(scope.row, 2)" class="operationText">
                     <img
                       src="@/assets/images/icon-delete.png"
                       width="15px"
@@ -468,40 +596,100 @@
         <div class="importMaterialBox" v-show="dialogSteps == 1">
           <el-table
             class="tables"
-            :data="orderMaterialList"
+            :data="ArrivalList"
             height="360"
             style="min-height: auto"
           >
             <el-table-column
               label="到货数量"
-              prop="materialName"
+              prop="arrivedQuantity"
               align="center"
             ></el-table-column>
             <el-table-column
               label="到货时间"
-              prop="materialName"
+              prop="arrivalTime"
               align="center"
             ></el-table-column>
             <el-table-column
               label="负责人"
-              prop="materialSpecifications"
+              prop="head"
               align="center"
             ></el-table-column>
-            <el-table-column label="验收状态" prop="materialNum" align="center">
+            <el-table-column
+              label="验收状态"
+              prop="acceptanceStatus"
+              align="center"
+            >
             </el-table-column>
-            <el-table-column label="验收结果" prop="materialNum" align="center">
+            <el-table-column
+              label="验收结果"
+              prop="acceptanceResult"
+              align="center"
+            >
             </el-table-column>
-            <el-table-column label="到货照片" prop="materialNum" align="center">
+            <el-table-column
+              label="到货照片"
+              prop="arrivalPicture"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <img
+                  :preview="
+                    scope.row.arrivalPicture[0]
+                      ? scope.row.arrivalPicture[0].url
+                      : []
+                  "
+                  :src="
+                    scope.row.arrivalPicture[0]
+                      ? scope.row.arrivalPicture[0].url
+                      : []
+                  "
+                  alt=""
+                  width="50px"
+                />
+              </template>
             </el-table-column>
-            <el-table-column label="验收照片" prop="materialNum" align="center">
+            <el-table-column
+              label="验收照片"
+              prop="acceptancePhoto"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <img
+                  :preview="
+                    scope.row.acceptancePhoto[0]
+                      ? scope.row.acceptancePhoto[0].url
+                      : []
+                  "
+                  :src="
+                    scope.row.acceptancePhoto[0]
+                      ? scope.row.acceptancePhoto[0].url
+                      : []
+                  "
+                  alt=""
+                  width="50px"
+                />
+              </template>
             </el-table-column>
-            <el-table-column label="验收人" prop="materialNum" align="center">
+            <el-table-column
+              label="验收人"
+              prop="acceptancePerson"
+              align="center"
+            >
             </el-table-column>
-            <el-table-column label="验收时间" prop="materialNum" align="center">
+            <el-table-column
+              label="验收时间"
+              prop="acceptanceTime"
+              align="center"
+            >
             </el-table-column>
-            <el-table-column label="品类" prop="materialNum" align="center">
+            <el-table-column label="品类" prop="category" align="center">
             </el-table-column>
-            <el-table-column label="规格型号" prop="materialNum" align="center">
+            <el-table-column
+              label="规格型号"
+              prop="specificationAndModel"
+              align="center"
+            >
             </el-table-column>
 
             <el-table-column label="操作" align="center">
@@ -515,7 +703,7 @@
                     top: 28% !important;
                   "
                 >
-                  <div @click="editComponent(scope.row)" class="operationText">
+                  <div @click="edit(scope.row, 3)" class="operationText">
                     <img
                       src="@/assets/images/icon-edit.png"
                       width="15px"
@@ -523,7 +711,7 @@
                     />
                     <span>编辑</span>
                   </div>
-                  <div @click="deleteDev(scope.row)" class="operationText">
+                  <div @click="deleteDev(scope.row, 3)" class="operationText">
                     <img
                       src="@/assets/images/icon-delete.png"
                       width="15px"
@@ -537,20 +725,13 @@
           </el-table>
         </div>
 
-        <div class="dialog-footer" style="margin-right: 45%">
-          <el-button
-            class="cancleBtn"
-            @click="addOrEditDialog = false"
-            icon="el-icon-circle-close"
-            size="medium"
-            >{{ $t('message.deviceManage.cancel') }}
-          </el-button>
+        <div class="dialog-footer" style="margin-right: 48%">
           <el-button
             type="primary"
             icon="el-icon-circle-check"
-            @click="submit"
+            @click="addOrEditDialog = false"
             size="medium"
-            >{{ $t('message.deviceManage.save') }}
+            >确认
           </el-button>
         </div>
       </div>
@@ -572,91 +753,97 @@
           label-width="120px"
           class="dialogFormBox"
         >
-          <el-form-item label="申请付款金额" prop="warehouseName">
+          <el-form-item label="申请付款金额" prop="requestPaymentAmount">
             <el-input
-              v-model="addEditForm.warehouseName"
+              v-model="tenderRecordsForm.requestPaymentAmount"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="申请付款时间" prop="header">
+          <el-form-item label="申请付款时间" prop="requestPaymentTime">
+            <el-date-picker
+              style="width: 320px !important"
+              v-model="tenderRecordsForm.requestPaymentTime"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="付款人" prop="payer">
             <el-input
-              v-model="addEditForm.header"
+              v-model="tenderRecordsForm.payer"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="付款人" prop="headerPhone">
+          <el-form-item label="付款状态" prop="paymentStatus">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="tenderRecordsForm.paymentStatus"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="付款状态" prop="headerPhone">
+          <el-form-item label="实际付款金额" prop="actualPaymentAmount">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="tenderRecordsForm.actualPaymentAmount"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="实际付款金额" prop="headerPhone">
+          <el-form-item label="实际付款时间" prop="actualPaymentTime">
+            <el-date-picker
+              style="width: 320px !important"
+              v-model="tenderRecordsForm.actualPaymentTime"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="开票金额" prop="invoiceAmount">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="tenderRecordsForm.invoiceAmount"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="实际付款时间" prop="headerPhone">
+          <el-form-item label="税点" prop="taxPoint">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="tenderRecordsForm.taxPoint"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-         
-          <el-form-item label="开票金额" prop="headerPhone">
+          <el-form-item label="发票开具状态" prop="invoicingStatus">
             <el-input
-              v-model="addEditForm.headerPhone"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="税点" prop="headerPhone">
-            <el-input
-              v-model="addEditForm.headerPhone"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="发票开具状态" prop="headerPhone">
-            <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="tenderRecordsForm.invoicingStatus"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item label="付款凭证">
-              <el-upload
-                :action="$store.state.UPLOADURL"
-                list-type="picture-card"
-                multiple
-                name="files"
-                :limit="1"
-                :file-list="fileList"
-                :on-success="handleSuccess"
-                :on-remove="handleRemove"
-              >
-                <i class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList1"
+              :on-success="(file) => handleSuccess(file, 1)"
+              :on-remove="(file, fileList) => handleRemove(file, fileList, 1)"
+            >
+              <i class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
           <el-form-item label="发票凭证">
-              <el-upload
-                :action="$store.state.UPLOADURL"
-                list-type="picture-card"
-                multiple
-                name="files"
-                :limit="1"
-                :file-list="fileList"
-                :on-success="handleSuccess"
-                :on-remove="handleRemove"
-              >
-                <i class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
-        
-      
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList2"
+              :on-success="(file) => handleSuccess(file, 2)"
+              :on-remove="(file, fileList) => handleRemove(file, fileList, 2)"
+            >
+              <i class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
 
           <div class="dialog-footer">
             <el-button
@@ -669,7 +856,7 @@
             <el-button
               type="primary"
               icon="el-icon-circle-check"
-              @click="submit"
+              @click="submit(2)"
               size="medium"
               >{{ $t('message.deviceManage.save') }}
             </el-button>
@@ -688,94 +875,102 @@
       <div class="dialog_content">
         <el-form
           size="medium"
-          ref="addEditForm"
-          :model="tenderListForm"
+          ref="ArrivalFrom"
+          :model="ArrivalFrom"
           label-width="120px"
           class="dialogFormBox"
         >
-        <el-form-item label="到货数量" prop="warehouseName">
+          <el-form-item label="到货数量" prop="arrivedQuantity">
             <el-input
-              v-model="addEditForm.warehouseName"
+              v-model="ArrivalFrom.arrivedQuantity"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="到货时间" prop="header">
+          <el-form-item label="到货时间" prop="arrivalTime">
+            <el-date-picker
+              style="width: 320px !important"
+              v-model="ArrivalFrom.arrivalTime"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="负责人" prop="head">
             <el-input
-              v-model="addEditForm.header"
+              v-model="ArrivalFrom.head"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="负责人" prop="headerPhone">
+          <el-form-item label="验收状态" prop="acceptanceStatus">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="ArrivalFrom.acceptanceStatus"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="验收状态" prop="headerPhone">
+          <el-form-item label="验收结果" prop="acceptanceResult">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="ArrivalFrom.acceptanceResult"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="验收结果" prop="headerPhone">
+
+          <el-form-item label="验收人" prop="acceptancePerson">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="ArrivalFrom.acceptancePerson"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-         
-          <el-form-item label="验收人" prop="headerPhone">
+          <el-form-item label="验收时间" prop="acceptanceTime">
+            <el-date-picker
+              style="width: 320px !important"
+              v-model="ArrivalFrom.acceptanceTime"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="品类" prop="category">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="ArrivalFrom.category"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="验收时间" prop="headerPhone">
+          <el-form-item label="规格型号" prop="specificationAndModel">
             <el-input
-              v-model="addEditForm.headerPhone"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="品类" prop="headerPhone">
-            <el-input
-              v-model="addEditForm.headerPhone"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="规格型号" prop="headerPhone">
-            <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="ArrivalFrom.specificationAndModel"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item label="到货照片">
-              <el-upload
-                :action="$store.state.UPLOADURL"
-                list-type="picture-card"
-                multiple
-                name="files"
-                :limit="1"
-                :file-list="fileList"
-                :on-success="handleSuccess"
-                :on-remove="handleRemove"
-              >
-                <i class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList3"
+              :on-success="(file) => handleSuccess(file, 3)"
+              :on-remove="(file, fileList) => handleRemove(file, fileList, 3)"
+            >
+              <i class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
           <el-form-item label="验收照片">
-              <el-upload
-                :action="$store.state.UPLOADURL"
-                list-type="picture-card"
-                multiple
-                name="files"
-                :limit="1"
-                :file-list="fileList"
-                :on-success="handleSuccess"
-                :on-remove="handleRemove"
-              >
-                <i class="el-icon-plus"></i>
-              </el-upload>
-            </el-form-item>
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList4"
+              :on-success="(file) => handleSuccess(file, 4)"
+              :on-remove="(file, fileList) => handleRemove(file, fileList, 4)"
+            >
+              <i class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
           <div class="dialog-footer">
             <el-button
               class="cancleBtn"
@@ -787,7 +982,7 @@
             <el-button
               type="primary"
               icon="el-icon-circle-check"
-              @click="submit"
+              @click="submit(3)"
               size="medium"
               >{{ $t('message.deviceManage.save') }}
             </el-button>
@@ -799,189 +994,114 @@
 </template>
 <script>
 import {
-  addStuffWarehouseApi,
-  deleteStuffWarehouseApi,
-  editStuffWarehouseApi,
-  getStuffWarehousePageApi
-} from '@/assets/js/api/warehouseManagement.js'
+  addGtMaterialContractApi,//合同信息
+  deletGtMaterialContractApi,
+  editGtMaterialContractApi,
+  gettGtMaterialContractPageApi,
+  addGtMaterialContractPaymentRecordApi,//付款记录
+  deletGtMaterialContractPaymentRecordApi,
+  editGtMaterialContractPaymentRecordApi,
+  getGtMaterialContractPaymentRecordPageApi,
+  addGtMaterialContractArrivalAcceptanceApi,//到货验收
+  deletGtMaterialContractArrivalAcceptanceApi,
+  editGtMaterialContractArrivalAcceptanceApi,
+  gettGMaterialContractArrivalAcceptancePageApi
+} from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
     this.getList()
   },
   data() {
     return {
-      value1: '',
-      basicForTitle: '',//新增
-      tenderListShowtitle: '',//详情-招标清单
-      tenderListShow: false,//详情-招标清单
-      tenderListForm: {},//详情-招标清单
-      tenderRecordStitle: '',//详情-投标记录
-      tenderRecordsShow: false,//详情-投标记录
-      tenderRecordsForm: {},//详情-投标记录
-      tenderRecordsList: [],//详情-投标记录
-      orderMaterialList: [
-        {
-          materialName: '佳信捷招标',
-          materialSpecifications: '文件',
-          computeUnit: 'wenj',
-          materialNum: '1111'
-        }
-      ],
-      detailData: {},
-      dialogSteps: 0,
-      contractForm: {},
-      contractFormRules: {},
-      addOrEditDialog: false,
-      surveySchemeList: [],
-      value: '',
-      options: [
-        {
-          label: '发标', value: 0
-        },
-        {
-          label: '议标', value: 1
-        },
-        {
-          label: '中标', value: 2
-        },
-      ],
-      //------------
-      title: "",
-      dialogShow: false,
+      searchForm: {
+        contractName: '',
+      },
       pagInfo: {
         pageNo: 1, //页数
         pageSize: 10, //条数
         total: 0 //总条数
       },
+      baseInfoFrom: {
+        signDate: "",
+        contractNumber: "",
+        contractName: "",
+        contractType: "",
+        startTime: "",
+        endTime: "",
+        contractAmount: "",
+        amount: "",
+        partyAUnits: "",
+        partyBUnit: "",
+        taxPoint:'',
+        signatory: "",
+        paymentMethod: "",
+        billingMethod: "",
+        advancePayment: "",
+        deposit: "",
+        paymentTerm: "",
+        receivingCondition: "",
+        remarks: "",
+      },//基本信息表单
+      detailData: {},
+      dialogSteps: 0,
+      fileList1: [],
+      fileList2: [],
+      fileList3: [],
+      fileList4: [],
+      tenderRecordsForm: {
+        requestPaymentAmount: "",
+        requestPaymentTime: "",
+        payer: "",
+        paymentStatus: "",
+        actualPaymentAmount: "",
+        actualPaymentTime: "",
+        invoiceAmount: "",
+        taxPoint: "",
+        invoicingStatus: "",
+        paymentProof: "",//付款凭证
+        invoiceVoucher: "",//发票凭证
+        gtMaterialContractId: "",//合同id
+      },//付款记录表单
+      gtMaterialContractId: "",
+      ArrivalList: [],
+      ArrivalFrom: {
+        arrivedQuantity: "",
+        head: "",
+        acceptanceStatus: "",
+        acceptanceResult: "",
+        acceptancePerson: "",
+        acceptanceTime: "",
+        category: "",
+        specificationAndModel: "",
+        arrivalPicture: "",
+        acceptancePhoto: "",
+      },
       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'
-          }
-        ],
+      basicForTitle: '',//新增
+      tenderListShowtitle: '',
+      tenderListShow: false,
+      tenderListForm: {},
+      tenderRecordStitle: '',
+      tenderRecordsShow: false,
+      tenderRecordsForm: {},
+      tenderRecordsList: [],
+      orderMaterialList: [],
+      contractForm: {},
+      contractFormRules: {},
+      addOrEditDialog: false,
+      surveySchemeList: [],
+      dialogShow: false,
 
-      },
-      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({
+      gettGtMaterialContractPageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
-        warehousePos: this.searchForm.warehousePos,
+        contractName: this.searchForm.contractName,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -989,81 +1109,366 @@ export default {
         }
       })
     },
-
-    add() {
-      this.basicForTitle = '新增信息'
-      this.dialogShow = true
-      this.close()
-    },
-
-    edit(obj) {
-      this.basicForTitle = '编辑信息'
-      this.dialogShow = true
-      this.addEditForm = JSON.parse(JSON.stringify(obj))
-    },
-    submit() {
-      let params = JSON.parse(JSON.stringify(this.addEditForm))
-      params.projectSn = this.$store.state.projectSn
-      this.$refs.addEditForm.validate((valid) => {
-        if (valid) {
-          if (this.title == '新增仓库') {
-            addStuffWarehouseApi(params).then((result) => {
-              if (result.success) {
-                this.$message.success(result.message)
-                this.getList()
+    //查询付款记录
+    getPaymentList() {
+      getGtMaterialContractPaymentRecordPageApi({
+        projectSn: this.$store.state.projectSn,
+        gtMaterialContractId: this.gtMaterialContractId
+      }).then((result) => {
+        if (result.success) {
+          result.result.map((item) => {
+            if (item.invoiceVoucher.includes("[")) {
+              item.invoiceVoucher = JSON.parse(item.invoiceVoucher);
+              if (item.invoiceVoucher.length !== 0 && !item.invoiceVoucher[0].url.includes(this.$store.state.FILEURL)) {
+                item.invoiceVoucher[0].url =
+                  this.$store.state.FILEURL + item.invoiceVoucher[0].url;
               }
-            })
-          } else if (this.title === '编辑仓库') {
-            console.log('编辑信息', this.addEditForm)
-            editStuffWarehouseApi(params).then((result) => {
-              if (result.success) {
-                this.$message.success(result.message)
-                this.getList()
+            } else {
+              let url = item.invoiceVoucher
+
+              if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) {
+                item.invoiceVoucher = [{}]
+                item.invoiceVoucher[0].url =
+                  this.$store.state.FILEURL + url;
               }
-            })
-          }
-          this.dialogShow = false
-        } else {
-          return false
+            }
+            if (item.paymentProof.includes("[")) {
+              item.paymentProof = JSON.parse(item.paymentProof);
+              if (item.paymentProof.length !== 0 && !item.paymentProof[0].url.includes(this.$store.state.FILEURL)) {
+                item.paymentProof[0].url =
+                  this.$store.state.FILEURL + item.paymentProof[0].url;
+              }
+            } else {
+              let url = item.paymentProof
+
+              if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) {
+                item.paymentProof = [{}]
+                item.paymentProof[0].url =
+                  this.$store.state.FILEURL + url;
+              }
+            }
+
+          });
+          this.orderMaterialList = result.result
+
+
         }
       })
     },
-    deleteDev(obj) {
-      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
-            if (res.success) {
-              this.getList()
-              this.$message({
-                type: "success",
-                message: "删除成功!",
-              });
+    //查询到货验收
+    getArrivalList() {
+      gettGMaterialContractArrivalAcceptancePageApi({
+        projectSn: this.$store.state.projectSn,
+        gtMaterialContractId: this.gtMaterialContractId
+      }).then((result) => {
+        if (result.success) {
+          result.result.map((item) => {
+            if (item.arrivalPicture.includes("[")) {
+              item.arrivalPicture = JSON.parse(item.arrivalPicture);
+              if (item.arrivalPicture.length !== 0 && !item.arrivalPicture[0].url.includes(this.$store.state.FILEURL)) {
+                item.arrivalPicture[0].url =
+                  this.$store.state.FILEURL + item.arrivalPicture[0].url;
+              }
             } else {
-              this.$message({
-                type: "error",
-                message: res.message,
-              });
-            }
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
+              let url = item.arrivalPicture
 
-    close() {
-      this.addEditForm = {}
-      this.$nextTick(() => {
-        this.$refs.addEditForm.clearValidate()
+              if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) {
+                item.arrivalPicture = [{}]
+                item.arrivalPicture[0].url =
+                  this.$store.state.FILEURL + url;
+              }
+            }
+            if (item.acceptancePhoto.includes("[")) {
+              item.acceptancePhoto = JSON.parse(item.acceptancePhoto);
+              if (item.acceptancePhoto.length !== 0 && !item.acceptancePhoto[0].url.includes(this.$store.state.FILEURL)) {
+                item.acceptancePhoto[0].url =
+                  this.$store.state.FILEURL + item.acceptancePhoto[0].url;
+              }
+            } else {
+              let url = item.acceptancePhoto
+
+              if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) {
+                item.acceptancePhoto = [{}]
+                item.acceptancePhoto[0].url =
+                  this.$store.state.FILEURL + url;
+              }
+            }
+
+          });
+          this.ArrivalList = result.result
+
+
+        }
       })
     },
+    add(type) {
+      if (type == 1) {
+        this.basicForTitle = '新增信息'
+        this.dialogShow = true
+        this.baseInfoFrom = {}
+      } else if (type == 2 && this.dialogSteps == 0) {
+        this.tenderRecordStitle = '新增记录'
+        this.tenderRecordsShow = true
+        this.tenderRecordsForm = {}
+        this.close()
+      } else if (type == 2 && this.dialogSteps == 1) {
+        this.tenderListShow = true
+        this.tenderListShowtitle = '新增验收'
+        this.ArrivalFrom={}
+        this.close()
+
+      }
+    },
+    edit(obj, type) {
+      if (type == 1) {
+        this.basicForTitle = '编辑信息'
+        this.dialogShow = true
+        this.baseInfoFrom = JSON.parse(JSON.stringify(obj))
+      } else if (type == 2) {
+        this.tenderRecordStitle = '编辑记录'
+        this.tenderRecordsShow = true
+        this.tenderRecordsForm = JSON.parse(JSON.stringify(obj))
+        this.fileList1 = obj.invoiceVoucher
+        this.fileList2 = obj.paymentProof
+      } else {
+        this.tenderListShow = true
+        this.tenderListShowtitle = '编辑验收'
+        this.ArrivalFrom = JSON.parse(JSON.stringify(obj))
+        this.fileList3 = obj.arrivalPicture
+        this.fileList4 = obj.acceptancePhoto
+      }
+
+    },
+    //提交//编辑
+    submit(type) {
+      if (type == 1) {
+        let params = JSON.parse(JSON.stringify(this.baseInfoFrom))
+        params.projectSn = this.$store.state.projectSn
+        this.$refs.contractForm.validate((valid) => {
+          if (valid) {
+            if (this.basicForTitle == '新增信息') {
+              addGtMaterialContractApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getList()
+                }
+              })
+            } else if (this.basicForTitle === '编辑信息') {
+              editGtMaterialContractApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getList()
+                }
+              })
+            }
+            this.dialogShow = false
+          } else {
+            return false
+          }
+        })
+      } else if (type == 2) {
+        let params = JSON.parse(JSON.stringify(this.tenderRecordsForm))
+        params.projectSn = this.$store.state.projectSn
+        params.paymentProof = JSON.stringify(this.fileList1)
+        params.invoiceVoucher = JSON.stringify(this.fileList2)
+        params.gtMaterialContractId = this.gtMaterialContractId
+        this.$refs.addEditForm.validate((valid) => {
+          if (valid) {
+            if (this.tenderRecordStitle == '新增记录') {
+              addGtMaterialContractPaymentRecordApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getPaymentList()
+                }
+              })
+            } else if (this.tenderRecordStitle == '编辑记录') {
+              editGtMaterialContractPaymentRecordApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getPaymentList()
+                }
+              })
+            }
+            this.tenderRecordsShow = false
+          } else {
+            return false
+          }
+        })
+      } else {
+        let params = JSON.parse(JSON.stringify(this.ArrivalFrom))
+        params.projectSn = this.$store.state.projectSn
+        params.arrivalPicture = JSON.stringify(this.fileList3)
+        params.acceptancePhoto = JSON.stringify(this.fileList4)
+        params.gtMaterialContractId = this.gtMaterialContractId
+        this.$refs.ArrivalFrom.validate((valid) => {
+          if (valid) {
+            if (this.tenderListShowtitle == '新增验收') {
+              addGtMaterialContractArrivalAcceptanceApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getArrivalList()
+                }
+              })
+            } else if (this.tenderListShowtitle == '编辑验收') {
+              editGtMaterialContractArrivalAcceptanceApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getArrivalList()
+                }
+              })
+            }
+            this.tenderListShow = false
+          } else {
+            return false
+          }
+        })
+      }
+
+    },
+    //删除
+    deleteDev(obj, type) {
+      if (type == 1) {
+        this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deletGtMaterialContractApi({ id: obj.id }).then((res) => {
+              if (res.success) {
+                this.getList()
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+              } else {
+                this.$message({
+                  type: "error",
+                  message: res.message,
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      } else if (type == 2) {
+        this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deletGtMaterialContractPaymentRecordApi({ id: obj.id }).then((res) => {
+              if (res.success) {
+                this.getPaymentList()
+                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(() => {
+            deletGtMaterialContractArrivalAcceptanceApi({ id: obj.id }).then((res) => {
+              if (res.success) {
+                this.getArrivalList()
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+              } else {
+                this.$message({
+                  type: "error",
+                  message: res.message,
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+      }
+    },
+    //显示检查详细弹框
+    showDetailFn(row) {
+      this.detailData = row
+      this.addOrEditDialog = true
+      this.gtMaterialContractId = this.detailData.id
+      this.getPaymentList()
+      this.getArrivalList()
+    },
+    // 删除文件
+    handleRemove(file, fileList, type) {
+      if (type == 1) {
+        this.fileList1 = fileList
+      } else if (type == 2) {
+        this.fileList2 = fileList
+      }
+      else if (type == 3) {
+        this.fileList3 = fileList
+      }
+      else if (type == 4) {
+        this.fileList4 = fileList
+      }
+    },
+    handleSuccess(file, type) {
+      let data = {
+        name: file.data[0].filename,
+        url: this.$store.state.FILEURL + file.data[0].imageUrl
+      }
+      if (type == 1) {
+        this.fileList1.push(
+          data
+        )
+      }
+      else if (type == 2) {
+        this.fileList2.push(
+          data
+        )
+      }
+      else if (type == 3) {
+        this.fileList3.push(
+          data
+        )
+      }
+      else if (type == 4) {
+        this.fileList4.push(
+          data
+        )
+      }
+
+
+    },
+    close() {
+      this.fileList1 = []
+      this.fileList2 = []
+      this.fileList3 = []
+      this.fileList4 = []
+    },
     SizeChange(val) {
       this.pagInfo.pageSize = val
       this.getList()
diff --git a/src/views/projectFront/contractManagement/evaluationRecords.vue b/src/views/projectFront/contractManagement/evaluationRecords.vue
index c457d06c..d8cab766 100644
--- a/src/views/projectFront/contractManagement/evaluationRecords.vue
+++ b/src/views/projectFront/contractManagement/evaluationRecords.vue
@@ -10,7 +10,7 @@
       >
         <el-form-item label="供应商名称">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.vendorName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
@@ -28,32 +28,32 @@
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List">
         <el-table-column
-          prop="warehouseName"
+          prop="vendorName"
           label="供应商名称"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="warehousePos"
+          prop="contractName"
           align="center"
           label="合同名称"
         ></el-table-column>
         <el-table-column
-          prop="header"
+          prop="evaluateContent"
           align="center"
           label="评价内容"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="evaluationScore"
           align="center"
           label="评价得分"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="evaluationUnit"
           align="center"
           label="评价单位"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="evaluationDate"
           align="center"
           label="评价日期"
         ></el-table-column>
@@ -108,41 +108,41 @@
           label-width="120px"
           class="dialogFormBox"
         >
-          <el-form-item label="供应商名称" prop="warehouseName">
+          <el-form-item label="供应商名称" prop="vendorName">
             <el-input
-              v-model="addEditForm.warehouseName"
+              v-model="addEditForm.vendorName"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="合同名称" prop="warehousePos">
+          <el-form-item label="合同名称" prop="contractName">
             <el-input
-              v-model="addEditForm.warehousePos"
+              v-model="addEditForm.contractName"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="评价内容" prop="header">
+          <el-form-item label="评价内容" prop="evaluateContent">
             <el-input
-            type="textarea"
+              type="textarea"
               :rows="2"
-              v-model="addEditForm.header"
+              v-model="addEditForm.evaluateContent"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="评价得分" prop="headerPhone">
+          <el-form-item label="评价得分" prop="evaluationScore">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="addEditForm.evaluationScore"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="评价单位" prop="remark">
+          <el-form-item label="评价单位" prop="evaluationUnit">
             <el-input
-              v-model="addEditForm.remark"
+              v-model="addEditForm.evaluationUnit"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="评价日期" prop="remark">
+          <el-form-item label="评价日期" prop="evaluationDate">
             <el-date-picker
-              v-model="addEditForm.remark"
+              v-model="addEditForm.evaluationDate"
               type="date"
               placeholder="选择日期"
             >
@@ -172,11 +172,11 @@
 </template>
 <script>
 import {
-  addStuffWarehouseApi,
-  deleteStuffWarehouseApi,
-  editStuffWarehouseApi,
-  getStuffWarehousePageApi
-} from '@/assets/js/api/warehouseManagement.js'
+  addGtMaterialSupplierEvaluationRecordApi,
+  deletGtMaterialSupplierEvaluationRecordApi,
+  editGtMaterialSupplierEvaluationRecordApi,
+  gettGMaterialSupplierEvaluationRecordPageApi
+} from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
     this.getList()
@@ -192,79 +192,28 @@ export default {
       },
       List: [],
       addEditForm: {
-        warehouseName: '',//仓库名称
-        warehousePos: '',//warehousePos
-        header: '',//负责人
-        headerPhone: '',//负责人电话
-        remark: '',//备注
+        vendorName: "",
+        contractName: "",
+        evaluateContent: "",
+        evaluationScore: "",
+        evaluationUnit: "",
+        evaluationDate: "",
       },
       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: '',
+        vendorName: '',
       },
     }
   },
   methods: {
     //查询仓库数据
     getList() {
-      getStuffWarehousePageApi({
+      gettGMaterialSupplierEvaluationRecordPageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
-        warehousePos: this.searchForm.warehousePos,
+        vendorName: this.searchForm.vendorName,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -289,16 +238,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 == '新增评价') {
+            addGtMaterialSupplierEvaluationRecordApi(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) => {
+            editGtMaterialSupplierEvaluationRecordApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -318,7 +267,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+          deletGtMaterialSupplierEvaluationRecordApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({
diff --git a/src/views/projectFront/procurementManagement/biddingManagement.vue b/src/views/projectFront/procurementManagement/biddingManagement.vue
index 41da8ba4..38fed2f2 100644
--- a/src/views/projectFront/procurementManagement/biddingManagement.vue
+++ b/src/views/projectFront/procurementManagement/biddingManagement.vue
@@ -270,7 +270,7 @@
           <el-form-item label="附件" prop="remarks">
             <!-- 下载附件 -->
             <el-button
-              @click.stop="download(detailData.annex,4)"
+              @click.stop="download(detailData.annex, 4)"
               type="primary"
               plain
               size="small"
@@ -434,16 +434,13 @@
           </el-table>
         </div>
 
-        <div class="dialog-footer" style="margin-right: 45%">
+        <div class="dialog-footer" style="margin-right: 48%">
           <el-button
-            class="cancleBtn"
+            type="primary"
+            icon="el-icon-circle-check"
             @click="addOrEditDialog = false"
-            icon="el-icon-circle-close"
             size="medium"
-            >{{ $t('message.deviceManage.cancel') }}
-          </el-button>
-          <el-button type="primary" icon="el-icon-circle-check" size="medium"
-            >{{ $t('message.deviceManage.save') }}
+            >确认
           </el-button>
         </div>
       </div>
@@ -837,12 +834,12 @@ export default {
       this.recordsForm = {}
       this.tenderListForm = {}
       this.commercialAffairsList = []
-      this.technologyList  = []
-      this.priceList   = []
+      this.technologyList = []
+      this.priceList = []
     },
     //显示检查详细弹框
     showDetailFn(row) {
-      console.log('row==========',row);
+      console.log('row==========', row);
       this.detailData = row
       this.gtMaterialTenderId = this.detailData.id
       this.addOrEditDialog = true
@@ -1045,17 +1042,17 @@ export default {
     },
     //下载附件
     download(item, type) {
-      if(item){
+      if (item) {
         let arr = []
-      arr = JSON.parse(item)
-      arr.forEach(element => {
-        window.location.href = element.url;
-      });
-      }else{
+        arr = JSON.parse(item)
+        arr.forEach(element => {
+          window.location.href = element.url;
+        });
+      } else {
         this.$message.success('未查询到附件')
       }
-     
-    
+
+
     },
     // 删除文件
     handleRemove(file, fileList, type) {