From aaaf4d1ea8fab89c9de339f4ba3a81633b01c935 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 14 Jun 2019 18:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E5=95=86=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseSituationSearch/index.vue         | 66 ++++++++++++++-----
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index d4720392..cc37de06 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -60,6 +60,16 @@
               {{ 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="100px">
+            <template slot-scope="scope">
+              {{ scope.row.备注 || '—' }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="技术下达数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.零件数量 || '—' }}
@@ -138,6 +148,16 @@
               {{ 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="100px">
+            <template slot-scope="scope">
+              {{ scope.row.备注 || '—' }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="技术下达数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.零件数量 || '—' }}
@@ -221,6 +241,16 @@
               {{ 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="100px">
+            <template slot-scope="scope">
+              {{ scope.row.备注 || '—' }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="技术下达数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.零件数量 || '—' }}
@@ -316,9 +346,9 @@ export default {
           searchTable2Export(check1, this.machineNumberValue, check2, this.groupNumberValue).then(res3 => { // 基本件
             import('./Export2Excel').then(excel => {
               const dataGroup = []
-              const filterVal1 = ['机床图号', '组号', '物料名称', '物料型号', '物料规格', '零件数量', ['数量', '离线采购数量'], ['已到货数量', '离线到货数量'], ['供应商名称', '离线合同供应商名称'], ['采购合同编号', '离线合同编号'], '姓名'] // tableData0里的属性名
-              const filterVal2 = ['机床图号', '组号', '物料名称', '物料型号', '物料规格', '零件数量', ['数量', '离线采购数量'], ['已到货数量', '离线到货数量'], ['供应商名称', '离线合同供应商名称'], ['采购合同编号', '离线合同编号'], '姓名'] // tableData1里的属性名
-              const filterVal3 = ['机床图号', '组号', '零件名称', '零件图号', '规格', '材料', '零件数量', '数量', '已到货数量', '供应商名称', '采购合同编号', '姓名'] // tableData2里的属性名
+              const filterVal1 = ['机床图号', '组号', '物料名称', '物料型号', '物料规格', '零件数量', ['数量', '离线采购数量'], ['已到货数量', '离线到货数量'], ['供应商名称', '离线合同供应商名称'], ['采购合同编号', '离线合同编号'], '姓名', '供货商', '备注'] // tableData0里的属性名
+              const filterVal2 = ['机床图号', '组号', '物料名称', '物料型号', '物料规格', '零件数量', ['数量', '离线采购数量'], ['已到货数量', '离线到货数量'], ['供应商名称', '离线合同供应商名称'], ['采购合同编号', '离线合同编号'], '姓名', '供货商', '备注'] // tableData1里的属性名
+              const filterVal3 = ['机床图号', '组号', '零件名称', '零件图号', '规格', '材料', '零件数量', '数量', '已到货数量', '供应商名称', '采购合同编号', '姓名', '供货商', '备注'] // tableData2里的属性名
               const data1 = res1.data.map(v => filterVal1.map(j => {
                 if (typeof (j) === 'string') {
                   return v[j] || '—'
@@ -329,13 +359,13 @@ export default {
               data1.map(v => {
                 v.push('') // 物料状态
                 if (v[10] === '—') {
-                  v[11] = '未分配'
+                  v[13] = '未分配'
                 } else if (v[6] === '—') {
-                  v[11] = '未采购'
+                  v[13] = '未采购'
                 } else if (v[6] !== '—' && v[6] !== v[7]) {
-                  v[11] = '未全部到货'
+                  v[13] = '未全部到货'
                 } else if (v[6] !== '—' && v[6] === v[7]) {
-                  v[11] = '全部到货'
+                  v[13] = '全部到货'
                 }
               })
               dataGroup.push(data1)
@@ -349,13 +379,13 @@ export default {
               data2.map(v => {
                 v.push('') // 物料状态
                 if (v[10] === '—') {
-                  v[11] = '未分配'
+                  v[13] = '未分配'
                 } else if (v[6] === '—') {
-                  v[11] = '未采购'
+                  v[13] = '未采购'
                 } else if (v[6] !== '—' && v[6] !== v[7]) {
-                  v[11] = '未全部到货'
+                  v[13] = '未全部到货'
                 } else if (v[6] !== '—' && v[6] === v[7]) {
-                  v[11] = '全部到货'
+                  v[13] = '全部到货'
                 }
               })
               dataGroup.push(data2)
@@ -369,19 +399,19 @@ export default {
               data3.map(v => {
                 v.push('') // 物料状态
                 if (v[11] === '—') {
-                  v[12] = '未分配'
+                  v[14] = '未分配'
                 } else if (v[7] === '—') {
-                  v[12] = '未采购'
+                  v[14] = '未采购'
                 } else if (v[7] !== '—' && v[7] !== v[8]) {
-                  v[12] = '未全部到货'
+                  v[14] = '未全部到货'
                 } else if (v[7] !== '—' && v[7] === v[8]) {
-                  v[12] = '全部到货'
+                  v[14] = '全部到货'
                 }
               })
               dataGroup.push(data3)
-              const headerGroup = [['机床号', '组号', '名称', '图号或型号', '规格', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '物料状态'],
-                ['机床号', '组号', '名称', '图号或型号', '规格', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '物料状态'],
-                ['机床号', '组号', '名称', '图号或型号', '规格', '材料', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '物料状态']]
+              const headerGroup = [['机床号', '组号', '名称', '图号或型号', '规格', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '备注', '物料状态'],
+                ['机床号', '组号', '名称', '图号或型号', '规格', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '备注', '物料状态'],
+                ['机床号', '组号', '名称', '图号或型号', '规格', '材料', '技术下达数量', '合同采购数量', '到货数量', '供应商', '合同编号', '采购员', '供货商', '备注', '物料状态']]
               const sheetGroup = ['标准件', '外购件', '基本件']
               excel.export_json_to_excel({
                 headerGroup: headerGroup,