diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
index 4256bcb6..dc2f6cbd 100644
--- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js
+++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
@@ -93,7 +93,7 @@ export function searchTable1(...params) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: 'xqs_采购管理_采购部采购_查询物料_分配后_采购任务分配',
-      param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}`,
+      param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}&排序名称=${params[23]}&排序方式=${params[24]}`,
       Pagination: params[0] + '&' + params[1]
     }
   })
@@ -108,7 +108,7 @@ export function searchTable2(...params) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_分配后_采购任务分配',
-      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态编号=${params[8]}&零件图号_check=${params[9]}&零件图号=${params[10]}&零件名称_check=${params[11]}&零件名称=${params[12]}&零件规格_check=${params[13]}&零件规格=${params[14]}&材料_check=${params[15]}&材料=${params[16]}`,
+      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态编号=${params[8]}&零件图号_check=${params[9]}&零件图号=${params[10]}&零件名称_check=${params[11]}&零件名称=${params[12]}&零件规格_check=${params[13]}&零件规格=${params[14]}&材料_check=${params[15]}&材料=${params[16]}&排序名称=${params[17]}&排序方式=${params[18]}`,
       Pagination: params[0] + '&' + params[1]
     }
   })
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 60642971..d8c67c22 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -33,7 +33,7 @@
       </div>
       <el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
         <el-tab-pane label="标准件" name="标准件">
-          <el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 1117px" height="320px" border stripe @selection-change="handleSelectionChange">
+          <el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
             <el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
             <el-table-column align="center" prop="机床图号" label="机床图号" width="120" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -70,21 +70,6 @@
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="已领数" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.已领数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="领用数" width="120px">
-              <template slot-scope="scope">
-                <el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="库存数" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.货位存量1 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.领料单编号 }}
@@ -104,7 +89,7 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="外购件" name="外购件">
-          <el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 1117px" height="320px" border stripe @selection-change="handleSelectionChange">
+          <el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
             <el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
             <el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -141,21 +126,6 @@
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="已领数" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.已领数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="领用数" width="120px">
-              <template slot-scope="scope">
-                <el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="库存数" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.货位存量1 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.领料单编号 }}
@@ -175,7 +145,7 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="基本件" name="基本件">
-          <el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 1226px" height="320px" border stripe @selection-change="handleSelectionChange">
+          <el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 976px" height="320px" border stripe @selection-change="handleSelectionChange">
             <el-table-column :selectable="selectable" type="selection" align="center" width="42"/>
             <el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -217,21 +187,6 @@
                 {{ scope.row.备件总数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="已领数" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.已领数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="领用数" width="120px">
-              <template slot-scope="scope">
-                <el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="库存数" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.货位存量1 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.领料单编号 }}
@@ -297,7 +252,7 @@
     <div slot="header">
       <el-card>
         <el-row style="margin-top: 5px">
-          <el-input v-model="pickingListPeople" clearable size="small" placeholder="制单人" style="width:100px;margin-left: 0px" />
+          <el-input v-model="pickingListPeople" clearable size="small" placeholder="领料单编号/制单人/机床" style="width:190px;margin-left: 0px" />
           <el-date-picker
             v-model="startTime"
             size="small"
