diff --git a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js
index 7194f0ca..b4485499 100644
--- a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js
+++ b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js
@@ -1,14 +1,14 @@
 import request from '@/utils/request'
 
 // 查询库存数
-export function searchInventoryNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, state1, state2) {
+export function searchInventoryNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, state1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_离线合同_物料余量_查询数据',
-      param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&库存状态_check=${check4}&库存状态=${state1}&采购状态=${state2}`,
+      param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&库存状态_check=${check4}&库存状态=${state1}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -70,7 +70,7 @@ export function addmateriel(formNumber, materielGroup) {
     data: {
       type: '2',
       name: '采购管理_仓库采购_表单明细_增加数据',
-      param: `表单编号=${formNumber}&物料流水号组=${materielGroup}`
+      param: `表单流水号=${formNumber}&物料流水号组=${materielGroup}`
     }
   })
 }
@@ -80,9 +80,32 @@ export function searchtable2(formNumber) {
     url: '',
     method: 'post',
     data: {
-      type: '2',
-      name: '采购管理_仓库采购_表单明细_增加数据',
-      param: `表单编号=${formNumber}`
+      type: '1',
+      name: '采购管理_仓库采购_表单明细_查询数据',
+      param: `表单流水号=${formNumber}`
+    }
+  })
+}
+// 设置安全库存
+export function setSafeValue(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_离线合同_物料安全库存_修改数据',
+      param: `物料流水号=${params[0]}&安全库存量=${params[1]}`
+    }
+  })
+}
+export function updateNumber(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_仓库采购_表单明细_编辑数据',
+      param: `id=${params[0]}&数量=${params[1]}&备注=${params[2]}`
     }
   })
 }
diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue
index 7989198a..368ba7c7 100644
--- a/src/views/Inventory/PurchasePartsStorage/index.vue
+++ b/src/views/Inventory/PurchasePartsStorage/index.vue
@@ -37,12 +37,12 @@
         </el-table-column>
         <el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip >
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
           </template>
         </el-table-column>
         <el-table-column label="规格型号" sortable prop="规格型号" width="180px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.规格型号 }}
+            {{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }}
           </template>
         </el-table-column>
         <el-table-column label="采购数量" align="center" width="100" show-overflow-tooltip prop="数量">
diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
index a9fcd084..3b1930b1 100644
--- a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
+++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
@@ -19,6 +19,8 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
+<<<<<<< HEAD
+=======
           <span>采购状态:</span>
           <el-select v-model="purchaseStateValue" placeholder="采购状态" size="small">
             <el-option
@@ -27,6 +29,7 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           <el-button
             type="success"
             size="small"
@@ -85,11 +88,32 @@
             <template slot-scope="scope">
               <template v-if="scope.row.changeSafeValue">
                 <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
+<<<<<<< HEAD
+                <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit1(scope.row)">取消</el-button>
+=======
                 <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
               </template>
               <span v-else>{{ scope.row.安全库存量 }}</span>
             </template>
           </el-table-column>
+<<<<<<< HEAD
+          <el-table-column label="设置" min-width="70" align="center">
+            <template slot-scope="scope">
+              <el-tooltip :open-delay="1000" effect="dark" content="设置安全库存量" placement="top">
+                <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit1(scope.row)">确定</el-button>
+                <el-button
+                  v-else
+                  type="warning"
+                  size="mini"
+                  plain
+                  icon="el-icon-edit"
+                  @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+=======
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         </el-table>
         <div class="block" style="margin-top: 10px;">
           <el-pagination
@@ -108,7 +132,11 @@
     <el-card>
       <div slot="header">
         <span>采购明细表名称:</span>
+<<<<<<< HEAD
+        <el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/>
+=======
         <el-input v-model="purchasingDetailsForm" placeholder="采购明细表号" size="small" clearable/>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         <el-button
           type="success"
           size="small"
@@ -130,6 +158,15 @@
       </div>
       <!--       -->
       <el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2">
+<<<<<<< HEAD
+        <el-table-column label="分配状态" align="center" min-width="170">
+          <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="success" size="small">已分配</el-tag>
+          </template>
+        </el-table-column>
+=======
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         <el-table-column label="表单编号" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.表单编号 }}
@@ -152,8 +189,8 @@
           <template slot-scope="scope">
             <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
             <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit(scope.$index, scope.row)">取消</el-button>
-            <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="!scope.row.edit" type="danger" size="mini" icon="el-icon-delete" @click="openDelete(scope.row)">删除</el-button>
+            <el-button v-else type="warning" size="mini" icon="el-icon-edit" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="!scope.row.edit" type="danger" size="mini" icon="el-icon-delete" plain @click="openDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -169,10 +206,18 @@
           @current-change="handleCurrentChange1"/>
       </div>
       <h3>合同详细信息</h3>
+<<<<<<< HEAD
+      <el-table v-loading="" :data="tableData2" border style="max-height: 500px;" height="450px" size="mini">
+        <el-table-column label="序号" type="index" align="center" width="110"/>
+        <el-table-column label="表单编号" align="center" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.表单编号 }}
+=======
       <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
         <el-table-column label="表单编号" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.离线合同编号 }}
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="物料名称" align="center" min-width="150">
@@ -192,6 +237,9 @@
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
+<<<<<<< HEAD
+            <el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
+=======
             <el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
             <b v-else>{{ scope.row.数量 }}</b>
           </template>
@@ -199,18 +247,27 @@
         <el-table-column label="单位" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.计量单位 }}
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" min-width="150" prop="备注">
           <template slot-scope="scope">
+<<<<<<< HEAD
+            <el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
+=======
             <el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px"/>
             <b v-else>{{ scope.row.备注 || '—' }}</b>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
+<<<<<<< HEAD
+            <el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+=======
             <el-button v-if="quickChangePrice" :disabled="disable" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
             <b v-else>移除</b>
+>>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
       </el-table>
@@ -231,7 +288,7 @@
 </template>
 
 <script>
-import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2 } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
+import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2, setSafeValue, updateNumber } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
 import { mapGetters } from 'vuex'
 export default {
   name: '', // 创建仓库采购
@@ -259,16 +316,6 @@ export default {
           value: 1
         }
       ], // 库存状态
-      purchaseStateValue: 2, // 采购状态
-      purchaseState: [
-        {
-          label: '未采购',
-          value: 1
-        }, {
-          label: '全部',
-          value: 2
-        }
-      ], // 采购状态
       tableData: [], // 表单数据
       loading: '', // 加载表单
       total: 0, // 数据总数
@@ -304,7 +351,7 @@ export default {
       this.materialModel ? check3 = 1 : check3 = 0
       this.materialName ? this.check1 = 1 : this.check1 = 0
       this.inventoryStateValue ? this.check2 = 1 : this.check2 = 0
-      searchInventoryNum(this.pageCurrent, this.pageSize, this.check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.check2, this.inventoryStateValue, this.purchaseStateValue).then(response => {
+      searchInventoryNum(this.pageCurrent, this.pageSize, this.check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.check2, this.inventoryStateValue).then(response => {
         this.tableData = response.data.rows
         this.tableData.map(v => {
           this.$set(v, 'changeSafeValue', false)
@@ -338,7 +385,26 @@ export default {
           this.dialogVisible = false
         }
       })
-    }, // 查询采购明细单
+<<<<<<< HEAD
+    },
+    cancelEdit1(row) { // 取消设置
+      row.安全库存量 = row.原安全库存量
+      row.changeSafeValue = false
+      this.$message('取消修改')
+    },
+    confirmEdit1(row) { // 确认设置
+      Number(row.安全库存量) ? row.安全库存量 = Number(row.安全库存量) : row.安全库存量 = 0
+      setSafeValue(row.物料流水号, parseInt(row.安全库存量)).then(response => {
+        if (response.data[0].result === '1') {
+          row.changeSafeValue = false
+          this.$message.success('设置成功')
+          this.searchTable1()
+        } else {
+          this.$message.error('设置失败')
+        }
+      })
+    },
+    // 查询采购明细单
     searchTable1() {
       this.tableData1 = []
       searchpurchasingDetailsForm(this.pageCurrent1, this.pageSize1, this.purchasingDetailsForm).then(response => {
@@ -352,7 +418,8 @@ export default {
               申请人: response.data.rows[i].姓名,
               检测时间: response.data.rows[i].检测时间,
               表单名称_原: response.data.rows[i].表单名称,
-              表单流水号: response.data.rows[i].id,
+              表单流水号: response.data.rows[i].表单流水号,
+              是否分配: response.data.rows[i].是否分配,
               edit: false
             })
           }
@@ -377,6 +444,15 @@ export default {
       this.searchTable1()
       row.edit = false
     },
+    updateNumber(row) {
+      updateNumber(row.id, row.数量, row.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('编辑成功')
+        } else {
+          this.$message.error('编辑失败')
+        }
+      })
+    },
     openDelete(row) {
       openDeletepurchasingDetailsForm(row.表单流水号).then(response => {
         if (response.data[0].result === '1') {
@@ -390,6 +466,10 @@ export default {
     addMateriel() {
       addmateriel(this.formNumber, this.materielGroup).then(response => {
         if (response.data[0].result === '1') {
+          searchtable2(this.formNumber).then(response => {
+            console.log(response.data)
+            this.tableData2 = response.data
+          })
           this.$message.success('选入物料信息成功')
         } else {
           this.$message.error('选入物料信息失败')
@@ -397,10 +477,11 @@ export default {
       })
     }, // 查询表单明细
     searchTable2(row) {
-      this.formNumber = row.表单编号
+      this.formNumber = row.表单流水号
       this.tableData2 = []
-      searchtable2(row.表单编号).then(response => {
-        this.tableData2 = response.data.rows
+      searchtable2(row.表单流水号).then(response => {
+        console.log(response.data)
+        this.tableData2 = response.data
       })
     }, // 勾选物料
     handleSelectionChange(val) {
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index e2de0028..ba3ab758 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -49,7 +49,7 @@
         border
         stripe
         size="mini">
-        <el-table-column align="center" label="投标结果" width="200">
+        <el-table-column align="center" label="投标结果" sortable prop="投标结果" width="200">
           <template slot-scope="scope">
             <el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
               <el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
@@ -62,7 +62,7 @@
             {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="招标企业" width="180">
+        <el-table-column align="center" label="招标企业" sortable prop="招标企业" width="180">
           <template slot-scope="scope">
             {{ scope.row.招标企业 }}
           </template>
@@ -103,7 +103,7 @@
             <el-tag v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投标人" width="100">
+        <el-table-column align="center" label="投标人" sortable prop="投标人" width="100">
           <template slot-scope="scope">
             {{ scope.row.投标人 }}
           </template>
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 70c67dcd..810e3ebf 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -107,7 +107,7 @@
         <el-card>
           <el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
           <el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
-            <el-table-column label="客户名称" align="center" min-width="180" show-overflow-tooltip>
+            <el-table-column label="客户名称" sortable prop="客户名称" align="center" min-width="180" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.客户名称 }}
               </template>
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index a690f13c..5316e156 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -66,14 +66,14 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同编号" width="130">
+        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="130">
           <template slot-scope="scope">
             <template>
               <el-tag slot="reference" type="mini">{{ scope.row.合同编号 }}</el-tag>
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -108,12 +108,12 @@
             {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="销售经理" width="90">
+        <el-table-column align="center" label="销售经理" sortable prop="营销经理" width="100">
           <template slot-scope="scope">
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" width="230" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="230" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 7f10c2ca..3ca8a2a2 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -52,12 +52,12 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同编号" width="140">
+        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="140">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" width="80" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -94,12 +94,12 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="营销经理" width="70">
+        <el-table-column align="center" label="营销经理" sortable prop="姓名" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index dfc50c05..a266be18 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -94,7 +94,7 @@
             </el-table>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同编号" width="130">
+        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="130">
           <template slot-scope="scope">
             <template>
               <el-popover
@@ -114,12 +114,12 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" width="190" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="190" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" width="140" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 8c046a71..036b401a 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -46,12 +46,12 @@
         stripe
         size="mini"
         @row-click="fetchTableData2">
-        <el-table-column align="center" label="合同编号" width="140">
+        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="140">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index c888689c..7c0d5360 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -39,12 +39,12 @@
         size="mini"
         highlight-current-row
         @row-click="fetchTableData2">
-        <el-table-column align="center" label="合同编号" width="150">
+        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="150">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -59,12 +59,12 @@
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="销售经理" width="90">
+        <el-table-column align="center" label="销售经理" sortable prop="姓名" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index fdb43e57..a01d5131 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -40,12 +40,12 @@
         size="mini"
         highlight-current-row
         @row-click="fetchTableData1">
-        <el-table-column align="center" label="合同编号" width="150">
+        <el-table-column align="center" label="合同编号" sortable prop="合同编号" width="150">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" sortable prop="项目名称" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -60,12 +60,12 @@
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="销售经理" width="100">
+        <el-table-column align="center" label="销售经理" sortable prop="姓名" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" width="250" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" sortable prop="客户名称" width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 0679cf94..4dddad2b 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -62,25 +62,33 @@
         <el-table-column
           label="机床图号"
           align="center"
+          sortable
+          prop="机床图号"
           min-width="150px">
           <template slot-scope="scope">{{ scope.row.机床图号 }}</template>
         </el-table-column>
         <el-table-column
           label="零件图号"
           align="center"
+          sortable
+          prop="零件图号"
           min-width="200px">
           <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
         </el-table-column>
         <el-table-column
           label="零件名称"
           align="center"
+          sortable
+          prop="零件名称"
           min-width="140px">
           <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
         </el-table-column>
         <el-table-column
           label="组号"
           align="center"
-          min-width="60px">
+          sortable
+          prop="组号"
+          min-width="80px">
           <template slot-scope="scope">{{ scope.row.组号 }}</template>
         </el-table-column>
         <el-table-column
@@ -101,11 +109,15 @@
         </el-table-column>
         <el-table-column
           label="材料"
+          sortable
+          prop="材料"
           align="center">
           <template slot-scope="scope">{{ scope.row.材料 }}</template>
         </el-table-column>
         <el-table-column
           label="规格"
+          sortable
+          prop="规格"
           align="center">
           <template slot-scope="scope">{{ scope.row.规格 }}</template>
         </el-table-column>
@@ -173,17 +185,17 @@
           align="center"
           type="index"
           width="50"/>
-        <el-table-column align="center" label="物料名称">
+        <el-table-column align="center" sortable prop="物料名称" label="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料规格">
+        <el-table-column align="center" sortable prop="物料规格" label="物料规格">
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料型号">
+        <el-table-column align="center" sortable prop="物料型号" label="物料型号">
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
@@ -203,12 +215,12 @@
             {{ scope.row.机床数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件类型">
+        <el-table-column align="center" sortable prop="零件类型" label="零件类型">
           <template slot-scope="scope">
             {{ scope.row.零件类型 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="供货商">
+        <el-table-column align="center" sortable prop="供货商" label="供货商">
           <template slot-scope="scope">
             {{ scope.row.供货商 }}
           </template>
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index a048b9a0..f5c37bbf 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -89,7 +89,17 @@
             </el-table>
           </template>
         </el-table-column>
+<<<<<<< HEAD
         <el-table-column align="center" label="发票号" sortable prop="发票号" min-width="120px">
+=======
+        <el-table-column align="center" label="发票状态" min-width="100px">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</el-tag>
+            <el-tag v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发票号" min-width="120px">
+>>>>>>> b61c5180f7663ad09422c333eddaa302cafc0307
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
@@ -119,6 +129,7 @@
             <el-tooltip :open-delay="1200" effect="dark" content="关联到货单" placement="top">
               <div style="display: inline-block">
                 <el-button
+                  :disabled="Number(scope.row.是否请款)===1"
                   type="success"
                   size="mini"
                   icon="el-icon-share"
@@ -130,6 +141,7 @@
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
+                  :disabled="Number(scope.row.是否请款)===1"
                   type="text"
                   size="mini"
                   icon="el-icon-edit-outline"
@@ -140,6 +152,7 @@
             <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
                 <el-button
+                  :disabled="Number(scope.row.是否请款)===1"
                   type="text"
                   size="mini"
                   icon="el-icon-delete"
@@ -357,6 +370,7 @@ export default {
           }
         }
         this.tableData1 = response.data.rows
+        console.log(this.tableData1)
         this.total1 = response.data.total
       })
     },