diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
index 470c27a3..428d589e 100644
--- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
+++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
@@ -7,8 +7,8 @@ export function getData(check, equipmentName, pageCurrent, pageSize) {
     data: {
       type: '1',
       name: '设备管理_设备加工能力_查询数据_设备维护NEW',
-      param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName,
-      pagination: pageCurrent + '&' + pageSize
+      param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName
+      // pagination: pageCurrent + '&' + pageSize
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index 98f8ef2d..ebb621c9 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -3,14 +3,27 @@
     <el-card>
       <span>设备名称:</span>
       <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px" @click="pageCurrent = 1;fetchData()">查询</el-button>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>
       <el-tooltip effect="dark" content="添加新设备" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>
+      </el-tooltip>
+      <span style="margin-left: 40px">有效时间：</span>
+      <el-date-picker
+        v-model="time"
+        type="date"
+        size="small"
+        value-format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
+        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>
+      </el-tooltip>
+      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
+        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>
       </el-tooltip>
     </el-card>
 
     <el-card>
-      <el-table :data="List" border size="small" stripe highlight-current-row height="500px">
+      <el-table :data="List" border size="small" stripe highlight-current-row height="700px">
         <el-table-column label="设备名称" prop="设备名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}
@@ -68,32 +81,32 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
-    <el-card>
-      <span>有效时间：</span>
-      <el-date-picker
-        v-model="time"
-        type="date"
-        size="small"
-        value-format="yyyy-MM-dd"
-        placeholder="选择日期"/>
-      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
-      </el-tooltip>
-      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
-        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
-      </el-tooltip>
+    <!--      <div class="block" style="margin-top: 10px;">-->
+    <!--        <el-pagination-->
+    <!--          :current-page="pageCurrent"-->
+    <!--          :page-sizes="[10, 20, 30, 40]"-->
+    <!--          :page-size="pageSize"-->
+    <!--          :total="total"-->
+    <!--          layout="total, sizes, prev, pager, next, jumper"-->
+    <!--          @size-change="handleSizeChange"-->
+    <!--          @current-change="handleCurrentChange"/>-->
+    <!--      </div>-->
     </el-card>
+    <!--    <el-card>-->
+    <!--      <span>有效时间：</span>-->
+    <!--      <el-date-picker-->
+    <!--        v-model="time"-->
+    <!--        type="date"-->
+    <!--        size="small"-->
+    <!--        value-format="yyyy-MM-dd"-->
+    <!--        placeholder="选择日期"/>-->
+    <!--      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
+    <!--        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
+    <!--      </el-tooltip>-->
+    <!--      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
+    <!--        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
+    <!--      </el-tooltip>-->
+    <!--    </el-card>-->
 
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
@@ -240,8 +253,8 @@ export default {
         this.check = 0
       }
       getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
-        this.List = response.data.rows
-        this.total = response.data.total
+        this.List = response.data
+        // this.total = response.data.total
       })
     },
     initialization() {
@@ -399,4 +412,14 @@ export default {
   .el-card{
     margin-bottom: 1px;
   }
+  /*.el-button--success {*/
+  /*  background: #ecf5ff;*/
+  /*  border-color: #2d72d5;*/
+  /*  color: #2d72d5;*/
+  /*}*/
+  /*.el-button--primary {*/
+  /*  background: #fdf6ec;*/
+  /*  border-color: #ff9759;*/
+  /*  color: #ff9759;*/
+  /*}*/
 </style>
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 38df33ef..c0fbeb02 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -39,11 +39,10 @@
         <!--          size="small"-->
         <!--          type="date"-->
         <!--          placeholder="请选择结束日期"/>-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @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 type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
       </div>
     </el-card>
     <el-row>
@@ -456,21 +455,21 @@ export default {
 </script>
 
 <style scoped>
-  .el-button--success {
-    background: #ffffff;
-    border-color: #2d72d5;
-    color: #2d72d5;
-  }
-  .el-button--primary {
-     background: #ffffff;
-     border-color: #ff9759;
-     color: #ff9759;
-   }
-  .el-button--info {
-    background: #ffffff;
-    border-color: #67c23a;
-    color: #67c23a;
-  }
+  /*.el-button--success {*/
+  /*  background: #ecf5ff;*/
+  /*  border-color: #2d72d5;*/
+  /*  color: #2d72d5;*/
+  /*}*/
+  /*.el-button--primary {*/
+  /*   background: #fdf6ec;*/
+  /*   border-color: #ff9759;*/
+  /*   color: #ff9759;*/
+  /* }*/
+  /*.el-button--info {*/
+  /*  background: #f0f9eb;*/
+  /*  border-color: #67c23a;*/
+  /*  color: #67c23a;*/
+  /*}*/
 </style>
 <style lang="scss">
   .subTableHeader {
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 2e4839f4..ada8a541 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -4,7 +4,7 @@
       <span>零件号:</span>
       <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
       <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button>
-      <el-button type="danger" size="mini" icon="el-icon-caret-right" style="margin-left:10px" @click="getBack()">打回车间</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-table
         v-loading="loading1"
         ref="multipleTable"
@@ -139,15 +139,15 @@
           <!--<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="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-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-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 v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" stripe size="mini" show-summary border>
           <el-table-column label="零件图号" align="center" min-width="150px">
             <template slot-scope="scope">
               {{ 零件图号[scope.$index] }}
@@ -205,13 +205,13 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="80px">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" plain icon="el-icon-delete" @click="handleDelete1(scope.$index)">移除</el-button>
+              <el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.$index)">移出</el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-col>
     </el-card>
-    <el-card v-show="true">
+    <el-card v-show="false">
       <div id="RWD">
         <table cellspacing="0px" align="center" width="100%" style="">
           <tbody id="1">
@@ -315,7 +315,7 @@
           <!--<el-button slot="append" icon="el-icon-search" @click="onFocus1();param=1"/>-->
           <!--</el-input>-->
         </el-form-item>
-        <el-form-item label="运费" prop="运费" style="margin-left: 70px">
+        <el-form-item v-show="false" label="运费" prop="运费" style="margin-left: 70px">
           <el-input v-model="form.运费" placeholder="运费" size="small" style="width:200px" clearable/>
         </el-form-item>
       </el-form>
@@ -682,9 +682,9 @@ export default {
     submit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.title === '增加外协表单') {
+          if (this.title === '新增外协任务单') {
             this.submitAdd()
-          } else if (this.title === '编辑外协表单') {
+          } else if (this.title === '编辑外协任务单') {
             this.submitEdit()
           }
         }
@@ -694,7 +694,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.title = '增加外协表单'
+      this.title = '新增外协任务单'
       var time = new Date()
       var month = time.getMonth() + 1
       var day = time.getDate()
@@ -1145,7 +1145,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.title = '编辑外协表单'
+      this.title = '编辑外协任务单'
       this.dialogFormVisible = true
       this.form.表单号 = row.表单号
       this.form.运费 = row.运费
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 2eb8064b..50180b33 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -20,13 +20,8 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/>
-        <el-button size="small" icon="el-icon-search" type="success" style="" @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
+        <el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
         <el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
-          <el-table-column
-            label="序号"
-            type="index"
-            align="center"
-            width="50"/>
           <el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
@@ -42,11 +37,6 @@
               {{ scope.row.材料 }}
             </template>
           </el-table-column>
-          <!--<el-table-column label="种类" prop="零件类型名臣" align="center" width="80px">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ scope.row.零件类型名称 }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="数量" align="center" width="60px">
             <template slot-scope="scope">
               {{ scope.row.批次数量 }}
@@ -68,7 +58,7 @@
     </el-col>
     <el-col :span="14">
       <el-card>
-        <el-button size="small" type="primary" style="margin: 10px" @click="saveRowPrice()">保存</el-button>
+        <el-button size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
         <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
           <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="加工状态" width="100" align="center">
@@ -84,12 +74,6 @@
               <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)"/>
             </template>
           </el-table-column>
-          <!--<el-table-column label="外协状态" width="100" align="center">-->
-          <!--<template slot-scope="scope">-->
-          <!--<span v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</span>-->
-          <!--<span v-else size="small">否</span>-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="工艺名称" align="center">
             <template slot-scope="scope">
               {{ scope.row.工艺名称 }}
@@ -125,6 +109,7 @@ export default {
       count: 0, // 计数器  (表二是否有外协工序)
       InOut: 1, // 工序间是否外协变量 1自家 2外协
       index: 0, // 当前点击行（改变颜色不刷新用）
+      index2: 0, // 当前点击行（改变颜色不刷新用）
       num1: '',
       checkBox: [],
       loading1: false,
@@ -217,6 +202,7 @@ export default {
       this.loading2 = true
       this.checkBox = []
       this.tableData2 = []
+      this.index2 = row.index
       searchTable2(row.工艺计划流水号).then(response => {
         this.num1 = row.工艺计划流水号
         if (response.data.length === 0) {
@@ -265,63 +251,14 @@ export default {
         this.InOut = 2
         edit(row.工序流水号, this.InOut).then(response => {
           edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => {
-            this.$message.success('工序外协状态更改成功')
             this.tableData2[this.index].工序间是否外协 = 2
-            // this.loading2 = true
-            // this.checkBox = []
-            // this.tableData2 = []
-            // searchTable2(this.num1).then(response => {
-            //   if (response.data.length === 0) {
-            //     this.loading0 = false
-            //   } else {
-            //     for (let i = 0; i < response.data.length; i++) {
-            //       if (response.data[i].工序间是否外协 === 1) {
-            //         this.checkBox.push(false)
-            //       } else {
-            //         this.checkBox.push(true)
-            //       }
-            //     }
-            //     for (let i = 0; i < response.data.length; i++) {
-            //       response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
-            //       response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
-            //       response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
-            //     }
-            //     this.tableData2 = response.data
-            //   }
-            // }).then(() => {
-            //   this.loading2 = false
-            // })
+            this.tableData1[this.index2].工序间是否外协 = 2
           })
         })
       } else {
         this.InOut = 1
         edit(row.工序流水号, this.InOut).then(response => {
-          this.$message.success('工序外协状态更改成功')
           this.tableData2[this.index].工序间是否外协 = 1
-          // this.loading2 = true
-          // this.checkBox = []
-          // this.tableData2 = []
-          // searchTable2(this.num1).then(response => {
-          //   if (response.data.length === 0) {
-          //     this.loading0 = false
-          //   } else {
-          //     for (let i = 0; i < response.data.length; i++) {
-          //       if (response.data[i].工序间是否外协 === 1) {
-          //         this.checkBox.push(false)
-          //       } else {
-          //         this.checkBox.push(true)
-          //       }
-          //     }
-          //     for (let i = 0; i < response.data.length; i++) {
-          //       response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
-          //       response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
-          //       response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
-          //     }
-          //     this.tableData2 = response.data
-          //   }
-          // }).then(() => {
-          //   this.loading2 = false
-          // })
         })
       }
     },