diff --git a/src/api/Inventory/InboundCard.js b/src/api/Inventory/InboundCard.js
index da7f4230..a57066c3 100644
--- a/src/api/Inventory/InboundCard.js
+++ b/src/api/Inventory/InboundCard.js
@@ -28,7 +28,19 @@ export function searchInbound(data1, data2, data3) {
     method: 'post',
     data: {
       type: '1',
-      name: '库存管理_入库记录_查询',
+      name: '库存管理_入库记录_采购部查询',
+      param: '采购合同流水号=' + data1 + '&到货时间=' + data2 + '&仓库流水号=' + data3
+    }
+  })
+}
+// 入库记录查询
+export function searchShopInbound(data1, data2, data3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_入库记录_车间采购查询',
       param: '采购合同流水号=' + data1 + '&到货时间=' + data2 + '&仓库流水号=' + data3
     }
   })
diff --git a/src/api/Inventory/PartsReplacement.js b/src/api/Inventory/PartsReplacement.js
index adb6bf3b..bcfccbbf 100644
--- a/src/api/Inventory/PartsReplacement.js
+++ b/src/api/Inventory/PartsReplacement.js
@@ -109,6 +109,18 @@ export function deleteReplacementCard(Number) {
     }
   })
 }
+// 补投删除
+export function deleteCardDetail(Number) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_补投单_补投单明细删除',
+      param: '补投单明细流水号=' + Number
+    }
+  })
+}
 // 补投增加
 export function addCardDetail(Number, project, machine, team, name, mass, locate, parttype, reason) {
   return request({
@@ -121,3 +133,16 @@ export function addCardDetail(Number, project, machine, team, name, mass, locate
     }
   })
 }
+
+// 补投单明细查询
+export function searchCardDetail(cardNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_仓库补投_补投单明细_查询',
+      param: '补投单流水号=' + cardNumber
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
new file mode 100644
index 00000000..b6543ae1
--- /dev/null
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+// 初始化 项目名称
+export function getEntryNameValue() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_项目名称_查询数据',
+      param: '考核状态=5=int'
+    }
+  })
+}
diff --git a/src/api/MarketingCenter/BidBond.js b/src/api/MarketingCenter/BidBond.js
index 888db345..fafb42a2 100644
--- a/src/api/MarketingCenter/BidBond.js
+++ b/src/api/MarketingCenter/BidBond.js
@@ -18,8 +18,8 @@ export function selectBidBond() {
     data: {
       type: '1',
       name: '投标保证金管理_投标保证金查询',
-      param: '是否收回_check=' + arguments[0] + '&是否收回=' + arguments[1] + '&保金类型_check=' + arguments[2] + '&保金类型=' + arguments[3] + '&投标人_check=' + arguments[4] + '&投标人=' + arguments[5] + '&招标企业_check=' + arguments[6] + '&招标企业=' + arguments[7] + '&开始日期_check=' + arguments[8] + '&开始日期=' + arguments[9] + '&结束日期_check=' + arguments[10] + '&结束日期=' + arguments[11],
-      Pagination: arguments[12] + '&' + arguments[13]
+      param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9],
+      Pagination: arguments[10] + '&' + arguments[11]
     }
   })
 }
@@ -90,7 +90,7 @@ export function addBidBond() {
     data: {
       type: '2',
       name: '投标保证金管理_投标保证金信息_增加',
-      param: '招标企业=' + arguments[0] + '&联系人=' + arguments[1] + '&联系电话=' + arguments[2] + '&保证金金额=' + arguments[3] + '&人员流水号=' + arguments[4] + '&保证金类型流水号=' + arguments[5] + '&投标日期=' + arguments[6] + '&预计收回日期=' + arguments[7] + '&备注=' + arguments[8] + '&提前X天提醒=' + arguments[9]
+      param: '招标企业=' + arguments[0] + '&联系人=' + arguments[1] + '&联系电话=' + arguments[2] + '&保证金金额=' + arguments[3] + '&人员流水号=' + arguments[4] + '&保证金类型流水号=' + arguments[5] + '&投标日期=' + arguments[6] + '&备注=' + arguments[7] + '&提前X天提醒=' + arguments[8]
     }
   })
 }
