diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js
index 5d2122ee..724af6f7 100644
--- a/src/api/ManufacturingCenter/CreatePreparationBill.js
+++ b/src/api/ManufacturingCenter/CreatePreparationBill.js
@@ -46,7 +46,7 @@ export function edit(num1) {
   })
 }
 // 外购备料
-export function edit2(num1) {
+export function edit2(num1, id) {
   return request({
     url: '',
     method: 'post',
@@ -55,7 +55,7 @@ export function edit2(num1) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理工艺_备料单导出_外购备料',
-      param: `工艺计划流水号组=${num1}&是否外购备料=1`
+      param: `工艺计划流水号组=${num1}&是否外购备料=1&分配人员编号=${id}`
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 0a3d0d9d..3c5a1619 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -250,12 +250,13 @@ export default {
       }
     },
     edit2() {
+      console.log(this.$store.state.user.id, 9090)
       if (this.tableData2.length === 0) {
         this.$message.warning('暂无数据')
       } else {
         this.a = 0
         for (let i = 0; i < this.tableData2.length; i++) {
-          edit2(this.tableData2[i].工艺计划流水号).then(response => {
+          edit2(this.tableData2[i].工艺计划流水号, this.$store.state.user.id).then(response => {
             this.a += parseInt(response.data[0].result)
             if (this.a === this.tableData2.length) {
               this.pageSize = 10
diff --git a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
index 87b2d17f..4b0d539f 100644
--- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
@@ -127,7 +127,7 @@ export default {
     loginsession() {
       this.$axios({
         methods: 'post',
-        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=0000',
+        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=1222',
         data: {
           userName: '0000'
         }
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index 220a7e4a..301caead 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -111,6 +111,16 @@
                 {{ scope.row.完成日期 }}
               </template>
             </el-table-column>
+            <el-table-column label="编辑时间" align="center" width="115px">
+              <template slot-scope="scope">
+                {{ scope.row.修改时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="编辑人" align="center" width="115px">
+              <template slot-scope="scope">
+                {{ scope.row.修改人员 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="操作" fixed="right" width="90px">
               <template slot-scope="scope">
                 <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
@@ -288,6 +298,8 @@ export default {
       param[4] = ['录入工时', this.form1.录入工时]
       param[5] = ['录入准结', this.form1.录入准结]
       param[6] = ['备注', this.form1.备注]
+      param[7] = ['修改人员', this.$store.state.user.id]
+      console.log(this.$store.state.user.id, 9999)
       var Data1 = this.CreateData('11', 'MES_机加工MES_编辑备注_Vue_New', param)
       this.ExecDatabase(Data1).then(response => {
         if (response.data[0].result === 1) {
diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
index 5f765cbd..6b2bbf95 100644
--- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
@@ -16,26 +16,27 @@
       </div>
     </el-card>
     <el-card>
-      <el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1350px">
-        <el-table-column label="序号" align="center" type="index" width="55"/>
+      <el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1480px">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="外协状态" align="center" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.外协状态)==1" type="primary" size="mini">未提交</el-tag>
-            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到</el-tag>
-            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到</el-tag>
+            <el-tag v-if="Number(scope.row.到货状态)===9" type="success" size="mini">未外协</el-tag>
+            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到货</el-tag>
+            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center" width="130px">
+        <el-table-column label="项目名称" align="center" width="115px">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center" width="160px">
+        <el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" align="center" width="120px">
+        <el-table-column label="零件名称" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -60,7 +61,7 @@
             {{ scope.row.加工价格_成交 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家" align="center" width="160px">
+        <el-table-column label="外协厂家" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.外协厂家名称 }}
           </template>
@@ -75,6 +76,11 @@
             {{ scope.row.任务下达日期.split(' ')[0] }}
           </template>
         </el-table-column>
+        <el-table-column label="外协员" align="center" width="70" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.外协计划员 }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 30cc59c4..6152f803 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -59,6 +59,11 @@
                   {{ scope.row.备料任务分配时间 }}
                 </template>
               </el-table-column>
+              <el-table-column label="分配人" prop="分配人姓名" width="90" align="center" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.分配人姓名 }}
+                </template>
+              </el-table-column>
             </el-table>
             <div v-show="false" class="block">
               <el-pagination