diff --git a/src.zip b/src.zip
new file mode 100644
index 00000000..94630d32
Binary files /dev/null and b/src.zip differ
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 96f0e9d0..c6be7d0f 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -253,7 +253,8 @@ h3 {
   height: 37px;
 }
 .el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td {
-  background-color: rgb(126,172,237);
+  //background-color: rgb(126,172,237);
+  background-color: #e9f0f9;
   font-weight:bold;
   color: black;
 }
@@ -289,7 +290,7 @@ h3 {
   }
 }
 .el-tabs--border-card>.el-tabs__content {
-  padding: 15px 15px 0px 15px!important;
+  padding: 8px 8px 8px 8px!important;
 }
 //.el-table__header-wrapper {
 //  height: 25px!important;
@@ -303,3 +304,39 @@ h3 {
 .el-table__header td,.el-table__header th{
   padding:0px!important;
 }
+
+
+// 20200211 刘路加 按钮样式 更新
+//分配按钮样式 橘黄 悬停变淡
+.el-button--distribution{
+  background:rgb(253,246,236);
+  border-color: #ff9759;
+  color: #ff9759;
+  &:hover{
+    background: #ff9759;
+    border-color: #ff9759;
+    color: white;
+  }
+  &:focus{
+    background: #ff9759;
+    border-color: #ff9759;
+    color: white;
+  }
+}
+// 20200211 刘路加 按钮样式 更新
+//打回 撤回 删除 移除 按钮  按钮样式 红色 悬停变淡
+.el-button--repulse{
+  background:rgb(253,246,236);
+  border-color: #F56C6C;
+  color: #F56C6C;
+  &:hover{
+    background: #F56C6C;
+    border-color: #F56C6C;
+    color: white;
+  }
+  &:focus{
+    background: #F56C6C;
+    border-color: #F56C6C;
+    color: white;
+  }
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 15f19c7e..82fbed06 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,6 +19,7 @@ export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
 export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
 export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESDownloadExcel.ashx' // 导出excel
 export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel
+
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
 export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index bf7cc776..8436d6c6 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -21,7 +21,7 @@
     </el-card>
     <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-row style="margin-bottom: 3px">
           <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
           <!--<el-option-->
           <!--v-for="item in project"-->
@@ -87,28 +87,29 @@
               :value="item.value"/>
           </el-select>
           <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
-          <el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>
-          <el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>
+          <el-checkbox v-model="checked" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-checkbox>
+          <!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>-->
+          <!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>-->
           <!--<div style="float:right;">-->
           <!--<span style="margin-left: 0">采购员:</span>-->
-          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 140px">
+          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 162px">
             <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-tooltip :open-delay="1000" effect="dark" content="采购任务分配到采购员" placement="top">
             <el-button
-              type="primary"
+              type="distribution"
               size="small"
               icon="el-icon-menu"
               style="margin-left: 10px"
               @click="allocateTask1">分配</el-button>
           </el-tooltip>
-          <el-tooltip :open-delay="1000" effect="dark" content="退回勾选的未分配的物料至车间" placement="top">
+          <el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
             <el-button
-              type="danger"
+              type="repulse"
               size="small"
               icon="el-icon-back"
               style="margin-left: 10px"
@@ -116,20 +117,20 @@
           </el-tooltip>
           <!--</div>-->
         </el-row>
-        <el-row style="margin-bottom: 10px">
+        <el-row style="margin-bottom: 3px">
           <el-table
             v-loading="loading"
             :data="tableData0"
             :header-cell-style="{fontFamily:'MicrosoftYaHeiUI',fontSize:'14px',fontWeight:200}"
             size="mini"
-            height="800px"
-            style="width: 1285px"
+            height="740px"
+            style="width: 1265px"
             border
             stripe
             highlight-current-row
             @selection-change="handleSelectionChange1">
-            <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" label="采购状态" prop="询价状态编号" min-width="100px" width="80px">
+            <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
+            <el-table-column align="center" label="进程" prop="询价状态编号" min-width="100px" width="60px">
               <template slot-scope="scope">
                 <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
                 <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -172,7 +173,7 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px" width="80px">
+            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
               </template>
@@ -239,6 +240,7 @@
             :page-size="pageSize0"
             :total="total0"
             style="display:inline-block;width:50%"
+            small
             layout="total, sizes, prev, pager, next, jumper"
             @size-change="handleSizeChange0"
             @current-change="handleCurrentChange0"/>
@@ -414,7 +416,8 @@
             :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSize1"
             :total="total1"
-            style="display:inline-block;width:50%"
+            small
+            style="display:inline-block;width:30%"
             layout="total, sizes, prev, pager, next, jumper"
             @size-change="handleSizeChange1"
             @current-change="handleCurrentChange1"/>
@@ -697,7 +700,8 @@ export default {
       total1: 0,
       pageCurrent2: 1,
       pageSize2: 50,
-      total2: 0
+      total2: 0,
+      checked: false
     }
   },
   computed: {
@@ -861,6 +865,8 @@ export default {
       }
     },
     searchTable0() { // 查询标准件
+      console.log(this.checked)
+      this.checked ? this.radio = 2 : this.radio = 1
       this.loading = true
       this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
       this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 8219ae73..639fad8e 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -644,7 +644,10 @@ export default {
       到货金额组: [],
       getRowKeys(row) {
         return row.采购计划明细流水号
-      }
+      },
+      sup: '',
+      num: '',
+      num2: ''
     }
   },
   computed: {
@@ -945,7 +948,10 @@ export default {
       })
     },
     searchTable5(row) {
-      console.log(row)
+      this.sup = row.供应商名称
+      this.num1 = row.到货单流水号
+      this.num2 = row.到货单编号
+      console.log(row, 22222)
       this.excle_row = row
       console.log(this.userId, this.id)
       this.disable = row.是否关联
@@ -1161,8 +1167,16 @@ export default {
       })
     },
     downloadExcel() {
-      const _ExcelWaiGou = ExcelWaiGou
-      this.download(`${_ExcelWaiGou}?type=Excel_NewArrivalList&folename=外购单&rec1=${this.excle_row.到货单流水号}&rec2=${this.excle_row.到货单流水号}&rec3=${this.excle_row.到货单流水号}&rec4=${this.excle_row.到货单流水号}`)
+      console.log(this.num2, 222222222)
+      var param = []
+      param[0] = ['到货单流水号', this.num1]
+      param[1] = ['编号', this.num2]
+      param[2] = ['供应商', this.sup]
+      var Data = this.CreateData('12', '报表_备料管理_到货单明细查询', param)
+      this.exportExcel_NPOI(Data)
+
+      // const _ExcelWaiGou = ExcelWaiGou
+      // this.download(`${_ExcelWaiGou}?type=Excel_NewArrivalList&folename=外购单&rec1=${this.excle_row.到货单流水号}&rec2=${this.excle_row.到货单流水号}&rec3=${this.excle_row.到货单流水号}&rec4=${this.excle_row.到货单流水号}`)
     },
     /**
      * 下载
@@ -1214,7 +1228,7 @@ function saveAs(blob, filename = '下载文件.xls') {
 
 <style scoped>
   .el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td {
-    /* background-color: #7eaced; */
+     background-color: #e9f0f9;
     font-weight: bold;
     color: black;
   }
