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

config/index.js

@@ -7,8 +7,8 @@ const os = require('os')
 
 const networkInterfaces = os.networkInterfaces()
 
-const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
+// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
-// const ip = '127.0.0.1'
+const ip = '127.0.0.1'
 module.exports = {
   dev: {
     // Paths

src/api/ManufacturingCenter/ContractDetailsInquiry.js

@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 初始化 项目名称
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_总计划'
+    }
+  })
+}
+
+// 查询机床
+export function initMachine(projectNum) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据2',
+      param: `项目流水号=${projectNum}`
+    }
+  })
+}
+
+// 查询项目详情
+export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '项目工时统计_合同详情查询_工时综合查询',
+      param: `项目流水号=${projectNum}&机床流水号=${machineValue}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}

src/api/Outsourcing/OutsourcingPaymentPlanManagement.js

@@ -1,74 +1,38 @@
 import request from '@/utils/request'
 
-// 初始化 外协厂商
-export function initOutHelp() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
-    }
-  })
-}
 // 查询表格数据
-export function searchtable(num2, ManufacturerName, num10, ManufacturerAbbreviation, num3, address, num4, roleName, phNumber, Fax, pageCurrent, pageSize) {
+export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据_付款计划',
+      name: '车间生产管理工艺_外协付款_查询',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=0&表单号_check=' + num2 + '&表单号=' + ManufacturerName + '&外协厂家_check=' + num10 + '&外协厂家=' + ManufacturerAbbreviation + '&任务下达日期时间_check=' + num3 + '&开始时间=' + address + '&结束时间=' + num4 + '&实际付款时间段_check=' + roleName + '&实际付款开始时间=' + phNumber + '&实际付款结束时间=' + Fax + '&外协计划员编号_check=0&外协计划员编号=0',
+      param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-// 修改实际付款日期
+export function getInvoice(Number, pageCurrent, pageSize) {
-export function payTime(num, time) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据_实际付款时间',
-      param: '外协加工任务单流水号=' + num + '&实际付款时间=' + time
-    }
-  })
-}
-// 修改扣款数据、扣款说明
-export function WithdrawingEdit(num, quality, Explain) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协扣款_编辑数据',
-      param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款说明=' + Explain
-    }
-  })
-}
-// 单据状态： 1 未成交 2 成交 3 作废
-export function payment(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据_作废',
-      param: '外协加工任务单流水号=' + num + '&单据状态=3'
-    }
-  })
-}
-// 查询零件信息
-export function getParts(check, Number, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + Number + '=int',
+      param: '外协厂家流水号_check=1&外协厂家流水号=' + Number,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function getPayment(Number, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_外协付款记录_查询数据',
+      param: '外协厂家流水号=' + Number,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/Outsourcing/OutsourcingTaskExecution.js

@@ -12,14 +12,14 @@ export function initOutHelp() {
   })
 }
 // 初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3) {
+export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据',
+      name: '车间生产管理_外协加工任务单_查询数据_2020',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num,
+      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/WorkshopProcurement/OfflineProcurement.js

@@ -49,15 +49,14 @@ export function deletePurchaseOrder(PurchaseOrderNameValue) {
   })
 }
 // 查询采购单
-export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check3, name2) {
+export function searchPurchaseOrder(check1, num, check3, name2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_离线采购计划_查询数据',
-      param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}`,
+      param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}`
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
@@ -109,15 +108,14 @@ export function getGroups(stepNumber) {
   })
 }
 
-export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) {
+export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, ordername, order) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新',
-      param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order,
+      param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js

@@ -13,27 +13,29 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
   })
 }
 // 查询备料
-export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) {
+export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order, pageSize, pageCurrent) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_外购备料_综合查询数据',
-      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue,
+      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue +
+      '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 导出
-export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) {
+export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_外购备料_综合查询数据',
-      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue
+      param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue +
+      '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order
     }
   })
 }

src/utils/curd.js

@@ -5,6 +5,30 @@ Created by hedekun
 import { type } from './tool' // type判断传入值的类型，比typeof更详细
 export default {
   install(Vue) {
+    Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
+      var paramStr = ''
+      var paramarray = []
+      if (data !== undefined) {
+        for (let i = 0; i < data.length; i++) {
+          paramarray.push({
+            name: data[i][0],
+            value: data[i][1],
+            type: data[i][2],
+            output: data[i][3]
+          })
+        }
+        paramStr = JSON.stringify(paramarray)
+      }
+      var obj = []
+      obj[0] = {}
+      obj[0].type = type
+      obj[0].name = name
+      obj[0].param = paramStr
+      obj[0].pageSize = pageSize
+      obj[0].pageList = pageList
+      var numn = JSON.stringify(obj[0])
+      return numn
+    }
     // 用于打开增加框，方法能重置表单，并使表单内容回到初始化状态。
     // 传入参数
     // 1）表单名称，字符串形式如'form'，必须

src/utils/request.js

@@ -6,8 +6,6 @@ export const name1 = `OP1000`
 export const name3 = `OP2000`
 export const name4 = `OP9999`
 
-// 创建axios实例
-
 export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice
 export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond
 export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement

src/views/Assembly/AssemblyQualityInspection/index.vue

@@ -12,21 +12,21 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px;width: 100px" size="small" clearable>
           <el-option
             v-for="item in groupNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="TestValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="TestValue" filterable placeholder="组件名称" style="margin:0px 10px;width: 150px;" size="small" clearable>
           <el-option
             v-for="item in Test"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px;width: 100px;" size="small" clearable>
           <el-option
             v-for="item in qualityInspection"
             :key="item.value"
@@ -63,7 +63,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="部件名称" prop="组件名称" align="center" width="100px">
+        <el-table-column label="部件名称" prop="组件名称" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
@@ -78,6 +78,16 @@
             {{ scope.row.检测项明细 }}
           </template>
         </el-table-column>
+        <el-table-column label="质检时间" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.质检时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检员" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
@@ -109,7 +119,7 @@ export default {
       groupNumber: [],
       TestValue: '',
       Test: [],
-      qualityInspectionValue: '',
+      qualityInspectionValue: 2,
       qualityInspection: [
         {
           value: 1,

src/views/Assembly/QualityInspectionInformationInquiry/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <el-select v-model="machineNumberValue" filterable placeholder="选择机床编号" size="small" style="margin-left: 10px" clearable @change="machineChange()">
+        <el-select v-model="machineNumberValue" filterable placeholder="选择机床编号" size="small" style="margin-left: 10px;width: 180px" clearable @change="machineChange()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -12,23 +12,21 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="groupNumberValue" filterable placeholder="选择组号" size="small" style="margin-left: 10px" clearable>
+        <el-select v-model="groupNumberValue" filterable placeholder="选择组号" size="small" style="margin-left: 10px;width:100px" clearable>
           <el-option
             v-for="item in groupNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px;margin-left: 10px" size="small" clearable/>
+        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 150px;margin-left: 10px" size="small" clearable/>
-        <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" style="margin-left: 10px" size="small" clearable>
+        <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" style="margin-left: 10px;width:150px" size="small" clearable>
           <el-option
             v-for="item in QualityTypeNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-      </el-row>
-      <el-row style="margin-top: 10px">
         <!--<span class="demonstration">时间区间:</span>-->
         <el-date-picker
           v-model="startTime"
@@ -46,7 +44,7 @@
           type="date"
           placeholder="选择结束日期"/>
         <!--<span>质检情况:</span>-->
-        <el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 140px;margin-left: 50px" clearable>
+        <el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
           <el-option
             v-for="item in qualityInspection"
             :key="item.value"
@@ -54,7 +52,7 @@
             :value="item.value"/>
         </el-select>
         <!--<span>质检人员:</span>-->
-        <el-select v-model="personNum" filterable placeholder="选择质检人员" size="small" style="width: 140px;margin-left: 10px" clearable>
+        <el-select v-model="personNum" filterable placeholder="选择质检人员" size="small" style="width: 130px;margin-left: 10px" clearable>
           <el-option
             v-for="item in person"
             :key="item.value"
@@ -75,7 +73,7 @@
             <el-tag v-if="parseInt(scope.row.是否禁用)===1" type="error" size="small">已禁用</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center">
+        <el-table-column label="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -90,7 +88,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件型号" align="center" min-width="120px">
+        <el-table-column label="零件图号" align="center" min-width="130px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -100,12 +98,12 @@
             {{ 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" width="100px">
+        <el-table-column label="规格或材料" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格或材料 }}
           </template>
@@ -115,22 +113,22 @@
             {{ 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">
           <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" width="90px">
+        <el-table-column label="不合格数" align="center" width="90px">
           <template slot-scope="scope">
             {{ scope.row.不合格数量 }}
           </template>
@@ -155,7 +153,7 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="形位" fixed="right" align="center" width="100">
+        <el-table-column label="形位" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -176,11 +174,11 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="尺寸" fixed="right" align="center" width="100">
+        <el-table-column label="尺寸" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -201,11 +199,11 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="外观" fixed="right" align="center" width="100">
+        <el-table-column label="外观" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -226,15 +224,15 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" min-width="120">
+        <el-table-column label="操作" fixed="right" align="center" min-width="90">
           <template slot-scope="scope">
             <el-button
               size="mini"
-              type="primary"
+              type="text"
               plain
               icon="el-icon-search"
               @click="viewPicture(scope.row)">查看图片</el-button>
@@ -256,7 +254,7 @@
     <el-card>
       <span style="margin-left: 45%;font-size: 20px;">正在加工零件列表</span>
       <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
-        <el-table-column label="机床图号" prop="机床图号" align="center">
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -471,7 +469,7 @@ export default {
       gridData: [],
       QualityTypeNumber: [],
       QualityTypeValue: '',
-      qualityInspectionValue: '',
+      qualityInspectionValue: 1,
       qualityInspection: [
         {
           value: 1,

src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue

@@ -17,16 +17,16 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>分组</span>
+      <!--      <span>分组</span>-->
-      <el-select v-model="partValue" clearable filterable size="small" style="margin-right:10px;width: 80px" placeholder="分组">
+      <!--      <el-select v-model="partValue" clearable filterable size="small" style="margin-right:10px;width: 80px" placeholder="分组">-->
-        <el-option
+      <!--        <el-option-->
-          v-for="item in part"
+      <!--          v-for="item in part"-->
-          :key="item.value"
+      <!--          :key="item.value"-->
-          :label="item.label"
+      <!--          :label="item.label"-->
-          :value="item.value"/>
+      <!--          :value="item.value"/>-->
-      </el-select>
+      <!--      </el-select>-->
-      <span>规格及型号</span>
+      <!--      <span>规格及型号</span>-->
-      <el-input v-model="specificationValue" clearable size="small" style="margin-right:10px;width: 150px" placeholder="规格型号"/>
+      <!--      <el-input v-model="specificationValue" clearable size="small" style="margin-right:10px;width: 150px" placeholder="规格型号"/>-->
       <span>加工总工时（小时）:</span>
       <el-input v-model="totalProcessingHours" clearable size="small" style="margin-right:10px;width: 100px"/>
       <span>计划总工时（小时）:</span>
@@ -34,89 +34,94 @@
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
     </el-card>
     <el-card>
-      <el-table :data="tableData" highlight-current-row border style="width: 100%;" size="mini" height="300">
+      <el-table :data="tableData" highlight-current-row border style="width: 100%;" size="mini" height="700">
-        <el-table-column label="跟单号" align="center" min-width="200">
+        <el-table-column label="跟单号" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.跟单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="序号" align="center" min-width="200">
+        <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="200">
+        <el-table-column label="工序名" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.工序名 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划数量" align="center" min-width="200">
+        <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="200">
+        <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="200">
+        <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="200">
+        <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="200">
+        <el-table-column label="计划加工日期" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.计划加工日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="加工数量" align="center" min-width="200">
+        <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="200">
+        <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="200">
+        <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="200">
           <template slot-scope="scope">
             {{ scope.row.加工工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="加工日期" align="center" min-width="200">
+        <el-table-column label="加工日期" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.加工日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号及规格" align="center" min-width="200">
+        <el-table-column label="图号及规格" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.图号及规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="制品名称" align="center" min-width="200">
+        <el-table-column label="制品名称" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.制品名称 }}
           </template>
         </el-table-column>
       </el-table>
+      <div class="block" style="margin: 10px 0;">
+        <el-pagination
+          :current-page="PageCurrent"
+          :page-sizes="[10, 20, 30, 40, 1000]"
+          :page-size="PageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
     </el-card>
   </div>
 </template>
 
 <script>
-import { initProject, initMachine } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
+import { initProject, initMachine, searchatabledata } from '@/api/ManufacturingCenter/ContractDetailsInquiry'
 export default {
   data() {
     return {
@@ -129,7 +134,10 @@ export default {
       specificationValue: '', // 规格型号
       totalProcessingHours: '', // 加工总工时
       totalPlannedHours: '', // 计划总工时
-      tableData: [] // 详情表
+      tableData: [], // 详情表
+      PageCurrent: 1,
+      PageSize: 1000,
+      total: 0
     }
   },
   created() {
@@ -150,6 +158,43 @@ export default {
           })
         }
       })
+    }, // 查询按钮
+    searchTable() {
+      this.tableData = []
+      searchatabledata(this.projectValue, this.machineValue, this.PageCurrent, this.PageSize).then(response => {
+        if (response.data.rows.length !== 0) {
+          for (let i = 0; i < response.data.rows.length; i++) {
+            this.tableData.push({
+              跟单号: response.data.rows[i].跟单号,
+              序号: response.data.rows[i].工序顺序,
+              工序名: response.data.rows[i].工艺名称,
+              计划数量: response.data.rows[i].批次数量,
+              计划准备工时: response.data.rows[i].准结定额工时,
+              单件计划工时: response.data.rows[i].单件定额工时,
+              计划工时: Number(response.data.rows[i].批次数量) * (Number(response.data.rows[i].单件定额工时) + Number(response.data.rows[i].准结定额工时)),
+              计划加工日期: response.data.rows[i].计划日期.split(' ')[0],
+              加工数量: response.data.rows[i].批次数量,
+              加工准备工时: response.data.rows[i].修补准结工时,
+              加工工时: response.data.rows[i].设备工时,
+              加工日期: response.data.rows[i].操作时间,
+              图号及规格: response.data.rows[i].机床图号,
+              制品名称: response.data.rows[i].零件名称
+            })
+            this.totalProcessingHours += Number(response.data.rows[i].设备工时)
+            this.totalPlannedHours += Number(Number(response.data.rows[i].批次数量) * (Number(response.data.rows[i].单件定额工时) + Number(response.data.rows[i].准结定额工时)))
+          }
+        }
+        this.total = response.data.total
+      })
+    },
+    handleSizeChange(val) {
+      this.PageCurrent = 1
+      this.PageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.PageCurrent = val
+      this.searchTable()
     }
   }
 }

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -29,7 +29,7 @@
         v-loading="loading"
         :data="tableData"
         height="760"
-        style="width: 1126px; margin: 3px 0"
+        style="width: 1408px; margin: 3px 0"
         size="mini"
         border
         stripe
@@ -81,6 +81,16 @@
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
+        <el-table-column label="备料任务接受时间" align="center" width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备料任务接受时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备料任务分配时间" align="center" width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备料任务分配时间 }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
@@ -217,7 +227,9 @@ export default {
               工艺要求: response.data[0].工艺要求,
               材料: this.Data[i].材料,
               重量: this.Data[i].重量,
-              批次数量: this.Data[i].批次数量
+              批次数量: this.Data[i].批次数量,
+              备料任务接受时间: this.Data[i].备料任务接受时间,
+              备料任务分配时间: this.Data[i].备料任务分配时间
             })
           })
           this.loading = false

src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue

@@ -28,7 +28,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total1=0;pageSize1 = 10000;pageCurrent1 = 1;searchData1()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 15px" @click="total1=0;pageSize1 = 10000;pageCurrent1 = 1;searchData1()">查询</el-button>
       </el-row>
     </el-card>
     <el-card style="margin-top: 15px">

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -29,7 +29,7 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-            <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10000;pageList = 1;getTable()">查询</el-button>
+            <el-button type="primary" size="small" icon="el-icon-search" style="margin-left:10px" plain @click="total = 0;pageSize = 10000;pageList = 1;getTable()">查询</el-button>
           </el-form-item>
         </el-form>
       </el-col>
@@ -103,7 +103,7 @@
             type="selection"
             align="center"
             width="35"/>
-          <el-table-column label="零件号" prop="零件图号" align="center" min-width="220">
+          <el-table-column label="零件号" prop="零件图号" align="center" min-width="150">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
             </template>
@@ -148,18 +148,20 @@
               {{ scope.row.零件类型名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="170px" fixed="right" align="center">
+          <el-table-column label="操作" width="220px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button
                 :disabled="checked_hebing"
                 size="mini"
                 type="primary"
+                icon="el-icon-star-off"
                 style="padding: 4px 8px"
                 plain
                 @click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
               <el-button
                 size="mini"
                 type="primary"
+                icon="el-icon-star-off"
                 style="padding: 4px 8px"
                 plain
                 @click="handleEditNumber(scope.$index, scope.row)">更改数量</el-button>
@@ -178,13 +180,13 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
           <el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
-            <el-button :loading="listLoading3" type="danger" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
+            <el-button :loading="listLoading3" type="danger" size="small" style="float:right;margin-left: 10px" plain @click="back">打回</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
-            <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
+            <el-button :loading="listLoading3" type="warning" size="small" style="float:right;" plain @click="production">投产</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
-            <el-button :loading="listLoading3" type="success" size="small" style="float:right;" @click="production10">备料投产</el-button>
+            <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" plain @click="production10">备料投产</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="将零件加急处理" placement="top">
             <el-checkbox v-model="checked_UrgentItem" style="float:right;margin-top:10px;margin-right:10px">是否加急</el-checkbox>

src/views/ManufacturingCenter/InventoryQuery/index.vue

@@ -6,7 +6,7 @@
           <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="success" icon="el-icon-search" size="small" 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: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
           <!--          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
         </el-row>
       </div>

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -64,7 +64,7 @@
     <el-card>
       <el-tabs type="border-card" @tab-click="selectPart">
         <el-tab-pane label="基本件">
-          <el-table :data="tableData1" :row-class-name="tableRowClassName1" 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: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
             <el-table-column label="零件名称" align="center" width="120px">
               <template slot-scope="scope">
@@ -229,15 +229,15 @@
         placeholder="选择日期"/>
       <span style="font-weight: bold">制造:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
-        <el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
+        <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>
       <span style="margin-left: 40px;font-weight: bold">金工:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
-        <el-button type="danger" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
+        <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>
       <span style="margin-left: 40px;font-weight: bold">采购:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
+        <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>
     </el-card>
     <el-card>
@@ -252,7 +252,7 @@
     <el-row>
       <el-col style="width: 400px">
         <el-card>
-          <el-table :data="tableData4" border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
+          <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">
               <template slot-scope="scope">
                 {{ scope.row.请购单编号 }}
@@ -669,11 +669,13 @@ export default {
         const _this = this
         if (route.name === 'PartAssignment') {
           _this.fetchData()
+          _this.DeliveryTime = ''
         }
       }
     }
   },
   created() {
+    this.DeliveryTime = ''
     this.fetchData()
   },
   methods: {

src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue

@@ -21,11 +21,11 @@
               :value="item.value"/>
           </el-select>
           <el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 150px;margin: 0px 10px;"/>
-          <el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
+          <el-button v-if="是否扫描 === false" size="small" type="primary" icon="el-icon-search" plain style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
-          <el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
+          <el-button v-if="是否扫描 === true" size="small" type="primary" icon="el-icon-search" plain style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
           <el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
           <el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" style="margin-left:200px" placement="top">
-            <el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
+            <el-button size="small" type="warning" plain @click="PartPlan()">零件计划变更</el-button>
           </el-tooltip>
           <el-date-picker
             v-model="startTime"
@@ -139,9 +139,9 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
         <el-tooltip :open-delay="1200" effect="dark" content="将选中零件自动排出加工工序" placement="top">
-          <el-button type="warning" size="small" icon="el-icon-download" @click="Selection">选入</el-button>
+          <el-button type="warning" size="small" icon="el-icon-download" plain @click="Selection">选入</el-button>
         </el-tooltip>
-        <el-button type="warning" size="small" icon="el-icon-download" @click="SelectionAll">全部选入</el-button>
+        <el-button type="warning" size="small" icon="el-icon-download" plain @click="SelectionAll">全部选入</el-button>
       </div>
       <div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
         <el-pagination
@@ -428,11 +428,11 @@
             @current-change="handleCurrentChange1"/>
           <div style="float:right">
             <el-tooltip :open-delay="1200" effect="dark" content="自动计算工序加工时间" placement="top">
-              <el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
+              <el-button type="warning" size="small" style="margin:5px 10px 10px 10px" plain @click="Discharge">虚拟排产</el-button>
             </el-tooltip>
-            <el-button v-if="可以确定零件计划" type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Plan" >确定零件计划</el-button>
+            <el-button v-if="可以确定零件计划" type="warning" size="small" style="margin:5px 10px 10px 10px" plain @click="Plan" >确定零件计划</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="选出重新设置零件的加工时间" placement="top">
-              <el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
+              <el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" plain @click="allOut">全部选出</el-button>
             </el-tooltip>
           </div>
         </div>

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -25,7 +25,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 150px; margin: 0px 10px" clearable/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="currentPage1=1; fetchTableData()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="currentPage1=1; fetchTableData()">查询</el-button>
       </el-row>
     </el-card>
     <el-row>
@@ -131,7 +131,6 @@
             element-loading-background="rgba(226,223,223,1)"
             height="600"
             border
-            stripe
             style="width: 510px">
             <el-table-column
               width="50px"
@@ -213,7 +212,7 @@
         <el-input v-model="inputC" auto-complete="off" style="width: 100px" size="small" />
         <span>开始工序</span>
         <el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
-        <el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
+        <el-button type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
       </div>
     </el-card>
     <el-card v-show="false">

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -3,9 +3,11 @@
     <el-card>
       <span>设备名称:</span>
       <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="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-tooltip effect="dark" content="添加新设备" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</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>
       <el-date-picker
@@ -15,10 +17,12 @@
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
       <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>
+        <!--<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>-->
+        <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>
       </el-tooltip>
       <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>
+        <!--<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>-->
+        <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
       </el-tooltip>
     </el-card>
 
@@ -74,10 +78,10 @@
             {{ scope.row.设备预留工时系数 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200px" fixed="right" >
+        <el-table-column label="操作" align="center" width="100px" fixed="right" >
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" plain style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)"/>
-            <el-button type="danger" size="mini" icon="el-icon-delete" plain @click="handleDelete(scope.row)">删除</el-button>
+            <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -194,6 +198,7 @@
 
 <script>
 import { getData, initProcessing, addTable, editTable, deleteTable, setUp, generate } from '@/api/ManufacturingCenter/WorkshopEquipmentManagement'
+import { getNowTime } from '@/utils/tool'
 export default {
   data() {
     return {
@@ -336,6 +341,13 @@ export default {
         }
       })
     },
+    ADD() {
+      this.addForm('form')
+      this.dialogFormVisible1 = true
+      this.form.contractSigningDate = getNowTime()// new Date()
+      this.temp = 1
+      this.title = '新增项目'
+    },
     submitEdit() {
       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') {
@@ -423,3 +435,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

@@ -39,18 +39,12 @@
         <!--          size="small"-->
         <!--          type="date"-->
         <!--          placeholder="请选择结束日期"/>-->
-        <el-button type="success" 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-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
-          <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 class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @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>
-        <!--<<<<<<< HEAD-->
-        <!--&lt;!&ndash;<<<<<<< HEAD&ndash;&gt;-->
-        <!--&lt;!&ndash;        &lt;!&ndash;        <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;&ndash;&gt;-->
-        <!--&lt;!&ndash;=======&ndash;&gt;-->
-        <!--&lt;!&ndash;        &lt;!&ndash;<el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;&ndash;&gt;-->
-        <!--&lt;!&ndash;&gt;>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7&ndash;&gt;-->
-        <!--=======-->
-        <!--&gt;>>>>>> 75e884a0fca545b1a478c0a0dcaf498a46cbe009-->
       </div>
     </el-card>
     <el-row>
@@ -91,14 +85,11 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="160">
               <template slot-scope="scope">
-                <el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
+                <el-button
-                  <el-button
+                  size="mini"
-                    size="mini"
+                  type="text"
-                    type="warning"
+                  icon="el-icon-circle-plus-outline"
-                    plain
+                  @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
-                    icon="el-icon-plus"
-                    @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
-                </el-tooltip>
                 <el-button
                   size="mini"
                   type="text"
@@ -126,7 +117,8 @@
       </el-col>
       <el-col style="width: 43%">
         <el-card>
-          <el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">
+          <!--<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-column label="设备型号" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -480,6 +472,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;
+    }
+  }
   .subTableHeader {
     th {
       background: #8ff4ea !important;

src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue

@@ -1,294 +1,151 @@
 <template>
   <div class="app-container">
-    <!--<el-card>-->
-    <!--<span>表单号:</span>-->
-    <!--<el-input v-model="FormNumber" placeholder="表单号" clearable size="small" style="width:190px;margin:10px;"/>-->
-    <!--<span>任务下达时间段:</span>-->
-    <!--<el-date-picker-->
-    <!--v-model="date1"-->
-    <!--style="width:190px;margin:10px;"-->
-    <!--size="small"-->
-    <!--type="date"-->
-    <!--value-format="yyyy-MM-dd"-->
-    <!--format="yyyy-MM-dd"-->
-    <!--placeholder="选择日期"/>-->
-    <!--<span>~</span>-->
-    <!--<el-date-picker-->
-    <!--v-model="date2"-->
-    <!--style="width:190px;margin:10px;"-->
-    <!--size="small"-->
-    <!--type="date"-->
-    <!--value-format="yyyy-MM-dd"-->
-    <!--format="yyyy-MM-dd"-->
-    <!--placeholder="选择日期"/>-->
-    <!--<span>实际付款时间段:</span>-->
-    <!--<el-date-picker-->
-    <!--v-model="date3"-->
-    <!--style="width:190px;margin:10px;"-->
-    <!--size="small"-->
-    <!--type="date"-->
-    <!--value-format="yyyy-MM-dd"-->
-    <!--format="yyyy-MM-dd"-->
-    <!--placeholder="选择日期"/>-->
-    <!--<span>~</span>-->
-    <!--<el-date-picker-->
-    <!--v-model="date4"-->
-    <!--style="width:190px;margin:10px;"-->
-    <!--size="small"-->
-    <!--type="date"-->
-    <!--value-format="yyyy-MM-dd"-->
-    <!--format="yyyy-MM-dd"-->
-    <!--placeholder="选择日期"/>-->
-    <!--</el-card>-->
     <el-card>
-      <el-row>
+      <el-col :span="8">
-        <span>厂家:</span>
+        <el-row>
-        <el-select v-model="ManufacturerNameValue" placeholder="选择外协厂家" filterable clearable size="small" style="width:190px;margin:10px;">
+          <span>外协厂家:</span>
-          <el-option
+          <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
-            v-for="item in ManufacturerName"
+          <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=20;getParts()">查询</el-button>
-            :key="item.value"
+        </el-row>
-            :label="item.label"
+        <el-table v-loading="loading" :data="tableData" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
-            :value="item.value"/>
+          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
-        </el-select>
+            <template slot-scope="scope">
-        <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
+              {{ scope.row.外协厂家名称 }}
-      </el-row>
+            </template>
-      <el-table v-loading="loading" :data="tableData" height="500" size="mini" stripe style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中">
+          </el-table-column>
-        <el-table-column label="序号" type="index" align="center" fixed="left" width="50"/>
+          <el-table-column label="外协金额" prop="总价" align="center" width="200px">
-        <el-table-column label="付款" prop="实际付款时间" width="65" align="center" fixed="left">
+            <template slot-scope="scope">
-          <template slot-scope="scope">
+              {{ scope.row.总价 }}
-            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
+            </template>
-            <el-tag v-else type="info" size="small">未付</el-tag>
+          </el-table-column>
-          </template>
+          <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
-        </el-table-column>
+            <template slot-scope="scope">
-        <el-table-column label="到货" prop="单据状态" width="65" align="center" fixed="left">
+              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
-          <template slot-scope="scope">
+            </template>
-            <el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
+          </el-table-column>
-            <el-tag v-else type="info" size="small">未到</el-tag>
+          <el-table-column label="付款金额" align="center">
-          </template>
+            <template slot-scope="scope">
-        </el-table-column>
+              {{ scope.row.备注 }}
-        <el-table-column label="单据号" prop="表单号" align="center" width="180px" fixed="left">
+            </template>
-          <template slot-scope="scope">
+          </el-table-column>
-            {{ scope.row.表单号 }}
+          <el-table-column label="未付金额" align="center">
-          </template>
+            <template slot-scope="scope">
-        </el-table-column>
+              {{ scope.row.备注 }}
-        <el-table-column label="外协厂家" prop="外协厂家名称" align="center" min-width="190px" show-overflow-tooltip>
+            </template>
-          <template slot-scope="scope">
+          </el-table-column>
-            {{ scope.row.外协厂家名称 }}
+          <el-table-column label="操作" align="center" width="200px">
-          </template>
+            <template slot-scope="scope">
-        </el-table-column>
+              <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-        <el-table-column label="总价" align="center" min-width="100px">
+              <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-          <template slot-scope="scope">
+            </template>
-            {{ parseFloat(scope.row.总价).toFixed(2) }}
+          </el-table-column>
-          </template>
+        </el-table>
-        </el-table-column>
+        <div class="block">
-        <el-table-column label="扣款金额" align="center" min-width="100px">
+          <el-pagination
-          <template slot-scope="scope">
+            v-if="!loading"
-            {{ parseFloat(scope.row.扣款_质量).toFixed(2) }}
+            :current-page="pageCurrent"
-          </template>
+            :page-sizes="[20, 30, 40]"
-        </el-table-column>
+            :page-size="pageSize"
-        <!--<el-table-column label="计划扣款" align="center" min-width="70px">-->
+            :total="total"
-        <!--<template slot-scope="scope">-->
+            layout="total, sizes, prev, pager, next, jumper"
-        <!--{{ scope.row.扣款_计划 }}-->
+            @size-change="handleSizeChange"
-        <!--</template>-->
+            @current-change="handleCurrentChange"/>
-        <!--</el-table-column>-->
+        </div>
-        <!--<el-table-column label="其他扣款" align="center" min-width="70px">-->
+      </el-col>
-        <!--<template slot-scope="scope">-->
+      <el-col :span="8">
-        <!--{{ scope.row.扣款_其他 }}-->
+        <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中">
-        <!--</template>-->
+          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
-        <!--</el-table-column>-->
+            <template slot-scope="scope">
-        <el-table-column label="应付金额" align="center" min-width="100px">
+              {{ scope.row.外协厂家名称 }}
-          <template slot-scope="scope">
+            </template>
-            {{ scope.row.实际付款时间 === '' ? parseFloat(scope.row.应付总额).toFixed(2) : '-' }}
+          </el-table-column>
-          </template>
+          <el-table-column label="外协金额" prop="总价" align="center" width="200px">
-        </el-table-column>
+            <template slot-scope="scope">
-        <el-table-column label="扣款说明" align="center" min-width="120px">
+              {{ scope.row.总价 }}
-          <template slot-scope="scope">
+            </template>
-            {{ scope.row.扣款说明 }}
+          </el-table-column>
-          </template>
+          <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
-        </el-table-column>
+            <template slot-scope="scope">
-        <el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="125px">
+              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
-          <template slot-scope="scope">
+            </template>
-            {{ scope.row.任务下达日期 }}
+          </el-table-column>
-          </template>
+          <el-table-column label="付款金额" align="center">
-        </el-table-column>
+            <template slot-scope="scope">
-        <el-table-column label="外协员" prop="外协员姓名" align="center" width="90px">
+              {{ scope.row.备注 }}
-          <template slot-scope="scope">
+            </template>
-            {{ scope.row.外协员姓名 }}
+          </el-table-column>
-          </template>
+          <el-table-column label="未付金额" align="center">
-        </el-table-column>
+            <template slot-scope="scope">
-        <!--<el-table-column label="加工价格" align="center">-->
+              {{ scope.row.备注 }}
-        <!--<el-table-column label="预算总价" align="center" width="85px">-->
+            </template>
-        <!--<template slot-scope="scope">-->
+          </el-table-column>
-        <!--{{ scope.row.加工价格_预算_总价 }}-->
+          <el-table-column label="操作" align="center" width="200px">
-        <!--</template>-->
+            <template slot-scope="scope">
-        <!--</el-table-column>-->
+              <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-        <!--<el-table-column label="成交总价" align="center" width="85px">-->
+              <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-        <!--<template slot-scope="scope">-->
+            </template>
-        <!--{{ scope.row.加工价格_成交_总价 }}-->
+          </el-table-column>
-        <!--</template>-->
+        </el-table>
-        <!--</el-table-column>-->
+        <div class="block">
-        <!--</el-table-column>-->
+          <el-pagination
-        <!--<el-table-column label="材料费" align="center" min-width="70px">-->
+            v-if="!loading2"
-        <!--<template slot-scope="scope">-->
+            :current-page="pageCurrent2"
-        <!--{{ scope.row.材料价格_价格_总价 }}-->
+            :page-sizes="[20, 30, 40]"
-        <!--</template>-->
+            :page-size="pageSize2"
-        <!--</el-table-column>-->
+            :total="total2"
-        <!--<el-table-column label="运费" align="center" min-width="70px">-->
+            layout="total, sizes, prev, pager, next, jumper"
-        <!--<template slot-scope="scope">-->
+            @size-change="handleSizeChange2"
-        <!--{{ scope.row.运费 }}-->
+            @current-change="handleCurrentChange2"/>
-        <!--</template>-->
+        </div>
-        <!--</el-table-column>-->
+      </el-col>
-        <!--<el-table-column label="其他费用" align="center" min-width="70px">-->
+      <el-col :span="8">
-        <!--<template slot-scope="scope">-->
+        <el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中">
-        <!--{{ scope.row.其他价格_总价 }}-->
+          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
-        <!--</template>-->
+            <template slot-scope="scope">
-        <!--</el-table-column>-->
+              {{ scope.row.外协厂家名称 }}
-        <!--<el-table-column label="总价" align="center" min-width="70px">-->
+            </template>
-        <!--<template slot-scope="scope">-->
+          </el-table-column>
-        <!--{{ scope.row.总价 }}-->
+          <el-table-column label="外协金额" prop="总价" align="center" width="200px">
-        <!--</template>-->
+            <template slot-scope="scope">
-        <!--</el-table-column>-->
+              {{ scope.row.总价 }}
-        <!--<el-table-column label="付款日期" align="center" width="240px">-->
+            </template>
-        <!--<el-table-column label="入库" align="center" min-width="70px">-->
+          </el-table-column>
-        <!--<template slot-scope="scope">-->
+          <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
-        <!--{{ scope.row.入库时间 }}-->
+            <template slot-scope="scope">
-        <!--</template>-->
+              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
-        <!--</el-table-column>-->
+            </template>
-        <!--<el-table-column label="计划" align="center" min-width="70px">-->
+          </el-table-column>
-        <!--<template slot-scope="scope">-->
+          <el-table-column label="付款金额" align="center">
-        <!--{{ scope.row.计划付款时间 }}-->
+            <template slot-scope="scope">
-        <!--</template>-->
+              {{ scope.row.备注 }}
-        <!--</el-table-column>-->
+            </template>
-        <!--<el-table-column label="实际" align="center" min-width="70px">-->
+          </el-table-column>
-        <!--<template slot-scope="scope">-->
+          <el-table-column label="未付金额" align="center">
-        <!--{{ scope.row.实际付款时间 }}-->
+            <template slot-scope="scope">
-        <!--</template>-->
+              {{ scope.row.备注 }}
-        <!--</el-table-column>-->
+            </template>
-        <!--</el-table-column>-->
+          </el-table-column>
-        <el-table-column label="操作" align="center" width="200px" fixed="right">
+          <el-table-column label="操作" align="center" width="200px">
-          <template slot-scope="scope">
+            <template slot-scope="scope">
-            <!--<el-tooltip :open-delay="1200" effect="dark" content="记录外协付款到票信息" placement="top">-->
+              <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-            <!--<el-button :disabled="scope.row.实际付款时间!==''" size="mini" type="primary" plain class="el-icon-check" @click="editType1(scope.row, 'form');param = 0">到票</el-button>-->
+              <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-            <!--</el-tooltip>-->
+            </template>
-            <el-tooltip :open-delay="1200" effect="dark" content="记录外协扣款信息" placement="top">
+          </el-table-column>
-              <el-button :disabled="scope.row.实际付款时间!==''" size="mini" type="primary" plain class="el-icon-edit" @click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
+        </el-table>
-            </el-tooltip>
+        <div class="block">
-            <el-tooltip :open-delay="1200" effect="dark" content="付款信息" placement="top">
+          <el-pagination
-              <el-button :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'" size="mini" type="success" class="el-icon-check" @click="payment(scope.$index, scope.row)">付款</el-button>
+            v-if="!loading3"
-            </el-tooltip>
+            :current-page="pageCurrent3"
-          </template>
+            :page-sizes="[20, 30, 40]"
-        </el-table-column>
+            :page-size="pageSize3"
-      </el-table>
+            :total="total3"
-      <div class="block">
+            layout="total, sizes, prev, pager, next, jumper"
-        <el-pagination
+            @size-change="handleSizeChange3"
-          v-if="!loading"
+            @current-change="handleCurrentChange3"/>
-          :current-page="pageCurrent"
+        </div>
-          :page-sizes="[20, 30, 40]"
+      </el-col>
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
     </el-card>
 
-    <el-card>
-      <el-row>
-        <span>厂家:</span>
-        <el-select v-model="ManufacturerNameValue2" placeholder="选择外协厂家" filterable clearable size="small" style="width:190px;margin:10px;">
-          <el-option
-            v-for="item in ManufacturerName2"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent2=1;pageSize2=20;getParts()">查询</el-button>
-        <el-tooltip :open-delay="1200" effect="dark" content="记录外协付款到票信息" placement="top">
-          <el-button size="small" type="primary" plain class="el-icon-check" @click="editType1('form');param = 0">到票</el-button>
-        </el-tooltip>
-      </el-row>
-      <el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" size="mini" stripe height="370" show-summary style="width: 100%;" border element-loading-text="拼命加载中">
-        <el-table-column label="厂家" prop="发票号" align="center" width="230px">
-          <template slot-scope="scope">
-            {{ scope.row.外协厂家名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="发票号" prop="发票号" align="center" width="200px">
-          <template slot-scope="scope">
-            {{ scope.row.发票号 }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="接收人" prop="接收人" align="center" width="100px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.接收人 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="开户行" align="center" width="150px" show-overflow-tooltip="">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.开户行 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="开票金额" align="center" width="130px" prop="开票金额">
-          <template slot-scope="scope">
-            {{ parseFloat(scope.row.开票金额).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="开票日期" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.开票时间 === '1900/1/1' ? '-' : scope.row.开票时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="接收日期" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.接收时间 === '1900/1/1' ? '-' : 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="200px">
-          <template slot-scope="scope">
-            <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-            <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block">
-        <el-pagination
-          v-if="!loading2"
-          :current-page="pageCurrent2"
-          :page-sizes="[20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="扣款" center style="min-height: 300px" width="500px">
-      <el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
-        <el-form-item label="扣款金额" prop="质量" style="margin-left: 70px">
-          <el-input v-model="form2.质量" placeholder="扣款金额" size="small" style="width:200px"/>
-        </el-form-item>
-        <el-form-item label="扣款说明" prop="扣款说明" style="margin-left: 70px">
-          <el-input v-model="form2.扣款说明" placeholder="扣款说明" size="small" style="width:200px"/>
-        </el-form-item>
-        <!--<el-form-item label="计划" style="margin-left: 200px">-->
-        <!--<el-input v-model="form2.计划" placeholder="计划" size="small" style="width:200px"/>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="其他" style="margin-left: 200px">-->
-        <!--<el-input v-model="form2.其他" placeholder="其他" size="small" style="width:200px"/>-->
-        <!--</el-form-item>-->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff2('form2')">取消</el-button>
-        <el-button type="primary" @click="submit2('form2')">确定</el-button>
-      </div>
-    </el-dialog>
-
     <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
         <el-row v-show="title1==='到票'">
@@ -330,38 +187,6 @@
                 placeholder="开票时间"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="开户行" prop="开户行">
-              <el-input v-model="form.开户行" placeholder="开户行" style="width:200px" clearable size="small" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="接收人" prop="接收人">
-              <el-input v-model="form.接收人" placeholder="接收人" style="width:200px" clearable size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接收时间" prop="接收时间">
-              <el-date-picker
-                v-model="form.接收时间"
-                style="width:200px"
-                size="small"
-                type="date"
-                value-format="yyyy-MM-dd"
-                format="yyyy-MM-dd"
-                clearable
-                placeholder="接收时间"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="备注">
-              <el-input v-model="form.备注" :rows="2" placeholder="备注" type="textarea" style="width:527px" clearable size="small"/>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -373,16 +198,14 @@
 </template>
 
 <script>
-import { initOutHelp, searchtable, payTime, WithdrawingEdit, getParts, edittype, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
+import { searchtable, getInvoice, getPayment, edittype, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
 export default {
   data() {
     return {
-      fukuanshijian: '',
+      ManufacturerName: '', // 外协厂家
+      外协厂家流水号: '',
       title1: '',
       dialogFormVisible: false,
-      renwudan: '',
-      count1: 0,
-      count2: 0,
       form: {
         外协厂家: '',
         发票号: '',
@@ -394,230 +217,95 @@ export default {
         备注: ''
       },
       外协厂家: [],
-      实际付款时间: '',
+      rules: {},
       loading: false,
-      loading2: false,
-      zhongjianbianliang: '',
-      dialogFormVisible2: false,
-      form2: {
-        质量: '',
-        计划: '',
-        其他: '',
-        扣款说明: ''
-      },
-      rules: {
-        外协厂家: [{ required: true, message: '请选择外协厂家', trigger: 'change' }],
-        发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
-        开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
-        质量: [{ required: true, message: '请输入扣款金额', trigger: 'blur' }],
-        扣款说明: [{ required: true, message: '请输入扣款说明', trigger: 'blur' }]
-      },
-      date1: '',
-      date2: '',
-      date3: '',
-      date4: '',
-      FormNumber: '',
-      ManufacturerNameValue: '',
-      ManufacturerName: [], // 厂家名称
-      ManufacturerNameValue2: '',
-      ManufacturerName2: [], // 厂家名称
-      FormNumber_check: false,
-      ManufacturerNameValue_check: false,
-      date1_check: false,
-      date3_check: false,
       tableData: [], // 表格数据
       total: null, // 总条数
       pageSize: 20, // 每页显示条数
       pageCurrent: 1, // 后台获取页
+      loading2: false,
       tableData2: [], // 表格数据
       total2: null, // 总条数
       pageSize2: 20, // 每页显示条数
-      pageCurrent2: 1 // 后台获取页
+      pageCurrent2: 1, // 后台获取页
+      loading3: false,
+      tableData3: [], // 表格数据
+      total3: null, // 总条数
+      pageSize3: 20, // 每页显示条数
+      pageCurrent3: 1 // 后台获取页
     }
   },
   created() {
-    this.fetchData()
-    this.searchTable()
     this.getParts()
   },
   methods: {
-    getSummaries(param) {
+    // 获取表格1数据
-      const { data } = param
-      const sums = ['', '', 0, '', '', '', '']
-      sums[0] = '合计'
-      for (let i = 0; i < data.length; i++) {
-        sums[2] += parseInt(data[i].开票金额)
-      }
-      // sums[2] = Math.round(sums[2] * 100) / 100 + ' 元'
-      sums[2] = parseFloat(sums[2]).toFixed(2) + ' 元'
-      return sums
-    },
-    // 初始化外协厂家
-    fetchData() {
-      this.ManufacturerName = []
-      this.ManufacturerName2 = []
-      this.外协厂家 = []
-      initOutHelp().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.ManufacturerName.push({
-            label: response.data[i].外协厂家名称,
-            value: response.data[i].外协厂家流水号
-          })
-          this.ManufacturerName2.push({
-            label: response.data[i].外协厂家名称,
-            value: response.data[i].外协厂家流水号
-          })
-          this.外协厂家.push({
-            label: response.data[i].外协厂家名称,
-            value: response.data[i].外协厂家流水号
-          })
-        }
-      })
-    },
-    // 查询表格数据
-    searchTable() {
-      this.loading = true
-      if (this.FormNumber === '' || this.FormNumber === null) {
-        this.FormNumber_check = false
-      } else {
-        this.FormNumber_check = true
-      }
-      if (this.ManufacturerNameValue === '' || this.ManufacturerNameValue === null) {
-        this.ManufacturerNameValue_check = false
-      } else {
-        this.ManufacturerNameValue_check = true
-      }
-      if (this.date1 === '' || this.date1 === null) {
-        this.date1_check = false
-      } else {
-        this.date1_check = true
-      }
-      if (this.date3 === '' || this.date3 === null) {
-        this.date3_check = false
-      } else {
-        this.date3_check = true
-      }
-      this.tableData = []
-      searchtable(this.FormNumber_check, this.FormNumber, this.ManufacturerNameValue_check, this.ManufacturerNameValue, this.date1_check, this.date1, this.date2, this.date3_check, this.date3, this.date4, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substring(0, response.data.rows[i].任务下达日期.indexOf(' '))
-          response.data.rows[i].实际付款时间 = response.data.rows[i].实际付款时间.substring(0, response.data.rows[i].实际付款时间.indexOf(' '))
-        }
-        this.tableData = response.data.rows
-        this.total = response.data.total
-      }).then(() => {
-        this.loading = false
-      })
-    },
-    // 付款
-    payment(index, row) {
-      this.$confirm('请仔细核对信息，确定后不可更改, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'success'
-      }).then(() => {
-        var time = new Date()
-        var month = time.getMonth() + 1
-        var day = time.getDate()
-        if (month >= 1 && month <= 9) {
-          month = '0' + month
-        }
-        if (day >= 1 && day <= 9) {
-          day = '0' + day
-        }
-        this.实际付款时间 = time.getFullYear() + '/' + month + '/' + day
-        payTime(row.外协加工任务单流水号, this.实际付款时间).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('付款成功')
-            this.searchTable()
-          } else {
-            this.$message.error('付款失败')
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消付款'
-        })
-      })
-    },
-    // 打开扣款编辑
-    Withdrawing(index, row) {
-      if (this.$refs['form2'] !== undefined) {
-        this.$refs['form2'].resetFields()
-      }
-      this.form2.质量 = row.扣款_质量
-      this.form2.计划 = row.扣款_计划
-      this.form2.其他 = row.扣款_其他
-      this.form2.扣款说明 = row.扣款说明
-      this.liushuihao = row.外协加工任务单流水号
-      this.dialogFormVisible2 = true
-    },
-    // 扣款编辑确定
-    submit2(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.WithdrawingEdit()
-        }
-      })
-    },
-    // 扣款编辑
-    WithdrawingEdit() {
-      WithdrawingEdit(this.liushuihao, this.form2.质量, this.form2.扣款说明).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('修改成功')
-          this.searchTable()
-        } else {
-          this.$message.error('修改失败')
-        }
-        this.dialogFormVisible2 = false
-      })
-    },
-    // 关闭扣款编辑
-    callOff2(formName) {
-      this.dialogFormVisible2 = false
-      this.$refs[formName].resetFields()
-    },
-    // 获取表格2数据
     getParts() {
+      this.loading = true
+      this.tableData = []
+      var check
+      var check2 = 0
+      this.ManufacturerName ? check = 1 : check = 0
+      searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent, this.pageSize).then(response => {
+        this.loading = false
+        if (response.data.rows.length !== 0) {
+          this.tableData = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    rowClick(row) {
+      this.外协厂家流水号 = row.外协厂家流水号
       this.loading2 = true
       this.tableData2 = []
-      let check
+      this.loading3 = true
-      this.ManufacturerNameValue2 ? check = 1 : check = 0
+      this.tableData3 = []
-      getParts(check, this.ManufacturerNameValue2, this.pageCurrent2, this.pageSize2).then(response => {
+      getInvoice(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 2)
+        this.loading2 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData2 = response.data.rows
+          this.total2 = response.data.total
+        }
+      })
+      getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 3)
+        this.loading3 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData3 = response.data.rows
+          this.total3 = response.data.total
+        }
+      })
+    },
+    // 发票
+    getInvoice(row) {
+      this.loading2 = true
+      this.tableData2 = []
+      getInvoice(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 2)
         this.loading2 = false
         if (response.data.rows.length !== 0) {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
-            response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
-          }
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
         }
       })
     },
-    getParts2() {
+    // 付款
-      this.loading2 = true
+    getPayment(row) {
-      this.tableData2 = []
+      this.loading3 = true
-      getParts(this.zhongjianbianliang, this.pageCurrent2, this.pageSize2).then(response => {
+      this.tableData3 = []
-        for (let i = 0; i < response.data.rows.length; i++) {
+      getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
-          response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
+        console.log(response.data, 3)
-          response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+        this.loading3 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData3 = response.data.rows
+          this.total3 = response.data.total
         }
-        this.tableData2 = response.data.rows
-        this.total2 = response.data.total
-      }).then(() => {
-        this.loading2 = false
       })
     },
     // 点击增加
     editType1(formName) {
-      this.count1 = this.count1 + 1
-      if (this.count1 !== 1) {
-        this.$refs[formName].resetFields()
-      }
       this.title1 = '到票'
-      // this.renwudan = row.外协加工任务单流水号
       this.form.发票号 = ''
       this.form.开户行 = ''
       this.form.开票时间 = ''
@@ -646,16 +334,6 @@ export default {
     },
     // 编辑打开
     handleChange1(index, row, formName) {
-      this.count2 = this.count2 + 1
-      if (this.count2 !== 1) {
-        this.$refs[formName].resetFields()
-      }
-      if (row.开票时间 === '1900/1/1') {
-        row.开票时间 = ''
-      }
-      if (row.接收时间 === '1900/1/1') {
-        row.接收时间 = ''
-      }
       this.form.外协厂家 = row.外协厂家流水号
       this.form.发票号 = row.发票号
       this.form.开户行 = row.开户行
@@ -711,8 +389,8 @@ export default {
         type: 'warning'
       }).then(() => {
         handledelete(row.id).then(response => {
-          if (this.tableData2 && this.tableData2.length === 1 && this.pageCurrent2 > 1) {
+          if (this.tableData && this.tableData.length === 1 && this.pageCurrent > 1) {
-            this.pageCurrent2--
+            this.pageCurrent--
           }
           if (response.data[0].result === '1') {
             this.$notify({
@@ -736,21 +414,29 @@ export default {
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
-      this.searchTable()
+      this.getParts()
     },
     handleCurrentChange(val) {
       this.pageCurrent = val
-      this.searchTable()
+      this.getParts()
     },
     handleSizeChange2(val) {
       this.pageCurrent2 = 1
       this.pageSize2 = val
-      this.getParts()
+      this.getInvoice()
     },
     handleCurrentChange2(val) {
       this.pageCurrent2 = val
-      this.tableData2 = []
+      this.getInvoice()
-      this.getParts()
+    },
+    handleSizeChange3(val) {
+      this.pageCurrent3 = 1
+      this.pageSize3 = val
+      this.getPayment()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.getPayment()
     }
   }
 }
@@ -764,4 +450,3 @@ export default {
     background: #AEF199;
   }
 </style>
-

src/views/Outsourcing/OutsourcingQCSearch/index.vue

@@ -1,10 +1,9 @@
 <template>
   <div class="app-container">
     <el-card>
-
+      <el-input v-model="orderNumber" clearable style="width: 210px;margin:0px 10px" placeholder="输入外协到货单或外协厂家" size="small"/>
-      <el-input v-model="orderNumber" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协到货单" size="small"/>
       <!--      <span style="margin-left: 10px">外协厂家:</span>-->
-      <el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>
+      <!--      <el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>-->
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
         <el-table-column label="序号" align="center" width="55" type="index"/>
@@ -20,7 +19,7 @@
         </el-table-column>
         <el-table-column label="创建日期" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.操作日期 }}
+            {{ scope.row.操作日期.split(' ')[0] }}
           </template>
         </el-table-column>
       </el-table>
@@ -47,7 +46,7 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center" width="70px">
+        <el-table-column label="零件数" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
@@ -57,12 +56,12 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="检验数量" align="center" width="70px">
+        <el-table-column label="检验数" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.数量 || 0 }}
           </template>
         </el-table-column>
-        <el-table-column label="不合格数量" align="center" min-width="140px">
+        <el-table-column label="不合格数" align="center" min-width="140px">
           <template slot-scope="scope">
             {{ scope.row.不合格数量 || 0 }}
           </template>
@@ -79,7 +78,7 @@
         </el-table-column>
         <el-table-column label="检验时间" align="center" min-width="135px">
           <template slot-scope="scope">
-            {{ scope.row.操作时间 || '—' }}
+            {{ scope.row.操作时间.split(' ')[0] || '—' }}
           </template>
         </el-table-column>
         <el-table-column label="形位" align="center" width="90px">
@@ -103,7 +102,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -128,7 +127,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -153,7 +152,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
             </el-popover>
           </template>
         </el-table-column>

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -84,6 +84,7 @@
         <span>厂家:</span>
         <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()" @clear="pageSize=20;pageList=1;fetchData()"/>
         <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
+        <el-checkbox v-model="isChecked" size="small" label="编辑已提交"/>
         <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
         <el-table v-loading="loading2" :data="List" highlight-current-row height="450" size="mini" stripe border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
@@ -341,6 +342,7 @@ export default {
   },
   data() {
     return {
+      isChecked: false,
       bianliang: [],
       card: false,
       费用: '',
@@ -536,7 +538,7 @@ export default {
       }
       this.List = []
       this.List3 = []
-      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize, this.documentStatus, this.num3).then(response => {
+      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize, this.documentStatus, this.num3, this.isChecked).then(response => {
         this.total = parseInt(response.data.total)
         for (let i = 0; i < response.data.rows.length; i++) {
           if (response.data.rows[i].任务下达日期 !== null) {

src/views/WorkshopProcurement/ExcelExport/index.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="app-container">
+    <el-button
+      type="success"
+      size="small"
+      style="margin-left:10px"
+      @click="downloadExcel()">导出Excel模板1</el-button>
+    <el-button
+      type="success"
+      size="small"
+      style="margin-left:10px"
+      @click="downloadExce2()">导出Excel模板2</el-button>
+    <el-button
+      type="success"
+      size="small"
+      style="margin-left:10px"
+      @click="downloadExce3()">导出Excel模板3</el-button>
+    <el-button
+      type="success"
+      size="small"
+      style="margin-left:10px"
+      @click="downloadExce4()">导出Excel模板4</el-button>
+    <el-button
+      type="success"
+      size="small"
+      style="margin-left:10px"
+      @click="downloadExce5()">导出Excel模板5</el-button>
+    <el-button
+      type="success"
+      size="small"
+      style="margin-left:10px"
+      @click="downloadExce6()">导出Excel模板6</el-button>
+    <el-button
+      type="success"
+      size="small"
+      style="margin-left:10px"
+      @click="downloadExce7()">导出Excel模板7</el-button>
+    <el-button
+      type="success"
+      size="small"
+      style="margin-left:10px"
+      @click="downloadExcel8()">导出Excel模板8</el-button>
+  </div>
+</template>
+
+<script>
+import { ExcelDownLoad } from '@/utils/request'
+export default {
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+    // 模板1
+    downloadExcel() {
+      var param = []
+      param[0] = ['发票流水号', 1]
+      param[1] = ['供应商名称', 2]
+      // var data = this.CreateData(1, name: 2, param)
+      var data = this.CreateData(1, 2, param)
+      console.log(data)
+      const _ExcelDownLoad = ExcelDownLoad
+      this.download(`${_ExcelDownLoad}?Fapiao=${data}`)
+    },
+    // 模板2
+    downloadExce2() {
+      var param = []
+      param[0] = ['发票流水号', 1]
+      param[1] = ['供应商名称', 2]
+      var data = this.CreateData(1, 2, param)
+      console.log(data)
+      const _ExcelDownLoad = ExcelDownLoad
+      this.download(`${_ExcelDownLoad}?Fapiao=${data}`)
+    },
+    // 模板3
+    downloadExce3() {
+      var param = []
+      param[0] = ['发票流水号', 1]
+      param[1] = ['供应商名称', 2]
+      var data = this.CreateData(1, 2, param)
+      console.log(data)
+      const _ExcelDownLoad = ExcelDownLoad
+      this.download(`${_ExcelDownLoad}?Fapiao=${data}`)
+    },
+    // 模板4
+    downloadExce4() {
+      var param = []
+      param[0] = ['发票流水号', 1]
+      param[1] = ['供应商名称', 2]
+      var data = this.CreateData(1, 2, param)
+      console.log(data)
+      const _ExcelDownLoad = ExcelDownLoad
+      this.download(`${_ExcelDownLoad}?Fapiao=${data}`)
+    },
+    // 模板5
+    downloadExce5() {
+      var param = []
+      param[0] = ['发票流水号', 1]
+      param[1] = ['供应商名称', 2]
+      var data = this.CreateData(1, 2, param)
+      console.log(data)
+      const _ExcelDownLoad = ExcelDownLoad
+      this.download(`${_ExcelDownLoad}?Fapiao=${data}`)
+    },
+    // 模板6
+    downloadExce6() {
+      var param = []
+      param[0] = ['发票流水号', 1]
+      param[1] = ['供应商名称', 2]
+      var data = this.CreateData(1, 2, param)
+      console.log(data)
+      const _ExcelDownLoad = ExcelDownLoad
+      this.download(`${_ExcelDownLoad}?Fapiao=${data}`)
+    },
+    // 模板7
+    downloadExce7() {
+      var param = []
+      param[0] = ['发票流水号', 1]
+      param[1] = ['供应商名称', 2]
+      var data = this.CreateData(1, 2, param)
+      console.log(data)
+      const _ExcelDownLoad = ExcelDownLoad
+      this.download(`${_ExcelDownLoad}?Fapiao=${data}`)
+    },
+    // 模板8
+    downloadExcel8() {
+      var param = []
+      param[0] = ['发票流水号', 1]
+      param[1] = ['供应商名称', 2]
+      var data = this.CreateData(1, 2, param)
+      console.log(data)
+      const _ExcelDownLoad = ExcelDownLoad
+      this.download(`${_ExcelDownLoad}?Fapiao=${data}`)
+    },
+    /**
+     * 下载
+     * @param  {String} url 目标文件地址
+     * @param  {String} filename 想要保存的文件名称
+     */
+    download(url) {
+      this.getBlob(url, function(blob, filename) {
+        saveAs(blob, filename)
+      })
+    },
+    getBlob(url, cb) {
+      var xhr = new XMLHttpRequest()
+      xhr.open('GET', url, true)
+      xhr.responseType = 'blob'
+      xhr.onload = function() {
+        if (xhr.status === 200) {
+          console.log(xhr, 1111)
+          const name = xhr.getResponseHeader('content-disposition').split('=')[1]
+          cb(xhr.response, name)
+        }
+      }
+      xhr.send()
+    }
+  }
+}
+/**
+ * 保存
+ * @param  {Blob} blob
+ * @param  {String} filename 想要保存的文件名称
+ */
+function saveAs(blob, filename = '下载文件.xls') {
+  if (window.navigator.msSaveOrOpenBlob) {
+    navigator.msSaveBlob(blob, filename)
+  } else {
+    var link = document.createElement('a')
+    var body = document.querySelector('body')
+    link.href = window.URL.createObjectURL(blob)
+    link.download = filename
+    // fix Firefox
+    link.style.display = 'none'
+    body.appendChild(link)
+    link.click()
+    body.removeChild(link)
+    window.URL.revokeObjectURL(link.href)
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/WorkshopProcurement/OfflineProcurement/index.vue

@@ -58,30 +58,30 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block">
+      <!--<div class="block">-->
-        <el-pagination
+      <!--<el-pagination-->
-          :current-page="pageCurrent10"
+      <!--:current-page="pageCurrent10"-->
-          :page-sizes="[10, 20, 30, 40]"
+      <!--:page-sizes="[10, 20, 30, 40]"-->
-          :page-size="pageSize10"
+      <!--:page-size="pageSize10"-->
-          :total="total10"
+      <!--:total="total10"-->
-          style="display:inline-block;width:50%"
+      <!--style="display:inline-block;width:50%"-->
-          layout="total, sizes, prev, pager, next, jumper"
+      <!--layout="total, sizes, prev, pager, next, jumper"-->
-          @size-change="handleSizeChange10"
+      <!--@size-change="handleSizeChange10"-->
-          @current-change="handleCurrentChange10"/>
+      <!--@current-change="handleCurrentChange10"/>-->
-      </div>
+      <!--</div>-->
     </el-card>
     <el-card style="width: 1137px">
       <span>离线备料单号:</span>
       <el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px" clearable/>
       <span style="margin-left: 10px">供应商:</span>
-      <el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable>
+      <el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable @change="searchTable">
         <el-option
           v-for="item in supplierNames"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable()">查询</el-button>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
       <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
       <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
       <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
@@ -137,17 +137,17 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block">
+      <!--<div class="block">-->
-        <el-pagination
+      <!--<el-pagination-->
-          :current-page="pageCurrent2"
+      <!--:current-page="pageCurrent2"-->
-          :page-sizes="[10, 20, 30, 40]"
+      <!--:page-sizes="[10, 20, 30, 40]"-->
-          :page-size="pageSize2"
+      <!--:page-size="pageSize2"-->
-          :total="total2"
+      <!--:total="total2"-->
-          style="display:inline-block;width:50%"
+      <!--style="display:inline-block;width:50%"-->
-          layout="total, sizes, prev, pager, next, jumper"
+      <!--layout="total, sizes, prev, pager, next, jumper"-->
-          @size-change="handleSizeChange2"
+      <!--@size-change="handleSizeChange2"-->
-          @current-change="handleCurrentChange2"/>
+      <!--@current-change="handleCurrentChange2"/>-->
-      </div>
+      <!--</div>-->
     </el-card>
     <el-card style="width: 1137px">
       <el-table v-loading="" :data="tableData3" stripe highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
@@ -402,7 +402,7 @@ export default {
             })
           }
         })
-        this.getTableData()
+        // this.getTableData()
       }
     }, // 获取组号
     getGroup() {
@@ -415,7 +415,7 @@ export default {
             value: response.data[i].组件流水号
           })
         }
-        this.Group = response.data[0].组件流水号
+        // this.Group = response.data[0].组件流水号
       })
       this.getTableData()
     },
@@ -442,6 +442,10 @@ export default {
     // 按条件查询
     getTableData() {
       this.tableData10 = []
+      if (!this.Machine && !this.Group && !this.number) {
+        this.$message.error('请输入筛选条件！')
+        return
+      }
       if (this.Machine === '') {
         this.checkbox_Machine = 0
       } else {
@@ -457,21 +461,20 @@ export default {
       } else {
         this.checkbox_number = 1
       }
-      getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10, this.ordername, this.order).then(response => {
+      getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.ordername, this.order).then(response => {
-        if (response.data.rows.length !== 0) {
+        if (response.data.length !== 0) {
-          for (let i = 0; i < response.data.rows.length; i++) {
+          for (let i = 0; i < response.data.length; i++) {
             this.tableData10.push({
-              工艺计划流水号: response.data.rows[i].工艺计划流水号,
+              工艺计划流水号: response.data[i].工艺计划流水号,
-              机床图号: response.data.rows[i].机床图号,
+              机床图号: response.data[i].机床图号,
-              组号: response.data.rows[i].组号,
+              组号: response.data[i].组号,
-              零件图号: response.data.rows[i].零件图号,
+              零件图号: response.data[i].零件图号,
-              零件名称: response.data.rows[i].零件名称,
+              零件名称: response.data[i].零件名称,
-              批次数量: response.data.rows[i].批次数量,
+              批次数量: response.data[i].批次数量,
-              材料: response.data.rows[i].材料
+              材料: response.data[i].材料
             })
           }
         }
-        this.total10 = response.data.total
         this.loading = false
       })
     },
@@ -492,11 +495,16 @@ export default {
       }
     },
     searchTable() {
+      this.tableData = []
+      if (!this.purchasingOrder && !this.supplierName) {
+        this.$message.error('请输入筛选条件！')
+        return
+      }
       this.purchasingOrder ? this.check3 = 1 : this.check3 = 0
       this.supplierName ? this.check4 = 1 : this.check4 = 0
-      searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, this.check4, this.supplierName).then(response => {
+      searchPurchaseOrder(this.check3, this.purchasingOrder, this.check4, this.supplierName).then(response => {
-        this.tableData = response.data.rows
+        this.tableData = response.data
-        this.total2 = response.data.total
+        // this.total2 = response.data.total
       })
     },
     handleSizeChange2(val) { // 采购单列表分页

src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 72%">
+    <el-card style="width: 76%">
       <div style="margin-top: 7px; margin-bottom: 7px">
         <span>供应商</span>
         <el-select v-model="supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable clearable>
@@ -20,11 +20,24 @@
             :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-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
         <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
       </div>
     </el-card>
-    <el-card style="width: 72%">
+    <el-card style="width: 76%">
       <el-table
         v-loading="loading"
         :data="tableData"
@@ -33,7 +46,8 @@
         stripe
         size="mini"
         style="width: 100%"
-        height="760">
+        height="760"
+        @sort-change="sortChange">
         <el-table-column
           label="序号"
           align="center"
@@ -52,7 +66,11 @@
         <el-table-column
           label="供应商"
           align="center"
-          min-width="210px">
+          min-width="210px"
+          width="300"
+          prop="供应商名称"
+          sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.供应商名称 }}</template>
         </el-table-column>
         <el-table-column
@@ -64,12 +82,16 @@
         <el-table-column
           label="物料名称"
           align="center"
+          prop="零件名称"
+          sortable="custom"
           width="120px">
           <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
         </el-table-column>
         <el-table-column
           label="材料"
-          width="100"
+          width="90"
+          prop="材料"
+          sortable="custom"
           align="center">
           <template slot-scope="scope">{{ scope.row.材料 }}</template>
         </el-table-column>
@@ -78,7 +100,7 @@
             {{ scope.row.采购数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="备料时间" align="center" width="100">
+        <el-table-column label="备料时间" align="center" prop="下单日期" sortable="custom" width="100">
           <template slot-scope="scope">
             {{ scope.row.下单日期 ? scope.row.下单日期.split(' ')[0] : '' }}
           </template>
@@ -122,6 +144,37 @@ export default {
   name: 'Index',
   data() {
     return {
+      ordername: '',
+      order: '',
+      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])
+          }
+        }]
+      },
       supplierNameValue: '',
       supplierNames: [],
       partNumber: '',
@@ -145,7 +198,7 @@ export default {
   },
   created() {
     this.fetchData()
-    this.getTableData()
+    // this.getTableData()
   },
   methods: {
     formatJson(filterVal, jsonData) {
@@ -154,7 +207,8 @@ export default {
       }))
     },
     exportExcel() {
-      let check, check1, check2
+      let check, check1, check2, check3
+      this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
       this.supplierNameValue ? check = 1 : check = 0
       this.partNumber ? check1 = 1 : check1 = 0
       if (this.MaterialsValue !== '' && this.MaterialsValue !== null) {
@@ -162,11 +216,11 @@ export default {
       } else {
         check2 = 0
       }
-      searchTablesheet(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue).then(res => {
+      searchTablesheet(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order).then(res => {
         console.log(res.data, 11)
         import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = ['备料状态', '供应商', '物料编码', '物料名称', '材料', '备件件数', '备料时间', '到货件数', '到货时间', '结算时间']
+          const tHeader = ['备料状态', '供应商', '物料编码', '物料名称', '材料', '备料件数', '备料时间', '到货件数', '到货时间', '结算时间']
-          const filterVal = ['是否到货', '供应商名称', '物料编码', '零件名称', '材料', '采购数量', '下单日期', '到货数量', '日期', '开票时间']
+          const filterVal = ['备料状态', '供应商名称', '物料编码', '零件名称', '材料', '采购数量', '下单日期', '到货数量', '日期', '开票时间']
           const list = res.data
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel({
@@ -189,9 +243,31 @@ export default {
         }
       })
     },
+    // 按供应商名称，下单日期，零件名称，材料
+    sortChange(column) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '供应商名称') {
+        this.ordername = 1
+      } else if (column.prop === '零件名称') {
+        this.ordername = 2
+      } else if (column.prop === '材料') {
+        this.ordername = 3
+      } else if (column.prop === '下单日期') {
+        this.ordername = 4
+      } else {
+        this.ordername = ''
+      }
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.getTableData()
+    },
     getTableData() {
       this.loading = true
-      let check, check1, check2
+      let check, check1, check2, check3
+      this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
       this.supplierNameValue ? check = 1 : check = 0
       this.partNumber ? check1 = 1 : check1 = 0
       if (this.MaterialsValue !== '' && this.MaterialsValue !== null) {
@@ -199,8 +275,8 @@ export default {
       } else {
         check2 = 0
       }
-      console.log(this.MaterialsValue, check2, 123)
+      searchTable(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order, this.pageSize, this.pageCurrent).then(response => {
-      searchTable(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, this.pageSize, this.pageCurrent).then(response => {
+        console.log(response)
         this.tableData = response.data.rows
         this.total = response.data.total
         this.loading = false

src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue

@@ -300,7 +300,7 @@ export default {
       this.searchTable1()
     },
     requestFund() { // 请款
-      this.searchTable01()
+      // this.searchTable01()
       this.dialogVisible2 = true
       this.supplierValue = ''
       this.fetchData() // 重新获取供应商
@@ -333,7 +333,7 @@ export default {
           } else { this.$message.error('请款失败') }
         })
       } else {
-        this.$message.error('请选择需要请款的合同')
+        this.$message.error('请选择供应商及对应请款合同')
       }
     },
     searchTable02(row) { // 查看详情（请款信息包含的合同）