Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/api/MarketingCenter/BidBond.js

@@ -29,6 +29,19 @@ export function selectBidBond() {
     }
   })
 }
+export function selectBidBond_excel() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '投标保证金管理_投标保证金查询',
+      param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9]
+    }
+  })
+}
 
 export function getTree() {
   return request({

src/api/MarketingCenter/ContractCapitalManagement.js

@@ -26,6 +26,20 @@ export function initMarketingManager() {
     }
   })
 }
+// 导出Excel llj
+export function downloadexcel(num1, num2, num3, check1, starttime, endtime, ordername, order) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '报表_合同收款计划_导出',
+      param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order
+    }
+  })
+}
 export function searchTable1(pageCurrent, pageSize, num1, num2, num3, check1, starttime, endtime, ordername, order) {
   return request({
     url: '',

src/api/MarketingCenter/InvoiceRecord.js

@@ -132,3 +132,16 @@ export function delSubmit(num1) {
     }
   })
 }
+export function searchTableData_Excel(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '报表_开票记录_导出',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&客户名称=' + num9 + '=string&客户名称_check=' + num10 + '=int'
+    }
+  })
+}

src/api/MarketingCenter/PerformanceBond.js

@@ -54,7 +54,7 @@ export function searchTableData2(num1) {
     }
   })
 }
-export function takeBack(num1, num2) {
+export function takeBack(num1, num2, num3) {
   return request({
     url: '',
     method: 'post',
@@ -63,7 +63,7 @@ export function takeBack(num1, num2) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '合同信息管理_履约保证金_收回',
-      param: '履约保证金流水号=' + num1 + '=int&实际收回日期=' + num2 + '=string'
+      param: '履约保证金流水号=' + num1 + '=int&实际收回日期=' + num2 + '=string' + '&收回金额=' + num3 + '=float'
     }
   })
 }
@@ -156,3 +156,16 @@ export function delPerformanceGuarantee() {
     }
   })
 }
+export function searchExcel(num1, num2, num3, num4, num5, num6, num7, num8) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '合同信息管理_履约保证金_合同信息统计_查询_新',
+      param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date&客户名称_check=' + num7 + '=int&客户名称=' + num8 + '=string'
+    }
+  })
+}

src/api/MarketingCenter/SafetyMargin.js

@@ -148,6 +148,19 @@ export function searchTableDataProject(pageCurrent, pageSize, num1, num2, num3,
     }
   })
 }
+export function searchTableDataProject_excel(num1, num2, num3, num4, num5, num6, num7, num8) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '合同信息管理_安全保证金_合同信息统计_查询_新',
+      param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date&客户名称_check=' + num7 + '=int&客户名称=' + num8 + '=string'
+    }
+  })
+}
 export function executionProgressID() {
   return request({
     url: '',

src/api/MarketingCenter/ShippingInquiries.js

@@ -11,7 +11,7 @@ export function InvoiceListSearch() {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '发货管理_发货申请_发货单_发货单列表_查询',
-      param: '发货单号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&发货单名_check=0\\&发货单号_check=' + arguments[2] + '\\&收货单位_check=' + arguments[3] + '\\&车辆牌号_check=0\\&司机姓名_check=0\\&司机电话_check=0\\&制单人_check=0\\&核准人_check=0\\&执行人_check=0\\&开始制单日期_check=0\\&结束制单日期_check=0\\&开始核准日期_check=0\\&结束核准日期_check=0\\&开始发货日期_check=0\\&结束发货日期_check=0'
+      param: '发货单号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&发货单名_check=0\\&发货单号_check=' + arguments[2] + '\\&收货单位_check=' + arguments[3] + '\\&车辆牌号_check=0\\&司机姓名_check=0\\&司机电话_check=0\\&制单人_check=0\\&核准人_check=0\\&执行人_check=0\\&开始制单日期_check=0\\&结束制单日期_check=0\\&开始核准日期_check=0\\&结束核准日期_check=0\\&开始发货日期_check=' + arguments[4] + '\\&结束发货日期_check=' + arguments[4] + '\\&开始发货日期=' + arguments[5] + '\\&结束发货日期=' + arguments[6]
     }
   })
 }
@@ -29,3 +29,16 @@ export function DetailsFeach() {
     }
   })
 }
+export function InvoiceListSearch_Excel() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '报表_发货记录_导出',
+      param: '发货单号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&发货单名_check=0\\&发货单号_check=' + arguments[2] + '\\&收货单位_check=' + arguments[3] + '\\&车辆牌号_check=0\\&司机姓名_check=0\\&司机电话_check=0\\&制单人_check=0\\&核准人_check=0\\&执行人_check=0\\&开始制单日期_check=0\\&结束制单日期_check=0\\&开始核准日期_check=0\\&结束核准日期_check=0\\&开始发货日期_check=' + arguments[4] + '\\&结束发货日期_check=' + arguments[4] + '\\&开始发货日期=' + arguments[5] + '\\&结束发货日期=' + arguments[6]
+    }
+  })
+}

src/api/WorkshopProcurement/CreatingPurchasingMaterials.js

@@ -62,7 +62,7 @@ export function initPartDrawing(check1, name) {
   })
 }
 // 查询外购备料
-export function searchPurchasedMaterials(check1, name, order, partName) {
+export function searchPurchasedMaterials(check1, name) {
   return request({
     url: '',
     method: 'post',
@@ -71,7 +71,7 @@ export function searchPurchasedMaterials(check1, name, order, partName) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '备料管理_外购备料_查询数据',
-      param: `零件图号_check=${check1}&零件图号=${name}&排序名称=${partName}&排序方式=${order}`
+      param: `零件图号_check=${check1}&零件图号=${name}`
     }
   })
 }

src/api/WorkshopProcurement/NewArrivalList.js

@@ -15,19 +15,6 @@ export function searchCailiao(name) {
     }
   })
 }
-// 获取新到货单编号
-export function searchNewOrder() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '备料管理_获取新到货单编号'
-    }
-  })
-}
 // 查询采购单
 export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check, num1) {
   return request({
@@ -87,7 +74,7 @@ export function searchLxMateriel(num, check, num1) {
   })
 }
 // 查询到货单
-export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime) {
+export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -96,7 +83,8 @@ export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime,
       ModularID: router.currentRoute.path,
       type: '1',
       name: '备料管理_到货单查询_新',
-      param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`
+      param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}`,
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/views/Assembly/SparePartsOutStockRecord/index.vue

@@ -21,14 +21,16 @@
         <!--:label="item.label"-->
         <!--:value="item.value"/>-->
         <!--</el-select>-->
+        <span style="margin-left: 10px">零件图号:</span>
         <el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 180px" size="small" clearable/>
+        <span class="demonstration" style="margin-left: 10px">时间区间:</span>
         <el-date-picker
           v-model="dateRange"
           :picker-options="pickerOptions"
           size="small"
           type="daterange"
           align="center"
-          style="width: 240px;margin-left: 10px"
+          style="width: 240px;margin: 3px 0"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           range-separator="～"
@@ -50,18 +52,18 @@
         <!--type="date"-->
         <!--placeholder="选择日期"/>-->
         <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="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 600px;margin-top: 3px" height="800px" @sort-change="sortChange">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 580px;margin-top: 3px" height="800px" @sort-change="sortChange">
         <!--<el-table-column label="项目名称" prop="项目名称" align="center" width="150" show-overflow-tooltip>-->
         <!--<template slot-scope="scope">-->
         <!--{{ scope.row.项目名称 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="机床图号" prop="机床图号" align="center" width="150" show-overflow-tooltip>
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -148,7 +148,7 @@
 </template>
 
 <script>
-import { searchtable, edit, edit2, getExport } from '@/api/ManufacturingCenter/CreatePreparationBill'
+import { searchtable, searchtable2, edit, edit2, getExport } from '@/api/ManufacturingCenter/CreatePreparationBill'
 import { exportExcelMethod } from './exportExcel'
 import $ from 'jquery'
 export default {
@@ -227,8 +227,26 @@ export default {
           // this.tableData.push({
           //   重量: response.data.rows[0].重量
           // })
-          this.tableData = response.data.rows
+          this.Data = response.data.rows
           this.total = response.data.total
+        }
+      }).then(() => {
+        for (let i = 0; i < this.Data.length; i++) {
+          searchtable2(this.Data[i].工艺计划流水号).then(response => {
+            this.tableData.push({
+              工艺计划流水号: this.Data[i].工艺计划流水号,
+              零件名称: this.Data[i].零件名称,
+              零件图号: this.Data[i].零件图号,
+              备料打印: this.Data[i].备料打印,
+              是否外购备料: this.Data[i].是否外购备料,
+              工艺要求: response.data[0].工艺要求,
+              材料: this.Data[i].材料,
+              重量: this.Data[i].重量,
+              批次数量: this.Data[i].批次数量,
+              备料任务接受时间: this.Data[i].备料任务接受时间,
+              备料任务分配时间: this.Data[i].备料任务分配时间
+            })
+          })
           this.loading = false
         }
       })

src/views/MarketingCenter/BidBond/index.vue

@@ -40,6 +40,11 @@
       <!--        placeholder="请选择结束日期"/>-->
       <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
       <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">保证金</el-button>
+      <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
+        <div style="display: inline-block">
+          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 600px" @click="exportExcel">导出</el-button>
+        </div>
+      </el-tooltip>
     </el-card>
 
     <!--投标保证金表格-->
@@ -71,27 +76,12 @@
             {{ scope.row.招标企业 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column align="center" label="联系人" width="80">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.联系人 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column align="center" label="联系电话" width="100">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.联系电话 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
         <el-table-column align="center" label="保证金金额(万元)" width="100">
           <template slot-scope="scope">
             <span style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投标日期" width="86">
+        <el-table-column align="center" label="缴纳时间" width="86">
           <template slot-scope="scope">
             {{ scope.row.投标日期.substring(0, scope.row.投标日期.length - 8) }}
           </template>
@@ -116,7 +106,7 @@
             {{ Number(scope.row.应收回金额).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="实收回(万元)" width="80">
+        <el-table-column align="center" label="已收回(万元)" width="80">
           <template slot-scope="scope">
             <span v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</span>
             <span v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</span>
@@ -151,6 +141,21 @@
         <!--<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="mini" style="width: 66px">已拖期</el-tag>-->
         <!--</template>-->
         <!--</el-table-column>-->
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="联系人" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.联系人 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="联系电话" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.联系电话 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="备注" width="100px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.备注 }}
@@ -336,14 +341,14 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="投标日期" prop="投标日期">
+            <el-form-item label="缴纳时间" prop="投标日期">
               <el-date-picker
                 v-model="form2.投标日期"
                 style="width: 200px;"
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
-                placeholder="投标日期"/>
+                placeholder="缴纳时间"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -455,7 +460,8 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond } from '@/api/MarketingCenter/BidBond'
+import { getNowShotTime } from '@/utils/tool'
+import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond, selectBidBond_excel } from '@/api/MarketingCenter/BidBond'
 export default {
   components: {
     elInput
@@ -613,6 +619,79 @@ export default {
     this.fetchTableData1()
   },
   methods: {
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        return v[j]
+      }))
+    },
+    exportExcel() {
+      if (this.TypeOfGoldDepositValue === '' || this.TypeOfGoldDepositValue == null) {
+        this.TypeOfGoldDepositValue_check = 0
+      } else {
+        this.TypeOfGoldDepositValue_check = 1
+      }
+      if (this.Bidder === '' || this.Bidder == null) {
+        this.Bidder_check = 0
+      } else {
+        this.Bidder_check = 1
+      }
+      if (this.TenderingEnterprise === '' || this.TenderingEnterprise == null) {
+        this.TenderingEnterprise_check = 0
+      } else {
+        this.TenderingEnterprise_check = 1
+      }
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      selectBidBond_excel(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.check1, this.dateRange[0], this.check1, 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 = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约金(万元)', '已收(万元)', '未收(万元)', '保证金备注']
+            const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '未收金额', '备注']
+            const list = val.data
+            const data = this.formatJson(filterVal, list)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: getNowShotTime() + '投标保证金',
+              autoWidth: true,
+              bookType: 'xlsx'
+            })
+          })
+        } else {
+          this.$message.warning('没有导出内容')
+        }
+      })
+    },
     changeTime() {
       this.pickerOptions = Object.assign({}, this.pickerOptions, {
         disabledDate: (time) => {

src/views/MarketingCenter/CRM/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>客户名称：</span>
+      <!--<span>客户名称：</span>-->
       <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin: 3px;width: 230px" size="small" clearable>
         <el-option
           v-for="item in CustomerName"
@@ -22,10 +22,10 @@
       <!--</el-option>-->
       <!--</el-select>-->
       <el-button type="primary" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" plain @click="selectCustomerOfName">查询</el-button>
+      <el-button class="button222" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">客户</el-button>
     </el-card>
     <el-card>
       <!--<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>-->
-      <el-button class="button222" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">客户</el-button>
       <!--<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>-->
       <!--&lt;!&ndash;<el-table-column label="责权省份" align="center" min-width="80">&ndash;&gt;-->
       <!--&lt;!&ndash;<template slot-scope="scope">&ndash;&gt;-->
@@ -84,11 +84,12 @@
             v-loading="loading1"
             ref="multipleTable"
             :data="tableData1"
+            :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
             stripe
             highlight-current-row
             tooltip-effect="dark"
             style="width: 100%; margin-top: 3px;"
-            height="550"
+            height="630"
             size="mini"
             border>
             <el-table-column align="center" label="序号" width="65">
@@ -106,7 +107,7 @@
       </el-col>
       <el-col :span="20">
         <el-card>
-          <el-table v-loading="loading2" :data="tableData2" highlight-current-row height="520" size="mini" stripe style="width: 100%;margin-top: 2px" border>
+          <el-table v-loading="loading2" :data="tableData2" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" highlight-current-row height="600" size="mini" stripe style="width: 100%;margin-top: 2px" border>
             <el-table-column label="客户名称" prop="客户名称" align="center" min-width="180" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.客户名称 }}
@@ -217,6 +218,7 @@
         <div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
           <el-tree
             :data="dataPeople"
+            :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
             :default-expanded-keys="treeData"
             node-key="id"
             style="width: 150px;float: left"
@@ -225,7 +227,7 @@
             @node-click="handleNodeClick"
           />
         </div>
-        <el-table :data="ListPeople" height="400" stripe style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
+        <el-table :data="ListPeople" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" height="400" stripe style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
           <el-table-column label="考勤编号" align="center" >
             <template slot-scope="scope">
               {{ scope.row.考勤编号 }}

src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue

@@ -82,12 +82,12 @@
       </el-col>
       <el-col :span="6.3">
         <el-table :data="tableData2" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" class="subTableHeader" border style="text-align: center" size="mini">
-          <el-table-column label="设备型号" align="center" width="90" show-overflow-tooltip>
+          <el-table-column label="设备型号" align="center" width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="设备名称" align="center" min-width="90" show-overflow-tooltip>
+          <el-table-column label="设备名称" align="center" min-width="180" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床名称 }}
             </template>
