diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/api/TechnologyCenter/QueryParts.js
index a33a477e..a3ac8126 100644
--- a/src/api/TechnologyCenter/QueryParts.js
+++ b/src/api/TechnologyCenter/QueryParts.js
@@ -40,7 +40,7 @@ export function groupSelect(machineValue) {
   })
 }
 
-export function basicPartsData(machine_check, machine, group_check, group, pageSize, pageCurrent) {
+export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, pageSize, pageCurrent) {
   return request({
     url: '',
     method: 'post',
@@ -49,11 +49,25 @@ export function basicPartsData(machine_check, machine, group_check, group, pageS
       ModularID: router.currentRoute.path,
       type: '1',
       name: 'PDM_零件明细表_基本件_查询数据_综合gj',
-      param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`,
+      param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
+// 根据机床和组查询规格型号  LLJ 新增
+export function searchModel(machine_check, machine, group_check, group) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '三表查询_根据机床组号查询规格型号',
+      param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`
+    }
+  })
+}
 export function purchasePartsData(num, pageCurrent, pageSize) {
   return request({
     url: '',
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index df6103a5..4ebd6e4f 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -201,6 +201,11 @@
             </template>
           </template>
         </el-table-column>
+        <el-table-column label="操作工" align="center" width="90px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.操作工姓名 }}
+          </template>
+        </el-table-column>
         <el-table-column label="质检时间" align="center" width="140px">
           <template slot-scope="scope">
             {{ scope.row.操作时间 }}
diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 1bcc4158..f2713eab 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -24,7 +24,7 @@
           </el-row>
         </el-card>
       </el-col>
-      <el-col style="width: 550px;">
+      <el-col style="width: 400px;">
         <el-card>
           <el-button type="primary" plain style="margin: 10px 0 3px 0" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺</el-button>
           <el-table :data="tableData2" :row-key="getRowKeys" size="mini" highlight-current-row stripe border height="600" width="100%">
@@ -67,11 +67,11 @@
                 {{ scope.row.工艺名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="工艺要求" align="center" width="200">
-              <template slot-scope="scope">
-                {{ scope.row.工艺要求 }}
-              </template>
-            </el-table-column>
+            <!--<el-table-column label="工艺要求" align="center" width="200">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.工艺要求 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column align="center" label="操作">
               <template slot-scope="scope">
                 <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
@@ -99,7 +99,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="calloff">取 消</el-button>
-        <el-button type="primary" @click="submit1('form1')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form1')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="编辑工艺分类" center style="min-height: 300px" width="400px">
@@ -110,7 +110,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="calloff">取 消</el-button>
-        <el-button type="primary" @click="submit1('form1')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form1')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="新增工艺" center style="min-height: 300px" width="400px">
@@ -124,7 +124,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="calloff">取 消</el-button>
-        <el-button type="primary" @click="submit1('form2')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form2')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="编辑工艺" center style="min-height: 300px" width="400px">
@@ -135,13 +135,13 @@
         <el-form-item label="工艺名称简称" prop="ProcessShort">
           <el-input v-model="form2.ProcessShort" size="small" clearable style="width:200px"/>
         </el-form-item>
-        <el-form-item label="工艺要求" prop="Process">
-          <el-input v-model="form2.Requirement" size="small" clearable style="width:200px"/>
-        </el-form-item>
+        <!--<el-form-item label="工艺要求" prop="Process">-->
+        <!--<el-input v-model="form2.Requirement" size="small" clearable style="width:200px"/>-->
+        <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="calloff">取 消</el-button>
-        <el-button type="primary" @click="submit1('form2')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form2')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="新增工艺要求" center style="min-height: 300px" width="400px">
@@ -152,7 +152,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="calloff">取 消</el-button>
-        <el-button type="primary" @click="submit1('form3')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form3')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible6" title="编辑工艺要求" center style="min-height: 300px" width="400px">
@@ -163,7 +163,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="calloff">取 消</el-button>
-        <el-button type="primary" @click="submit1('form3')">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form3')">确 定</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
index 66f9383e..d51023ef 100644
--- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
+++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
@@ -118,7 +118,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible=false">取消</el-button>
-        <el-button :disabled="wareHousing_disable" type="primary" @click="CHUKU()">确 定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="CHUKU()">确 定</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
index 9ef8bd81..a5534508 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -16,7 +16,7 @@
           :value="item.value"/>
       </el-select>
       <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
-      <el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
+      <el-button v-positive="'loading'" :disabled="false" size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" highlight-current-row show-summary border style="width: 1510px;" size="mini" height="700">
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
index 08a36d30..c1d2bf3c 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue
@@ -16,7 +16,7 @@
           :value="item.value"/>
       </el-select>
       <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
-      <el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
+      <el-button v-positive="'loading'" :disabled="false" size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" show-summary highlight-current-row border style="width: 1360px;" size="mini" height="590">
diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
index a28687e5..308fd21b 100644
--- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
@@ -38,7 +38,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
         <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchData1()">查询</el-button>
-        <el-button type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportExcel()">导出</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportExcel()">导出</el-button>
       </el-row>
     </el-card>
     <el-row>
@@ -133,7 +133,7 @@
           <div class="block" style="margin-top: 10px">
             <el-pagination
               :current-page="pageCurrent"
-              :page-sizes="[10, 20, 30, 40]"
+              :page-sizes="[10, 20, 30, 40, 50]"
               :page-size="pageSize"
               :total="total"
               layout="total, sizes, prev, pager, next, jumper"
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index d2d7e3ec..f9db6dbd 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -127,7 +127,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购时间">
                   <template slot-scope="scope">
-                    {{ scope.row.创建日期 }}
+                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="到货数量">
@@ -187,7 +187,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购时间">
                   <template slot-scope="scope">
-                    {{ scope.row.创建日期 }}
+                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="到货数量">
@@ -252,7 +252,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="采购时间">
                   <template slot-scope="scope">
-                    采购时间
+                    {{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="到货数量">
@@ -598,6 +598,7 @@ export default {
       this.Group ? check2 = 1 : check2 = 0
       searchTable02(check1, this.Machine, check2, this.Group, this.pageCurrent02, this.pageSize02).then(response => {
         this.tableData02 = response.data.rows
+        console.log(response, 999)
         this.total02 = response.data.total
       })
     },
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index b9dd542f..1b48d0e2 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -5,7 +5,7 @@
         <el-row style="margin-bottom:-10px!important;">
           <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
           <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 20px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
-          <el-button type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
         </el-row>
       </div>
       <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">
diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue
index ac5e39ab..f6c86bc1 100644
--- a/src/views/ManufacturingCenter/MaterialArrival/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue
@@ -22,7 +22,7 @@
           </el-select>
           <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
           <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-          <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
+          <el-button v-positive="'loading'" :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
         </el-card>
         <el-row>
           <el-card style="width: 870px; margin-left: 0px;display: inline-block;" >
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index a2f40eec..f80f02ef 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -18,7 +18,7 @@
         <el-checkbox v-model="check" class="remeberPassword">筛选</el-checkbox>
       </el-tooltip>
       <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
-      <el-button size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
+      <el-button v-positive="'loading'" :disabled="false" size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 720px" height="720px" border @sort-change="sortChange">
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
index 991bc922..064aad78 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue
@@ -18,7 +18,7 @@
         <el-checkbox v-model="check" class="remeberPassword">筛选</el-checkbox>
       </el-tooltip>
       <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
-      <el-button size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
+      <el-button v-positive="'loading'" :disabled="false" size="small" type="success" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" show-summary size="mini" style="max-height: 590px;width: 1370px" height="720px" border @sort-change="sortChange">
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 492c51c5..c7c0878e 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -19,8 +19,8 @@
           :value="item.value"/>
       </el-select>
       <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" plain @click="selectAll(tableData)">全选</el-button>
-      <el-button :loading="loading" type="success" size="small" icon="el-icon-upload" style="margin-left: 10px" plain @click="save">保存</el-button>
-      <el-button :loading="loading" type="success" size="small" icon="el-icon-upload" style="margin-left: 300px" plain @click="currency">通用件保存</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="success" size="small" icon="el-icon-upload" style="margin-left: 10px" plain @click="save">保存</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="success" size="small" icon="el-icon-upload" style="margin-left: 300px" plain @click="currency">通用件保存</el-button>
     </el-card>
     <el-card>
       <el-table ref="multipleTable" :data="tableData" :row-class-name="tableRowClassName1" style="width: 1000px;" size="mini" height="750" highlight-current-row border @selection-change="handleSelectionChange" @row-click="rowClick">
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index a3e3aa05..604bcd88 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -21,7 +21,7 @@
       </el-select>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
       <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-      <el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
       <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
       <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>-->
     </el-card>
diff --git a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
index a756e038..925c603f 100644
--- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
@@ -26,7 +26,7 @@
             <el-tooltip :open-delay="1200" effect="dark" content="只查询加急的零件" placement="top">
               <el-checkbox v-model="all" size="small">加急</el-checkbox>
             </el-tooltip>
-            <el-button type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportTable()">导出</el-button>
+            <el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportTable()">导出</el-button>
           </el-row>
         </el-card>
       </div>
diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue
index 2bc805a6..b16cb4ca 100644
--- a/src/views/ManufacturingCenter/maintainInformation/index.vue
+++ b/src/views/ManufacturingCenter/maintainInformation/index.vue
@@ -13,7 +13,7 @@
           </el-select>
           <span>选择月份：</span>
           <el-date-picker v-model="monthssss" size="small" type="month" value-format="yyyy-MM" format="yyyy-MM" style="width: 120px" placeholder="选择月"/>
-          <el-button size="small" type="warning" style="margin-right: 50px" plain @click="exportOut()">导出日点检表</el-button>
+          <el-button v-positive="'loading'" :disabled="false" size="small" type="warning" style="margin-right: 50px" plain @click="exportOut()">导出日点检表</el-button>
         </div>
       </div>
       <el-table v-loading="loading1" :data="tableData1" stripe height="200" border>
@@ -391,7 +391,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff1('form1')">取消</el-button>
-        <el-button type="primary" @click="submit1('form1')" >确定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form1')" >确定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogFormVisible2" title="新增" center width="500px">
@@ -411,7 +411,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff2('form2')">取消</el-button>
-        <el-button type="primary" @click="submit2('form2')" >确定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit2('form2')" >确定</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 4a9f2621..9915788b 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -45,7 +45,7 @@
         <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 15px" @click="ADD()">自家项目</el-button>
         <!--<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>-->
       </el-tooltip>
-      <el-button icon="el-icon-bottom" type="success" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
+      <el-button v-positive="'loading'" :disabled="false" icon="el-icon-bottom" type="success" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
     </el-card>
     <el-row>
       <el-col style="width: 783px">
diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
index 38ba7a35..5d598821 100644
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -110,7 +110,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff('form')">取消</el-button>
-        <el-button :disabled="editType1_disable" type="primary" @click="submit('form')" >确定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit('form')" >确定</el-button>
       </div>
     </el-dialog>
 
diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
index feb72b46..268059cb 100644
--- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
@@ -12,7 +12,7 @@
             :value="item.value"/>
         </el-select>
         <el-button icon="el-icon-search" type="primary" size="small" plain @click="getTableData()">查询</el-button>
-        <el-button type="success" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="success" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
       </div>
     </el-card>
     <el-card>
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 2cb9ccf7..27ef569a 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -16,7 +16,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"/>
           <el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="getParts()">查询</el-button>
-          <el-button type="success" plain class="el-icon-download" style="margin-left: 30px" size="small" @click="exportExcel">导出</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="success" plain class="el-icon-download" style="margin-left: 30px" size="small" @click="exportExcel">导出</el-button>
         </el-row>
         <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 690px;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick">
           <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
@@ -155,7 +155,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff1('form1')">取消</el-button>
-        <el-button :disabled="handleAdd1_disable" type="primary" @click="submit1('form1')" >确定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit1('form1')" >确定</el-button>
       </div>
     </el-dialog>
 
@@ -182,7 +182,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff2('form2')">取消</el-button>
-        <el-button :disabled="handleAdd2_disable" type="primary" @click="submit2('form2')" >确定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit2('form2')" >确定</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 27e1f16e..1a6cce44 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-input v-model="partNumber" size="small" placeholder="零件号或零件名称" clearable style="width:160px;margin-top: 3px"/>
       <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button>
-      <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回</el-button>
       <el-table v-loading="loading1" ref="multipleTable" :data="List1" border size="mini" stripe highlight-current-row height="265" style="width: 100%;margin-top: 3px" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"/>
         <el-table-column label="项目名称" prop="项目名称" align="center" show-overflow-tooltip>
@@ -74,10 +74,10 @@
       </el-col>
       <el-col :span="15" style="float: right">
         <div>
-          <el-button :disabled="jinyong" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-top:3px" plain @click="getSpareParts">选入零件</el-button>
-          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('RWD')">导出任务单</el-button>
+          <el-button v-positive="'loading'" :disabled="jinyong" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-top:3px" plain @click="getSpareParts">选入零件</el-button>
+          <el-button v-positive="'loading'" :disabled="false" type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('RWD')">导出任务单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
-            <el-button :disabled="jinyong" type="success" size="mini" icon="el-icon-upload2" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
+            <el-button v-positive="'loading'" :disabled="jinyong" type="success" size="mini" icon="el-icon-upload2" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
           </el-tooltip>
           <!--<el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">-->
           <!--<el-button type="success" size="mini" icon="el-icon-tickets" style="margin-left:10px;margin-top: 3px;float: right" plain @click="confirmPrice">保存</el-button>-->
@@ -164,7 +164,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff('form')">取消</el-button>
-        <el-button :disabled="handleAdd_disable" type="primary" @click="submit('form')">确定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" @click="submit('form')">确定</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 84400125..499fbff0 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -33,7 +33,7 @@
     </el-col>
     <el-col :span="14">
       <el-card>
-        <el-button :disabled="loading" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">收货</el-button>
+        <el-button v-positive="'loading'" :disabled="loading" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">收货</el-button>
         <el-table v-loading="loading" :data="List3" border size="mini" height="595" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column :selectable="selectable" type="selection" align="center" width="55"/>
           <el-table-column label="收货状态" width="100" align="center">
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 5e402cea..7582786c 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -58,7 +58,7 @@
     </el-col>
     <el-col style="width: auto">
       <el-card>
-        <el-button :disabled="saveRowPrice_disable" size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
+        <el-button v-positive="'loading'" :disabled="false" size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
         <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" empty-text="   " height="580" border element-loading-text="拼命加载中" size="small">
           <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="加工状态" width="100" align="center">
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 374b5f59..61750ee1 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -76,7 +76,7 @@
               <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
               <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>-->
               <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=50;total11=0;searchTable11()">查询</el-button>
-              <el-button type="search" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
+              <el-button v-positive="'loading'" :disabled="false" type="search" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
               <el-tooltip :open-delay="100" effect="dark" content="开启物料变更" placement="top">
                 <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 30px"/>
               </el-tooltip>
@@ -235,18 +235,21 @@
                 <!--</template>-->
                 <!--</el-table-column>-->
               </el-table>
-              <div class="block" style="display: inline-block;">
-                <el-pagination
-                  :current-page="pageCurrent11"
-                  :page-sizes="[10, 50, 100, 150]"
-                  :page-size="pageSize11"
-                  :total="total11"
-                  style="display:inline-block;width:50px"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="handleSizeChange11"
-                  @current-change="handleCurrentChange11"/>
+              <div class="block" style="display: inline-block;width:1150px;float: right;">
+                <div style="display: inline-block;float: right;">
+                  <el-pagination
+                    :current-page="pageCurrent11"
+                    :page-sizes="[10, 50, 100, 150]"
+                    :page-size="pageSize11"
+                    :total="total11"
+                    mini
+                    style="display:inline-block;margin-right: 0px"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    @size-change="handleSizeChange11"
+                    @current-change="handleCurrentChange11"/>
+                </div>
               </div>
-              <div style="display: inline-block; float: left">
+              <div style="display: inline-block;float: left">
                 <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
                   <el-button
                     type="primary"
@@ -417,16 +420,19 @@
                 <!--</el-table-column>-->
               </el-table>
             </el-row>
-            <div class="block" style="display: inline-block;">
-              <el-pagination
-                :current-page="pageCurrent12"
-                :page-sizes="[10, 50, 100, 150]"
-                :page-size="pageSize12"
-                :total="total12"
-                style="display:inline-block;width:50px"
-                layout="total, sizes, prev, pager, next, jumper"
-                @size-change="handleSizeChange12"
-                @current-change="handleCurrentChange12"/>
+            <div class="block" style="display: inline-block;width:1150px;float: right;">
+              <div style="display: inline-block;float: right;">
+                <el-pagination
+                  :current-page="pageCurrent12"
+                  :page-sizes="[10, 50, 100, 150]"
+                  :page-size="pageSize12"
+                  :total="total12"
+                  mini
+                  style="display:inline-block;margin-right: 0px"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  @size-change="handleSizeChange12"
+                  @current-change="handleCurrentChange12"/>
+              </div>
             </div>
             <div style="display: inline-block; float: left">
               <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
@@ -2572,4 +2578,7 @@ export default {
       line-height: 46px;
     }
   }
+  el-pagination__sizes {
+    width: 10px;
+  }
 </style>
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 5be0d365..096a7a03 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -147,10 +147,10 @@
         <el-radio-button label="模板1"/>
         <el-radio-button label="模板2" disabled/>
       </el-radio-group>
-      <el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
       <span>递交审核：</span>
       <el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审核" placement="top">
-        <el-button :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
+        <el-button v-positive="'loading'" :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
       </el-tooltip>
       <hr>
       <!--html代码-->
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index 703f3003..97293bc8 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -24,7 +24,7 @@
         <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
         <el-button type="warning" size="small" icon="el-icon-goods" plain style="" @click="requestFund">请款</el-button>
         <!--        <el-checkbox v-model="searchAll" style="margin-left: 50px">查询全部</el-checkbox>-->
-        <el-button type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 20px;" @click="exportExcel">导出</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 20px;" @click="exportExcel">导出</el-button>
       </div>
       <!--<h3>请款表</h3>-->
       <el-table v-loading="" :data="tableData1" border size="mini" height="200" stripe highlight-current-row @row-click="searchTable02">
@@ -246,7 +246,7 @@
         </el-table-column>
       </el-table>
       <span>合计：<el-input v-model="SUM" readonly size="mini" style="width: 150px; margin: 10px 10px 0 10px"/>元</span>
-      <el-button type="primary" size="small" style="float:right;margin: 10px" icon="el-icon-check" @click="submitRequestFund">确定请款</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="primary" size="small" style="float:right;margin: 10px" icon="el-icon-check" @click="submitRequestFund">确定请款</el-button>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 866e404d..99fcb454 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -49,7 +49,7 @@
     <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
       <el-tab-pane label="标准件" name="标准件">
         <el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe @sort-change="sortChange0">
-          <el-table-column align="center" prop="询价状态编号" label="采购状态" width="90px">
+          <el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom">
             <template slot-scope="scope">
               <!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
               <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
@@ -161,7 +161,7 @@
         <div class="block">
           <el-pagination
             :current-page="pageCurrent0"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSize0"
             :total="total0"
             style="margin-top:10px;display:inline-block;width:50%"
@@ -172,7 +172,7 @@
       </el-tab-pane>
       <el-tab-pane label="外购件" name="外购件">
         <el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
-          <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
+          <el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom">
             <template slot-scope="scope">
               <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
               <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -276,7 +276,7 @@
         <div class="block">
           <el-pagination
             :current-page="pageCurrent1"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSize1"
             :total="total1"
             style="margin-top:10px;display:inline-block;width:50%"
@@ -287,7 +287,7 @@
       </el-tab-pane>
       <el-tab-pane label="基本件" name="基本件">
         <el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe @sort-change="sortChange2">
-          <el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
+          <el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom">
             <template slot-scope="scope">
               <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
               <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -397,7 +397,7 @@
         <div class="block">
           <el-pagination
             :current-page="pageCurrent2"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSize2"
             :total="total2"
             style="margin-top:10px;display:inline-block;width:50%"
@@ -434,13 +434,13 @@ export default {
       tableData2: [],
       tableData3: [],
       pageCurrent0: 1,
-      pageSize0: 20,
+      pageSize0: 50,
       total0: 0,
       pageCurrent1: 1,
-      pageSize1: 20,
+      pageSize1: 50,
       total1: 0,
       pageCurrent2: 1,
-      pageSize2: 20,
+      pageSize2: 50,
       total2: 0
     }
   },
@@ -657,6 +657,10 @@ export default {
         this.partName = 4
       } else if (column.prop === '供应商名称') {
         this.partName = 5
+      } else if (column.prop === '供货商') {
+        this.partName = 4
+      } else if (column.prop === '询价状态编号') {
+        this.partName = 6
       } else {
         this.partName = ''
       }
@@ -728,6 +732,8 @@ export default {
         this.partName = 4
       } else if (column.prop === '供应商名称') {
         this.partName = 5
+      } else if (column.prop === '询价状态编号') {
+        this.partName = 6
       } else {
         this.partName = ''
       }
@@ -801,6 +807,8 @@ export default {
         this.partName = 4
       } else if (column.prop === '供应商名称') {
         this.partName = 5
+      } else if (column.prop === '询价状态编号') {
+        this.partName = 6
       } else {
         this.partName = ''
       }
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index fee07584..d4e4b784 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -1,20 +1,27 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small">
+      <el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small" @change="searchModel()">
         <el-option
           v-for="item in machine"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-select v-model="groupValue" placeholder="组号" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small">
+      <el-select v-model="groupValue" placeholder="组号" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="" @change="searchModel()">
         <el-option
           v-for="item in group"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
+      <el-select v-model="ModelValue" placeholder="规格" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="">
+        <el-option
+          v-for="item in Model"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
       <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
     </el-card>
     <el-card>
@@ -278,7 +285,7 @@
 </template>
 
 <script>
-import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts'
+import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData, searchModel } from '@/api/TechnologyCenter/QueryParts'
 import { mapGetters } from 'vuex'
 import { ServerIP } from '@/utils/request'
 export default {
@@ -290,6 +297,8 @@ export default {
       groupValue: '',
       group: [],
       group1: [],
+      ModelValue: '', // 规格型号
+      Model: [], // 规格型号组
       loading: false,
       loadingWB: false,
       dialogFormVisible: false,
@@ -375,14 +384,26 @@ export default {
       this.form.组号 = ''
       this.getSelect(groupSelect, ['组号', '组件流水号'], 'group1', this.form.机床号)
     },
+    searchModel() {
+      const machine_check = this.machineValue ? 1 : 0
+      const group_check = this.groupValue ? 1 : 0
+      var param = []
+      param[0] = machine_check
+      param[1] = this.machineValue
+      param[2] = group_check
+      param[3] = this.groupValue
+      this.getSelect(searchModel, ['规格', '规格'], 'Model', param)
+      console.log(this.Model, 989898)
+    },
     getTableData() {
       this.getFileData(this.machineValue)
       console.log(this.hadFile, 88899)
       if (this.machineValue) {
         const machine_check = this.machineValue ? 1 : 0
         const group_check = this.groupValue ? 1 : 0
+        const Model_check = this.ModelValue ? 1 : 0
         this.loading = true
-        basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
+        basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, Model_check, this.ModelValue, this.pageSize, this.pageCurrent).then(response => {
           this.loading = false
           const res = response.data
           this.total = res.total
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index b0b9782b..111264e3 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -13,7 +13,6 @@
           </el-option>
         </el-select>
         <el-input v-model="contractName" placeholder="合同名称" style="width: 120px" size="small"/>
-        <!--        <el-input v-model="supplierName" size="small" placeholder="请双击选择供应商" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>-->
         <el-select v-model="supplierValue" placeholder="选择供应商" filterable style="width: 220px" size="small" clearable>
           <el-option
             v-for="item in supplierValues"
@@ -29,13 +28,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--        <el-date-picker-->
-        <!--          v-model="stipulateArrivalTime"-->
-        <!--          size="small"-->
-        <!--          type="date"-->
-        <!--          format="yyyy-MM-dd"-->
-        <!--          value-format="yyyy-MM-dd"-->
-        <!--          placeholder="规定到货时间"/>-->
         <el-input v-model="name" placeholder="采购员" style="width: 120px" size="small" readonly/>
         <el-input v-model="taxRate" placeholder="税率" style="width: 100px" size="small"/>
         <el-button v-show="contractNumType===0" type="primary" plain size="small" @click="linkGroup">成组采购</el-button>
@@ -162,11 +154,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button
-        type="distribution"
-        size="small"
-        style="margin-left: 7.5%; margin-top: 10px"
-        @click="doneContract">生成采购合同</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" style="margin-left: 7.5%; margin-top: 10px" @click="doneContract">生成采购合同</el-button>
     </el-card>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 6152f803..351c2941 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -9,7 +9,7 @@
               <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
-              <el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
+              <el-button v-positive="'loading'" :disabled="false" type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
             </el-tooltip>
             <el-table
               v-loading="loading1"
@@ -82,10 +82,10 @@
             <!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
             <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">外购备料</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
-              <el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
+              <el-button v-positive="'loading'" :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
-              <el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 10px" @click="saveMateriel">保存</el-button>
+              <el-button v-positive="'loading'" :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 10px" @click="saveMateriel">保存</el-button>
             </el-tooltip>
             <el-select v-model="supplierName0" placeholder="供应商" style="width: 220px;margin-left: 10px" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">
               <el-option
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index f8a5012e..2db27b80 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -123,17 +123,31 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
+      <div class="block" style="display: inline-block;width:1150px;float: right;">
+        <div style="display: inline-block;float: right;">
+          <el-pagination
+            :current-page="pageCurrent1"
+            :page-sizes="[10, 20, 30, 40, 100]"
+            :page-size="pageSize1"
+            :total="total1"
+            mini
+            style="display:inline-block;margin-right: 0px"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange1"
+            @current-change="handleCurrentChange1"/>
+        </div>
       </div>
+      <!--<div class="block" style="margin-top: 10px;">-->
+      <!--<el-pagination-->
+      <!--:current-page="pageCurrent1"-->
+      <!--:page-sizes="[10, 20, 30, 40]"-->
+      <!--:page-size="pageSize1"-->
+      <!--:total="total1"-->
+      <!--style="display:inline-block;width:50%"-->
+      <!--layout="total, sizes, prev, pager, next, jumper"-->
+      <!--@size-change="handleSizeChange1"-->
+      <!--@current-change="handleCurrentChange1"/>-->
+      <!--</div>-->
     </el-card>
 
     <el-card>
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 70a2ccf6..255aa009 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -25,7 +25,7 @@
               end-placeholder="结束日期"/>
             <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable4()">查询</el-button>
             <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">到货单</el-button>
-            <el-button type="success" plain size="small" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
+            <el-button v-positive="'loading'" :disabled="false" type="success" plain size="small" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
           </div>
         </el-card>
         <el-card style="width: 650px;margin-left: 0px;display: inline-block">
@@ -195,321 +195,267 @@
             </el-table-column>
           </el-table>
         </el-card>
-
-        <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="360px">
-          <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
-            <el-form-item label="到货单号">
-              <el-input v-model="NewOrder" style="width: 180px" size="small" disabled/>
-            </el-form-item>
-            <el-form-item label="供应商" prop="supplierNameValue">
-              <el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" style="width: 180px" size="small" filterable @change="searchTable20()">
+      </div>
+      <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="360px">
+        <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
+          <el-form-item label="到货单号">
+            <el-input v-model="NewOrder" style="width: 180px" size="small" disabled/>
+          </el-form-item>
+          <el-form-item label="供应商" prop="supplierNameValue">
+            <el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" style="width: 180px" size="small" filterable @change="searchTable20()">
+              <el-option
+                v-for="item in supplierNames"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="到货日期" prop="invoiceTime">
+            <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" style="width: 180px" format="yyyy-MM-dd" placeholder="选择日期"/>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button
+            v-show="title==='新增到货单'"
+            :disabled="addArrivalOrder_disable"
+            type="primary"
+            size="small"
+            icon="el-icon-check"
+            @click="submitAddArrivalOrder">保存</el-button>
+          <el-button
+            v-show="title==='编辑到货单'"
+            :disabled="addArrivalOrder_disable"
+            type="primary"
+            size="small"
+            icon="el-icon-check"
+            @click="submitEditArrivalOrder">确定</el-button>
+        </div>
+      </el-dialog>
+      <el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 200px" width="1600px">
+        <el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
+          <el-row style="background-color: white">
+            <el-col :span="5" style="margin-left: 2%">
+              <span>供应商</span>
+              <el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
+            </el-col>
+            <el-col :span="4">
+              <span>到货单编号</span>
+              <el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
+            </el-col>
+            <el-col :span="4">
+              <span>计划类型</span>
+              <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
                 <el-option
-                  v-for="item in supplierNames"
+                  v-for="item in planTypes"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-            </el-form-item>
-            <el-form-item label="到货日期" prop="invoiceTime">
-              <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" style="width: 180px" format="yyyy-MM-dd" placeholder="选择日期"/>
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button
-              v-show="title==='新增到货单'"
-              :disabled="addArrivalOrder_disable"
-              type="primary"
-              size="small"
-              icon="el-icon-check"
-              @click="submitAddArrivalOrder">保存</el-button>
-            <el-button
-              v-show="title==='编辑到货单'"
-              :disabled="addArrivalOrder_disable"
-              type="primary"
-              size="small"
-              icon="el-icon-check"
-              @click="submitEditArrivalOrder">确定</el-button>
-          </div>
-        </el-dialog>
-        <el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 200px" width="1600px">
-          <el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
-            <el-row style="background-color: white">
-              <el-col :span="5" style="margin-left: 2%">
-                <span>供应商</span>
-                <el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
-              </el-col>
-              <el-col :span="4">
-                <span>到货单编号</span>
-                <el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
-              </el-col>
-              <el-col :span="4">
-                <span>计划类型</span>
-                <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
-                  <el-option
-                    v-for="item in planTypes"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"/>
-                </el-select>
-              </el-col>
-              <el-col :span="4">
-                <span>零件图号</span>
-                <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
-              </el-col>
-              <el-col :span="2">
-                <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
-              </el-col>
-            </el-row>
-            <el-row>
-              <div style="width: 20%;float: left;margin-top: 20px">
-                <div style="background: white">
-                  <el-row style="height: 50px">
-                    <el-form-item label="材料" prop="CailiaoValue">
-                      <el-input v-model="form10.CailiaoValue" size="small"/>
-                    </el-form-item>
-                  </el-row>
-                  <el-row style="height: 50px">
-                    <el-form-item label="重量" prop="数量">
-                      <el-input-number v-model="form10.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
-                    </el-form-item>
-                  </el-row>
-                  <el-row style="height: 50px">
-                    <el-form-item label="单价" prop="单价">
-                      <el-input-number v-model="form10.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
-                    </el-form-item>
-                  </el-row>
-                  <el-row style="height: 50px">
-                    <el-form-item label="单位" prop="单位">
-                      <el-input v-model="form10.单位" size="small"/>
-                    </el-form-item>
-                  </el-row>
-                  <el-row style="height: 50px">
-                    <el-form-item label="金额(元)" prop="金额">
-                      <el-input-number v-model="form10.金额" :precision="2" :step="1" size="medium" disabled/>
-                    </el-form-item>
-                  </el-row>
-                </div>
-                <div>
-                  <el-button type="primary" size="small" style="margin-left: 40%;margin-top: 10px" @click="submitAddArrivalOrderMX">确定</el-button>
-                </div>
+            </el-col>
+            <el-col :span="4">
+              <span>零件图号</span>
+              <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
+            </el-col>
+            <el-col :span="2">
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div style="width: 20%;float: left;margin-top: 20px">
+              <div style="background: white">
+                <el-row style="height: 50px">
+                  <el-form-item label="材料" prop="CailiaoValue">
+                    <el-input v-model="form10.CailiaoValue" size="small"/>
+                  </el-form-item>
+                </el-row>
+                <el-row style="height: 50px">
+                  <el-form-item label="重量" prop="数量">
+                    <el-input-number v-model="form10.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
+                  </el-form-item>
+                </el-row>
+                <el-row style="height: 50px">
+                  <el-form-item label="单价" prop="单价">
+                    <el-input-number v-model="form10.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
+                  </el-form-item>
+                </el-row>
+                <el-row style="height: 50px">
+                  <el-form-item label="单位" prop="单位">
+                    <el-input v-model="form10.单位" size="small"/>
+                  </el-form-item>
+                </el-row>
+                <el-row style="height: 50px">
+                  <el-form-item label="金额(元)" prop="金额">
+                    <el-input-number v-model="form10.金额" :precision="2" :step="1" size="medium" disabled/>
+                  </el-form-item>
+                </el-row>
               </div>
-              <div style="width: 79%;float: left;margin-left: 10px">
-                <el-table
-                  ref="multipleTable"
-                  :row-key="getRowKeys"
-                  :summary-method="getSummaries2"
-                  :data="tableData20"
-                  border
-                  show-summary
-                  highlight-current-row
-                  stripe
-                  style="margin: 3px 0"
-                  height="350px"
-                  size="mini"
-                  @selection-change="handleSelectionChange">
-                  <el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
-                  <el-table-column label="采购单号" align="center" width="120">
-                    <template slot-scope="scope">
-                      {{ scope.row.采购单号 }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="物料编码" align="center" width="150">
-                    <template slot-scope="scope">
-                      {{ scope.row.物料零件编码 }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="零件名称" align="center" width="110px">
-                    <template slot-scope="scope">
-                      {{ scope.row.零件名称 }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="材料" align="center" width="90px">
-                    <template slot-scope="scope">
-                      {{ scope.row.材料 }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备料数" align="center" width="65px">
-                    <template slot-scope="scope">
-                      {{ scope.row.采购数量 }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="已到数" align="center" width="65px">
-                    <template slot-scope="scope">
-                      {{ scope.row.到货数量 }}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="到货件数" align="center" width="120px">
-                    <template slot-scope="scope">
-                      <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:100%" @change="saveData(scope.row)"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="到货重量(KG)" align="center" width="150px" prop="到货重量">
-                    <template slot-scope="scope">
-                      <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0.00" size="mini" style="width:100%" @change="saveData(scope.row)"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="成品尺寸(长、宽、高)" align="center" width="170px">
-                    <template slot-scope="scope">
-                      {{ scope.row.成品尺寸 }}
-                    </template>
-                  </el-table-column>
-                  <!--<el-table-column label="单位" align="center" width="60px">-->
-                  <!--<template slot-scope="scope">-->
-                  <!--{{ scope.row.单位 ? scope.row.单位 : '-' }}-->
-                  <!--</template>-->
-                  <!--</el-table-column>-->
-                  <el-table-column label="备注" align="center">
-                    <template slot-scope="scope">
-                      {{ scope.row.备注1 }}
-                    </template>
-                  </el-table-column>
-                </el-table>
+              <div>
+                <el-button type="primary" size="small" style="margin-left: 40%;margin-top: 10px" @click="submitAddArrivalOrderMX">确定</el-button>
               </div>
-            </el-row>
-          </el-form>
-        </el-dialog>
-
-        <!--<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 200px" width="430px">-->
-        <!--<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="120px">-->
-        <!--<el-row>-->
-        <!--<el-form-item v-show="title1==='添加到货明细'" label="材料" prop="CailiaoValue">-->
-        <!--<el-input v-model="form1.CailiaoValue" size="small"/>-->
-        <!--</el-form-item>-->
-        <!--</el-row>-->
-        <!--<el-row>-->
-        <!--<el-form-item label="数量" prop="数量">-->
-        <!--<el-input-number v-model="form1.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>-->
-        <!--</el-form-item>-->
-        <!--</el-row>-->
-        <!--<el-row>-->
-        <!--<el-form-item label="单价" prop="单价">-->
-        <!--<el-input-number v-model="form1.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>-->
-        <!--</el-form-item>-->
-        <!--</el-row>-->
-        <!--<el-row>-->
-        <!--<el-form-item label="单位" prop="单位">-->
-        <!--<el-input v-model="form1.单位" size="small"/>-->
-        <!--</el-form-item>-->
-        <!--</el-row>-->
-        <!--<el-row>-->
-        <!--<el-form-item label="金额" prop="金额">-->
-        <!--<el-input-number v-model="form1.金额" :precision="2" :step="1" size="medium"/>-->
-        <!--</el-form-item>-->
-        <!--</el-row>-->
-        <!--</el-form>-->
-        <!--<div slot="footer" class="dialog-footer">-->
-        <!--<el-button-->
-        <!--v-show="title1==='添加到货明细'"-->
-        <!--type="warning"-->
-        <!--size="small"-->
-        <!--plain-->
-        <!--icon="el-icon-check"-->
-        <!--@click="submitAddArrivalOrderMX">保存</el-button>-->
-        <!--<el-button-->
-        <!--v-show="title1==='添加到货明细'"-->
-        <!--type="primary"-->
-        <!--plain-->
-        <!--size="small"-->
-        <!--icon="el-icon-check"-->
-        <!--@click="submitAddArrivalOrderMX1">继续添加</el-button>-->
-        <!--<el-button-->
-        <!--v-show="title1==='编辑到货明细'"-->
-        <!--type="primary"-->
-        <!--size="small"-->
-        <!--icon="el-icon-check"-->
-        <!--@click="submitEditArrivalOrderMX">确定</el-button>-->
-        <!--</div>-->
-        <!--</el-dialog>-->
-
-        <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 550px" width="1400px">
-          <span>计划类型</span>
-          <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
-            <el-option
-              v-for="item in planTypes"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <span>零件图号</span>
-          <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
-          <span style="margin-left: 20px">未绑定重量：{{ 未绑定数量 }}KG</span>
-          <el-table
-            ref="multipleTable"
-            :row-key="getRowKeys"
-            :summary-method="getSummaries3"
-            :row-selection="{selectedRowKeys: selectedRowKeys}"
-            :data="tableData20"
-            border
-            show-summary
-            highlight-current-row
-            stripe
-            style="margin: 3px 0"
-            height="300px"
-            size="mini"
-            @selection-change="handleSelectionChange1">
-            <el-table-column :reserve-selection="mark" type="selection" width="50" align="center"/>
-            <el-table-column label="采购单号" align="center" width="120">
-              <template slot-scope="scope">
-                {{ scope.row.采购单号 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="物料编码" align="center" width="150">
-              <template slot-scope="scope">
-                {{ scope.row.物料零件编码 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="零件名称" align="center" width="90px">
-              <template slot-scope="scope">
-                {{ scope.row.零件名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="材料" align="center" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.材料 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="备料数" align="center" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.采购数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="已到数" align="center" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.到货数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="到货件数" align="center" width="120px">
-              <template slot-scope="scope">
-                <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:95px" @change="saveData(scope.row)"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="到货重量(KG)" align="center" width="150px">
-              <template slot-scope="scope">
-                <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:100%" @change="saveData(scope.row)"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="成品尺寸（长、宽、高）" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.成品尺寸 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="单位" align="center" width="60px">
-              <template slot-scope="scope">
-                {{ scope.row.单位 ? scope.row.单位 : '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.备注1 }}
-              </template>
-            </el-table-column>
-          </el-table>
-          <div slot="footer" class="dialog-footer">
-            <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联备料材料</el-button>
-          </div>
-        </el-dialog>
-      </div>
+            </div>
+            <div style="width: 79%;float: left;margin-left: 10px">
+              <el-table
+                ref="multipleTable"
+                :row-key="getRowKeys"
+                :summary-method="getSummaries2"
+                :data="tableData20"
+                border
+                show-summary
+                highlight-current-row
+                stripe
+                style="margin: 3px 0"
+                height="350px"
+                size="mini"
+                @selection-change="handleSelectionChange">
+                <el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
+                <el-table-column label="采购单号" align="center" width="120">
+                  <template slot-scope="scope">
+                    {{ scope.row.采购单号 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="物料编码" align="center" width="150">
+                  <template slot-scope="scope">
+                    {{ scope.row.物料零件编码 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="零件名称" align="center" width="110px">
+                  <template slot-scope="scope">
+                    {{ scope.row.零件名称 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="材料" align="center" width="90px">
+                  <template slot-scope="scope">
+                    {{ scope.row.材料 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="备料数" align="center" width="65px">
+                  <template slot-scope="scope">
+                    {{ scope.row.采购数量 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="已到数" align="center" width="65px">
+                  <template slot-scope="scope">
+                    {{ scope.row.到货数量 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="到货件数" align="center" width="120px">
+                  <template slot-scope="scope">
+                    <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:100%" @change="saveData(scope.row)"/>
+                  </template>
+                </el-table-column>
+                <el-table-column label="到货重量(KG)" align="center" width="150px" prop="到货重量">
+                  <template slot-scope="scope">
+                    <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0.00" size="mini" style="width:100%" @change="saveData(scope.row)"/>
+                  </template>
+                </el-table-column>
+                <el-table-column label="成品尺寸(长、宽、高)" align="center" width="170px">
+                  <template slot-scope="scope">
+                    {{ scope.row.成品尺寸 }}
+                  </template>
+                </el-table-column>
+                <!--<el-table-column label="单位" align="center" width="60px">-->
+                <!--<template slot-scope="scope">-->
+                <!--{{ scope.row.单位 ? scope.row.单位 : '-' }}-->
+                <!--</template>-->
+                <!--</el-table-column>-->
+                <el-table-column label="备注" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.备注1 }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-row>
+        </el-form>
+      </el-dialog>
+      <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 550px" width="1400px">
+        <span>计划类型</span>
+        <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
+          <el-option
+            v-for="item in planTypes"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>零件图号</span>
+        <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
+        <span style="margin-left: 20px">未绑定重量：{{ 未绑定数量 }}KG</span>
+        <el-table
+          ref="multipleTable"
+          :row-key="getRowKeys"
+          :summary-method="getSummaries3"
+          :row-selection="{selectedRowKeys: selectedRowKeys}"
+          :data="tableData20"
+          border
+          show-summary
+          highlight-current-row
+          stripe
+          style="margin: 3px 0"
+          height="300px"
+          size="mini"
+          @selection-change="handleSelectionChange1">
+          <el-table-column :reserve-selection="mark" type="selection" width="50" align="center"/>
+          <el-table-column label="采购单号" align="center" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.采购单号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料编码" align="center" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.物料零件编码 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="零件名称" align="center" width="90px">
+            <template slot-scope="scope">
+              {{ scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="材料" align="center" width="70px">
+            <template slot-scope="scope">
+              {{ scope.row.材料 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备料数" align="center" width="70px">
+            <template slot-scope="scope">
+              {{ scope.row.采购数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="已到数" align="center" width="70px">
+            <template slot-scope="scope">
+              {{ scope.row.到货数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="到货件数" align="center" width="120px">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:95px" @change="saveData(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="到货重量(KG)" align="center" width="150px">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:100%" @change="saveData(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="成品尺寸（长、宽、高）" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.成品尺寸 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单位" align="center" width="60px">
+            <template slot-scope="scope">
+              {{ scope.row.单位 ? scope.row.单位 : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.备注1 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+          <el-button v-positive="'loading'" :disabled="false" type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联备料材料</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index 3233773e..2f12ea71 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -64,7 +64,7 @@
             <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
             <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
             <!--</el-tooltip>-->
-            <el-button type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
+            <el-button v-positive="'loading'" :disabled="false" type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
             <!--slot="header"-->
             <!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
             <el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px;margin-top: 3px;margin-left: 20px" clearable/>
@@ -251,14 +251,17 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
+          v-positive="'loading'"
           v-show="title2==='创建外购备料计划'"
-          :disabled="addPurchaseOrder_disable"
+          :disabled="false"
           type="primary"
           size="small"
           icon="el-icon-check"
           @click="submitAddPurchaseOrder">确定</el-button>
         <el-button
+          v-positive="'loading'"
           v-show="title2==='编辑外购备料计划'"
+          :disabled="false"
           type="primary"
           size="small"
           icon="el-icon-check"
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 48ac6bb4..fd0fcb38 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -224,7 +224,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
-        <el-button :disabled="addTable1_disable" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -254,7 +254,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
+        <el-button v-positive="'loading'" :disabled="false" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -278,7 +278,7 @@
         </el-table-column>
       </el-table>
       <span>合计：<el-input v-positive="'float'" v-model="SUM" size="mini" type="number" style="width: 80px; margin: 10px 10px 0 10px" @change="Keeptwodecimalplaces"/>元</span>
-      <el-button :disabled="aboutArrival_disable" type="primary" size="small" icon="el-icon-download" style="float:right;margin: 10px 10px 0 10px" @click="addMateriel">货票关联</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="primary" size="small" icon="el-icon-download" style="float:right;margin: 10px 10px 0 10px" @click="addMateriel">货票关联</el-button>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index 7d730be9..872b8ac6 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -17,7 +17,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>备料时间段:</span>
+        <span>接收时间:</span>
         <el-date-picker
           v-model="dateRange"
           :picker-options="pickerOptions"
@@ -31,7 +31,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
         <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 10px" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-        <el-button type="success" plain icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="success" plain icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
       </div>
     </el-card>
     <el-card style="width: 100%">
@@ -97,6 +97,16 @@
             {{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
+        <el-table-column label="接收时间" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.备料任务接受时间 ? scope.row.备料任务接受时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="分配时间" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.备料任务分配时间 ? scope.row.备料任务分配时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 0bf8345d..dea40e80 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -35,7 +35,7 @@
             :value="item.value"/>
         </el-select>
         <el-button type="primary" size="small" plain icon="el-icon-search" @click="total1=0;pageCurrent1=1;pageSize1=20;searchTable1()">查询</el-button>
-        <el-button type="primary" size="small" plain icon="el-icon-download" @click="exportExcel()">导出合同报表</el-button>
+        <el-button v-positive="'loading'" :disabled="false" type="primary" size="small" plain icon="el-icon-download" @click="exportExcel()">导出合同报表</el-button>
       </el-row>
     </el-card>
 
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index 94f7e52a..ffe0e466 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -9,20 +9,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="searchTable1()">查询</el-button>
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-download"
-        style="margin-left:10px"
-        @click="exportExcel()">导出</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="searchTable1()">查询</el-button>
+      <el-button v-positive="'loading'" :disabled="false" type="primary" size="small" plain icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
     </el-card>
     <el-card style="width: 800px">
       <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index a469fd84..2abebc42 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -22,13 +22,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-search"
-        style="margin-left: 10px"
-        @click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
       <el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
     </el-card>
     <el-row>
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 54768562..0862249f 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -156,37 +156,37 @@
             <!--</el-table-column>-->
           </el-table>
         </el-card>
-        <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
-          <span>供应商：</span>
-          <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
-            <el-option
-              v-for="item in supplier"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" align="center" width="50"/>
-            <el-table-column label="发票号" align="center" min-width="120">
-              <template slot-scope="scope">
-                {{ scope.row.发票号 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="到票金额" align="center" min-width="70">
-              <template slot-scope="scope">
-                {{ Number(scope.row.开票金额).toFixed(2) }}
-              </template>
-            </el-table-column>
-            <el-table-column label="到票时间" align="center" min-width="70">
-              <template slot-scope="scope">
-                {{ scope.row.开票时间 | formatTime }}
-              </template>
-            </el-table-column>
-          </el-table>
-          <span>合计：<el-input v-model="SUM" size="mini" style="width: 90px; margin: 10px 10px 0 10px"/>元</span>
-          <el-button :disabled="requestFund_disable" type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
-        </el-dialog>
       </div>
+      <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
+        <span>供应商：</span>
+        <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
+          <el-option
+            v-for="item in supplier"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" align="center" width="50"/>
+          <el-table-column label="发票号" align="center" min-width="120">
+            <template slot-scope="scope">
+              {{ scope.row.发票号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="到票金额" align="center" min-width="70">
+            <template slot-scope="scope">
+              {{ Number(scope.row.开票金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="到票时间" align="center" min-width="70">
+            <template slot-scope="scope">
+              {{ scope.row.开票时间 | formatTime }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <span>合计：<el-input v-model="SUM" size="mini" style="width: 90px; margin: 10px 10px 0 10px"/>元</span>
+        <el-button :disabled="requestFund_disable" type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
+      </el-dialog>
     </div>
   </div>
 </template>