@@ -101,7 +101,7 @@ export function editBidBond() {
     data: {
       type: '2',
       name: '投标保证金管理_投标保证金信息_修改',
-      param: '招标企业=' + arguments[0] + '&联系人=' + arguments[1] + '&联系电话=' + arguments[2] + '&保证金金额=' + arguments[3] + '&人员流水号=' + arguments[4] + '&保证金类型流水号=' + arguments[5] + '&投标日期=' + arguments[6] + '&预计收回日期=' + arguments[7] + '&备注=' + arguments[8] + '&提前X天提醒=' + arguments[9] + '&招标保证金流水号=' + arguments[10]
+      param: '招标企业=' + arguments[0] + '&联系人=' + arguments[1] + '&联系电话=' + arguments[2] + '&保证金金额=' + arguments[3] + '&人员流水号=' + arguments[4] + '&保证金类型流水号=' + arguments[5] + '&投标日期=' + arguments[6] + '&备注=' + arguments[7] + '&提前X天提醒=' + arguments[8] + '&招标保证金流水号=' + arguments[9]
     }
   })
 }
@@ -116,3 +116,14 @@ export function delBidBond() {
     }
   })
 }
+export function winningBid() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '投标保证金管理_投标保证金信息_投标结果',
+      param: '招标保证金流水号=' + arguments[0] + '&投标结果=' + arguments[1] + '&公布日期=' + arguments[2] + '&中标服务费=' + arguments[3]
+    }
+  })
+}
diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 346008f6..59a2ae6c 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -261,7 +261,7 @@ export function selectBidBond() {
     data: {
       type: '1',
       name: '投标保证金管理_投标保证金查询',
-      param: '是否收回_check=' + arguments[0] + '&是否收回=' + arguments[1] + '&保金类型_check=' + arguments[2] + '&保金类型=' + arguments[3] + '&投标人_check=' + arguments[4] + '&投标人=' + arguments[5] + '&招标企业_check=' + arguments[6] + '&招标企业=' + arguments[7] + '&开始日期_check=' + arguments[8] + '&开始日期=' + arguments[9] + '&结束日期_check=' + arguments[10] + '&结束日期=' + arguments[11]
+      param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9]
     }
   })
 }
diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue
index 8f4709ed..067f423c 100644
--- a/src/views/Inventory/InboundCard/index.vue
+++ b/src/views/Inventory/InboundCard/index.vue
@@ -1,81 +1,83 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <span>采购合同编号:</span>
-      <el-select v-model="ContractValue" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
-        <el-option
-          v-for="item in Contract"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span class="demonstration">入库日期</span>
-      <el-date-picker
-        v-model="InboundDate"
-        type="date"
-        size="small"
-        value-format="yyyy-MM-dd"
-        format="yyyy-MM-dd"
-        placeholder="选择日期"/>
-      <span>仓库:</span>
-      <el-select v-model="InventoryValue" filterable clearable size="small" placeholder="仓库" style="width: 200px">
-        <el-option
-          v-for="item in Inventory"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button><br>
-    </el-card>
-    <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        border
-        style="width: 100%;"
-        height="400">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column label="存货编码" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.采购合同编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="存货名称" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="规格型号" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.实际到货数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="本币单价" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.单价 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="本币单价" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.单价 * scope.row.实际到货数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" min-width="120">
-          <template slot-scope="scope" align="center">
-            <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选入</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="采购部采购" name="first">
+        <el-card>
+          <span>采购合同编号:</span>
+          <el-select v-model="ContractValue" filterable clearable size="small" placeholder="采购合同" style="width: 200px">
+            <el-option
+              v-for="item in Contract"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span class="demonstration">入库日期</span>
+          <el-date-picker
+            v-model="InboundDate"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            placeholder="选择日期"/>
+          <span>仓库:</span>
+          <el-select v-model="InventoryValue" filterable clearable size="small" placeholder="仓库" style="width: 200px">
+            <el-option
+              v-for="item in Inventory"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchPartinfo()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" @click="searchPartinfo()">导出</el-button>
+        </el-card>
+        <el-card>
+          <el-table
+            v-loading="listLoading"
+            :data="tableData"
+            size="mini"
+            border
+            style="width: 100%;"
+            height="400">
+            <el-table-column
+              label="序号"
+              align="center"
+              type="index"
+              width="50"/>
+            <el-table-column label="存货名称" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="规格型号" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.实际到货数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="本币单价" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.单价 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="本币单价" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.单价 * scope.row.实际到货数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" min-width="120">
+              <template slot-scope="scope" align="center">
+                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选入</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-tab-pane>
+      <el-tab-pane label="车间采购" name="second">配置管理</el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -91,7 +93,8 @@ export default {
       InventoryValue: '',
       InboundDate: '',
       listLoading: '',
-      tableData: []
+      tableData: [],
+      activeName: 'first'
     }
   },
   computed: {
diff --git a/src/views/Inventory/PartsReplacement/index.vue b/src/views/Inventory/PartsReplacement/index.vue
index 9b06c74c..58f43481 100644
--- a/src/views/Inventory/PartsReplacement/index.vue
+++ b/src/views/Inventory/PartsReplacement/index.vue
@@ -42,7 +42,7 @@
     </el-card>
     <el-card v-show="altershow">
       <el-table
-        v-loading="loading1"
+        v-loading="loading"
         :data="tableData1"
         border
         style="width: 100%;max-height: 300px;"
@@ -103,10 +103,10 @@
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
-          :current-page="pageCurrent1"
+          :current-page="pageCurrent"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
+          :page-size="pageSize"
+          :total="total"
           style="display:inline-block;width:50%"
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange"
@@ -115,13 +115,13 @@
     </el-card>
     <el-card v-show="errorshow">
       <el-table
-        v-loading="loading1"
+        v-loading="loading2"
         :data="tableData2"
         border
         style="width: 100%;max-height: 300px;"
         height="300px"
         size="mini"
-        @selection-change="handleSelectionChange">
+        @selection-change="handleSelectionChange2">
         <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="项目名称" min-width="100" align="center">
           <template slot-scope="scope">
@@ -143,7 +143,7 @@
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="异常数量" min-width="50" align="center">
+        <el-table-column label="异常数量" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.异常数量 }}
           </template>
