suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

计划管理问题修改

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
dev-scheduling
zhangdi 1 month ago
parent a3e5b10a0d
commit 29028620d8
8 changed files with 62 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/views/basicData/components/inventory.vue
  2. 20
      src/views/inboundOutboundManagement/otherIssuing/index.vue
  3. 15
      src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
  4. 6
      src/views/orderManagement/components/mold/addMoldDailog.vue
  5. 8
      src/views/orderManagement/components/mold/detailsInfoDialog.vue
  6. 46
      src/views/orderManagement/components/mold/moldRequire.vue
  7. 1
      src/views/warehouseManagement/materialExpiration/matureSubmission.vue
  8. 2
      src/views/warehouseManagement/teamRequest/index.vue

19
src/views/basicData/components/inventory.vue
Unescape View File

@ -91,7 +91,7 @@ export default {
searchShowBtn: false,
showOverflowTooltip: true,
searchLabelPosition: 'left',
searchLabelWidth:'auto',
searchLabelWidth: 'auto',
searchGutter: 24,
searchSpan: 6,
menuAlign: 'left',
@ -145,6 +145,7 @@ export default {
span: 12,
overflow: true,
search: true,
type: 'select',
},
{
label: '物料名称',
@ -257,18 +258,20 @@ export default {
}
},
onLoad() {
this.loading = true
this.loading = true;
getLocationList({
current: this.page.currentPage,
size: this.page.pageSize,
...this.query,
}).then(res => {
this.loading = false
this.data = res.data.data.records;
this.page.total = res.data.data.total;
}).catch(err => {
this.loading = false
})
.then(res => {
this.loading = false;
this.data = res.data.data.records;
this.page.total = res.data.data.total;
})
.catch(err => {
this.loading = false;
});
},
},
};

20
src/views/inboundOutboundManagement/otherIssuing/index.vue
Unescape View File

