yunxi
/
GWEip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加声明

Browse Source
main
mhsnet 7 months ago
parent 1abcc2de7d
commit e118b2c689
4 changed files with 193 additions and 188 deletions
Show Stats Download Patch File Download Diff File

2
src/views/Gw/productionOrder/ProductionOrder.vue
Unescape View File

@ -181,7 +181,7 @@ const gridOptionsA: any = reactive({
}
}
})
function formatTime ({ cellValue, row, column }) {
function formatTime ({ cellValue, row, column }:any) {
if(cellValue != undefined)
return dayjs(cellValue).format("YYYY-MM-DD")
}

46
src/views/Gw/productionOrder/ProductionOrderForm.vue
Unescape View File

@ -69,14 +69,16 @@
</vxe-form-item>
<vxe-form-item title="计划开始日期" field="PlanStartDate" span="12">
<template #default="params">
<vxe-input v-model="params.data.PlanStartDate" type="date" placeholder="请输入计划开始日期" style="width: 197px;" v-bind:disabled="formTypeA == 'info'"
clearable @change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.PlanStartDate" type="date" placeholder="请输入计划开始日期"
style="width: 197px;" v-bind:disabled="formTypeA == 'info'" clearable
@change="fnChangeA(params)"></vxe-input>
</template>
</vxe-form-item>
<vxe-form-item title="计划完成日期" field="PlanFinishDate" span="12">
<template #default="params">
<vxe-input v-model="params.data.PlanFinishDate" type="date" placeholder="请输入计划完成日期" style="width: 197px;" v-bind:disabled="formTypeA == 'info'"
clearable @change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.PlanFinishDate" type="date" placeholder="请输入计划完成日期"
style="width: 197px;" v-bind:disabled="formTypeA == 'info'" clearable
@change="fnChangeA(params)"></vxe-input>
</template>
</vxe-form-item>
<!-- <vxe-form-item title="数据关联类型" field="DateType" span="12">
@ -91,8 +93,9 @@
</vxe-form-item> -->
<vxe-form-item title="厂家物料编码" field="MaterialCode" span="12">
<template #default="params">
<vxe-select v-model="params.data.MaterialCode" clearable filterable @change="fnMatCodeChange(params)" v-bind:disabled="formTypeA == 'info'">
<template v-for="(item) in ipoMats">
<vxe-select v-model="params.data.MaterialCode" clearable filterable
@change="fnMatCodeChange(params)" v-bind:disabled="formTypeA == 'info'">
<template v-for="item in ipoMats">
<vxe-option :value="item.key" :label="item.val"></vxe-option>
</template>
</vxe-select>
@ -103,36 +106,36 @@
</vxe-form-item>
<vxe-form-item title="厂家物料名称" field="MaterialName" span="12">
<template #default="params">
<vxe-input v-model="params.data.MaterialName" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
clearable @change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.MaterialName" placeholder="请输入"
v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
<!-- <div style="width: 196px;">{{ params.data.MaterialName }}</div> -->
</template>
</vxe-form-item>
<vxe-form-item title="厂家物资单位" field="MaterialUnit" span="12">
<template #default="params">
<vxe-input v-model="params.data.MaterialUnit" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
clearable @change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.MaterialUnit" placeholder="请输入"
v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
<!-- <div style="width: 196px;">{{ params.data.MaterialUnit }}</div> -->
</template>
</vxe-form-item>
<vxe-form-item title="厂家物料描述" field="MaterialDesc" span="12">
<template #default="params">
<vxe-input v-model="params.data.MaterialDesc" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
clearable @change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.MaterialDesc" placeholder="请输入"
v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
<!-- <div style="width: 196px;">{{ params.data.MaterialDesc }}</div> -->
</template>
</vxe-form-item>
<vxe-form-item title="生产数量" field="Amount" span="12">
<template #default="params">
<vxe-input v-model="params.data.Amount" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
clearable @change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.Amount" placeholder="请输入"
v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
<!-- <div style="width: 196px;">{{ params.data.Amount }}</div> -->
</template>
</vxe-form-item>
<vxe-form-item title="计量单位" field="Unit" span="12">
<template #default="params">
<vxe-input v-model="params.data.Unit" placeholder="请输入" v-bind:disabled="formTypeA == 'info'"
clearable @change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.Unit" placeholder="请输入"
v-bind:disabled="formTypeA == 'info'" clearable @change="fnChangeA(params)"></vxe-input>
<!-- <div style="width: 196px;">{{ params.data.Unit }}</div> -->
</template>
</vxe-form-item>
@ -334,8 +337,8 @@ const formRulesA: any = ref({
{ required: true, message: '请输入计划完成日期' }
],
})
const baseMats = ref([])
const ipoMats = ref([])
const baseMats: any = ref([])
const ipoMats: any = ref([])
// 挂载
onMounted(() => {
@ -355,7 +358,7 @@ const open = async (type: string, row?: any) => {
baseMats.value = await BaseMaterialApi.GetBaseMaterialList(filterReq)
ipoMats.value = []
baseMats.value.Data.forEach( (item) => {
baseMats.value.Data.forEach((item: any) => {
if (ipoMats.value.indexOf(item.MatNo) == -1)
ipoMats.value.push({ key: item.MatNo, val: item.MatNo })
@ -416,9 +419,8 @@ defineExpose({ open })
const fnMatCodeChange = (params: any) => {
if (params.data.MaterialCode) {
baseMats.value.Data.forEach( (item) => {
if(item.MatNo == params.data.MaterialCode)
{
baseMats.value.Data.forEach((item: any) => {
if (item.MatNo == params.data.MaterialCode) {
params.data.MaterialName = item.MatName;
params.data.MaterialUnit = item.MatUnit;
params.data.MaterialDesc = item.MatDescption;

2
src/views/Gw/productionWorkOrder/ProductionWorkOrder.vue
Unescape View File

@ -179,7 +179,7 @@ const gridOptionsA: any = reactive({
}
}
})
function formatTime ({ cellValue, row, column }) {
function formatTime({ cellValue, row, column }: any) {
if (cellValue != undefined)
return dayjs(cellValue).format("YYYY-MM-DD")
}

59
src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
Unescape View File

@ -22,7 +22,8 @@
</vxe-form-item>
<vxe-form-item title="实物ID" field="EntityCode" span="12">
<template #default="params">
<vxe-select v-model="params.data.EntityCode" style="width:240px;" clearable filterable v-bind:disabled="formTypeA == 'info'">
<vxe-select v-model="params.data.EntityCode" style="width:240px;" clearable filterable
v-bind:disabled="formTypeA == 'info'">
<template v-for="(item) in ipoEntityIds">
<vxe-option :value="item.key" :label="item.val"></vxe-option>
</template>
@ -71,7 +72,8 @@
<!-- <div style="width: 196px;">{{ params.data.MaterialsCode }}</div> -->
<!-- <vxe-input v-model="params.data.MaterialsCode" placeholder="请输入厂家物料编码" clearable style="width:240px;"
@change="fnChangeA(params)"></vxe-input> -->
<vxe-select v-model="params.data.MaterialsCode" style="width:240px;" clearable filterable @change="fnMatCodeChange(params)" v-bind:disabled="formTypeA == 'info'">
<vxe-select v-model="params.data.MaterialsCode" style="width:240px;" clearable
filterable @change="fnMatCodeChange(params)" v-bind:disabled="formTypeA == 'info'">
<template v-for="(item) in ipoMats">
<vxe-option :value="item.key" :label="item.val"></vxe-option>
</template>
@ -80,8 +82,8 @@
</vxe-form-item>
<vxe-form-item title="厂家物料描述" field="MaterialsDesc" span="12">
<template #default="params">
<vxe-input v-model="params.data.MaterialsDesc" placeholder="请输入厂家物料描述" clearable style="width:240px;"
@change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.MaterialsDesc" placeholder="请输入厂家物料描述" clearable
style="width:240px;" @change="fnChangeA(params)"></vxe-input>
</template>
</vxe-form-item>
<!-- <vxe-form-item title="物料批次" field="MaterialsBatch " span="12">
@ -92,38 +94,39 @@
</vxe-form-item> -->
<vxe-form-item title="生产数量" field="Amount" span="12">
<template #default="params">
<vxe-input v-model="params.data.Amount" placeholder="请输入生产数量" clearable style="width:240px;" disabled></vxe-input>
<vxe-input v-model="params.data.Amount" placeholder="请输入生产数量" clearable
style="width:240px;" disabled></vxe-input>
</template>
</vxe-form-item>
<vxe-form-item title="计量单位" field="Unit" span="12">
<template #default="params">
<!-- <div style="width: 196px;">{{ params.data.Unit }}</div> -->
<vxe-input v-model="params.data.Unit" placeholder="请输入计量单位" clearable style="width:240px;"
@change="fnChangeA(params)"></vxe-input>
<vxe-input v-model="params.data.Unit" placeholder="请输入计量单位" clearable
style="width:240px;" @change="fnChangeA(params)"></vxe-input>
</template>
</vxe-form-item>
<vxe-form-item title="计划开始日期" field="PlanStartDate" span="12">
<template #default="params">
<vxe-input v-model="params.data.PlanStartDate" placeholder="请输入计划开始日期" clearable style="width:240px;"
@change="fnChangeA(params)" type="date"></vxe-input>
<vxe-input v-model="params.data.PlanStartDate" placeholder="请输入计划开始日期" clearable
style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
</template>
</vxe-form-item>
<vxe-form-item title="计划结束日期" field="PlanFinishDate" span="12">
<template #default="params">
<vxe-input v-model="params.data.PlanFinishDate" placeholder="请输入计划结束日期" clearable style="width:240px;"
@change="fnChangeA(params)" type="date"></vxe-input>
<vxe-input v-model="params.data.PlanFinishDate" placeholder="请输入计划结束日期" clearable
style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
</template>
</vxe-form-item>
<vxe-form-item title="实际开始日期" field="ActualStartDate" span="12">
<template #default="params">
<vxe-input v-model="params.data.ActualStartDate" placeholder="请输入实际开始日期" clearable style="width:240px;"
@change="fnChangeA(params)" type="date"></vxe-input>
<vxe-input v-model="params.data.ActualStartDate" placeholder="请输入实际开始日期" clearable
style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
</template>
</vxe-form-item>
<vxe-form-item title="实际完成日期" field="ActualFinishDate" span="12">
<template #default="params">
<vxe-input v-model="params.data.ActualFinishDate" placeholder="请输入实际完成日期" clearable style="width:240px;"
@change="fnChangeA(params)" type="date"></vxe-input>
<vxe-input v-model="params.data.ActualFinishDate" placeholder="请输入实际完成日期" clearable
style="width:240px;" @change="fnChangeA(params)" type="date"></vxe-input>
</template>
</vxe-form-item>
<vxe-form-item title="工单状态" field="WoStatus" span="12">
@ -140,7 +143,8 @@
<template #default="params">
<!-- <vxe-input v-model="params.data.VoltageLevel" placeholder="请输入电压等级" clearable style="width:240px;"
@change="fnChangeA(params)"></vxe-input> -->
<vxe-select v-model="params.data.VoltageLevel" style="width:240px;" clearable filterable v-bind:disabled="formTypeA == 'info'">
<vxe-select v-model="params.data.VoltageLevel" style="width:240px;" clearable filterable
v-bind:disabled="formTypeA == 'info'">
<template v-for="(item) in ipoVoltages">
<vxe-option :value="item.key" :label="item.val"></vxe-option>
</template>
@ -271,14 +275,14 @@ const formRulesA: any = ref({
{ required: true, message: '请输入工单状态' }
],
})
const baseMats = ref([])
const ipoMats = ref([])
const baseMats: any = ref([])
const ipoMats: any = ref([])
const baseEntityIds = ref([])
const ipoEntityIds = ref([])
const baseEntityIds: any = ref([])
const ipoEntityIds: any = ref([])
const baseVoltages = ref([])
const ipoVoltages = ref([])
const baseVoltages: any = ref([])
const ipoVoltages: any = ref([])
// 挂载
onMounted(() => {
})
@ -292,7 +296,7 @@ const open = async (type: string, row?: any) => {
baseMats.value = await BaseMaterialApi.GetBaseMaterialList(filterMatReq)
ipoMats.value = []
baseMats.value.Data.forEach( (item) => {
baseMats.value.Data.forEach((item: any) => {
if (ipoMats.value.indexOf(item.MatNo) == -1)
ipoMats.value.push({ key: item.MatNo, val: item.MatNo })
@ -303,7 +307,7 @@ const open = async (type: string, row?: any) => {
baseEntityIds.value = await BaseEntityIDApi.GetPoUnUsedEntityID()
ipoEntityIds.value = []
baseEntityIds.value.forEach( (item) => {
baseEntityIds.value.forEach((item: any) => {
if (ipoEntityIds.value.indexOf(item.EntityId) == -1)
ipoEntityIds.value.push({ key: item.EntityId, val: item.EntityId })
@ -313,7 +317,7 @@ const open = async (type: string, row?: any) => {
baseVoltages.value = await BaseVoltageApi.GetBaseVoltageList(filterVoltageReq)
ipoVoltages.value = []
baseVoltages.value.Data.forEach( (item) => {
baseVoltages.value.Data.forEach((item: any) => {
if (ipoVoltages.value.indexOf(item.Voltage + item.Level) == -1)
ipoVoltages.value.push({ key: item.Voltage + item.Level, val: item.Voltage + item.Level })
@ -370,9 +374,8 @@ const open = async (type: string, row?: any) => {
const fnMatCodeChange = (params: any) => {
if (params.data.MaterialsCode) {
baseMats.value.Data.forEach( (item) => {
if(item.MatNo == params.data.MaterialsCode)
{
baseMats.value.Data.forEach((item: any) => {
if (item.MatNo == params.data.MaterialsCode) {
params.data.Unit = item.MatUnit;
params.data.MaterialsDesc = item.MatDescption;
}

Write Preview
Loading…
Cancel
Save