@@ -183,7 +183,7 @@
     </el-card>
     <el-card>
       <span>补投单号:</span>
-      <el-input v-model="repleacecard" placeholder="补投单号" size="small" clearable style="width: 150px"/>
+      <el-input v-model="repleacecard" placeholder="补投单号" size="small" clearable style="width: 200px"/>
       <span>仓库:</span>
       <el-select v-model="HouseNumber" placeholder="请选择仓库" size="small" @change="searchDemo();payMethodChange()">
         <el-option
@@ -209,16 +209,10 @@
         size="small"
         icon="el-icon-download"
         style="margin-left: 10px"
-        @click="addMateriel">选入物料</el-button>
+        @click="submitCardDetail">选入物料</el-button>
     </el-card>
     <el-card>
-      <el-table v-loading="" :data="tableData3" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="补投单状态" align="center" width="80" fixed="left">
-          <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.是否传递)===0" type="warning" size="small">未传递</el-tag>
-            <el-tag v-if="parseInt(scope.row.是否传递)===1" type="primary" size="small">已传递</el-tag>
-          </template>
-        </el-table-column>
+      <el-table v-loading="loading3" :data="tableData3" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable4">
         <el-table-column label="补投单编号" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.补投单编号 }}
@@ -242,7 +236,7 @@
         <el-table-column label="操作" align="center" width="280" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="parseInt(scope.row.离线合同状态) === 1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
-            <el-button type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">传递</el-button>
+            <el-button type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">导出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -257,35 +251,50 @@
           @size-change="handleSizeChange3"
           @current-change="handleCurrentChange3"/>
       </div>
-      <el-table v-loading="" :data="tableData4" border style="max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="离线请购单编号" align="center" min-width="150">
+      <el-table v-loading="loading4" :data="tableData4" border style="max-height: 300px;" height="300px" size="mini">
+        <el-table-column label="补投单编号" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ scope.row.请购单编号 }}
+            {{ scope.row.补投单编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" align="center" min-width="150">
+        <el-table-column label="项目名称" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="100">
+        <el-table-column label="机床图号" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="200">
+        <el-table-column label="组号" align="center" min-width="200">
           <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.名称 }}
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.仓库名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="类型名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.类型名称 }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-button :disabled="disable" type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <el-button :disabled="disable" type="danger" size="mini" icon="el-icon-delete" @click="deleteDetail(scope.row)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -294,7 +303,7 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchTeam, searchAlterRecord, searchErrorRecord, searchReplacementCard, addReplacementCard, initWarehouse } from '@/api/Inventory/PartsReplacement'
+import { initProject, searchmachine, searchTeam, searchAlterRecord, searchErrorRecord, searchReplacementCard, addReplacementCard, initWarehouse, addCardDetail, searchCardDetail, deleteReplacementCard, deleteCardDetail } from '@/api/Inventory/PartsReplacement'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -309,18 +318,18 @@ export default {
       tableData2: [],
       tableData3: [],
       tableData4: [],
-      listLoading: false,
-      listLoading2: false,
-      listLoading3: false,
-      listLoading4: false,
-      PageCurrent: 1,
-      PageSize: 10,
+      loading: false,
+      loading2: false,
+      loading3: false,
+      loading4: false,
+      pageCurrent: 1,
+      pageSize: 10,
       total: 0,
-      PageCurrent2: 1,
-      PageSize2: 10,
+      pageCurrent2: 1,
+      pageSize2: 10,
       total2: 0,
-      PageCurrent3: 1,
-      PageSize3: 10,
+      pageCurrent3: 1,
+      pageSize3: 10,
       total3: 0,
       ProjectValue_check: '',
       MachineValue_check: '',
@@ -332,7 +341,16 @@ export default {
       House: [],
       radio: '',
       altershow: true,
-      errorshow: false
+      errorshow: false,
+      projectGroup: [],
+      machineGroup: [],
+      partGroup: [],
+      nameGroup: [],
+      numberGroup: [],
+      locateGroup: [],
+      partType: [],
+      reasonGroup: [],
+      cardNumber: ''
     }
   },
   computed: {
@@ -361,6 +379,46 @@ export default {
         }
       })
     },