@ -323,16 +323,16 @@ export default {
// },
],
},
{
label: '审批意见',
prop: 'approvalOpinion',
search: false,
sortable: true,
filter: true,
span: 12,
display: false,
width: 180,
},
// {
// label: '审批意见',
// prop: 'approvalOpinion',
// search: false,
// sortable: true,
// filter: true,
// span: 12,
// display: false,
// width: 180,
// },
{
label: '审批人',
prop: 'approverName',

15
src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue
Unescape View File

@ -204,7 +204,8 @@
</template>
</el-table-column>
<el-table-column label="到期日期" prop="scrapCycle" align="center">
<template #header>
<template #default="scope">{{ scope.row.scrapCycle }}</template>
<!-- <template #header>
<span><i style="color: red">*</i>到期日期</span>
</template>
<template #default="scope">
@ -217,10 +218,11 @@
placeholder="选择日期"
style="width: 100%"
/>
</template>
</template> -->
</el-table-column>
<el-table-column label="入库日期" prop="inOutDate" align="center">
<template #header>
<el-table-column label="入库日期" prop="inDate" align="center">
<template #default="scope">{{ scope.row.inDate }}</template>
<!-- <template #header>
<span><i style="color: red">*</i>入库日期</span>
</template>
<template #default="scope">
@ -233,7 +235,7 @@
placeholder="选择日期"
style="width: 100%"
/>
</template>
</template> -->
</el-table-column>
</el-table>
</el-form>
@ -428,6 +430,7 @@ export default {
this.outbankList[index].slId = '';
this.outbankList[index].piNo = '';
this.outbankList[index].quantity = '';
}
getLocationData({
shId: this.stOtherOutRecord.shId,
@ -454,7 +457,7 @@ export default {
this.outbankList[index].stovePiNo = tmp.stovePiNo;
this.outbankList[index].quantity = tmp.quantity;
this.outbankList[index].scrapCycle = tmp.scrapCycle;
this.outbankList[index].inOutDate = tmp.inOutDate;
this.outbankList[index].inDate = tmp.inDate;
this.outbankList[index].id = tmp.id;
}
},

6
src/views/orderManagement/components/mold/addMoldDailog.vue
Unescape View File

@ -19,7 +19,7 @@
<el-table :data="form.moldPlan" @select="selectChange" style="width: 100%" border>
<el-table-column type="selection" width="55" v-if="moldAddMore"></el-table-column>
<el-table-column type="index" width="80" label="序号" align="center"></el-table-column>
<!-- <el-table-column type="index" width="80" label="序号" align="center"></el-table-column> -->
<el-table-column prop="partCode" label="零件编码" align="center" width="190">
<template #header>
<span><i style="color: red">*</i>零件编码</span>
@ -64,7 +64,7 @@
</template>
</el-table-column>
<el-table-column prop="partName" label="零件名称" align="center">
<el-table-column prop="partName" label="零件名称" align="center" show-overflow-tooltip>
<template #default="scope">
<span>{{ scope.row.partName }}</span>
</template>
@ -383,7 +383,7 @@ export default {
console.log(val, i,value,item,9090909090)
this.form.moldPlan[i].partName =item.partName
// this.partCodeList.find(item => item.partCode === val)?.partName || '';
getToolList({partCode:val}).then(res =>{
getToolList({partCode:item.partCode}).then(res =>{
console.log('res-----------',res)
this.form.moldPlan[i].modeArray = res.data.data
})

8
src/views/orderManagement/components/mold/detailsInfoDialog.vue
Unescape View File

@ -9,10 +9,10 @@
>
<el-descriptions class="margin-top" :column="4" border title="需求信息">
<el-descriptions-item label="需求编号">{{form.mdCode}}</el-descriptions-item>
<el-descriptions-item label="工装编号">{{ form.moCode || "-" }}</el-descriptions-item>
<el-descriptions-item label="工装名称">{{ form.moName || "-" }}</el-descriptions-item>
<el-descriptions-item label="关联订单数">{{form.linkOrderIds || "-"}}</el-descriptions-item>
<el-descriptions-item label="工装需求量">{{ form.quantity || "-" }}</el-descriptions-item>
<el-descriptions-item label="工装编号">{{ form.toolCode || "-" }}</el-descriptions-item>
<el-descriptions-item label="工装名称">{{ form.toolName || "-" }}</el-descriptions-item>
<el-descriptions-item label="关联订单数">{{form.linkOrderNum || "-"}}</el-descriptions-item>
<el-descriptions-item label="工装需求量">{{ form.demandNum || "-" }}</el-descriptions-item>
<el-descriptions-item label="库存数量">{{ form.stockNum || "-" }}</el-descriptions-item>
<el-descriptions-item label="占用数量">{{ form.occupyNum || "-" }}</el-descriptions-item>
</el-descriptions>

46
src/views/orderManagement/components/mold/moldRequire.vue
Unescape View File

@ -221,7 +221,7 @@ export default {
// },
{
label: '订单需求量',
prop: 'quantity',
prop: 'demandNum',
search: false,
sortable: true,
width:120,
@ -249,28 +249,28 @@ export default {
// },
{
label: '关联订单个数',
prop: 'linkOrderIds',
prop: 'linkOrderNum',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
},
{
// STATUS_WAITING("待出库", 10000),
// STATUS_OUT_STORE("已出库", 10001),
// STATUS_DONE("完成", 10002),
// STATUS_CLOSE("关闭", 10003),
label:'状态',
// type:"select",
prop:"statusName",
// dicData:[
// {label:'待出库',value:10000},
// {label:'已出库',value:10001},
// {label:'完成',value:10002},
// {label:'关闭',value:10003}
// ]
}
// {
// // STATUS_WAITING("待出库", 10000),
// // STATUS_OUT_STORE("已出库", 10001),
// // STATUS_DONE("完成", 10002),
// // STATUS_CLOSE("关闭", 10003),
// label:'状态',
// // type:"select",
// prop:"statusName",
// // dicData:[
// // {label:'待出库',value:10000},
// // {label:'已出库',value:10001},
// // {label:'完成',value:10002},
// // {label:'关闭',value:10003}
// // ]
// }
],
},
@ -290,11 +290,11 @@ export default {
this.$message.error('请至少选择一条数据!');
return;
}
let tmp = this.selectionList.map(item => item.statusName != '待出库');
if(tmp){
this.$message.error("请选择状态为【待出库】的数据")
return
}
// let tmp = this.selectionList.map(item => item.statusName != '待出库');
// if(tmp){
// this.$message.error("请选择状态为【待出库】的数据")
// return
// }
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -302,7 +302,7 @@ export default {
})
.then(() => {
const ids = this.selectionList.map(item => item.id).join(',');
closeBatchs({ ids }).then(res => {
closeBatchs(ids).then(res => {
if (res.data.code === 200) {
this.$message({
type: 'success',

1
src/views/warehouseManagement/materialExpiration/matureSubmission.vue
Unescape View File

@ -307,6 +307,7 @@ export default {
item.esDept = '' //送检部门名称
item.esQty = '' //送检数量
item.esDeptId='' //送检部门id
item.rlsId = item.id
});
this.rowData = this.selectionList
this.inspectionShow = true

2
src/views/warehouseManagement/teamRequest/index.vue
Unescape View File

@ -218,7 +218,7 @@ export default {
},
{
label: '关联订单号',
prop: 'memo',
prop: 'woCode',
search: false,
sortable: true,
filter: true,

Write Preview
Loading…
Cancel
Save