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

src/api/Inventory/PurchaseInRecord.js

@@ -11,7 +11,7 @@ export function initMachineProject() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_项目名称_查询数据'
+      name: '采购管理_仓库采购_入库记录_机床图号_查询'
     }
   })
 }
@@ -24,7 +24,7 @@ export function searchGroup(num) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_组件名称_查询数据',
+      name: '采购管理_仓库采购_入库记录_组件名称_查询',
       param: '机床流水号=' + num
     }
   })

src/api/Inventory/PurchaseOutRecord.js

@@ -11,7 +11,8 @@ export function initMachineProject() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_项目名称_查询数据'
+      // name: 'PDM_项目名称_查询数据'
+      name: '采购管理_仓库采购_出库记录_机床图号_查询'
     }
   })
 }
@@ -24,7 +25,8 @@ export function searchGroup(num) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_组件名称_查询数据',
+      // name: 'PDM_组件名称_查询数据',
+      name: '采购管理_仓库采购_出库记录_组件名称_查询',
       param: '机床流水号=' + num
     }
   })

src/api/ManufacturingCenter/PartAssignment.js

@@ -11,7 +11,8 @@ export function initProject() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_项目名称_查询数据'
+      // name: 'PDM_项目名称_查询数据'
+      name: '制造中心_制造_零件分配_机床编号_查询'
     }
   })
 }
@@ -38,7 +39,7 @@ export function searchgroup(num) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: 'PDM_组件名称_查询数据',
+      name: '制造中心_制造_零件分配_组号_查询',
       param: '机床流水号=' + num
     }
   })

src/api/ManufacturingCenter/ProcessingStatusNew.js

@@ -176,3 +176,28 @@ export function submit2(num, num1, num2) {
     }
   })
 }
+export function submitEdit3(num, num1, num2, num3, num4) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '车间生产管理工艺_修补完成数量_增加数据',
+      param: `工序流水号=${num}&操作者编号=${num1}&完成数量=${num2}&修补工时=${num3}&完成时间=${num4}`
+    }
+  })
+}
+export function getPerson_Form3() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_追溯加工过程_操作者查询'
+    }
+  })
+}

src/api/WorkshopProcurement/RequestOutsourcingMaterials.js

@@ -87,3 +87,4 @@ export function cancelRequestFund(num) {
     }
   })
 }
+

src/styles/sidebar.scss

@@ -1,6 +1,7 @@
 #app {
   // 主体区域
   .main-container {
+    min-width: 1380px;
     min-height: 100%;
     transition: margin-left .28s;
     margin-left: 200px;

src/views/Assembly/SparePartsOutStockRecord/index.vue

@@ -22,46 +22,58 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <span style="margin-left: 10px">零件图号:</span>
-        <el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 150px" size="small" clearable/>
+        <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="startTime"
+          v-model="dateRange"
-          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
           size="small"
-          style="width: 130px"
+          type="daterange"
-          type="date"
+          align="center"
-          placeholder="选择日期"/>
+          style="width: 240px;margin: 3px 0"
-        <span class="demonstration">~</span>
-        <el-date-picker
-          v-model="endTime"
           value-format="yyyy-MM-dd"
-          size="small"
+          format="yyyy-MM-dd"
-          style="width: 130px"
+          range-separator="～"
-          type="date"
+          start-placeholder="开始日期"
-          placeholder="选择日期"/>
+          end-placeholder="结束日期"/>
+        <!--<el-date-picker-->
+        <!--v-model="startTime"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="small"-->
+        <!--style="width: 130px"-->
+        <!--type="date"-->
+        <!--placeholder="选择日期"/>-->
+        <!--<span class="demonstration">~</span>-->
+        <!--<el-date-picker-->
+        <!--v-model="endTime"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="small"-->
+        <!--style="width: 130px"-->
+        <!--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: 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: 700px;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="180" show-overflow-tooltip>
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" prop="零件图号" align="center" width="233" sortable="custom" show-overflow-tooltip>
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" prop="零件名称" align="center" width="150" sortable="custom" show-overflow-tooltip>
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="140" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -93,6 +105,35 @@ import { initProject, searchgroup, selecttable } from '@/api/Assembly/SpareParts
 export default {
   data() {
     return {
+      dateRange: '',
+      expands: [],
+      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])
+          }
+        }]
+      },
       PartDrawingNumber: '',
       startTime: '',
       endTime: '',
@@ -164,9 +205,9 @@ export default {
       if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
       if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
       if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) { this.check3 = 1 } else { this.check3 = 0 }
-      if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
+      this.dateRange ? this.startTime_check = 1 : (this.startTime_check = 0, this.dateRange = '')
-      if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      this.dateRange ? this.endTime_check = 1 : (this.endTime_check = 0, this.dateRange = '')
-      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.dateRange[0], this.endTime_check, this.dateRange[1], this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
         this.tableData1 = response.data.rows
         this.loading = false
         this.total = response.data.total

src/views/Inventory/PurchaseInRecord/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 900px;margin: 0px 0px 5px 0px">
+    <el-card style="width: 950px;margin: 0px 0px 5px 0px">
       <el-row style="margin-bottom:10px;margin-top: 10px">
-        <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 150px" @change="machineChange">
+        <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 180px" @change="machineChange">
           <el-option
             v-for="item in machine"
             :key="item.value"
@@ -12,20 +12,30 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="groupValue" style="width:150px;margin-left: 10px" placeholder="组号" size="small" clearable filterable>
+        <el-select v-model="groupValue" style="width:90px;margin-left: 10px" placeholder="组号" size="small" clearable filterable>
           <el-option
             v-for="item in group"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="name" placeholder="名称图号规格" style="width:150px;margin-left: 10px" clearable size="small" @keyup.enter.native="searchRecord()"/>
+        <el-input v-model="name" placeholder="名称图号规格入库人" style="width:165px;margin-left: 10px" clearable size="small" @keyup.enter.native="searchRecord()"/>
         <!--<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />-->
         <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
-        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="searchRecord()">查询</el-button>
+        <el-date-picker
-        <el-button type="success" plain size="small" @click="exportExcel()">导出</el-button>
+          v-model="inTime"
+          type="daterange"
+          size="small"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          range-separator=""
+          style="width:240px;margin-left: 10px"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="searchRecord()">查询</el-button>
+        <el-button type="success" icon="el-icon-bottom" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
       </el-row>
-      <el-row v-show="false" style="margin-bottom:10px">
+      <el-row v-show="false" style="margin-left:10px">
         <el-date-picker
           v-model="inTime"
           type="daterange"
@@ -38,19 +48,19 @@
           end-placeholder="结束时间"/>
       </el-row>
     </el-card>
-    <el-card style="width: 900px">
+    <el-card style="width: 950px">
       <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="700">
-        <el-table-column label="名称" prop="名称" align="center" min-width="100" show-overflow-tooltip>
+        <el-table-column label="名称" prop="名称" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" prop="图号或型号" align="center" min-width="120" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="图号或型号" align="center" width="260" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" prop="规格" align="center" min-width="180" show-overflow-tooltip>
+        <el-table-column label="规格" prop="规格" align="center" width="220" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
@@ -65,7 +75,7 @@
             {{ scope.row.入库人 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库时间" prop="入库时间" align="center" width="145">
+        <el-table-column label="入库时间" prop="入库时间" align="center" width="90">
           <template slot-scope="scope">
             {{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '-' }}
           </template>
@@ -92,6 +102,7 @@ export default {
   name: 'PurchaseInRecord',
   data() {
     return {
+      date: [],
       machineValue: '',
       machine: [],
       groupValue: '',
@@ -106,6 +117,11 @@ export default {
       total1: 0
     }
   },
+  watch: {
+    groupValue() {
+      this.searchRecord()
+    }
+  },
   created() {
     this.fetchData()
   },
@@ -164,6 +180,9 @@ export default {
             label: response.data[i].组号
           })
         }
+        if (response.data.length > 0) {
+          this.groupValue = this.group[0].value
+        }
       })
     },
     searchRecord() {
@@ -172,6 +191,7 @@ export default {
       this.searchRecord1()
     },
     searchRecord1() {
+      console.log(111111)
       let check1, check2, check3, check4, check5, check6, check7
       this.projectValue ? check1 = 1 : check1 = 0
       this.machineValue ? check2 = 1 : check2 = 0
@@ -180,6 +200,8 @@ export default {
       this.spec ? check5 = 1 : check5 = 0
       this.model ? check6 = 1 : check6 = 0
       this.inTime ? check7 = 1 : (check7 = 0, this.inTime = '')
+      this.tableData = ''
+      this.total1 = 0
       searchRecord1(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.inTime[0], this.inTime[1], this.pageCurrent1, this.pageSize1).then(res => {
         this.tableData1 = res.data.rows
         this.total1 = res.data.total

src/views/Inventory/PurchaseOutRecord/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 900px;margin: 0px 0px 5px 0px">
+    <el-card style="width: 950px;margin: 0px 0px 5px 0px">
       <el-row style="margin-bottom:10px;margin-top: 10px">
-        <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 150px" @change="machineChange">
+        <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 180px" @change="machineChange">
           <el-option
             v-for="item in machine"
             :key="item.value"
@@ -12,18 +12,28 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="groupValue" placeholder="组号" size="small" style="width: 150px;margin-left: 10px" clearable filterable>
+        <el-select v-model="groupValue" placeholder="组号" size="small" style="width: 90px;margin-left: 10px" clearable filterable>
           <el-option
             v-for="item in group"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="name" placeholder="名称图号规格" clearable size="small" style="width:150px;margin-left: 10px" @keyup.enter.native="pageCurrent1=1;pageSize1=100;searchRecord()"/>
+        <el-input v-model="name" placeholder="名称图号规格领料人" clearable size="small" style="width:165px;margin-left: 10px" @keyup.enter.native="pageCurrent1=1;pageSize1=100;searchRecord()"/>
         <!--<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />-->
         <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
-        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
+        <el-date-picker
-        <el-button type="success" plain size="small" @click="exportExcel()">导出</el-button>
+          v-model="outTime"
+          type="daterange"
+          size="small"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          range-separator="~"
+          style="width:240px;margin-left: 10px"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
+        <el-button type="success" icon="el-icon-bottom" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
       </el-row>
       <el-row v-show="false" style="margin-bottom:10px">
         <el-date-picker
@@ -38,19 +48,19 @@
           end-placeholder="结束时间"/>
       </el-row>
     </el-card>
-    <el-card style="width: 900px">
+    <el-card style="width: 950px">
-      <el-table :data="tableData" border stripe size="mini" style="width: 100%;" width="100%" height="700">
+      <el-table :data="tableData" border stripe size="mini" height="700">
-        <el-table-column label="名称" align="center" min-width="160" show-overflow-tooltip>
+        <el-table-column label="名称" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="160" show-overflow-tooltip>
+        <el-table-column label="图号或型号" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="160" show-overflow-tooltip>
+        <el-table-column label="规格" align="center" width="270" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
@@ -65,7 +75,7 @@
             {{ scope.row.领料人 }}
           </template>
         </el-table-column>
-        <el-table-column label="出库时间" align="center" width="145">
+        <el-table-column label="出库时间" align="center" width="90">
           <template slot-scope="scope">
             {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
           </template>
@@ -108,6 +118,11 @@ export default {
       outTime: '' // 出库时间
     }
   },
+  watch: {
+    groupValue() {
+      this.searchRecord()
+    }
+  },
   created() {
     this.fetchData()
   },
@@ -125,7 +140,7 @@ export default {
       this.name ? check4 = 1 : check4 = 0
       this.spec ? check5 = 1 : check5 = 0
       this.model ? check6 = 1 : check6 = 0
-      this.inTime ? check7 = 1 : (check7 = 0, this.inTime = '')
+      this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
       var param = []
       param[0] = ['项目流水号_check', check1]
       param[1] = ['项目流水号', this.projectValue]
@@ -139,9 +154,9 @@ export default {
       param[9] = ['规格', this.spec]
       param[10] = ['图号或型号_check', check6]
       param[11] = ['图号或型号', this.model]
-      param[12] = ['入库时间_check', check7]
+      param[12] = ['出库时间_check', check7]
-      param[13] = ['入库开始时间', this.inTime[0]]
+      param[13] = ['出库开始时间', this.outTime[0]]
-      param[14] = ['入库结束时间', this.inTime[1]]
+      param[14] = ['出库结束时间', this.outTime[1]]
       var Data = this.CreateData('00', '报表_采购部仓库_出库记录_查询', param)
       this.exportExcel_NPOI(Data)
     },
@@ -166,6 +181,9 @@ export default {
             label: response.data[i].组号
           })
         }
+        if (response.data.length > 0) {
+          this.groupValue = this.group[0].value
+        }
       })
     },
     searchRecord() {
@@ -177,7 +195,8 @@ export default {
       this.spec ? check5 = 1 : check5 = 0
       this.model ? check6 = 1 : check6 = 0
       this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
-      console.log(this.outTime, 999)
+      this.tableData = []
+      this.total1 = 0
       searchRecord(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.outTime[0], this.outTime[1], this.pageCurrent1, this.pageSize1).then(res => {
         this.tableData = res.data.rows
         this.total1 = res.data.total

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -1,35 +1,39 @@
 <template>
   <div>
-    <el-card>
+    <div style="width: 1900px;overflow:auto">
-      <el-row>
+      <div style="white-space: nowrap">
-        <span>零件图号:</span>
+        <el-card>
-        <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
+          <el-row>
-        <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
+            <span>零件图号:</span>
-        <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
+            <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px;margin: 3px 0"/>
-          <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
+            <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
-        </el-tooltip>
+            <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
-        <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
+              <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
-        <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
+            </el-tooltip>
-          <el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
+            <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
-        </el-tooltip>
+            <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
-        <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
+              <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
-          <el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
+            </el-tooltip>
-        </el-tooltip>
+            <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
-        <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
+              <el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:10px" @click="edit('BL')">分配自家备料</el-button>
-          <el-button type="distribution" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
+            </el-tooltip>
-        </el-tooltip>
+            <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
-        <el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
+              <el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
-          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
+            </el-tooltip>
-        </el-tooltip>
+            <el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
-      </el-row>
+              <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 3px 0px 0 170px" @click="exportExcel">导出</el-button>
-    </el-card>
+            </el-tooltip>
-
+          </el-row>
+        </el-card>
+      </div>
+    </div>
     <el-card>
       <el-table
         v-loading="loading"
         :data="tableData"
+        :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
         height="760"
-        style="width: 1408px; margin: 3px 0"
+        style="width: 1110px; margin: 3px 0"
         size="mini"
         border
         stripe
@@ -43,30 +47,30 @@
           type="selection"
           width="50"
           align="center"/>
-        <el-table-column label="备料分配" prop="备料分配" align="center" width="90">
+        <el-table-column label="进程" prop="备料分配" align="center" width="70">
           <template slot-scope="scope">
             <span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</span>
             <span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</span>
             <span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</span>
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
+        <el-table-column label="零件名称" prop="零件名称" align="center" width="140px" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
+        <el-table-column label="零件图号" prop="零件图号" align="center" width="180px" sortable="custom" show-overflow-tooltip>
           <!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" width="60">
+        <el-table-column label="数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="材料" align="center" width="120" show-overflow-tooltip>
+        <el-table-column label="材料" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.材料 }}
           </template>
@@ -76,19 +80,19 @@
             {{ scope.row.重量 }}
           </template>
         </el-table-column>
-        <el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip>
+        <el-table-column label="工艺要求" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
-        <el-table-column label="备料任务接受时间" align="center" width="140" show-overflow-tooltip>
+        <el-table-column label="接收时间" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.备料任务接受时间 }}
+            {{ scope.row.备料任务接受时间 | formatTime }}
           </template>
         </el-table-column>
-        <el-table-column label="备料任务分配时间" align="center" width="140" show-overflow-tooltip>
+        <el-table-column label="分配时间" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.备料任务分配时间 }}
+            {{ scope.row.备料任务分配时间 | formatTime }}
           </template>
         </el-table-column>
       </el-table>
