diff --git a/src/views/Outsourcing/OutsourcingStatus/index.vue b/src/views/Outsourcing/OutsourcingStatus/index.vue
index 2b889a3e..cb4bcd5f 100644
--- a/src/views/Outsourcing/OutsourcingStatus/index.vue
+++ b/src/views/Outsourcing/OutsourcingStatus/index.vue
@@ -4,50 +4,126 @@
     <el-card>
       <span>零件号:</span>
       <el-input v-model="partNum" placeholder="零件号" size="small" clearable style="width:200px"/>
+      <span>厂家:</span>
+      <el-select v-model="ManufacturerNameValue" placeholder="选择外协厂家" filterable clearable size="small" style="width:190px;margin:10px;">
+        <el-option
+          v-for="item in ManufacturerName"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="PageCurrent=1;PageSize=10;searchTable()">查询</el-button>
-    </el-card>
-
-    <el-card>
-      <el-table v-loading="loading0" :data="tableData" border style="width: 100%;" height="650" stripe>
-        <el-table-column label="机床图号" width="180px" align="center">
+      <el-table v-loading="loading0" :data="tableData" height="550" size="mini" stripe style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table-column label="序号" type="index" align="center" fixed="left" width="50"/>
+        <el-table-column label="付款" prop="实际付款时间" width="65" align="center" fixed="left">
           <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
+            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
+            <el-tag v-else type="info" size="small">未付</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="组号" width="100px" align="center">
+        <el-table-column label="到货" prop="单据状态" width="65" align="center" fixed="left">
           <template slot-scope="scope">
-            {{ scope.row.组号 }}
+            <el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
+            <el-tag v-else type="info" size="small">未到</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" width="250px" align="center">
+        <el-table-column label="单据号" prop="表单号" align="center" width="180px" fixed="left">
           <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
+            {{ scope.row.表单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" width="100px" align="center">
+        <el-table-column label="外协厂家" prop="外协厂家名称" align="center" min-width="190px" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
+            {{ scope.row.外协厂家名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" width="100px" align="center">
+        <el-table-column label="总价" align="center" min-width="70px">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.总价 }}
           </template>
         </el-table-column>
-        <!--<el-table-column label="已入库数量" width="100px" align="center">-->
+        <el-table-column label="质量扣款" align="center" min-width="70px">
+          <template slot-scope="scope">
+            {{ scope.row.扣款_质量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="计划扣款" align="center" min-width="70px">
+          <template slot-scope="scope">
+            {{ scope.row.扣款_计划 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="其他扣款" align="center" min-width="70px">
+          <template slot-scope="scope">
+            {{ scope.row.扣款_其他 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="应付金额" align="center" min-width="70px">
+          <template slot-scope="scope">
+            {{ scope.row.应付总额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="125px">
+          <template slot-scope="scope">
+            {{ scope.row.任务下达日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="外协员" prop="外协员姓名" align="center" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.外协员姓名 }}
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="加工价格" align="center">-->
+        <!--<el-table-column label="预算总价" align="center" width="85px">-->
         <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.入库数量 }}-->
+        <!--{{ scope.row.加工价格_预算_总价 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-
-        <el-table-column label="零件状态" align="center" >
+        <!--<el-table-column label="成交总价" align="center" width="85px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.加工价格_成交_总价 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="材料费" align="center" min-width="70px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.材料价格_价格_总价 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="运费" align="center" min-width="70px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.运费 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="其他费用" align="center" min-width="70px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.其他价格_总价 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="总价" align="center" min-width="70px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.总价 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="付款日期" align="center" width="240px">-->
+        <!--<el-table-column label="入库" align="center" min-width="70px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.入库时间 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="计划" align="center" min-width="70px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.计划付款时间 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="实际" align="center" min-width="70px">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.实际付款时间 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--</el-table-column>-->
+        <el-table-column label="扣款说明" align="center" min-width="120px">
           <template slot-scope="scope">
-            <el-steps :active="active[scope.$index]" finish-status="success" simple process-status="finish">
-              <el-step title="未协"/>
-              <el-step title="已协"/>
-              <el-step title="交检"/>
-              <el-step title="入库"/>
-            </el-steps>
+            {{ scope.row.扣款说明 }}
           </template>
         </el-table-column>
       </el-table>
@@ -118,9 +194,6 @@ export default {
 </script>
 
 <style scoped>
-  .el-card{
-    margin-bottom: 15px;
-  }
   span{
     margin: 10px 0 10px 10px;
   }
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 20606a26..3001a2f3 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -137,14 +137,14 @@
           <!--<el-tooltip :open-delay="1200" effect="dark" content="计算选入零件的价格" placement="top">-->
           <!--<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>-->
           <!--</el-tooltip>-->
-          <el-button type="info" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">选入零件</el-button>
-          <el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px" @click="confirmPrice">保存</el-button>
-          </el-tooltip>
-          <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px" @click="Deal">成交</el-button>
-          </el-tooltip>
+          <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">选入零件</el-button>
           <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" @click="exportTable('RWD')">导出单据</el-button>
+          <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
+            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" @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-edit" style="margin-left:10px;margin-top: 3px;float: right" @click="confirmPrice">保存</el-button>
+          </el-tooltip>
         </div>
         <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" :row-class-name="tableRowClassName" height="488" stripe size="mini" show-summary border>
           <el-table-column label="零件图号" align="center" min-width="150px">