出库加密

2019-12-13 09:22:03 +08:00
parent 03b3dbbb0f dee8d4b275
commit 7352294237
17 changed files with 747 additions and 117 deletions
--- a/src/api/ManufacturingCenter/ManHourAnalysis.js
+++ b/src/api/ManufacturingCenter/ManHourAnalysis.js
@@ -0,0 +1,14 @@
+import request from '@/utils/request'
+
+// 查询人员总工工时
+export function search1(num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_工时统计_查询数据2',
+      param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5
+    }
+  })
+}
--- a/src/api/ManufacturingCenter/maintainInformation.js
+++ b/src/api/ManufacturingCenter/maintainInformation.js
@@ -117,3 +117,50 @@ export function submit2(num1, num2, num3) {
    }
  })
 }
+export function exportOut(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: `SELECT * 
+            ,case when [FN1] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN1]) else '' end as [姓名1]
+            ,case when [FN2] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN2]) else '' end as [姓名2]
+            ,case when [FN3] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN3]) else '' end as [姓名3]
+            ,case when [FN4] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN4]) else '' end as [姓名4]
+            ,case when [FN5] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN5]) else '' end as [姓名5]
+            ,case when [FN6] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN6]) else '' end as [姓名6]
+            ,case when [FN7] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN7]) else '' end as [姓名7]
+            ,case when [FN8] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN8]) else '' end as [姓名8]
+            ,case when [FN9] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN9]) else '' end as [姓名9]
+            ,case when [FN10] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN10]) else '' end as [姓名10]
+            ,case when [FN11] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN11]) else '' end as [姓名11]
+            ,case when [FN12] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN12]) else '' end as [姓名12]
+            ,case when [FN13] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN13]) else '' end as [姓名13]
+            ,case when [FN14] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN14]) else '' end as [姓名14]
+            ,case when [FN15] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN15]) else '' end as [姓名15]
+            ,case when [FN16] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN16]) else '' end as [姓名16]
+            ,case when [FN17] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN17]) else '' end as [姓名17]
+            ,case when [FN18] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN18]) else '' end as [姓名18]
+            ,case when [FN19] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN19]) else '' end as [姓名19]
+            ,case when [FN20] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN20]) else '' end as [姓名20]
+            ,case when [FN21] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN21]) else '' end as [姓名21]
+            ,case when [FN22] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN22]) else '' end as [姓名22]
+            ,case when [FN23] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN23]) else '' end as [姓名23]
+            ,case when [FN24] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN24]) else '' end as [姓名24]
+            ,case when [FN25] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN25]) else '' end as [姓名25]
+            ,case when [FN26] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN26]) else '' end as [姓名26]
+            ,case when [FN27] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN27]) else '' end as [姓名27]
+            ,case when [FN28] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN28]) else '' end as [姓名28]
+            ,case when [FN29] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN29]) else '' end as [姓名29]
+            ,case when [FN30] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN30]) else '' end as [姓名30]
+            ,case when [FN31] in (select 人员编号 from 人事档案管理_人员名单) then (select 姓名 from 人事档案管理_人员名单 where 人员编号 = [FN31]) else '' end as [姓名31]
+            FROM
+            [基础数据_设备工位点检表] inner join [工位日点检任务记录]
+            on [基础数据_设备工位点检表].工位号 = [工位日点检任务记录].工位号
+            inner join [基础数据_点检内容]
+            on [工位日点检任务记录].点检任务编号 = [基础数据_点检内容].点检任务编号
+            where [基础数据_设备工位点检表].工位号 = '${num1}' and 年 = '${num2}' and 月 = '${num3}' order by [工位日点检任务记录].点检任务编号`
+    }
+  })
+}
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -88,27 +88,27 @@ export function changeNum(num, num1, num2, num3, num4) {
  })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_创建询价单',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&供货商_check=${check8}&供货商=${val11}`,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
 }
 // 查询分配后的基本件
-export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
+export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单',
-      param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&供货商_check=${check8}&供货商=${val11}`,
      Pagination: pageCurrent + '&' + pageSize
    }
  })
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -18,7 +18,7 @@ export function initSupplier11(num) {
    data: {
      type: '3',
      name: ` SELECT distinct 供应商流水号,供应商名称
-              FROM 采购管理_询价单_视图
+              FROM 采购管理_询价单_视图_新
              where  not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and (是否未通过 is null or 是否未通过 <> 1) and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
    }
  })
@@ -30,7 +30,7 @@ export function searchInquirySheet(check2, value2, check3, id, check4, supplier)
    method: 'post',
    data: {
      type: '1',
-      name: '采购管理_询价单_查询数据',
+      name: '采购管理_询价单_查询数据_创建合同',
      param: `询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}`
    }
  })
--- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
+++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js
@@ -26,14 +26,14 @@ export function addMateriel2(num1, num2) {
  })
 }
 // 保存重量和备注
