From 494d907b4673cc54378660da195cfd92856e65ea Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 16 Mar 2020 16:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionCapacityBalance/index.vue       | 98 +++----------------
 .../ShippingInquiries/index.vue               | 32 ------
 2 files changed, 12 insertions(+), 118 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index f14ca5c5..0f1374da 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -46,20 +46,8 @@
       </div>
     </el-card>
     <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        :row-class-name="tableRowClassName"
-        border
-        stripe
-        style="max-height: 400px;margin-top:10px"
-        height="400"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          align="center"
-          width="50"/>
+      <el-table v-loading="listLoading" :data="tableData" :row-class-name="tableRowClassName" border stripe style="max-height: 400px;margin-top:10px" height="400" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" align="center" width="50"/>
         <el-table-column label="零件图号" prop="零件图号" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
@@ -90,42 +78,6 @@
             {{ scope.row.工序数量 }}
           </template>
         </el-table-column>
-        <!--<el-table-column label="是否超负荷" align="center" width="100">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.是否超负荷 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="外协" width="100" align="center">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="加工件合格" align="center" width="230">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-date-picker-->
-        <!--v-model="tableData[scope.$index].加工件合格时间"-->
-        <!--size="mini"-->
-        <!--type="date"-->
-        <!--value-format="yyyy-MM-dd"-->
-        <!--placeholder="选择加工件合格时间"-->
-        <!--@change="timeChange(scope.row)"/>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="板焊结束" width="150" align="center">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.板焊 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="操作" width="200px" align="center" fixed="right">-->
-        <!--<template slot-scope="scope" align="center">-->
-        <!--<el-button-->
-        <!--size="mini"-->
-        <!--type="primary"-->
-        <!--class="el-icon-edit"-->
-        <!--@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>-->
-        <!--&lt;!&ndash;<el-button size="mini" type="primary" @click="inBatches">分批</el-button>&ndash;&gt;-->
-        <!--</template>-->
-        <!--</el-table-column>-->
       </el-table>
       <div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
         <el-pagination
@@ -159,14 +111,7 @@
 
     <el-card>
       <div>
-        <el-table
-          v-loading="listLoading1"
-          :data="tableData1"
-          class="table"
-          borde
-          stripe
-          style="max-height: 500px"
-          height="500">
+        <el-table v-loading="listLoading1" :data="tableData1" class="table" borde stripe style="max-height: 500px" height="500">
           <el-table-column label="零件图号" align="center" min-width="160">
             <template slot-scope="scope">
               {{ 零件图号[scope.$index] }}
@@ -192,11 +137,6 @@
               {{ 机加工结束时间[scope.$index] }}
             </template>
           </el-table-column>
-          <!--<el-table-column label="是否预计外协" align="center" width="110">-->
-          <!--<template slot-scope="scope">-->
-          <!--{{ 预计外协[scope.$index] }}-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="零件加工计划进度（工艺名称、计划日期、工序工时）" align="">
             <el-table-column label="[1]" align="center" width="120px">
               <template slot-scope="scope">
@@ -465,11 +405,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      v-el-drag-dialog
-      :visible.sync="dialogTableVisible520"
-      title="调整工序计划"
-      width="45%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogTableVisible520" title="调整工序计划" width="45%">
       <div style="overflow: auto;max-height: 450px;">
         <el-row v-if="false">
           <span>开始时间:</span>
@@ -491,12 +427,7 @@
           <el-button size="mini" type="success" icon="el-icon-search" style="margin: 10px 0 10px 10px" @click="searchChart1">查询</el-button>
         </el-row>
         <div v-if="false" id="myChart1" style="width: 58%;height: 300px;display: inline-block"/>
-        <el-table
-          v-if="false"
-          :data="tableData01"
-          border
-          style="max-height: 300px;width:40%;display: inline-block"
-          height="300">
+        <el-table v-if="false" :data="tableData01" border style="max-height: 300px;width:40%;display: inline-block" height="300">
           <el-table-column label="名称" align="center">
             <template slot-scope="scope">
               {{ scope.row.设备名称 }}
@@ -536,7 +467,9 @@
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
-          </el-select>～<el-select v-model="month2" size="mini" style="width:60px" placeholder="月">
+          </el-select>
+          ～
+          <el-select v-model="month2" size="mini" style="width:60px" placeholder="月">
             <el-option
               v-for="item in months"
               :key="item.value"
