diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
index f326320b..d5399312 100644
--- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js
+++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
@@ -53,7 +53,7 @@ export function searchMachine(num) {
     data: {
       type: '1',
       name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=1&项目流水号=' + num
+      param: '项目流水号_check=0&项目流水号=' + num
     }
   })
 }
@@ -76,7 +76,7 @@ export function searchTable1(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: 'xqs_采购管理_采购部采购_查询物料_分配后',
+      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]}`,
       Pagination: params[0] + '&' + params[1]
     }
@@ -89,7 +89,7 @@ export function searchTable2(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购部采购_查询物料_基本件_分配后',
+      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]}`,
       Pagination: params[0] + '&' + params[1]
     }
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 8a27de06..7db6d77f 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -22,13 +22,14 @@
     <el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
       <el-tab-pane label="标准件" name="标准件">
         <el-row style="margin-bottom: 5px">
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
-            <el-option
-              v-for="item in project"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
+          <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
+          <!--<el-option-->
+          <!--v-for="item in project"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
             <el-option
               v-for="item in machine"
@@ -39,13 +40,13 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable width="100px">
-            <el-option
-              v-for="item in group"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
+          <!--<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable width="100px">-->
+          <!--<el-option-->
+          <!--v-for="item in group"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
           <el-date-picker
             v-show="false"
             v-model="dateRange"
@@ -59,7 +60,7 @@
             style="width:250px"
             start-placeholder="开始日期"
             end-placeholder="结束日期"/>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px"/>
+          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px"/>-->
           <el-select
             v-model="MaterialCategoryValue"
             placeholder="物料类别"
@@ -72,18 +73,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <div style="float:right;">
-            <span style="margin-left: 0">采购员:</span>
-            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </div>
-        </el-row>
-        <el-row style="margin-bottom: 5px">
           <el-select
             v-model="MaterialVarietyValue"
             placeholder="物料品种"
@@ -95,11 +84,16 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
-          <div style="float:right">
+          <div style="float:right;">
+            <span style="margin-left: 0">采购员:</span>
+            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+              <el-option
+                v-for="item in person"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
             <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
               <el-button
                 type="primary"
@@ -129,6 +123,26 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="数量" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -154,26 +168,6 @@
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
-              <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料规格" label="规格" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料规格 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="数量" min-width="80px">
-              <template slot-scope="scope">
-                {{ scope.row.零件数量 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="备注" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
@@ -238,14 +232,15 @@
       </el-tab-pane>
       <el-tab-pane label="外购件" name="外购件">
         <el-row style="margin-bottom: 5px">
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
-            <el-option
-              v-for="item in project"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
+          <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
+          <!--<el-option-->
+          <!--v-for="item in project"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable/>
+          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
               v-for="item in machine"
               :key="item.value"
@@ -255,14 +250,14 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
-            <el-option
-              v-for="item in group"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
+          <!--<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>-->
+          <!--<el-option-->
+          <!--v-for="item in group"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>-->
           <el-select
             v-model="MaterialCategoryValue"
             placeholder="物料类别"
@@ -275,18 +270,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <div style="float:right;">
-            <span style="margin-left: 0">采购员:</span>
-            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </div>
-        </el-row>
-        <el-row style="margin-bottom: 5px">
           <el-select
             v-model="MaterialVarietyValue"
             placeholder="物料品种"
@@ -298,28 +281,18 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px;"
-            @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
-          <div style="float:right">
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-menu"
-              style="margin-left: 10px"
-              @click="allocateTask1">分配</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-back"
-              style="margin-left: 10px"
-              @click="executeReturn1">退回</el-button>
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
+          <div style="float:right;">
+            <span style="margin-left: 0">采购员:</span>
+            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+              <el-option
+                v-for="item in person"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+            <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask1">分配</el-button>
+            <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">退回</el-button>
           </div>
         </el-row>
         <el-row style="margin-bottom: 10px">
@@ -333,6 +306,26 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="物料名称" label="名称" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料规格" label="规格" width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料型号" label="图号或型号" width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="数量" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -358,26 +351,6 @@
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
-              <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料规格" label="规格" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料规格 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="数量" min-width="80px">
-              <template slot-scope="scope">
-                {{ scope.row.零件数量 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="备注" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
@@ -439,14 +412,15 @@
       </el-tab-pane>
       <el-tab-pane label="基本件" name="基本件">
         <el-row style="margin-bottom: 5px">
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
-            <el-option
-              v-for="item in project"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
+          <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
+          <!--<el-option-->
+          <!--v-for="item in project"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <el-input v-model="partNum" placeholder="图号名称规格材料" size="small" clearable/>
+          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
               v-for="item in machine"
               :key="item.value"
@@ -456,15 +430,15 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
-            <el-option
-              v-for="item in group"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
-          <el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
+          <!--<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>-->
+          <!--<el-option-->
+          <!--v-for="item in group"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>-->
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
           <div style="float:right">
             <span style="margin-left: 0">采购员:</span>
             <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -474,31 +448,8 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-          </div>
-        </el-row>
-        <el-row style="margin-bottom: 5px">
-          <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
-          <el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
-          <el-input v-model="partMaterial" placeholder="零件材料" size="small" clearable/>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px;"
-            @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
-          <div style="float:right">
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-menu"
-              style="margin-left: 10px"
-              @click="allocateTask2">分配</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-back"
-              style="margin-left: 10px"
-              @click="executeReturn2">退回</el-button>
+            <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>
+            <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">退回</el-button>
           </div>
         </el-row>
         <el-row style="margin-bottom: 10px">
@@ -512,6 +463,31 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="零件图号" label="图号" min-width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="零件名称" label="名称" width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="规格" label="规格" width="170px">
+              <template slot-scope="scope">
+                {{ scope.row.规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="材料" width="180">
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="数量" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -527,31 +503,6 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="零件图号" label="图号" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.零件图号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="零件名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.零件名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="规格" label="规格" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.规格 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="材料" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.材料 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="数量" min-width="80px">
-              <template slot-scope="scope">
-                {{ scope.row.零件数量 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="备注" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
@@ -762,6 +713,7 @@ export default {
   created() {
     this.searchTable0() // 查表1
     this.fetchData() // 初始化数据
+    this.projectChange()
     this.searchUnallocatePartNumber()
     this.timer2 = setInterval(this.searchUnallocatePartNumber, 20 * 60 * 1000) // 20 分钟一刷新
     this.getDefaultTime()