@@ -1254,7 +1268,7 @@ function saveAs(blob, filename = '下载文件.xls') {
 </style>
 <style>
   .el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td {
-    background-color: #F5F7FA;
+    background-color: #e9f0f9;
     font-weight: bold;
     color: black;
   }
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index ca39e556..5cd1c569 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -2,25 +2,23 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>发票号:</span>
-        <el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 180px" clearable/>
-        <span>供应商:</span>
-        <el-input v-show="false" v-model="supplierName0" placeholder="供应商" size="small" style="width:130px" clearable @focus="fetchData"/>
-        <el-select v-model="gongyingshangValue" placeholder="供应商" style="width: 180px" size="small" filterable clearable @change="searchTable1">
+        <el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 140px" clearable/>
+        <el-input v-show="false" v-model="supplierName0" placeholder="供应商" size="small" style="width:140px;margin-left: 10px" clearable @focus="fetchData"/>
+        <el-select v-model="gongyingshangValue" placeholder="供应商" style="width: 180px;margin-left: 10px" size="small" filterable clearable @change="searchTable1">
           <el-option
             v-for="item in gongyingshang"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
+            :value="item.value"
+            size="mini"/>
         </el-select>
-        <span v-show="true" class="demonstration">时间段:</span>
+        <span v-show="false" class="demonstration">时间段:</span>
         <el-date-picker
           v-model="dateRange"
-          :picker-options="pickerOptions"
           size="small"
           type="daterange"
           align="center"
-          style="width: 300px;margin: 3px 0"
+          style="width: 240px;margin: 3px 10px"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           range-separator="～"
@@ -46,12 +44,13 @@
         <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
           <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
         </el-tooltip>
-        <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">新增到票</el-button>
+        <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">到票</el-button>
       </el-row>
     </el-card>
-    <el-card style="width: 58%;float: left">
+    <el-card style="float: left">
       <el-table
         :data="tableData1"
+        :header-cell-style="{fontFamily:'MicrosoftYaHeiUI',fontSize:'14px',fontWeight:200}"
         size="mini"
         style="margin-top: 3px"
         height="750px"
@@ -59,50 +58,51 @@
         border
         highlight-current-row
         @row-click="searchTable02">
-        <el-table-column align="center" label="发票状态" width="80px">
+        <el-table-column align="center" label="进程" width="70px">
           <template slot-scope="scope">
             <span v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</span>
             <span v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="发票号" width="120px">
+        <el-table-column align="center" label="发票号" width="110px">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="开票时间" prop="开票时间" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.开票时间 }}
+            {{ scope.row.开票时间 | formatTime }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="开票金额" width="80px">
+        <el-table-column align="center" label="开票金额(元)" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.开票金额 }}
+            {{ scope.row.开票金额.toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="供应商" prop="供应商名称" min-width="200px" show-overflow-tooltip>
+        <el-table-column align="center" label="供应商" prop="供应商名称" min-width="190px" width="190px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="备注" >
+        <el-table-column align="center" label="备注" width="100px" >
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作" fixed="right" width="300px">
+        <el-table-column align="center" label="操作" width="210px">
           <template slot-scope="scope">
-            <el-tooltip :open-delay="1200" effect="dark" content="关联到货单" placement="top">
-              <div style="display: inline-block">
+            <el-tooltip :open-delay="1200" effect="dark" content="到货单" placement="top" style="margin-left: 0">
+              <div style="display: inline-block;margin-left: 0px">
                 <el-button
                   :disabled="Number(scope.row.是否请款)===1"
                   type="text"
                   size="mini"
                   icon="el-icon-share"
-                  @click="aboutArrival(scope.row)">关联到货单</el-button>
+                  style="margin-left: -15px"
+                  @click="aboutArrival(scope.row)">到货单</el-button>
               </div>
             </el-tooltip>
-            <el-button type="text" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel(scope.row)">导出</el-button>
+            <el-button type="text" size="mini" icon="el-icon-download" style="margin-left:8px" @click="downloadExcel(scope.row)">导出</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
@@ -110,7 +110,7 @@
                   type="text"
                   size="mini"
                   icon="el-icon-edit-outline"
-                  style="margin-left: 20px"
+                  style="margin-left: 10px"
                   @click="editTable1(scope.row)"/>
               </div>
             </el-tooltip>
@@ -121,14 +121,14 @@
                   type="text"
                   size="mini"
                   icon="el-icon-delete"
-                  style="margin-left: 20px"
+                  style="margin-left: 10px"
                   @click="deleteTable1(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
+      <div class="block" style="margin-top: 0px;">
         <el-pagination
           :current-page="pageCurrent1"
           :page-sizes="[10, 20, 30, 40]"
@@ -140,10 +140,10 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-    <el-card style="float: left;width: 41.3%;margin-left: 5px">
-      <el-table :data="gridData" class="subTableHeader" show-summary border size="mini" style="width: 100%">
+    <el-card style="float: left;margin-left: 5px">
+      <el-table :data="gridData" :header-cell-style="{fontFamily:'MicrosoftYaHeiUI',fontSize:'14px',fontWeight:200}" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%">
         <el-table-column width="50" align="center" type="index" label="序号"/>
-        <el-table-column label="到货单编号" align="center">
+        <el-table-column label="到货单编号" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.到货单编号 }}
           </template>
