meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
caoxinyu
2019-01-04 20:57:24 +08:00
parent b3ef8975f4 b66b3cd65c
commit 853e6a029b
61 changed files with 1230 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
index.html
View File

@@ -8,6 +8,31 @@
<body>
<script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>
<div id="app"></div>
<script>
if (window.console) {
console.log(`%c
_ooOoo_
o8888888o
88" . "88
(| -_- |)
O\\ = /O
____/\`---'\\____
.' \\\\| |// \`.
/ \\\\||| : |||// \\
/ _||||| -:- |||||- \\
| | \\\\\\ - /// | |
| \\_| ''\\---/'' | |
\\ .-\\__ \`-\` ___/-. /
___\`. .' /--.--\\ \`. . __
."" '< \`.___\\_<|>_/___.' >'"".
| | : \`- \\\`.;\`\\ _ /\`;.\`/ - \` : | |
\\ \\ \`-. \\_ __\\ /__ _/ .-\` / /
======\`-.____\`-.___\\_____/___.-\`____.-'======
\`=---='
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
佛祖保佑 永无BUG`, 'color:#fcaf17')
}
</script>
<!-- built files will be auto injected -->
</body>
</html>

1
package.json
View File

@@ -13,6 +13,7 @@
"svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
},
"dependencies": {
"@xkeshi/vue-barcode": "^1.0.0",
"axios": "0.18.0",
"echarts": "^4.2.0-rc.2",
"element-ui": "2.4.6",

2
src/api/BasicData/ShiftManagement.js
View File

@@ -60,7 +60,7 @@ export function deleteShift(shiftCode) {
}
})
}
// 删除班次
// 班次类型与工作时间增加
export function addShiftType() {
return request({
url: '',

30
src/api/Inventory/InventoryCheck.js
View File

@@ -105,7 +105,7 @@ export function searchStandardPartOut(data1) {
data: {
type: '1',
name: '库存管理_库存盘点_标准件出库记录',
param: '组件零件流水号=' + data1
param: '采购合同明细流水号=' + data1
}
})
}
@@ -211,15 +211,39 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p
}
})
}
// 车间采购外购件出库记录查询
export function searchShopPurchasePartOut(teampart) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_库存盘点_车间外购件出库记录',
param: '请购单明细流水号=' + teampart
}
})
}
// 车间采购外购件入库记录查询
export function searchShopPurchasePartIn(teampart) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_库存盘点_车间外购件入库记录',
param: '请购单明细流水号=' + teampart
}
})
}
// 车间采购库存盘点修改
export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, alterdate, craftnumber, materialType, materiallocate) {
export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, craftnumber, materialType, materiallocate, name, mode, picture, type, material) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_库存盘点_修改数量',
param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate
param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate + '&名称=' + name + '&规格=' + mode + '&图号=' + picture + '&型号=' + type + '&材料=' + material
}
})
}

4
src/api/Inventory/InventoryManagement.js
View File

@@ -12,14 +12,14 @@ export function initWarehouse() {
})
}
// 增加仓库
export function addWarehouse(num0, num1, num2, num3, num4) {
export function addWarehouse(num0, num1, num2, num3, num4, num5) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_货位仓库_仓库_增加数据',
param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num4
param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num5
}
})
}

4
src/api/Inventory/OfflinePurchase.js
View File

@@ -74,14 +74,14 @@ export function addRequestCardDetail(data1, data2) {
})
}
// 请购单明细修改
export function alterNumber(data1, data2, data3) {
export function alterNumber(data2, data3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_离线请购单_请购单明细修改',
param: '离线请购单流水号=' + data1 + '&离线请购单明细流水号组=' + data2 + '&数量组=' + data3
param: '离线请购单明细流水号组=' + data2 + '&数量组=' + data3
}
})
}

35
src/api/Inventory/PartOut.js
View File

@@ -36,15 +36,28 @@ export function ListDetailOut(listNumber) {
}
})
}
// 交换件查询
export function ExchangeOut(listNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_零件出库_交换件查询',
param: '领料单流水号=' + listNumber
}
})
}
// 外购件零件出库
export function PurchasePart(data1, data2, data3, data4, data5) {
export function PurchasePart(data1, data2, data3, data4, data5, data6) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_外购件出库_修改数据',
param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
}
})
}
@@ -61,18 +74,18 @@ export function BasicPart(data1, data2, data3, data4, data5) {
})
}
// 车间采购件零件出库
export function WorkShopPart(data1, data2, data3, data4, data5) {
export function WorkShopPart(data1, data2, data3, data4, data5, data6) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_车间采购出库_修改数据',
param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
}
})
}
// 车间采购件零件出库
// 异常出库
export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) {
return request({
url: '',
@@ -84,3 +97,15 @@ export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8,
}
})
}
// 交换出库
export function ExchangePartOut(data0, data1, data2, data3, data4, data5) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_交换件出库_修改数据',
param: '交换单流水号=' + data0 + '&采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
}
})
}

10
src/api/Inventory/SubstitutePart.js
View File

@@ -36,26 +36,26 @@ export function searchTeam(machineNumber) {
})
}
// 外购件、标准件查询
export function searchPurchasePart(project_check, project, machine_check, machine, group_check, group) {
export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_外购件出库_零件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 被替换件查询
export function searchSubstituted(material_check, material) {
export function searchSubstituted() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_替换件_被替换件查询',
param: '物料名称_check=' + material_check + '&物料名称=' + material
name: '库存管理_离线外购件_出库查询'
}
})
}

11
src/api/ManufacturingCenter/MaterialArrivalManagement.js
View File

@@ -49,3 +49,14 @@ export function handlechange(Number, code) {
}
})
}
export function change(Number, code, num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_备料到货更改',
param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num
}
})
}

4
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) {
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_工艺拷贝_工艺流水号',
param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
}
})
}

66
src/api/ManufacturingCenter/RepairTimeEntry.js
View File

@@ -12,6 +12,50 @@ export function searchTechnology(num) {
}
})
}
export function getNames() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
}
})
}
export function getMachines(gongyi) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
param: '项目流水号=' + gongyi + '=int'
}
})
}
export function getGroups(stepNumber) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
param: '机床流水号=' + stepNumber + '=int'
}
})
}
export function getParts(stepNumber, a, b, c, d, e, f, g) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理_基础表_员工月修补工时_查询零件',
param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0'
}
})
}
// 查询人员编号
export function searchperson(num) {
return request({
@@ -31,33 +75,45 @@ export function searchtable(check, num, pageCurrent, pageSize) {
method: 'post',
data: {
type: '1',
name: '车间生产管理_基础表_员工月修补工时_查询数据',
name: '车间生产管理_基础表_员工月修补工时_查询数据_MESWORK',
param: '人员编号_check=' + check + '&人员编号=' + num,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 增加
export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) {
export function edittype(num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_增加数据',
param: '人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName
param: '工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2
}
})
}
// 编辑
export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) {
export function handlechange(CoManufacturerFlowNumber, num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_修改数据',
param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName
param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2
}
})
}
// 删除工艺信息
export function delList(MaterialCode) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理_基础表_员工月修补工时_删除数据',
param: '员工月修补工时流水号=' + MaterialCode
}
})
}

6
src/api/WorkshopProcurement/AccountingPrice.js
View File

@@ -7,19 +7,19 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
name: '车间采购管理_采购合同_查询'
}
})
}
// 查询表1
export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
export function searchParts(pageCurrent, pageSize, check1, num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_核算价格_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}`,
Pagination: pageCurrent + '&' + pageSize
}
})

6
src/api/WorkshopProcurement/ProcurementContractApproval.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_未审批查询'
}
})
}
@@ -60,14 +60,14 @@ export function searchTable3(num) {
}
})
}
export function submitApproval(num, num1, num2) {
export function submitApproval(num, num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_合同审批_修改数据',
param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
param: '采购合同流水号=' + num + '&请购单流水号=' + num3 + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
}
})
}

2
src/api/WorkshopProcurement/PurchaseContractChange.js
View File

@@ -7,7 +7,7 @@ export function initContract() {
method: 'post',
data: {
type: '1',
name: '车间采购管理_采购合同_查询_cjn'
name: '车间采购管理_采购合同_查询'
}
})
}

2
src/api/WorkshopProcurement/PurchasingQualityInspection.js
View File

@@ -7,7 +7,7 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
name: '车间采购管理_采购合同_查询'
}
})
}

17
src/api/WorkshopProcurement/QualityInspectionQuery.js
View File

@@ -7,30 +7,19 @@ export function initPayState() {
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_合同查询'
}
})
}
// 初始化零件
export function initParts() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_基本件外购质检_零件查询'
name: '车间采购管理_采购合同_查询'
}
})
}
// 查询表1
export function searchParts(pageCurrent, pageSize, check1, num, check2, name, check3, num1) {
export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间管理_质检情况_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}&物料流水号_check=${check3}&物料流水号=${num1}`,
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
Pagination: pageCurrent + '&' + pageSize
}
})

14
src/api/WorkshopProcurement/ReceiptConnectionSheet.js
View File