@@ -327,4 +331,21 @@ export default {
 <style scoped>
 
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
 

src/views/ManufacturingCenter/EquipmentMonitoring/index.vue

@@ -532,49 +532,76 @@
             </el-row>
           </div>
         </el-tooltip>
-        <el-tooltip :id="机床总装" placement="bottom" @mouseover.native.prevent="changeActive($event)">
+        <div :id="机床总装" placement="bottom" @mouseover.native.prevent="changeActive($event)">
-          <div slot="content" style="max-height: 200px;overflow: auto" v-html="returns1"/>
+          <!--          <div slot="content" style="max-height: 200px;overflow: auto" v-html="returns1"/>-->
-          <div :title="tooltip" style="position: relative;left:520px;top:-1280px; width: 100px;height: 28px;">
+          <div style="max-height: 200px;overflow: auto"/>
+          <!--          <div :title="tooltip" style="position: relative;left:520px;top:-1280px; width: 100px;height: 28px;">-->
+          <div style="position: relative;left:520px;top:-1280px; width: 100px;height: 28px;">
             <el-row>
               <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 机床总装 }}</div>
             </el-row>
           </div>
-        </el-tooltip>
+        </div>
-        <el-tooltip :id="部件装配" placement="bottom" @mouseover.native.prevent="changeActive($event)">
+        <div :id="部件装配" placement="bottom" @mouseover.native.prevent="changeActive($event)">
-          <div slot="content" style="max-height: 200px;overflow: auto" v-html="returns2"/>
+          <!--          <div slot="content" style="max-height: 200px;overflow: auto" v-html="returns2"/>-->
-          <div :title="tooltip" style="position: relative;left:660px;top:-1308px; width: 100px;height: 28px;">
+          <div style="max-height: 200px;overflow: auto"/>
+          <!--          <div :title="tooltip" style="position: relative;left:660px;top:-1308px; width: 100px;height: 28px;">-->
+          <div style="position: relative;left:660px;top:-1308px; width: 100px;height: 28px;">
             <el-row>
               <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 部件装配 }}</div>
             </el-row>
           </div>
-        </el-tooltip>
+        </div>
       </div>
-      <el-card style="position: absolute;background: #ffffff;margin-top: -825px;margin-left: 1540px;height: 130px;width: 120px">
+      <!--      <el-card style="position: absolute;background: #ffffff;margin-top: -825px;margin-left: 1540px;height: 130px;width: 120px">-->
-        <div style="margin-top: 6px">
+      <!--        <div style="margin-top: 6px">-->
-          <div class="circle4" style="margin-top: 3px"/>
+      <!--          <div class="circle4" style="margin-top: 3px"/>-->
-          <el-tooltip>
+      <!--          <el-tooltip>-->
-            <div slot="content">设备开机<br>电流计正常工作<br>工控机关机</div>
+      <!--            <div slot="content">设备开机<br>电流计正常工作<br>工控机关机</div>-->
-            <span style="margin-left: 5px">电脑关机</span>
+      <!--            <span style="margin-left: 5px">电脑关机</span>-->
-          </el-tooltip>
+      <!--          </el-tooltip>-->
-        </div>
+      <!--        </div>-->
-        <div style="margin-top: 6px">
+      <!--        <div style="margin-top: 6px">-->
-          <div class="circle" style="margin-top: 3px"/>
+      <!--          <div class="circle" style="margin-top: 3px"/>-->
-          <span style="margin-left: 5px">设备开机</span>
+      <!--          <span style="margin-left: 5px">设备开机</span>-->
-        </div>
+      <!--        </div>-->
-        <div style="margin-top: 6px">
+      <!--        <div style="margin-top: 6px">-->
-          <div class="circle1" style="margin-top: 3px"/>
+      <!--          <div class="circle1" style="margin-top: 3px"/>-->
-          <span style="margin-left: 5px">设备工作</span>
+      <!--          <span style="margin-left: 5px">设备工作</span>-->
-        </div>
+      <!--        </div>-->
-        <div style="margin-top: 6px">
+      <!--        <div style="margin-top: 6px">-->
-          <div class="circle2" style="margin-top: 3px"/>
+      <!--          <div class="circle2" style="margin-top: 3px"/>-->
-          <span style="margin-left: 5px">设备关机</span>
+      <!--          <span style="margin-left: 5px">设备关机</span>-->
-        </div>
+      <!--        </div>-->
-        <div style="margin-top: 6px">
+      <!--        <div style="margin-top: 6px">-->
-          <div class="circle3" style="margin-top: 3px"/>
+      <!--          <div class="circle3" style="margin-top: 3px"/>-->
-          <span style="margin-left: 5px">电流计故障</span>
+      <!--          <span style="margin-left: 5px">电流计故障</span>-->
-        </div>
+      <!--        </div>-->
-      </el-card>
+      <!--      </el-card>-->
     </el-card>