@@ -112,7 +112,7 @@
           :value="item.value"/>
       </el-select>
       <div style="margin-top: 5px">
-        <el-table :data="tableData3" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
+        <el-table :data="tableData3" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
           <el-table-column label="营销经理" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
@@ -138,6 +138,7 @@
             <el-table
               v-loading="listLoadingContractCapitalManagement"
               :data="tableDataContractCapitalManagement"
+              :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
               style="width: 99%;"
               height="100"
               border
@@ -207,6 +208,7 @@
             <el-table
               v-loading="listLoadingInvoiceRecord"
               :data="tableDataInvoiceRecord"
+              :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
               style="width: 99%"
               height="100"
               border
@@ -270,6 +272,7 @@
               v-loading="tableDataLoadingDeliveryManagement"
               id="tb"
               :data="tableDataDeliveryManagement"
+              :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
               highlight-current-row
               style="width: 99%"
               height="100"
@@ -329,6 +332,7 @@
             <el-table
               v-loading="tableData1LoadingBidBond"
               :data="tableDataBidBond"
+              :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
               style="width: 99%"
               height="100"
               border
@@ -435,6 +439,7 @@
               v-loading="listLoadingPerformanceBond"
               v-show="showPerformanceBond"
               :data="tableDataPerformanceBond"
+              :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
               style="width: 99%"
               height="100"
               border
@@ -507,6 +512,7 @@
             <el-table
               v-loading="listLoadingSafetyMargin"
               :data="tableDataSafetyMargin"
+              :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
               style="width: 99%"
               height="100"
               border

src/views/MarketingCenter/ContractCapitalManagement/index.vue

@@ -30,6 +30,11 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"/>
       <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
+      <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
+        <div style="display: inline-block">
+          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 250px" @click="exportExcel">导出</el-button>
+        </div>
+      </el-tooltip>
       <!--<el-badge :value="value" :max="99" class="item">-->
       <!--<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>-->
       <!--</el-badge>-->
@@ -167,6 +172,7 @@
         <el-table
           :data="tableData2"
           :summary-method="getSummaries1"
+          :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
           style="width: 395px;max-height: 440px;text-align: center"
           highlight-current-row
           show-summary
@@ -206,7 +212,8 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { updateMoney, addMoney, deleteMoney, executionProgressID, getcustomername, searchProjectNumber2, AccountsReceivable, selectProvince, SelectMarketingManager, searchTable1, searchTable2, searchProjectNumber, PaymentPhase, selectMachine } from '@/api//MarketingCenter/ContractCapitalManagement'
+import { getNowShotTime } from '@/utils/tool'
+import { updateMoney, addMoney, deleteMoney, executionProgressID, getcustomername, searchProjectNumber2, AccountsReceivable, selectProvince, SelectMarketingManager, searchTable1, searchTable2, searchProjectNumber, PaymentPhase, selectMachine, downloadexcel } from '@/api//MarketingCenter/ContractCapitalManagement'
 
 export default {
   components: {
@@ -303,7 +310,39 @@ export default {
     this.getCustomerName()
   },
   methods: {
-    // 2020 02 20 刘路加新增怕徐
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        return v[j]
+      }))
+    },
+    exportExcel() {
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      downloadexcel(this.entryNameValue, this.peopleid, this.customerName, this.check1, this.dateRange[0], this.dateRange[1], this.ordername, this.order).then(val => {
+        for (let i = 0; i < val.data.length; i++) {
+          val.data[i]['合同总金额(万元)'] === null ? val.data[i]['合同总金额(万元)'] = '0.00' : val.data[i]['合同总金额(万元)'] = (val.data[i]['合同总金额(万元)']).toFixed(2)
+          val.data[i]['到账金额(万元)'] === null ? val.data[i]['到账金额(万元)'] = '0.00' : val.data[i]['到账金额(万元)'] = (val.data[i]['到账金额(万元)']).toFixed(2)
+          val.data[i]['未收金额(万元)'] === null ? val.data[i]['未收金额(万元)'] = '0.00' : val.data[i]['未收金额(万元)'] = (val.data[i]['未收金额(万元)']).toFixed(2)
+        }
+        if (val.length !== 0) {
+          import('@/vendor/Export2Excel').then(excel => {
+            const tHeader = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
+            const filterVal = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
+            const list = val.data
+            const data = this.formatJson(filterVal, list)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: getNowShotTime(),
+              autoWidth: true,
+              bookType: 'xlsx'
+            })
+          })
+        } else {
+          this.$message.warning('没有导出内容')
+        }
+      })
+    },
+    // 2020 02 20 刘路加新增排序
     sortChange(column, prop, order) {
       console.log(column + '-' + column.prop + '-' + column.order, 11111)
       if (column.prop === '合同编号') {
@@ -421,7 +460,6 @@ export default {
           this.tableData2[index].收款金额 = 0
         }
       }).then(() => {
-        console.log(111111111)
         this.getTableData()
       })
     },
