计划管理及基础数据模块缺陷修复

dev-scheduling
jinna 3 weeks ago
parent fa373d3f1e
commit 4023b06587
  1. 92
      src/views/basicData/materialQuota/components/KAu.vue
  2. 94
      src/views/basicData/materialQuota/components/silverAnode.vue
  3. 8
      src/views/orderManagement/components/lookProcess.vue
  4. 11
      src/views/orderManagement/components/mold/addMoldDailog.vue
  5. 21
      src/views/orderManagement/components/mold/moldRequire.vue
  6. 9
      src/views/orderManagement/planYieIdOrder.vue
  7. 4
      src/views/orderManagement/sinTerYieIdOrder.vue

@ -32,6 +32,18 @@
<!-- <el-button type="text" @click="editFn(scope.row)">编辑 </el-button> -->
<!-- <el-button type="text" @click="handleDelete">删除 </el-button> -->
</template>
<template #quota-form="{ type, disabled }">
<el-input v-model="form.quota" placeholder="请输入 滚振镀金类定额" @input="validateRow"></el-input>
</template>
<template #smallBatQuota-form="{ type, disabled }">
<el-input v-model="form.smallBatQuota" placeholder="请输入 挂镀金类定额" @input="validateSmallBat"></el-input>
</template>
<template #bigBatQuota-form="{ type, disabled }">
<el-input v-model="form.bigBatQuota" placeholder="请输入 微孔镀金类定额" @input="validateBigBat"></el-input>
</template>
<template #partQuota-form="{ type, disabled }">
<el-input v-model="form.partQuota" placeholder="请输入 局部镀定额" @input="validatePart"></el-input>
</template>
<template #produceTsTarget="scope"> </template>
</avue-crud>
<!-- 导入 -->
@ -119,39 +131,47 @@ export default {
}
]
},
// {
// label: "",
// prop: "processAbilityId",
// type:"select",
// sortable: true,
// filter: true,
// span: 24,
// search: false,
// dicUrl:"/api/blade-desk/BA/craftAbility/findList",
// props:{
// label:"caName",
// value:"id"
// }
// },
{
label: "工艺能力",
prop: "processAbilityId",
type:"select",
label: "滚振镀金类定额",
prop: "quota",
sortable: true,
filter: true,
span: 24,
search: false,
dicUrl:"/api/blade-desk/BA/craftAbility/findList",
props:{
label:"caName",
value:"id"
}
},
{
label: "定额",
prop: "quota",
label: "挂镀金类定额",
prop: "smallBatQuota",
sortable: true,
filter: true,
span: 24,
search: false,
},
{
label: "小批量定额",
prop: "smallBatQuota",
label: "微孔镀金类定额",
prop: "bigBatQuota",
sortable: true,
filter: true,
span: 24,
search: false,
},
{
label: "大批量定额",
prop: "bigBatQuota",
label: "局部镀定额",
prop: "partQuota",
sortable: true,
filter: true,
span: 24,
@ -174,6 +194,50 @@ export default {
handleImport() {
this.isShowImport = true
},
validateValue(value){
if (value == null) return '';
// 1
let filterVal = value.replace(/[^\d.]/g, '');
// 2
filterVal = filterVal.replace(/(\.\d*)\./g, '$1');
// 35
filterVal = filterVal.replace(/(\.\d{5})\d+/g, '$1');
// 40
// 1>100123 00
// 200.123
if (filterVal.startsWith('0') && filterVal.length > 1 && !filterVal.startsWith('0.')) {
// 00
filterVal = filterVal.replace(/^0+/, '0');
// 00123012301230
if (filterVal === '0' && val.length > 1) {
filterVal = '0';
} else {
// 012300123400.123
filterVal = filterVal.replace(/^0(?!\.)/, '');
// 010
if (!filterVal) {
filterVal = '0';
}
}
}
return filterVal;
},
validateRow(value){
this.form.quota = this.validateValue(value)
},
validateSmallBat(value){
this.form.smallBatQuota = this.validateValue(value)
},
validateBigBat(value){
this.form.bigBatQuota = this.validateValue(value)
},
validatePart(value){
this.form.partQuota = this.validateValue(value)
},
addEdit() {
this.isOpen = true;
},

@ -33,7 +33,15 @@
<el-button type="text" @click="handleDelete">删除 </el-button> -->
</template>
<template #produceTsTarget="scope"> </template>
<template #quota-form="{ type, disabled }">
<el-input v-model="form.quota" placeholder="请输入 滚振镀银类定额" @input="validateQuota"></el-input>
</template>
<template #smallBatQuota-form="{ type, disabled }">
<el-input v-model="form.smallBatQuota" placeholder="请输入 滚振镀银类定额" @input="validateSmallBat"></el-input>
</template>
</avue-crud>
<!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
@ -112,22 +120,22 @@ export default {
span: 24,
search: false,
},
// {
// label: "",
// prop: "processAbilityId",
// type:'select',
// sortable: true,
// filter: true,
// span: 24,
// search: false,
// dicUrl:"/api/blade-desk/BA/craftAbility/findList",
// props:{
// label:'caName',
// value:"id"
// }
// },
{
label: "工艺能力",
prop: "processAbilityId",
type:'select',
sortable: true,
filter: true,
span: 24,
search: false,
dicUrl:"/api/blade-desk/BA/craftAbility/findList",
props:{
label:'caName',
value:"id"
}
},
{
label: "定额",
label: "滚振镀银类定额",
prop: "quota",
sortable: true,
filter: true,
@ -135,21 +143,21 @@ export default {
search: false,
},
{
label: "小批量定额",
label: "挂镀银类定额",
prop: "smallBatQuota",
sortable: true,
filter: true,
span: 24,
search: false,
},
{
label: "大批量定额",
prop: "bigBatQuota",
sortable: true,
filter: true,
span: 24,
search: false,
},
// {
// label: "",
// prop: "bigBatQuota",
// sortable: true,
// filter: true,
// span: 24,
// search: false,
// },
],
},
form: {},
@ -163,6 +171,44 @@ export default {
};
},
methods: {
validateValue(value){
if (value == null) return '';
// 1
let filterVal = value.replace(/[^\d.]/g, '');
// 2
filterVal = filterVal.replace(/(\.\d*)\./g, '$1');
// 35
filterVal = filterVal.replace(/(\.\d{5})\d+/g, '$1');
// 40
// 1>100123 00
// 200.123
if (filterVal.startsWith('0') && filterVal.length > 1 && !filterVal.startsWith('0.')) {
// 00
filterVal = filterVal.replace(/^0+/, '0');
// 00123012301230
if (filterVal === '0' && val.length > 1) {
filterVal = '0';
} else {
// 012300123400.123
filterVal = filterVal.replace(/^0(?!\.)/, '');
// 010
if (!filterVal) {
filterVal = '0';
}
}
}
return filterVal;
},
validateQuota(value){
this.form.quota = this.validateValue(value)
},
validateSmallBat(value){
this.form.smallBatQuota = this.validateValue(value)
},
//
handleImport() {
this.isShowImport = true

@ -240,13 +240,13 @@ export default {
},
{
label: '工序代码',
prop: 'partname',
prop: 'processCode',
search: false,
// width: 170,
},
{
label: '工序名称',
prop: 'firpp',
prop: 'processName',
search: false,
// width: 180,
},
@ -308,16 +308,20 @@ export default {
if (this.sourceId === 'sinTerYieIdOrder') {
console.log('由sinTerYieIdOrder组件打开');
this.loading = true;
getProcessRouting({id:this.id}).then(res =>{
console.log('res---------',res)
this.data1 = res.data.data
this.loading = false
})
}
if (this.sourceId === 'planYieIdOrder') {
console.log('由planYieIdOrder父组件打开');
this.loading = true;
getProcessRouting({id:this.id}).then(res =>{
console.log('res---------',res)
this.data1 = res.data.data
this.loading = false
})
}
if (this.sourceId === 'plannedOrder') {

@ -56,7 +56,8 @@
</template>
<template #default="scope">
<el-form-item :prop="`moldPlan[${scope.$index}].toolCode`" :rules="formRules.toolCode">
<el-select
<el-input v-model="scope.row.toolCode" :disabled="scope.row.disabled"></el-input>
<!-- <el-select
v-model="scope.row.toolCode"
:filterable="true"
:disabled="scope.row.disabled"
@ -69,16 +70,16 @@
:label="item.name"
:value="item.code"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="toolName" label="工装名称" align="center">
<!-- <el-table-column prop="toolName" label="工装名称" align="center">
<template #default="scope">
<span>{{ scope.row.toolName }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="applyNum" label="数量" align="center">
<template #header>
@ -169,7 +170,7 @@
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="100" align="left" v-if="moldAddMore">
<el-table-column fixed="right" label="操作" width="80" align="center" v-if="moldAddMore">
<template #default="scope">
<el-button type="text" @click.prevent="delTable(scope.row, scope.$index)"
>删除</el-button

@ -139,7 +139,7 @@ export default {
editBtnText: '修改',
labelWidth: 120,
// searchLabelWidth: 120,
menuWidth: 140,
menuWidth: 120,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
@ -201,20 +201,21 @@ export default {
align: 'center',
searchLabelWidth: 60,
},
{
label: '工装名称',
prop: 'moName',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'left',
},
// {
// label: '',
// prop: 'moName',
// search: false,
// sortable: true,
// span: 12,
// headerAlign: 'center',
// align: 'left',
// },
{
label: '订单需求量',
prop: 'quantity',
search: false,
sortable: true,
width:120,
span: 12,
headerAlign: 'center',
align: 'center',

@ -343,7 +343,12 @@ export default {
headerAlign: 'center',
align: 'center',
type: 'select',
// dicData: [
dicData: [
{ label:'1级',value:'15001' },
{ label:'2级',value:'15002' },
{ label:'3级',value:'15003' },
{ label:'4级',value:'15004' },
{ label:'5级',value:'15005' },
// {
// label: '',
// value: '1',
@ -356,7 +361,7 @@ export default {
// label: '',
// value: '3',
// },
// ],
],
rules: [
{
required: true,

@ -421,7 +421,7 @@ export default {
// YIELD_TYPE_4("", 12004),
// YIELD_TYPE_5("", 12005),
// YIELD_TYPE_6("", 12006),
{label: '热表订单', value: 12001},
// {label: '', value: 12001},
{label: '烧结订单', value: 12002},
{label: '玻璃饼', value: 12003},
{label: '壳体', value: 12004},
@ -640,7 +640,7 @@ export default {
sortable: true,
width: 160,
span: 12,
searchLabelWidth: 150,
searchLabelWidth: 110,
headerAlign: 'center',
align: 'center',
type: 'select',

Loading…
Cancel
Save