计划模块缺陷修复

dev-scheduling
jinna 3 months ago
parent ac0c570ab3
commit 260347442b
  1. 10
      src/views/orderManagement/components/mold/addMoldDailog.vue
  2. 2
      src/views/orderManagement/components/mold/detailsInfoDialog.vue
  3. 5
      src/views/orderManagement/components/mold/moldRecord.vue
  4. 29
      src/views/orderManagement/components/mold/moldRequire.vue
  5. 2
      src/views/productionManagement/components/coatingMater/materialRequirements.vue

@ -80,14 +80,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="quantity" label="数量" align="center"> <el-table-column prop="applyNum" label="数量" align="center">
<template #header> <template #header>
<span><i style="color: red">*</i>数量</span> <span><i style="color: red">*</i>数量</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`moldPlan[${scope.$index}].quantity`" :rules="formRules.quantity"> <el-form-item :prop="`moldPlan[${scope.$index}].applyNum`" :rules="formRules.applyNum">
<el-input-number <el-input-number
v-model="scope.row.quantity" v-model="scope.row.applyNum"
:min="1" :min="1"
controls-position="right" controls-position="right"
style="width: 90%" style="width: 90%"
@ -239,7 +239,7 @@ export default {
], ],
partCode: [{ required: true, message: '请选择零件编码', trigger: ['change', 'submit'] }], partCode: [{ required: true, message: '请选择零件编码', trigger: ['change', 'submit'] }],
toolCode: [{ required: true, message: '请选择工装号', trigger: ['change', 'submit'] }], toolCode: [{ required: true, message: '请选择工装号', trigger: ['change', 'submit'] }],
quantity: [ applyNum: [
{ required: true, message: '请输入数量', trigger: ['change', 'submit'] }, { required: true, message: '请输入数量', trigger: ['change', 'submit'] },
{ type: 'number', min: 1, message: '数量不能小于1', trigger: ['change', 'submit'] }, { type: 'number', min: 1, message: '数量不能小于1', trigger: ['change', 'submit'] },
], ],
@ -306,7 +306,7 @@ export default {
partName: '', partName: '',
toolCode: '', toolCode: '',
toolName: '', toolName: '',
quantity: 1, applyNum: 1,
mafType: '', mafType: '',
needDate: '', needDate: '',
quaLevel: '', quaLevel: '',

@ -8,7 +8,7 @@
fullscreen fullscreen
> >
<el-descriptions class="margin-top" :column="4" border title="需求信息"> <el-descriptions class="margin-top" :column="4" border title="需求信息">
<el-descriptions-item label="需求编号">{{}}</el-descriptions-item> <el-descriptions-item label="需求编号">{{form.mdCode}}</el-descriptions-item>
<el-descriptions-item label="工装编号">{{ form.moCode || "-" }}</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.moName || "-" }}</el-descriptions-item>
<el-descriptions-item label="关联订单数">{{form.linkOrderIds || "-"}}</el-descriptions-item> <el-descriptions-item label="关联订单数">{{form.linkOrderIds || "-"}}</el-descriptions-item>

@ -144,12 +144,11 @@ export default {
sortable: true, sortable: true,
span: 12, span: 12,
headerAlign: 'center', headerAlign: 'center',
align: 'left',
width: 140, width: 140,
}, },
{ {
label: '数量', label: '数量',
prop: 'quantity', prop: 'applyNum',
search: false, search: false,
sortable: true, sortable: true,
span: 12, span: 12,
@ -216,7 +215,7 @@ export default {
span: 12, span: 12,
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
width: 150, width: 180,
}, },
{ {
label: '建立人员', label: '建立人员',

@ -164,7 +164,7 @@ export default {
column: [ column: [
{ {
label: '需求单号', label: '需求单号',
prop: 'partCode', prop: 'mdCode',
search: false, search: false,
sortable: true, sortable: true,
span: 12, span: 12,
@ -246,6 +246,21 @@ export default {
headerAlign: 'center', headerAlign: 'center',
align: '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}
// ]
}
], ],
}, },
@ -265,6 +280,11 @@ export default {
this.$message.error('请至少选择一条数据!'); this.$message.error('请至少选择一条数据!');
return; return;
} }
let tmp = this.selectionList.map(item => item.statusName != '待出库');
if(tmp){
this.$message.error("请选择状态为【待出库】的数据")
return
}
this.$confirm('确定将选择数据批量关闭?', { this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -273,13 +293,14 @@ export default {
.then(() => { .then(() => {
const ids = this.selectionList.map(item => item.id).join(','); const ids = this.selectionList.map(item => item.id).join(',');
closeBatchs({ ids }).then(res => { closeBatchs({ ids }).then(res => {
if (res.code === 200) { if (res.data.code === 200) {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '操作成功!', message: '关闭成功!',
}); });
}
this.onLoad(); this.onLoad();
}
}); });
// this.onLoad(this.page); // this.onLoad(this.page);

@ -178,7 +178,7 @@ export default {
}, },
{ {
label: '物料编号', label: '物料编号',
prop: 'plateGoodsCode', prop: 'goodsCode',
span: 24, span: 24,
width: 150, width: 150,
overflow: true, overflow: true,

Loading…
Cancel
Save