Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/105pull/106/head
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-11-07 19:47:48 | * @Date: 2023-11-07 19:47:48 | ||||
* @LastEditTime: 2023-11-16 17:49:23 | |||||
* @LastEditTime: 2023-11-23 13:57:41 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
*/ | */ | ||||
@@ -104,3 +104,18 @@ export function getMaterialList(data) { | |||||
data: data | data: data | ||||
}) | }) | ||||
} | } | ||||
export function getMaterialCode(data) { | |||||
return request({ | |||||
url: '/extend/process-equ-material-bom/getCode', | |||||
method: 'get', | |||||
params: data | |||||
}) | |||||
} | |||||
export function createProcessEquMaterialBomDetList(data) { | |||||
return request({ | |||||
url: '/extend/process-equ-material-bom-det/createByList', | |||||
method: 'post', | |||||
data: data | |||||
}) | |||||
} |
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-11-09 09:37:14 | * @Date: 2023-11-09 09:37:14 | ||||
* @LastEditTime: 2023-11-16 17:47:21 | |||||
* @LastEditTime: 2023-11-23 14:15:45 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
*/ | */ | ||||
@@ -104,3 +104,19 @@ export function getValueList(data) { | |||||
params: data | params: data | ||||
}) | }) | ||||
} | } | ||||
export function getValueCode(data) { | |||||
return request({ | |||||
url: '/extend/process-equ-value-bom/getCode', | |||||
method: 'get', | |||||
params: data | |||||
}) | |||||
} | |||||
export function createProcessEquValueBomDetList(data) { | |||||
return request({ | |||||
url: '/extend/process-equ-value-bom-det/createByList', | |||||
method: 'post', | |||||
data: data | |||||
}) | |||||
} |
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-07-19 15:18:30 | * @Date: 2021-07-19 15:18:30 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2023-11-22 13:58:30 | |||||
* @LastEditTime: 2023-11-23 11:14:30 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -730,21 +730,21 @@ export default { | |||||
} | } | ||||
}, | }, | ||||
// watch: { | |||||
// clientWidth(val) { | |||||
// if (!this.timer) { | |||||
// this.clientWidth = val | |||||
// this.beilv2 = this.clientWidth / 1920 | |||||
// this.timer = true | |||||
// let _this = this | |||||
// setTimeout(function () { | |||||
// _this.timer = false | |||||
// }, 500) | |||||
// } | |||||
// // 这里可以添加修改时的方法 | |||||
// this.windowWidth(val); | |||||
// } | |||||
// }, | |||||
watch: { | |||||
clientWidth(val) { | |||||
if (!this.timer) { | |||||
this.clientWidth = val | |||||
this.beilv2 = this.clientWidth / 1920 | |||||
this.timer = true | |||||
let _this = this | |||||
setTimeout(function () { | |||||
_this.timer = false | |||||
}, 500) | |||||
} | |||||
// 这里可以添加修改时的方法 | |||||
this.windowWidth(val); | |||||
} | |||||
}, | |||||
created() { | created() { | ||||
// this.fetchList('exception-alarm') | // this.fetchList('exception-alarm') | ||||
// this.fetchList('inAndOutOfEachLine') | // this.fetchList('inAndOutOfEachLine') | ||||
@@ -941,7 +941,7 @@ export default { | |||||
</style> | </style> | ||||
<style lang="scss"> | |||||
<style lang="scss" > | |||||
.visual-container { | .visual-container { | ||||
::-webkit-scrollbar { | ::-webkit-scrollbar { | ||||
width: 8px; | width: 8px; | ||||
@@ -60,7 +60,7 @@ | |||||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> | <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> | ||||
<base-container1 :beilv="1" :title="'设备状态监控'" :title-icon="'1_5'"> | <base-container1 :beilv="1" :title="'设备状态监控'" :title-icon="'1_5'"> | ||||
<div class="visual-select"> | <div class="visual-select"> | ||||
<el-select v-model="modelMonth" size="mini" placeholder=""> | |||||
<el-select class="coldSelect" v-model="modelMonth" size="mini" placeholder=""> | |||||
<el-option key="1" value="钢1线" label="钢1线" default /> | <el-option key="1" value="钢1线" label="钢1线" default /> | ||||
</el-select> | </el-select> | ||||
</div> | </div> | ||||
@@ -634,21 +634,21 @@ export default { | |||||
} | } | ||||
} | } | ||||
}, | }, | ||||
watch: { | |||||
clientWidth(val) { | |||||
if (!this.timer) { | |||||
this.clientWidth = val | |||||
this.beilv2 = this.clientWidth / 1920 | |||||
this.timer = true | |||||
let _this = this | |||||
setTimeout(function () { | |||||
_this.timer = false | |||||
}, 500) | |||||
} | |||||
// 这里可以添加修改时的方法 | |||||
this.windowWidth(val); | |||||
} | |||||
}, | |||||
// watch: { | |||||
// clientWidth(val) { | |||||
// if (!this.timer) { | |||||
// this.clientWidth = val | |||||
// this.beilv2 = this.clientWidth / 1920 | |||||
// this.timer = true | |||||
// let _this = this | |||||
// setTimeout(function () { | |||||
// _this.timer = false | |||||
// }, 500) | |||||
// } | |||||
// // 这里可以添加修改时的方法 | |||||
// this.windowWidth(val); | |||||
// } | |||||
// }, | |||||
created() { | created() { | ||||
// this.fetchList('exception-alarm') | // this.fetchList('exception-alarm') | ||||
// this.fetchList('inAndOutOfEachLine') | // this.fetchList('inAndOutOfEachLine') | ||||
@@ -658,6 +658,7 @@ export default { | |||||
this.windowWidth(document.documentElement.clientWidth) | this.windowWidth(document.documentElement.clientWidth) | ||||
}, | }, | ||||
mounted() { | mounted() { | ||||
console.log(1111); | |||||
const _this = this; | const _this = this; | ||||
_this.beilv2 = document.documentElement.clientWidth / 1920 | _this.beilv2 = document.documentElement.clientWidth / 1920 | ||||
window.onresize = () => { | window.onresize = () => { | ||||
@@ -686,6 +687,7 @@ export default { | |||||
methods: { | methods: { | ||||
windowWidth(value) { | windowWidth(value) { | ||||
this.clientWidth = value | this.clientWidth = value | ||||
this.beilv2 = this.clientWidth / 1920 | |||||
}, | }, | ||||
// erd.listenTo(document.getElementById("box"), (element) => { | // erd.listenTo(document.getElementById("box"), (element) => { | ||||
// var width = element.offsetWidth; | // var width = element.offsetWidth; | ||||
@@ -1057,7 +1059,7 @@ export default { | |||||
} | } | ||||
</style> | </style> | ||||
<style lang="scss"> | |||||
<style lang="scss" > | |||||
.visual-container { | .visual-container { | ||||
::-webkit-scrollbar { | ::-webkit-scrollbar { | ||||
width: 8px; | width: 8px; | ||||
@@ -1096,23 +1098,25 @@ export default { | |||||
background-color: rgba($color: #5bc4be, $alpha: 1); | background-color: rgba($color: #5bc4be, $alpha: 1); | ||||
} | } | ||||
} | } | ||||
.el-input { | |||||
min-height: 10px; | |||||
} | |||||
.coldSelect{ | |||||
.el-input { | |||||
min-height: 10px; | |||||
} | |||||
.el-input__inner { | |||||
background-color: rgba($color: #31878c, $alpha: 0.29); | |||||
border: rgba($color: #31878c, $alpha: 0.29); | |||||
color: aliceblue; | |||||
} | |||||
.el-input__inner { | |||||
background-color: rgba($color: #31878c, $alpha: 0.29); | |||||
border: rgba($color: #31878c, $alpha: 0.29); | |||||
color: aliceblue; | |||||
} | |||||
.el-divider--vertical { | |||||
height: 174px; | |||||
width: 1px; | |||||
border: rgba(255, 255, 255, 0.15); | |||||
color: rgba(255, 255, 255, 0.15); | |||||
margin-left: 3em; | |||||
} | |||||
.el-divider--vertical { | |||||
height: 174px; | |||||
width: 1px; | |||||
border: rgba(255, 255, 255, 0.15); | |||||
color: rgba(255, 255, 255, 0.15); | |||||
margin-left: 3em; | |||||
} | |||||
} | |||||
</style> | </style> | ||||
<style scoped> | <style scoped> | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-07-19 15:18:30 | * @Date: 2021-07-19 15:18:30 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2023-10-17 11:10:22 | |||||
* @LastEditTime: 2023-11-23 11:11:35 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -44,7 +44,7 @@ | |||||
<el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8"> | <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8"> | ||||
<base-container :title="'各工序缺陷汇总'" :title-icon="'5_2'"> | <base-container :title="'各工序缺陷汇总'" :title-icon="'5_2'"> | ||||
<div class="visual-select"> | <div class="visual-select"> | ||||
<el-select v-model="modelMonth" size="mini" placeholder=""> | |||||
<el-select class="coldSelect" v-model="modelMonth" size="mini" placeholder=""> | |||||
<el-option key="1" value="钢1线" label="钢1线" default /> | <el-option key="1" value="钢1线" label="钢1线" default /> | ||||
</el-select> | </el-select> | ||||
</div> | </div> | ||||
@@ -740,16 +740,16 @@ export default { | |||||
// this.fetchList('order-process') | // this.fetchList('order-process') | ||||
// this.fetchList('line-chart-data') | // this.fetchList('line-chart-data') | ||||
this.init() | this.init() | ||||
this.windowWidth(document.documentElement.clientWidth) | |||||
}, | }, | ||||
mounted() { | mounted() { | ||||
const _this = this; | |||||
window.onresize = () => { | |||||
return (() => { | |||||
_this.clientWidth = `${document.documentElement.clientWidth}` | |||||
this.beilv2 = _this.clientWidth / 1920 | |||||
})() | |||||
} | |||||
this.windowWidth(document.documentElement.clientWidth) | |||||
// const _this = this; | |||||
// window.onresize = () => { | |||||
// return (() => { | |||||
// _this.clientWidth = `${document.documentElement.clientWidth}` | |||||
// this.beilv2 = _this.clientWidth / 1920 | |||||
// })() | |||||
// } | |||||
// this.beilv2 = window.innerWidth / 1920 | // this.beilv2 = window.innerWidth / 1920 | ||||
// addEventListener('resize', resizeFun = () => { | // addEventListener('resize', resizeFun = () => { | ||||
// this.beilv2 = window.innerWidth / 1920 | // this.beilv2 = window.innerWidth / 1920 | ||||
@@ -770,6 +770,7 @@ export default { | |||||
methods: { | methods: { | ||||
windowWidth(value) { | windowWidth(value) { | ||||
this.clientWidth = value | this.clientWidth = value | ||||
this.beilv2 = this.clientWidth / 1920 | |||||
}, | }, | ||||
// fetchList(type) { | // fetchList(type) { | ||||
// switch (type) { | // switch (type) { | ||||
@@ -932,7 +933,8 @@ export default { | |||||
background-color: rgba($color: #5bc4be, $alpha: 1); | background-color: rgba($color: #5bc4be, $alpha: 1); | ||||
} | } | ||||
} | } | ||||
.el-input { | |||||
.coldSelect{ | |||||
.el-input { | |||||
min-height: 10px; | min-height: 10px; | ||||
} | } | ||||
@@ -949,6 +951,7 @@ export default { | |||||
color: rgba(255, 255, 255, 0.15); | color: rgba(255, 255, 255, 0.15); | ||||
margin-left: 3em; | margin-left: 3em; | ||||
} | } | ||||
} | |||||
</style> | </style> | ||||
@@ -202,12 +202,11 @@ export default { | |||||
} | } | ||||
}, | }, | ||||
created() { | created() { | ||||
// this.init() | |||||
// console.log('aaaaaa') | |||||
// this.otherPaper() | |||||
// $('.hiprintEpContainer').empty() | |||||
}, | }, | ||||
destroyed () { | destroyed () { | ||||
$('.hiprintEpContainer').empty() | $('.hiprintEpContainer').empty() | ||||
console.log(11111) | |||||
}, | }, | ||||
methods: { | methods: { | ||||
// handleClose() { | // handleClose() { | ||||
@@ -215,6 +214,7 @@ export default { | |||||
// }, | // }, | ||||
closed() { | closed() { | ||||
$('.hiprintEpContainer').empty() | $('.hiprintEpContainer').empty() | ||||
$('.hiprint-printTemplate').empty() | |||||
}, | }, | ||||
init(data) { | init(data) { | ||||
this.drawer = true | this.drawer = true | ||||
@@ -256,17 +256,17 @@ export default { | |||||
// console.log(this.modelData) | // console.log(this.modelData) | ||||
// console.log($('#hiprint-printTemplate').empty()) | // console.log($('#hiprint-printTemplate').empty()) | ||||
if (this.modelData != {}) { | |||||
console.log(this.modelData); | |||||
$('.hiprintEpContainer').empty() | |||||
hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) | |||||
$('.hiprint-printTemplate').empty() | |||||
hiprintTemplate = new hiprint.PrintTemplate({ | |||||
template: JSON.parse(this.modelData), | |||||
settingContainer: '#PrintElementOptionSetting', | |||||
paginationContainer: '.hiprint-printPagination' | |||||
}) | |||||
} else { | |||||
// if () { | |||||
// console.log(this.modelData); | |||||
// $('.hiprintEpContainer').empty() | |||||
// hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) | |||||
// $('.hiprint-printTemplate').empty() | |||||
// hiprintTemplate = new hiprint.PrintTemplate({ | |||||
// template: JSON.parse(this.modelData), | |||||
// settingContainer: '#PrintElementOptionSetting', | |||||
// paginationContainer: '.hiprint-printPagination' | |||||
// }) | |||||
// } else { | |||||
$('.hiprintEpContainer').empty() | $('.hiprintEpContainer').empty() | ||||
console.log(this.modelData); | console.log(this.modelData); | ||||
hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) | hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value) | ||||
@@ -275,11 +275,11 @@ export default { | |||||
const template = provider.value | const template = provider.value | ||||
// console.log(template) | // console.log(template) | ||||
hiprintTemplate = new hiprint.PrintTemplate({ | hiprintTemplate = new hiprint.PrintTemplate({ | ||||
template: template, | |||||
template: this.modelData != '' ? JSON.parse(this.modelData) : {}, | |||||
settingContainer: '#PrintElementOptionSetting', | settingContainer: '#PrintElementOptionSetting', | ||||
paginationContainer: '.hiprint-printPagination' | paginationContainer: '.hiprint-printPagination' | ||||
}) | }) | ||||
} | |||||
// } | |||||
hiprintTemplate.design('#hiprint-printTemplate') | hiprintTemplate.design('#hiprint-printTemplate') | ||||
// console.log(hiprintTemplate) | // console.log(hiprintTemplate) | ||||
console.log(hiprintTemplate); | console.log(hiprintTemplate); | ||||
@@ -236,212 +236,10 @@ export const aProvider = function (ops) { | |||||
}; | }; | ||||
}; | }; | ||||
// 自定义设计元素2 | |||||
export const bProvider = function (ops) { | |||||
var addElementTypes = function (context) { | |||||
context.removePrintElementTypes("bProviderModule"); | |||||
context.addPrintElementTypes( | |||||
"bProviderModule", | |||||
[ | |||||
new hiprint.PrintElementTypeGroup("常规", [ | |||||
{ | |||||
tid: 'bProviderModule.header', title: '单据表头', data: '单据表头', type: 'text', | |||||
options: { | |||||
testData: '单据表头', | |||||
height: 17, | |||||
fontSize: 16.5, | |||||
fontWeight: "700", | |||||
textAlign: "center", | |||||
hideTitle: true | |||||
} | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.type', title: '单据类型', data: '单据类型', type: 'text', | |||||
options: { | |||||
testData: '单据类型', | |||||
height: 16, | |||||
fontSize: 15, | |||||
fontWeight: "700", | |||||
textAlign: "center", | |||||
hideTitle: true | |||||
} | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.order', title: '订单编号', data: 'XS888888888', type: 'text', | |||||
options: { | |||||
field: 'orderId', | |||||
testData: 'XS888888888', | |||||
height: 16, | |||||
fontSize: 6.75, | |||||
fontWeight: "700", | |||||
textAlign: "left", | |||||
textContentVerticalAlign: "middle" | |||||
} | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.date', title: '业务日期', data: '2020-01-01', type: 'text', | |||||
options: { | |||||
field: 'date', | |||||
testData: '2020-01-01', | |||||
height: 16, | |||||
fontSize: 6.75, | |||||
fontWeight: "700", | |||||
textAlign: "left", | |||||
textContentVerticalAlign: "middle" | |||||
} | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.barcode', title: '条形码', data: 'XS888888888', type: 'text', | |||||
options: { | |||||
field: 'barcode', | |||||
testData: 'XS888888888', | |||||
height: 32, | |||||
fontSize: 12, | |||||
lineHeight: 18, | |||||
textType: "barcode" | |||||
} | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.qrcode', title: '二维码', data: 'XS888888888', type: 'text', | |||||
options: { | |||||
field: 'qrcode', | |||||
testData: 'XS888888888', | |||||
height: 32, | |||||
fontSize: 12, | |||||
lineHeight: 18, | |||||
textType: "qrcode" | |||||
} | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.platform', title: '平台名称', data: '平台名称', type: 'text', | |||||
options: { | |||||
testData: '平台名称', | |||||
height: 17, | |||||
fontSize: 16.5, | |||||
fontWeight: "700", | |||||
textAlign: "center", | |||||
hideTitle: true | |||||
} | |||||
}, | |||||
{tid: 'bProviderModule.image', title: 'Logo', data: 'data: image/png;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', type: 'image', options: { | |||||
src: 'data: image/png;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', | |||||
fit: 'none' | |||||
}}, | |||||
]), | |||||
new hiprint.PrintElementTypeGroup("客户", [ | |||||
{ | |||||
tid: 'bProviderModule.khname', title: '客户名称', data: '高级客户', type: 'text', | |||||
options: { | |||||
field: 'name', | |||||
testData: '高级客户', | |||||
height: 16, | |||||
fontSize: 6.75, | |||||
fontWeight: "700", | |||||
textAlign: "left", | |||||
textContentVerticalAlign: "middle" | |||||
} | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.tel', title: '客户电话', data: '18888888888', type: 'text', | |||||
options: { | |||||
field: 'tel', | |||||
testData: '18888888888', | |||||
height: 16, | |||||
fontSize: 6.75, | |||||
fontWeight: "700", | |||||
textAlign: "left", | |||||
textContentVerticalAlign: "middle" | |||||
} | |||||
}, | |||||
]), | |||||
new hiprint.PrintElementTypeGroup("表格/其他", [ | |||||
{ | |||||
tid: 'bProviderModule.table', title: '订单数据', | |||||
type: 'table', | |||||
options: { | |||||
field: 'table', | |||||
fields: [ | |||||
{text: '名称', field: 'NAME'}, | |||||
{text: '数量', field: 'SL'}, | |||||
{text: '规格', field: 'GG'}, | |||||
{text: '条码', field: 'TM'}, | |||||
{text: '单价', field: 'DJ'}, | |||||
{text: '金额', field: 'JE'}, | |||||
{text: '备注', field: 'DETAIL'}, | |||||
], | |||||
}, | |||||
editable: true, | |||||
columnDisplayEditable: true,//列显示是否能编辑 | |||||
columnDisplayIndexEditable: true,//列顺序显示是否能编辑 | |||||
columnTitleEditable: true,//列标题是否能编辑 | |||||
columnResizable: true, //列宽是否能调整 | |||||
columnAlignEditable: true,//列对齐是否调整 | |||||
columns: [ | |||||
[ | |||||
{title: '名称', align: 'center', field: 'NAME', width: 100}, | |||||
{title: '数量', align: 'center', field: 'SL', width: 100}, | |||||
{title: '条码', align: 'center', field: 'TM', width: 100}, | |||||
{title: '规格', align: 'center', field: 'GG', width: 100}, | |||||
{title: '单价', align: 'center', field: 'DJ', width: 100}, | |||||
{title: '金额', align: 'center', field: 'JE', width: 100}, | |||||
{title: '备注', align: 'center', field: 'DETAIL', width: 100}, | |||||
] | |||||
], | |||||
footerFormatter: function (options, rows, data, currentPageGridRowsData) { | |||||
if (data && data['totalCap']) { | |||||
return `<td style="padding:0 10px" colspan="100">${'应收金额大写: ' + data['totalCap']}</td>` | |||||
} | |||||
return '<td style="padding:0 10px" colspan="100">应收金额大写: </td>' | |||||
}, | |||||
}, | |||||
{tid: 'bProviderModule.customText', title: '文本', customText: '自定义文本', custom: true, type: 'text'}, | |||||
{ | |||||
tid: 'bProviderModule.longText', title: '长文本', type: 'longText', options: { | |||||
field: 'test.longText', | |||||
width: 200, | |||||
testData: '长文本分页/不分页测试' | |||||
}, | |||||
} | |||||
]), | |||||
new hiprint.PrintElementTypeGroup("辅助", [ | |||||
{ | |||||
tid: 'bProviderModule.hline', | |||||
title: '横线', | |||||
type: 'hline' | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.vline', | |||||
title: '竖线', | |||||
type: 'vline' | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.rect', | |||||
title: '矩形', | |||||
type: 'rect' | |||||
}, | |||||
{ | |||||
tid: 'bProviderModule.oval', | |||||
title: '椭圆', | |||||
type: 'oval' | |||||
} | |||||
]) | |||||
] | |||||
); | |||||
}; | |||||
return { | |||||
addElementTypes: addElementTypes | |||||
}; | |||||
}; | |||||
// type: 1供货商 2经销商 | // type: 1供货商 2经销商 | ||||
export default [{ | export default [{ | ||||
name: 'A设计', | name: 'A设计', | ||||
value: 'aProviderModule', | value: 'aProviderModule', | ||||
type: 1, | type: 1, | ||||
f: aProvider() | f: aProvider() | ||||
}, { | |||||
name: 'B设计', | |||||
value: 'bProviderModule', | |||||
type: 2, | |||||
f: bProvider() | |||||
}] | }] |
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2023-08-01 14:55:51 | * @Date: 2023-08-01 14:55:51 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2023-11-07 19:28:18 | |||||
* @LastEditTime: 2023-11-22 14:40:59 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -77,7 +77,7 @@ const tableProps = [ | |||||
{ | { | ||||
prop: 'printStatus', | prop: 'printStatus', | ||||
label: '打印状态', | label: '打印状态', | ||||
// subcomponent: unitDict, | |||||
filter: (val) => val == 1 ? '未打印' : '已打印', | |||||
}, | }, | ||||
{ | { | ||||
prop: 'createTime', | prop: 'createTime', | ||||
@@ -96,7 +96,11 @@ export default { | |||||
exportURL: exportPackingExcel, | exportURL: exportPackingExcel, | ||||
}, | }, | ||||
tableProps, | tableProps, | ||||
tableBtn: [ | |||||
tableBtn: [ | |||||
{ | |||||
type: 'print', | |||||
btnName: '打印', | |||||
}, | |||||
this.$auth.hasPermi(`base:packaging-print-log:update`) | this.$auth.hasPermi(`base:packaging-print-log:update`) | ||||
? { | ? { | ||||
type: 'edit', | type: 'edit', | ||||
@@ -109,10 +113,6 @@ export default { | |||||
btnName: '删除', | btnName: '删除', | ||||
} | } | ||||
: undefined, | : undefined, | ||||
{ | |||||
type: 'print', | |||||
btnName: '打印', | |||||
}, | |||||
].filter((v) => v), | ].filter((v) => v), | ||||
tableData: [], | tableData: [], | ||||
formConfig: [ | formConfig: [ | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2023-08-01 14:55:51 | * @Date: 2023-08-01 14:55:51 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2023-11-01 10:28:29 | |||||
* @LastEditTime: 2023-11-22 14:40:07 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -33,6 +33,11 @@ import { | |||||
} from '@/api/base/printModel'; | } from '@/api/base/printModel'; | ||||
const tableProps = [ | const tableProps = [ | ||||
{ | |||||
prop: 'createTime', | |||||
label: '创建时间', | |||||
filter: parseTime | |||||
}, | |||||
{ | { | ||||
prop: 'name', | prop: 'name', | ||||
label: '模板名称' | label: '模板名称' | ||||
@@ -64,7 +69,11 @@ export default { | |||||
}, | }, | ||||
tableProps, | tableProps, | ||||
modelShow:false, | modelShow:false, | ||||
tableBtn: [ | |||||
tableBtn: [ | |||||
{ | |||||
type: 'print', | |||||
btnName: '查看', | |||||
}, | |||||
this.$auth.hasPermi(`base:packaging-print-model:update`) | this.$auth.hasPermi(`base:packaging-print-model:update`) | ||||
? { | ? { | ||||
type: 'edit', | type: 'edit', | ||||
@@ -77,10 +86,6 @@ export default { | |||||
btnName: '删除', | btnName: '删除', | ||||
} | } | ||||
: undefined, | : undefined, | ||||
{ | |||||
type: 'print', | |||||
btnName: '查看', | |||||
}, | |||||
].filter((v) => v), | ].filter((v) => v), | ||||
tableData: [], | tableData: [], | ||||
formConfig: [ | formConfig: [ | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2023-08-01 14:55:51 | * @Date: 2023-08-01 14:55:51 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2023-10-18 16:11:22 | |||||
* @LastEditTime: 2023-11-22 14:36:33 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -107,12 +107,12 @@ export default { | |||||
// valueFormat: 'yyyy-MM-dd', | // valueFormat: 'yyyy-MM-dd', | ||||
// param: 'createTime', | // param: 'createTime', | ||||
// }, | // }, | ||||
{ | |||||
type: 'button', | |||||
btnName: '搜索', | |||||
name: 'search', | |||||
color: 'primary', | |||||
}, | |||||
// { | |||||
// type: 'button', | |||||
// btnName: '搜索', | |||||
// name: 'search', | |||||
// color: 'primary', | |||||
// }, | |||||
// { | // { | ||||
// type: 'separate', | // type: 'separate', | ||||
// }, | // }, | ||||
@@ -125,7 +125,7 @@ export default { | |||||
type: 'separate', | type: 'separate', | ||||
}, | }, | ||||
{ | { | ||||
type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '', | |||||
type: this.$auth.hasPermi('base:packaging-print-type:create') ? 'button' : '', | |||||
btnName: '新增', | btnName: '新增', | ||||
name: 'add', | name: 'add', | ||||
color: 'success', | color: 'success', | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-11-18 14:16:25 | * @Date: 2021-11-18 14:16:25 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2023-11-10 16:26:08 | |||||
* @LastEditTime: 2023-11-22 16:50:55 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -100,7 +100,8 @@ import { | |||||
updateProcessEquMaterialBom, | updateProcessEquMaterialBom, | ||||
getEquipmentList, | getEquipmentList, | ||||
processEquMaterialBomDetPage, | processEquMaterialBomDetPage, | ||||
deleteProcessEquMaterialBomDet | |||||
deleteProcessEquMaterialBomDet, | |||||
getMaterialCode | |||||
} from '@/api/extend/processEquMaterialBom'; | } from '@/api/extend/processEquMaterialBom'; | ||||
import SmallTitle from './SmallTitle'; | import SmallTitle from './SmallTitle'; | ||||
import { parseTime } from '../../core/mixins/code-filter'; | import { parseTime } from '../../core/mixins/code-filter'; | ||||
@@ -197,7 +198,6 @@ export default { | |||||
}; | }; | ||||
}, | }, | ||||
mounted() { | mounted() { | ||||
this.getDict() | |||||
}, | }, | ||||
methods: { | methods: { | ||||
getCode(val) { | getCode(val) { | ||||
@@ -223,6 +223,9 @@ export default { | |||||
// console.log(response); | // console.log(response); | ||||
this.equipmentList = res.data | this.equipmentList = res.data | ||||
}) | }) | ||||
getMaterialCode().then(res => { | |||||
this.dataForm.code = res.data | |||||
}) | |||||
}, | }, | ||||
handleClick(raw) { | handleClick(raw) { | ||||
if (raw.type === 'delete') { | if (raw.type === 'delete') { | ||||
@@ -267,7 +270,8 @@ export default { | |||||
}); | }); | ||||
}, | }, | ||||
init(id, isdetail) { | init(id, isdetail) { | ||||
this.initData(); | |||||
this.initData() | |||||
this.getDict() | |||||
this.isdetail = isdetail || false; | this.isdetail = isdetail || false; | ||||
this.dataForm.id = id || undefined; | this.dataForm.id = id || undefined; | ||||
this.visible = true; | this.visible = true; | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-11-08 15:30:27 | * @Date: 2023-11-08 15:30:27 | ||||
* @LastEditTime: 2023-11-09 14:11:02 | |||||
* @LastEditTime: 2023-11-23 14:27:59 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -18,13 +18,16 @@ | |||||
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px" | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px" | ||||
@keyup.enter.native="dataFormSubmit()"> | @keyup.enter.native="dataFormSubmit()"> | ||||
<el-form-item label="物料名称" prop="materialId"> | <el-form-item label="物料名称" prop="materialId"> | ||||
<el-select v-model="dataForm.materialId" filterable placeholder="请选择物料名称"> | |||||
<el-select v-model="dataForm.materialId" filterable placeholder="请选择物料名称" multiple> | |||||
<el-option v-for="dict in materialList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | <el-option v-for="dict in materialList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | ||||
</el-select> | </el-select> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item label="数量" prop="num"> | <el-form-item label="数量" prop="num"> | ||||
<el-input v-model="dataForm.num" placeholder="请输入数量" clearable /> | <el-input v-model="dataForm.num" placeholder="请输入数量" clearable /> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item label="备注" prop="remark"> | |||||
<el-input v-model="dataForm.remark" placeholder="请输入备注" clearable /> | |||||
</el-form-item> | |||||
</el-form> | </el-form> | ||||
<el-row style="text-align: right"> | <el-row style="text-align: right"> | ||||
@@ -37,7 +40,7 @@ | |||||
<script> | <script> | ||||
import { | import { | ||||
getProcessEquMaterialBomDet, | getProcessEquMaterialBomDet, | ||||
createProcessEquMaterialBomDet, | |||||
createProcessEquMaterialBomDetList, | |||||
updateProcessEquMaterialBomDet, | updateProcessEquMaterialBomDet, | ||||
getMaterialList | getMaterialList | ||||
} from '@/api/extend/processEquMaterialBom'; | } from '@/api/extend/processEquMaterialBom'; | ||||
@@ -56,11 +59,13 @@ export default { | |||||
dataForm: { | dataForm: { | ||||
id: undefined, | id: undefined, | ||||
bomId: undefined, | bomId: undefined, | ||||
materialId:null, | |||||
materialId:[], | |||||
num: undefined, | num: undefined, | ||||
remark:undefined | |||||
}, | }, | ||||
dataRule: { | dataRule: { | ||||
attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }], | |||||
materialId: [{ required: true, message: '名称不能为空', trigger: 'change' }], | |||||
num: [{ required: true, message: '数量不能为空', trigger: 'blur' }], | |||||
}, | }, | ||||
}; | }; | ||||
}, | }, | ||||
@@ -79,8 +84,11 @@ export default { | |||||
getProcessEquMaterialBomDet({ | getProcessEquMaterialBomDet({ | ||||
id: this.dataForm.id | id: this.dataForm.id | ||||
}).then((res) => { | }).then((res) => { | ||||
this.dataForm = res.data; | |||||
// this.dataForm.materialId = materialId; | |||||
this.dataForm = res.data | |||||
const arr = [] | |||||
arr.push(res.data.materialId) | |||||
this.dataForm.materialId =arr | |||||
console.log(this.dataForm.materialId); | |||||
// this.dataForm.value = value; | // this.dataForm.value = value; | ||||
}); | }); | ||||
} | } | ||||
@@ -97,10 +105,16 @@ export default { | |||||
this.$refs['dataForm'].validate((valid) => { | this.$refs['dataForm'].validate((valid) => { | ||||
if (valid) { | if (valid) { | ||||
// 修改的提交 | // 修改的提交 | ||||
if (this.dataForm.id) { | |||||
if (this.dataForm.id) { | |||||
const dataObj = { | |||||
materialId: this.dataForm.materialId.toString(), | |||||
bomId: this.dataForm.bomId, | |||||
num: this.dataForm.num, | |||||
id: this.dataForm.id, | |||||
remark: this.dataForm.remark | |||||
} | |||||
updateProcessEquMaterialBomDet({ | updateProcessEquMaterialBomDet({ | ||||
...this.dataForm, | |||||
productId: this.productId, | |||||
...dataObj | |||||
}).then((response) => { | }).then((response) => { | ||||
this.$modal.msgSuccess('修改成功'); | this.$modal.msgSuccess('修改成功'); | ||||
this.visible = false; | this.visible = false; | ||||
@@ -108,11 +122,16 @@ export default { | |||||
}); | }); | ||||
return; | return; | ||||
} | } | ||||
// 添加的提交 | |||||
createProcessEquMaterialBomDet({ | |||||
...this.dataForm, | |||||
productId: this.productId, | |||||
}).then((response) => { | |||||
// 添加的提交 | |||||
const dataArr = this.dataForm.materialId.map(ele => { | |||||
return { | |||||
materialId: ele, | |||||
bomId: this.dataForm.bomId, | |||||
num: this.dataForm.num, | |||||
remark: this.dataForm.remark | |||||
} | |||||
}); | |||||
createProcessEquMaterialBomDetList(dataArr).then((response) => { | |||||
this.$modal.msgSuccess('新增成功'); | this.$modal.msgSuccess('新增成功'); | ||||
this.visible = false; | this.visible = false; | ||||
this.$emit('refreshDataList'); | this.$emit('refreshDataList'); | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2021-11-18 14:16:25 | * @Date: 2021-11-18 14:16:25 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2023-11-09 14:49:16 | |||||
* @LastEditTime: 2023-11-23 09:20:12 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -53,7 +53,7 @@ | |||||
</el-form-item> | </el-form-item> | ||||
</el-form> | </el-form> | ||||
</div> | </div> | ||||
<div class="drawer-body__footer"> | |||||
<div v-if="isdetail" class="drawer-body__footer"> | |||||
<el-button style="" @click="goback()">取消</el-button> | <el-button style="" @click="goback()">取消</el-button> | ||||
<el-button v-if="isdetail" type="primary" @click="goEdit()"> | <el-button v-if="isdetail" type="primary" @click="goEdit()"> | ||||
编辑 | 编辑 | ||||
@@ -63,7 +63,7 @@ | |||||
<div class="attr-list" v-if="idAttrShow"> | <div class="attr-list" v-if="idAttrShow"> | ||||
<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true"> | <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true"> | ||||
设备物料明细 | |||||
设备参数 | |||||
</small-title> | </small-title> | ||||
<div v-if="!isdetail" class="action_btn"> | <div v-if="!isdetail" class="action_btn"> | ||||
@@ -100,7 +100,8 @@ import { | |||||
updateProcessEquValueBom, | updateProcessEquValueBom, | ||||
getEquipmentList, | getEquipmentList, | ||||
processEquValueBomDetPage, | processEquValueBomDetPage, | ||||
deleteProcessEquValueBomDet | |||||
deleteProcessEquValueBomDet, | |||||
getValueCode | |||||
} from '@/api/extend/processEquValueBom'; | } from '@/api/extend/processEquValueBom'; | ||||
import SmallTitle from './SmallTitle'; | import SmallTitle from './SmallTitle'; | ||||
import { parseTime } from '../../core/mixins/code-filter'; | import { parseTime } from '../../core/mixins/code-filter'; | ||||
@@ -208,7 +209,6 @@ export default { | |||||
}; | }; | ||||
}, | }, | ||||
mounted() { | mounted() { | ||||
this.getDict() | |||||
}, | }, | ||||
methods: { | methods: { | ||||
getCode(val) { | getCode(val) { | ||||
@@ -234,6 +234,9 @@ export default { | |||||
// console.log(response); | // console.log(response); | ||||
this.equipmentList = res.data | this.equipmentList = res.data | ||||
}) | }) | ||||
getValueCode().then(res => { | |||||
this.dataForm.code = res.data | |||||
}) | |||||
}, | }, | ||||
handleClick(raw) { | handleClick(raw) { | ||||
if (raw.type === 'delete') { | if (raw.type === 'delete') { | ||||
@@ -277,8 +280,9 @@ export default { | |||||
this.listQuery.total = response.data.total; | this.listQuery.total = response.data.total; | ||||
}); | }); | ||||
}, | }, | ||||
init(id, isdetail) { | |||||
this.initData(); | |||||
init(id, isdetail) { | |||||
this.getDict() | |||||
this.initData() | |||||
console.log(isdetail); | console.log(isdetail); | ||||
this.isdetail = isdetail || false; | this.isdetail = isdetail || false; | ||||
this.dataForm.id = id || undefined; | this.dataForm.id = id || undefined; | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: zhp | * @Author: zhp | ||||
* @Date: 2023-11-08 15:30:27 | * @Date: 2023-11-08 15:30:27 | ||||
* @LastEditTime: 2023-11-09 14:44:49 | |||||
* @LastEditTime: 2023-11-23 14:26:54 | |||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @Description: | * @Description: | ||||
--> | --> | ||||
@@ -18,19 +18,19 @@ | |||||
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px" | <el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="100px" | ||||
@keyup.enter.native="dataFormSubmit()"> | @keyup.enter.native="dataFormSubmit()"> | ||||
<el-form-item label="参数名称" prop="paramId"> | <el-form-item label="参数名称" prop="paramId"> | ||||
<el-select v-model="dataForm.paramId" filterable placeholder="参数名称" @change="getData"> | |||||
<el-select v-model="dataForm.paramId" filterable placeholder="参数名称" @change="getData" multiple > | |||||
<el-option v-for="dict in materialList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | <el-option v-for="dict in materialList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | ||||
</el-select> | </el-select> | ||||
</el-form-item> | </el-form-item> | ||||
<!-- <el-form-item label="参数编码" prop="code"> | <!-- <el-form-item label="参数编码" prop="code"> | ||||
<el-input v-model="dataForm.code" placeholder="请输入参数编码" clearable /> | <el-input v-model="dataForm.code" placeholder="请输入参数编码" clearable /> | ||||
</el-form-item> --> | </el-form-item> --> | ||||
<el-form-item label="标准最小值" prop="standardMinValue"> | |||||
<!-- <el-form-item label="标准最小值" prop="standardMinValue"> | |||||
<el-input v-model="dataForm.standardMinValue" placeholder="请输入标准最小值" clearable /> | <el-input v-model="dataForm.standardMinValue" placeholder="请输入标准最小值" clearable /> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item label="标准最大值" prop="standardMaxValue"> | <el-form-item label="标准最大值" prop="standardMaxValue"> | ||||
<el-input v-model="dataForm.standardMaxValue" placeholder="请输入标准最大值" clearable /> | <el-input v-model="dataForm.standardMaxValue" placeholder="请输入标准最大值" clearable /> | ||||
</el-form-item> | |||||
</el-form-item> --> | |||||
<el-form-item label="工艺最小值" prop="minValue"> | <el-form-item label="工艺最小值" prop="minValue"> | ||||
<el-input v-model="dataForm.minValue" placeholder="请输入工艺最小值" clearable /> | <el-input v-model="dataForm.minValue" placeholder="请输入工艺最小值" clearable /> | ||||
</el-form-item> | </el-form-item> | ||||
@@ -55,7 +55,7 @@ | |||||
<script> | <script> | ||||
import { | import { | ||||
getProcessEquValueBomDet, | getProcessEquValueBomDet, | ||||
createProcessEquValueBomDet, | |||||
createProcessEquValueBomDetList, | |||||
updateProcessEquValueBomDet, | updateProcessEquValueBomDet, | ||||
getValueList | getValueList | ||||
} from '@/api/extend/processEquValueBom'; | } from '@/api/extend/processEquValueBom'; | ||||
@@ -74,7 +74,7 @@ export default { | |||||
dataForm: { | dataForm: { | ||||
id: undefined, | id: undefined, | ||||
bomId: undefined, | bomId: undefined, | ||||
paramId:undefined, | |||||
paramId:[], | |||||
minValue:undefined, | minValue:undefined, | ||||
maxValue: undefined, | maxValue: undefined, | ||||
defaultValue: undefined, | defaultValue: undefined, | ||||
@@ -117,6 +117,10 @@ export default { | |||||
id: this.dataForm.id | id: this.dataForm.id | ||||
}).then((res) => { | }).then((res) => { | ||||
this.dataForm = res.data; | this.dataForm = res.data; | ||||
const arr = [] | |||||
arr.push(res.data.paramId) | |||||
this.dataForm.paramId = arr | |||||
console.log(this.dataForm.paramId); | |||||
// this.dataForm.materialId = materialId; | // this.dataForm.materialId = materialId; | ||||
// this.dataForm.value = value; | // this.dataForm.value = value; | ||||
}); | }); | ||||
@@ -137,22 +141,41 @@ export default { | |||||
this.$refs['dataForm'].validate((valid) => { | this.$refs['dataForm'].validate((valid) => { | ||||
if (valid) { | if (valid) { | ||||
// 修改的提交 | // 修改的提交 | ||||
if (this.dataForm.id) { | |||||
if (this.dataForm.id) { | |||||
const dataObj = { | |||||
paramId: this.dataForm.paramId.toString(), | |||||
bomId: this.dataForm.bomId, | |||||
minValue: this.dataForm.minValue, | |||||
maxValue: this.dataForm.maxValue, | |||||
defaultValue: this.dataForm.defaultValue, | |||||
standardMinValue: this.dataForm.standardMinValue, | |||||
standardMaxValue: this.dataForm.standardMaxValue, | |||||
remark: this.dataForm.remark, | |||||
id: this.dataForm.id | |||||
} | |||||
updateProcessEquValueBomDet({ | updateProcessEquValueBomDet({ | ||||
...this.dataForm, | |||||
productId: this.productId, | |||||
...dataObj, | |||||
}).then((response) => { | }).then((response) => { | ||||
this.$modal.msgSuccess('修改成功'); | this.$modal.msgSuccess('修改成功'); | ||||
this.visible = false; | this.visible = false; | ||||
this.$emit('refreshDataList'); | this.$emit('refreshDataList'); | ||||
}); | }); | ||||
return; | return; | ||||
} | |||||
} | |||||
const dataArr = this.dataForm.paramId.map(ele => { | |||||
return { | |||||
paramId: ele, | |||||
bomId: this.dataForm.bomId, | |||||
minValue: this.dataForm.minValue, | |||||
maxValue: this.dataForm.maxValue, | |||||
defaultValue: this.dataForm.defaultValue, | |||||
standardMinValue: this.dataForm.standardMinValue, | |||||
standardMaxValue: this.dataForm.standardMaxValue, | |||||
remark: this.dataForm.remark | |||||
} | |||||
}); | |||||
// 添加的提交 | // 添加的提交 | ||||
createProcessEquValueBomDet({ | |||||
...this.dataForm, | |||||
productId: this.productId, | |||||
}).then((response) => { | |||||
createProcessEquValueBomDetList(dataArr).then((response) => { | |||||
this.$modal.msgSuccess('新增成功'); | this.$modal.msgSuccess('新增成功'); | ||||
this.visible = false; | this.visible = false; | ||||
this.$emit('refreshDataList'); | this.$emit('refreshDataList'); | ||||
@@ -2,7 +2,7 @@ | |||||
* @Author: zwq | * @Author: zwq | ||||
* @Date: 2023-08-01 14:55:51 | * @Date: 2023-08-01 14:55:51 | ||||
* @LastEditors: zhp | * @LastEditors: zhp | ||||
* @LastEditTime: 2023-11-10 10:23:33 | |||||
* @LastEditTime: 2023-11-22 14:23:40 | |||||
* @Description: | * @Description: | ||||
--> | --> | ||||
<template> | <template> | ||||
@@ -70,7 +70,7 @@ const tableProps = [ | |||||
}, | }, | ||||
{ | { | ||||
prop: 'yield', | prop: 'yield', | ||||
label: '成品率' | |||||
label: '合格率' | |||||
} | } | ||||
]; | ]; | ||||
@@ -115,19 +115,19 @@ export default { | |||||
valueField: 'id', | valueField: 'id', | ||||
param: 'orderName' | param: 'orderName' | ||||
}, | }, | ||||
// { | |||||
// type: 'datePicker', | |||||
// label: '时间段', | |||||
// dateType: 'daterange', | |||||
// format: 'yyyy-MM-dd', | |||||
// valueFormat: "yyyy-MM-dd", | |||||
// rangeSeparator: '-', | |||||
// startPlaceholder: '开始时间', | |||||
// endPlaceholder: '结束时间', | |||||
// param: 'timeVal', | |||||
// defaultSelect: [], | |||||
// width: 250 | |||||
// }, | |||||
{ | |||||
type: 'datePicker', | |||||
label: '工单开始时间', | |||||
dateType: 'daterange', | |||||
format: 'yyyy-MM-dd', | |||||
valueFormat: "yyyy-MM-dd", | |||||
rangeSeparator: '-', | |||||
startPlaceholder: '开始时间', | |||||
endPlaceholder: '结束时间', | |||||
param: 'timeVal', | |||||
defaultSelect: [], | |||||
width: 250 | |||||
}, | |||||
{ | { | ||||
type: 'button', | type: 'button', | ||||
btnName: '搜索', | btnName: '搜索', | ||||
@@ -238,13 +238,13 @@ export default { | |||||
if (val.btnName === 'search') { | if (val.btnName === 'search') { | ||||
this.listQuery.orderName = val.orderName ? val.orderName :undefined | this.listQuery.orderName = val.orderName ? val.orderName :undefined | ||||
// this.queryParams.status = val.status | // this.queryParams.status = val.status | ||||
// if (val.timeVal && val.timeVal.length != 0 ) { | |||||
// this.listQuery.startTime = val.timeVal[0] + ' 00:00:00' | |||||
// this.listQuery.endTime = val.timeVal[1] + ' 23:59:59' | |||||
// } else { | |||||
// this.listQuery.startTime = undefined | |||||
// this.listQuery.endTime = undefined | |||||
// } | |||||
if (val.timeVal && val.timeVal.length != 0 ) { | |||||
this.listQuery.startTime = val.timeVal[0] + ' 00:00:00' | |||||
this.listQuery.endTime = val.timeVal[1] + ' 23:59:59' | |||||
} else { | |||||
this.listQuery.startTime = undefined | |||||
this.listQuery.endTime = undefined | |||||
} | |||||
this.getList() | this.getList() | ||||
} else { | } else { | ||||
// this.handleExport() | // this.handleExport() | ||||