@@ -745,7 +700,6 @@ export default {
       if (this.PickingValue === false) {
         this.loading0 = true
         searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent0, this.pageSize0, 1).then(response => {
-          console.log(response.data.rows, 1111)
           this.tableData0 = response.data.rows
           this.total0 = response.data.total
           this.loading0 = false
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 29a5a81b..79a8873f 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -226,9 +226,9 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="人员编号" prop="password" label-width="100px" size="small">
-          <el-input v-model="form3.password" size="small" placeholder="人员编号" style="width: 200px"/>
-        </el-form-item>
+        <!--<el-form-item label="人员编号" prop="password" label-width="100px" size="small">-->
+        <!--<el-input v-model="form3.password" size="small" placeholder="人员编号" style="width: 200px"/>-->
+        <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible3=false">取消</el-button>
@@ -319,7 +319,7 @@ export default {
       form3: {
         outTypeValue: '',
         department: '',
-        password: '',
+        // password: '',
         DirectNote: ''
       },
       form4: {
@@ -339,7 +339,7 @@ export default {
         reason: [{ required: true, message: '请输入' }]
       },
       rules3: {
-        password: [{ required: true, message: '请输入' }],
+        // password: [{ required: true, message: '请输入' }],
         outTypeValue: [{ required: true, message: '请选择' }]
       },
       rules4: {
@@ -519,7 +519,7 @@ export default {
     // 领料确认
     inputPassword() {
       this.form3.outTypeValue = 21
-      this.form3.password = ''
+      // this.form3.password = ''
       this.selectDepartment()
       this.departments = []
       this.buttonDisable = false
@@ -664,7 +664,7 @@ export default {
           this.outNumber.push(this.pickListTable2[i].出库数量)
         }
       }
-      if (Number(this.form3.password) === Number(this.form3.DirectNote)) {
+      if (this.form3.DirectNote) {
         for (let i = 0; i < this.departments.length; i++) {
           if (this.form3.department === this.departments[i].value) {
             this.department111 = this.departments[i].label
@@ -688,7 +688,7 @@ export default {
           } else { this.$message.error('操作失败') }
         })
       } else {
-        this.$message.error('人员编号错误')
+        this.$message.error('请选择领料人')
       }
     },
     // 提交出库
diff --git a/src/views/Inventory/MaterialOut/index2.vue b/src/views/Inventory/MaterialOut/index2.vue
index 674716c2..65c9496e 100644
--- a/src/views/Inventory/MaterialOut/index2.vue
+++ b/src/views/Inventory/MaterialOut/index2.vue
@@ -104,9 +104,9 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="人员编号" prop="password" label-width="100px" size="small">
-          <el-input v-model="form3.password" size="small" placeholder="人员编号" style="width: 200px"/>
-        </el-form-item>
+        <!--<el-form-item label="人员编号" prop="password" label-width="100px" size="small">-->
+        <!--<el-input v-model="form3.password" size="small" placeholder="人员编号" style="width: 200px"/>-->
+        <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible3=false">取消</el-button>
@@ -136,11 +136,11 @@ export default {
       form3: {
         outTypeValue: '',
         department: '',
-        password: '',
+        // password: '',
         DirectNote: ''
       },
       rules3: {
-        password: [{ required: true, message: '请输入' }],
+        // password: [{ required: true, message: '请输入' }],
         outTypeValue: [{ required: true, message: '请选择' }]
       },
       multipleSelection1: []
@@ -227,7 +227,7 @@ export default {
     // 领料确认
     inputPassword() {
       this.form3.outTypeValue = 21
-      this.form3.password = ''
+      // this.form3.password = ''
       this.selectDepartment()
       this.departments = []
       this.buttonDisable = false
@@ -268,7 +268,7 @@ export default {
           this.outNumber.push(this.multipleSelection1[i].出库数量)
         }
       }
-      if (Number(this.form3.password) === Number(this.form3.DirectNote)) {
+      if (this.form3.DirectNote) {
         for (let i = 0; i < this.departments.length; i++) {
           if (this.form3.department === this.departments[i].value) {
             this.department111 = this.departments[i].label
@@ -286,7 +286,7 @@ export default {
         })
       } else {
         this.buttonDisable = false
-        this.$message.error('人员编号错误')
+        this.$message.error('请选择领料人')
       }
     },
     handleSizeChange1(val) {
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index ef1cb628..3df48659 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -65,6 +65,11 @@
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="220" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="出库数量" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.出库数量 }}
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 51297208..1769bb70 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -144,16 +144,30 @@
               <el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
                 <el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
               </el-tooltip>
-              <div class="block" style="margin: 10px 0 0 0;display: inline-block">
-                <el-pagination
-                  :current-page="pageCurrent11"
-                  :page-sizes="[10, 20, 30, 40, 100]"
-                  :page-size="pageSize11"
-                  :total="total11"
-                  style="display:inline-block;width:800px"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="handleSizeChange11"
-                  @current-change="handleCurrentChange11"/>
+              <!--<div class="block" style="margin: 10px 0 0 0;display: inline-block">-->
+              <!--<el-pagination-->
+              <!--:current-page="pageCurrent11"-->
+              <!--:page-sizes="[10, 20, 30, 40, 100]"-->
+              <!--:page-size="pageSize11"-->
+              <!--:total="total11"-->
+              <!--style="display:inline-block;width:800px"-->
+              <!--layout="total, sizes, prev, pager, next, jumper"-->
+              <!--@size-change="handleSizeChange11"-->
+              <!--@current-change="handleCurrentChange11"/>-->
+              <!--</div>-->
+              <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, 20, 30, 40, 100]"
+                    :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>
               <!--:row-class-name="tableRowClassName2"-->
             </el-tab-pane>
@@ -197,16 +211,30 @@
               <el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
                 <el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 5px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
               </el-tooltip>
-              <div class="block" style="display: inline-block">
-                <el-pagination
-                  :current-page="pageCurrent22"
-                  :page-sizes="[20, 50, 100, 150]"
-                  :page-size="pageSize22"
-                  :total="total22"
-                  style="display:inline-block;width:50%"
-                  layout="total, sizes, prev, pager, next, jumper"
-                  @size-change="handleSizeChange22"
-                  @current-change="handleCurrentChange22"/>
+              <!--<div class="block" style="display: inline-block">-->
+              <!--<el-pagination-->
+              <!--:current-page="pageCurrent22"-->
+              <!--:page-sizes="[20, 50, 100, 150]"-->
+              <!--:page-size="pageSize22"-->
+              <!--:total="total22"-->
+              <!--style="display:inline-block;width:50%"-->
+              <!--layout="total, sizes, prev, pager, next, jumper"-->
+              <!--@size-change="handleSizeChange22"-->
+              <!--@current-change="handleCurrentChange22"/>-->
+              <!--</div>-->
+              <div class="block" style="display: inline-block;width:1150px;float: right;">
+                <div style="display: inline-block;float: right;">
+                  <el-pagination
+                    :current-page="pageCurrent22"
+                    :page-sizes="[20, 50, 100, 150]"
+                    :page-size="pageSize22"
+                    :total="total22"
+                    mini
+                    style="display:inline-block;margin-right: 0px"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    @size-change="handleSizeChange22"
+                    @current-change="handleCurrentChange22"/>
+                </div>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -324,7 +352,7 @@
           </el-table-column>
           <el-table-column label="采购数" align="center" width="120">
             <template slot-scope="scope">
-              <el-input v-positive="'float'" v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:100px" type="number" @change="saveContract()"/>
+              <el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:100px" @change="saveContract()"/>
               <b v-else>{{ scope.row.数量 }}</b>
             </template>
           </el-table-column>
@@ -347,7 +375,6 @@
           <el-table-column label="单价(含税)元" align="center" width="120" prop="单价(含税)">
             <template slot-scope="scope">
               <el-input
-                v-positive="'float'"
                 v-direction="{x: 1, y: scope.$index}"
                 v-if="hasTax==='含税'"
                 v-model="scope.row.单价"
@@ -355,7 +382,6 @@
                 class="editWorkTime"
                 size="mini"
                 style="width:100px"
-                type="number"
                 @blur="changefixed(scope.row.单价, scope.$index, '单价')"
                 @change="saveContract()"/>
               <b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b>
@@ -1797,6 +1823,11 @@ export default {
     width:150px;
     margin-right: 10px;
   }
+</style>
+<style>
+  .el-table .MistyRose {
+    background: #9BD7FC!important;
+  }
   .editWorkTime input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
     -webkit-appearance: none;
     text-align: center;
@@ -1805,8 +1836,3 @@ export default {
     -moz-appearance: textfield;
   }
 </style>
-<style>
-  .el-table .MistyRose {
-    background: #9BD7FC!important;
-  }
-</style>
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 9a8ed92e..e3abf4e0 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -128,6 +128,7 @@
             border
             stripe
             highlight-current-row
+            @sort-change="sortChange"
             @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
             <el-table-column align="center" label="进程" prop="询价状态编号" width="60px">
@@ -188,7 +189,7 @@
                 {{ scope.row.接收日期 }}
               </template>
             </el-table-column>
-            <el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" show-overflow-tooltip>
+            <el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.任务分配时间 }}
               </template>
@@ -340,7 +341,7 @@
           <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">打回</el-button>-->
         </el-row>
         <el-row style="margin-bottom: 10px">
-          <el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1365px" border stripe @selection-change="handleSelectionChange1">
+          <el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1365px" border stripe @sort-change="sortChange1" @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
             <el-table-column align="center" prop="询价状态编号" label="进程" min-width="100px" width="60px">
               <template slot-scope="scope">
@@ -395,7 +396,7 @@
                 {{ scope.row.接收日期 }}
               </template>
             </el-table-column>
-            <el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" show-overflow-tooltip>
+            <el-table-column v-if="radio===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.任务分配时间 }}
               </template>
@@ -520,7 +521,7 @@
           <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
         </el-row>
         <el-row style="margin-bottom: 10px">
-          <el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1355px" border stripe @selection-change="handleSelectionChange2">
+          <el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1355px" border stripe @sort-change="sortChange2" @selection-change="handleSelectionChange2">
             <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
             <el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px">
               <template slot-scope="scope">
@@ -575,7 +576,7 @@
                 {{ scope.row.操作日期.split(' ')[0] }}
               </template>
             </el-table-column>
-            <el-table-column v-if="radio===2" align="center" prop="分配日期" label="分配日期" min-width="100px" width="100px" show-overflow-tooltip>
+            <el-table-column v-if="radio2===2" align="center" prop="任务分配时间" label="分配日期" width="120px" sortable="custom" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.任务分配时间.split(' ')[0] }}
               </template>
@@ -601,7 +602,7 @@
             <!--{{ scope.row.操作日期.split(' ')[0] }}-->
             <!--</template>-->
             <!--</el-table-column>-->
-            <el-table-column v-if="radio===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" width="80px" prop="buyer">
+            <el-table-column v-if="radio2===2" :filters="person" :filter-method="filterHandler" align="center" label="采购员" width="80px" prop="buyer">
               <template slot-scope="scope">
                 {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
               </template>
@@ -611,7 +612,7 @@
             <!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
             <!--</template>-->
             <!--</el-table-column>-->
-            <el-table-column v-if="radio===2" align="center" label="撤回分配" width="100px" fixed="right">
+            <el-table-column v-if="radio2===2" align="center" label="撤回分配" width="100px" fixed="right">
               <template slot-scope="scope">
                 <el-button
                   :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
@@ -772,6 +773,7 @@ export default {
       pageCurrent2: 1,
       pageSize2: 50,
       total2: 0,
+      order: '',
       checked: false,
       checked2: false,
       checked3: false
@@ -937,6 +939,21 @@ export default {
         this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
       }
     },
+    sortChange(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '任务分配时间') {
+        this.partName = 1
+      } else {
+        this.partName = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable0()
+    },
     searchTable0() { // 查询标准件
       this.checked ? this.radio = 2 : this.radio = 1
       console.log(this.checked, this.radio, 991)
@@ -951,12 +968,27 @@ export default {
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
       // this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '')
-      searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
+      searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '', this.partName, this.order).then(response => {
         this.tableData0 = response.data.rows
         this.total0 = response.data.total
         this.loading = false
       })
     },
+    sortChange1(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '任务分配时间') {
+        this.partName = 1
+      } else {
+        this.partName = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable1()
+    },
     searchTable1() { // 查询外购件
       this.loading = true
       this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
@@ -969,12 +1001,28 @@ export default {
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
       this.checked2 ? this.radio1 = 2 : this.radio1 = 1
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2, 0, '', '', this.partName, this.order).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
         this.loading = false
       })
     },
+    sortChange2(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '任务分配时间') {
+        this.partName = 1
+      } else {
+        this.partName = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable2()
+    },
+
     searchTable2() { // 查询基本件
       this.loading = true
       this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -986,7 +1034,7 @@ export default {
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
       this.checked3 ? this.radio2 = 2 : this.radio2 = 1
-      searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
+      searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial, this.partName, this.order).then(response => {
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
         this.loading = false
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index f3b6439e..5dbf8508 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -47,10 +47,17 @@
           align="center"
           type="index"
           width="50"/>
-        <el-table-column align="center" label="物料状态" min-width="90">
+        <el-table-column align="center" label="物料状态" min-width="110">
           <template slot-scope="scope">
-            <span v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</span>
-            <span v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</span>
+            <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量===0 && Number(scope.row.部件数量)===0 && scope.row.分类码===''" type="warning" size="mini" style="margin: 0px">装机数、部件数都为0,分类码为空</el-tag>
+            <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量===0 && Number(scope.row.部件数量)===0 && scope.row.分类码!==''" type="warning" size="mini" style="margin: 0px">装机数、部件数都为0</el-tag>
+            <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量===0 && Number(scope.row.部件数量)!==0 && scope.row.分类码===''" type="warning" size="mini" style="margin: 0px">装机数为0,分类码为空</el-tag>
+            <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量!==0 && Number(scope.row.部件数量)===0 && scope.row.分类码===''" type="warning" size="mini" style="margin: 0px">部件数为0,分类码为空</el-tag>
+            <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量===0 && Number(scope.row.部件数量)!==0 && scope.row.分类码!==''" type="warning" size="mini" style="margin: 0px">装机数为0</el-tag>
+            <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量!==0 && Number(scope.row.部件数量)===0 && scope.row.分类码!==''" type="warning" size="mini" style="margin: 0px">部件数为0</el-tag>
+            <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量!==0 && Number(scope.row.部件数量)!==0 && scope.row.分类码===''" type="warning" size="mini" style="margin: 0px">分类码为空</el-tag>
+            <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
+            <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量!==0 && Number(scope.row.部件数量)!==0 && scope.row.分类码!==''" type="primary" size="mini" style="margin: 0px">存在</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="图号" min-width="120">
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 02df1d8f..dec17614 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -50,10 +50,13 @@
               align="center"
               type="index"
               width="50"/>
-            <el-table-column align="center" label="物料" min-width="70">
+            <el-table-column align="center" label="物料" min-width="100">
               <template slot-scope="scope">
+                <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量===0 && Number(scope.row.部件数量)===0" type="warning" size="mini" style="margin: 0px">装机数、部件数都为0</el-tag>
+                <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量===0 && Number(scope.row.部件数量)!==0" type="warning" size="mini" style="margin: 0px">装机数为0</el-tag>
+                <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量!==0 && Number(scope.row.部件数量)===0" type="warning" size="mini" style="margin: 0px">部件数为0</el-tag>
                 <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
-                <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
+                <el-tag v-if="scope.row.物料流水号!==null && scope.row.装机数量!==0 && Number(scope.row.部件数量)!==0" type="primary" size="mini" style="margin: 0px">存在</el-tag>
               </template>
             </el-table-column>
             <el-table-column align="center" label="图号" min-width="100" show-overflow-tooltip>