+    handleSelectionChange(val) {
+      this.projectGroup = []
+      this.machineGroup = []
+      this.partGroup = []
+      this.nameGroup = []
+      this.numberGroup = []
+      this.locateGroup = []
+      this.partType = []
+      this.reasonGroup = []
+      for (let i = 0; i < val.length; i++) {
+        this.projectGroup.push(val[i].项目流水号)
+        this.machineGroup.push(val[i].机床流水号)
+        this.partGroup.push(val[i].组件流水号)
+        this.nameGroup.push(val[i].名称)
+        this.numberGroup.push(val[i].数量)
+        this.locateGroup.push(val[i].货位流水号)
+        this.partType.push(val[i].零件类型)
+        this.reasonGroup.push(val[i].原因)
+      }
+    },
+    handleSelectionChange2(val) {
+      this.projectGroup = []
+      this.machineGroup = []
+      this.partGroup = []
+      this.nameGroup = []
+      this.numberGroup = []
+      this.locateGroup = []
+      this.partType = []
+      this.reasonGroup = []
+      for (let i = 0; i < val.length; i++) {
+        this.projectGroup.push(val[i].项目流水号)
+        this.machineGroup.push(val[i].机床流水号)
+        this.partGroup.push(val[i].组件流水号)
+        this.nameGroup.push(val[i].名称)
+        this.numberGroup.push(val[i].异常数量)
+        this.locateGroup.push(val[i].货位流水号)
+        this.partType.push(val[i].零件类型)
+        this.reasonGroup.push(val[i].异常原因)
+      }
+    },
     fetchData() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
     },