+    <div style="position: absolute;margin-top: -610px;margin-left: 490px;height: 350px;width: 124px;background-color: transparent">
+      <el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData1" style="width: 433px; text-align: center" size="mini">
+        <el-table-column label="总装机床" align="center" width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="position: absolute;margin-top: -610px;margin-left: 625px;background-color: transparent">
+      <el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData2" max-height="365" style="width: 156px;text-align: center" size="mini">
+        <el-table-column label="总装机床" align="left" width="150" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}&nbsp;&nbsp;&nbsp;&nbsp;{{ scope.row.任务名称 }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="任务名称" align="left" width="70" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.任务名称 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+      </el-table>
+    </div>
   </div>
 </template>
 
@@ -586,6 +613,8 @@ import { mapGetters } from 'vuex' // 暂无用
 export default {
   data() {
     return {
+      tableData1: '',
+      tableData2: '',
       returns1: '',
       returns2: '',
       fang: '_fang',
@@ -668,6 +697,12 @@ export default {
     this.connect()
     // this.getwork_state()
     this.getOP_state()
+    getZongzhuang().then(res2 => {
+      this.tableData1 = res2.data
+    })
+    getBuzhuang().then(res3 => {
+      this.tableData2 = res3.data
+    })
     // this.timer = setInterval(this.getwork_state, 60 * 1000) // 工位状态 60秒 一刷新
   },
   beforeDestroy() {
@@ -711,7 +746,7 @@ export default {
     },
     // 工位电流值
     // 1停机灰色 2开机黄色 3运行绿色 4报警红色
-    // 0 电流计故障 蓝闪 1 设备关机 灰闪 2 设备开机 黄闪 3 设备工作 绿闪 10断网或电脑关机 灰色
+    // 0 电流计故障 蓝 1 设备关机 灰 2 设备开机 黄 3 设备工作 绿 10断网或电脑关机 透明
     getOP_state() {
       getOP_state().then(response => {
         for (let i = 0; i < response.data.length; i++) {
@@ -720,31 +755,31 @@ export default {
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle4')
-            $('#' + response.data[i].工位号 + '_circle').addClass('circle1') // 黄色闪
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle1') // 黄色
           } else if (response.data[i].状态代码 === '3') {
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle4')
-            $('#' + response.data[i].工位号 + '_circle').addClass('circle') // 绿色闪
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle') // 绿色
           } else if (response.data[i].状态代码 === '0') {
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle4')
-            $('#' + response.data[i].工位号 + '_circle').addClass('circle3') // 蓝色闪
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle3') // 蓝色
           } else if (response.data[i].状态代码 === '1') {
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle4')
-            $('#' + response.data[i].工位号 + '_circle').addClass('circle2') // 灰色闪
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle2') // 灰色
           } else {
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle3')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle1')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle')
             $('#' + response.data[i].工位号 + '_circle').removeClass('circle2')
-            $('#' + response.data[i].工位号 + '_circle').addClass('circle4') // 灰色
+            $('#' + response.data[i].工位号 + '_circle').addClass('circle4') // 灰色圈
           }
         }
       })
@@ -759,6 +794,7 @@ export default {
         this.returns2 = ''
         if ($event.path[2].id === '机床总装') {
           getZongzhuang().then(res2 => {
+            // this.tableData1 = res2.data
             if (res2.data.length !== 0) {
               this.returns1 = '<div slot="content">总装机床：<br>'
               for (let i = 0; i < res2.data.length; i++) {
@@ -771,6 +807,7 @@ export default {
           })
         } else if ($event.path[2].id === '部件装配') {
           getBuzhuang().then(res3 => {
+            this.tableData2 = res3.data
             if (res3.data.length !== 0) {
               this.returns2 = '<div slot="content">部件装配：<br>'
               for (let i = 0; i < res3.data.length; i++) {
@@ -848,7 +885,19 @@ export default {
               this.tooltip3 = '加工零件：' + response.data[0].零件图号_零件工艺计划
             }
             getOP_state2($event.path[2].id).then(res => {
-              if (res.data[0].状态代码 === '1') { this.tooltip2 = '设备状态：关机' } else if (res.data[0].状态代码 === '2') { this.tooltip2 = '设备状态：等待' } else if (res.data[0].状态代码 === '3') { this.tooltip2 = '设备状态：运行' } else if (res.data[0].状态代码 === '4') { this.tooltip2 = '设备状态：报警' }
+              if (res.data[0].状态代码 === '0') {
+                this.tooltip2 = '设备状态：设备报警'
+              } else if (res.data[0].状态代码 === '1') {
+                this.tooltip2 = '设备状态：关机'
+              } else if (res.data[0].状态代码 === '2') {
+                this.tooltip2 = '设备状态：等待'
+              } else if (res.data[0].状态代码 === '3') {
+                this.tooltip2 = '设备状态：运行'
+              } else if (res.data[0].状态代码 === '4') {
+                this.tooltip2 = '设备状态：报警'
+              } else if (res.data[0].状态代码 === '10') {
+                this.tooltip2 = '设备状态：工位电脑关闭'
+              }
             })
           })
         }
@@ -960,7 +1009,7 @@ export default {
     background-size:100% 100%;-moz-background-size:100% 100%;
     overflow: hidden;
   }
-  /*绿色闪*/
+  /*绿色*/
   .circle{
     float: left;
     width: 10px;
@@ -969,9 +1018,9 @@ export default {
     border-radius: 50%;
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
-    background: url('../../../assets/img/greenTwinkle.gif');
+    /*background: url('../../../assets/img/greenTwinkle.gif');*/
   }
-   /*黄色闪*/
+   /*黄色*/
   .circle1{
     float: left;
     width: 10px;
@@ -980,9 +1029,9 @@ export default {
     border-radius: 50%;
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
-    background: url('../../../assets/img/yellowTwinkle.gif');
+    /*background: url('../../../assets/img/yellowTwinkle.gif');*/
   }
-  /*灰色闪*/
+  /*灰色*/
   .circle2{
     float: left;
     width: 10px;
@@ -991,25 +1040,26 @@ export default {
     border-radius: 50%;
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
-    background: url('../../../assets/img/grayTwinkle.gif');
+    /*background: url('../../../assets/img/grayTwinkle.gif');*/
   }
-  /*蓝色闪*/
+  /*红色*/
   .circle3{
     float: left;
     width: 10px;
     height: 10px;
-    background-color:dodgerblue;
+    background-color:red;
     border-radius: 50%;
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
-    background: url('../../../assets/img/blueTwinkle.gif');
+    /*background: url('../../../assets/img/blueTwinkle.gif');*/
   }
-  /*灰色*/
+  /*灰色圈*/
   .circle4{
     float: left;
     width: 10px;
     height: 10px;
-    background-color:gray;
+    border:2px solid gray;
+    background-color:transparent;
     border-radius: 50%;
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
@@ -1027,3 +1077,71 @@ export default {
     background-color:#FFBB00 ;
   }
 </style>
+<style lang="scss">
+  /* 滚动条 */
+  .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    background: rgb(42,118,206);
+    width: 1px;
+    border: none;
+    border-radius:4px;
+  }
+  .el-table__body-wrapper::-webkit-scrollbar {
+    color: rgb(42,118,206);
+    width: 4px;
+  }
+  /* 滚动条 */
+  .el-table td, .el-table th.is-leaf {
+    border: 0px solid #EBEEF5;
+  }
+  .el-table--border, .el-table--group {
+     border: 0px solid #EBEEF5;
+  }
+  .el-table::before {
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    /* height: 1px; */
+  }
+  .el-table tbody tr:hover>td {
+    background-color:transparent!important
+  }
+  .el-table{
+    /* 表格字体颜色 */
+    color:black;
+    /* 表格边框颜色 */
+    /* border: 0.5px solid #758a99; */
+    height: 500px;
+    background: transparent;
+  }
+  /* 表格内背景颜色 */
+  .el-table th, .el-table tr,.el-table td{
+    border: 0;
+    background-color: transparent;
+  }
+  /* 双数行背景颜色 */
+  .el-table--striped .el-table__body tr.el-table__row--striped td {
+
+    background-color: transparent;
+    background-color: rgba(148, 144, 144, 0.3)
+  }
+  /* 使表格背景透明 */
+  .el-table th, .el-table tr {
+    background-color: transparent;
+  }
+  /* 删除表格下横线 */
+  .el-table::before {
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 0px;
+  }
+  /* 表格表头字体颜色 */
+  .el-table thead {
+    color: white;
+    font-weight: 500;
+    background-color: rgba(148, 144, 144, 0.3)
+  }
+  .el-table--enable-row-hover .el-table__body tr:hover>td{
+    background-color: transparent !important;
+  }
+</style>

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -10,7 +10,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="机床号" style="margin-top:28px">
-            <el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床号" @change="typeChange1()">
+            <el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床号" @change="typeChange1()">
               <el-option
                 v-for="item in toolNum"
                 :key="item.value"
@@ -22,7 +22,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="分组">
-            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组" @change="total = 0;pageSize = 10;pageList = 1;getTable()">
+            <el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="分组" @change="total = 0;pageSize = 10;pageList = 1;getTable()">
               <el-option
                 v-for="item in Num"
                 :key="item.value"

src/views/ManufacturingCenter/InventoryQuery/index.vue

@@ -6,18 +6,18 @@
           <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
           <!--          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
           <!--          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
-          <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 20px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
-          <el-button type="success" plain size="small" @click="exportExcel()">导出</el-button>
+          <el-button type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
           <!--          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
         </el-row>
       </div>
-      <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 639px" size="mini">
+      <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">
         <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="240" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="物料型号" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>

src/views/ManufacturingCenter/MaterialArrival/index.vue

@@ -1,116 +1,120 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <div style="width: 100%;overflow:auto">
-      <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
+      <div style="white-space: nowrap">
-        <el-option
+        <el-card style="width: 1455px">
-          v-for="item in Machines"
+          <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
-          :key="item.value"
+            <el-option
-          :label="item.label"
+              v-for="item in Machines"
-          :value="item.value">
+              :key="item.value"
-          <div style="float: left">{{ item.label }}</div>
+              :label="item.label"
-          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+              :value="item.value">
-        </el-option>
+              <div style="float: left">{{ item.label }}</div>
-      </el-select>
+              <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
-      <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
+            </el-option>
-        <el-option
+          </el-select>
-          v-for="item in Groups"
+          <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
-          :key="item.value"
+            <el-option
-          :label="item.label"
+              v-for="item in Groups"
-          :value="item.value"/>
+              :key="item.value"
-      </el-select>
+              :label="item.label"
-      <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
+              :value="item.value"/>
-      <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
+          </el-select>
-      <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
+          <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
-    </el-card>
+          <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-    <el-row>
+          <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
-      <el-card style="width: 50%; float: left">
+        </el-card>
-        <el-table
+        <el-row>
-          :data="tableData"
+          <el-card style="width: 850px; margin-left: 0px;display: inline-block;" >
-          loading="loading"
+            <el-table
-          class="table"
+              :data="tableData"
-          highlight-current-row
+              loading="loading"
-          border
+              class="table"
-          stripe
+              highlight-current-row
-          height="750"
+              border
-          style="width: 100%"
+              stripe
-          @current-change="getCurrentRow">
+              height="750"
-          <el-table-column align="center" type="index" label="序号" width="50"/>
+              style="width: 100%"
-          <el-table-column align="center" label="机床号" show-overflow-tooltip width="120">
+              @current-change="getCurrentRow">
-            <template slot-scope="scope">
+              <el-table-column align="center" type="index" label="序号" width="50"/>
-              {{ scope.row.机床图号 }}
+              <el-table-column align="center" label="机床号" show-overflow-tooltip width="120">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.机床图号 }}
-          <el-table-column align="center" label="组号" show-overflow-tooltip width="120">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.组号 }}
+              <el-table-column align="center" label="组号" show-overflow-tooltip width="120">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.组号 }}
-          <el-table-column align="center" label="零件图号" show-overflow-tooltip min-width="190">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.零件图号 }}
+              <el-table-column align="center" label="零件图号" show-overflow-tooltip min-width="190">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.零件图号 }}
-          <el-table-column align="center" label="零件名称" show-overflow-tooltip width="140">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.零件名称 }}
+              <el-table-column align="center" label="零件名称" show-overflow-tooltip width="140">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.零件名称 }}
-          <el-table-column align="center" label="数量" width="80">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.投产数量 }}
+              <el-table-column align="center" label="数量" width="80">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.投产数量 }}
-          <el-table-column align="center" label="加工完成" width="110">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.完成日期 }}
+              <el-table-column align="center" label="加工完成" width="110">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.完成日期 }}
-        </el-table>
+                </template>
-        <div class="block">
+              </el-table-column>
-          <el-pagination
+            </el-table>
-            :current-page="pageCurrent"
+            <div class="block">
-            :page-sizes="[50, 200, 300, 400]"
+              <el-pagination
-            :page-size="pageSize"
+                :current-page="pageCurrent"
-            :total="total"
+                :page-sizes="[50, 200, 300, 400]"
-            layout="total, sizes, prev, pager, next, jumper"
+                :page-size="pageSize"
-            @size-change="handleSizeChange"
+                :total="total"
-            @current-change="handleCurrentChange"/>
+                layout="total, sizes, prev, pager, next, jumper"
-        </div>
+                @size-change="handleSizeChange"
-      </el-card>
+                @current-change="handleCurrentChange"/>
-      <el-card style="width: 34.5%; float: left">
+            </div>
-        <el-table
+          </el-card>
-          :data="tableData1"
+          <el-card style="width: 600px; margin-left: 1px;display: inline-block;vertical-align: top;">
-          loading="loading"
+            <el-table
-          class="table"
+              :data="tableData1"
-          style="max-height: 830px"
+              loading="loading"
-          highlight-current-row
+              class="table"
-          empty-text="   "
+              style="max-height: 830px"
-          border
+              highlight-current-row
-          @row-click="getRow">
+              empty-text="   "
-          <el-table-column type="index" label="序号" width="50"/>
+              border
-          <el-table-column align="center" label="工艺名" min-width="100">
+              @row-click="getRow">
-            <template slot-scope="scope">
+              <el-table-column type="index" label="序号" width="50"/>
-              {{ scope.row.工艺名称 }}
+              <el-table-column align="center" label="工艺名" min-width="100">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.工艺名称 }}
-          <el-table-column align="center" label="操作者" show-overflow-tooltip min-width="90">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.操作者 }}
+              <el-table-column align="center" label="操作者" show-overflow-tooltip min-width="90">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.操作者 }}
-          <el-table-column align="center" label="排产日期" min-width="110">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.排产日期 }}
+              <el-table-column align="center" label="排产日期" min-width="110">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.排产日期 }}
-          <el-table-column align="center" label="完成日期" min-width="110">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.完成日期 }}
+              <el-table-column align="center" label="完成日期" min-width="110">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.完成日期 }}
-        </el-table>
+                </template>
-      </el-card>
+              </el-table-column>
-    </el-row>
+            </el-table>
+          </el-card>
+        </el-row>
+      </div>
+    </div>
   </div>
 </template>
 

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
-    <el-card style="padding-top: 10px">
+    <el-card style="padding-top: 5px;">
       <el-row>
         <!--        <span>机床编号:</span>-->
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床图号" size="small" style="margin:0px;width: 180px" clearable @change="machineChange">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -14,14 +14,14 @@
           </el-option>
         </el-select>
         <!--        <span>组号:</span>-->
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable @change="searchTable">
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin-left: 10px;width: 90px" size="small" clearable>
           <el-option
             v-for="item in groupNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 50px">三表下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