@@ -560,6 +598,7 @@ export default {
 </script>
 
 <style scoped>
+
   /*.el-card {*/
   /*  !*margin-top: 15px;*!*/
   /*}*/
@@ -575,7 +614,7 @@ export default {
   .el-table td, .el-table th.is-leaf,
   .el-radio__inner,
   .el-input__inner{
-    border: 1px solid black!important;
+    /*border: 1px solid black!important;*/
     width: 150px;
     white-space: nowrap;
     overflow: hidden;
@@ -586,7 +625,7 @@ export default {
   /*}*/
 </style>
 <style lang="scss">
-  .subTableHeader {
+  >>>.subTableHeader {
     th {
       background: #7eaced !important;
       color: black;

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -47,7 +47,7 @@
         @expand-change="selectMachine">
         <el-table-column type="expand" label="详情" width="50">
           <template slot-scope="scope">
-            <el-table :data="tableData2" class="subTableHeader" size="mini" border style="width: 482px; text-align: center">
+            <el-table :data="tableData2" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" class="subTableHeader" size="mini" border style="width: 482px; text-align: center">
               <el-table-column label="机床型号" align="center" width="140">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
@@ -209,7 +209,7 @@
     </el-card>
     <!--新增合同信息对话框-->
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px; " width="700px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12" style="height: 2px">
             <el-form-item label="项目名称" prop="EntryName" style="">
@@ -217,12 +217,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="投标保证金" prop="">
+            <el-form-item label="投标保证金(万元)" prop="">
               <el-input v-model="form.bidding" readonly clearable size="small" style="width:180px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="合同总额" prop="contractAmount">
+            <el-form-item label="合同总额(万元)" prop="contractAmount">
               <el-input v-model="form.contractAmount" clearable size="small" style="width:180px" placeholder="请输入合同金额" @change="fun()"/>
             </el-form-item>
           </el-col>
@@ -352,14 +352,14 @@
     <!--营销经理选择-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="300px">
       <div style="margin-top: 0px;width: 250px">
-        <el-table :data="tableData4" border style="width: 120px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
+        <el-table :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border style="width: 120px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
           <el-table-column label="部门" align="center" >
             <template slot-scope="scope">
               {{ scope.row.部门名称 }}
             </template>
           </el-table-column>
         </el-table>
-        <el-table :data="tableData3" border stripe style="width: 120px;height:350px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange">
+        <el-table :data="tableData3" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 120px;height:350px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange">
           <el-table-column label="销售经理" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
@@ -442,7 +442,18 @@
     <el-dialog v-el-drag-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="400px">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
       <el-button type="search" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
-      <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 350px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
+      <el-table
+        v-loading="loading1"
+        :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
+        :data="CustomerData"
+        highlight-current-row
+        height="300"
+        stripe
+        border
+        show-overflow-tooltip
+        style="height: 350px; margin-top: 10px"
+        size="mini"
+        @row-click="handleCustomerChange">
         <el-table-column label="客户名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
@@ -767,7 +778,7 @@ export default {
       this.ExecutionProgressShow = false
       this.uploader = false
       this.ExecutionProgress = null
-      this.listLoading = true
+      // this.listLoading = true
       var param = []
       param[0] = ['项目流水号_check', this.entryNameValue_check]
       param[1] = ['合同ID', this.entryNameValue]

src/views/MarketingCenter/DeliveryApplication/index.vue

@@ -1190,17 +1190,18 @@ export default {
 }
 </script>
 <style>
-  .el-textarea__inner,
+
-  .el-radio__inner,
-  .el-input__inner{
-    border-bottom: 1px solid #dcdfe6!important;
-  }
-  .el-textarea__inner, .el-radio__inner, .el-input__inner{
-    border: 1px solid #dcdfe6!important;
-  }
 </style>
 
 <style scoped>
+  >>>.el-textarea__inner,
+  >>>.el-radio__inner,
+  >>>.el-input__inner{
+    border-bottom: 1px solid #dcdfe6!important;
+  }
+  >>>.el-textarea__inner,>>> .el-radio__inner,>>> .el-input__inner{
+    border: 1px solid #dcdfe6!important;
+  }
   .el-divider{
     margin: 5px;
   }

src/views/MarketingCenter/InvoiceRecord/index.vue

@@ -30,6 +30,11 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           @click.stop="openAddInvoiceRecordingDialog(); flag = 1">开票</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
+          <div style="display: inline-block">
+            <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 70px" @click="exportExcel">导出</el-button>
+          </div>
+        </el-tooltip>
       </el-row>
     </el-card>
     <!--项目表格-->
@@ -37,6 +42,7 @@
       <el-col :span="15">
         <el-table
           v-loading="listLoading1"
+          :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
           :data="tableData1"
           highlight-current-row
           style="width: 900px;margin-top: 3px"
@@ -124,6 +130,7 @@
       <el-col :span="9">
         <el-table
           v-loading="listLoading2"
+          :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
           :data="tableData2"
           :summary-method="getSummaries"
           show-summary
@@ -189,6 +196,7 @@
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleRecord" title="开票详情" center width="600px">
       <el-table
         v-loading="listLoading2"
+        :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
         :data="tableData2"
         :summary-method="getSummaries"
         show-summary
@@ -255,7 +263,7 @@
       <el-input v-model="name" clearable size="small" style="width: 200px"/>
       <el-button size="small" type="success" style="margin-left: 10px;" icon="el-icon-search" @click="searchName">查询</el-button>
       <div style="margin-top: 5px">
-        <el-table :data="dataPeople" border size="mini" stripe style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
+        <el-table :data="dataPeople" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border size="mini" stripe style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
           <el-table-column label="销售经理" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
@@ -310,7 +318,18 @@
     <el-dialog v-el-drag-dialog :visible.sync="dialogCustomerFormVisible" title="选择客户" center width="600px">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
-      <el-table v-loading="loading1" :data="CustomerData" border stripe size="mini" highlight-current-row height="400" show-overflow-tooltip style="height: 330px; margin-top: 5px" @row-click="handleCustomerChange">
+      <el-table
+        v-loading="loading1"
+        :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
+        :data="CustomerData"
+        border
+        stripe
+        size="mini"
+        highlight-current-row
+        height="400"
+        show-overflow-tooltip
+        style="height: 330px; margin-top: 5px"
+        @row-click="handleCustomerChange">
         <el-table-column label="省份" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.省份 }}
@@ -351,7 +370,8 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { initProject, searchTableData1, searchTableData2, revisionOfTaxRate, selectProvince, SelectMarketingManager, fetchCustomerData, addSubmit, editSubmit, delSubmit } from '@/api/MarketingCenter/InvoiceRecord'
+import { getNowShotTime } from '@/utils/tool'
+import { initProject, searchTableData1, searchTableData2, revisionOfTaxRate, selectProvince, SelectMarketingManager, fetchCustomerData, addSubmit, editSubmit, delSubmit, searchTableData_Excel } from '@/api/MarketingCenter/InvoiceRecord'
 export default {
   components: {
     elInput
@@ -472,6 +492,44 @@ export default {
     this.fetchTableData1()
   },
   methods: {
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        return v[j]
+      }))
+    },
+    exportExcel() {
+      if (this.customerName === '' || this.customerName === null) { this.customerName_check = 0 } else { this.customerName_check = 1 }
+      if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
+      if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
+      this.dateRange ? (this.startTime_check = 1, this.endTime_check = 0) : (this.startTime_check = 0, this.endTime_check = 0, this.dateRange = '')
+      // if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
+      // if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      searchTableData_Excel(this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.dateRange[0], this.dateRange[1], this.customerName, this.customerName_check).then(val => {
+        console.log(val)
+        for (let i = 0; i < val.data.length; i++) {
+          val.data[i].合同金额 === null ? val.data[i].合同金额 = '0.00' : val.data[i].合同金额 = (val.data[i].合同金额).toFixed(2)
+          val.data[i].到账金额 === null ? val.data[i].到账金额 = '0.00' : val.data[i].到账金额 = (val.data[i].到账金额).toFixed(2)
+          val.data[i].开票金额 === null ? val.data[i].开票金额 = '0.00' : val.data[i].开票金额 = (val.data[i].开票金额).toFixed(2)
+        }
+        if (val.length !== 0) {
+          import('@/vendor/Export2Excel').then(excel => {
+            const tHeader = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '签订日期', '合同金额(万元)', '到账金额(万元)', '开票金额(万元)', '营销经理']
+            const filterVal = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '签订日期', '合同金额', '到账金额', '开票金额', '营销经理']
+            const list = val.data
+            const data = this.formatJson(filterVal, list)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: getNowShotTime() + '开票记录',
+              autoWidth: true,
+              bookType: 'xlsx'
+            })
+          })
+        } else {
+          this.$message.warning('没有导出内容')
+        }
+      })
+    },
     opendialogFormVisibleRecordDialog(row) {
       this.dialogFormVisibleRecord = true
       this.fetchTableData2(row)

src/views/MarketingCenter/PerformanceBond/index.vue

@@ -164,6 +164,11 @@
                   <el-tag v-else-if="parseInt(scope.row.是否收回) === 0" slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
                 </template>
               </el-table-column>
+              <el-table-column align="center" label="收回金额">
+                <template slot-scope="scope">
+                  {{ Number(scope.row.收回金额).toFixed(2) }}
+                </template>
+              </el-table-column>
               <el-table-column align="center" label="实际收回日期">
                 <template slot-scope="scope">
                   {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? scope.row.实际收回日期 = '暂未收回' : scope.row.实际收回日期 }}
@@ -266,6 +271,9 @@
             type="date"
             placeholder="请选择实际收回日期"/>
         </el-form-item>