@@ -550,7 +483,9 @@
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
-          </el-select>～<el-select v-model="week2" size="mini" style="width:60px" placeholder="周">
+          </el-select>
+          ～
+          <el-select v-model="week2" size="mini" style="width:60px" placeholder="周">
             <el-option
               v-for="item in weeks"
               :key="item.value"
@@ -562,13 +497,7 @@
           <span>零件类型：</span>{{ partType }}
         </el-row>
         <div v-if="false" id="myChart2" style="width: 58%;height: 300px;display: inline-block"/>
-        <!--@row-click="rowClick"-->
-        <el-table
-          :data="tableData02"
-          :row-class-name="rowClassName"
-          border
-          style="max-height: 300px;display: inline-block"
-          height="300">
+        <el-table :data="tableData02" :row-class-name="rowClassName" border style="max-height: 300px;display: inline-block" height="300">
           <el-table-column label="工序顺序" align="center" width="80" type="index">
             <template slot-scope="scope">
               {{ 工序顺序[scope.$index] }}
@@ -602,9 +531,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <!--<div slot="footer" class="dialog-footer" style="margin-right: 20px;float:right">-->
-        <!--<el-button size="mini" type="primary" @click="refreshTable" icon="el-icon-refresh"  style="margin-left: 750px">确定</el-button>-->
-        <!--</div>-->
       </div>
     </el-dialog>
 
diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue
index 19758c9e..ff146094 100644
--- a/src/views/MarketingCenter/ShippingInquiries/index.vue
+++ b/src/views/MarketingCenter/ShippingInquiries/index.vue
@@ -194,42 +194,10 @@ export default {
       }))
     },
     exportExcel() {
-      this.tableDataSearchList = []
       this.invoiceNumber !== null && this.invoiceNumber !== '' ? this.invoiceNumber_check = 1 : this.invoiceNumber_check = 0
       this.receivingUnit !== null && this.receivingUnit !== '' ? this.receivingUnit_check = 1 : this.receivingUnit_check = 0
       this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
       InvoiceListSearch_Excel(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check, this.check1, this.dateRange[0], this.dateRange[1]).then(val => {
-        console.log(val)
-        // for (let i = 0; i < val.data.length; i++) {
-        //   // if (val.data[i].投标结果 !== '' && val.data[i].交付日期 !== null) {
-        //   //   val.data[i].交付日期 = val.data[i].交付日期.substring(0, val.data[i].交付日期.length - 8)
-        //   // }
-        //   if (val.data[i].投标结果 === 0) {
-        //     val.data[i].投标结果 = ''
-        //   } else if (val.data[i].投标结果 === 1) {
-        //     val.data[i].投标结果 = '已中标'
-        //   } else if (val.data[i].投标结果 === 2) {
-        //     val.data[i].投标结果 = '未中标'
-        //   }
-        //   if (val.data[i].公布日期 !== '' && val.data[i].公布日期 !== null) {
-        //     val.data[i].公布日期 = val.data[i].公布日期.substring(0, val.data[i].公布日期.length - 8)
-        //   }
-        //   if (val.data[i].投标日期 !== '' && val.data[i].投标日期 !== null) {
-        //     val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
-        //   }
-        //   // if (val.data[i].投标日期 !== '' && val.data[i].投标日期 !== null) {
-        //   //   val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
-        //   // }
-        //   if (parseInt(val.data[i].是否收回) !== 2) {
-        //     val.data[i].应收回金额 = '未收回'
-        //   } else {
-        //     val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
-        //   }
-        //   val.data[i].保证金金额 = (val.data[i].保证金金额).toFixed(2)
-        //   val.data[i].中标服务费 = (val.data[i].中标服务费).toFixed(2)
-        //   val.data[i].未收金额 = (val.data[i].未收金额).toFixed(2)
-        //   val.data[i].转履约保证金金额 = (val.data[i].转履约保证金金额).toFixed(2)
-        // }
         if (val.length !== 0) {
           import('@/vendor/Export2Excel').then(excel => {
             const tHeader = ['状态', '发货单号', '收货单位', '收货人', '联系电话', '收货地址', '发货日期', '车辆牌号', '司机姓名', '司机电话', '货品类别', '货品编号', '货品名称', '货品规格', '货品型号', '数量', '设计者']