+        <span style="margin-left: 20px">任务下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
         <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>-->
         <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchPart()">查询1</el-button>-->
         <el-badge :value="value1" :max="99" class="item">
@@ -61,22 +61,22 @@
     <!--        </el-table-column>-->
     <!--      </el-table>-->
     <!--    </el-card>-->
-    <el-card>
+    <el-card style="">
       <el-tabs type="border-card" @tab-click="selectPart">
         <el-tab-pane label="基本件">
-          <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
+          <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1140px" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
-            <el-table-column label="零件名称" align="center" width="120px">
+            <el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip>
               <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="120px" show-overflow-tooltip>
               <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="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.前零件图号 }}
               </template>
@@ -113,13 +113,13 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="100px">
               <template slot-scope="scope">
-                <el-button type="danger" size="mini" icon="el-icon-delete" plain @click="OutParts(scope.row)">移出</el-button>
+                <el-button type="danger" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="外购件">
-          <el-table :data="tableData2" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
+          <el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
             <el-table-column label="物料代码" align="center" width="120">
               <template slot-scope="scope">
@@ -169,7 +169,7 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="标准件">
-          <el-table :data="tableData3" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
+          <el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
             <el-table-column label="物料代码" align="center" width="120">
               <template slot-scope="scope">
@@ -219,38 +219,41 @@
           </el-table>
         </el-tab-pane>
       </el-tabs>
-      <span>交货期：</span>
+      <el-card style="padding: 3px">
-      <el-date-picker
+        <span>交货期：</span>
-        v-model="time"
+        <el-date-picker
-        size="small"
+          v-model="time"
-        type="date"
+          size="small"
-        format="yyyy-MM-dd"
+          type="date"
-        value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
-        placeholder="选择日期"/>
+          value-format="yyyy-MM-dd"
-      <span style="font-weight: bold">制造:</span>
+          placeholder="选择日期"/>
-      <el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
+        <span style="font-weight: bold">制造:</span>
-        <el-button type="primary" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
-      </el-tooltip>
+          <el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
-      <span style="margin-left: 40px;font-weight: bold">金工:</span>
+        </el-tooltip>
-      <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
+        <span style="margin-left: 40px;font-weight: bold">金工:</span>
-        <el-button type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
-      </el-tooltip>
+          <el-button type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
-      <span style="margin-left: 40px;font-weight: bold">采购:</span>
+        </el-tooltip>
-      <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
+        <span style="margin-left: 40px;font-weight: bold">采购:</span>
-        <el-button type="success" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
-      </el-tooltip>
+          <el-button type="success" size="small" icon="el-icon-shopping-cart-full" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
+        </el-tooltip>
+      </el-card>
     </el-card>
-    <el-card>
+    <el-card style="padding: 3px;">
       <el-row>
         <!--        <span>请购单号：</span>-->
         <el-input v-model="PurchaseOrder" size="small" style="width: 155px" placeholder="请购单号" clearable/>
-        <el-button type="primary" size="mini" style="margin-left: 10px" plain @click="searchTable1()">查询</el-button>
+        <el-button icon="el-icon-search" type="primary" size="mini" style="margin-left: 10px" plain @click="searchTable1()">查询</el-button>
-        <el-button type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">新增</el-button>
+        <el-button icon="el-icon-circle-plus-outline" type="warning" size="mini" style="margin-left: 10px" plain @click="handleAdd()">新增</el-button>
-        <el-button type="danger" size="mini" style="margin-left: 10px" plain @click="handleDelete()">删除</el-button>
+        <el-button icon="el-icon-edit-outline" type="danger" size="mini" style="margin-left: 10px" plain @click="handleDelete()">删除</el-button>
+        <el-button icon="el-icon-bottom" type="success" plain size="mini" @click="exportExcel()">导出</el-button>
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 400px">
+      <el-col style="width: 400px;">
         <el-card>
           <el-table :data="tableData4" stripe border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
             <el-table-column label="请购单号" show-overflow-tooltip align="center" width="120px">
@@ -273,7 +276,7 @@
                 {{ scope.row.请购时间 }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center" width="107px">
+            <el-table-column label="备注" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
@@ -287,9 +290,9 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 920px;margin-left: 10px">
+      <el-col style="width: 985px;margin-left: 0px">
         <el-card>
-          <el-table :data="tableData6" stripe border size="mini" style="width: 100%" height="300px">
+          <el-table :data="tableData6" border size="mini" height="300px">
             <el-table-column label="序号" type="index" align="center" width="50px"/>
             <el-table-column label="零件名称" show-overflow-tooltip align="center" width="90px">
               <template slot-scope="scope">
@@ -306,17 +309,17 @@
                 {{ scope.row.规格或材料 }}
               </template>
             </el-table-column>
-            <el-table-column label="数量" align="center" width="50px">
+            <el-table-column label="数量" show-overflow-tooltip align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件类型" align="center" width="70px">
+            <el-table-column label="零件类型" show-overflow-tooltip align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.零件类型 }}
               </template>
             </el-table-column>
-            <el-table-column label="交货期" align="center" width="90px">
+            <el-table-column label="交货期" show-overflow-tooltip align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.物料计划到货时间 }}
               </template>
@@ -326,17 +329,17 @@
             <!--                {{ scope.row.项目名称 }}-->
             <!--              </template>-->
             <!--            </el-table-column>-->
-            <el-table-column label="机床编号" align="center" width="90px">
+            <el-table-column label="机床图号" show-overflow-tooltip align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="组号" align="center" width="50px">
+            <el-table-column label="组号" show-overflow-tooltip align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center" width="100px">
+            <el-table-column label="备注" show-overflow-tooltip align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
@@ -672,6 +675,9 @@ export default {
           _this.DeliveryTime = ''
         }
       }
+    },
+    groupNumberValue() {
+      this.searchTable()
     }
   },
   created() {
@@ -679,6 +685,16 @@ export default {
     this.fetchData()
   },
   methods: {
+    // EXCEL 导出
+    // 姜福壮
+    exportExcel() {
+      if (this.RequisitionList !== '') {
+        var param = []
+        param[0] = ['请购单流水号', this.RequisitionList]
+        var Data = this.CreateData('00', '报表_制造中心-制造_零件分配_查询', param)
+        this.exportExcel_NPOI(Data)
+      }
+    },
     fetchData() {
       if (Cookie.get('machineValue') !== undefined) {
         this.machineNumber = []
@@ -871,6 +887,9 @@ export default {
             value: response.data[i].组件流水号
           })
         }
+        if (response.data.length > 0) {
+          this.groupNumberValue = this.groupNumber[0].value
+        }
       })
     },
     // 三表下达时间查询
@@ -1531,7 +1550,7 @@ export default {
   }
   .item {
     float: right;
-    margin-top: 10px;
+    margin-top: 5px;
     margin-right: 40px;
   }
 </style>

src/views/ManufacturingCenter/ProcessingStatusNew/index.vue

@@ -1,8 +1,7 @@
 <template>
-  <div class="app-container">
+  <div>
     <el-card>
       <!--<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>-->
-      <el-button :disabled="isDisabled" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditConfirmNum">修改完成数量</el-button>
       <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
         <el-option
           v-for="item in Machines"
@@ -23,6 +22,8 @@
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
       <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
       <el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+      <!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
+      <el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>
     </el-card>
     <el-row>
       <el-col style="width: 37%">
@@ -74,6 +75,7 @@
       <el-col style="width: 63%">
         <el-card>
           <el-table
+            ref="singleTable"
             :data="tableData"
             :row-class-name="tableRowClassName"
             loading="loading"
@@ -82,11 +84,11 @@
             border
             height="630"
             @row-click="getCurrentRow">
-            <el-table-column type="index" align="center" label="跟单号" width="140">
+            <!--<el-table-column type="index" align="center" label="跟单号" width="140">-->
-              <template slot-scope="scope">
+            <!--<template slot-scope="scope">-->
-                <el-radio :label="scope.row.跟单号" v-model="radio"/>
+            <!--<el-radio :label="scope.row.跟单号" v-model="radio"/>-->
-              </template>
+            <!--</template>-->
-            </el-table-column>
+            <!--</el-table-column>-->
             <el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
@@ -231,16 +233,52 @@
         <el-button type="primary" @click="submit2('form')" >确定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible3" title="修补加工工时" center style="min-height: 300px" width="400px">