+        <el-form-item label="收回金额(万元)" prop="收回金额">
+          <el-input-number v-model="form.收回金额" :precision="2" :min="0" :step="1" :max="maxrecmoney" style="width: 150px" size="small"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" icon="el-icon-circle-close" @click="callOffTime('form')">取消</el-button>
@@ -398,8 +406,10 @@ export default {
       performanceGuaranteeShow: true,
       customerName_check: '',
       customerName: '', // 客户名称
+      maxrecmoney: 0.00,
       form: {
-        实际收回日期: ''
+        实际收回日期: '',
+        收回金额: ''
       },
       form2: {
         保证金金额: '',
@@ -408,7 +418,10 @@ export default {
         截止时间: 15
       },
       rules: { // 表单验证规则
-        实际收回日期: [{ required: true, message: '请选择实际收回日期', trigger: 'change' }]
+        实际收回日期: [{ required: true, message: '请选择实际收回日期', trigger: 'change' }],
+        收回金额: [
+          { required: true, message: '请输入收回金额', trigger: 'change' },
+          { required: true, trigger: 'blur', validator: validateValue }]
       },
       rules2: { // 表单验证规则
         保证金金额: [
@@ -525,6 +538,9 @@ export default {
     takeBack(row) {
       this.addForm('form')
       this.performanceBondCode = row.履约保证金流水号
+      this.form.收回金额 = Number(row.收回金额).toFixed(2)
+      console.log((row.履约保证金金额).toFixed(2))
+      this.maxrecmoney = row.履约保证金金额
       this.dialogTimeVisible = true
     },
     callOffTime() {
@@ -533,7 +549,7 @@ export default {
     submitTime(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          takeBack(this.performanceBondCode, this.form.实际收回日期).then(response => {
+          takeBack(this.performanceBondCode, this.form.实际收回日期, this.form.收回金额).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('操作成功')
               this.dialogTimeVisible = false

src/views/MarketingCenter/SafetyMargin/index.vue

@@ -40,8 +40,12 @@
       <!--        type="date"-->
       <!--        placeholder="请选择结束日期"/>-->
       <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
+      <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
+        <div style="display: inline-block">
+          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 630px" @click="exportExcel">导出</el-button>
+        </div>
+      </el-tooltip>
     </el-card>
-
     <el-card>
       <el-table
         v-loading="listLoadingProject"
@@ -113,6 +117,11 @@
             {{ Number(scope.row.已收金额).toFixed(2) }}
           </template>
         </el-table-column>
+        <el-table-column label="未收(万元)" align="center" width="100">
+          <template slot-scope="scope">
+            {{ Number(scope.row.未收金额).toFixed(2) }}
+          </template>
+        </el-table-column>
         <el-table-column label="营销经理" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
@@ -204,7 +213,6 @@
           @current-change="handleCurrentChangeProject"/>
       </div>
     </el-card>
-
     <!--安全保证金表格-->
     <el-card>
       <el-table
@@ -633,7 +641,8 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { initProject, searchTable1, searchTable2, addSafetyMargin, editSafetyMargin, delSafetyMargin, Withdrawing, delWithdrawing, edtWithdrawing, TakeBack, searchTableDataProject, executionProgressID } from '@/api/MarketingCenter/SafetyMargin'
+import { getNowShotTime } from '@/utils/tool'
+import { initProject, searchTable1, searchTable2, addSafetyMargin, editSafetyMargin, delSafetyMargin, Withdrawing, delWithdrawing, edtWithdrawing, TakeBack, searchTableDataProject, searchTableDataProject_excel, executionProgressID } from '@/api/MarketingCenter/SafetyMargin'
 export default {
   components: {
     elInput
@@ -786,6 +795,68 @@ export default {
     this.searchTableDataProject()
   },
   methods: {
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        return v[j]
+      }))
+    },
+    exportExcel() {
+      if (this.entryNameValue === '' || this.entryNameValue === null) {
+        this.entryNameValue_check = 0
+      } else {
+        this.entryNameValue_check = 1
+      }
+      if (this.startTime === '' || this.startTime === null) {
+        this.startTime_check = 0
+      } else {
+        this.startTime_check = 1
+      }
+      if (this.endTime === '' || this.endTime === null) {
+        this.endTime_check = 0
+      } else {
+        this.endTime_check = 1
+      }
+      if (this.customerName === '' || this.customerName === null) {
+        this.customerName_check = 0
+      } else {
+        this.customerName_check = 1
+      }
+      // llj新增
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      searchTableDataProject_excel(this.entryNameValue, this.entryNameValue_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.customerName_check, this.customerName).then(val => {
+        console.log(val.data[0])
+        for (let i = 0; i < val.data.length; i++) {
+          val.data[i].保证金金额 === null ? val.data[i].保证金金额 = '0.00' : val.data[i].保证金金额 = (val.data[i].保证金金额).toFixed(2)
+          val.data[i].扣款金额 === null ? val.data[i].扣款金额 = '0.00' : val.data[i].扣款金额 = (val.data[i].扣款金额).toFixed(2)
+          val.data[i].应收回金额 === null ? val.data[i].应收回金额 = '0.00' : val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
+          val.data[i].已收金额 === null ? val.data[i].已收金额 = '0.00' : val.data[i].已收金额 = (val.data[i].已收金额).toFixed(2)
+          val.data[i].未收金额 === null ? val.data[i].未收金额 = '0.00' : val.data[i].未收金额 = (val.data[i].未收金额).toFixed(2)
+          // val.data[i].扣款金额 === null ? val.data[i].扣款金额 = 0.00 : (val.data[i].扣款金额).toFixed(2)
+          // val.data[i].应收回金额 === null ? 0.00 : (val.data[i].应收回金额).toFixed(2)
+          // val.data[i].已收金额 === null ? 0.00 : (val.data[i].已收金额).toFixed(2)
+          if (val.data[i].交付日期 !== '' && val.data[i].交付日期 !== null) {
+            val.data[i].交付日期 = val.data[i].交付日期.substring(0, val.data[i].交付日期.length - 8)
+          }
+        }
+        if (val.length !== 0) {
+          import('@/vendor/Export2Excel').then(excel => {
+            const tHeader = ['合同编号', '项目名称', '客户名称', '安全金(万元)', '缴纳时间', '扣款金额(万元)', '扣款原因', '应收(万元)', '已收(万元)', '未收(万元)', '营销经理', '合同信息备注', '备注']
+            const filterVal = ['合同编号', '项目名称', '客户名称', '保证金金额', '交付日期', '扣款金额', '扣款原因', '应收回金额', '已收金额', '未收金额', '姓名', '合同信息备注', '备注']
+            const list = val.data
+            const data = this.formatJson(filterVal, list)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: getNowShotTime() + '安全保证金',
+              autoWidth: true,
+              bookType: 'xlsx'
+            })
+          })
+        } else {
+          this.$message.warning('没有导出内容')
+        }
+      })
+    },
     changeTime() {
       this.pickerOptions = Object.assign({}, this.pickerOptions, {
         disabledDate: (time) => {
@@ -848,6 +919,7 @@ export default {
         for (let i = 0; i < data.rows.length; i++) {
           data.rows[i].合同签订日期 = data.rows[i].合同签订日期.substring(0, data.rows[i].合同签订日期.length - 8)
           parseInt(data.rows[i].安全保证金类型) === 1 ? data.rows[i].是否禁用增加安全保证金 = true : data.rows[i].是否禁用增加安全保证金 = false
+          data.rows[i].交付日期 = data.rows[i].交付日期.substring(0, data.rows[i].交付日期.length - 8)
         }
 
         this.projectTableData = data.rows

src/views/MarketingCenter/ShippingInquiries/index.vue

@@ -3,11 +3,25 @@
     <el-card>
       <el-input v-model="invoiceNumber" placeholder="发货单号和收货单位" clearable style="width: 200px;margin-right: 10px" size="small" @keyup.enter.native="openSearch"/>
       <!--<el-input v-model="receivingUnit" placeholder="请输入收货单位" clearable style="width: 150px;margin-right: 10px" size="mini"/>-->
+      <span style="font-size: 13px;margin-left: 10px">发货时间</span>
+      <el-date-picker
+        v-model="dateRange"
+        :picker-options="pickerOptions"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 240px;margin: 3px 0"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <el-button type="primary" icon="el-icon-search" size="mini" style="margin-left: 10px" plain @click="openSearch">查询</el-button>
-      <InputNumberNew
+      <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
-        v-model="invoiceNumber"
+        <div style="display: inline-block">
-        placeholder="请输入数字"
+          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
-      />
+        </div>
+      </el-tooltip>
     </el-card>
     <el-card>
       <el-col :span="12">
@@ -127,10 +141,40 @@
 </template>
 
 <script>
-import { InvoiceListSearch, DetailsFeach } from '@/api/MarketingCenter/ShippingInquiries'
+import { getNowShotTime } from '@/utils/tool'
+import { InvoiceListSearch, DetailsFeach, InvoiceListSearch_Excel } from '@/api/MarketingCenter/ShippingInquiries'
 export default {
   data() {
     return {
+      dateRange: '',
+      check1: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       tableDataSearchList: [],
       invoiceNumber: '',
       receivingUnit: '',
@@ -144,11 +188,73 @@ export default {
     this.openSearch()
   },
   methods: {
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        return v[j]
+      }))
+    },
+    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 = ['状态', '发货单号', '收货单位', '收货人', '联系电话', '收货地址', '发货日期', '车辆牌号', '司机姓名', '司机电话', '货品类别', '货品编号', '货品名称', '货品规格', '货品型号', '数量', '设计者']
+            const filterVal = ['状态', '发货单号', '收货单位', '收货人', '联系电话', '收货地址', '发货日期', '车辆牌号', '司机姓名', '司机电话', '货品类别', '货品编号', '货品名称', '货品规格', '货品型号', '数量', '设计者']
+            const list = val.data
+            const data = this.formatJson(filterVal, list)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: getNowShotTime() + '发货记录',
+              autoWidth: true,
+              bookType: 'xlsx'
+            })
+          })
+        } else {
+          this.$message.warning('没有导出内容')
+        }
+      })
+    },
     openSearch() {
       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
-      InvoiceListSearch(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check).then(response => {
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      InvoiceListSearch(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check, this.check1, this.dateRange[0], this.dateRange[1]).then(response => {
         if (response.data.length !== 0) {
           this.tableDataSearchList = response.data
         }

src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue

@@ -11,20 +11,9 @@
             <el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
               <el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
             </el-tooltip>
-            <el-table
+            <el-table v-loading="loading1" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}" border stripe highlight-current-row style="width:795px ;margin-top:3px;" height="690" size="mini" @selection-change="handleSelectionChange">
-              v-loading="loading1"
-              :data="tableData1"
-              :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
-              border
-              stripe
-              highlight-current-row
-              style="width:795px ;margin-top:3px;"
-              height="690"
-              size="mini"
-              @sort-change="sortChange"
-              @selection-change="handleSelectionChange">
               <el-table-column type="selection" align="center" width="45"/>
-              <el-table-column label="机床图号" prop="机床图号" width="120" sortable="custom" align="center">
+              <el-table-column label="机床图号" prop="机床图号" width="120" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
                 </template>
@@ -39,7 +28,7 @@
                   {{ scope.row.零件图号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="零件名称" prop="零件名称" width="140" sortable="custom" align="center" show-overflow-tooltip>
+              <el-table-column label="零件名称" prop="零件名称" width="140" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.零件名称 }}
                 </template>
@@ -49,7 +38,7 @@
                   {{ scope.row.批次数量 }}
                 </template>
               </el-table-column>
-              <el-table-column label="材料" prop="材料" width="150" sortable="custom" align="center" show-overflow-tooltip>
+              <el-table-column label="材料" prop="材料" width="150" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.材料 }}
                 </template>
@@ -94,7 +83,7 @@
             <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>-->
             <!--</el-tooltip>-->
             <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
-            <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">外购备料</el-button>
+            <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
               <el-button type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
             </el-tooltip>
@@ -406,8 +395,6 @@ export default {
       pageCurrent: 1,
       pageSize: 10,
       total: null,
-      partName: '',
-      order: '',
       partDrawingNumber: '',
       Buyer: '',
       loading1: false,
@@ -495,42 +482,10 @@ export default {
   },
   created() {
     this.searchRawMaterial()
-    this.getCurrentTime()
-    this.searchTable2()
     // this.searchTable1()
     // this.searchTable2()
   },
   methods: {
-    getCurrentTime() {
-      this.dateRange = [this.getTime1(70), this.getTime0(0)]
-    },
-    getTime0(num) {
-      var date0 = new Date()
-      var date = new Date(date0.getTime() + num * 24 * 60 * 60 * 1000)
-      var month = this.zeroFill(date.getMonth() + 1)
-      var day = this.zeroFill(date.getDate())
-      var hour = this.zeroFill(date.getHours())
-      var minute = this.zeroFill(date.getMinutes())
-      var second = this.zeroFill(date.getSeconds())
-      return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
-    },
-    getTime1(num) {
-      var date0 = new Date()
-      var date = new Date(date0.getTime() - num * 24 * 60 * 60 * 1000)
-      var month = this.zeroFill(date.getMonth() + 1)
-      var day = this.zeroFill(date.getDate())
-      var hour = this.zeroFill(date.getHours())
-      var minute = this.zeroFill(date.getMinutes())
-      var second = this.zeroFill(date.getSeconds())
-      return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
-    },
-    zeroFill(i) {
-      if (i >= 0 && i <= 9) {
-        return '0' + i
-      } else {
-        return i
-      }
-    },
     // 获取原材料
     searchRawMaterial() {
       searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
@@ -607,23 +562,6 @@ export default {
         img.src = url
       })
     },
-    sortChange(column, prop, order) {
-      console.log(column + '-' + column.prop + '-' + column.order, 11111)
-      if (column.prop === '零件名称') {
-        this.partName = 1
-      } else if (column.prop === '机床图号') { this.partName = 2 } else if (column.prop === '材料') {
-        this.partName = 3
-      } else {
-        this.partName = ''
-      }
-      console.log(this.ordername, 9990999)
-      if (column.order === 'ascending') {
-        this.order = 1
-      } else if (column.order === 'descending') { this.order = 2 } else {
-        this.order = ''
-      }
-      this.searchTable1()
-    },
     fetchData() {
       initPartDrawing(0, this.partDrawingNumberValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
@@ -638,7 +576,7 @@ export default {
       this.loading1 = true
       this.partDrawingNumber ? this.check1 = 1 : this.check1 = 0
       // this.pageCurrent1, this.pageSize1,
-      searchPurchasedMaterials(this.check1, this.partDrawingNumber, this.order, this.partName).then(response => {
+      searchPurchasedMaterials(this.check1, this.partDrawingNumber).then(response => {
         this.tableData1 = response.data
         this.total1 = response.data.total
         this.loading1 = false
@@ -768,15 +706,27 @@ export default {
       }))
     },
     exportExcel2(row) {
-      if (this.tableData4.length !== 0) {
+      this.searchTable3(row).then(val => {
-        var param = []
+        console.log(row, 11111)
-        param[0] = ['采购计划流水号', row.采购计划流水号]
+        console.log(this.tableData4)
-        param[1] = ['供应商', row.供应商名称]
+        if (this.tableData4.length !== 0) {
-        var Data = this.CreateData('2001', '报表_备料管理_采购计划明细_查询数据', param)
+           import('@/vendor/Export2Excel').then(excel => {
-        this.exportExcel_NPOI(Data)
+             const tHeader = ['备料状态', '物料编码', '零件名称', '材料', '数量', '成品尺寸', '单位', '备注']
-      } else {
+             const filterVal = ['备料状态', '物料零件编码', '零件名称', '材料', '总数量', '成品尺寸', '单位', '备注1']
-        this.$message.warning('暂无数据')
+             const list = this.tableData4
-      }
+             const data = this.formatJson(filterVal, list)
+             excel.export_json_to_excel({
+               header: tHeader,
+               data,
+               filename: row.采购单名称 + '-' + row.计划完成日期,
+               autoWidth: true,
+               bookType: 'xlsx'
+             })
+           })
+        } else {
+          this.$message.warning('没有导出内容')
+        }
+      })
     },
     searchTable3(row) { // 查询采购计划明细
       this.purchasingOrderNumber = row.采购计划流水号

src/views/WorkshopProcurement/NewArrivalList/index.vue

@@ -4,33 +4,35 @@
       <div style="white-space: nowrap">
         <el-card style="width: 1329px;">
           <div>
-            <el-select v-model="supplierNameValue" placeholder="供应商" size="small" style="width: 220px" filterable clearable @change="searchTable4()">
+            <span style="margin-left: 10px">供应商:</span>
+            <el-select v-model="supplierNameValue" placeholder="供应商" size="small" style="width: 220px" filterable clearable @change="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">
               <el-option
                 v-for="item in supplierName"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
+            <span>请款时间段:</span>
             <el-date-picker
               v-model="dateRange"
               :picker-options="pickerOptions"
               size="small"
               type="daterange"
               align="center"
-              style="width: 240px"
+              style="width: 240px;margin: 3px 0"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               range-separator="～"
               start-placeholder="开始日期"
               end-placeholder="结束日期"/>
-            <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable4()">查询</el-button>
+            <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
             <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
-            <el-button type="success" plain size="small" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
           </div>
         </el-card>
-        <el-card style="width: 650px;margin-left: 0px;display: inline-block">
+        <el-card style="width: 660px;margin-left: 0px;display: inline-block">
-          <el-table v-loading="" :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 650px" height="260px" size="mini" highlight-current-row @row-click="searchTable5">
+          <span>到货单</span>
-            <el-table-column label="进程" align="center" width="80">
+          <el-table v-loading="" :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 7000px" height="240px" size="mini" highlight-current-row @row-click="searchTable5">
+            <el-table-column label="关联情况" align="center" width="80">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</span>
                 <span v-else type="primary" size="mini">未结算</span>
@@ -71,8 +73,21 @@
             <!--</template>-->
             <!--</el-table-column>-->
           </el-table>
+          <div class="block">
+            <el-pagination
+              :current-page="pageCurrent4"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize4"
+              :total="total4"
+              style="display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange4"
+              @current-change="handleCurrentChange4"/>
+          </div>
         </el-card>
-        <el-card style="width: 670px;margin-left: 3px;display: inline-block;vertical-align: top">
+        <el-card style="width: 660px;margin-left: 3px;display: inline-block;vertical-align: top">
+          <span>到货单明细</span>
+          <el-button type="primary" plain size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
           <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
           <el-table
             v-loading=""
@@ -102,12 +117,12 @@
                 {{ scope.row.单位 }}
               </template>
             </el-table-column>
-            <el-table-column label="单价(元)" align="right" width="80">
+            <el-table-column label="单价" align="right" width="80">
               <template slot-scope="scope">
                 {{ scope.row.单价.toFixed(2) }}
               </template>
             </el-table-column>
-            <el-table-column label="金额(元)" align="right" width="95">
+            <el-table-column label="金额" align="right" width="80">
               <template slot-scope="scope">
                 {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
               </template>
@@ -129,6 +144,7 @@
           </el-table>
         </el-card>
         <el-card style="width: 1329px">
+          <span>关联备料材料</span>
           <el-table
             v-loading=""
             :data="tableData6"
@@ -136,7 +152,7 @@
             border
             show-summary
             highlight-current-row
-            style="margin: 3px 0; width: 1310px"
+            style="margin: 3px 0; width: 1280px"
             height="500px"
             size="mini">
             <el-table-column label="物料编码" prop="物料零件编码" align="center" width="150">
@@ -159,22 +175,22 @@
                 {{ scope.row.数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="单位" align="center" width="110" >
+            <el-table-column label="成品尺寸（长、宽、高）" align="center" width="240">
-              <template slot-scope="scope">
-                {{ scope.row.单位 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="成品尺寸（长、宽、高）" align="center" width="210">
               <template slot-scope="scope">
                 {{ scope.row.成品尺寸 }}
               </template>
             </el-table-column>
-            <el-table-column label="重量小计(KG)" align="center" prop="总重量" width="130">
+            <el-table-column label="总重量" align="center" prop="总重量" width="100">
               <template slot-scope="scope">
                 {{ scope.row.重量 }}
               </template>
             </el-table-column>
-            <el-table-column label="金额小计(KG)" align="center" prop="总金额" width="130">
+            <el-table-column label="单位" align="center" width="70" >
+              <template slot-scope="scope">
+                {{ scope.row.单位 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="总金额" align="center" prop="总金额" width="130">
               <template slot-scope="scope">
                 {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
               </template>
@@ -196,23 +212,24 @@
           </el-table>
         </el-card>
 
-        <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="360px">
+        <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="380px">
           <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
-            <el-form-item label="到货单号">
+            <el-row>
-              <el-input v-model="NewOrder" style="width: 180px" size="small" disabled/>
+              <el-form-item label="供应商" prop="supplierNameValue">
-            </el-form-item>
+                <el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" size="small" filterable @change="searchTable20()">
-            <el-form-item label="供应商" prop="supplierNameValue">
+                  <el-option
-              <el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" style="width: 180px" size="small" filterable @change="searchTable20()">
+                    v-for="item in supplierNames"
-                <el-option
+                    :key="item.value"
-                  v-for="item in supplierNames"
+                    :label="item.label"
-                  :key="item.value"
+                    :value="item.value"/>
-                  :label="item.label"
+                </el-select>
-                  :value="item.value"/>
+              </el-form-item>
-              </el-select>
+            </el-row>
-            </el-form-item>
+            <el-row>
-            <el-form-item label="到货日期" prop="invoiceTime">
+              <el-form-item label="到货日期" prop="invoiceTime">
-              <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" style="width: 180px" format="yyyy-MM-dd" placeholder="选择日期"/>
+                <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
-            </el-form-item>
+              </el-form-item>
+            </el-row>
           </el-form>
           <div slot="footer" class="dialog-footer">
             <el-button
@@ -304,37 +321,37 @@
                       {{ scope.row.物料零件编码 }}
                     </template>
                   </el-table-column>
-                  <el-table-column label="零件名称" align="center" width="110px">
+                  <el-table-column label="零件名称" align="center" width="90px">
                     <template slot-scope="scope">
                       {{ scope.row.零件名称 }}
                     </template>
                   </el-table-column>
-                  <el-table-column label="材料" align="center" width="90px">
+                  <el-table-column label="材料" align="center" width="70px">
                     <template slot-scope="scope">
                       {{ scope.row.材料 }}
                     </template>
                   </el-table-column>
-                  <el-table-column label="备料数" align="center" width="65px">
+                  <el-table-column label="备料件数" align="center" width="70px">
                     <template slot-scope="scope">
                       {{ scope.row.采购数量 }}
                     </template>
                   </el-table-column>
-                  <el-table-column label="已到数" align="center" width="65px">
+                  <el-table-column label="已到件数" align="center" width="70px">
                     <template slot-scope="scope">
                       {{ scope.row.到货数量 }}
                     </template>
                   </el-table-column>
-                  <el-table-column label="到货数" align="center" width="120px">
+                  <el-table-column label="到货件数" align="center" width="110px">
                     <template slot-scope="scope">
-                      <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
+                      <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
                     </template>
                   </el-table-column>
-                  <el-table-column label="到货重量" align="center" width="120px" prop="到货重量">
+                  <el-table-column label="到货重量" align="center" width="110px" prop="到货重量">
                     <template slot-scope="scope">
-                      <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
+                      <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
                     </template>
                   </el-table-column>
-                  <el-table-column label="成品尺寸(长、宽、高)" align="center" width="170px">
+                  <el-table-column label="成品尺寸（长、宽、高）" align="center">
                     <template slot-scope="scope">
                       {{ scope.row.成品尺寸 }}
                     </template>
@@ -441,24 +458,24 @@
                 {{ scope.row.材料 }}
               </template>
             </el-table-column>
-            <el-table-column label="备料数" align="center" width="70px">
+            <el-table-column label="备料件数" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.采购数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="已到数" align="center" width="70px">
+            <el-table-column label="已到件数" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.到货数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="到货数" align="center" width="120px">
+            <el-table-column label="到货件数" align="center" width="110px">
               <template slot-scope="scope">
-                <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
+                <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column label="到货重量" align="center" width="120px">
+            <el-table-column label="到货重量" align="center" width="110px">
               <template slot-scope="scope">
-                <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:95px" @change="saveData(scope.row)"/>
+                <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
               </template>
             </el-table-column>
             <el-table-column label="成品尺寸（长、宽、高）" align="center">
@@ -487,7 +504,7 @@
 </template>
 <script>
 import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5,
-  searchSupplier, deleteArrivalMX, EditArrivalOrderMX, AddArrivalOrderMX, deleteMateriel, searchTable6, searchLxPurchaseOrder, searchLxMateriel, searchNewOrder } from '@/api/WorkshopProcurement/NewArrivalList.js'
+  searchSupplier, deleteArrivalMX, EditArrivalOrderMX, AddArrivalOrderMX, deleteMateriel, searchTable6, searchLxPurchaseOrder, searchLxMateriel } from '@/api/WorkshopProcurement/NewArrivalList.js'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -575,7 +592,6 @@ export default {
       pageCurrent4: 1,
       pageSize4: 10,
       tableData5: [],
-      NewOrder: '',
       到货单流水号: '',
       中间变量: '',
       form: {
@@ -650,40 +666,9 @@ export default {
   created() {
     this.fetchdata()
     this.searchTable2()
-    this.getCurrentTime()
     // this.searchTable4()
   },
   methods: {
-    getCurrentTime() {
-      this.dateRange = [this.getTime1(30), this.getTime0(0)]
-    },
-    getTime0(num) {
-      var date0 = new Date()
-      var date = new Date(date0.getTime() + num * 24 * 60 * 60 * 1000)
-      var month = this.zeroFill(date.getMonth() + 1)
-      var day = this.zeroFill(date.getDate())
-      var hour = this.zeroFill(date.getHours())
-      var minute = this.zeroFill(date.getMinutes())
-      var second = this.zeroFill(date.getSeconds())
-      return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
-    },
-    getTime1(num) {
-      var date0 = new Date()
-      var date = new Date(date0.getTime() - num * 24 * 60 * 60 * 1000)
-      var month = this.zeroFill(date.getMonth() + 1)
-      var day = this.zeroFill(date.getDate())
-      var hour = this.zeroFill(date.getHours())
-      var minute = this.zeroFill(date.getMinutes())
-      var second = this.zeroFill(date.getSeconds())
-      return date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
-    },
-    zeroFill(i) {
-      if (i >= 0 && i <= 9) {
-        return '0' + i
-      } else {
-        return i
-      }
-    },
     saveData(row) {
       var a = 0
       this.tableData30.map(v => {
@@ -763,8 +748,8 @@ export default {
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {
-        if (index === 0) {
+        if (index === 1) {
-          sums[index] = '小计'
+          sums[index] = '总重量：'
           return
         } else if (index === 2) {
           const values = data.map(item => Number(item['数量']))
@@ -784,6 +769,9 @@ export default {
         } else if (index === 3) {
           sums[index] = 'KG'
           return
+        } else if (index === 4) {
+          sums[index] = '总金额：'
+          return
         } else if (index === 5) {
           const values = data.map(item => Number(item['金额']))
           if (!values.every(value => isNaN(value))) {
@@ -811,7 +799,7 @@ export default {
           sums[index] = '未绑定重量：'
           return
         } else if (index === 4) {
-          sums[index] = this.未绑定数量 + ' KG'
+          sums[index] = this.未绑定数量
         } if (index === 5) {
           sums[index] = '绑定重量：'
           return
@@ -826,7 +814,7 @@ export default {
                 return parseInt(Number(prev) * 100) / 100
               }
             }, 0)
-            sums[index] += ' KG'
+            sums[index]
           } else {
             sums[index] = 'N/A'
           }
@@ -863,26 +851,28 @@ export default {
       } else {
         this.check2 = 0
       }
-      if ((this.supplierNameValue !== '' && this.supplierNameValue !== null) || this.dateRange !== '') {
+      searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => {
-        searchArriveOrder(this.check, this.supplierNameValue, this.check2, this.PickingValue, this.check1, this.dateRange[0], this.dateRange[1]).then(response => {
+        this.tableData4 = response.data.rows
-          this.tableData4 = response.data
+        this.total4 = response.data.total
-        })
+      })
-      } else {
-        this.tableData4 = []
-        this.$message.warning('请填入查询条件')
-      }
     },
     Calculation() {
       this.form10.金额 = this.form10.单价 * this.form10.数量
     },
+    handleSizeChange4(val) { // 采购单列表分页
+      this.pageSize4 = val
+      this.pageCurrent4 = 1
+      this.searchTable4()
+    },
+    handleCurrentChange4(val) { // 采购单列表分页
+      this.pageCurrent4 = val
+      this.searchTable4()
+    },
     // 创建采购单
     addArrivalOrder() {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      searchNewOrder().then(response => {
-        this.NewOrder = response.data[0].到货单号
-      })
       this.title = '新增到货单'
       this.form.备注 = ''
       this.form.supplierNameValue = ''
@@ -904,6 +894,8 @@ export default {
           addPurchaseOrder(this.form.备注, this.form.supplierNameValue, this.form.日期).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('新建到货单成功')
+              this.pageCurrent4 = 1
+              this.pageSize4 = 10
               this.searchTable4()
               this.dialogVisible = false
             } else { this.$message.error('新建到货单失败') }
@@ -1176,16 +1168,12 @@ export default {
       })
     },
     downloadExcel() {
-      if (this.num1) {
+      var param = []
-        var param = []
+      param[0] = ['到货单流水号', this.num1]
-        param[0] = ['到货单流水号', this.num1]
+      param[1] = ['编号', this.num2]
-        param[1] = ['编号', this.num2]
+      param[2] = ['供应商', this.sup]
-        param[2] = ['供应商', this.sup]
+      var Data = this.CreateData('12', '报表_备料管理_到货单明细查询', param)
-        var Data = this.CreateData('2001', '报表_备料管理_到货单明细查询', param)
+      this.exportExcel_NPOI(Data)
-        this.exportExcel_NPOI(Data)
-      } else {
-        this.$message.warning('请先选择到货单')
-      }
     }
   }
 }
@@ -1230,25 +1218,6 @@ export default {
     right: 15px;
     top: 5px;
   }
-  .el-form--label-left >>> .el-form-item__label {
-    text-align: right;
-  }
-  >>>.el-dialog--center .el-dialog__body {
-    text-align: initial;
-    padding: 20px 30px 20px
-  }
-  >>>.el-dialog__header {
-    padding: 20px 20px 0px;
-  }
-  >>>.el-dialog__footer {
-    padding: 0px 20px 20px;
-    /*text-align: right;*/
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-  }
-  >>>.el-form-item {
-    margin-bottom: 13px;
-  }
 </style>
 <style>
   .el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td {

src/views/WorkshopProcurement/OfflineProcurement/index.vue

@@ -1,191 +1,279 @@
 <template>
-  <div>
+  <div class="app-container">
-    <div style="width: 100%;overflow:auto">
+    <el-card style="width: 1137px">
-      <div style="white-space: nowrap">
+      <span>机床号：</span>
-        <el-card style="margin-left: 0px;width:820px; display: inline-block;height: 745px">
+      <el-select v-model="Machine" filterable clearable size="small" style="width: 150px;" placeholder="机床号" @change="getGroup">
-          <el-col>
+        <el-option
-            <el-select v-model="Machine" filterable clearable size="small" style="width: 150px;margin-top: 3px" placeholder="机床图号" @change="getGroup">
+          v-for="item in Machines"
-              <el-option
+          :key="item.value"
-                v-for="item in Machines"
+          :label="item.label"
-                :key="item.value"
+          :value="item.value">
-                :label="item.label"
+          <div style="float: left">{{ item.label }}</div>
-                :value="item.value">
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
-                <div style="float: left">{{ item.label }}</div>
+        </el-option>
-                <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+      </el-select>
-              </el-option>
+      <span>组号：</span>
-            </el-select>
+      <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 120px;" @change="getTableData">
-            <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 120px;" @change="getTableData">
+        <el-option
-              <el-option
+          v-for="item in Groups"
-                v-for="item in Groups"
+          :key="item.value"
-                :key="item.value"
+          :label="item.label"
-                :label="item.label"
+          :value="item.value"/>
-                :value="item.value"/>
+      </el-select>
-            </el-select>
+      <span>零件号：</span>
-            <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 150px"/>
+      <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 150px"/>
-            <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="getTableData()">查询</el-button>
+      <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
-            <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="690px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
+    </el-card>
-              <el-table-column type="selection" align="center" width="55"/>
+    <el-card style="width: 1137px">
-              <el-table-column label="机床图号" prop="机床图号" width="120" align="center">
+      <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
-                <template slot-scope="scope">
+        <el-table-column type="selection" align="center" width="55"/>
-                  {{ scope.row.机床图号 }}
+        <el-table-column label="机床图号" prop="机床图号" min-width="180" align="center">
-                </template>
+          <template slot-scope="scope">
-              </el-table-column>
+            {{ scope.row.机床图号 }}
-              <el-table-column label="组号" prop="组号" width="80" sortable="custom" align="center">
+          </template>
-                <template slot-scope="scope">
+        </el-table-column>
-                  {{ scope.row.组号 }}
+        <el-table-column label="组号" prop="组号" width="120" sortable="custom" align="center">
-                </template>
+          <template slot-scope="scope">
-              </el-table-column>
+            {{ scope.row.组号 }}
-              <el-table-column label="零件图号" prop="零件图号" align="center" sortable="custom" width="180">
+          </template>
-                <template slot-scope="scope">
+        </el-table-column>
-                  {{ scope.row.零件图号 }}
+        <el-table-column label="零件图号" prop="零件图号" align="center" sortable="custom" width="220">
-                </template>
+          <template slot-scope="scope">
-              </el-table-column>
+            {{ scope.row.零件图号 }}
-              <el-table-column label="零件名称" align="center" width="140">
+          </template>
-                <template slot-scope="scope">
+        </el-table-column>
-                  {{ scope.row.零件名称 }}
+        <el-table-column label="零件名称" align="center" width="220">
-                </template>
+          <template slot-scope="scope">
-              </el-table-column>
+            {{ scope.row.零件名称 }}
-              <el-table-column label="数量" align="center" width="70">
+          </template>
-                <template slot-scope="scope">
+        </el-table-column>
-                  {{ scope.row.批次数量 }}
+        <el-table-column label="数量" align="center" width="100">
-                </template>
+          <template slot-scope="scope">
-              </el-table-column>
+            {{ scope.row.批次数量 }}
-              <el-table-column label="材料" prop="材料" align="center" sortable="custom" width="150">
+          </template>
-                <template slot-scope="scope">
+        </el-table-column>
-                  {{ scope.row.材料 }}
+        <el-table-column label="材料" prop="材料" align="center" sortable="custom" min-width="160">
-                </template>
+          <template slot-scope="scope">
-              </el-table-column>
+            {{ scope.row.材料 }}
-            </el-table>
+          </template>
-          </el-col>
+        </el-table-column>
-        </el-card>
+      </el-table>
-        <el-card style="margin-left: 1px;width:1120px; display: inline-block;">
+      <!--<div class="block">-->
-          <div> <!--slot="header"-->
+      <!--<el-pagination-->
-            <!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
+      <!--:current-page="pageCurrent10"-->
-            <el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px;margin-top: 3px" clearable/>
+      <!--:page-sizes="[10, 20, 30, 40]"-->
-            <el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 200px" filterable clearable @change="searchTable">
+      <!--:page-size="pageSize10"-->
-              <el-option
+      <!--:total="total10"-->
-                v-for="item in supplierNames"
+      <!--style="display:inline-block;width:50%"-->
-                :key="item.value"
+      <!--layout="total, sizes, prev, pager, next, jumper"-->
-                :label="item.label"
+      <!--@size-change="handleSizeChange10"-->
-                :value="item.value"/>
+      <!--@current-change="handleCurrentChange10"/>-->
-            </el-select>
+      <!--</div>-->
-            <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
+    </el-card>
-            <el-button type="distribution" size="small" plain icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">采购计划单</el-button>
+    <el-card style="width: 1137px">
-            <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
+      <span>离线备料单号:</span>
-            <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
+      <el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px" clearable/>
-            <!--</el-tooltip>-->
+      <span style="margin-left: 10px">供应商:</span>
-            <el-button type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
+      <el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable @change="searchTable">
-          </div>
+        <el-option
-          <el-table v-loading="" :data="tableData" stripe highlight-current-row border style="width: 100%;max-height: 230px;margin-top: 10px" height="230px" size="mini" @row-click="searchMX">
+          v-for="item in supplierNames"
-            <el-table-column label="进程" prop="采购计划状态" align="center" width="70">
+          :key="item.value"
-              <template slot-scope="scope">
+          :label="item.label"
-                <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">未到货</span>
+          :value="item.value"/>
-                <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
+      </el-select>
-                <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
-              </template>
+      <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
-            </el-table-column>
+      <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
-            <el-table-column label="离线备料计划编号" align="center" width="140">
+      <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
-              <template slot-scope="scope">
+      <!--</el-tooltip>-->
-                {{ scope.row.离线采购计划编号 }}
+      <el-button type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
-              </template>
+    </el-card>
-            </el-table-column>
+    <el-card style="width: 1137px">
-            <el-table-column label="离线备料名称" align="center" width="160">
+      <el-table v-loading="" :data="tableData" stripe highlight-current-row border style="width: 100%;max-height: 230px;margin-top: 10px" height="230px" size="mini" @row-click="searchMX">
-              <template slot-scope="scope">
+        <el-table-column label="采购状态" prop="采购计划状态" align="center" width="90">
-                {{ scope.row.离线采购计划名称 }}
+          <template slot-scope="scope">
-              </template>
+            <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">未到货</span>
-            </el-table-column>
+            <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
-            <el-table-column label="供应商" align="center" width="200" show-overflow-tooltip>
+            <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
-              <template slot-scope="scope">
+          </template>
-                {{ scope.row.供应商名称 }}
+        </el-table-column>
-              </template>
+        <el-table-column label="离线采购计划编号" align="center" width="200">
-            </el-table-column>
+          <template slot-scope="scope">
-            <el-table-column label="下单日期" prop="下单日期" align="center" width="100">
+            {{ scope.row.离线采购计划编号 }}
-              <template slot-scope="scope">
+          </template>
-                {{ scope.row.下单日期.split(' ')[0] }}
+        </el-table-column>
-              </template>
+        <el-table-column label="离线采购计划名称" align="center" width="180">
-            </el-table-column>
+          <template slot-scope="scope">
-            <el-table-column label="操作" align="center" width="240">
+            {{ scope.row.离线采购计划名称 }}
-              <template slot-scope="scope">
+          </template>
-                <el-tooltip :open-delay="1200" effect="dark" content="打印采购计划单" placement="top">
+        </el-table-column>
-                  <div style="display: inline-block">
+        <el-table-column label="供应商" align="center" width="250" show-overflow-tooltip>
-                    <el-button size="mini" type="text" icon="el-icon-printer" @click="exportExcel(scope.row)">打印单据</el-button>
+          <template slot-scope="scope">
-                  </div>
+            {{ scope.row.供应商名称 }}
-                </el-tooltip>
+          </template>
-                <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
+        </el-table-column>
-                  <div style="display: inline-block">
+        <el-table-column label="下单日期" prop="下单日期" align="center" width="100">
-                    <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
+          <template slot-scope="scope">
-                  </div>
+            {{ scope.row.下单日期.split(' ')[0] }}
-                </el-tooltip>
+          </template>
-                <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
+        </el-table-column>
-                  <div style="display: inline-block">
+        <el-table-column label="操作" align="center" width="290">
-                    <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
+          <template slot-scope="scope">
-                  </div>
+            <el-tooltip :open-delay="1200" effect="dark" content="打印采购计划单" placement="top">
-                </el-tooltip>
+              <div style="display: inline-block">
-              </template>
+                <el-button size="mini" type="text" icon="el-icon-printer" @click="exportExcel(scope.row)">打印单据</el-button>
-            </el-table-column>
+              </div>
-          </el-table>
+            </el-tooltip>
-          <!--<div class="block">-->
+            <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
-          <!--<el-pagination-->
+              <div style="display: inline-block">
-          <!--:current-page="pageCurrent2"-->
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
-          <!--:page-sizes="[10, 20, 30, 40]"-->
+              </div>
-          <!--:page-size="pageSize2"-->
+            </el-tooltip>
-          <!--:total="total2"-->
+            <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
-          <!--style="display:inline-block;width:40%;float: right;margin-right: 60px"-->
+              <div style="display: inline-block">
-          <!--layout="total, sizes, prev, pager, next, jumper"-->
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
-          <!--@size-change="handleSizeChange2"-->
+              </div>
-          <!--@current-change="handleCurrentChange2"/>-->
+            </el-tooltip>
-          <!--</div>-->
+          </template>
-          <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;margin-top: 10px" height="455px" size="mini">
+        </el-table-column>
-            <el-table-column label="进程" align="center" width="70">
+      </el-table>
-              <template slot-scope="scope">
+      <!--<div class="block">-->
-                <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
+      <!--<el-pagination-->
-                <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
+      <!--:current-page="pageCurrent2"-->
-                <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
+      <!--:page-sizes="[10, 20, 30, 40]"-->
-              </template>
+      <!--:page-size="pageSize2"-->
-            </el-table-column>
+      <!--:total="total2"-->
-            <el-table-column label="物料编码" prop="物料零件编码" align="center" width="140" show-overflow-tooltip>
+      <!--style="display:inline-block;width:50%"-->
-              <template slot-scope="scope">
+      <!--layout="total, sizes, prev, pager, next, jumper"-->
-                {{ scope.row.物料零件编码 }}
+      <!--@size-change="handleSizeChange2"-->
-              </template>
+      <!--@current-change="handleCurrentChange2"/>-->
-            </el-table-column>
+      <!--</div>-->
-            <el-table-column label="零件名称" align="center" width="120">
+    </el-card>
-              <template slot-scope="scope">
+    <el-card style="width: 1137px">
-                {{ scope.row.零件名称 }}
+      <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
-              </template>
+        <el-table-column label="采购状态" align="center" width="90">
-            </el-table-column>
+          <template slot-scope="scope">
-            <el-table-column label="材料" prop="材料" align="center" width="95">
+            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
-              <template slot-scope="scope">
+            <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
-                {{ scope.row.材料 }}
+            <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="数量" align="center" prop="数量" width="100px">
+        <el-table-column label="物料编码" prop="物料零件编码" align="center" width="180">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <el-input v-positive="'int'" :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.数量" size="mini" type="int" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
+            {{ scope.row.物料零件编码 }}
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="成品尺寸（长、宽、高）" align="center" min-width="120px">
+        <el-table-column label="零件名称" align="center" width="160">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.成品尺寸" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
+            {{ scope.row.零件名称 }}
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="备注" align="center" prop="备注" min-width="100px">
+        <el-table-column label="材料" prop="材料" align="center" width="100">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
+            {{ scope.row.材料 }}
-              </template>
+          </template>
-            </el-table-column>
+        </el-table-column>
-            <el-table-column label="操作" align="center" width="90px" fixed="right">
+        <el-table-column label="数量" align="center" prop="数量" width="100px">
-              <template slot-scope="scope">
+          <template slot-scope="scope">
-                <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
+            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.数量" size="mini" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
-                  <div style="display: inline-block">
+          </template>
-                    <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="text" size="mini" icon="el-icon-right" @click="deleteMX(scope.row)">移出</el-button>
+        </el-table-column>
-                  </div>
+        <el-table-column label="成品尺寸（长、宽、高）" align="center" width="160px">
-                </el-tooltip>
+          <template slot-scope="scope">
-              </template>
+            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.成品尺寸" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
-            </el-table-column>
+          </template>
-          </el-table>
+        </el-table-column>
-        </el-card>
+        <el-table-column label="备注" align="center" prop="备注" width="220px">
+          <template slot-scope="scope">
+            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注" size="mini" style="width:100%" @change="saveWeight(scope.$index, scope.row)"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100px">
+          <template slot-scope="scope">
+            <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="text" size="mini" icon="el-icon-right" @click="deleteMX(scope.row)">移出</el-button>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-card style="width: 1137px">
+      <div id="WGBLD" style="width: 1037px;margin: 0 auto">
+        <table cellspacing="0px" align="center" border="1 solid black" width="100%">
+          <tr style="height: 60px">
+            <th colspan="12"><h3>江苏高精机电装备有限公司</h3></th>
+          </tr>
+          <tr style="height: 40px">
+            <th colspan="12"><h4>{{ 采购单名称 }}</h4></th>
+          </tr>
+          <tr style="height: 40px">
+            <td colspan="2" style="text-align: center;width: 15%">下单单位</td>
+            <td colspan="4" style="text-align: center;width: 35%">{{ 下单单位 }}</td>
+            <td colspan="2" style="text-align: center;width: 15%">单号</td>
+            <td colspan="4" style="text-align: center;width: 35%">{{ 单号 }}</td>
+          </tr>
+          <tr style="height: 40px">
+            <td colspan="2" style="text-align: center;width: 15%">下单日期</td>
+            <td colspan="4" style="text-align: center;width: 35%">{{ 下单日期 }}</td>
+            <td colspan="2" style="text-align: center;width: 15%">计划完成日期</td>
+            <td colspan="4" style="text-align: center;width: 35%">{{ 计划完成日期 }}</td>
+          </tr>
+        </table>
+        <table cellspacing="0px" align="center" border="1 solid black" width="100%" style="margin-top: 0px">
+          <tr id="tablehead" style="height: 35px">
+            <td style="text-align: center;width: 7%">序号</td>
+            <td colspan="2" style="text-align: center;width: 20%">物料编码</td>
+            <td colspan="2" style="text-align: center;width: 10%">名称</td>
+            <td colspan="2" style="text-align: center;width: 10%">材料</td>
+            <td colspan="2" style="text-align: center;width: 8%">数量</td>
+            <td colspan="2" style="text-align: center;width: 20%">成品尺寸（长、宽、高）</td>
+            <td style="text-align: center;width: 17%">备注</td>
+          </tr>
+          <tr v-for="(list, index) in tableData3" :key="index" style="height: 35px">
+            <td style="text-align: center;width: 7%">{{ index + 1 }}</td>
+            <td colspan="2" style="text-align: center;width: 20%">{{ list.物料零件编码 }}</td>
+            <td colspan="2" style="text-align: center;width: 10%">{{ list.零件名称 }}</td>
+            <td colspan="2" style="text-align: center;width: 10%">{{ list.材料 }}</td>
+            <td colspan="2" style="text-align: center;width: 8%">{{ list.数量 }}</td>
+            <td colspan="2" style="text-align: center;width: 20%">{{ list.成品尺寸 }}</td>
+            <td style="text-align: center;width: 17%">{{ list.备注 }}</td>
+          </tr>
+        </table>
+        <div style="margin-top: 20px">联系人:___________ 联系电话:___________ </div>
       </div>
-    </div>
+    </el-card>
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="520px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="150px">
+        <el-form-item label="离线采购计划名称" prop="离线采购计划名称">
+          <el-input v-model="form2.离线采购计划名称" size="small"/>
+        </el-form-item>
+        <el-form-item label="供应商" prop="supplierNameValue">
+          <el-select v-model="form2.supplierNameValue" placeholder="供应商" size="small" filterable>
+            <el-option
+              v-for="item in supplierNames"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          v-show="title2==='创建离线采购计划'"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitAddPurchaseOrder">确定</el-button>
+        <el-button
+          v-show="title2==='编辑离线采购计划'"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitEditPurchaseOrder">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -355,7 +443,7 @@ export default {
     getTableData() {
       this.tableData10 = []
       if (!this.Machine && !this.Group && !this.number) {
-        this.$message.warning('请输入筛选条件！')
+        this.$message.error('请输入筛选条件！')
         return
       }
       if (this.Machine === '') {
@@ -409,7 +497,7 @@ export default {
     searchTable() {
       this.tableData = []
       if (!this.purchasingOrder && !this.supplierName) {
-        this.$message.warning('请输入筛选条件！')
+        this.$message.error('请输入筛选条件！')
         return
       }
       this.purchasingOrder ? this.check3 = 1 : this.check3 = 0

src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue

@@ -74,7 +74,7 @@
             {{ scope.row.开票时间 | formatTime }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="开票金额(元)" width="110px">
+        <el-table-column align="center" label="开票金额(元)" width="100px">
           <template slot-scope="scope">
             {{ scope.row.开票金额.toFixed(2) }}
           </template>
@@ -153,7 +153,7 @@
             {{ scope.row.日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="金额(元)" align="center" width="100" prop="到货金额">
+        <el-table-column label="金额(元)" align="center" width="120" prop="到货金额">
           <template slot-scope="scope">
             {{ scope.row.到货金额.toFixed(2) }}
           </template>
@@ -165,7 +165,7 @@
                 <el-button
                   type="text"
                   size="mini"
-                  icon="el-icon-right"
+                  icon="el-icon-delete"
                   @click="deleteTable10(scope.row)"/>
               </div>
             </el-tooltip>
@@ -173,7 +173,7 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="新增备料到票" center style="min-height: 300px" width="800px">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
         <div style="width: 45%;float: left;margin-top: 5px">
           <div style="background: white">
@@ -186,14 +186,14 @@
                   :value="item.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="发票号">
+            <el-form-item label="发票号" prop="money">
               <el-input v-model="form1.Number" size="small" placeholder="发票号"/>
             </el-form-item>
             <el-form-item label="到票时间" prop="invoiceTime">
               <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
             </el-form-item>
-            <el-form-item label="到票金额(元)" prop="money">
+            <el-form-item label="到票金额" prop="money">
-              <el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="开票金额"/>
+              <el-input v-model="form1.money" size="small" placeholder="开票金额"/>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form1.remark" size="small"/>
@@ -213,7 +213,7 @@
                 {{ scope.row.日期.split(' ')[0] }}
               </template>
             </el-table-column>
-            <el-table-column label="金额(元)" align="center">
+            <el-table-column label="金额" align="center">
               <template slot-scope="scope">
                 {{ scope.row.到货金额.toFixed(2) }}
               </template>
@@ -223,37 +223,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
+        <el-button v-show="title1==='新增备料到票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
-      </div>
+        <el-button v-show="title1==='编辑备料到票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
-    </el-dialog>
-
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="编辑备料到票" center style="height: 600px" width="400px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
-        <el-form-item label="供应商" prop="supplierNameValue">
-          <el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
-            <el-option
-              v-for="item in supplierNames"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="发票号" prop="money">
-          <el-input v-model="form1.Number" size="small" placeholder="发票号"/>
-        </el-form-item>
-        <el-form-item label="到票时间" prop="invoiceTime">
-          <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item label="到票金额(元)" prop="money">
-          <el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="开票金额"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form1.remark" size="small"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible2 = false">取消</el-button>
-        <el-button size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -270,14 +241,15 @@
             {{ scope.row.日期.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="金额(元)" align="center">
+        <el-table-column label="金额" align="center">
           <template slot-scope="scope">
             {{ scope.row.到货金额.toFixed(2) }}
           </template>
         </el-table-column>
       </el-table>
-      <span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
+      <div slot="footer" class="dialog-footer">
-      <el-button type="primary" size="small" icon="el-icon-download" style="float:right;margin: 10px 10px 0 10px" @click="addMateriel">关联到货单</el-button>
+        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联到货单</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -328,7 +300,6 @@ export default {
       invoiceNum: '',
       invoiceTime: '',
       Name: '',
-      SUM: 0.00,
       arrest: [],
       pageCurrent1: 1,
       pageSize1: 30,
@@ -348,7 +319,6 @@ export default {
       supplierNames: [],
       dialogVisible: false,
       dialogVisible1: false,
-      dialogVisible2: false,
       title1: '',
       form1: {
         supplierNameValue: '',
@@ -359,8 +329,7 @@ export default {
         remark: ''
       },
       rules1: {
-        supplierNameValue: [{ required: true, message: '请选择供应商' }],
+        supplierNameValue: [{ required: true, message: '请选择供应商' }]
-        money: [{ required: true, message: '请填写到票金额' }]
       }
     }
   },
@@ -471,6 +440,7 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
+      this.title1 = '新增备料到票'
       this.tableData4 = []
       this.dialogVisible1 = true
       console.log(this.supplierNames)
@@ -510,13 +480,14 @@ export default {
       if (this.$refs['form1'] !== undefined) {
         this.$refs['form1'].resetFields()
       }
-      this.dialogVisible2 = true
+      this.title1 = '编辑备料到票'
+      this.dialogVisible1 = true
       this.form1.invoiceNumValue = row.发票流水号
       this.form1.invoiceTime = row.开票时间
       this.form1.money = row.开票金额
       this.form1.Number = row.发票号
       this.form1.remark = row.备注
-      this.form1.supplierNameValue = parseInt(row.供应商)
+      this.form1.supplierNameValue = row.供应商
       if (row.开票时间 === '1900/1/1') {
         this.form1.invoiceTime = null
       }
@@ -528,7 +499,7 @@ export default {
           editInvoice(this.form1.invoiceNumValue, this.form1.invoiceTime, this.form1.money, this.form1.Number, this.form1.remark, this.form1.supplierNameValue).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('编辑成功')
-              this.dialogVisible2 = false
+              this.dialogVisible1 = false
               this.searchTable1()
             } else { this.$message.error('编辑失败') }
           })
@@ -565,10 +536,6 @@ export default {
       this.searchTable4()
     },
     handleSelectionChange(val) {
-      this.SUM = 0
-      for (let i = 0; i < val.length; i++) {
-        this.SUM += parseFloat(val[i].到货金额).toFixed(2)
-      }
       this.arrest = val
     },
     // 选入
@@ -617,7 +584,7 @@ export default {
       var param = []
       param[0] = ['发票流水号', row.发票流水号]
       param[1] = ['供应商', row.供应商名称]
-      var Data = this.CreateData('2001', '报表_备料管理_发票_查询数据', param)
+      var Data = this.CreateData('12', '报表_备料管理_发票明细_查询数据', param)
       this.exportExcel_NPOI(Data)
       // const _ExcelDownLoad = ExcelDownLoad
       // this.download(`${_ExcelDownLoad}?Fapiao=${row.发票流水号}&name=${row.供应商名称}`)

src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue

@@ -10,7 +10,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 180px" clearable/>
-        <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 140px;margin-left: 10px" clearable>
+        <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 140px" clearable>
           <el-option
             v-for="item in Materials"
             :key="item.value"
@@ -30,8 +30,8 @@
           range-separator="～"
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
-        <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 10px" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
+        <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-        <el-button type="success" plain icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
+        <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
       </div>
     </el-card>
     <el-card style="width: 100%">
@@ -43,7 +43,7 @@
         stripe
         size="mini"
         style="width: 100%"
-        height="750"
+        height="760"
         @sort-change="sortChange">
         <el-table-column
           label="序号"
@@ -51,10 +51,8 @@
           type="index"
           width="50"/>
         <el-table-column
-          label="进程"
+          label="备料状态"
           align="center"
-          prop="进程"
-          sortable="custom"
           width="80px">
           <template slot-scope="scope">
             <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>
@@ -75,7 +73,7 @@
         <el-table-column
           label="物料编码"
           align="center"
-          width="180px">
+          min-width="180px">
           <template slot-scope="scope">{{ scope.row.物料编码 }}</template>
         </el-table-column>
         <el-table-column
@@ -94,12 +92,12 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.材料 }}</template>
         </el-table-column>
-        <el-table-column label="备料件数" align="center" width="100">
+        <el-table-column label="备料件数" align="center" width="70">
           <template slot-scope="scope">
             {{ scope.row.采购数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="120">
+        <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="100">
           <template slot-scope="scope">
             {{ scope.row.下单日期 ? scope.row.下单日期.split(' ')[0] : '' }}
           </template>
@@ -107,7 +105,7 @@
         <el-table-column
           label="到货件数"
           align="center"
-          width="100">
+          width="70">
           <template slot-scope="scope">{{ scope.row.到货数量 }}</template>
         </el-table-column>
         <el-table-column
@@ -138,7 +136,7 @@
 </template>
 
 <script>
-import { searchSupplier, searchTable } from '@/api/WorkshopProcurement/OutsourcingMaterialsSearch'
+import { searchSupplier, searchTable, searchTablesheet } from '@/api/WorkshopProcurement/OutsourcingMaterialsSearch'
 export default {
   name: 'Index',
   data() {
@@ -206,38 +204,31 @@ export default {
       }))
     },
     exportExcel() {
-      if (this.tableData.length !== 0) {
+      let check, check1, check2, check3
-        let check, check1, check2, check3
+      this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
-        this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
+      this.supplierNameValue ? check = 1 : check = 0
-        this.supplierNameValue ? check = 1 : check = 0
+      this.partNumber ? check1 = 1 : check1 = 0
-        this.partNumber ? check1 = 1 : check1 = 0
+      if (this.MaterialsValue !== '' && this.MaterialsValue !== null) {
-        if (this.MaterialsValue !== '' && this.MaterialsValue !== null) {
+        check2 = 1
-          check2 = 1
-        } else {
-          check2 = 0
-        }
-        var param = []
-        param[0] = ['供应商流水号_check', check]
-        param[1] = ['供应商流水号', this.supplierNameValue]
-        param[2] = ['零件图号_check', check1]
-        param[3] = ['零件图号', this.partNumber]
-        param[4] = ['备料状态_check', check2]
-        param[5] = ['备料状态', this.MaterialsValue]
-        param[6] = ['下单时间_check', check3]
-        if (check3 === 0) {
-          param[7] = ['开始时间', '']
-          param[8] = ['结束时间', '']
-        } else {
-          param[7] = ['开始时间', this.dateRange[0]]
-          param[8] = ['结束时间', this.dateRange[1]]
-        }
-        param[9] = ['排序名称', this.ordername]
-        param[10] = ['排序方式', this.order]
-        var Data = this.CreateData('2001', '报表_备料管理_外购备料_综合查询数据', param)
-        this.exportExcel_NPOI(Data)
       } else {
-        this.$message.warning('暂无数据')
+        check2 = 0
       }
+      searchTablesheet(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order).then(res => {
+        console.log(res.data, 11)
+        import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['备料状态', '供应商', '物料编码', '物料名称', '材料', '备料件数', '备料时间', '到货件数', '到货时间', '结算时间']
+          const filterVal = ['备料状态', '供应商名称', '物料编码', '零件名称', '材料', '采购数量', '下单日期', '到货数量', '日期', '开票时间']
+          const list = res.data
+          const data = this.formatJson(filterVal, list)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '外购备料',
+            autoWidth: true,
+            bookType: 'xlsx'
+          })
+        })
+      })
     },
     fetchData() {
       searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
@@ -260,8 +251,6 @@ export default {
         this.ordername = 3
       } else if (column.prop === '下单日期') {
         this.ordername = 4
-      } else if (column.prop === '进程') {
-        this.ordername = 5
       } else {
         this.ordername = ''
       }

src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue

@@ -4,19 +4,21 @@
       <div style="white-space: nowrap">
         <el-card style="width: 1663px">
           <el-col>
-            <el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
+            <span>请款时间段:</span>
             <el-date-picker
               v-model="dateRange"
               :picker-options="pickerOptions"
               size="small"
               type="daterange"
               align="center"
-              style="width: 240px;margin-left: 10px"
+              style="width: 240px;margin: 3px 0"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               range-separator="～"
               start-placeholder="开始日期"
               end-placeholder="结束日期"/>
+            <span style="margin-left: 10px">供应商:</span>
+            <el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
             <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
               <el-button
                 type="primary"
@@ -30,7 +32,7 @@
               <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
-              <el-button type="success" plain class="el-icon-download" size="small" style="margin: 10px 0 10px 130px" @click="exportExcel">导出</el-button>
+              <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 130px" @click="exportExcel">导出</el-button>
             </el-tooltip>
           </el-col>
         </el-card>
@@ -64,7 +66,7 @@
                 {{ scope.row.姓名 }}
               </template>
             </el-table-column>
-            <el-table-column label="请款金额(元)" align="center" min-width="90" width="90" prop="请款金额">
+            <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
               <template slot-scope="scope">
                 {{ parseFloat(scope.row.请款金额).toFixed(2) }}
               </template>
@@ -73,10 +75,10 @@
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</span>
                 <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</span>
-                <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">未通过</span>
+                <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</span>
               </template>
             </el-table-column>
-            <el-table-column label="未通过原因" width="120" align="center">
+            <el-table-column label="未通过审批原因" width="120" align="center">
               <template slot-scope="scope">
                 {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
               </template>
@@ -84,8 +86,8 @@
             <el-table-column label="付款情况" width="100" align="center">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</span>
-                <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已付</span>
+                <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</span>
-                <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">未付</span>
+                <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</span>
               </template>
             </el-table-column>
             <el-table-column label="未付款原因" width="100" align="center">
@@ -118,26 +120,21 @@
         <el-card style="margin-left: 0px;width:524px; margin-left: 1px; display: inline-block;vertical-align: top">
           <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" border class="subTableHeader" size="mini" show-summary style="">
             <el-table-column width="50" align="center" type="index" label="序号"/>
-            <el-table-column width="120" align="center" label="发票号">
+            <el-table-column min-width="120" align="center" label="发票号">
               <template slot-scope="scope">
                 {{ scope.row.发票号 }}
               </template>
             </el-table-column>
-            <el-table-column width="170" align="center" label="供应商" show-overflow-tooltip>
+            <el-table-column min-width="170" align="center" label="供应商" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供应商名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="到票金额(元)" width="90px" prop="到票金额">
+            <el-table-column align="center" label="开票金额" width="100px" prop="开票金额">
               <template slot-scope="scope">
                 {{ scope.row.开票金额.toFixed(2) }}
               </template>
             </el-table-column>
-            <el-table-column label="到票时间" align="center" width="90">
-              <template slot-scope="scope">
-                {{ scope.row.开票时间 | formatTime }}
-              </template>
-            </el-table-column>
           </el-table>
         </el-card>
         <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
@@ -161,12 +158,12 @@
                 {{ scope.row.供应商名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="到票金额(元)" align="center" min-width="90">
+            <el-table-column label="开票金额" align="center" min-width="70">
               <template slot-scope="scope">
                 {{ scope.row.开票金额 }}
               </template>
             </el-table-column>
-            <el-table-column label="到票时间" align="center" min-width="70">
+            <el-table-column label="开票时间" align="center" min-width="70">
               <template slot-scope="scope">
                 {{ scope.row.开票时间 | formatTime }}
               </template>
@@ -283,7 +280,7 @@ export default {
       param[2] = ['结束时间', this.dateRange[1]]
       param[3] = ['供应商名称_check', this.check2]
       param[4] = ['供应商名称', this.supplierName0]
-      var Data = this.CreateData('2001', '报表_备料管理_请款_查询数据', param)
+      var Data = this.CreateData('03', '报表_备料管理_请款_查询数据', param)
       this.exportExcel_NPOI(Data)
     },
     // dateFormat(row, column) {