-export function saveWeight(num1, num2, num3, num4, num5, num6, num7) {
+export function saveWeight(num1, num2, num3, num4, num8) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '备料管理_采购计划明细_保存重量和备注_9745',
-      param: `采购计划流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&零件图号=${num5}&材料=${num6}&零件名称=${num7}`
+      param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&采购数量=${num8}`
    }
  })
 }
@@ -124,15 +124,26 @@ export function searchMateriel(num) {
    }
  })
 }
+export function searchMateriel1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '备料管理_采购计划明细_查询数据_新',
+      param: `采购计划流水号=${num}`
+    }
+  })
+}
 // 增加采购计划明细
-export function addMateriel(num1, num2) {
+export function addMateriel(num1, num2, num3) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '2',
      name: '备料管理_采购计划明细_增加数据',
-      param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}`
+      param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}&数量组=${num3}`
    }
  })
 }
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
 export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
 export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
 export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
-export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel
+export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
+export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
  timeout: 1500000 // 请求超时时间
 })
 export default service
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -210,21 +210,9 @@ export default {
    getTableData() {
      this.listLoading1 = true
      this.listLoading2 = true
-      if (this.Machine === '') {
-        this.checkbox_Machine = 0
-      } else {
-        this.checkbox_Machine = 1
-      }
-      if (this.Group === '') {
-        this.checkbox_Group = 0
-      } else {
-        this.checkbox_Group = 1
-      }
-      if (this.number === '') {
-        this.checkbox_number = 0
-      } else {
-        this.checkbox_number = 1
-      }
+      this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
+      this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
+      this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
      this.tableData1 = []
      this.tableData0 = []
      getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
@@ -249,10 +237,13 @@ export default {
    handleSizeChange(val) {
      this.pageCurrent = 1
      this.pageSize = val
+      this.pageCurrent0 = 1
+      this.pageSize0 = val
      this.getTableData()
    },
    handleCurrentChange(val) {
      this.pageCurrent = val
+      this.pageCurrent0 = val
      this.getTableData()
    }
  }
--- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-card v-loading="loading1" style="height: 450px">
+        <span>工时分析</span>
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 170px;margin:0px 10px"
+          type="date"
+          placeholder="选择开始加工日期"/>
+        <span class="demonstration">~</span>
+        <el-date-picker
+          v-model="endTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 170px;margin:0px 10px"
+          type="date"
+          placeholder="选择加工完成日期"/>
+        <el-button size="small" type="success" icon="el-icon-search" @click="search1()">查询</el-button>
+        <div v-if="chart1" id="myChart1" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
+      </el-card>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-card v-loading="loading2" style="height: 450px">
+          <span>工人时间段统计</span>
+          <el-button size="small" type="success" icon="el-icon-search" @click="search2()">查询</el-button>
+          <div v-if="chart2" id="myChart2" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { search1 } from '@/api/ManufacturingCenter/ManHourAnalysis'
+import echarts from 'echarts'
+
+export default {
+  data() {
+    return {
+      startTime: '',
+      endTime: '',
+      chart1: true,
+      res1: [],
+      loading1: false, // 图表1
+      chart2: true,
+      res2: [],
+      loading2: false // 2
+    }
+  },
+  methods: {
+    // 时间段工时
+    search1() {
+      this.chart1 = false
+      this.loading1 = true
+      var check
+      if (this.startTime && this.endTime) { check = 1 } else { check = 0 }
+      search1(0, 0, check, this.startTime, this.endTime).then(response => {
+        this.res1 = response.data
+        this.loading1 = false
+        this.chart1 = true
+      }).then(() => {
+        var myChart1 = echarts.init(document.getElementById('myChart1'))
+        myChart1.clear()
+        this.drawLine1(this.res1)
+      })
+    },
+    drawLine1(data) {
+      var dataX = []
+      var lineData1 = []
+      var lineData2 = []
+      for (let i = 0; i < data.length; i++) {
+        dataX.push(data[i].姓名)
+        lineData1.push(data[i].理论加工时间段)
+        lineData2.push(data[i].实际加工时间段)
+      }
+      var myChart1 = echarts.init(document.getElementById('myChart1'))
+      myChart1.clear()
+      myChart1.setOption({
+        legend: {
+          data: ['理论工时', '实际工时']
+        },
+        grid: {
+          left: '3%',
+          right: '8%',
+          bottom: '3%',
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        xAxis: {
+          type: 'category',
+          name: '姓名',
+          axisLabel: {
+            interval: 0,
+            rotate: 90,
+            margin: 10
+          },
+          data: dataX
+        },
+        yAxis: {
+          type: 'value',
+          name: 'min',
+          min: 0,
+          scale: 'true'
+        },
+        series: [
+          {
+            name: '理论工时',
+            type: 'bar',
+            color: '#67C23A',
+            label: {
+              normal: {
+                show: true,
+                position: 'inside'
+              }
+            },
+            data: lineData1
+          },
+          {
+            name: '实际工时',
+            type: 'bar',
+            color: 'rgb(213,58,53)',
+            label: {
+              normal: {
+                show: true,
+                position: 'top'
+              }
+            },
+            data: lineData2
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
--- a/src/views/ManufacturingCenter/maintainInformation/index.vue
+++ b/src/views/ManufacturingCenter/maintainInformation/index.vue
@@ -1,7 +1,21 @@
 <template>
  <div class="app-container">
    <el-card>
-      <div>设备对应点检类型维护</div>
+      <div>
+        <span style="line-height: 25px">设备对应点检类型维护</span>
+        <div style="float: right;margin: 5px">
+          <el-select v-model="OPnameValue" filterable size="small" placeholder="工位号" style="width: 110px">
+            <el-option
+              v-for="item in OPname"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>选择月份：</span>
+          <el-date-picker v-model="monthssss" size="small" type="month" value-format="yyyy-MM" format="yyyy-MM" style="width: 110px" placeholder="选择月"/>
+          <el-button size="small" type="primary" style="margin-right: 50px" @click="exportOut()">导出日点检表</el-button>
+        </div>
+      </div>
      <el-table v-loading="loading1" :data="tableData1" height="200" highlight-current-row border>
        <el-table-column align="center" label="序号" type="index" width="50"/>
        <el-table-column align="center" label="工位号" width="110">
@@ -103,6 +117,274 @@
        </el-table>
      </el-col>
    </el-card>
+    <el-card v-show="false" style="width: 1565px">
+      <div id="dianjianbiao">
+        <div style="width: 1541px;font-size: 28px;font-weight: bold;text-align: center;">设备保养点检记录表</div>
+        <div>
+          <span style="font-size: 20px;margin-left: 50px">设备名称：</span>
+          <span style="font-size: 20px">{{ 设备名称 }}</span>
+          <span style="font-size: 20px;margin-left: 50px">设备编号：</span>
+          <span style="font-size: 20px">{{ 设备编号 }}</span>
+        </div>
+        <el-table :data="tableData" :resizable="false" style="margin: 5px 0 0 0;width: 1541px" border>
+          <el-table-column :resizable="false" align="center" label="项次" type="index" width="50"/>
+          <el-table-column :resizable="false" align="center" label="日保养项目" width="250">
+            <template slot-scope="scope">
+              {{ scope.row.保养项目 }}
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="1" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F1===1">V</span>
+              <span v-if="scope.row.F1===2">R</span>
+              <span v-if="scope.row.F1===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="2" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F2===1">V</span>
+              <span v-if="scope.row.F2===2">R</span>
+              <span v-if="scope.row.F2===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="3" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F3===1">V</span>
+              <span v-if="scope.row.F3===2">R</span>
+              <span v-if="scope.row.F3===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="4" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F4===1">V</span>
+              <span v-if="scope.row.F4===2">R</span>
+              <span v-if="scope.row.F4===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="5" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F5===1">V</span>
+              <span v-if="scope.row.F5===2">R</span>
+              <span v-if="scope.row.F5===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="6" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F6===1">V</span>
+              <span v-if="scope.row.F6===2">R</span>
+              <span v-if="scope.row.F6===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="7" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F7===1">V</span>
+              <span v-if="scope.row.F7===2">R</span>
+              <span v-if="scope.row.F7===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="8" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F8===1">V</span>
+              <span v-if="scope.row.F8===2">R</span>
+              <span v-if="scope.row.F8===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="9" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F9===1">V</span>
+              <span v-if="scope.row.F9===2">R</span>
+              <span v-if="scope.row.F9===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="10" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F10===1">V</span>
+              <span v-if="scope.row.F10===2">R</span>
+              <span v-if="scope.row.F10===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="11" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F11===1">V</span>
+              <span v-if="scope.row.F11===2">R</span>
+              <span v-if="scope.row.F11===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="12" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F12===1">V</span>
+              <span v-if="scope.row.F12===2">R</span>
+              <span v-if="scope.row.F12===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="13" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F13===1">V</span>
+              <span v-if="scope.row.F13===2">R</span>
+              <span v-if="scope.row.F13===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="14" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F14===1">V</span>
+              <span v-if="scope.row.F14===2">R</span>
+              <span v-if="scope.row.F14===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="15" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F15===1">V</span>
+              <span v-if="scope.row.F15===2">R</span>
+              <span v-if="scope.row.F15===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="16" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F16===1">V</span>
+              <span v-if="scope.row.F16===2">R</span>
+              <span v-if="scope.row.F16===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="17" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F17===1">V</span>
+              <span v-if="scope.row.F17===2">R</span>
+              <span v-if="scope.row.F17===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="18" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F18===1">V</span>
+              <span v-if="scope.row.F18===2">R</span>
+              <span v-if="scope.row.F18===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="19" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F19===1">V</span>
+              <span v-if="scope.row.F19===2">R</span>
+              <span v-if="scope.row.F19===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="20" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F20===1">V</span>
+              <span v-if="scope.row.F20===2">R</span>
+              <span v-if="scope.row.F20===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="21" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F21===1">V</span>
+              <span v-if="scope.row.F21===2">R</span>
+              <span v-if="scope.row.F21===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="21" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F21===1">V</span>
+              <span v-if="scope.row.F21===2">R</span>
+              <span v-if="scope.row.F21===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="23" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F23===1">V</span>
+              <span v-if="scope.row.F23===2">R</span>
+              <span v-if="scope.row.F23===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="24" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F24===1">V</span>
+              <span v-if="scope.row.F24===2">R</span>
+              <span v-if="scope.row.F24===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="25" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F25===1">V</span>
+              <span v-if="scope.row.F25===2">R</span>
+              <span v-if="scope.row.F25===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="26" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F26===1">V</span>
+              <span v-if="scope.row.F26===2">R</span>
+              <span v-if="scope.row.F26===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="27" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F27===1">V</span>
+              <span v-if="scope.row.F27===2">R</span>
+              <span v-if="scope.row.F27===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="28" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F28===1">V</span>
+              <span v-if="scope.row.F28===2">R</span>
+              <span v-if="scope.row.F28===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="29" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F29===1">V</span>
+              <span v-if="scope.row.F29===2">R</span>
+              <span v-if="scope.row.F29===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="30" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F30===1">V</span>
+              <span v-if="scope.row.F30===2">R</span>
+              <span v-if="scope.row.F30===3">X</span>
+            </template>
+          </el-table-column>
+          <el-table-column :resizable="false" align="center" label="31" width="40">
+            <template slot-scope="scope">
+              <span v-if="scope.row.F31===1">V</span>
+              <span v-if="scope.row.F31===2">R</span>
+              <span v-if="scope.row.F31===3">X</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="width: 300px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 80px;">点 检 人（操作工）</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名1 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名2 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名3 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名4 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名5 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名6 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名7 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名8 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名9 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名10 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名11 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名12 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名13 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名14 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名15 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名16 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名17 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名18 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名19 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名20 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名21 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名22 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名23 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名24 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名25 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名26 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名27 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名28 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名29 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名30 : '' }}</div>
+        <div style="width: 40px;height: 80px;border: 1px solid rgb(235,238,245);float: left;text-align: center;line-height: 40px;-webkit-writing-mode: vertical-rl;">{{ tableData[0] ? tableData[0].姓名31 : '' }}</div>
+      </div>
+    </el-card>

    <el-dialog :visible.sync="dialogFormVisible1" title="新增" center width="500px">
      <el-form ref="form1" :model="form1" :rules="rules" label-position="right" label-width="160px">
@@ -139,7 +421,8 @@
 </template>

 <script>
-import { getTableData1, getTableData2, getTableData3, editType, confirmEdit1, confirmEdit2, selectCount, openDelete1, openDelete2, submit1, submit2 } from '@/api/ManufacturingCenter/maintainInformation'
+import { getTableData1, getTableData2, getTableData3, editType, confirmEdit1, confirmEdit2, selectCount, openDelete1, openDelete2, submit1, submit2, exportOut } from '@/api/ManufacturingCenter/maintainInformation'
+import $ from 'jquery'

 export default {
  data() {
@@ -181,7 +464,13 @@ export default {
        点检类型名称: [{ required: true, message: '请输入点检类型名称', trigger: 'blur' }],
        保养项目: [{ required: true, message: '请输入保养项目', trigger: 'blur' }],
        保养周期: [{ required: true, message: '请选择保养周期', trigger: 'change' }]
-      }
+      },
+      OPnameValue: '',
+      OPname: [],
+      monthssss: '',
+      tableData: [],
+      设备名称: '',
+      设备编号: ''
    }
  },
  created() {
@@ -190,9 +479,16 @@ export default {
  },
  methods: {
    getTableData1() {
+      this.OPname = []
      this.tableData1 = []
      this.loading1 = true
      getTableData1().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.OPname.push({
+            label: response.data[i].工位号,
+            value: response.data[i].工位号
+          })
+        }
        this.tableData1 = response.data
        this.loading1 = false
      })
@@ -406,11 +702,59 @@ export default {
          return false
        }
      })
+    },
+    exportOut() {
+      this.tableData = []
+      if (this.OPnameValue) {
+        if (this.monthssss) {
+          var year = this.monthssss.split('-')[0]
+          var month = this.monthssss.split('-')[1]
+          exportOut(this.OPnameValue, year, month).then(response => {
+            if (response.data.length !== 0) {
+              this.设备名称 = response.data[0].设备名称
+              this.设备编号 = response.data[0].设备编号
+              this.tableData = response.data
+            }
+          }).then(() => {
+            if (this.tableData.length !== 0) {
+              this.Out()
+            } else {
+              this.$message.error('暂无该月数据')
+            }
+          })
+        } else {
+          this.$message.error('请选择月份')
+        }
+      } else {
+        this.$message.error('请选择工位')
+      }
+    },
+    Out() {
+      const htmlNode = $('#dianjianbiao').html()
+      const body = $('body')
+      body.children().hide()
+      const printNode = $(htmlNode)
+      body.append(printNode)
+      window.print()
+      body.children().not('script').show()
+      body.children().not('#app').hide()
+      printNode.remove()
    }
  }
 }
 </script>

-<style>
-
+<style lang="scss">
+  #dianjianbiao {
+    /*.el-table td, .el-table th.is-leaf,.el-table--border, .el-table--group{*/
+      /*border-color: black !important;*/
+    /*}*/
+    /*.el-table--border::after, .el-table--group::after, .el-table::before{*/
+      /*background-color: black !important;*/
+    /*}*/
+    /*th {*/
+      /*background: white !important;*/
+      /*color: black !important;*/
+    /*}*/
+  }
 </style>
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -98,7 +98,7 @@
        <!--</el-table-column>-->
        <el-table-column label="应付金额" align="center" min-width="100px">
          <template slot-scope="scope">
-            {{ parseFloat(scope.row.应付总额).toFixed(2) }}
+            {{ scope.row.实际付款时间 === '' ? parseFloat(scope.row.应付总额).toFixed(2) : '-' }}
          </template>
        </el-table-column>
        <el-table-column label="扣款说明" align="center" min-width="120px">
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -47,6 +47,7 @@
              <!--:value="item.value"/>-->
              <!--</el-select>-->
              <el-input v-model="materialName" placeholder="名称规格" size="small" style="width:120px" clearable @keyup.enter.native="searchTable11()"/>
+              <el-input v-model="supplierName" placeholder="供货商" size="small" style="width:120px" clearable/>
              <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
                <el-option
                  v-for="item in machine"
@@ -68,18 +69,17 @@
              <el-tooltip :open-delay="1000" effect="dark" content="开启物料变更" placement="top">
                <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 30px"/>
              </el-tooltip>
-              <!--<el-date-picker-->
-              <!--v-model="startTime"-->
-              <!--size="small"-->
-              <!--type="daterange"-->
-              <!--align="center"-->
-              <!--value-format="yyyy-MM-dd"-->
-              <!--format="yyyy-MM-dd"-->
-              <!--range-separator="～"-->
-              <!--style="width:250px"-->
-              <!--start-placeholder="开始日期"-->
-              <!--end-placeholder="结束日期"-->
-              <!--@change="timeChange1()"/>-->
+              <el-date-picker
+                v-model="startTime"
+                size="small"
+                type="daterange"
+                align="center"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                range-separator="～"
+                style="width:250px"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
              <el-popover v-model="visible1" placement="top" width="140">
                <div style="text-align: right; margin: 0">
                  <el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
@@ -109,7 +109,7 @@
            </el-row>
            <el-row>
              <el-table
-                v-loading=""
+                v-loading="loading"
                :data="tableData11"
                :row-class-name="tableRowClassName"
                border
@@ -263,6 +263,7 @@
              <!--:value="item.value"/>-->
              <!--</el-select>-->
              <el-input v-model="partNum" placeholder="图号名称规格" size="small" clearable @keyup.enter.native="searchTable12()"/>
+              <el-input v-model="supplierName" placeholder="供货商" size="small" style="width:120px" clearable/>
              <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
                <el-option
                  v-for="item in machine"
@@ -280,18 +281,17 @@
              <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable12()">查询</el-button>
              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
-              <!--<el-date-picker-->
-              <!--v-model="endTime"-->
-              <!--size="small"-->
-              <!--type="daterange"-->
-              <!--align="center"-->
-              <!--value-format="yyyy-MM-dd"-->
-              <!--format="yyyy-MM-dd"-->
-              <!--range-separator="～"-->
-              <!--style="width:250px"-->
-              <!--start-placeholder="开始日期"-->
-              <!--end-placeholder="结束日期"-->
-              <!--@change="timeChange2()"/>-->
+              <el-date-picker
+                v-model="endTime"
+                size="small"
+                type="daterange"
+                align="center"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                range-separator="～"
+                style="width:250px"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
              <el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng2()">调整采购任务</el-button>
              <el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
                <el-option
@@ -318,7 +318,7 @@
            </el-row>
            <el-row style="margin-bottom: 10px">
              <el-table
-                v-loading=""
+                v-loading="loading"
                :data="tableData12"
                :row-class-name="tableRowClassName2"
                border
@@ -1090,7 +1090,7 @@
 </template>

 <script>
-import { timeSearch, timeChange1, timeChange2, tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
+import { tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
  createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
  submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge, changeNum } from '@/api/PurchasingCenter/CreateInquirySheet'
 import { mapGetters } from 'vuex'
@@ -1102,8 +1102,9 @@ export default {
  name: '', // 创建询价单
  data() {
    return {
-      startTime: [],
-      endTime: [],
+      startTime: '',
+      endTime: '',
+      loading: false,
      标准件和外购件流水号: [],
      基本件流水号: [],
      visible: false,
@@ -1299,7 +1300,7 @@ export default {
    }
  },
  created() {
-    this.timeSearch()
+    // this.timeSearch()
    this.getPerson()
    this.fetchData()
    this.projectChange()
@@ -1315,13 +1316,13 @@ export default {
    }, 500)
  },
  methods: {
-    timeSearch() {
-      timeSearch().then(response => {
-        this.startTime = [response.data[0].外购件开始时间, response.data[0].外购件结束时间]
-        this.endTime = [response.data[0].基本件开始时间, response.data[0].基本件结束时间]
-        this.searchTable11()
-      })
-    },
+    // timeSearch() {
+    //   timeSearch().then(response => {
+    //     this.startTime = [response.data[0].外购件开始时间, response.data[0].外购件结束时间]
+    //     this.endTime = [response.data[0].基本件开始时间, response.data[0].基本件结束时间]
+    //     this.searchTable11()
+    //   })
+    // },
    changeNumber(row) {
      changeNum(row.物料流水号, row.使用库存数, row.机床流水号, row.组件零件流水号, row.零件数量).then(response => {
        if (response.data[0].result === '1') {
@@ -1356,16 +1357,16 @@ export default {
        }
      })
    },
-    timeChange1() {
-      if (this.startTime) {
-        timeChange1(this.startTime[0], this.startTime[1])
-      }
-    },
-    timeChange2() {
-      if (this.endTime) {
-        timeChange2(this.endTime[0], this.endTime[1])
-      }
-    },
+    // timeChange1() {
+    //   if (this.startTime) {
+    //     timeChange1(this.startTime[0], this.startTime[1])
+    //   }
+    // },
+    // timeChange2() {
+    //   if (this.endTime) {
+    //     timeChange2(this.endTime[0], this.endTime[1])
+    //   }
+    // },
    Jump() {
      window.location.hash = '#PurchasingCenter/CreateInquirySheet'
    },
@@ -1747,15 +1748,17 @@ export default {
      return row['供货商'].trim() === value
    },
    searchTable11() { // 查询外购件列表
-      let check1, check2, check3, check4, check5, check6, check7
+      this.loading = true
+      let check1, check2, check3, check4, check5, check6, check7, check8
      this.materialName ? check1 = 1 : check1 = 0
      this.materialSpec ? check2 = 1 : check2 = 0
      this.materialModel ? check3 = 1 : check3 = 0
-      this.projectValue ? check4 = 1 : check4 = 0
+      this.projectValue ? check4 = 0 : check4 = 0
      this.machineValue ? check5 = 1 : check5 = 0
      this.groupValue ? check6 = 1 : check6 = 0
-      this.startTime ? check7 = 0 : (check7 = 0, this.startTime = '')
-      searchMaterial(this.pageCurrent11, this.pageSize11, 3, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
+      this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
+      this.supplierName ? check8 = 1 : check8 = 0
+      searchMaterial(this.pageCurrent11, this.pageSize11, 3, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1], check8, this.supplierName).then(response => {
        this.tableData11 = response.data.rows
        this.total11 = response.data.total
        const remark = []
@@ -1774,6 +1777,7 @@ export default {
            this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
          }
        })
+        this.loading = false
      })
    },
    handleSizeChange11(val) { // 标准件和外购件列表分页
@@ -1786,15 +1790,17 @@ export default {
      this.searchTable11()
    },
    searchTable12() { // 查询基本件列表
-      let check1, check2, check3, check4, check5, check6, check7
+      this.loading = true
+      let check1, check2, check3, check4, check5, check6, check7, check8
      this.partNum ? check1 = 1 : check1 = 0
      this.partName ? check2 = 1 : check2 = 0
      this.partSpec ? check3 = 1 : check3 = 0
-      this.projectValue ? check4 = 1 : check4 = 0
+      this.projectValue ? check4 = 0 : check4 = 0
      this.machineValue ? check5 = 1 : check5 = 0
      this.groupValue ? check6 = 1 : check6 = 0
-      this.endTime ? check7 = 0 : (check7 = 0, this.endTime = '')
-      searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
+      this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
+      this.supplierName ? check8 = 1 : check8 = 0
+      searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1], check8, this.supplierName).then(response => {
        this.tableData12 = response.data.rows
        this.total12 = response.data.total
        const remark = []
@@ -1809,6 +1815,7 @@ export default {
            this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
          }
        })
+        this.loading = false
      })
    },
    handleSizeChange12(val) { // 基本件列表分页
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -56,7 +56,7 @@
        <el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" placeholder="其他说明" type="textarea" rows="1" @blur="contractHeaderChange"/>
      </el-row>

-      <el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
+      <el-table v-loading="loading" :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
        <el-table-column label="序号" align="center" width="50" type="index"/>
        <el-table-column label="机床图号" align="center" min-width="100">
          <template slot-scope="scope">
@@ -152,7 +152,7 @@
      <div v-show="false">{{ content }}</div>
      <!--富文本编辑器-->
      <div v-show="!preview" id="tinymce" style="height:850px;">
-        <tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto"/>
+        <tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;pointer-events: none"/>
      </div>
      <!--网页预览-->
      <div v-show="preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
@@ -174,6 +174,7 @@ export default {
  data() {
    return {
      isShowN: false,
+      loading: false,
      supplierValue11: '', // 供应商查询条件
      supplier11: [],
      quickChangePrice: true,
@@ -463,6 +464,7 @@ export default {
      }
    },
    contractChange() { // 选择合同select
+      this.loading = true
      searchContractHeader(this.contractNumValue).then(response => {
        this.deliveryDate = response.data[0].交货日期
        this.invoiceInfo = response.data[0].开票信息
@@ -515,6 +517,7 @@ export default {
            备注: response.data[i].备注
          })
        }
+        this.loading = false
      })
    },
    demoChange() { // 模板change
--- a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue
+++ b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue
@@ -19,11 +19,51 @@
        value-format="yyyy-MM-dd"
        format="yyyy-MM-dd"
        placeholder="选择日期"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData1()">查询</el-button>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="getTableData()">查询</el-button>
    </el-card>
    <el-card>
      <div id="myChart" style="width: 1000px; height: 570px; margin: auto"/>
    </el-card>
+    <el-card style="width: 650px">
+      <el-table
+        :data="tableData"
+        highlight-current-row
+        border
+        stripe
+        size="mini"
+        style="width: 100%"
+        height="460">
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column
+          label="采购合同编号"
+          align="center"
+          width="140px">
+          <template slot-scope="scope">{{ scope.row.采购合同编号 }}</template>
+        </el-table-column>
+        <el-table-column
+          label="采购用时"
+          align="center"
+          width="80px">
+          <template slot-scope="scope">{{ scope.row.平均采购时间 }}</template>
+        </el-table-column>
+        <el-table-column
+          label="平均分配日期"
+          width="170"
+          align="center">
+          <template slot-scope="scope">{{ scope.row.平均分配日期 }}</template>
+        </el-table-column>
+        <el-table-column
+          label="合同生成日期"
+          align="center"
+          width="170">
+          <template slot-scope="scope">{{ scope.row.合同生成日期 }}</template>
+        </el-table-column>
+      </el-table>
+    </el-card>
  </div>
 </template>

@@ -33,28 +73,26 @@ export default {
  data() {
    return {
      tableData: [],
-      data1: '',
-      data2: ''
+      date1: '',
+      date2: ''
    }
  },
-  mounted() {},
  methods: {
-    getTableData() {
+    async getTableData() {
      this.tableData = []
      getData(this.date1, this.date2).then(response => {
        for (let i = 0; i < response.data.length; i++) {
          this.tableData.push({
            采购合同流水号: response.data[i].采购合同流水号,
            采购合同编号: response.data[i].采购合同编号,
-            合同生成日期: response.data[i].操作日期,
+            合同生成日期: response.data[i].操作时间,
            平均分配日期: '',
            平均采购时间: ''
          })
        }
        this.getTableData1(this.tableData)
-      }).then(() => {
-        this.drawLine()
      })
+      setTimeout(this.drawLine, 2000)
    },
    getTableData1(row) {
      for (let i = 0; i < row.length; i++) {
@@ -70,8 +108,9 @@ export default {
      const xData = []
      const lineData = []
      for (let i = 0; i < this.tableData.length; i++) {
-        xData.push(this.tableData[i].采购合同编号.split(' ')[0])
-        lineData.push(this.tableData[i].平均采购时间.toFixed(2))
+        console.log(this.tableData[i].采购合同编号)
+        xData.push(this.tableData[i].采购合同编号)
+        lineData.push(this.tableData[i].平均采购时间)
      }
      myChart.clear()
      myChart.setOption({
@@ -94,13 +133,17 @@ export default {
            data: xData,
            axisPointer: {
              type: 'shadow'
+            },
+            axisLabel: {
+              interval: 0,
+              rotate: 40
            }
          }
        ],
        yAxis: [
          {
            type: 'value',
-            name: '采购用时'
+            name: '采购用时(H)'
          }
        ],
        series: [
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -165,9 +165,9 @@
            {{ scope.row.材料 }}
          </template>
        </el-table-column>
-        <el-table-column label="数量" align="center" width="50">
+        <el-table-column label="数量" align="center" width="115">
          <template slot-scope="scope">
-            {{ scope.row.总数量 }}
+            <el-input-number :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.采购数量" :min="0" size="mini" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
          </template>
        </el-table-column>
        <el-table-column label="成品尺寸（长、宽、高）" align="center" min-width="120px">
@@ -284,7 +284,7 @@
            <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">
+          <tr v-for="(list, index) in tableData4" :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>
@@ -302,7 +302,7 @@
 </template>

 <script>
-import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, addPurchaseOrder, searchSupplier, editPurchaseOrder, deletePurchaseOrder, searchMateriel,
+import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, addPurchaseOrder, searchSupplier, editPurchaseOrder, deletePurchaseOrder, searchMateriel, searchMateriel1,
  addMateriel, deleteMateriel, saveMateriel, saveMateriel1, searchRawMaterial, addMateriel2, saveWeight, edit2 } from '@/api/WorkshopProcurement/CreatingPurchasingMaterials'
 import QRCode from 'qrcode'
 import $ from 'jquery'
@@ -386,6 +386,7 @@ export default {
      },
      tableData3: [],
      materielGroup: [], // 工艺计划流水号组
+      partNum: [], // 默认采购数量
      partGroup: [], // 采购计划明细流水号组
      unit: [], // 单位组
      Remarks: [], // 备注组
@@ -439,6 +440,9 @@ export default {
            this.searchTable1()
            this.searchRawMaterial()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('选入失败') }
@@ -452,10 +456,10 @@ export default {
      }
    },
    saveWeight(index, row) {
-      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
+      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
    },
    saveMoney(index, row) {
-      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
+      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
      // var reg = /^[0-9]*$/
      // if (!reg.test(row.单价)) {
      //   this.$message.error('请输入正确的单价')
@@ -464,7 +468,7 @@ export default {
      // }
    },
    saveRemarks(index, row) {
-      saveWeight(row.采购计划流水号, row.成品尺寸, row.备注1, row.单位, row.零件图号, row.材料, row.零件名称)
+      saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位, row.采购数量)
    },
    // ///////////////////////////////////////////////////////////////////////////////////////0529新加↑
    useqrcode(contractNum) {
@@ -512,8 +516,10 @@ export default {
    },
    handleSelectionChange(val) {
      this.materielGroup = []
+      this.partNum = []
      for (let i = 0; i < val.length; i++) {
        this.materielGroup.push(val[i].工艺计划流水号)
+        this.partNum.push(val[i].批次数量)
      }
    },
    searchTable2() { // 查询采购单列表
@@ -594,6 +600,9 @@ export default {
            this.$message.success('删除成功')
            this.searchTable2()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('数据占用，删除失败') }
@@ -614,7 +623,11 @@ export default {
      this.计划完成日期 = row.计划完成日期.split(' ')[0]
      this.下单日期 = row.下单日期.split(' ')[0]
      searchMateriel(this.purchasingOrderNumber).then(response => {
+        this.tableData4 = response.data
+      })
+      searchMateriel1(this.purchasingOrderNumber).then(response => {
        this.tableData3 = response.data
+        console.log(response.data)
      })
    },
    addMateriel() { // 将材料选入请购单
@@ -623,11 +636,14 @@ export default {
      } else if (this.materielGroup.length === 0) {
        this.$message.warning('请勾选物料')
      } else {
-        addMateriel(this.purchasingOrderNumber, this.materielGroup).then(response => {
+        addMateriel(this.purchasingOrderNumber, this.materielGroup, this.partNum).then(response => {
          if (response.data[0].result === '1') {
            this.$message.success('选入成功')
            this.searchTable1()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('选入失败') }
@@ -665,6 +681,9 @@ export default {
            this.$message.success('保存成功')
            this.searchTable2()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('保存失败') }
@@ -682,6 +701,9 @@ export default {
            this.$message.success('移除成功')
            this.searchTable1()
            searchMateriel(this.purchasingOrderNumber).then(response => {
+              this.tableData4 = response.data
+            })
+            searchMateriel1(this.purchasingOrderNumber).then(response => {
              this.tableData3 = response.data
            })
          } else { this.$message.error('移除失败') }
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -333,7 +333,7 @@
              </el-table-column>
              <el-table-column label="备料件数" align="center" width="70px">
                <template slot-scope="scope">
-                  {{ scope.row.批次数量 }}
+                  {{ scope.row.采购数量 }}
                </template>
              </el-table-column>
              <el-table-column label="已到件数" align="center" width="70px">
@@ -343,7 +343,7 @@
              </el-table-column>
              <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:90px" @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="110px" prop="到货重量">
@@ -460,7 +460,7 @@
        </el-table-column>
        <el-table-column label="备料件数" align="center" width="70px">
          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.采购数量 }}
          </template>
        </el-table-column>
        <el-table-column label="已到件数" align="center" width="70px">
@@ -470,7 +470,7 @@
        </el-table-column>
        <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:90px" @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="110px">
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -74,7 +74,7 @@
        </el-table-column>
        <el-table-column label="备料件数" align="center" width="70">
          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.采购数量 }}
          </template>
        </el-table-column>
        <el-table-column label="备料时间" align="center" width="100">
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -92,7 +92,7 @@
        <el-table-column label="操作" align="center" min-width="100px">
          <template slot-scope="scope">
            <el-button type="warning" plain size="mini" @click="exportTable()">打印</el-button>
-            <el-button type="danger" plain size="mini" @click="Disable(scope.row)">禁用</el-button>
+            <el-button type="danger" plain size="mini" @click="Disable(scope.row)">打回</el-button>
          </template>
        </el-table-column>
      </el-table>