+      <el-form ref="form3" :model="form3" :rules="rules2" label-position="left" label-width="90px" class="demo-ruleForm">
+        <el-row width="200px">
+          <el-form-item label="操作员" prop="人员" >
+            <el-select v-model="form3.人员" filterable style="width: 80%" size="small" placeholder="无">
+              <el-option
+                v-for="item in person_Form3"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="完成数量" prop="完成数量" >
+            <el-input-number v-model="form3.完成数量" :min="0" :max="批次数量" size="small" style="width: 80%"/>
+          </el-form-item>
+          <el-form-item label="修补工时" prop="修补工时" >
+            <el-input v-model="form3.修补工时" placeholder="修补工时" size="small" style="width: 80%" />
+          </el-form-item>
+          <el-form-item label="完成日期" prop="完成时间">
+            <el-date-picker
+              v-model="form3.完成时间"
+              style="width: 80%"
+              size="small"
+              type="date"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              placeholder="选择日期"/>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible3=false">取消</el-button>
+        <el-button type="primary" @click="submit3('form3')" >确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8, submitEdit, getExport, searchWorkTime, submit2 } from '@/api/ManufacturingCenter/ProcessingStatusNew'
+import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8, submitEdit, getExport, searchWorkTime, submit2, submitEdit3, getPerson_Form3 } from '@/api/ManufacturingCenter/ProcessingStatusNew'
-import Cookie from 'js-cookie'
 
 export default {
   data() {
     return {
+      index: -1,
       Machine: '', // 机床号
       Machines: [],
       Group: '', // 组号
@@ -289,14 +327,117 @@ export default {
         数量: ''
       },
       操作者: [],
-      max: 0
+      max: 0,
+      // new 20200213修补加工工时↓
+      dialogFormVisible3: false,
+      person_Form3: [],
+      form3: {
+        人员: '',
+        完成数量: '',
+        修补工时: '',
+        完成时间: ''
+      },
+      rules2: {
+        人员: [{ required: true, message: '请选择操作员', trigger: 'change' }],
+        完成时间: [{ required: true, message: '请选择实际完成时间', trigger: 'change' }],
+        修补工时: [{ required: true, message: '请输入修补工时', trigger: 'blur' }],
+        完成数量: [{ required: true, message: '请输入完成数量', trigger: 'blur' }]
+      },
+      批次数量: 0
     }
   },
   created() {
     this.getMachine()
     this.getTable9()
+    var _this = this
+    document.onkeydown = function(e) {
+      if (event.keyCode === 37 || event.keyCode === 38) {
+        _this.click_Up()
+      }
+      if (event.keyCode === 39 || event.keyCode === 40) {
+        _this.click_Down()
+      }
+    }
   },
   methods: {
+    click_Up() {
+      if (this.index === -1) {
+        console.log(-1)
+      } else {
+        this.index = this.index - 1
+        console.log(this.index)
+        this.$refs.singleTable.setCurrentRow(this.tableData[this.index])
+        this.批次数量 = this.tableData[this.index].批次数量
+        this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
+      }
+    },
+    click_Down() {
+      if (this.index === -1) {
+        console.log(-1)
+      } else {
+        this.index = this.index + 1
+        console.log(this.index)
+        this.$refs.singleTable.setCurrentRow(this.tableData[this.index])
+        this.批次数量 = this.tableData[this.index].批次数量
+        this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
+      }
+    },
+    getCurrentRow_Click(row) {
+      this.isDisabled = true
+      this.completeTime = ''
+      this.dateOfProduction = ''
+      this.processSerialNumber = ''
+      this.tableData1 = []
+      gettabledata1(row).then(response => {
+        if (response.data.length !== 0) {
+          for (let i = 0; i < response.data.length; i++) {
+            this.tableData1.push({
+              工艺名称: response.data[i].工艺名称,
+              序间质检: response.data[i].质检结果,
+              排产日期: response.data[i].排产时间 ? response.data[i].排产时间.split(' ')[0] : '',
+              完成日期: response.data[i].工序完成日期 ? response.data[i].工序完成日期.split(' ')[0] : '',
+              操作者: response.data[i].操作者,
+              不合格数量: response.data[i].不合格数量,
+              质检数量: response.data[i].数量,
+              工序流水号: response.data[i].工序流水号,
+              工序状态: response.data[i].工序状态,
+              完成数量: response.data[i].完成数量
+            })
+          }
+        }
+      })
+    },
+    EditWorkingHours() {
+      if (this.$refs['form3'] !== undefined) {
+        this.$refs['form3'].resetFields()
+      }
+      this.getPerson_Form3()
+      this.dialogFormVisible3 = true
+    },
+    getPerson_Form3() {
+      this.person_Form3 = []
+      getPerson_Form3().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person_Form3.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      }).then(() => {
+        this.form3.人员 = this.person_Form3[0].value
+      })
+    },
+    submit3() {
+      submitEdit3(this.processSerialNumber, this.form3.人员, this.form3.完成数量, this.form3.修补工时, this.form3.完成时间).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('补录成功')
+        } else {
+          this.$message.error('补录失败')
+        }
+      })
+      this.dialogFormVisible3 = false
+      this.getCurrentRow_Click(this.tableData[this.index].工艺计划流水号)
+    },
     EditConfirmNum() {
       this.form2.数量 = 0
       this.操作者 = []
@@ -345,7 +486,6 @@ export default {
         return
       }
       getExport(this.Machine).then(res => {
-        console.log(res.data)
         import('@/vendor/Export2Excel').then(excel => {
           const tHeader = ['机床', '组号', '图号及规格', '制品名称', '计划数', '材料', '当前工序名']
           const filterVal = ['机床图号', '组号', '零件图号', '零件名称', '投产数量', '材料', '工艺名称']
@@ -362,50 +502,20 @@ export default {
       })
     },
     getMachine() {
-      if (Cookie.get('machineValue') !== undefined) {
+      this.Machine = ''
-        this.Machine = ''
+      this.Machines = []
-        this.Machines = []
+      this.Group = ''
-        this.Group = ''
+      this.Groups = []
-        this.Groups = []
+      getMachines().then(response => {
-        getMachines().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
-          for (let i = 0; i < response.data.length; i++) {
+          this.Machines.push({
-            this.Machines.push({
+            label: response.data[i].机床图号,
-              label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
-              value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
-              value2: response.data[i].项目名称
+          })
-            })
+        }
-          }
+      })
-          if (Cookie.get('group') !== undefined) {
+    },
-            this.Machine = parseInt(Cookie.get('machineValue'))
-            this.getGroup()
-            this.getTableData()
-            this.Group = parseInt(Cookie.get('group'))
-            // this.getTableData()
-            Cookie.remove('machineValue')
-            Cookie.remove('group')
-          } else {
-            // this.getTableData()
-            Cookie.remove('machineValue')
-            Cookie.remove('group')
-          }
-        })
-      } else {
-        this.Machine = ''
-        this.Machines = []
-        this.Group = ''
-        this.Groups = []
-        getMachines().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.Machines.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号,
-              value2: response.data[i].项目名称
-            })
-          }
-        })
-        this.getTableData()
-      }
-    }, // 获取组号
     getGroup() {
       this.Group = ''
       this.Groups = []
@@ -464,15 +574,16 @@ export default {
     },
     // 获取工序表
     getCurrentRow(row) {
+      this.批次数量 = row.批次数量
+      this.index = row.index
+      this.row2 = row.工艺计划流水号
       this.isDisabled = true
       this.completeTime = ''
       this.dateOfProduction = ''
       this.processSerialNumber = ''
       this.radio = true
       this.tableData1 = []
-      this.row2 = row.工艺计划流水号
       gettabledata1(this.row2).then(response => {
-        console.log(response.data)
         if (response.data.length !== 0) {
           for (let i = 0; i < response.data.length; i++) {
             this.tableData1.push({

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -1,87 +1,86 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="padding: 3px">
-      <span>设备名称:</span>
+      <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 0px"/>
-      <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
       <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
-      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
       <el-tooltip effect="dark" content="添加新设备" placement="top">
-        <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
         <!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
       </el-tooltip>
-      <span style="margin-left: 40px">有效时间：</span>
+      <!--      <span style="margin-left: 40px">有效时间：</span>-->
-      <el-date-picker
+      <!--      <el-date-picker-->
-        v-model="time"
+      <!--        v-model="time"-->
-        type="date"
+      <!--        type="date"-->
-        size="small"
+      <!--        size="small"-->
-        value-format="yyyy-MM-dd"
+      <!--        value-format="yyyy-MM-dd"-->
-        placeholder="选择日期"/>
+      <!--        placeholder="选择日期"/>-->
-      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
+      <!--      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
-        <!--<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>-->
+      <!--        &lt;!&ndash;<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>&ndash;&gt;-->
-        <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>
+      <!--        <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>-->
-      </el-tooltip>
+      <!--      </el-tooltip>-->
-      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
+      <!--      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
-        <!--<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>-->
+      <!--        &lt;!&ndash;<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>&ndash;&gt;-->
-        <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
+      <!--        <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
-      </el-tooltip>
+      <!--      </el-tooltip>-->
     </el-card>
 
     <el-card>
-      <el-table :data="List" border size="small" stripe highlight-current-row height="700px">
+      <el-table :data="List" border size="small" stripe highlight-current-row height="700px" style="width: 570px">
-        <el-table-column label="设备名称" prop="设备名称" align="center" >
+        <el-table-column label="设备名称" prop="设备名称" align="center" width="120px" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="设备编号" prop="设备编号" align="center" >
+        <el-table-column label="设备编号" prop="设备编号" align="center" width="120px" >
           <template slot-scope="scope">
             {{ scope.row.设备编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="设备型号" rop="设备型号" align="center" >
+        <el-table-column label="设备型号" rop="设备型号" align="center" width="120px" >
           <template slot-scope="scope">
             {{ scope.row.设备型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="设备性能指标" align="center" >
+        <!--        <el-table-column label="设备性能指标" align="center" >-->
-          <template slot-scope="scope">
+        <!--          <template slot-scope="scope">-->
-            {{ scope.row.设备性能指标 }}
+        <!--            {{ scope.row.设备性能指标 }}-->
-          </template>
+        <!--          </template>-->
-        </el-table-column>
+        <!--        </el-table-column>-->
-        <el-table-column label="设备加工能力" align="center" >
+        <!--        <el-table-column label="设备加工能力" align="center" >-->
-          <template slot-scope="scope">p
+        <!--          <template slot-scope="scope">p-->
-            {{ scope.row.设备加工能力工时 }}
+        <!--            {{ scope.row.设备加工能力工时 }}-->
-          </template>
+        <!--          </template>-->
-        </el-table-column>
+        <!--        </el-table-column>-->
-        <el-table-column label="设备加工工艺" align="center" >
+        <el-table-column label="设备加工工艺" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.工艺属性 }}
           </template>
         </el-table-column>
-        <el-table-column label="班次类型" align="center" >
+        <!--        <el-table-column label="班次类型" align="center" >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.班次类型 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="设备工时系数" align="center" >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.设备工时系数 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="整改工时系数" align="center" >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.整改工时比例 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="预留工时系数" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.设备预留工时系数 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" align="center" width="70px">
           <template slot-scope="scope">
-            {{ scope.row.班次类型 }}
+            <el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:5px" @click="handleEdit(scope.row)"/>
-          </template>
+            <el-button type="text" size="mini" icon="el-icon-delete" style="margin-left:5px" @click="handleDelete(scope.row)"/>
-        </el-table-column>
-        <el-table-column label="设备工时系数" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.设备工时系数 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="整改工时系数" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.整改工时比例 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="预留工时系数" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.设备预留工时系数 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="100px" fixed="right" >
-          <template slot-scope="scope">
-            <el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)"/>
-            <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -144,7 +143,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="title!=='增加'">
+        <el-row v-show="false">
           <el-col :span = "12">
             <el-form-item label="设备加工能力" prop="设备加工能力" >
               <el-input v-model="form.设备加工能力" placeholder="设备加工能力" size="small" style="width:200px" clearable />
@@ -156,7 +155,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="title!=='增加'">
+        <el-row v-show="false">
           <el-col :span = "12">
             <el-form-item label="班次类型" prop="班次类型" >
               <el-select v-model="form.班次类型" placeholder="班次类型" size="small" style="width:200px" clearable >
@@ -174,7 +173,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="title!=='增加'">
+        <el-row v-show="false">
           <el-col :span = "12">
             <el-form-item label="整改工时系数" prop="整改工时系数" >
               <el-input v-model="form.整改工时系数" placeholder="整改工时系数" size="small" style="width:200px" clearable />
@@ -296,7 +295,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-      this.title = row.设备名称
+      this.title = '编辑'
       this.dialogFormVisible = true
       this.form.设备名称 = row.设备名称
       this.form.设备编号 = row.设备编号
@@ -311,6 +310,7 @@ export default {
       this.equipmentSerialNumber = row.设备流水号
     },
     submit(formName) {
+      console.log(this.title)
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.title === '增加') {
@@ -343,12 +343,13 @@ export default {
     },
     ADD() {
       this.addForm('form')
-      this.dialogFormVisible1 = true
+      this.dialogFormVisible = true
       this.form.contractSigningDate = getNowTime()// new Date()
       this.temp = 1
-      this.title = '新增项目'
+      this.title = '增加'
     },
     submitEdit() {
+      console.log(2323)
       editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
         if (response.data[0].result === '1') {
           this.$notify({
@@ -435,4 +436,20 @@ export default {
   /*  color: #ff9759;*/
   /*}*/
 </style>
-
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>

src/views/MarketingCenter/CreateProject/index.vue

@@ -1,55 +1,54 @@
 <template>
   <div>
-    <el-card>
+    <el-card style="padding: 3px 0px 3px 0px;width: 1135px">
-      <div>
+      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 0px 0px" @change="PageSize = 10;PageCurrent = 1;fetchTableData1()">
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin: 3px 10px">
+        <el-option
-          <el-option
+          v-for="item in entryName"
-            v-for="item in entryName"
+          :key="item.value"
-            :key="item.value"
+          :label="item.label"
-            :label="item.label"
+          :value="item.value"/>
-            :value="item.value"/>
+      </el-select>
-        </el-select>
+      <el-date-picker
-        <el-date-picker
+        v-model="date"
-          v-model="date"
+        size="small"
-          size="small"
+        style="width: 240px;margin-left: 10px"
-          clearable
+        clearable
-          type="daterange"
+        type="daterange"
-          range-separator="至"
+        range-separator=""
-          start-placeholder="开始日期"
+        start-placeholder="开始日期"
-          end-placeholder="结束日期"/>
+        end-placeholder="结束日期"/>
-        <!--        <el-input v-model="contractNumber" clearable size="small" style="width:200px;margin: 3px 10px" placeholder="请输入合同编号"/>-->
+      <!--        <el-input v-model="contractNumber" clearable size="small" style="width:200px;margin: 3px 10px" placeholder="请输入合同编号"/>-->
 
-        <!--        <span style="margin-left: 10px">机床型号：</span>-->
+      <!--        <span style="margin-left: 10px">机床型号：</span>-->
-        <!--        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>-->
+      <!--        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>-->
-        <!--      </div>-->
+      <!--      </div>-->
-        <!--      <div style="margin-top: 10px">-->
+      <!--      <div style="margin-top: 10px">-->
-        <!--        <span style="margin-left: 0px">开始日期：</span>-->
+      <!--        <span style="margin-left: 0px">开始日期：</span>-->
-        <!--        <el-date-picker-->
+      <!--        <el-date-picker-->
-        <!--          v-model="startTime"-->
+      <!--          v-model="startTime"-->
-        <!--          style="width: 200px;"-->
+      <!--          style="width: 200px;"-->
-        <!--          value-format="yyyy-MM-dd"-->
+      <!--          value-format="yyyy-MM-dd"-->
-        <!--          size="small"-->
+      <!--          size="small"-->
-        <!--          type="date"-->
+      <!--          type="date"-->
-        <!--          placeholder="请选择开始日期"/>-->
+      <!--          placeholder="请选择开始日期"/>-->
-        <!--        <span style="margin-left: 10px">结束日期：</span>-->
+      <!--        <span style="margin-left: 10px">结束日期：</span>-->
-        <!--        <el-date-picker-->
+      <!--        <el-date-picker-->
-        <!--          v-model="endTime"-->
+      <!--          v-model="endTime"-->
-        <!--          style="width: 200px;"-->
+      <!--          style="width: 200px;"-->
-        <!--          value-format="yyyy-MM-dd"-->
+      <!--          value-format="yyyy-MM-dd"-->
-        <!--          size="small"-->
+      <!--          size="small"-->
-        <!--          type="date"-->
+      <!--          type="date"-->
-        <!--          placeholder="请选择结束日期"/>-->
+      <!--          placeholder="请选择结束日期"/>-->
-        <!--<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>-->
+      <!--<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>-->
-        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
-        <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
+      <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
-          <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 15px" @click="ADD()">自家项目</el-button>
-          <!--<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>-->
+        <!--<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>-->
-        </el-tooltip>
+      </el-tooltip>
-        <el-button type="success" plain size="small" @click="exportExcel()">导出</el-button>
+      <el-button icon="el-icon-bottom" type="success" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
-      </div>
     </el-card>
     <el-row>
-      <el-col style="width: 56%">
+      <el-col style="width: 680px">
         <el-card>
           <el-table
             v-loading="listLoading"
@@ -62,41 +61,44 @@
             stripe
             size="mini"
             @row-click="selectMachine">
-            <el-table-column align="center" label="合同编号" prop="合同编号" width="120">
+            <el-table-column align="center" label="合同编号" prop="合同编号" width="130px">
               <template slot-scope="scope">
                 <template>
                   {{ scope.row.合同编号 }}
                 </template>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="项目名称" prop="项目名称" width="130" show-overflow-tooltip>
+            <el-table-column align="center" label="项目名称" prop="项目名称" width="140px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100">
+            <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.合同签订日期.substring(0,10) }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="合同信息备注" min-width="150">
+            <el-table-column align="center" label="合同信息备注" width="150px">
               <template slot-scope="scope">
                 {{ scope.row.合同信息备注 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
+            <el-table-column label="操作" align="center" width="130px">
               <template slot-scope="scope">
                 <el-button
+                  style="margin-left: 5px"
                   size="mini"
                   type="text"
                   icon="el-icon-circle-plus-outline"
-                  @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
+                  @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
                 <el-button
+                  style="margin-left: 5px"
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click.stop="handleEdit(scope.row)"/>
                 <el-button
+                  style="margin-left: 5px;margin-right: 5px"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
@@ -116,33 +118,35 @@
           <!--          </div>-->
         </el-card>
       </el-col>
-      <el-col style="width: 43%">
+      <el-col style="width: 455px">
         <el-card>
           <!--<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">-->
-          <el-table :data="tableData2" border stripe style="width: 100%; text-align: center" size="mini">
+          <el-table :data="tableData2" border stripe style="width: 433px; text-align: center" size="mini">
             <el-table-column label="设备型号" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="设备名称" align="center" min-width="160">
+            <el-table-column label="设备名称" align="center" width="150">
               <template slot-scope="scope">
                 {{ scope.row.机床名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="机床数量" align="center" width="70">
+            <el-table-column label="机床数量" align="center" width="80">
               <template slot-scope="scope">
                 {{ scope.row.机床数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="140" align="center">
+            <el-table-column label="操作" width="80" align="center">
               <template slot-scope="scope">
                 <el-button
+                  style="margin-left: 5px"
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="editMachine(scope.row);flag = 2"/>
                 <el-button
+                  style="margin-left: 5px"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
@@ -284,7 +288,7 @@ export default {
     // EXCEL 导出
     // 姜福壮
     exportExcel() {
-      if (this.contractNumber === '' || this.contractNumber === null) { this.contractNumber_check = 0 } else { this.contractNumber_check = 1 }
+      if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.date !== null) {
         this.time_check = 1
         this.startTime = this.datetoYYMMDD(this.date[0])
@@ -295,12 +299,12 @@ export default {
         this.endTime = ''
       }
       var param = []
-      param[0] = ['项目流水号_check', this.contractNumber_check]
+      param[0] = ['项目流水号_check', this.entryNameValue_check]
-      param[1] = ['项目流水号', this.contractNumber]
+      param[1] = ['项目流水号', this.entryNameValue]
       param[2] = ['日期_check', this.time_check]
       param[3] = ['开始日期', this.startTime]
       param[4] = ['结束日期', this.endTime]
-      var Data = this.CreateData('00', '报表_自家项目报表_查询', param)
+      var Data = this.CreateData('04', '报表_自家项目报表_查询', param)
       this.exportExcel_NPOI(Data)
     },
     init() {
@@ -316,6 +320,7 @@ export default {
       this.fetchTableData1()
     },
     fetchTableData1() {
+      this.tableData2 = []
       if (this.date !== null) {
         this.startTime = this.datetoYYMMDD(this.date[0])
         this.endTime = this.datetoYYMMDD(this.date[1])
@@ -496,7 +501,7 @@ export default {
   /*}*/
 </style>
 <style lang="scss">
-  .NewlyAdded{
+  .button111{
     background:rgb(253,246,236);
     border-color: #ff9759;
     color: #ff9759;

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -121,6 +121,7 @@
           <el-table
             v-loading="loading"
             :data="tableData0"
+            :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
             size="mini"
             height="740px"
             style="width: 1265px"
@@ -157,6 +158,11 @@
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
+            <!--<el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px" width="140px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.项目名称 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -187,11 +193,31 @@
                 {{ scope.row.供货商 }}
               </template>
             </el-table-column>
+            <!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.物料计划到货时间.split(' ')[0] }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.操作日期.split(' ')[0] }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
               <template slot-scope="scope">
                 {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
               </template>
             </el-table-column>
+            <!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
               <template slot-scope="scope">
                 <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
@@ -1128,4 +1154,20 @@ export default {
       line-height: 46px;
     }
   }
+  /*.el-table td.gutter,.el-table th.gutter{*/
+    /*width: 15px;*/
+    /*border-right-width: 0;*/
+    /*border-bottom-width: 0;*/
+    /*padding: 0;*/
+    /*background: red;*/
+  /*}*/
+</style>
+<style>
+  /*.el-table td.gutter,.el-table th.gutter{*/
+    /*width: 15px;*/
+    /*border-right-width: 0;*/
+    /*border-bottom-width: 0;*/
+    /*padding: 0;*/
+    /*background: white;*/
+  /*}*/
 </style>

src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue

@@ -1,232 +1,294 @@
 <template>
-  <div class="app-container">
+  <div>
-    <el-card style="margin-left: 0px;width: 37%;float: left">
+    <div style="width: 100%;overflow:auto">
-      <el-col>
+      <div style="white-space: nowrap">
-        <el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0" @keyup.enter.native="searchTable1"/>
+        <el-card style="margin-left: 0px;width:820px; display: inline-block;">
-        <el-tooltip :open-delay="1200" effect="dark" content="查询备料零件" placement="top">
+          <el-col>
-          <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
+            <el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0;width: 180px" @keyup.enter.native="searchTable1"/>
-        </el-tooltip>
+            <el-tooltip :open-delay="1200" effect="dark" content="查询备料零件" placement="top">
-        <el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
+              <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
-          <el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
+            </el-tooltip>
-        </el-tooltip>
+            <el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
-        <el-table v-loading="loading1" :data="tableData1" border stripe highlight-current-row style="width: 100%;margin-top:3px;" height="690" size="mini" @selection-change="handleSelectionChange">
+              <el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
-          <el-table-column type="selection" align="center" width="45"/>
+            </el-tooltip>
-          <el-table-column label="机床图号" prop="机床图号" width="95" align="center">
+            <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">
-            <template slot-scope="scope">
+              <el-table-column type="selection" align="center" width="45"/>
-              {{ scope.row.机床图号 }}
+              <el-table-column label="机床图号" prop="机床图号" width="120" align="center">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.机床图号 }}
-          <el-table-column label="组号" prop="组号" width="55" align="center">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.组号 }}
+              <el-table-column label="组号" prop="组号" width="70" align="center">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.组号 }}
-          <el-table-column label="零件图号" prop="零件图号" min-width="120" width="155" align="center" show-overflow-tooltip>
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.零件图号 }}
+              <el-table-column label="零件图号" prop="零件图号" min-width="120" width="180" align="center" show-overflow-tooltip>
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.零件图号 }}
-          <el-table-column label="零件名称" prop="零件名称" width="110" align="center" show-overflow-tooltip>
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.零件名称 }}
+              <el-table-column label="零件名称" prop="零件名称" width="140" align="center" show-overflow-tooltip>
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.零件名称 }}
-          <el-table-column label="数量" width="45" align="center">
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.批次数量 }}
+              <el-table-column label="数量" width="70" align="center">
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.批次数量 }}
-          <el-table-column label="材料" prop="材料" width="85" align="center" show-overflow-tooltip>
+                </template>
-            <template slot-scope="scope">
+              </el-table-column>
-              {{ scope.row.材料 }}
+              <el-table-column label="材料" prop="材料" width="150" align="center" show-overflow-tooltip>
-            </template>
+                <template slot-scope="scope">
-          </el-table-column>
+                  {{ scope.row.材料 }}
-        </el-table>
+                </template>
-        <div v-show="false" class="block">
+              </el-table-column>
-          <el-pagination
+            </el-table>
-            :current-page="pageCurrent1"
+            <div v-show="false" class="block">
-            :page-size="pageSize1"
+              <el-pagination
-            :total="total1"
+                :current-page="pageCurrent1"
-            style="display:inline-block;width:50%"
+                :page-size="pageSize1"
-            layout="total, prev, pager, next"
+                :total="total1"
-            @size-change="handleSizeChange1"
+                style="display:inline-block;width:50%"
-            @current-change="handleCurrentChange1"/>
+                layout="total, prev, pager, next"
+                @size-change="handleSizeChange1"
+                @current-change="handleCurrentChange1"/>
+            </div>
+          </el-col>
+        </el-card>
+        <el-card style="margin-left: 1px;width:1120px; display: inline-block;">
+          <div> <!--slot="header"-->
+            <!--<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()"/>-->
+            <el-select v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">
+              <el-option
+                v-for="item in supplierName0s"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+            <el-date-picker
+              v-model="dateRange"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              align="center"
+              style="width: 240px;margin: 3px 10px"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              range-separator="～"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+            <!--<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>-->
+            <!--<el-tooltip :open-delay="1200" effect="dark" content="查询采购计划单" placement="top">-->
+            <!--<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-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>
+            <el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
+              <el-button type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 90px" @click="saveMateriel">保存</el-button>
+            </el-tooltip>
+          </div>
+          <el-table
+            v-loading=""
+            :data="tableData2"
+            :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
+            border
+            stripe
+            style="max-height: 460px;width: 930px"
+            height="230px"
+            size="mini"
+            highlight-current-row
+            @row-click="searchTable3">
+            <el-table-column label="进程" prop="采购计划状态" align="center" width="60" fixed="left">
+              <template slot-scope="scope">
+                <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</span>
+                <span v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</span>
+                <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
+                <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="外购备料单号" prop="采购单号" align="center" width="130">
+              <template slot-scope="scope">
+                {{ scope.row.采购单号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="外购计划单名称" prop="采购单名称" align="center" width="160">
+              <template slot-scope="scope">
+                {{ scope.row.采购单名称 }}
+              </template>
+            </el-table-column>
+            <!--<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>-->
+            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="190" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="采购员" prop="姓名" align="center" width="70" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="计划完成日期" align="center" width="110">
+              <template slot-scope="scope">
+                {{ scope.row.计划完成日期.split(' ')[0] }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="190px">
+              <template slot-scope="scope">
+                <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
+                  <div style="display: inline-block">
+                    <el-button size="mini" style="margin-left: 10px" type="text" icon="el-icon-download" @click="exportExcel2(scope.row)">导出</el-button>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="text" content="打印" placement="top">
+                  <div style="display: inline-block">
+                    <el-button size="mini" type="text" style="margin-left: 10px" icon="el-icon-printer" @click="exportExcel(scope.row)">打印</el-button>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 10px" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 10px" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--<div class="block">-->
+          <!--<el-pagination-->
+          <!--:current-page="pageCurrent2"-->
+          <!--:page-sizes="[10, 20, 30, 40]"-->
+          <!--:page-size="pageSize2"-->
+          <!--:total="total2"-->
+          <!--style="display:inline-block;width:40%;float: right;margin-right: 60px"-->
+          <!--layout="total, sizes, prev, pager, next, jumper"-->
+          <!--@size-change="handleSizeChange2"-->
+          <!--@current-change="handleCurrentChange2"/>-->
+          <!--</div>-->
+          <div class="block">
+            <el-pagination
+              v-show="false"
+              :current-page="pageCurrent2"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize2"
+              :total="total2"
+              style="display:inline-block;width:40%;float: right;margin-right: 60px"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange2"
+              @current-change="handleCurrentChange2"/>
+          </div>
+          <el-table v-loading="" :data="tableData3" :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}" border highlight-current-row style="margin: 3px 0;width: 1100px" height="455px" width="1100px" size="mini">
+            <el-table-column label="进程" align="center" width="60">
+              <template slot-scope="scope">
+                <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
+                <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
+                <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="物料编码" prop="物料零件编码" align="center" width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料零件编码 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件名称" align="center" width="120">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="材料" prop="材料" align="center" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" width="115">
+              <template slot-scope="scope">
+                <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">
+              <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="80px">
+              <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="saveMoney(scope.$index, scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="备注" min-width="100px">
+              <template slot-scope="scope">
+                <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注1" size="mini" style="width:100%" @change="saveRemarks(scope.$index, scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="90px" fixed="right">
+              <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="deleteMateriel(scope.row)">移出</el-button>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </div>
+    </div>
+    <div>
+      <el-card style="width: 1100px;margin: 10px auto">
+        <div id="WGBLD" style="width: 1000px;margin: 0 auto">
+          <table cellspacing="0px" align="center" border="1 solid black" width="100%">
+            <tr style="height: 60px">
+              <th colspan="14"><h3>江苏高精机电装备有限公司</h3></th>
+            </tr>
+            <tr style="height: 40px">
+              <th colspan="14"><h4>{{ 采购单名称 }}</h4></th>
+            </tr>
+            <tr style="height: 40px">
+              <td colspan="2" style="text-align: center;width: 15%">下单单位</td>
+              <td colspan="5" style="text-align: center;width: 35%">{{ 下单单位 }}</td>
+              <td colspan="2" style="text-align: center;width: 15%">单号</td>
+              <td colspan="5" style="text-align: center;width: 35%">{{ 单号 }}</td>
+            </tr>
+            <tr style="height: 40px">
+              <td colspan="2" style="text-align: center;width: 15%">下单日期</td>
+              <td colspan="5" style="text-align: center;width: 35%">{{ 下单日期 }}</td>
+              <td colspan="2" style="text-align: center;width: 15%">计划完成日期</td>
+              <td colspan="5" 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: 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 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>
+              <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: 8%">{{ list.总数量 }}</td>
+              <td colspan="2" style="text-align: center;width: 20%">{{ list.成品尺寸 }}</td>
+              <td style="text-align: center;width: 17%">{{ list.备注1 }}</td>
+            </tr>
+          </table>
+          <div style="margin-top: 20px">联系人:___________ 联系电话:___________ </div>
         </div>
-      </el-col>
+      </el-card>
-    </el-card>
+    </div>
-
-    <el-card style="margin-left: 10px;width: 62.3%;float: left">
-      <div> <!--slot="header"-->
-        <!--<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()"/>-->
-        <el-select v-model="supplierName0" placeholder="供应商" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">
-          <el-option
-            v-for="item in supplierName0s"
-            :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: 300px;margin: 3px 0"
-          value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
-          range-separator="～"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"/>
-        <!--<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>-->
-        <!--<el-tooltip :open-delay="1200" effect="dark" content="查询采购计划单" placement="top">-->
-        <!--<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 type="distribution" 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>
-        <el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
-          <el-button type="success" size="small" icon="el-icon-download" plain style="margin-left: 140px" @click="saveMateriel">保存</el-button>
-        </el-tooltip>
-      </div>
-      <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="200px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="备料状态" prop="采购计划状态" align="center" width="75" fixed="left">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</span>
-            <span v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</span>
-            <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
-            <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="外购备料单号" prop="采购单号" align="center" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.采购单号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="外购计划单名称" prop="采购单名称" align="center" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.采购单名称 }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>-->
-        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购员" prop="姓名" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="计划完成日期" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.计划完成日期.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="330" fixed="right">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
-              <div style="display: inline-block">
-                <el-button size="mini" style="margin-left: 10px" type="text" icon="el-icon-download" @click="exportExcel2(scope.row)">导出</el-button>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="text" content="打印" placement="top">
-              <div style="display: inline-block">
-                <el-button size="mini" type="text" style="margin-left: 10px" icon="el-icon-printer" @click="exportExcel(scope.row)">打印</el-button>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 10px" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 10px" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--<div class="block">-->
-      <!--<el-pagination-->
-      <!--:current-page="pageCurrent2"-->
-      <!--:page-sizes="[10, 20, 30, 40]"-->
-      <!--:page-size="pageSize2"-->
-      <!--:total="total2"-->
-      <!--style="display:inline-block;width:40%;float: right;margin-right: 60px"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--@size-change="handleSizeChange2"-->
-      <!--@current-change="handleCurrentChange2"/>-->
-      <!--</div>-->
-      <div class="block">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="display:inline-block;width:40%;float: right;margin-right: 60px"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-      <el-table v-loading="" :data="tableData3" border highlight-current-row style="margin: 3px 0" height="455px" size="mini">
-        <el-table-column label="备料状态" align="center" width="80">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
-            <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
-            <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
-          </template>
-        </el-table-column>
-        <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="零件名称" align="center" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="材料" prop="材料" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" width="115">
-          <template slot-scope="scope">
-            <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">
-          <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="80px">
-          <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="saveMoney(scope.$index, scope.row)"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="备注" min-width="100px">
-          <template slot-scope="scope">
-            <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注1" size="mini" style="width:100%" @change="saveRemarks(scope.$index, scope.row)"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="90px" fixed="right">
-          <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="deleteMateriel(scope.row)">移出</el-button>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
 
     <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px" @close="closedialog()">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
@@ -282,54 +344,9 @@
           @click="submitEditPurchaseOrder">确定</el-button>
       </div>
     </el-dialog>
-    <el-card style="width: 1100px;margin: 10px auto">
+
-      <div id="WGBLD" style="width: 1000px;margin: 0 auto">
-        <table cellspacing="0px" align="center" border="1 solid black" width="100%">
-          <tr style="height: 60px">
-            <th colspan="14"><h3>江苏高精机电装备有限公司</h3></th>
-          </tr>
-          <tr style="height: 40px">
-            <th colspan="14"><h4>{{ 采购单名称 }}</h4></th>
-          </tr>
-          <tr style="height: 40px">
-            <td colspan="2" style="text-align: center;width: 15%">下单单位</td>
-            <td colspan="5" style="text-align: center;width: 35%">{{ 下单单位 }}</td>
-            <td colspan="2" style="text-align: center;width: 15%">单号</td>
-            <td colspan="5" style="text-align: center;width: 35%">{{ 单号 }}</td>
-          </tr>
-          <tr style="height: 40px">
-            <td colspan="2" style="text-align: center;width: 15%">下单日期</td>
-            <td colspan="5" style="text-align: center;width: 35%">{{ 下单日期 }}</td>
-            <td colspan="2" style="text-align: center;width: 15%">计划完成日期</td>
-            <td colspan="5" 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: 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 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>
-            <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: 8%">{{ list.总数量 }}</td>
-            <td colspan="2" style="text-align: center;width: 20%">{{ list.成品尺寸 }}</td>
-            <td style="text-align: center;width: 17%">{{ list.备注1 }}</td>
-          </tr>
-        </table>
-        <div style="margin-top: 20px">联系人:___________ 联系电话:___________ </div>
-      </div>
-    </el-card>
   </div>
+
 </template>
 
 <script>
@@ -338,7 +355,6 @@ import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, addPurc
 import QRCode from 'qrcode'
 import $ from 'jquery'
 import { mapGetters } from 'vuex'
-
 export default {
   name: '', // 采购计划
   data() {
@@ -907,4 +923,21 @@ export default {
     top: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
 

src/views/WorkshopProcurement/OfflineProcurement/index.vue

@@ -678,4 +678,21 @@ export default {
     margin: 0
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
 

src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue

@@ -44,12 +44,13 @@
         <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
           <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
         </el-tooltip>
-        <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">到票</el-button>
+        <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">到票</el-button>
       </el-row>
     </el-card>
     <el-card style="float: left">
       <el-table
         :data="tableData1"
+        :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
         size="mini"
         style="margin-top: 3px"
         height="750px"
@@ -57,7 +58,7 @@
         border
         highlight-current-row
         @row-click="searchTable02">
-        <el-table-column align="center" label="进程" width="70px">
+        <el-table-column align="center" label="进程" width="60px">
           <template slot-scope="scope">
             <span v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</span>
             <span v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</span>
@@ -140,7 +141,7 @@
       </div>
     </el-card>
     <el-card style="float: left;margin-left: 5px">
-      <el-table :data="gridData" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%">
+      <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%">
         <el-table-column width="50" align="center" type="index" label="序号"/>
         <el-table-column label="到货单编号" align="center" width="120px">
           <template slot-scope="scope">
@@ -673,3 +674,21 @@ function saveAs(blob, filename = '下载文件.xls') {
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+

src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue

@@ -1,19 +1,16 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 76%">
+    <el-card style="width: 100%">
       <div style="margin-top: 7px; margin-bottom: 7px">
-        <span>供应商</span>
+        <el-select v-model="supplierNameValue" style="width:220px" placeholder="供应商" size="small" filterable clearable>
-        <el-select v-model="supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable clearable>
           <el-option
             v-for="item in supplierNames"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>零件图号</span>
+        <el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 180px" clearable/>
-        <el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 160px" clearable/>
+        <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 140px" clearable>
-        <span>备料状态</span>
-        <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 100px" clearable>
           <el-option
             v-for="item in Materials"
             :key="item.value"
@@ -27,7 +24,7 @@
           size="small"
           type="daterange"
           align="center"
-          style="width: 300px;margin: 3px 0"
+          style="width: 240px;margin: 3px 0"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           range-separator="～"
@@ -37,7 +34,7 @@
         <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
       </div>
     </el-card>
-    <el-card style="width: 76%">
+    <el-card style="width: 100%">
       <el-table
         v-loading="loading"
         :data="tableData"

src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue

@@ -1,196 +1,179 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <div style="width: 100%;overflow:auto">
-      <el-col>
+      <div style="white-space: nowrap">
-        <span>请款时间段:</span>
+        <el-card style="width: 1663px">
-        <el-date-picker
+          <el-col>
-          v-model="dateRange"
+            <span>请款时间段:</span>
-          :picker-options="pickerOptions"
+            <el-date-picker
-          size="small"
+              v-model="dateRange"
-          type="daterange"
+              :picker-options="pickerOptions"
-          align="center"
+              size="small"
-          style="width: 300px;margin: 3px 0"
+              type="daterange"
-          value-format="yyyy-MM-dd"
+              align="center"
-          format="yyyy-MM-dd"
+              style="width: 240px;margin: 3px 0"
-          range-separator="～"
+              value-format="yyyy-MM-dd"
-          start-placeholder="开始日期"
+              format="yyyy-MM-dd"
-          end-placeholder="结束日期"/>
+              range-separator="～"
-        <span style="margin-left: 10px">供应商:</span>
+              start-placeholder="开始日期"
-        <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
+              end-placeholder="结束日期"/>
-        <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
+            <span style="margin-left: 10px">供应商:</span>
-          <el-button
+            <el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
-            type="primary"
+            <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
-            size="small"
+              <el-button
-            plain
+                type="primary"
-            icon="el-icon-search"
+                size="small"
-            style="margin-left: 10px"
+                plain
-            @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
+                icon="el-icon-search"
-        </el-tooltip>
+                style="margin-left: 10px"
-        <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
+                @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
-          <el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
-        </el-tooltip>
-      </el-col>
-    </el-card>
-    <el-card style="margin-left: 0px;width: 68%;float: left">
-      <!--@expand-change="searchTable02"-->
-      <!--<el-table-column type="expand" label="详情">-->
-      <!--<template slot-scope="scope">-->
-      <!--<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">-->
-      <!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
-      <!--<el-table-column min-width="150" align="center" label="发票号">-->
-      <!--<template slot-scope="scope">-->
-      <!--{{ scope.row.发票号 }}-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column min-width="150" align="center" label="供应商">-->
-      <!--<template slot-scope="scope">-->
-      <!--{{ scope.row.供应商名称 }}-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">-->
-      <!--<template slot-scope="scope">-->
-      <!--{{ scope.row.开票金额 }}-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-      <!--</el-table>-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-      <el-table
-        v-loading=""
-        :data="tableData1"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        border
-        stripe
-        style="margin-top: 3px;"
-        height="600px"
-        size="mini"
-        show-summary
-        highlight-current-row
-        @row-click="searchTable02">
-        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="90" width="90" prop="date">
-          <template slot-scope="scope">
-            {{ scope.row.请款时间 | formatTime }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款人" align="center" min-width="80" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
-          <template slot-scope="scope">
-            {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <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.审批情况流水号)===2" type="danger" size="mini">不通过</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="未通过审批原因" width="110" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
-          </template>
-        </el-table-column>
-        <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.付款情况流水号)===2" type="danger" size="mini">不同意</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="未付款原因" width="100" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-tooltip effect="dark" content="取消请款" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
-              </div>
             </el-tooltip>
-          </template>
+            <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
-        </el-table-column>
+              <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
-      </el-table>
+            </el-tooltip>
-      <div class="block" style="margin-top: 10px;">
+            <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
-        <el-pagination
+              <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 130px" @click="exportExcel">导出</el-button>
-          :current-page="pageCurrent1"
+            </el-tooltip>
-          :page-sizes="[10, 20, 30, 40]"
+          </el-col>
-          :page-size="pageSize1"
+        </el-card>
-          :total="total1"
+        <el-card style="margin-left: 0px;width: 1135px;margin-left: 0px;display: inline-block" >
-          style="display:inline-block;width:50%"
+          <el-table
-          layout="total, sizes, prev, pager, next, jumper"
+            v-loading=""
-          @size-change="handleSizeChange1"
+            :data="tableData1"
-          @current-change="handleCurrentChange1"/>
+            :row-key="getRowKeys"
+            :expand-row-keys="expands"
+            :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
+            border
+            stripe
+            style="margin-top: 3px;"
+            height="600px"
+            size="mini"
+            show-summary
+            highlight-current-row
+            @row-click="searchTable02">
+            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款时间" align="center" min-width="90" width="90" prop="date">
+              <template slot-scope="scope">
+                {{ scope.row.请款时间 | formatTime }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款人" align="center" min-width="80" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
+              <template slot-scope="scope">
+                {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="审批进程" width="80" 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.审批情况流水号)===2" type="danger" size="mini">不通过</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="未通过审批原因" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
+              </template>
+            </el-table-column>
+            <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.付款情况流水号)===2" type="danger" size="mini">不同意</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="未付款原因" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="80">
+              <template slot-scope="scope">
+                <el-tooltip effect="dark" content="取消请款" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="pageCurrent1"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize1"
+              :total="total1"
+              style="display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange1"
+              @current-change="handleCurrentChange1"/>
+          </div>
+        </el-card>
+        <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 min-width="120" align="center" label="发票号">
+              <template slot-scope="scope">
+                {{ scope.row.发票号 }}
+              </template>
+            </el-table-column>
+            <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="100px" prop="开票金额">
+              <template slot-scope="scope">
+                {{ scope.row.开票金额.toFixed(2) }}
+              </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">
+          <span>供应商：</span>
+          <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
+            <el-option
+              v-for="item in supplier"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="发票号" align="center" min-width="120">
+              <template slot-scope="scope">
+                {{ scope.row.发票号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <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">
+              <template slot-scope="scope">
+                {{ scope.row.开票时间 | formatTime }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
+          <el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
+        </el-dialog>
       </div>
-    </el-card>
+    </div>
-    <el-card style="margin-left: 0px;width: 32%;float: left">
-      <el-table-column type="expand" label="详情">
-        <el-table :data="gridData" class="subTableHeader" size="mini" show-summary style="width: 100%">
-          <el-table-column width="50" align="center" type="index" label="序号"/>
-          <el-table-column min-width="150" align="center" label="发票号">
-            <template slot-scope="scope">
-              {{ scope.row.发票号 }}
-            </template>
-          </el-table-column>
-          <el-table-column min-width="150" align="center" label="供应商">
-            <template slot-scope="scope">
-              {{ scope.row.供应商名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column min-width="150" align="center" label="开票金额" prop="开票金额">
-            <template slot-scope="scope">
-              {{ scope.row.开票金额 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-table-column>
-    </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
-      <span>供应商：</span>
-      <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
-        <el-option
-          v-for="item in supplier"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="50"/>
-        <el-table-column label="发票号" align="center" min-width="120">
-          <template slot-scope="scope">
-            {{ scope.row.发票号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <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">
-          <template slot-scope="scope">
-            {{ scope.row.开票时间 | formatTime }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
-      <el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
-    </el-dialog>
   </div>
 </template>
 <script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
@@ -263,6 +246,43 @@ export default {
     this.searchTable1()
   },
   methods: {
+    getSummaries(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index === 3) {
+          const values = data.map(item => Number(parseFloat(item['开票金额'])))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
+    exportExcel() {
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      this.supplierName0 ? this.check2 = 1 : (this.check2 = 0, this.supplierName0 = '')
+      var param = []
+      param[0] = ['时间段_check', this.check1]
+      param[1] = ['开始时间', this.dateRange[0]]
+      param[2] = ['结束时间', this.dateRange[1]]
+      param[3] = ['供应商名称_check', this.check2]
+      param[4] = ['供应商名称', this.supplierName0]
+      var Data = this.CreateData('03', '报表_备料管理_请款_查询数据', param)
+      this.exportExcel_NPOI(Data)
+    },
     // dateFormat(row, column) {
     //   var date = row[column.property]
     //   console.log(date)
@@ -411,8 +431,8 @@ export default {
 <style lang="scss">
   .subTableHeader {
     th {
-      background: #8ff4ea !important;
+      background: #7eaced !important;
-      color: black;
+      color: #FFFFFF;
     }
 
     tr.el-table__row td {
@@ -424,3 +444,21 @@ export default {
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+

src/views/layout/components/AppMain.vue

@@ -24,8 +24,9 @@ export default {
 <style scoped>
 .app-main {
   /*50 = navbar  */
+  width: 1380px;
   position: relative;
   overflow: hidden;
-  /*min-height:calc(100vh - 50px);background: url('../../../../static/bg.jpg') repeat;*/
+  /*min-height:calc(100vh - 85px);background: url('../../../../static/bg.jpg') repeat;*/
 }
 </style>