Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/255pull/258/head
@@ -1,7 +1,7 @@ | |||
/* | |||
* @Author: zhp | |||
* @Date: 2023-12-04 14:10:37 | |||
* @LastEditTime: 2023-12-14 10:06:03 | |||
* @LastEditTime: 2024-03-19 15:02:49 | |||
* @LastEditors: zhp | |||
* @Description: | |||
*/ | |||
@@ -26,10 +26,11 @@ export function updateQualityInspectionBoxBtn(data) { | |||
} | |||
// 删除安灯按钮16键对应 | |||
export function deleteQualityInspectionBoxBtn(id) { | |||
export function deleteQualityInspectionBoxBtn(query) { | |||
return request({ | |||
url: '/base/quality-inspection-box-btn/delete?id=' + id, | |||
method: 'delete' | |||
url: 'base/quality-inspection-box-btn/deleteByLineSection', | |||
method: 'delete', | |||
params: query | |||
}) | |||
} | |||
@@ -1,7 +1,7 @@ | |||
/* | |||
* @Author: zhp | |||
* @Date: 2023-10-18 09:33:57 | |||
* @LastEditTime: 2024-03-15 15:18:09 | |||
* @LastEditTime: 2024-03-20 15:39:27 | |||
* @LastEditors: zhp | |||
* @Description: | |||
*/ | |||
@@ -36,7 +36,7 @@ export function exportEnergyPlcExcel(query) { | |||
export function exportEquipmentTraceabilityExcel(query) { | |||
return request({ | |||
url: '/analysis/equipment-analysis/export-excel', | |||
url: '/analysis/equipment-analysis/export-efficiency', | |||
method: 'get', | |||
params: query, | |||
responseType: 'blob' | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-10-17 16:50:19 | |||
* @LastEditTime: 2024-01-22 09:55:32 | |||
* @LastEditTime: 2024-03-20 08:36:01 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -23,7 +23,7 @@ | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="标签类型" prop="typeId"> | |||
<el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择打印方式" clearable> | |||
<el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择标签类型" clearable> | |||
<el-option v-for="dict in typeList" :key="dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2021-11-18 14:16:25 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2023-12-08 13:59:20 | |||
* @LastEditTime: 2024-03-20 09:18:30 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -12,49 +12,47 @@ | |||
</small-title> | |||
<div class="content"> | |||
<!-- <div class="visual-part"> --> | |||
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" | |||
label-width="100px" label-position="top"> | |||
<el-row :gutter="24"> | |||
<el-col :span="8"> | |||
<el-form-item label="设备名称" prop="equipmentId"> | |||
<el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%" | |||
@change="getCode" placeholder="请选择设备名称"> | |||
<el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="设备编码" prop="equipmentCode"> | |||
<el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="设备Bom编码" prop="code"> | |||
<el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入设备Bom编码" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row :gutter="24"> | |||
<el-col :span="8"> | |||
<el-form-item label="设备物料BOM名称" prop="name"> | |||
<el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备物料BOM名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="当前状态" prop="enabled"> | |||
<el-select v-model="dataForm.enabled" filterable :disabled="isdetail" style="width: 100%" | |||
placeholder="请选择当前状态"> | |||
<el-option v-for="dict in enableList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
</el-form> | |||
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" | |||
label-width="100px" label-position="top"> | |||
<el-row :gutter="24"> | |||
<el-col :span="8"> | |||
<el-form-item label="设备名称" prop="equipmentId"> | |||
<el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%" | |||
@change="getCode" placeholder="请选择设备名称"> | |||
<el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="设备编码" prop="equipmentCode"> | |||
<el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="设备Bom编码" prop="code"> | |||
<el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入设备Bom编码" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row :gutter="24"> | |||
<el-col :span="8"> | |||
<el-form-item label="设备物料BOM名称" prop="name"> | |||
<el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备物料BOM名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="当前状态" prop="enabled"> | |||
<el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0"> | |||
</el-switch> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
</el-form> | |||
<!-- </div> --> | |||
<div class="attr-list" v-if="idAttrShow"> | |||
<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true"> | |||
@@ -77,9 +75,9 @@ | |||
:limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" /> | |||
</div> | |||
</div> | |||
<div class="drawer-body__footer"> | |||
<div class="drawer-body__footer"> | |||
<el-button style="" @click="goback()">取消</el-button> | |||
<el-button type="primary" @click="dataFormSubmit()">确定</el-button> | |||
<el-button type="primary" @click="dataFormSubmit()">确定</el-button> | |||
</div> | |||
<attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :product-id="dataForm.id" @refreshDataList="getList" /> | |||
</el-drawer> | |||
@@ -93,6 +93,7 @@ export default { | |||
labelField: 'name', | |||
valueField: 'id', | |||
param: 'equipmentId', | |||
filterable: true | |||
}, | |||
{ | |||
type: 'input', | |||
@@ -146,6 +147,26 @@ export default { | |||
}); | |||
} | |||
}, | |||
deleteHandle(id, name, index) { | |||
this.$confirm(`是否确认删除设备物料bom${name}`, "提示", { | |||
confirmButtonText: "确定", | |||
cancelButtonText: "取消", | |||
type: "warning", | |||
}) | |||
.then(() => { | |||
this.urlOptions.deleteURL(id).then(({ data }) => { | |||
this.$message({ | |||
message: "操作成功", | |||
type: "success", | |||
duration: 1500, | |||
onClose: () => { | |||
this.getDataList(); | |||
}, | |||
}); | |||
}); | |||
}) | |||
.catch(() => { }); | |||
}, | |||
getDict() { | |||
getEquipmentList().then((res) => { | |||
// console.log(res); | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2021-11-18 14:16:25 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-03-08 09:14:38 | |||
* @LastEditTime: 2024-03-20 09:17:11 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -12,51 +12,53 @@ | |||
</small-title> | |||
<div class="content"> | |||
<!-- <div class="visual-part"> --> | |||
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" | |||
label-width="100px" label-position="top"> | |||
<el-row :gutter="24"> | |||
<el-col :span="8"> | |||
<el-form-item label="设备名称" prop="equipmentId"> | |||
<el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%" | |||
@change="getCode" placeholder="请选择设备名称"> | |||
<el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="设备编码" prop="equipmentCode"> | |||
<el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="参数Bom编码" prop="code"> | |||
<el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入参数Bom编码" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row :gutter="24"> | |||
<el-col :span="8"> | |||
<el-form-item label="设备参数BOM名称" prop="name"> | |||
<el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备参数BOM名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="当前状态" prop="enabled"> | |||
<!-- <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0" /> --> | |||
<el-select v-model="dataForm.enabled" filterable :disabled="isdetail" style="width: 100%" | |||
placeholder="请选择当前状态"> | |||
<el-option v-for="dict in enableList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" | |||
label-width="100px" label-position="top"> | |||
<el-row :gutter="24"> | |||
<el-col :span="8"> | |||
<el-form-item label="设备名称" prop="equipmentId"> | |||
<el-select v-model="dataForm.equipmentId" filterable :disabled="isdetail" style="width: 100%" | |||
@change="getCode" placeholder="请选择设备名称"> | |||
<el-option v-for="dict in equipmentList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="设备编码" prop="equipmentCode"> | |||
<el-input v-model="dataForm.equipmentCode" clearable :disabled="isdetail" placeholder="请输入设备编码" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="参数Bom编码" prop="code"> | |||
<el-input v-model="dataForm.code" clearable :disabled="isdetail" placeholder="请输入参数Bom编码" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row :gutter="24"> | |||
<el-col :span="8"> | |||
<el-form-item label="设备参数BOM名称" prop="name"> | |||
<el-input v-model="dataForm.name" clearable :disabled="isdetail" placeholder="请输入设备参数BOM名称" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="当前状态" prop="enabled"> | |||
<!-- <el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0" /> --> | |||
<!-- <el-select v-model="dataForm.enabled" filterable :disabled="isdetail" style="width: 100%" | |||
placeholder="请选择当前状态"> | |||
<el-option v-for="dict in enableList" :key=" dict.id" :label="dict.name" :value="dict.id" /> | |||
</el-select> --> | |||
<el-switch v-model="dataForm.enabled" :active-value="1" :inactive-value="0"> | |||
</el-switch> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" :disabled="isdetail" clearable placeholder="请输入备注" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
</el-form> | |||
</el-form> | |||
<!-- </div> --> | |||
<!-- <div v-if="!isdetail" class="drawer-body__footer"> | |||
@@ -83,7 +85,7 @@ | |||
:limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" /> | |||
</div> | |||
</div> | |||
<div v-if="!isdetail" class="drawer-body__footer"> | |||
<div v-if="!isdetail" class="drawer-body__footer"> | |||
<el-button style="" @click="goback()">取消</el-button> | |||
<el-button type="primary" @click="dataFormSubmit()">确定</el-button> | |||
</div> | |||
@@ -93,6 +93,8 @@ export default { | |||
labelField: 'name', | |||
valueField: 'id', | |||
param: 'equipmentId', | |||
filterable: true | |||
// filter | |||
}, | |||
{ | |||
type: 'input', | |||
@@ -158,6 +160,26 @@ export default { | |||
}) | |||
}) | |||
}, | |||
deleteHandle(id, name, index) { | |||
this.$confirm(`是否确认删除设备参数bom${ name}`, "提示", { | |||
confirmButtonText: "确定", | |||
cancelButtonText: "取消", | |||
type: "warning", | |||
}) | |||
.then(() => { | |||
this.urlOptions.deleteURL(id).then(({ data }) => { | |||
this.$message({ | |||
message: "操作成功", | |||
type: "success", | |||
duration: 1500, | |||
onClose: () => { | |||
this.getDataList(); | |||
}, | |||
}); | |||
}); | |||
}) | |||
.catch(() => { }); | |||
}, | |||
// 获取数据列表 | |||
getDataList() { | |||
this.dataListLoading = true; | |||
@@ -1,8 +1,8 @@ | |||
<!-- | |||
<!-- | |||
filename: index.vue | |||
author: liubin | |||
date: 2023-10-19 10:03:42 | |||
description: | |||
description: | |||
--> | |||
<template> | |||
@@ -189,7 +189,7 @@ export default { | |||
input: true, | |||
label: '工艺编码', | |||
prop: 'code', | |||
// url: '/base/core-equipment/getCode', | |||
url: '/extend/process-flow/getCode', | |||
}, | |||
], | |||
[ | |||
@@ -166,13 +166,20 @@ export default { | |||
this.resetForm('form'); | |||
}, | |||
deleteHandle(id, name, index, data) { | |||
console.log(data) | |||
// const params = new URLSearchParams(); | |||
// params.append('productionLineId', data.productionLineId) | |||
// params.append('sectionId', data.sectionId); | |||
this.$confirm(`确认要删除产线名为${data.productionLineName}的数据项?`, "提示", { | |||
confirmButtonText: "确定", | |||
cancelButtonText: "取消", | |||
type: "warning", | |||
}) | |||
.then(() => { | |||
this.urlOptions.deleteURL(data.id).then(({ data }) => { | |||
this.urlOptions.deleteURL({ | |||
'productionLineId': data.productionLineId, | |||
'sectionId': data.sectionId, | |||
}).then(({ data }) => { | |||
this.$message({ | |||
message: "操作成功", | |||
type: "success", | |||
@@ -34,6 +34,7 @@ import basicPage from './basic-page'; | |||
import moment from 'moment'; | |||
import addOrUpdate from './dialogForm.vue'; | |||
import ProcessBomList from './ProcessBomList.vue'; | |||
import row from './row.vue'; | |||
export default { | |||
name: 'QualityInspectionBoxBtn', | |||
mixins: [basicPage], | |||
@@ -115,7 +116,8 @@ export default { | |||
}, | |||
{ | |||
prop: 'datas', | |||
label: '产线及工段', | |||
label: '产线及工段', | |||
subcomponent: row | |||
} | |||
], | |||
// 查询参数 | |||
@@ -168,7 +170,7 @@ export default { | |||
this.urlOptions.getDataListURL(this.listQuery).then(res => { | |||
this.tableData = res.data.list.map((item) => { | |||
return { | |||
datas: item.strList ? item.strList.toString() : null, | |||
datas: item.strList || null, | |||
nickName: item.nickName, | |||
userName: item.userName, | |||
userId: item.userId | |||
@@ -0,0 +1,46 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-03-20 10:01:01 | |||
* @LastEditTime: 2024-03-20 10:03:39 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
<div class="tableInner"> | |||
<div v-for="(item,index) in injectData.datas" :key="index"> | |||
<span> {{ item }} </span> | |||
</div> | |||
<!-- <el-input-number v-model="list[itemProp]" @blur="changeInput" :min="0" :max="100000000" style="width: 100%" :controls='false'></el-input-number> --> | |||
</div> | |||
</template> | |||
<script> | |||
export default { | |||
name: 'InputArea', | |||
props: { | |||
injectData: { | |||
type: Object, | |||
default: () => ({}) | |||
}, | |||
itemProp: { | |||
type: String | |||
} | |||
}, | |||
data() { | |||
return { | |||
list: this.injectData | |||
} | |||
}, | |||
methods: { | |||
// changeInput() { | |||
// this.$emit('emitData', this.list) | |||
// } | |||
} | |||
} | |||
</script> | |||
<style lang="scss"> | |||
// .tableInner .el-input__inner { | |||
// border: none; | |||
// padding: 0; | |||
// height: 33px; | |||
// } | |||
</style> |
@@ -59,12 +59,18 @@ const tableProps = [ | |||
}, | |||
{ | |||
prop: 'materialGrade', | |||
label: '原料等级' | |||
label: '原料等级', | |||
filter: (val) => val == 1 ? 'A' : val == 2 ? 'B' : 'C', | |||
}, | |||
{ | |||
prop: 'checkerName', | |||
label: '检测人员' | |||
}, | |||
{ | |||
prop: 'checkTime', | |||
label: '检测时间', | |||
filter: parseTime | |||
}, | |||
]; | |||
export default { | |||
@@ -112,6 +118,19 @@ export default { | |||
labelField: 'name', | |||
valueField: 'id', | |||
param: 'materialId', | |||
}, | |||
{ | |||
type: 'datePicker', | |||
label: '时间段', | |||
dateType: 'daterange', | |||
format: 'yyyy-MM-dd HH:mm:ss', | |||
valueFormat: "yyyy-MM-dd HH:mm:ss", | |||
rangeSeparator: '-', | |||
startPlaceholder: '开始时间', | |||
endPlaceholder: '结束时间', | |||
param: 'checkTime', | |||
defaultSelect: [], | |||
width: 250 | |||
}, | |||
{ | |||
type: 'button', | |||
@@ -159,7 +178,7 @@ export default { | |||
}); | |||
}, | |||
deleteHandle(id, name, index, data) { | |||
this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", { | |||
this.$confirm(`确认要删除序号${index}?`, "提示", { | |||
confirmButtonText: "确定", | |||
cancelButtonText: "取消", | |||
type: "warning", | |||
@@ -189,7 +208,7 @@ export default { | |||
this.listQuery.pageNo = 1; | |||
this.listQuery.pageSize = 10; | |||
this.listQuery.materialId = val.materialId ? val.materialId : undefined; | |||
// this.listQuery.typeId = val.typeId ? val.typeId : undefined; | |||
this.listQuery.checkTime = val.checkTime ? val.checkTime : undefined; | |||
this.getDataList(); | |||
break; | |||
case 'reset': | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-11-06 15:15:30 | |||
* @LastEditTime: 2024-03-15 14:31:10 | |||
* @LastEditTime: 2024-03-20 09:38:10 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -22,7 +22,8 @@ | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="报废时间" prop="logTime"> | |||
<el-date-picker style="width: 100%;" v-model="dataForm.logTime" type="datetime" value-format="timestamp" placeholder="选择日期"> | |||
<el-date-picker style="width: 100%;" v-model="dataForm.logTime" type="datetime" value-format="timestamp" | |||
placeholder="选择日期"> | |||
</el-date-picker> | |||
</el-form-item> | |||
</el-col> | |||
@@ -51,18 +52,17 @@ | |||
</el-col> | |||
</el-row> | |||
<el-row :gutter="20"> | |||
<el-col :span="8"> | |||
<el-col :span="24"> | |||
<el-form-item label="描述" prop="description"> | |||
<el-input v-model="dataForm.description" placeholder="请输入描述" /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" placeholder="备注" /> | |||
<el-input v-model="dataForm.description" type="textarea" :rows="4" placeholder="请输入描述" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" placeholder="备注" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-form> | |||
</template> | |||
@@ -1,7 +1,7 @@ | |||
/* | |||
* @Author: zhp | |||
* @Date: 2024-02-28 09:51:25 | |||
* @LastEditTime: 2024-03-15 14:34:29 | |||
* @LastEditTime: 2024-03-20 09:42:46 | |||
* @LastEditors: zhp | |||
* @Description: | |||
*/ | |||
@@ -24,10 +24,9 @@ export default { | |||
} | |||
}, | |||
created() { | |||
this.dataForm.logTime = this.format(new Date().getTime()) | |||
console.log(this.dataForm.logTime); | |||
}, | |||
mounted () { | |||
mounted() { | |||
}, | |||
// activated() { | |||
// }, | |||
@@ -50,7 +49,8 @@ export default { | |||
this.getArr() | |||
} | |||
this.$nextTick(() => { | |||
this.$refs["dataForm"].resetFields(); | |||
this.$refs["dataForm"].resetFields() | |||
this.dataForm.logTime = new Date() | |||
if (this.dataForm.id) { | |||
this.urlOptions.infoURL(id).then(response => { | |||
console.log(response) | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-11-06 15:15:30 | |||
* @LastEditTime: 2024-03-15 14:33:12 | |||
* @LastEditTime: 2024-03-20 09:40:42 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -57,18 +57,17 @@ | |||
</el-col> | |||
</el-row> | |||
<el-row :gutter="20"> | |||
<el-col :span="8"> | |||
<el-col :span="24"> | |||
<el-form-item label="描述" prop="description"> | |||
<el-input v-model="dataForm.description" placeholder="请输入描述" disabled /> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" placeholder="备注" disabled /> | |||
<el-input v-model="dataForm.description" type="textarea" :rows="4" placeholder="请输入描述" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-col :span="8"> | |||
<el-form-item label="备注" prop="remark"> | |||
<el-input v-model="dataForm.remark" placeholder="备注" /> | |||
</el-form-item> | |||
</el-col> | |||
</el-form> | |||
</el-dialog> | |||
@@ -59,7 +59,7 @@ const tableProps = [ | |||
{ | |||
prop: 'detContent', | |||
label: '报废原因' | |||
}, | |||
}, | |||
{ | |||
prop: 'source', | |||
label: '来源', | |||
@@ -2,7 +2,7 @@ | |||
* @Author: zwq | |||
* @Date: 2023-08-01 14:55:51 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-03-15 15:22:59 | |||
* @LastEditTime: 2024-03-20 09:25:40 | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -124,7 +124,7 @@ export default { | |||
label: '时间段', | |||
dateType: 'daterange', | |||
format: 'yyyy-MM-dd', | |||
valueFormat: "yyyy-MM-dd", | |||
valueFormat: "timestamp", | |||
rangeSeparator: '-', | |||
startPlaceholder: '开始时间', | |||
endPlaceholder: '结束时间', | |||
@@ -251,8 +251,8 @@ export default { | |||
this.listQuery.orderName = val.orderName ? val.orderName :undefined | |||
// 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' | |||
this.listQuery.startTime = val.timeVal[0] | |||
this.listQuery.endTime = val.timeVal[1] | |||
} else { | |||
this.listQuery.startTime = undefined | |||
this.listQuery.endTime = undefined | |||