diff --git a/src/api/Inventory/InboundCard.js b/src/api/Inventory/InboundCard.js
index 7d900b77..6bd7ba98 100644
--- a/src/api/Inventory/InboundCard.js
+++ b/src/api/Inventory/InboundCard.js
@@ -80,7 +80,18 @@ export function addInboundCard(data1, data2, data3, data4, data5, data6, data7,
     }
   })
 }
-
+// 入库单删除
+export function deleteInboundCard(data1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_采购入库单_入库单删除',
+      param: '采购入库单流水号=' + data1
+    }
+  })
+}
 // 入库单修改
 export function editInboundCard(data0, data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) {
   return request({
diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue
index 33df0fd7..f2a68644 100644
--- a/src/views/Inventory/DirectPart/index.vue
+++ b/src/views/Inventory/DirectPart/index.vue
@@ -109,14 +109,14 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center" min-width="80">
+        <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="80">
+        <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="80">
@@ -124,9 +124,9 @@
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" align="center" min-width="80">
+        <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="80">
@@ -154,7 +154,7 @@
           <el-input v-model="form.DirectNumber" size="small" placeholder="到货数量" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="领用者" prop="TotalContractAmount" label-width="100px">
-          <el-select v-model="PeopleValue" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
+          <el-select v-model="form.getPeople" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
             <el-option
               v-for="item in People"
               :key="item.value"
@@ -178,7 +178,7 @@
           <el-input v-model="form.DirectNumber" size="small" placeholder="到货数量" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="领用者" prop="TotalContractAmount" label-width="100px">
-          <el-select v-model="PeopleValue" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
+          <el-select v-model="form.getPeople" filterable clearable size="small" placeholder="领用者" style="width: 200px;margin-right:10px" @change="searchGroupList()">
             <el-option
               v-for="item in People"
               :key="item.value"
@@ -242,12 +242,15 @@ export default {
       PageCurrent: 1,
       PageSize: 10,
       total: null,
-      projectName: '',
-      machineName: '',
-      teamName: '',
-      materialName: '',
-      contractNumber: '',
-      directPartNumber: ''
+      projectNumber: '', // 项目流水号
+      machineNumber: '', // 机床流水号
+      teamNumber: '', // 组件流水号
+      materialName: '', // 物料名称
+      materialtype: '', // 物料型号
+      materialMode: '', // 物料规格
+      partPicture: '', // 零件图号
+      directPartNumber: '',
+      teamBasicPart: ''
     }
   },
   computed: {
@@ -299,11 +302,13 @@ export default {
         for (let i = 0; i < response.data.length; i++) {
           this.People.push({
             label: response.data[i].姓名,
-            value: parseInt(response.data[i].考勤编号)
+            value: Number(response.data[i].人员编号)
           })
         }
         console.log(this.People)
       })
+      console.log(this.token, 88)
+      console.log(this.People, 99)
     },
     searchContractData() { // 查询合同
       this.Contract = []
@@ -346,17 +351,21 @@ export default {
     },
     // 打开直达件表单
     addDirect(row) {
+      console.log(row)
       this.PeopleValue = ''
       this.form = {}
       this.dialogFormVisible = true
       this.materialNum = row.物料流水号
       this.purchaseContractNumber = row.采购合同明细流水号
       this.teamPart = row.组件零件流水号
-      this.projectName = row.项目名称
-      this.machineName = row.机床名称
-      this.teamName = row.组件名称
+      this.teamBasicPart = row.组件零件基本件流水号
+      this.projectNumber = row.项目流水号
+      this.machineNumber = row.机床流水号
+      this.teamNumber = row.组件流水号
       this.materialName = row.物料名称
-      this.contractNumber = row.采购合同编号
+      this.materialtype = row.物料型号
+      this.materialMode = row.物料规格
+      this.partPicture = row.零件图号
     },
     // 打开直达件编辑表单
     changeDirect(row) {
@@ -407,8 +416,7 @@ export default {
     },
     // 增加直达件
     addDirectPartm() {
-      console.log(this.materialNum, this.form.DirectNumber, this.locate, this.purchaseContractNumber, this.PeopleNumber, this.PeopleValue, this.form.DirectNumber, this.teamPart, this.form.DirectNote)
-      addDirectPart(this.materialNum, this.form.DirectNumber, this.locate, this.purchaseContractNumber, this.PeopleNumber, this.PeopleValue, this.form.DirectNumber, this.teamPart, this.projectName, this.machineName, this.teamName, this.materialName, this.contractNumber, this.form.DirectNote).then(response => {
+      addDirectPart(this.form.DirectNumber, this.purchaseContractNumber, this.PeopleNumber, this.form.getPeople, this.form.DirectNumber, this.teamPart, this.teamBasicPart, this.projectNumber, this.machineNumber, this.teamNumber, this.materialName, this.form.DirectNote, this.materialtype, this.materialMode, this.partPicture).then(response => {
         if (response.data[0].result === '1') {
           this.$notify({
             title: '成功',
diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue
index 8067448c..9c883c3e 100644
--- a/src/views/Inventory/InboundCard/index.vue
+++ b/src/views/Inventory/InboundCard/index.vue
@@ -169,8 +169,9 @@
       <el-input v-model="inboundCardNumber" clearable size="small" style="width:200px" />
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchInboundCard1()">查询</el-button>
       <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addCard()">创建</el-button>
-      <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="InboundCardDetail()">选入</el-button>
-      <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="downLoadCjn()">导出</el-button>
+      <el-button size="small" type="primary" icon="el-icon-arrow-down" style="margin: 0 0 0 10px" @click="InboundCardDetail()">选入</el-button>
+    </el-card>
+    <el-card>
       <el-table
         v-loading="listLoading3"
         :data="tableData3"
@@ -214,7 +215,7 @@
             {{ scope.row.到货日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="业务号" align="center" min-width="50">
+        <el-table-column label="业务号" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.业务号 }}
           </template>
@@ -229,17 +230,17 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="业务类型" align="center" min-width="130">
+        <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="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="50">
+        <el-table-column label="入库类别" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.入库类别 }}
           </template>
@@ -251,9 +252,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="300px">
           <template slot-scope="scope" align="center">
-            <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="chooseListinfor(scope.row)">编辑</el-button>
-            <el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropListinfor(scope.row)">删除</el-button>
-            <el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" @click="exportCard(scope.row)">导出</el-button>
+            <el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="editInboundCardInfor(scope.row)">编辑</el-button>
+            <el-button size="small" type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropCard(scope.row)">删除</el-button>
+            <el-button size="small" type="warning" icon="el-icon-download" style="margin: 0 0 0 10px" @click="exportCard(scope.row)">导出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -432,123 +433,197 @@
         <el-button type="primary" size="small" @click="printCard">打印</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogVisible1" title="增加采购入库单" center style="min-height: 300px" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
-        <el-form-item label="合同名称" prop="合同名称">
-          <el-select v-model="form.contract" 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>
-        </el-form-item>
-        <el-form-item label="仓库名称" prop="仓库名称">
-          <el-select v-model="form.house" 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-form-item>
-        <el-form-item label="入库日期" prop="入库日期">
-          <el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="到货单号" prop="到货单号">
-          <el-input v-model="form.arrive" placeholder="到货单号" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="业务号" prop="业务号">
-          <el-input v-model="form.affair" placeholder="业务号" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="业务员" prop="业务员">
-          <el-select v-model="form.affairPeople" filterable clearable size="small" placeholder="业务员" style="width: 200px">
-            <el-option
-              v-for="item in People"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="到货日期" prop="到货日期">
-          <el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="业务类型" prop="业务类型">
-          <el-input v-model="form.affirType" placeholder="业务类型" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="采购类型" prop="采购类型">
-          <el-input v-model="form.purchaseType" placeholder="采购类型" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="备注" prop="备注">
-          <el-input v-model="form.note" placeholder="备注" size="small" clearable/>
-        </el-form-item>
+    <el-dialog :visible.sync="dialogVisible1" title="增加采购入库单" center style="min-height: 300px" width="700px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同名称" prop="合同名称">
+              <el-select v-model="form.contract" 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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库名称" prop="仓库名称">
+              <el-select v-model="form.house" 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-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入库日期" prop="入库日期">
+              <el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" style="width: 200px" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="到货单号" prop="到货单号">
+              <el-input v-model="form.arrive" placeholder="到货单号" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="业务号" prop="业务号">
+              <el-input v-model="form.affair" placeholder="业务号" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务员" prop="业务员">
+              <el-select v-model="form.affairPeople" filterable clearable style="width: 200px" size="small" placeholder="业务员">
+                <el-option
+                  v-for="item in People"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="到货日期" prop="到货日期">
+              <el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 200px" size="small" type="date" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务类型" prop="业务类型">
+              <el-input v-model="form.affirType" placeholder="业务类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="采购类型" prop="采购类型">
+              <el-input v-model="form.purchaseType" placeholder="采购类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="备注">
+              <el-input v-model="form.note" placeholder="备注" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入库类别" prop="入库类别">
+              <el-input v-model="form.inboundType" placeholder="入库类别" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisibleExport=false">取消</el-button>
+        <el-button size="small" @click="dialogVisible1=false">取消</el-button>
         <el-button type="primary" size="small" @click="submitCard">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
-        <el-form-item label="合同名称" prop="合同名称">
-          <el-select v-model="form.contract" 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>
-        </el-form-item>
-        <el-form-item label="仓库名称" prop="仓库名称">
-          <el-select v-model="form.house" 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-form-item>
-        <el-form-item label="入库日期" prop="入库日期">
-          <el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="到货单号" prop="到货单号">
-          <el-input v-model="form.arrive" placeholder="到货单号" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="业务号" prop="业务号">
-          <el-input v-model="form.affair" placeholder="业务号" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="业务员" prop="业务员">
-          <el-select v-model="form.affairPeople" filterable clearable size="small" placeholder="业务员" style="width: 200px">
-            <el-option
-              v-for="item in People"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="到货日期" prop="到货日期">
-          <el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="业务类型" prop="业务类型">
-          <el-input v-model="form.affirType" placeholder="业务类型" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="采购类型" prop="采购类型">
-          <el-input v-model="form.purchaseType" placeholder="采购类型" size="small" clearable/>
-        </el-form-item>
-        <el-form-item label="备注" prop="备注">
-          <el-input v-model="form.note" placeholder="备注" size="small" clearable/>
-        </el-form-item>
+    <el-dialog :visible.sync="dialogVisible2" title="修改采购入库单" center style="min-height: 300px" width="700px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同名称" prop="合同名称">
+              <el-select v-model="form.contract" 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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库名称" prop="仓库名称">
+              <el-select v-model="form.house" 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-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入库日期" prop="入库日期">
+              <el-date-picker v-model="form.inboundDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" style="width: 200px" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="到货单号" prop="到货单号">
+              <el-input v-model="form.arrive" placeholder="到货单号" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="业务号" prop="业务号">
+              <el-input v-model="form.affair" placeholder="业务号" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务员" prop="业务员">
+              <el-select v-model="form.affairPeople" filterable clearable style="width: 200px" size="small" placeholder="业务员">
+                <el-option
+                  v-for="item in People"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="到货日期" prop="到货日期">
+              <el-date-picker v-model="form.arriveDay" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 200px" size="small" type="date" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务类型" prop="业务类型">
+              <el-input v-model="form.affirType" placeholder="业务类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="采购类型" prop="采购类型">
+              <el-input v-model="form.purchaseType" placeholder="采购类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入库类型" prop="入库类型">
+              <el-input v-model="form.inboundType" placeholder="入库类型" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="备注">
+              <el-input v-model="form.note" placeholder="备注" style="width: 200px" size="small" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible2=false">取消</el-button>
-        <el-button type="primary" size="small" @click="editCard">确定</el-button>
+        <el-button type="primary" size="small" @click="submitInboundCardInfor">确定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchContract, searchInventory, searchInbound, searchShopInbound, searchInboundCard, addInboundCard, searchAffairPeople, addInboundCardDetail, searchInboundCardDetail, deleteInboundCardDetail, searchShopContract, editInboundCard } from '@/api/Inventory/InboundCard'
+import { searchContract, searchInventory, searchInbound, searchShopInbound, searchInboundCard, addInboundCard, searchAffairPeople, addInboundCardDetail, searchInboundCardDetail, deleteInboundCardDetail, searchShopContract, editInboundCard, deleteInboundCard } from '@/api/Inventory/InboundCard'
 import { mapGetters } from 'vuex'
 import $ from 'jquery'
 
@@ -568,6 +643,7 @@ export default {
       listLoading2: '',
       tableData2: [],
       listLoading3: '',
+      CardNumber: '', // 采购入库单流水号
       inboundCardNumber: '',
       inboundCardNumber_check: '',
       tableData3: [],
@@ -644,7 +720,7 @@ export default {
         }
       })
       // 查询车间合同
-      searchContract().then(response => {
+      searchShopContract().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.ShopContract.push({
             label: response.data[i].采购合同编号,
@@ -652,7 +728,6 @@ export default {
           })
         }
       })
-      searchShopContract
       searchAffairPeople(this.token).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.People.push({
@@ -677,7 +752,7 @@ export default {
       this.listLoading = true
       searchInbound(this.ContractValue, this.InboundDate, this.InventoryValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].组件零件流水号 !== 0) {
+          if (response.data[i].组件零件流水号 === 0) {
             response.data[i].物料名称 = response.data[i].零件名称
           }
         }
@@ -711,7 +786,8 @@ export default {
     addCard() {
       this.dialogVisible1 = true
     },
-    submitCard() { // 提交设置
+    // 增加入库单
+    submitCard() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           addInboundCard(this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => {
@@ -770,6 +846,32 @@ export default {
         }
       })
     },
+    // 修改入库单
+    editInboundCardInfor(row) {
+      this.DetailNumber = row.采购入库单流水号
+      this.dialogVisible2 = true
+      this.form.contract = row.合同流水号
+      this.form.house = row.仓库流水号
+      this.form.inboundDay = row.入库日期
+      this.form.arrive = row.到货单号
+      this.form.affair = row.业务号
+      this.form.affairPeople = row.业务员
+      this.form.arriveDay = row.到货日期
+      this.form.affirType = row.业务类型
+      this.form.purchaseType = row.采购类型
+      this.form.inboundType = row.入库类别
+      this.form.note = row.备注
+    },
+    submitInboundCardInfor() {
+      editInboundCard(this.DetailNumber, this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('修改成功')
+          this.dialogVisible2 = false
+        } else {
+          this.$message.error('修改失败')
+        }
+      })
+    },
     // 查询采购入库单明细
     searchDetail(row) {
       this.DetailNumber = row.采购入库单流水号
@@ -781,6 +883,30 @@ export default {
         this.tableData4 = data
       })
     },
+
+    // 删除领料单
+    dropCard(row) {
+      this.CardNumber = row.采购入库单流水号
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteInboundCard(this.CardNumber).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.searchInboundCard1()
+          } else {
+            this.$message.error('数据占用')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
     // 删除领料单明细
     dropCarddetail(row) {
       this.CardDetailNumber = row.采购入库单明细流水号
diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue
index 87854b2b..8ce6ab3d 100644
--- a/src/views/Inventory/OfflinePurchase/index.vue
+++ b/src/views/Inventory/OfflinePurchase/index.vue
@@ -42,7 +42,7 @@
             <el-tag v-else type="success" size="small">充足</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" min-width="200" align="center">
+        <el-table-column label="物料名称" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
@@ -57,7 +57,7 @@
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="供货商" min-width="200" align="center">
+        <el-table-column label="供货商" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.供货商 }}
           </template>