@@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) {
}
})
}
// 传送人接收人初始化
// 接收人初始化
export function initPerson() {
return request({
url: '',
@@ -61,6 +61,18 @@ export function initPerson() {
}
})
}
// 传送人初始化
export function initPerson1() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=5'
}
})
}
// 初始化合同号
export function initContract() {
return request({

2
src/main.js
View File

@@ -19,6 +19,8 @@ import time from 'time-formater'
import htmlToPdf from '@/vendor/htmlToPdf'
import Viewer from 'v-viewer'
import 'viewerjs/dist/viewer.css'
import VueBarcode from '@xkeshi/vue-barcode'
Vue.component('barcode', VueBarcode)
Vue.use(curd)
Vue.use(htmlToPdf)

20
src/utils/request.js
View File

@@ -3,23 +3,25 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
export const wsuri = `ws://192.168.0.2:61101//WebMoudule//websocket`
export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
export const readFile = `http://192.168.0.2:8411/webpage/file/` // invoice
export const readImg = `http://192.168.0.2:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://192.168.0.2:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://192.168.0.2:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://192.168.0.2:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://192.168.0.2:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `http://192.168.0.2:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const readFile = `http://192.168.1.212:8411/webpage/file/` // invoice
export const readImg = `http://192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://192.168.1.212:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://192.168.1.212:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `http://192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement
const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间

147
src/views/Assembly/PrintingAssemblyProcessCard/index.vue
View File

@@ -18,7 +18,7 @@
:value="item.value"/>
</el-select>
<el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchTable">查询</el-button>
<el-button type="primary" icon="el-icon-download" size="small" @click="exportTable('cjn')">导出</el-button>
<el-button type="primary" icon="el-icon-download" size="small" @click="exportTable()">导出</el-button>
</el-card>
<el-card>
<el-table
@@ -64,58 +64,73 @@
</div>
</el-card>
<el-card>
<table id="cjn" cellspacing="0px" border align="center" width="100%" style="">
<thead id="20">
<tr>
<td colspan="1" style="text-align: center;font-size: 30px;font-weight: bold;width: 10.25%;">GAOJING</td>
<td colspan="15" style="text-align:center;font-size: 30px;font-weight: bold">专机装配工艺过程卡</td>
</tr>
<tr class="tbodyHead">
<td colspan="1" style="font-weight: bold" width="6.25%" align="center">机床编号:</td>
<td colspan="4" width="15%" align="center">{{ MachineNum }}</td>
<td colspan="1" style="font-weight: bold" width="6.25%" align="center">机床名称:</td>
<td colspan="5" width="35%" align="center">{{ MachineName }}</td>
<td colspan="1" style="font-weight: bold" width="6.25%" align="center">客户名称:</td>
<td colspan="4" width="31.25%" align="center">{{ CustomerName }}</td>
</tr>
<tr id="tableHead">
<th class="tg-0pky">序号</th>
<th class="tg-0lax" colspan="4">工序名称</th>
<th class="tg-0lax" colspan="6">工艺内容及装配具体要求</th>
<th class="tg-0lax">质检</th>
<th class="tg-0lax">工时/时</th>
<th class="tg-0lax">完成情况/装配工</th>
<th class="tg-0lax">检验情况/检验员</th>
<th class="tg-0lax" width="100px">备注</th>
</tr>
</thead>
<tbody v-for="(item, index) in dataAll" :key="index">
<tr>
<td colspan="16" style="font-weight: bold">{{ item.table1 }}</td>
</tr>
<tr v-for="(list, index) in item.table2" :key="index">
<td align="center"> {{ list.序号 }}</td>
<td colspan="4">{{ list.工序名称 }}</td>
<td colspan="6">{{ list.工艺内容及装配具体要求 }}</td>
<td align="center">{{ list.质检 }}</td>
<td>{{ list.工时 }}</td>
<td/>
<td/>
<td width="100px"/>
</tr>
</tbody>
</table>
<div id="cjn">
<table cellspacing="0px" border align="center" width="100%" style="">
<thead id="20">
<tr class="trHeight2">
<td colspan="3" style="text-align: center;font-size: 30px;font-weight: bold;width: 10.25%;">GAOJING</td>
<td colspan="13" style="text-align:center;font-size: 30px;font-weight: bold">专机装配工艺过程卡</td>
<td colspan="2"><img id="img" alt=""></td>
</tr>
<tr class="tbodyHead">
<td colspan="2" style="font-weight: bold" width="7.25%" align="center">机床编号:</td>
<td colspan="3" width="16%" align="center">{{ MachineNum }}</td>
<td colspan="1" style="font-weight: bold" width="8.25%" align="center">机床名称:</td>
<td colspan="5" width="30%" align="center">{{ MachineName }}</td>
<td colspan="1" style="font-weight: bold" width="7.25%" align="center">客户名称:</td>
<td colspan="6" width="31.25%" align="center">{{ CustomerName }}</td>
</tr>
<tr id="tableHead" class="trHeight">
<th class="tg-0pky" width="4%">序号</th>
<th class="tg-0lax" colspan="4">工序名称</th>
<th class="tg-0lax" colspan="6">工艺内容及装配具体要求</th>
<th class="tg-0lax">质检</th>
<th class="tg-0lax" width="4%">工时/时</th>
<th class="tg-0lax">完成情况/装配工</th>
<th class="tg-0lax">检验情况/检验员</th>
<th class="tg-0lax" width="100px">备注</th>
<th class="tg-0lax" colspan="2" width="200px">条码</th>
</tr>
</thead>
<tbody v-for="(item, index) in dataAll" :key="index">
<tr class="trHeight">
<td colspan="18" style="font-weight: bold">{{ item.table1 }}</td>
</tr>
<tr v-for="(list, index) in item.table2" :key="index" class="trHeight1">
<td align="center"> {{ list.序号 }}</td>
<td colspan="4">{{ list.工序名称 }}</td>
<td colspan="6">{{ list.工艺内容及装配具体要求 }}</td>
<td align="center">{{ list.质检 }}</td>
<td>{{ list.工时 }}</td>
<td/>
<td/>
<td width="100px"/>
<td colspan="2" width="200px"><barcode :value="list.装配工序流水号" :options="barcode_option" tag="svg"/></td>
</tr>
</tbody>
</table>
</div>
</el-card>
</div>
</template>
<script>
import { initProject, searchMachine, searchDetail, searchProcess, searchTable } from '@/api/Assembly/PrintingAssemblyProcessCard'
import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import $ from 'jquery'
import QRCode from 'qrcode'
export default {
data() {
return {
barcode_option: {
displayValue: false,
background: '#fff',
valid: function(valid) {
console.log(valid)
},
width: '2px',
height: '25px'
},
dataAll: [],
tableData: [],
radio: 0,
@@ -168,6 +183,18 @@ export default {
this.MachineName = row.机床名称
this.MachineNum = row.机床图号
this.CustomerName = row.客户名称
const opts = {
errorCorrectionLevel: 'H',
type: 'image/jpeg',
rendererOpts: {
quality: 0.3
}
}
QRCode.toDataURL(row.机床流水号, opts, function(err, url) {
if (err) throw err
const img = document.getElementById('img')
img.src = url
})
const response = await searchDetail(row.机床流水号)
const data = response.data
for (let i = 0; i < data.length; i++) {
@@ -178,14 +205,15 @@ export default {
})
}
},
exportTable(tableid) {
if (this.dataAll.length === 0) {
this.$message.warning('暂无数据')
} else {
getExplorer()
method5(tableid)
Cleanup()
}
exportTable() {
const htmlNode = $('#cjn').html()
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().not('script').show()
printNode.remove()
},
handleSizeChange(val) {
this.pageSize = val
@@ -207,11 +235,18 @@ export default {
span{
margin: 10px 0 10px 10px;
}
.trHeight{
height: 65px;
}
.trHeight1{
height: 30px;
}
.trHeight2{
height: 120px;
}
.tbodyHead{
height: 70px;
}
</style>
<style>
.tg {border-collapse:collapse;border-spacing:0;}
.tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
.tg .tg-0pky{border-color:inherit;text-align:left;vertical-align:top}
.tg .tg-0lax{text-align:left;vertical-align:top}
</style>

6
src/views/Inventory/DirectPart/index.vue
View File

@@ -334,12 +334,6 @@ export default {
this.listLoading = false
})
},
// 查询采购合同明细
// searchContractDetailinfo() {
// searchContractDetail(this.ContractValue).then(response => {
// this.tableDataPurchase = response.data
// })
// },
// 查询直达件记录
searchDirect(row) {
this.purchaseContractNumber = row.采购合同明细流水号

25
src/views/Inventory/ExchangePart/index.vue
View File

@@ -67,7 +67,7 @@
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.外购件类型 }}
{{ scope.row.类型名称 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
@@ -160,7 +160,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="80">
<el-table-column label="名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
@@ -410,7 +410,23 @@ export default {
searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.total = response.data.total
const data = response.data.rows
console.log(data)
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].组件零件基本件流水号 === '0') {
response.data.rows[i].零件类型 = response.data.rows[i].零件类型代码
response.data.rows[i].类型名称 = response.data.rows[i].外购件类型
}
}
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].组件零件流水号 === '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].基本件机床图号
response.data.rows[i].组号 = response.data.rows[i].基本件组号
response.data.rows[i].项目流水号 = response.data.rows[i].基本件项目流水号
response.data.rows[i].机床流水号 = response.data.rows[i].基本件机床流水号
response.data.rows[i].组件流水号 = response.data.rows[i].基本件组件流水号
}
}
for (let i = 0; i < data.length; i++) {
data[i].是否交换 === '1' || data[i].是否交换 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
@@ -432,7 +448,6 @@ export default {
this.listLoading1 = true
searchExchangePart(this.PageCurrent1, this.PageSize1).then(response => {
const data = response.data.rows
console.log(data, 2233)
for (let i = 0; i < data.length; i++) {
data[i].审批通过 === '1' || data[i].审批通过 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
@@ -459,7 +474,7 @@ export default {
addListDetailinfor(form) {
this.$refs[form].validate((valid) => {
if (valid) {
addExchangepart(this.form.ExchangeNumber, this.tableData1[0].采购合同明细流水号, this.tableData2[0].采购合同明细流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData1[0].项目流水号, this.tableData2[0].项目流水号, this.tableData1[0].机床流水号, this.tableData2[0].机床流水号, this.tableData1[0].分组流水号, this.tableData2[0].分组流水号, this.tableData1[0].货位流水号, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote, this.PickingListNumber).then(response => {
addExchangepart(this.form.ExchangeNumber, this.tableData1[0].采购合同明细流水号, this.tableData2[0].采购合同明细流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData1[0].项目流水号, this.tableData2[0].项目流水号, this.tableData1[0].机床流水号, this.tableData2[0].机床流水号, this.tableData1[0].组件流水号, this.tableData2[0].组件流水号, this.tableData1[0].货位流水号, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote, this.PickingListNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
} else { this.$message.error('增加失败') }

30
src/views/Inventory/InboundCard/index.vue
View File

@@ -794,6 +794,7 @@ export default {
}
})
},
// 选中采购部入库记录
handleSelectionChange(val) {
this.nameGroup = []
this.modelGroup = []
@@ -810,6 +811,7 @@ export default {
this.priceGroup.push(val[i].单价)
}
},
// 选中车间采购入库记录
handleSelectionChange2(val) {
this.nameGroup = []
this.modelGroup = []
@@ -827,17 +829,21 @@ export default {
}
},
InboundCardDetail() {
addInboundCardDetail(this.DetailNumber, this.nameGroup, this.modelGroup, this.specificationGroup, this.paintGroup, this.numberGroup, this.priceGroup).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogVisible1 = false
searchInboundCardDetail(this.DetailNumber).then(response => {
this.tableData4 = response.data
})
} else {
this.$message.error('增加失败')
}
})
if (this.DetailNumber === '') {
this.$message.error('请选择入库单')
} else {
addInboundCardDetail(this.DetailNumber, this.nameGroup, this.modelGroup, this.specificationGroup, this.paintGroup, this.numberGroup, this.priceGroup).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogVisible1 = false
searchInboundCardDetail(this.DetailNumber).then(response => {
this.tableData4 = response.data
})
} else {
this.$message.error('增加失败')
}
})
}
},
// 修改入库单
editInboundCardInfor(row) {
@@ -1021,7 +1027,7 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
printNode.remove()
}
}

100
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -43,7 +43,8 @@
size="mini"
border
style="width: 100%;"
height="200">
height="200"
@row-click="searchBasicPartRecord">
<el-table-column
label="序号"
align="center"
@@ -79,13 +80,13 @@
{{ scope.row.零件类型名称 }}
</template>
</el-table-column>
<el-table-column label="设置" min-width="100" align="center">
<el-table-column label="操作" min-width="100" align="center">
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
icon="el-icon-edit"
@click="AlterNumber(scope.row)">设置</el-button>
@click="AlterBasicNumber(scope.row)">设置</el-button>
</template>
</el-table-column>
</el-table>
@@ -324,10 +325,10 @@
<el-dialog :visible.sync="dialogFormVisible" title="盘点修改" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
<el-form-item label="零件数量" prop="Number" label-width="100px" size="small">
<el-input v-model="form2.Number" size="small" placeholder="出库数量" style="width: 200px"/>
<el-input v-model="form2.Number" size="small" placeholder="零件数量" style="width: 200px"/>
</el-form-item>
<el-form-item label="修改原因" prop="AlterReason" label-width="100px">
<el-input v-model="form2.AlterReason" size="small" placeholder="请输入备注" style="width: 200px"/>
<el-input v-model="form2.AlterReason" size="small" placeholder="修改原因" style="width: 200px"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -565,12 +566,12 @@
</el-table-column>
<el-table-column label="库存数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.库存数量 }}
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
{{ scope.row.外购件类型 }}
</template>
</el-table-column>
<el-table-column label="安全库存" align="center" min-width="80">
@@ -580,8 +581,8 @@
</el-table-column>
<el-table-column label="操作" align="center" width="200px">
<template slot-scope="scope" align="center">
<el-button size="mini" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)" >设置</el-button>
<el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)" >设置</el-button>
<el-button size="mini" type="danger" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
</template>
</el-table-column>
</el-table>
@@ -812,12 +813,12 @@
</el-table-column>
<el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.出库时间 ? scope.row.到货时间.split(' ')[0] : '' }}
{{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="领用者" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.领用者 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
</el-table>
@@ -1026,7 +1027,7 @@
size="mini"
style="width: 100%;"
height="200"
@row-click="HousePurchaseRecord">
@row-click="searchShopBasicPartRecord">
<el-table-column
label="序号"
align="center"
@@ -1142,7 +1143,7 @@
</el-table-column>
<el-table-column label="领用者" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.领用者 }}
{{ scope.row.姓名 }}
</template>
</el-table-column>
</el-table>
@@ -1154,7 +1155,7 @@
<script>
import { mapGetters } from 'vuex'
import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart, CheckAlter, searchPurchaseBasicPart } from '@/api/Inventory/InventoryCheck'
import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart, CheckAlter, searchPurchaseBasicPart, searchShopPurchasePartOut, searchShopPurchasePartIn } from '@/api/Inventory/InventoryCheck'
export default {
data() {
return {
@@ -1259,7 +1260,13 @@ export default {
locate: '',
contractdetail: '',
craftnumber: '',
receive: ''
requestNumber: '', // 请购单明细流水号
receive: '', // 收件信息id
name: '', // 名称
mode: '', // 规格
picture: '', // 图号
type: '', // 型号
material: '' // 材料
}
},
computed: {
@@ -1314,7 +1321,6 @@ export default {
this.GroupNum = []
this.MachineValue = ''
this.GroupNumValue = ''
console.log(this.ProjectValue)
if (this.ProjectValue !== '') {
searchmachine(1, this.ProjectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -1406,7 +1412,6 @@ export default {
},
standardselecting(row) {
this.contractDeatilNumber = row.采购合同明细流水号
this.steamPartNumber = row.组件零件流水号
this.getStandardPartIn()
this.getStandardPartOut()
},
@@ -1421,8 +1426,10 @@ export default {
// 查询标准件出库记录
getStandardPartOut() {
this.listLoading11 = true
searchStandardPartOut(this.steamPartNumber).then(response => {
searchStandardPartOut(this.contractDeatilNumber).then(response => {
console.log(response.data, 2345)
this.StandardPartOut = response.data
console.log(this.StandardPartOut, 23456)
this.listLoading11 = false
})
},
@@ -1520,6 +1527,25 @@ export default {
this.BasicPartOut = response.data
})
},
// 查询车间外购记录
searchShopBasicPartRecord(row) {
this.listLoading4 = true
this.listLoading5 = true
this.requestNumber = row.请购单明细流水号
searchShopPurchasePartIn(this.requestNumber).then(response => {
this.HouseDataPurchaseIn = response.data
this.listLoading10 = false
})
searchShopPurchasePartOut(this.requestNumber).then(response => {
this.HouseDataPurchaseOut = response.data
this.listLoading11 = false
})
},
changesafeAmount(row) {
this.dialogFormVisible2 = true
this.teamPartNumber = row.组件零件流水号
this.form.safeNumber = row.安全库存量
},
// 查询通用件记录
searchGeneralPartRecord(row) {
this.listLoading4 = true
@@ -1534,11 +1560,6 @@ export default {
this.listLoading5 = false
})
},
changesafeAmount(row) {
this.dialogFormVisible2 = true
this.teamPartNumber = row.组件零件流水号
this.form.safeNumber = row.安全库存量
},
// 修改安全库存量
edeitsafeAmount() {
safeAmount(this.teamPartNumber, this.form.safeNumber).then(response => {
@@ -1559,7 +1580,7 @@ export default {
this.$refs[formName].resetFields()
},
tableRowClassName1({ row }) {
if (row.安全库存量 > row.库存数量) {
if (Number(row.安全库存量) > Number(row.货位存量)) {
return 'background: #ff6666'
} else {
return ''
@@ -1713,6 +1734,26 @@ export default {
})
},
AlterNumber(row) {
this.form2 = []
this.project = row.项目流水号
this.machinenumber = row.机床流水号
this.partnumber = row.组件流水号
this.oldnumber = row.货位存量
this.locate = row.货位流水号
this.contractdetail = row.采购合同明细流水号
this.craftnumber = row.工艺计划流水号
this.receive = row.收件信息id
this.materiallocate = row.物料与货位对照流水号
this.materialType = row.零件类型代码
this.dialogFormVisible = true
this.name = row.物料名称
this.mode = row.物料规格
this.picture = row.零件图号
this.type = row.物料型号
this.material = row.材料
},
AlterBasicNumber(row) {
this.form2 = []
this.project = row.项目流水号
this.machinenumber = row.机床流水号
this.partnumber = row.组件流水号
@@ -1720,13 +1761,18 @@ export default {
this.locate = row.货位流水号
this.contractdetail = row.采购合同明细流水号
this.craftnumber = row.工艺计划流水号
this.receive = row.收件信息ID
this.receive = row.收件信息id
this.materiallocate = row.物料与货位对照流水号
this.materialType = row.零件类型代码
this.materialType = row.零件类型
this.dialogFormVisible = true
this.name = row.零件名称
this.mode = row.物料规格
this.picture = row.零件图号
this.type = row.物料型号
this.material = row.材料
},
submitChannge() {
CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate).then(response => {
CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate, this.name, this.mode, this.picture, this.type, this.material).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')
this.dialogFormVisible = false

2
src/views/Inventory/InventoryManagement/index.vue
View File

@@ -215,7 +215,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="是否永久" prop="永久">
<el-select v-model="form2.永久" clearable filterable placeholder="请选择" style="width: 200px;margin-right:10px">
<el-select v-model="form2.永久" clearable filterable placeholder="请选择" size="small" style="width: 200px;margin-right:10px">
<el-option
v-for="item in options"
:key="item.value"

4
src/views/Inventory/OfflinePartOut/index.vue
View File

@@ -30,9 +30,9 @@
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="80">
<el-table-column label="物料型号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="80">

5
src/views/Inventory/OfflinePurchase/index.vue
View File

@@ -351,6 +351,7 @@ export default {
disable2: true,
disable3: true,
disable4: true,
purchasecardnumber: '', // 请购单流水号
disable: false, // 其他的禁用
House: [],
HouseNumber: '',
@@ -551,7 +552,7 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
printNode.remove()
},
// 传递请购单
@@ -567,7 +568,7 @@ export default {
this.partGroup.push(this.tableData3[i].离线请购单明细流水号)
this.numGroup.push(this.tableData3[i].数量)
}
alterNumber(this.purchasecardnumber, this.partGroup, this.numGroup).then(response => {
alterNumber(this.partGroup, this.numGroup).then(response => {
if (response.data[0].result === '1') {
this.$message.success('请购单生成成功')
this.searchTable2()

121
src/views/Inventory/PartOut/index.vue
View File

@@ -93,6 +93,96 @@
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-table
v-loading="listLoading1"
:data="tableDataExchange"
border
size="mini"
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="交换单编号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.交换单编号 }}
</template>
</el-table-column>
<el-table-column label="交换件名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.交换件名称 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="被交换件名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.被交换件名称 }}
</template>
</el-table-column>
<el-table-column label="被交换件项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.被交换件项目名称 }}
</template>
</el-table-column>
<el-table-column label="被交换件机床图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.被交换件机床图号 }}
</template>
</el-table-column>
<el-table-column label="被交换件组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.被交换件组号 }}
</template>
</el-table-column>
<el-table-column label="交换数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.交换数量 }}
</template>
</el-table-column>
<el-table-column label="申请人" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="申请时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.申请时间 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="审批状态" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.审批状态 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="100">
<template slot-scope="scope">
<el-button :disabled="scope.row.是否禁用" size="mini" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="execExchangePartOut(scope.row)">出库</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<!--异常出库对话框-->
<el-dialog :visible.sync="dialogFormVisible" title="异常出库" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left">
@@ -112,7 +202,7 @@
</template>
<script>
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut, ErrorOut } from '@/api/Inventory/PartOut'
import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut, ErrorOut, ExchangeOut, ExchangePartOut } from '@/api/Inventory/PartOut'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -160,6 +250,7 @@ export default {
projectnumber: '',
machinenumber: '',
teamnumber: '',
tableDataExchange: [], // 交换件列表
purchaseDeatileNumber: '', // 采购合同明细流水号
askPurchaseNumber: '', // 请购单明细流水号
craftnumber: '', // 工艺计划流水号
@@ -195,6 +286,16 @@ export default {
this.listLoading = false
})
},
// 查询交换单
searchExchange() {
ExchangeOut(this.pickingListNumberx).then(response => {
const data = response.data
for (let i = 0; i < data.length; i++) {
data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
}
this.tableDataExchange = data
})
},
// 查询领料单明细
searchListDetailt() {
this.listLoading1 = true
@@ -212,13 +313,14 @@ export default {
chooseListinfor(row) {
this.pickingListNumberx = row.领料单流水号
this.getpicikingPeople = row.领料人流水号
console.log(this.pickingListNumberx)
console.log(this.pickingListNumberx, 223344)
this.searchListDetailt()
this.searchExchange()
},
// 出库
partOut(row) {
if (row.出库类型 === 3) {
WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
@@ -226,7 +328,7 @@ export default {
} else { this.$message.error('出库失败') }
})
} else if (row.出库类型 === 2) {
PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
ListDetailOut(row.领料单明细流水号)
this.$message.success('出库成功')
@@ -260,6 +362,17 @@ export default {
this.form = []
this.dialogFormVisible = false
},
execExchangePartOut(row) {
ExchangePartOut(row.交换单流水号, row.被交换件采购合同明细流水号, row.申请人, row.交换数量, row.被交换货位流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
this.dialogFormVisible = false
this.form = []
} else {
this.$message.error('出库失败')
}
})
},
submitEdit() {
ErrorOut(this.projectnumber, this.machinenumber, this.teamnumber, this.partName, this.picikingPeople, this.purchaseDeatileNumber, this.askPurchaseNumber, this.craftnumber, this.locatenumber, this.form.ErrorNumber, this.form.Reason, this.partType).then(response => {
if (response.data[0].result === '1') {

2
src/views/Inventory/PartsReplacement/index.vue
View File

@@ -724,7 +724,7 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
printNode.remove()
}
}

20
src/views/Inventory/PickingList/index.vue
View File

@@ -244,7 +244,7 @@
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="80">
<el-table-column label="名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
@@ -259,6 +259,11 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -327,7 +332,7 @@
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="80">
<el-table-column label="名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
@@ -667,6 +672,17 @@ export default {
response.data.rows[i].类型名称 = response.data.rows[i].外购件类型
}
}
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].组件零件流水号 === '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].基本件机床图号
response.data.rows[i].组号 = response.data.rows[i].基本件组号
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.tableDataPurchase = response.data.rows
this.listLoading = false
this.total1 = response.data.total

47
src/views/Inventory/SubstitutePart/index.vue
View File

@@ -67,7 +67,7 @@
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.外购件类型 }}
{{ scope.row.类型名称 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120">
@@ -76,6 +76,16 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<el-row>
@@ -306,6 +316,9 @@ export default {
tableData1: [],
tableData2: [],
listNumber: '',
PageCurrent: 1,
PageSize: 10,
total: null,
picikingPeople: '', // 领料人流水号
partProjectNumber: '', // 项目流水号
partProjectName: '', // 项目名称
@@ -404,8 +417,25 @@ export default {
this.GroupNumValue_check = 1
}
this.listLoading = true
searchPurchasePart(this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.tableDataPurchase = response.data
searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].组件零件基本件流水号 === '0') {
response.data.rows[i].零件类型 = response.data.rows[i].零件类型代码
response.data.rows[i].类型名称 = response.data.rows[i].外购件类型
}
}
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].组件零件流水号 === '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].基本件机床图号
response.data.rows[i].组号 = response.data.rows[i].基本件组号
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.tableDataPurchase = response.data.rows
this.listLoading = false
})
},
@@ -424,7 +454,7 @@ export default {
} else {
this.materialName_check = 1
}
searchSubstituted(this.materialName_check, this.materialName).then(response => {
searchSubstituted().then(response => {
this.tableDataSub = response.data
})
},
@@ -501,6 +531,15 @@ export default {
},
submitEdit() {
this.editTable(editSubstitutedCard, [this.substituteListNumber, this.form.ExchangeNumber, this.form.ExchangeNumberx, this.form.ExchangeNote], 'form', function() { this.getSubstitutedCard(); this.dialogFormVisible = false })
},
handleSizeChange(val) {
this.PageCurrent = 1
this.PageSize = val
this.searchPartinfo()
},
handleCurrentChange(val) {
this.PageCurrent = val
this.searchPartinfo()
}
}
}

57
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -6,7 +6,7 @@
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
<el-checkbox v-model="all" size="mini">查询全部</el-checkbox>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="downLoad('BL')">导出备料单</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button>
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">导出完成</el-button>
</el-row>
</el-card>
@@ -52,27 +52,29 @@
</div>
</el-card>
<table id="BL" border cellspacing="0px" style="table-layout: fixed; width: 600px;display: none">
<colgroup>
<col style="width: 100px">
<col style="width: 150px">
<col style="width: 450px">
</colgroup>
<tr>
<th height="60px">GAOJING</th>
<th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th>
</tr>
<tr>
<td align="center">零件名称</td>
<td align="center">零件图号</td>
<td align="center">备料</td>
</tr>
<tr v-for="(list, index) in tableData2" :key="index">
<td align="center">{{ list.零件名称 }}</td>
<td align="center">{{ list.零件图号 }}</td>
<td>{{ list.工艺要求 }}</td>
</tr>
</table>
<div v-show="false" id="BL">
<table border cellspacing="0px" style="table-layout: fixed; width: 600px;">
<colgroup>
<col style="width: 100px">
<col style="width: 150px">
<col style="width: 450px">
</colgroup>
<tr>
<th height="60px">GAOJING</th>
<th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th>
</tr>
<tr>
<td align="center">零件名称</td>
<td align="center">零件图号</td>
<td align="center">备料</td>
</tr>
<tr v-for="(list, index) in tableData2" :key="index">
<td align="center">{{ list.零件名称 }}</td>
<td align="center">{{ list.零件图号 }}</td>
<td>{{ list.工艺要求 }}</td>
</tr>
</table>
</div>
</div>
</template>
@@ -80,6 +82,7 @@
<script>
import { searchtable, searchtable2, edit } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { exportExcelMethod } from './exportExcel'
import $ from 'jquery'
export default {
data() {
return {
@@ -99,6 +102,16 @@ export default {
this.searchTable()
},
methods: {
exportTable() {
const htmlNode = $('#BL').html()
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().not('script').show()
printNode.remove()
},
// 查询表格数据
searchTable() {
this.loading = true

4
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -5,13 +5,13 @@
<el-col :span="12">
<el-form label-width="270px" label-position="right" class="Time">
<el-form-item>
<el-form-item v-show="false">
<el-radio-group v-model="radio" size="small">
<el-radio :label="0">正常件投产</el-radio>
<el-radio :label="1">整改件投产</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="项目名称">
<el-form-item label="项目名称" style="margin-top:28px">
<el-select v-model="entryNameValue" filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in entryName"

18
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -7,6 +7,7 @@
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
<el-checkbox v-model="all" size="mini" @change="searchTable">查询全部</el-checkbox>
<el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">到货</el-button>
<!--<el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">刷新</el-button>-->
</el-row>
</el-card>
@@ -55,10 +56,12 @@
</template>
<script>
import { searchtable, searchtable2, edit, handlechange } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
import { searchtable, searchtable2, change } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
export default {
data() {
return {
bianliang1: [],
bianliang2: [],
num: 0,
arrest: [],
all: false,
@@ -115,15 +118,12 @@ export default {
this.$message.warning('请选择零件')
} else {
for (let i = 0; i < this.arrest.length; i++) {
edit(this.arrest[i].工艺计划流水号).then(() => {
handlechange(this.arrest[i].工序流水号, '0000').then(response => {
this.num = this.num + response.data[0].result
})
})
if (this.num === this.arrest.length) {
this.searchTable()
}
this.bianliang1.push(this.arrest[i].工艺计划流水号)
this.bianliang2.push(this.arrest[i].工序流水号)
}
change(this.bianliang2, '0000', this.bianliang1).then(() => {
this.searchTable()
})
}
},
// 分页

25
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -4,8 +4,8 @@
<span>零件号：</span>
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
<el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadCjn('cjn')">导出工艺定额卡</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadCjn1('cjn1')">导出加工路线单</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoaddek('dek')">导出工艺定额卡</el-button>
<el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadlxd('lxd')">导出加工路线单</el-button>
</el-card>
<el-card>
@@ -45,7 +45,7 @@
</div>
</el-card>
<el-card>
<table id="cjn" style="width: 975px;" border="2px" cellspacing="0px" align="center">
<table id="dek" style="width: 975px;" border="2px" cellspacing="0px" align="center">
<thead>
<tr height="25px">
<td colspan="4" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
@@ -238,7 +238,7 @@
</table>
</el-card>
<el-card>
<table id="cjn1" style="width: 800px;" border="2px" cellspacing="0px" align="center">
<table id="lxd" style="width: 800px;" border="2px" cellspacing="0px" align="center">
<thead>
<tr height="60px">
<td colspan="6" style="text-align:center;width: 33%">江苏高精机电<br>装备有限公司</td>
@@ -688,12 +688,12 @@ export default {
})
}
},
downLoadCjn(tableid) { // 下载工艺定额卡
downLoaddek(tableid) { // 下载工艺定额卡
getExplorer()
method5(tableid)
Cleanup()
},
downLoadCjn1(tableid) { // 下载零件加工路线单
downLoadlxd(tableid) { // 下载零件加工路线单
getExplorer()
method5(tableid)
Cleanup()
@@ -701,13 +701,7 @@ export default {
}
}
</script>
<style>
td{
width: 100px;
height: 30px;
text-align:center;
}
</style>
<style scoped>
span{
margin: 10px 0 10px 10px;
@@ -719,4 +713,9 @@ export default {
max-height: 250px;
overflow: auto;
}
td{
width: 100px;
height: 30px;
text-align:center;
}
</style>

22
src/views/ManufacturingCenter/ProcessPlanning/index.vue
View File

@@ -43,9 +43,10 @@
</el-select>
<el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
</el-button>
<el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
</el-button>
<el-button v-show="!isShow2" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
</el-button>
<div v-show="isShow">
<span>种类:</span>
@@ -57,9 +58,8 @@
<el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
<el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
</el-input>
<el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
<span>规格:</span>
<el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
<el-input v-show="false" v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
<span>投产总数量:</span>
<el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
</div>
@@ -81,8 +81,6 @@
<el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
<el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
<el-button-group v-if="isShow1" style="margin: 10px">
<el-button v-if="isShow1" type="info" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
</el-button>
<el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
<el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
</el-button>
@@ -90,7 +88,9 @@
</el-button>
<el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
</el-button>
<el-button :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存
<el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
</el-button>
<el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
</el-button>
</el-button-group>
</el-row>
@@ -353,10 +353,9 @@
</el-col>
<el-col :span="10">
<el-form-item label="零件号">
<el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" @change="inputChange"/>
<el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" clearable @change="inputChange"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
@@ -834,6 +833,8 @@ export default {
},
WYbtn() { // 完艺按钮
this.tableData4 = []
this.tuhaoValue = ''
this.remark1 = ''
this.dialogFormVisible1 = true
},
selectPerson(row) { // 选择工艺员
@@ -1218,20 +1219,15 @@ export default {
.doing-row4 {
background: #f0f9eb;
}
.el-card {
margin-bottom: 15px;
}
.el-date-editor {
width: 150px
}
span {
margin: 10px 0 10px 10px;
}
</style>
<style>
.el-table .change {
background: oldlace;
}

3
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -47,8 +47,7 @@
<el-table
ref="multipleTable"
:data="tableData"
style="width: 100%;max-height: 440px;"
height="440"
style="width: 100%;height: 550px;"
highlight-current-row
border
@selection-change="handleSelectionChange">

10
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -201,11 +201,11 @@
{{ 机加工结束时间[scope.$index] }}
</template>
</el-table-column>
<el-table-column label="是否预计外协" align="center" width="110">
<template slot-scope="scope">
{{ 预计外协[scope.$index] }}
</template>
</el-table-column>
<!--<el-table-column label="是否预计外协" align="center" width="110">-->
<!--<template slot-scope="scope">-->
<!--{{ 预计外协[scope.$index] }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="零件加工计划进度（工艺名称、计划日期、工序工时）" align="">
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">

278
src/views/ManufacturingCenter/RepairTimeEntry/index.vue
View File

@@ -19,9 +19,9 @@
type="index"
align="center"
width="50"/>
<el-table-column label="工艺名称" align="center" width="280px">
<el-table-column label="零件图号" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
{{ scope.row.零件图号_零件工艺计划 }}
</template>
</el-table-column>
<el-table-column label="修补工时" align="center" width="110px">
@@ -44,18 +44,23 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作时间" align="center">
<el-table-column label="修补工艺" align="center">
<template slot-scope="scope">
{{ scope.row.操作时间 }}
{{ scope.row.修补工艺 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150px" fixed="right">
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
<el-button
size="mini"
type="danger"
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -72,51 +77,97 @@
</div>
</el-card>
<el-dialog :title="title1" :visible.sync="dialogFormVisible" center>
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm" style="width: 48%;margin: auto">
<el-form-item label="工艺" prop="TechnologyValue">
<el-select v-model="form.TechnologyValue" filterable size="small">
<el-option
v-for="item in Technology"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="年" prop="yearNumberValue">
<el-select v-model="form.yearNumberValue" size="small">
<el-option
v-for="item in yearNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="月" prop="monthNumberValue">
<el-select v-model="form.monthNumberValue" size="small">
<el-option
v-for="item in monthNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="修补工时" prop="timeNumber">
<el-input v-model="form.timeNumber" placeholder="修补工时" clearable size="small" style="width: 200px"/>
</el-form-item>
<el-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>
<el-col :span="14"/>
<el-form-item >
<el-button size="small" @click="callOff('form')">取消</el-button>
<el-button size="small" type="primary" @click="submit('form')">确 定</el-button>
</el-form-item>
<el-col :span="12">
<el-form-item label="项目" prop="project">
<el-select v-model="form.project" filterable size="small" @change="getMachine">
<el-option
v-for="item in projects"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="机床" prop="Machine">
<el-select v-model="form.Machine" filterable size="small" @change="getGroup">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="分组" prop="Group">
<el-select v-model="form.Group" filterable size="small" @change="getParts">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="零件" prop="零件">
<el-select v-model="form.零件" filterable size="small">
<el-option
v-for="item in Parts"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="年" prop="yearNumberValue">
<el-select v-model="form.yearNumberValue" size="small">
<el-option
v-for="item in yearNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="月" prop="monthNumberValue">
<el-select v-model="form.monthNumberValue" size="small">
<el-option
v-for="item in monthNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="修补工时" prop="timeNumber">
<el-input v-model="form.timeNumber" placeholder="修补工时" clearable size="small" style="width: 200px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="修补工艺" prop="修补工艺">
<el-input v-model="form.修补工艺" placeholder="修补工艺" clearable size="small" style="width: 200px"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')" >确定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="人员信息" center width="750px">
@@ -162,8 +213,12 @@
</template>
<script>
import { getTable8, getTree, fn, dialogtablevisible, searchTechnology, searchperson, searchtable, edittype, handlechange } from '@/api/ManufacturingCenter/RepairTimeEntry'
import { delList, getTable8, getNames, getMachines, getGroups, getParts, getTree, fn, dialogtablevisible, searchTechnology, searchperson, searchtable, edittype, handlechange } from '@/api/ManufacturingCenter/RepairTimeEntry'
import elInput from 'element-ui/packages/input'
export default {
components: {
elInput
},
data() {
return {
codes2: '',
@@ -179,11 +234,20 @@ export default {
liushuihao: '', // 编辑流水号
renyuanbianhao: '', // 编辑人员编号
personnelNumber: '', // 人员编号
projects: [],
Machines: [],
Groups: [],
Parts: [],
form: {
零件: '',
project: '',
Machine: '',
Group: '',
TechnologyValue: '',
yearNumberValue: '',
monthNumberValue: '',
timeNumber: ''
timeNumber: '',
修补工艺: ''
},
Technology: [], // 工艺
yearNumber: [], // 年
@@ -198,8 +262,11 @@ export default {
dialogFormVisible: false,
title1: '',
rules: {
TechnologyValue: [{ required: true, message: '请选择工艺', trigger: 'change' }],
timeNumber: [{ required: true, message: '请输入修补工时', trigger: 'blur' }]
零件: [{ required: true, message: '请选择零件', trigger: 'change' }],
timeNumber: [{ required: true, message: '请输入修补工时', trigger: 'blur' }],
yearNumberValue: [{ required: true, message: '请选择年份', trigger: 'blur' }],
monthNumberValue: [{ required: true, message: '请选择月份', trigger: 'blur' }],
修补工艺: [{ required: true, message: '请输入修补工艺', trigger: 'blur' }]
}
}
},
@@ -207,8 +274,81 @@ export default {
this.fetchData()
this.fetchData3()
this.searchTable()
this.fetchData2()
this.getParts()
},
methods: {
fetchData2() {
this.projects = []
getNames().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.projects.push({
label: response.data[i].项目名称,
value: response.data[i].项目流水号
})
}
})
},
getMachine() {
this.form.Machine = ''
this.Machines = []
this.form.Group = ''
this.Groups = []
if (this.form.project !== '') {
getMachines(this.form.project).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
}
},
getGroup() {
this.form.Group = ''
this.Groups = []
getGroups(this.form.Machine).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Groups.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
getParts() {
if (this.project === '') {
this.checkbox_project = false
} else {
this.checkbox_project = true
}
if (this.Machine === '') {
this.checkbox_Machine = false
} else {
this.checkbox_Machine = true
}
if (this.Group === '') {
this.checkbox_Group = false
} else {
this.checkbox_Group = true
}
if (this.number === '') {
this.checkbox_number = false
} else {
this.checkbox_number = true
}
this.form.零件 = ''
this.Parts = []
getParts(this.checkbox_project, this.form.project, this.checkbox_Machine, this.form.Machine, this.checkbox_Group, this.form.Group).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Parts.push({
label: response.data[i].零件图号,
value: response.data[i].工艺计划流水号
})
}
})
},
handleCurrentChange2(row) { // 获取当前行人员信息
this.ssks = row.节点名称
this.Number1 = row.人员编号
@@ -286,18 +426,43 @@ export default {
})
}
},
// 删除
handleDelete(index, row) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delList(row.员工月修补工时流水号).then(response => {
if (response.data[0].result === '1') {
this.searchTable()
this.$message({
message: '已被成功删除',
type: 'success'
})
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
// 增加打开
editType1(formName) {
if (this.personnelNumber === '' || this.personnelNumber === null) {
this.$message.error('请输入人员编号')
} else {
this.form.TechnologyValue = ''
this.form.timeNumber = ''
this.form.零件 = ''
this.form.修补工艺 = ''
this.count1 = this.count1 + 1
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.title1 = '增加'
this.form.TechnologyValue = ''
this.form.timeNumber = ''
this.dialogFormVisible = true
}
},
@@ -305,7 +470,7 @@ export default {
editType() {
searchperson(this.codes2).then(response => {
if (response.data.length !== 0) {
edittype(response.data[0].人员编号, this.form.TechnologyValue, this.form.yearNumberValue, this.form.monthNumberValue, this.form.timeNumber).then(response => {
edittype(this.form.零件, response.data[0].人员编号, this.form.yearNumberValue, this.form.monthNumberValue, this.form.timeNumber, this.form.修补工艺).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.pageCurrent = 1
@@ -331,16 +496,17 @@ export default {
}
this.renyuanbianhao = row.人员编号
this.liushuihao = row.员工月修补工时流水号
this.form.TechnologyValue = parseInt(row.工艺编号)
this.form.零件 = parseInt(row.工艺计划流水号)
this.form.yearNumberValue = row.年
this.form.monthNumberValue = row.月
this.form.timeNumber = row.修补工时
this.form.修补工艺 = row.修补工艺
this.dialogFormVisible = true
this.title1 = '编辑'
},
// 编辑确定
handleChange() {
handlechange(this.liushuihao, this.renyuanbianhao, this.form.TechnologyValue, this.form.yearNumberValue, this.form.monthNumberValue, this.form.timeNumber).then(response => {
handlechange(this.liushuihao, this.form.零件, this.renyuanbianhao, this.form.yearNumberValue, this.form.monthNumberValue, this.form.timeNumber, this.form.修补工艺).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')
this.searchTable()

4
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -264,8 +264,8 @@ export default {
this.form.设备加工能力 = 1
this.form.班次类型 = 1
this.form.设备工时系数 = 1
this.form.整改工时系数 = 1
this.form.预留工时系数 = 1
this.form.整改工时系数 = 0
this.form.预留工时系数 = 0
this.dialogFormVisible = true
},
handleEdit(row) {

188
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -329,75 +329,77 @@
<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>
<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="confirmPrice">确定价格</el-button>
<el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 15px" @click="Deal">成交</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 15px" @click="downLoadRWD('RWD')">导出外协加工任务单</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 15px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
</div>
</el-card>
<el-card v-show="card">
<table id="RWD" cellspacing="0px" align="center" width="100%" style="">
<tbody id="1">
<tr>
<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
<td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
</tr>
<tr class="tbodyHead">
<td colspan="2">任务单号:</td>
<td colspan="6">{{ 任务单号 }}</td>
<td colspan="4">任务下达日期:</td>
<td colspan="4">{{ 任务下达日期 }}</td>
<td colspan="3">外协厂家:</td>
<td colspan="9">{{ 外协厂家 }}</td>
</tr>
<tr class="tbodyHead">
<td colspan="2">外协员:</td>
<td colspan="6">{{ 外协员 }}</td>
<td colspan="2">电话:</td>
<td colspan="6">{{ 外协员电话 }}</td>
<td colspan="3">联系人:</td>
<td colspan="3">{{ 联系人 }}</td>
<td colspan="2">电话:</td>
<td colspan="4">{{ 联系人电话 }}</td>
</tr>
<tr id="tableHead">
<td style="width: 2%">序号</td>
<td colspan="5">零件图号</td>
<td colspan="2" style="width: 4%">零件名称</td>
<td colspan="2" style="width: 2%">数量</td>
<td colspan="9" width="30%">内容</td>
<td colspan="1">零件类型</td>
<td>外协类别</td>
<td>加工价格</td>
<td>材料价格</td>
<td>其他价格</td>
<td colspan="2">计划开始</td>
<td colspan="2">计划结束</td>
</tr>
<div id="RWD">
<table cellspacing="0px" align="center" width="100%" style="">
<tbody id="1">
<tr>
<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
<td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
</tr>
<tr class="tbodyHead">
<td colspan="2">任务单号:</td>
<td colspan="6">{{ 任务单号 }}</td>
<td colspan="4">任务下达日期:</td>
<td colspan="4">{{ 任务下达日期 }}</td>
<td colspan="3">外协厂家:</td>
<td colspan="9">{{ 外协厂家 }}</td>
</tr>
<tr class="tbodyHead">
<td colspan="2">外协员:</td>
<td colspan="6">{{ 外协员 }}</td>
<td colspan="2">电话:</td>
<td colspan="6">{{ 外协员电话 }}</td>
<td colspan="3">联系人:</td>
<td colspan="3">{{ 联系人 }}</td>
<td colspan="2">电话:</td>
<td colspan="4">{{ 联系人电话 }}</td>
</tr>
<tr id="tableHead">
<td style="width: 2%">序号</td>
<td colspan="5">零件图号</td>
<td colspan="2" style="width: 4%">零件名称</td>
<td colspan="2" style="width: 2%">数量</td>
<td colspan="9" width="30%">内容</td>
<td colspan="1">零件类型</td>
<td>外协类别</td>
<td>加工价格</td>
<td>材料价格</td>
<td>其他价格</td>
<td colspan="2">计划开始</td>
<td colspan="2">计划结束</td>
</tr>
</tbody>
<tfoot>
<tr id="tableFoot">
<td>费用</td>
<td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td>
<td colspan="1">0</td>
<td colspan="1"/>
<td/>
<td>{{ 加工价格合计 }}</td>
<td>{{ 材料价格合计 }}</td>
<td>{{ 其他价格合计 }}</td>
<td colspan="2">{{ 最早时间 }}</td>
<td colspan="2">{{ 最晚时间 }}</td>
</tr>
<tr class="foot">
<td colspan="4">外协员:</td>
<td colspan="4">外协科长:</td>
<td colspan="4">采购二部长:</td>
<td colspan="4">制品部长:</td>
<td colspan="4">定额科统计员:</td>
<td colspan="4">定额科长:</td>
<td colspan="4">外协厂:</td>
</tr>
</tfoot>
</table>
</tbody>
<tfoot>
<tr id="tableFoot">
<td>费用</td>
<td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td>
<td colspan="1">0</td>
<td colspan="1"/>
<td/>
<td>{{ 加工价格合计 }}</td>
<td>{{ 材料价格合计 }}</td>
<td>{{ 其他价格合计 }}</td>
<td colspan="2">{{ 最早时间 }}</td>
<td colspan="2">{{ 最晚时间 }}</td>
</tr>
<tr class="foot">
<td colspan="4">外协员:</td>
<td colspan="4">外协科长:</td>
<td colspan="4">采购二部长:</td>
<td colspan="4">制品部长:</td>
<td colspan="4">定额科统计员:</td>
<td colspan="4">定额科长:</td>
<td colspan="4">外协厂:</td>
</tr>
</tfoot>
</table>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
@@ -457,6 +459,7 @@ import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex'
import elInput from 'element-ui/packages/input'
import $ from 'jquery'
export default {
components: {
@@ -574,6 +577,20 @@ export default {
this.getList()
},
methods: {
exportTable() {
if (this.List3.length === 0) {
this.$message.warning('暂无数据')
} else {
const htmlNode = $('#RWD').html()
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().not('script').show()
printNode.remove()
}
},
fetchData() {
this.loading2 = true
var day3 = new Date(this.time)
@@ -768,10 +785,8 @@ export default {
if (valid) {
if (this.title === '增加') {
this.submitAdd()
this.title = ''
} else if (this.title === '编辑') {
this.submitEdit()
this.title = ''
}
}
})
@@ -781,7 +796,6 @@ export default {
this.$refs['form'].resetFields()
}
this.title = '增加'
this.dialogFormVisible = true
var time = new Date()
var month = time.getMonth() + 1
var day = time.getDate()
@@ -797,21 +811,29 @@ export default {
})
this.form.运费 = null
this.form.外协厂家 = ''
this.dialogFormVisible = true
},
submitAdd() {
addTable(this.form.表单号, this.id, this.ManufactorNumber1, this.form.下达任务日期, this.form.运费).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息添加成功',
type: 'success'
})
this.dialogFormVisible = false
this.fetchData()
} else {
this.$message.error('信息添加失败')
}
})
this.form.运费 = parseInt(this.form.运费)
if (isNaN(this.form.运费)) {
this.form.运费 = ''
this.$message.error('请输入数字')
} else {
addTable(this.form.表单号, this.id, this.ManufactorNumber1, this.form.下达任务日期, this.form.运费).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息添加成功',
type: 'success'
})
this.dialogFormVisible = false
this.title = ''
this.fetchData()
} else {
this.$message.error('信息添加失败')
}
})
}
},
getList() {
if (this.partNumber !== '') {
@@ -1247,6 +1269,7 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false
this.title = ''
this.fetchData()
} else { this.$message.error('编辑失败') }
})
@@ -1571,8 +1594,6 @@ export default {
span{
margin: 10px 0 10px 10px;
}
</style>
<style>
td{
width: 100px;
height: 30px;
@@ -1594,8 +1615,6 @@ export default {
width: 7%;
text-align: left;
}
</style>
<style>
.el-table .chajia {
background: #EBF953;
}
@@ -1606,4 +1625,3 @@ export default {
height: 30px;
}
</style>

153
src/views/Outsourcing/OutsourcingTaskQuery/index.vue
View File

@@ -15,7 +15,7 @@
size="small"
placeholder="选择日期"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downLoadCjn('cjn')">导出外协加工任务单</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
</el-card>
<el-card>
@@ -77,70 +77,72 @@
</el-card>
<el-card>
<table id="cjn" cellspacing="0px" align="center" width="100%" style="">
<tbody id="1">
<tr>
<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
<td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
</tr>
<tr class="tbodyHead">
<td colspan="2">任务单号:</td>
<td colspan="6">{{ 任务单号 }}</td>
<td colspan="4">任务下达日期:</td>
<td colspan="4">{{ 任务下达日期 }}</td>
<td colspan="3">外协厂家:</td>
<td colspan="9">{{ 外协厂家 }}</td>
</tr>
<tr class="tbodyHead">
<td colspan="2">外协员:</td>
<td colspan="6">{{ 外协员 }}</td>
<td colspan="2">电话:</td>
<td colspan="6">{{ 外协员电话 }}</td>
<td colspan="3">联系人:</td>
<td colspan="3">{{ 联系人 }}</td>
<td colspan="2">电话:</td>
<td colspan="4">{{ 联系人电话 }}</td>
</tr>
<tr id="tableHead">
<td style="width: 2%">序号</td>
<td colspan="5">零件图号</td>
<td colspan="2" style="width: 4%">零件名称</td>
<td colspan="2" style="width: 2%">数量</td>
<td colspan="9" width="30%">内容</td>
<td colspan="1">零件类型</td>
<td>外协类别</td>
<td>加工价格</td>
<td>材料价格</td>
<td>其他价格</td>
<td colspan="2">计划开始</td>
<td colspan="2">计划结束</td>
</tr>
<div id="RWD">
<table cellspacing="0px" align="center" width="100%" style="">
<tbody id="1">
<tr>
<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>
<td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">外协加工任务单</td>
</tr>
<tr class="tbodyHead">
<td colspan="2">任务单号:</td>
<td colspan="6">{{ 任务单号 }}</td>
<td colspan="4">任务下达日期:</td>
<td colspan="4">{{ 任务下达日期 }}</td>
<td colspan="3">外协厂家:</td>
<td colspan="9">{{ 外协厂家 }}</td>
</tr>
<tr class="tbodyHead">
<td colspan="2">外协员:</td>
<td colspan="6">{{ 外协员 }}</td>
<td colspan="2">电话:</td>
<td colspan="6">{{ 外协员电话 }}</td>
<td colspan="3">联系人:</td>
<td colspan="3">{{ 联系人 }}</td>
<td colspan="2">电话:</td>
<td colspan="4">{{ 联系人电话 }}</td>
</tr>
<tr id="tableHead">
<td style="width: 2%">序号</td>
<td colspan="5">零件图号</td>
<td colspan="2" style="width: 4%">零件名称</td>
<td colspan="2" style="width: 2%">数量</td>
<td colspan="9" width="30%">内容</td>
<td colspan="1">零件类型</td>
<td>外协类别</td>
<td>加工价格</td>
<td>材料价格</td>
<td>其他价格</td>
<td colspan="2">计划开始</td>
<td colspan="2">计划结束</td>
</tr>
</tbody>
<tfoot>
<tr id="tableFoot">
<td>费用</td>
<td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td>
<td colspan="1">0</td>
<td colspan="1"/>
<td/>
<td>{{ 加工价格合计 }}</td>
<td>{{ 材料价格合计 }}</td>
<td>{{ 其他价格合计 }}</td>
<td colspan="2">{{ 最早时间 }}</td>
<td colspan="2">{{ 最晚时间 }}</td>
</tr>
<tr class="foot">
<td colspan="4">外协员:</td>
<td colspan="4">外协科长:</td>
<td colspan="4">采购二部长:</td>
<td colspan="4">制品部长:</td>
<td colspan="4">定额科统计员:</td>
<td colspan="4">定额科长:</td>
<td colspan="4">外协厂:</td>
</tr>
</tfoot>
</table>
</tbody>
<tfoot>
<tr id="tableFoot">
<td>费用</td>
<td colspan="17" style="text-align: left;">加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}</td>
<td colspan="1">0</td>
<td colspan="1"/>
<td/>
<td>{{ 加工价格合计 }}</td>
<td>{{ 材料价格合计 }}</td>
<td>{{ 其他价格合计 }}</td>
<td colspan="2">{{ 最早时间 }}</td>
<td colspan="2">{{ 最晚时间 }}</td>
</tr>
<tr class="foot">
<td colspan="4">外协员:</td>
<td colspan="4">外协科长:</td>
<td colspan="4">采购二部长:</td>
<td colspan="4">制品部长:</td>
<td colspan="4">定额科统计员:</td>
<td colspan="4">定额科长:</td>
<td colspan="4">外协厂:</td>
</tr>
</tfoot>
</table>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
@@ -169,6 +171,7 @@ import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex'
import elInput from 'element-ui/packages/input'
import $ from 'jquery'
export default {
components: {
@@ -288,6 +291,20 @@ export default {
this.getList()
},
methods: {
exportTable() {
if (this.List3.length === 0) {
this.$message.warning('暂无数据')
} else {
const htmlNode = $('#RWD').html()
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().not('script').show()
printNode.remove()
}
},
shouhuo(row) {
this.$confirm('此操作将不可更改, 是否继续?', '提示', {
confirmButtonText: '确定',
@@ -460,7 +477,7 @@ export default {
}
this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
this.大写金额 = convertCurrency(this.总计)
// cjn end
// RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -762,7 +779,7 @@ export default {
if (response.data.length === 0) {
this.loading = false
}
// cjn end
// RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -886,7 +903,7 @@ export default {
}
this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
this.大写金额 = convertCurrency(this.总计)
// cjn end
// RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -1279,7 +1296,7 @@ export default {
this.$message.warning('请选择订单')
}
},
downLoadCjn(tableid) {
downLoadRWD(tableid) {
if (this.List3.length === 0) {
this.$message.warning('暂无数据')
} else {

41
src/views/Outsourcing/UnqualifiedTreatment/index.vue
View File

@@ -78,18 +78,18 @@
{{ scope.row.废品数量 }}
</template>
</el-table-column>
<el-table-column label="不合格处理方式" align="center">
<el-table-column label="不合格处理方式" width="200" align="center">
<template slot-scope="scope">
{{ scope.row.不合格处理方式 }}
</template>
</el-table-column>
<el-table-column label="操作" width="130px" align="center">
<el-table-column label="操作" width="130px" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="handleEdit(scope.$index, scope.row, 'form')">编辑</el-button>
@click="handleEdit(scope.$index, scope.row, 'form')">扣款</el-button>
</template>
</el-table-column>
@@ -107,7 +107,7 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="20%">
<el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm" label-width="100px" style="width: 90%;margin: auto">
<el-form-item label="废品数量" prop="wasteQuantity">
@@ -138,6 +138,7 @@ import { initOutHelp, searchTable, editList } from '@/api/Outsourcing/Unqualifie
export default {
data() {
return {
num_bhg: '',
count2: 0,
form: {
wasteQuantity: '', // 废品数量
@@ -165,6 +166,7 @@ export default {
},
created() {
this.fetchData()
this.searchTable()
},
methods: {
fetchData() {
@@ -218,24 +220,29 @@ export default {
}
this.number = row.外协加工任务单明细流水号
this.form.wasteQuantity = row.废品数量
this.num_bhg = row.批次数量
this.form.processingMethod = row.不合格处理方式
this.dialogFormVisible1 = true
},
// 提交编辑
submitEdit() {
editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => {
if (response.data[0].result === '1') {
this.dialogFormVisible1 = false
this.$message({
type: 'success',
message: '信息更新成功!'
})
this.searchTable()
} else {
this.dialogFormVisible1 = false
this.$message.error('信息更新失败')
}
})
if (this.form.wasteQuantity > this.num_bhg) {
this.$message.error('废品数量大于总数量')
} else {
editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => {
if (response.data[0].result === '1') {
this.dialogFormVisible1 = false
this.$message({
type: 'success',
message: '信息更新成功!'
})
this.searchTable()
} else {
this.dialogFormVisible1 = false
this.$message.error('信息更新失败')
}
})
}
},
// 提交添加或者修改
submit(formName) {

4
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -969,12 +969,14 @@ export default {
this.useqrcode(row.离线合同流水号) // 显示二维码
}).then(() => {
const htmlNode = $('#offlineContract').html()
const body = $('body')
const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.removeAttr('style')
body.children().not('script').show()
body.children().not('#app').hide()
printNode.remove()
}).catch(res => {
console.log(res)

4
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -249,12 +249,14 @@ export default {
if (this.contractValue) {
// exportExcelMethod('print', '采购合同', '采购合同sheet1')
const htmlNode = $('#print').html()
const body = $('body')
const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.removeAttr('style')
body.children().not('script').show()
body.children().not('#app').hide()
printNode.remove()
} else {
this.$message.error('请选择合同')

1
src/views/TechnologyCenter/CreatePackingList/index.vue
View File

@@ -606,7 +606,6 @@ export default {
console.log(resp)
const groupData = resp.data.map(item => {
item.类别 = '机床所属部件'
item.代号 = data[i].代号 + '-' + item.代号 + '组'
return item
})
console.log(groupData)

2
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -546,7 +546,7 @@ export default {
const data = this.tableDataAll[i]
const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
console.log(data.前id, data.前图号或者型号)
const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号)
const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++

1
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -168,6 +168,7 @@ export default {
this.disabled = false
return
} else {
console.log(this.worksheet[j], 111111111)
if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''

1
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -160,6 +160,7 @@
size="mini"
type="danger"
icon="el-icon-delete"
disabled
@click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>

64
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -203,8 +203,10 @@
icon=""
style="margin-top:10px"
@click="calculateContractSum">计算合同总额</el-button>
<span>合同总额:</span>
<span>合同总额(未税):</span>
<el-input v-model="contractSum" size="small"/>
<span>合同总额(含税):</span>
<el-input v-model="contractSum2" size="small"/>
</el-card>
<el-card>
<el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/>
@@ -364,6 +366,7 @@ export default {
paramRow: '', // 参数row
contractSum: 0,
contractSum1: 0,
contractSum2: 0,
deliveryDay: [],
deliveryDay1: [],
contractNumValue: '',
@@ -515,6 +518,7 @@ export default {
this.tableData4.push(this.groupNum2[i])
}
this.contractSum = (this.contractSum + this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100
this.costAccount = this.contractSum
if (parseInt(this.costAccount) === 0) {
this.$message.error('成本核算不可为0')
@@ -543,6 +547,11 @@ export default {
this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) {
response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0]
}
}
this.tableData01 = response.data
})
},
@@ -676,59 +685,6 @@ export default {
})
}
},
// payMethodChange() { // 付款方式改变
// for (let i = 0; i < this.payMethod.length; i++) {
// if (this.payMethod[i].value === this.payMethodValue) {
// this.payMethodName = this.payMethod[i].label
// }
// }
// const payTimeNum = this.payMethodName.split(':')
// switch (payTimeNum.length) {
// case 1:
// this.disable2 = true
// this.disable3 = true
// this.disable4 = true
// this.disable5 = true
// this.disable6 = true
// break
// case 2:
// this.disable2 = false
// this.disable3 = true
// this.disable4 = true
// this.disable5 = true
// this.disable6 = true
// break
// case 3:
// this.disable2 = false
// this.disable3 = false
// this.disable4 = true
// this.disable5 = true
// this.disable6 = true
// break
// case 4:
// this.disable2 = false
// this.disable3 = false
// this.disable4 = false
// this.disable5 = true
// this.disable6 = true
// break
// case 5:
// this.disable2 = false
// this.disable3 = false
// this.disable4 = false
// this.disable5 = false
// this.disable6 = true
// break
// case 6:
// this.disable2 = false
// this.disable3 = false
// this.disable4 = false
// this.disable5 = false
// this.disable6 = false
// break
// }
// this.fetchData()
// },
exportExcel() {}
}
}

8
src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
View File

@@ -75,7 +75,7 @@
</el-table-column>
<el-table-column label="总金额" width="70" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" width="80" align="center">
@@ -207,7 +207,7 @@
</el-table-column>
<el-table-column label="总金额" min-width="80" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" min-width="80" align="center">
@@ -314,6 +314,8 @@ export default {
}
}
})
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
}
this.tableData1 = response.data.rows
this.total1 = response.data.total
@@ -381,6 +383,8 @@ export default {
}
searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => {
for (let j = 0; j < response.data.length; j++) {
response.data[j].含税总金额 = parseInt(response.data[j].含税总金额 * 100) / 100
response.data[j].欠款金额 = parseInt(response.data[j].欠款金额 * 100) / 100
if (response.data[j].请款时间 !== null) {
response.data[j].请款时间 = response.data[j].请款时间.substring(0, response.data[j].请款时间.indexOf(' '))
}

6
src/views/WorkshopProcurement/FundApproval2/index.vue
View File

@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column label="总金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" align="center" min-width="70">
@@ -108,6 +108,10 @@ export default {
},
searchTable() {
initApproval1(this.pageCurrent, this.pageSize, 2).then(response => {
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
}
this.tableData = response.data.rows
this.total = response.data.total
})

6
src/views/WorkshopProcurement/FundApproval3/index.vue
View File

@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column label="总金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" align="center" min-width="70">
@@ -108,6 +108,10 @@ export default {
},
searchTable() {
initApproval1(this.pageCurrent, this.pageSize, 3).then(response => {
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
}
this.tableData = response.data.rows
this.total = response.data.total
})

4
src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
View File

@@ -182,7 +182,9 @@ export default {
this.contractNum ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => {
console.log(response.data.rows)
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].合同总金额 = parseInt(response.data.rows[j].合同总金额 * 100) / 100
}
this.tableData1 = response.data.rows
this.total1 = response.data.total
})

10
src/views/WorkshopProcurement/PayStateSearch/index.vue
View File

@@ -56,7 +56,7 @@
</el-table-column>
<el-table-column label="总金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" align="center" min-width="70">
@@ -66,7 +66,7 @@
</el-table-column>
<el-table-column label="已付金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总金额 - scope.row.欠款金额 }}
{{ scope.row.含税总金额 - scope.row.欠款金额 }}
</template>
</el-table-column>
<el-table-column label="付款情况" align="center" min-width="150">
@@ -74,7 +74,7 @@
<el-progress
:text-inside="true"
:stroke-width="18"
:percentage="(parseInt(10000*(scope.row.总金额 - scope.row.欠款金额)/scope.row.总金额)) / 100"
:percentage="(parseInt(10000*(scope.row.含税总金额 - scope.row.欠款金额)/scope.row.含税总金额)) / 100"
status="success"/>
</template>
</el-table-column>
@@ -141,6 +141,10 @@ export default {
this.contractNumValue ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
}
this.tableData1 = response.data.rows
this.total1 = response.data.total
})

6
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -61,7 +61,7 @@
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center">
@@ -303,6 +303,7 @@ export default {
TotalAmount1: '',
RMB1: '',
total1: 0,
QGNUM: '',
pageCurrent1: 1,
pageSize1: 10,
tableData1: [],
@@ -398,6 +399,7 @@ export default {
console.log(row)
this.dialogVisible3 = true
this.ProcurementContractNum = row.采购合同流水号
this.QGNUM = row.请购单流水号
},
selectChange() {
if (this.form2.审批是否通过 === 2) {
@@ -409,7 +411,7 @@ export default {
submitApproval(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因).then(response => {
submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因, this.QGNUM).then(response => {
if (response.data[0].result === '1') {
this.$message.success('审批成功')
this.dialogVisible3 = false

4
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -70,7 +70,7 @@
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center">
@@ -431,7 +431,7 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
printNode.remove()
},
handleSizeChange1(val) {

60
src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
View File

@@ -17,7 +17,7 @@
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData2" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -56,7 +56,7 @@
</el-table>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table v-loading="" :data="tableData" :summary-method="getSummaries" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -144,6 +144,62 @@ export default {
} else {
this.$message.error('请选择项目')
}
},
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 4) {
sums[index] = '合计'
return
} else if (index === 5) {
const values = data.map(item => Number(item['金额']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Number(prev) + Number(curr)
} else {
return Number(prev)
}
}, 0)
sums[index] += ' 元(未税)'
} else {
sums[index] = 'N/A'
}
} else if (index === 6) {
sums[index] = parseInt(parseInt(sums[5]) * 1.16 * 100) / 100 + ' 元(含税)'
}
})
return sums
},
getSummaries1(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 4) {
sums[index] = '合计'
return
} else if (index === 5) {
const values = data.map(item => Number(item['金额']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Number(prev) + Number(curr)
} else {
return Number(prev)
}
}, 0)
sums[index] += ' 元(未税)'
} else {
sums[index] = 'N/A'
}
} else if (index === 6) {
sums[index] = parseInt(parseInt(sums[5]) * 1.16 * 100) / 100 + ' 元(含税)'
}
})
return sums
}
}
}

8
src/views/WorkshopProcurement/PurchaseContractChange/index.vue
View File

@@ -49,7 +49,7 @@
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center">
@@ -76,7 +76,7 @@
</div>
</el-card>
<el-card>
<div style="width:750px">
<div style="width:715px">
<el-card>
<table id="1" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">
@@ -257,7 +257,7 @@
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center">
@@ -289,7 +289,7 @@
</div>
</el-card>
<el-card>
<div style="width:750px">
<div style="width:715px">
<el-card>
<table id="3" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">

23
src/views/WorkshopProcurement/QualityInspectionQuery/index.vue
View File

@@ -15,14 +15,6 @@
</el-select>
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width: 200px"/>
<span>零件名称:</span>
<el-select v-model="PartNumberValue" placeholder="零件名称" size="small" filterable clearable>
<el-option
v-for="item in PartNumber"
: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="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
</el-row>
</el-card>
@@ -102,7 +94,7 @@
</template>
<script>
import { initPayState, initParts, searchParts } from '@/api/WorkshopProcurement/QualityInspectionQuery'
import { initPayState, searchParts } from '@/api/WorkshopProcurement/QualityInspectionQuery'
import { mapGetters } from 'vuex'
export default {
@@ -115,8 +107,6 @@ export default {
contractNumValue: '',
contractNum: [],
supplierName: '',
PartNumberValue: '',
PartNumber: [],
tableData: [],
pageSize: 10,
pageCurrent: 1,
@@ -145,21 +135,12 @@ export default {
})
}
})
initParts().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.PartNumber.push({
label: response.data[i].物料名称,
value: response.data[i].物料流水号
})
}
})
},
searchTable() {
this.loading = true
this.contractNumValue ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
this.PartNumberValue ? this.check3 = 1 : this.check3 = 0
searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue, this.check2, this.supplierName, this.check3, this.PartNumberValue).then(response => {
searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
this.loading = false
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].交检日期 !== '') {

20
src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
View File

@@ -19,7 +19,7 @@
<span>传送人:</span>
<el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:100px">
<el-option
v-for="item in selectPerson"
v-for="item in selectPerson1"
:key="item.value"
:label="item.label"
:value="item.value"/>
@@ -80,7 +80,7 @@
</el-table-column>
<el-table-column align="center" label="总金额" min-width="100px">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="扣除金额" min-width="100px">
@@ -160,7 +160,7 @@
<el-form-item label="传送人" prop="sendPerson">
<el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled filterable clearable style="width:100px">
<el-option
v-for="item in selectPerson"
v-for="item in selectPerson1"
:key="item.value"
:label="item.label"
:value="item.value"/>
@@ -189,7 +189,7 @@
</template>
<script>
import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initContract } from '@/api/WorkshopProcurement/ReceiptConnectionSheet'
import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initPerson1, initContract } from '@/api/WorkshopProcurement/ReceiptConnectionSheet'
import { mapGetters } from 'vuex'
export default {
@@ -201,7 +201,8 @@ export default {
invoiceNum: '',
invoiceTime: '',
transmitValue: '',
selectPerson: [], // 传送人接收人
selectPerson: [], // 接收人
selectPerson1: [], // 传送人
recipientValue: '',
contractNum: '',
pageCurrent1: 1,
@@ -266,6 +267,14 @@ export default {
})
}
})
initPerson1().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.selectPerson1.push({
label: response.data[i].姓名,
value: response.data[i].人员编号
})
}
})
},
searchTable1() {
this.invoiceNum ? this.check1 = 1 : this.check1 = 0
@@ -275,6 +284,7 @@ export default {
this.contractNum ? this.check5 = 1 : this.check5 = 0
searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.invoiceNum, this.check2, this.invoiceTime, this.check3, this.transmitValue, this.check4, this.recipientValue, this.check5, this.contractNum).then(response => {
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
if (response.data.rows[j].开票时间 !== null) {
response.data.rows[j].开票时间 = response.data.rows[j].开票时间.substring(0, response.data.rows[j].开票时间.indexOf(' '))
}