@@ -153,12 +153,12 @@
             {{ scope.row.日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="金额" align="center" width="80" prop="到货金额">
+        <el-table-column label="金额(元)" align="center" width="120" prop="到货金额">
           <template slot-scope="scope">
             {{ scope.row.到货金额.toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column min-width="100" align="center" label="操作">
+        <el-table-column min-width="100" width="60" align="center" label="操作">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="取消关联" placement="top">
               <div style="display: inline-block">
@@ -257,7 +257,6 @@
 <script>
 import { searchInvoice, addInvoice, editInvoice, deleteInvoice, searchSupplier, searchInvoiceDetail, searchArriveOrder, addMateriel, deleteInvoiceMX, getGongyingshang } from '@/api/WorkshopProcurement/OutsourcingMaterialsInvoice'
 import { mapGetters } from 'vuex'
-import { ExcelDownLoad } from '@/utils/request'
 
 export default {
   name: '', // 发票交接单
@@ -347,6 +346,31 @@ export default {
     this.searchTable1()
   },
   methods: {
+    getSummaries(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index === 3) {
+          const values = data.map(item => Number(parseFloat(item['到货金额'])))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
     fetchData() {
       searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
         for (let i = 0; i < response.data.length; i++) {
@@ -557,8 +581,13 @@ export default {
       })
     },
     downloadExcel(row) {
-      const _ExcelDownLoad = ExcelDownLoad
-      this.download(`${_ExcelDownLoad}?Fapiao=${row.发票流水号}&name=${row.供应商名称}`)
+      var param = []
+      param[0] = ['发票流水号', row.发票流水号]
+      param[1] = ['供应商', row.供应商名称]
+      var Data = this.CreateData('12', '报表_备料管理_发票明细_查询数据', param)
+      this.exportExcel_NPOI(Data)
+      // const _ExcelDownLoad = ExcelDownLoad
+      // this.download(`${_ExcelDownLoad}?Fapiao=${row.发票流水号}&name=${row.供应商名称}`)
     },
     /**
      * 下载
@@ -631,16 +660,17 @@ function saveAs(blob, filename = '下载文件.xls') {
 <style lang="scss">
   .subTableHeader {
     th {
-      background: #8ff4ea !important;
-      color: black;
+      background: #7eaced !important;
+      color: #FFFFFF;
     }
 
     tr.el-table__row td {
-      background-color: #d8e5f6 !important;
+      background-color: #ffffff !important;
     }
 
     tr.el-table__row.el-table__row--striped td {
       background: #e9f0f9 !important;
+      background-color: #e9f0f9;
     }
   }
 </style>
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 60759c22..e5287ef5 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -145,7 +145,8 @@ export default {
           margin-left: 15px;
         }
         &.active {
-          background-color: rgb(52,119,190);
+          /*background-color: rgb(52,119,190);*/
+          background-color: #2A71CA;
           color: #ffffff;
           border-color: #ffffff;
           &::before {