@@ -395,7 +453,7 @@ export default {
     },
     // 查询修改记录
     getAlterRecord() {
-      this.listLoading = true
+      this.loading = true
       this.tableData1 = []
       if (this.ProjectValue === '') {
         this.ProjectValue_check = 0
@@ -412,16 +470,18 @@ export default {
       } else {
         this.GroupNumValue_check = 1
       }
-      searchAlterRecord(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+      searchAlterRecord(this.pageCurrent, this.pageSize, this.rojectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
         this.tableData1 = response.data.rows
+        console.log(response.data)
+        console.log(this.tableData1)
         this.total = response.data.total
-        this.listLoading = false
+        this.loading = false
       })
       this.getErrorRecord()
     },
     // 查询异常记录
     getErrorRecord() {
-      this.listLoading2 = true
+      this.loading2 = true
       this.tableData2 = []
       if (this.ProjectValue === '') {
         this.ProjectValue_check = 0
@@ -438,54 +498,67 @@ export default {
       } else {
         this.GroupNumValue_check = 1
       }
-      searchErrorRecord(this.PageCurrent2, this.PageSize2, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+      searchErrorRecord(this.pageCurrent2, this.pageSize2, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
-        this.listLoading2 = false
+        this.loading2 = false
       })
     },
     handleSizeChange(val) {
       this.PageCurrent = 1
       this.PageSize = val
-      this.searchPartinfo()
+      this.getAlterRecord()
     },
     handleCurrentChange(val) {
       this.PageCurrent = val
-      this.searchPartinfo()
+      this.getAlterRecord()
     },
     handleSizeChange2(val) {
       this.PageCurrent2 = 1
       this.PageSize2 = val
-      this.searchPartinfo()
+      this.getErrorRecord()
     },
     handleCurrentChange2(val) {
       this.PageCurrent2 = val
-      this.searchPartinfo()
+      this.getErrorRecord()
+    },
+    handleSizeChange3(val) {
+      this.PageCurrent3 = 1
+      this.PageSize3 = val
+      this.getReplacement()
+    },
+    handleCurrentChange3(val) {
+      this.PageCurrent3 = val
+      this.getReplacement()
     },
     // 查询补投单
     getReplacement() {
-      this.listLoading3 = true
+      this.loading3 = true
       this.tableData3 = []
       if (this.repleacecard === '') {
         this.repleacecard_check = 0
       } else {
         this.repleacecard_check = 1
       }
-      searchReplacementCard(this.PageCurrent3, this.PageSize3, this.repleacecard_check, this.repleacecard).then(response => {
+      searchReplacementCard(this.pageCurrent3, this.pageSize3, this.repleacecard_check, this.repleacecard).then(response => {
         this.tableData3 = response.data.rows
         this.total3 = response.data.total
-        this.listLoading3 = false
+        this.loading3 = false
       })
     },
     addCard() {
-      addReplacementCard(this.people, this.HouseNumber).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('增加成功')
-          this.getReplacement()
-        } else {
-          this.$message.error('删除失败')
-        }
-      })
+      if (this.HouseNumber === '') {
+        this.$message.error('请选择仓库')
+      } else {
+        addReplacementCard(this.people, this.HouseNumber).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.getReplacement()
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      }
     },
     BasicShow() {
       if (this.radio === 1) {
@@ -495,6 +568,76 @@ export default {
         this.altershow = false
         this.errorshow = true
       }
+    },
+    searchTable4(row) {
+      this.cardNumber = row.补投单流水号
+      this.getdetail()
+    },
+    submitCardDetail() {
+      if (this.cardNumber === '') {
+        this.$message.error('请选择领料单')
+      } else {
+        addCardDetail(this.cardNumber, this.projectGroup, this.machineGroup, this.partGroup, this.nameGroup, this.numberGroup, this.locateGroup, this.partType, this.reasonGroup, this.CardDetail).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.searchTable4()
+          } else {
+            this.$message.error('增加失败')
+          }
+        })
+      }
+    },
+    // 查询补投单明细
+    getdetail() {
+      this.loading4 = true
+      searchCardDetail(this.cardNumber).then(response => {
+        this.tableData4 = response.data
+        this.loading4 = false
+      })
+    },
+    // 删除补投单
+    deleteOfflineContract(row) { // 删除请购单
+      this.$confirm('确定删除该补投单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteReplacementCard(row.补投单流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.getReplacement()
+          } else {
+            this.$message.error('数据占用')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 删除补投单明细
+    deleteDetail(row) {
+      this.$confirm('确定删除该补投单明细?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteCardDetail(row.补投单明细流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.getdetail()
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     }
   }
 }
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index a6ed0441..afd16c8e 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -2,8 +2,10 @@
   <div class="app-container">
     <!--顶栏结构-->
     <el-card>
-      <el-radio v-model="radio" label="1">未收回</el-radio>
-      <el-radio v-model="radio" label="2">已收回</el-radio>
+      <!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
+      <!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
+      <span style="margin-left: 10px">招标企业：</span>
+      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:140px" placeholder="请输入招标企业"/>
       <span style="margin-left: 20px">保金类型：</span>
       <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="margin-left: 10px;width: 100px">
         <el-option
@@ -14,8 +16,6 @@
       </el-select>
       <span style="margin-left: 10px">投标人：</span>
       <el-input v-model="Bidder" clearable size="small" style="width:100px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1" @clear="clear()"/>
-      <span style="margin-left: 10px">招标企业：</span>
-      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:140px" placeholder="请输入招标企业"/>
       <span style="margin-left: 10px">开始日期：</span>
       <el-date-picker
         v-model="startTime"
@@ -35,25 +35,30 @@
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">增加</el-button>
     </el-card>
-    <el-card>
-      <span>预警颜色说明：</span>
-      <el-tag type="info">未到时间</el-tag>
-      <el-tag type="warning">即将拖期</el-tag>
-      <el-tag type="danger">已拖期</el-tag>
-      <el-tag type="success">已收回</el-tag>
-      <el-tag style="background-color: lightgrey;color: #666666">履约金</el-tag>
-    </el-card>
 
     <!--投标保证金表格-->
     <el-card>
       <el-table
         v-loading="tableData1Loading"
-        :row-style="tableRowClassName"
         :data="tableData1"
         style="width: 100%"
         height="600"
-        border>
-        <el-table-column align="center" label="招标企业" width="300">
+        border
+        size="mini">
+        <el-table-column align="center" label="投标结果" width="190">
+          <template slot-scope="scope">
+            <el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
+              <el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
+              <el-radio :disabled="scope.row.是否禁用未中标" label="2">未中标</el-radio>
+            </el-radio-group>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="公布日期" width="100">
+          <template slot-scope="scope">
+            {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="招标企业" width="180">
           <template slot-scope="scope">
             {{ scope.row.招标企业 }}
           </template>
@@ -70,7 +75,28 @@
         </el-table-column>
         <el-table-column align="center" label="保证金金额" width="100">
           <template slot-scope="scope">
-            {{ scope.row.保证金金额 }}
+            <el-tag style="width: 80px" size="small">{{ scope.row.保证金金额 }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="中标服务费" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.中标服务费 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="转履约保证金金额" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.转履约保证金金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="应收回金额" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.应收回金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="实收回金额" width="100">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.是否收回) === 2" size="small" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</el-tag>
+            <el-tag v-else slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="投标人" width="100">
@@ -85,25 +111,30 @@
         </el-table-column>
         <el-table-column align="center" label="投标日期" width="150">
           <template slot-scope="scope">
-            {{ scope.row.投标日期 }}
+            {{ scope.row.投标日期.substring(0, scope.row.投标日期.length - 8) }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="计划收回日期" width="150">
           <template slot-scope="scope">
-            {{ scope.row.预计收回日期 }}
+            {{ !scope.row.预计收回日期 ? '结果未公布' : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="实际收回日期" width="150">
           <template slot-scope="scope">
-            {{ scope.row.实际收回日期 }}
+            {{ !scope.row.实际收回日期 ? '未收回' : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="状态" width="120">
           <template slot-scope="scope">
-            <div v-if="scope.row.状态 === '0'">未到预警时间</div>
-            <div v-else-if="scope.row.状态 === '1'">即将拖期</div>
-            <div v-else-if="scope.row.状态 === '2'">已拖期</div>
-            <div v-else >已收回</div>
+            <!--<div v-if="scope.row.状态 === '0'">未到预警时间</div>-->
+            <!--<div v-else-if="scope.row.状态 === '1'">即将拖期</div>-->
+            <!--<div v-else-if="scope.row.状态 === '2'">已拖期</div>-->
+            <!--<div v-else >已收回</div>-->
+            <el-tag v-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="small" style="width: 66px">未公布</el-tag>
+            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
+            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===0" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>
+            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===1" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>
+            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="备注">
@@ -126,13 +157,13 @@
               icon="el-icon-edit"
               @click.stop="ComplianceGold(scope.row)">履约</el-button>
             <el-button
-              :disabled="disabled"
+              :disabled="scope.row.是否禁用编辑"
               size="mini"
               type="primary"
               icon="el-icon-edit"
               @click.stop="editBidBond(scope.row);flag1 = 3">编辑</el-button>
             <el-button
-              :disabled="disabled"
+              :disabled="scope.row.是否禁用删除"
               size="mini"
               type="danger"
               icon="el-icon-delete"
@@ -233,7 +264,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="保证金金额" prop="保证金金额">
-              <el-input v-model="form2.保证金金额" size="small" placeholder="请输入保证金金额" style="width: 200px;"/>
+              <el-input-number v-model="form2.保证金金额" :precision="2" :step="0.1" style="width: 200px" size="small"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -268,26 +299,26 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="计划收回日期" prop="计划收回日期">
-              <el-date-picker
-                v-model="form2.计划收回日期"
-                style="width: 200px;"
-                value-format="yyyy-MM-dd"
-                size="small"
-                type="date"
-                placeholder="收回日期"/>
+            <el-form-item label="公布后X天收回" prop="提前X天提醒我">
+              <el-input-number v-model="form2.提前X天提醒我" :step="1" style="width: 200px" size="small"/>
             </el-form-item>
           </el-col>
+          <!--<el-col :span="12">-->
+          <!--<el-form-item label="计划收回日期" prop="计划收回日期">-->
+          <!--<el-date-picker-->
+          <!--v-model="form2.计划收回日期"-->
+          <!--style="width: 200px;"-->
+          <!--value-format="yyyy-MM-dd"-->
+          <!--size="small"-->
+          <!--type="date"-->
+          <!--placeholder="收回日期"/>-->
+          <!--</el-form-item>-->
+          <!--</el-col>-->
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="提前X天提醒我" prop="提前X天提醒我">
-              <el-input v-model="form2.提前X天提醒我" size="small" placeholder="提前X天提醒我" style="width: 200px;"/>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="备注" prop="备注">
-              <el-input v-model="form2.备注" size="small" placeholder="请输入备注" style="width: 200px;"/>
+              <el-input v-model="form2.备注" size="small" placeholder="请输入备注" style="width: 560px;"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -297,12 +328,33 @@
         <el-button type="primary" @click="submit('form2')">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="请输入" center style="min-height: 300px" width="23%">
+      <el-form ref="Timeform" :model="Timeform" :rules="TimeRules" label-width="150px">
+        <el-form-item label="投标结果公布日期" prop="投标结果公布日期">
+          <el-date-picker
+            v-model="Timeform.投标结果公布日期"
+            style="width: 200px;"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="请选择结果公布日期"/>
+        </el-form-item>
+        <el-form-item label="中标服务费" prop="中标服务费">
+          <el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :step="0.1" :max="tenderResultMax" style="width: 200px" size="small"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOffTime('Timeform')">取消</el-button>
+        <el-button type="primary" @click="submitTime('Timeform')">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond } from '@/api/MarketingCenter/BidBond'
+import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond, winningBid } from '@/api/MarketingCenter/BidBond'
 export default {
   components: {
     elInput
@@ -310,6 +362,7 @@ export default {
   data() {
     return {
       disabled: false,
+      tenderResultDisabled: false,
       BidBondCode: '',
       MoneyTypeCode: '',
       TypeOfGoldDeposit1: [],
@@ -331,8 +384,9 @@ export default {
       TenderingEnterprise: '', // 招标企业
       TenderingEnterprise_check: '',
       time: [], // 时间区间
-      radio: '1',
+      radio: '',
       tableData1: [],
+      tenderResultMax: null,
       PageSize: 10,
       PageCurrent: 1,
       total: null,
@@ -342,9 +396,14 @@ export default {
       peopleid: '',
       peoplename: '',
       dialogFormVisible1: false,
+      dialogTimeVisible: false,
       form1: {
         收回日期: ''
       },
+      Timeform: {
+        投标结果公布日期: '',
+        中标服务费: ''
+      },
       form2: {
         招标企业: '',
         联系人: '',
@@ -354,12 +413,16 @@ export default {
         投标人: '',
         投标日期: '',
         计划收回日期: '',
-        提前X天提醒我: '',
+        提前X天提醒我: 15,
         备注: ''
       },
       rules1: { // 表单验证规则
         收回日期: [{ required: true, message: '请输入收回日期', trigger: 'change' }]
       },
+      TimeRules: { // 表单验证规则
+        投标结果公布日期: [{ required: true, message: '请选择投标结果公布日期', trigger: 'change' }],
+        中标服务费: [{ required: true, message: '请输入中标服务费', trigger: 'change' }]
+      },
       rules2: { // 表单验证规则
         招标企业: [{ required: true, message: '请输入招标企业', trigger: 'blur' }],
         联系人: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
@@ -411,29 +474,40 @@ export default {
       } else {
         this.endTime_check = 1
       }
-      if (this.radio === '1') {
-        this.disabled = false
-      } else {
-        this.disabled = true
-      }
+      // if (this.radio === '1') {
+      //   this.disabled = false
+      // } else {
+      //   this.disabled = true
+      // }
       this.tableData1Loading = true
-      selectBidBond(1, this.radio, this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.PageCurrent, this.PageSize).then(response => {
+      selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.PageCurrent, this.PageSize).then(response => {
+        console.log(response)
         this.tableData1Loading = false
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
           data[i].履约金 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
           data[i].履约金 === '1' ? data[i].是否禁用履约 = true : data[i].是否禁用履约 = false
-          data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
-          data[i].预计收回日期 = data[i].预计收回日期.substring(0, data[i].预计收回日期.length - 8)
-        }
-        if (this.radio === '2') {
-          for (let i = 0; i < data.length; i++) {
-            data[i].是否禁用 = true
-            data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
-            data[i].预计收回日期 = data[i].预计收回日期.substring(0, data[i].预计收回日期.length - 8)
-            data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8)
+          data[i].是否收回 === '2' ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+          data[i].是否收回 === '2' ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
+          if (data[i].投标结果 === '1') {
+            data[i].是否禁用已中标 = false
+            data[i].是否禁用未中标 = true
+          } else if (data[i].投标结果 === '2') {
+            data[i].是否禁用已中标 = true
+            data[i].是否禁用未中标 = false
+          } else {
+            data[i].是否禁用已中标 = false
+            data[i].是否禁用未中标 = false
           }
         }
+        // if (this.radio === '2') {
+        //   for (let i = 0; i < data.length; i++) {
+        //     data[i].是否禁用 = true
+        //     data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
+        //     data[i].预计收回日期 = data[i].预计收回日期.substring(0, data[i].预计收回日期.length - 8)
+        //     data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8)
+        //   }
+        // }
         this.tableData1 = data
         this.total = response.data.total
       })
@@ -447,22 +521,6 @@ export default {
       this.PageCurrent = val
       this.fetchTableData1()
     },
-    tableRowClassName({ row }) {
-      if (parseInt(row.是否收回) === 2) {
-        return 'background: #66cc33'
-      } else {
-        if (parseInt(row.履约金) === 1) {
-          return 'background: lightgrey'
-        }
-        if (parseInt(row.状态) === 1) {
-          return 'background: #ffff66'
-        } else if (parseInt(row.状态) === 2) {
-          return 'background: #ff6666'
-        } else {
-          return ''
-        }
-      }
-    },
     handleNodeClick(data) { // 树节点点击
       this.getData(getTablePeople, 'ListPeople', data.id)
     },
@@ -541,7 +599,7 @@ export default {
       this.dialogFormVisible2 = true
     },
     addTableData1() {
-      addBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.计划收回日期, this.form2.备注, this.form2.提前X天提醒我).then(response => {
+      addBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.备注, this.form2.提前X天提醒我).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
           this.title = ''
@@ -565,20 +623,20 @@ export default {
       this.form2.保证金类型 = parseInt(row.保证金类型流水号)
       // this.MoneyTypeCode = row.保证金类型流水号
       this.form2.投标日期 = row.投标日期
-      this.form2.计划收回日期 = row.预计收回日期
+      // this.form2.计划收回日期 = row.预计收回日期
       this.form2.备注 = row.备注
       this.form2.提前X天提醒我 = row.提前x天提醒
       this.BidBondCode = row.招标保证金流水号
     },
     editTableData1() {
-      editBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.计划收回日期, this.form2.备注, this.form2.提前X天提醒我, this.BidBondCode).then(response => {
+      editBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.备注, this.form2.提前X天提醒我, this.BidBondCode).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('编辑成功')
           this.title = ''
           this.dialogFormVisible2 = false
           this.fetchTableData1()
         } else {
-          this.$message.error('编辑失败，请检查金额于提醒天数是否为数字')
+          this.$message.error('编辑失败')
         }
       })
     },
@@ -588,6 +646,34 @@ export default {
         this.dialogFormVisible2 = false
       }
       this.deleteRow(delBidBond, row.招标保证金流水号, a)
+    },
+    changeTenderResult(row) {
+      this.code = row.招标保证金流水号
+      this.tenderResultMax = row.应收回金额
+      if (row.投标结果 === '1') {
+        this.radio = '1'
+        this.dialogTimeVisible = true
+        this.tenderResultDisabled = false
+      } else if (row.投标结果 === '2') {
+        this.radio = '2'
+        this.dialogTimeVisible = true
+        this.tenderResultDisabled = true
+      }
+    },
+    callOffTime() {
+      this.dialogTimeVisible = false
+      this.fetchTableData1()
+    },
+    submitTime() {
+      winningBid(this.code, this.radio, this.Timeform.投标结果公布日期, this.Timeform.中标服务费).then(response => {
+        if (response.data[0].result === '1') {
+          this.fetchTableData1()
+          this.dialogTimeVisible = false
+          this.$message.success('操作成功')
+        } else {
+          this.$message.error('操作失败')
+        }
+      })
     }
   }
 }
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 43515ddb..b42916d2 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -1164,7 +1164,7 @@ export default {
       this.dialogFormVisibleBidding = true
     },
     searchBidding() {
-      selectBidBond(0, '', 0, '', 0, '', 1, this.enterprise, 0, '', 0, '').then(response => {
+      selectBidBond(0, '', 0, '', 1, this.enterprise, 0, '', 0, '').then(response => {
         const data = response.data
         for (let i = 0; i < data.length; i++) {
           if (data[i].投标日期 !== '' && data[i].投标日期 !== null) {