wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-11-08

java8
fengyuan_yang 1 year ago
parent
b3a03a4c26
commit
771235aedf
5 changed files with 110 additions and 243 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/views/modules/eam/eamWorkOrderForDefect.vue
  2. 12
      src/views/modules/part/bomManagement.vue
  3. 313
      src/views/modules/part/partInformation.vue
  4. 12
      src/views/modules/part/routingManagement.vue
  5. 8
      src/views/modules/reportWorkOrder/reportDefectOrder.vue

8
src/views/modules/eam/eamWorkOrderForDefect.vue
View File

@ -1421,14 +1421,6 @@
this.$message.warning('到达时间不能大于实际执行时间！') this.$message.warning('到达时间不能大于实际执行时间！')
return return
} }
if (this.detailData.faultReason === '' || this.detailData.faultReason == null || this.detailData.faultReason.length < 10) {
this.$message.warning('请填写故障原因，且不低于十个字数！')
return
}
if (this.detailData.handlingMethod === '' || this.detailData.handlingMethod == null || this.detailData.handlingMethod.length < 10) {
this.$message.warning('请填写处理方式，且不低于十个字数！')
return
}
updateReportResult(this.detailData).then(({data}) => { updateReportResult(this.detailData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()

12
src/views/modules/part/bomManagement.vue
View File

@ -1545,7 +1545,7 @@ export default {
columnWidth: 300 columnWidth: 300
}, },
{ {
columnProp: 'printUnit',
columnProp: 'printUnitName',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '计量单位', columnLabel: '计量单位',
@ -1556,7 +1556,7 @@ export default {
columnWidth: 100 columnWidth: 100
}, },
{ {
columnProp: 'partType',
columnProp: 'partType2',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '零件类型', columnLabel: '零件类型',
@ -1564,7 +1564,7 @@ export default {
columnImage: false, columnImage: false,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
} }
], ],
componentPartColumnList: [ componentPartColumnList: [
@ -1602,7 +1602,7 @@ export default {
columnWidth: 300 columnWidth: 300
}, },
{ {
columnProp: 'printUnit',
columnProp: 'printUnitName',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '计量单位', columnLabel: '计量单位',
@ -1613,7 +1613,7 @@ export default {
columnWidth: 100 columnWidth: 100
}, },
{ {
columnProp: 'partType',
columnProp: 'partType2',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '零件类型', columnLabel: '零件类型',
@ -1621,7 +1621,7 @@ export default {
columnImage: false, columnImage: false,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
} }
], ],
columnSubDetailList1: [ columnSubDetailList1: [

313
src/views/modules/part/partInformation.vue
View File

@ -145,8 +145,6 @@
:key = "i.buNo" :key = "i.buNo"
:label = "i.buDesc" :label = "i.buDesc"
:value = "i.buNo"> :value = "i.buNo">
<!-- <span style="float: left;width: 100px">{{ i.sitename }}</span>-->
<!-- <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">{{ i.buDesc }}</span>-->
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -156,12 +154,11 @@
<el-option label="否" value="N"></el-option> <el-option label="否" value="N"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="零件类型">
<el-select v-model="modalData.partType" style="width: 160px">
<el-option label="Manufactured" value="Manufactured"></el-option>
<el-option label="Manufactured Recipe" value="Manufactured Recipe"></el-option>
<el-option label="Purchased (raw)" value="Purchased (raw)"></el-option>
<el-option label="Purchased" value="Purchased"></el-option>
<el-form-item prop="partType2" label="零件类型">
<el-select v-model="modalData.partType2" style="width: 160px">
<el-option label="成品" value="Manufactured"></el-option>
<el-option label="半成品" value="Manufactured Recipe"></el-option>
<el-option label="原材料" value="Purchased (raw)"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="modalData.flag === '2'" :label="' '"> <el-form-item v-if="modalData.flag === '2'" :label="' '">
@ -171,39 +168,11 @@
<el-tabs v-model="inventoryPartTable" style="width: 100%;height: 305px;" type="border-card" @tab-click="inventoryPartClick"> <el-tabs v-model="inventoryPartTable" style="width: 100%;height: 305px;" type="border-card" @tab-click="inventoryPartClick">
<el-tab-pane label="General" name="General"> <el-tab-pane label="General" name="General">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
<!-- <el-form-item label="PN">-->
<!-- <el-input v-model="modalData.cinvSourceCode" style="width: 144px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="SKU">-->
<!-- <el-input v-model="modalData.sku" style="width: 144px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="cinvcname">-->
<!-- <el-input v-model="modalData.cinvcname" style="width: 145px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料类别">-->
<!-- <el-input v-model="modalData.invdefinetype" style="width: 174px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="controlMes" label="controlMes">-->
<!-- <el-select v-model="modalData.controlMes" style="width: 100px">-->
<!-- <el-option label="是" value="Y"></el-option>-->
<!-- <el-option label="否" value="N"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
<!-- <el-form-item label="Qty Box Roll">-->
<!-- <el-input v-model="modalData.qtyBoxRoll" style="width: 144px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="Qty Roll">-->
<!-- <el-input v-model="modalData.qtyRoll" style="width: 144px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="Standard Box Qty">-->
<!-- <el-input v-model="modalData.standardBoxQty" style="width: 145px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item prop="umId">
<el-form-item prop="umId2">
<span style="cursor: pointer" slot="label" @click="getBaseList(510)"><a herf="#">计量单位</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(510)"><a herf="#">计量单位</a></span>
<el-input v-model="modalData.umId" @blur="umIdBlur(510)" style="width: 128px"></el-input>
<el-input v-model="modalData.umId2" @blur="umIdBlur(510)" style="width: 128px"></el-input>
<el-input v-model="modalData.umName" disabled style="width: 330px"></el-input> <el-input v-model="modalData.umName" disabled style="width: 330px"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -213,29 +182,24 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
<!-- <el-form-item>-->
<!-- <span style="cursor: pointer" slot="label" @click="getBaseList(511)"><a herf="#">默认仓库</a></span>-->
<!-- <el-input v-model="modalData.defaultWarehouseID" @blur="defaultWarehouseBlur(511)" style="width: 128px"></el-input>-->
<!-- <el-input v-model="modalData.defaultWarehouseName" disabled style="width: 330px"></el-input>-->
<!-- </el-form-item>-->
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
<el-form-item> <el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(211)"><a herf="#">商品组1</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(211)"><a herf="#">商品组1</a></span>
<el-input v-model="modalData.otherGroup1" @blur="productGroupId1Blur(211)" style="width: 128px"></el-input>
<el-input v-model="modalData.otherGroupName1" disabled style="width: 330px"></el-input>
<el-input v-model="modalData.productGroupId1" @blur="productGroupId1Blur(211)" style="width: 128px"></el-input>
<el-input v-model="modalData.productGroupName1" disabled style="width: 330px"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(212)"><a herf="#">商品组2</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(212)"><a herf="#">商品组2</a></span>
<el-input v-model="modalData.otherGroup2" @blur="productGroupId2Blur(212)" style="width: 128px"></el-input>
<el-input v-model="modalData.otherGroupName2" disabled style="width: 330px"></el-input>
<el-input v-model="modalData.productGroupId2" @blur="productGroupId2Blur(212)" style="width: 128px"></el-input>
<el-input v-model="modalData.productGroupName2" disabled style="width: 330px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
<el-form-item> <el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(213)"><a herf="#">商品组3</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(213)"><a herf="#">商品组3</a></span>
<el-input v-model="modalData.otherGroup3" @blur="productGroupId3Blur(213)" style="width: 128px"></el-input>
<el-input v-model="modalData.otherGroupName3" disabled style="width: 330px"></el-input>
<el-input v-model="modalData.productGroupId3" @blur="productGroupId3Blur(213)" style="width: 128px"></el-input>
<el-input v-model="modalData.productGroupName3" disabled style="width: 330px"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(219)"><a herf="#">属性模板</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(219)"><a herf="#">属性模板</a></span>
@ -243,28 +207,6 @@
<el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input> <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">-->
<!-- <el-form-item label="Mold Code">-->
<!-- <el-input v-model="modalData.moldCode" style="width: 224px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="Mold Code Required">-->
<!-- <el-input v-model="modalData.moldCodeRequired" style="width: 224px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">-->
<!-- <el-form-item label="Serial Number Required">-->
<!-- <el-input v-model="modalData.serialNumberRequired" style="width: 224px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="Part Mes Type">-->
<!-- <el-input v-model="modalData.partMesType" style="width: 224px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="Product Rev">-->
<!-- <el-input v-model="modalData.productRev" style="width: 224px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="Inv Type">-->
<!-- <el-input v-model="modalData.invtype" style="width: 224px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
<el-form-item label="备注" style="height: 135px"> <el-form-item label="备注" style="height: 135px">
<el-input type="textarea" v-model="modalData.remark" :rows="5" resize='none' show-word-limit style="width: 939px"></el-input> <el-input type="textarea" v-model="modalData.remark" :rows="5" resize='none' show-word-limit style="width: 939px"></el-input>
@ -1146,36 +1088,21 @@
bu: '', bu: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
umId: '',
umId2: '',
umName: '', umName: '',
spec: '', spec: '',
active: '', active: '',
cinvSourceCode: '',
sku: '',
qtyBoxRoll: '',
qtyRoll: '',
partType: '',
partType2: '',
standardBoxQty: '', standardBoxQty: '',
controlMes: '',
cinvcname: '',
otherGroup1: '',
otherGroupName1: '',
otherGroup2: '',
otherGroupName2: '',
otherGroup3: '',
otherGroupName3: '',
defaultWarehouseID: '',
defaultWarehouseName: '',
productGroupId1: '',
productGroupName1: '',
productGroupId2: '',
productGroupName2: '',
productGroupId3: '',
productGroupName3: '',
familyID: '', familyID: '',
familyName: '', familyName: '',
invdefinetype: '',
partDesceEn: '', partDesceEn: '',
moldCode: '',
moldCodeRequired: '',
serialNumberRequired: '',
partMesType: '',
productRev: '',
invtype: '',
remark: '', remark: '',
codeNo: '', codeNo: '',
codeDesc: '' codeDesc: ''
@ -1275,7 +1202,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100
columnWidth: 80
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1365,15 +1292,15 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100
columnWidth: 80
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 601001, functionId: 601001,
serialNumber: '601001Table1PartType',
serialNumber: '601001Table1PartType2Desc',
tableId: '601001Table1', tableId: '601001Table1',
tableName: '物料信息表', tableName: '物料信息表',
columnProp: 'partType',
columnProp: 'partType2Desc',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
columnLabel: '零件类型', columnLabel: '零件类型',
@ -1383,7 +1310,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1391,7 +1318,7 @@
serialNumber: '601001Table1UmId', serialNumber: '601001Table1UmId',
tableId: '601001Table1', tableId: '601001Table1',
tableName: '物料信息表', tableName: '物料信息表',
columnProp: 'umId',
columnProp: 'umId2',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
columnLabel: '计量单位编码', columnLabel: '计量单位编码',
@ -1401,7 +1328,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1419,7 +1346,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 200
columnWidth: 150
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1437,7 +1364,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1455,7 +1382,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 200
columnWidth: 150
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1463,7 +1390,7 @@
serialNumber: '601001Table1OtherGroup1', serialNumber: '601001Table1OtherGroup1',
tableId: '601001Table1', tableId: '601001Table1',
tableName: '物料信息表', tableName: '物料信息表',
columnProp: 'otherGroup1',
columnProp: 'productGroupId1',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
columnLabel: '商品组1编码', columnLabel: '商品组1编码',
@ -1473,7 +1400,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1481,7 +1408,7 @@
serialNumber: '601001Table1OtherGroupName1', serialNumber: '601001Table1OtherGroupName1',
tableId: '601001Table1', tableId: '601001Table1',
tableName: '物料信息表', tableName: '物料信息表',
columnProp: 'otherGroupName1',
columnProp: 'productGroupName1',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
columnLabel: '商品组1名称', columnLabel: '商品组1名称',
@ -1491,7 +1418,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 200
columnWidth: 150
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1499,7 +1426,7 @@
serialNumber: '601001Table1OtherGroup2', serialNumber: '601001Table1OtherGroup2',
tableId: '601001Table1', tableId: '601001Table1',
tableName: '物料信息表', tableName: '物料信息表',
columnProp: 'otherGroup2',
columnProp: 'productGroupId2',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
columnLabel: '商品组2编码', columnLabel: '商品组2编码',
@ -1509,7 +1436,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1517,7 +1444,7 @@
serialNumber: '601001Table1OtherGroupName2', serialNumber: '601001Table1OtherGroupName2',
tableId: '601001Table1', tableId: '601001Table1',
tableName: '物料信息表', tableName: '物料信息表',
columnProp: 'otherGroupName2',
columnProp: 'productGroupName2',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
columnLabel: '商品组2名称', columnLabel: '商品组2名称',
@ -1527,7 +1454,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 200
columnWidth: 150
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1535,7 +1462,7 @@
serialNumber: '601001Table1OtherGroup3', serialNumber: '601001Table1OtherGroup3',
tableId: '601001Table1', tableId: '601001Table1',
tableName: '物料信息表', tableName: '物料信息表',
columnProp: 'otherGroup3',
columnProp: 'productGroupId3',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
columnLabel: '商品组3编码', columnLabel: '商品组3编码',
@ -1545,7 +1472,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1553,7 +1480,7 @@
serialNumber: '601001Table1OtherGroupName3', serialNumber: '601001Table1OtherGroupName3',
tableId: '601001Table1', tableId: '601001Table1',
tableName: '物料信息表', tableName: '物料信息表',
columnProp: 'otherGroupName3',
columnProp: 'productGroupName3',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
columnLabel: '商品组3名称', columnLabel: '商品组3名称',
@ -1563,7 +1490,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 200
columnWidth: 150
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1635,7 +1562,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 160
columnWidth: 150
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -2213,7 +2140,7 @@
trigger: ['blur','change'] trigger: ['blur','change']
} }
], ],
umId: [
umId2: [
{ {
required: true, required: true,
message: ' ', message: ' ',
@ -2248,7 +2175,7 @@
trigger: ['blur','change'] trigger: ['blur','change']
} }
], ],
partType: [
partType2: [
{ {
required: true, required: true,
message: ' ', message: ' ',
@ -2732,36 +2659,21 @@
bu: this.userBuList[0].buNo, bu: this.userBuList[0].buNo,
partNo: '', partNo: '',
partDesc: '', partDesc: '',
umId: '',
umId2: '',
umName: '', umName: '',
spec: '', spec: '',
active: 'Y', active: 'Y',
cinvSourceCode: '',
sku: '',
qtyBoxRoll: '',
qtyRoll: '',
partType: 'Purchased (raw)',
partType2: 'Purchased (raw)',
standardBoxQty: '', standardBoxQty: '',
controlMes: '',
cinvcname: '',
otherGroup1: '',
otherGroupName1: '',
otherGroup2: '',
otherGroupName2: '',
otherGroup3: '',
otherGroupName3: '',
defaultWarehouseID: '',
defaultWarehouseName: '',
productGroupId1: '',
productGroupName1: '',
productGroupId2: '',
productGroupName2: '',
productGroupId3: '',
productGroupName3: '',
familyID: '', familyID: '',
familyName: '', familyName: '',
invdefinetype: '',
partDesceEn: '', partDesceEn: '',
moldCode: '',
moldCodeRequired: '',
serialNumberRequired: '',
partMesType: '',
productRev: '',
invtype: '',
remark: '', remark: '',
codeNo: '', codeNo: '',
codeDesc: '' codeDesc: ''
@ -2790,36 +2702,21 @@
buNo: row.buNo, buNo: row.buNo,
partNo: row.partNo, partNo: row.partNo,
partDesc: row.partDesc, partDesc: row.partDesc,
umId: row.umId,
umId2: row.umId2,
umName: row.umName, umName: row.umName,
spec: row.spec, spec: row.spec,
active: row.active, active: row.active,
cinvSourceCode: row.cinvSourceCode,
sku: row.sku,
qtyBoxRoll: row.qtyBoxRoll,
qtyRoll: row.qtyRoll,
partType: row.partType,
partType2: row.partType2,
standardBoxQty: row.standardBoxQty, standardBoxQty: row.standardBoxQty,
controlMes: row.controlMes,
cinvcname: row.cinvcname,
otherGroup1: row.otherGroup1,
otherGroupName1: row.otherGroupName1,
otherGroup2: row.otherGroup2,
otherGroupName2: row.otherGroupName2,
otherGroup3: row.otherGroup3,
otherGroupName3: row.otherGroupName3,
defaultWarehouseID: row.defaultWarehouseID,
defaultWarehouseName: row.defaultWarehouseName,
productGroupId1: row.productGroupId1,
productGroupName1: row.productGroupName1,
productGroupId2: row.productGroupId2,
productGroupName2: row.productGroupName2,
productGroupId3: row.productGroupId3,
productGroupName3: row.productGroupName3,
familyID: row.familyID, familyID: row.familyID,
familyName: row.familyName, familyName: row.familyName,
invdefinetype: row.invdefinetype,
partDesceEn: row.partDesceEn, partDesceEn: row.partDesceEn,
moldCode: row.moldCode,
moldCodeRequired: row.moldCodeRequired,
serialNumberRequired: row.serialNumberRequired,
partMesType: row.partMesType,
productRev: row.productRev,
invtype: row.invtype,
remark: row.remark, remark: row.remark,
codeNo: row.codeNo, codeNo: row.codeNo,
codeDesc: row.codeDesc codeDesc: row.codeDesc
@ -3244,7 +3141,7 @@
this.$message.warning('请选择BU！') this.$message.warning('请选择BU！')
return return
} }
if (this.modalData.umId === '' || this.modalData.umId == null) {
if (this.modalData.umId2 === '' || this.modalData.umId2 == null) {
this.$message.warning('请选择计量单位！') this.$message.warning('请选择计量单位！')
return return
} }
@ -3519,15 +3416,15 @@
// 计量单位输入校验 // 计量单位输入校验
umIdBlur (tagNo) { umIdBlur (tagNo) {
if (this.modalData.umId != null && this.modalData.umId !== '') {
if (this.modalData.umId2 != null && this.modalData.umId2 !== '') {
let tempData = { let tempData = {
tagno: tagNo, tagno: tagNo,
conditionSql: " and UMID = '" + this.modalData.umId + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'"
conditionSql: " and UMID = '" + this.modalData.umId2 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'"
} }
verifyData(tempData).then(({data}) => { verifyData(tempData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
if (data.baseListData.length > 0) { if (data.baseListData.length > 0) {
this.modalData.umId = data.baseListData[0].UMID
this.modalData.umId2 = data.baseListData[0].UMID
this.modalData.umName = data.baseListData[0].UMName this.modalData.umName = data.baseListData[0].UMName
return return
} }
@ -3539,82 +3436,62 @@
// 商品组1输入校验 // 商品组1输入校验
productGroupId1Blur (tagNo) { productGroupId1Blur (tagNo) {
if (this.modalData.otherGroup1 != null && this.modalData.otherGroup1 !== '') {
if (this.modalData.productGroupId1 != null && this.modalData.productGroupId1 !== '') {
let tempData = { let tempData = {
tagno: tagNo, tagno: tagNo,
conditionSql: " and product_group_id = '" + this.modalData.otherGroup1 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
conditionSql: " and product_group_id = '" + this.modalData.productGroupId1 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
} }
verifyData(tempData).then(({data}) => { verifyData(tempData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
if (data.baseListData.length > 0) { if (data.baseListData.length > 0) {
this.modalData.otherGroup1 = data.baseListData[0].product_group_id
this.modalData.otherGroupName1 = data.baseListData[0].product_group_name
this.modalData.productGroupId1 = data.baseListData[0].product_group_id
this.modalData.productGroupName1 = data.baseListData[0].product_group_name
return return
} }
} }
}) })
} }
this.modalData.otherGroupName1 = ''
this.modalData.productGroupName1 = ''
}, },
// 商品组2输入校验 // 商品组2输入校验
productGroupId2Blur (tagNo) { productGroupId2Blur (tagNo) {
if (this.modalData.otherGroup2 != null && this.modalData.otherGroup2 !== '') {
if (this.modalData.productGroupId2 != null && this.modalData.productGroupId2 !== '') {
let tempData = { let tempData = {
tagno: tagNo, tagno: tagNo,
conditionSql: " and product_group_id = '" + this.modalData.otherGroup2 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
conditionSql: " and product_group_id = '" + this.modalData.productGroupId2 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
} }
verifyData(tempData).then(({data}) => { verifyData(tempData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
if (data.baseListData.length > 0) { if (data.baseListData.length > 0) {
this.modalData.otherGroup2 = data.baseListData[0].product_group_id
this.modalData.otherGroupName2 = data.baseListData[0].product_group_name
this.modalData.productGroupId2 = data.baseListData[0].product_group_id
this.modalData.productGroupName2 = data.baseListData[0].product_group_name
return return
} }
} }
}) })
} }
this.modalData.otherGroupName2 = ''
this.modalData.productGroupName2 = ''
}, },
// 商品组3输入校验 // 商品组3输入校验
productGroupId3Blur (tagNo) { productGroupId3Blur (tagNo) {
if (this.modalData.otherGroup3 != null && this.modalData.otherGroup3 !== '') {
let tempData = {
tagno: tagNo,
conditionSql: " and product_group_id = '" + this.modalData.otherGroup3 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
verifyData(tempData).then(({data}) => {
if (data && data.code === 0) {
if (data.baseListData.length > 0) {
this.modalData.otherGroup3 = data.baseListData[0].product_group_id
this.modalData.otherGroupName3 = data.baseListData[0].product_group_name
return
}
}
})
}
this.modalData.otherGroupName3 = ''
},
// 默认仓库输入校验
defaultWarehouseBlur (tagNo) {
if (this.modalData.defaultWarehouseID != null && this.modalData.defaultWarehouseID !== '') {
if (this.modalData.productGroupId3 != null && this.modalData.productGroupId3 !== '') {
let tempData = { let tempData = {
tagno: tagNo, tagno: tagNo,
conditionSql: " and warehouse_id = '" + this.modalData.defaultWarehouseID + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'"
conditionSql: " and product_group_id = '" + this.modalData.productGroupId3 + "'" + " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
} }
verifyData(tempData).then(({data}) => { verifyData(tempData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
if (data.baseListData.length > 0) { if (data.baseListData.length > 0) {
this.modalData.defaultWarehouseID = data.baseListData[0].warehouse_id
this.modalData.defaultWarehouseName = data.baseListData[0].warehouse_name
this.modalData.productGroupId3 = data.baseListData[0].product_group_id
this.modalData.productGroupName3 = data.baseListData[0].product_group_name
return return
} }
} }
}) })
} }
this.modalData.defaultWarehouseName = ''
this.modalData.productGroupName3 = ''
}, },
// 物料分类输入校验 // 物料分类输入校验
@ -3676,17 +3553,14 @@
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'" conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
} }
if (val === 510) { if (val === 510) {
strVal = this.modalData.umId
strVal = this.modalData.umId2
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'"
} else if (val === 211) { } else if (val === 211) {
strVal = this.modalData.otherGroup1
strVal = this.modalData.productGroupId1
} else if (val === 212) { } else if (val === 212) {
strVal = this.modalData.otherGroup2
strVal = this.modalData.productGroupId2
} else if (val === 213) { } else if (val === 213) {
strVal = this.modalData.otherGroup3
} else if (val === 511) {
strVal = this.modalData.defaultWarehouseID
conSql = ''
strVal = this.modalData.productGroupId3
} else if (val === 214) { } else if (val === 214) {
strVal = this.modalData.familyID strVal = this.modalData.familyID
} else if (val === 219) { } else if (val === 219) {
@ -3701,20 +3575,17 @@
*/ */
getBaseData (val) { getBaseData (val) {
if (this.tagNo === 510) { if (this.tagNo === 510) {
this.modalData.umId = val.UMID
this.modalData.umId2 = val.UMID
this.modalData.umName = val.UMName this.modalData.umName = val.UMName
} else if (this.tagNo === 211) { } else if (this.tagNo === 211) {
this.modalData.otherGroup1 = val.product_group_id
this.modalData.otherGroupName1 = val.product_group_name
this.modalData.productGroupId1 = val.product_group_id
this.modalData.productGroupName1 = val.product_group_name
} else if (this.tagNo === 212) { } else if (this.tagNo === 212) {
this.modalData.otherGroup2 = val.product_group_id
this.modalData.otherGroupName2 = val.product_group_name
this.modalData.productGroupId2 = val.product_group_id
this.modalData.productGroupName2 = val.product_group_name
} else if (this.tagNo === 213) { } else if (this.tagNo === 213) {
this.modalData.otherGroup3 = val.product_group_id
this.modalData.otherGroupName3 = val.product_group_name
} else if (this.tagNo === 511) {
this.modalData.defaultWarehouseID = val.warehouse_id
this.modalData.defaultWarehouseName = val.warehouse_name
this.modalData.productGroupId3 = val.product_group_id
this.modalData.productGroupName3 = val.product_group_name
} else if (this.tagNo === 214) { } else if (this.tagNo === 214) {
this.modalData.familyID = val.family_id this.modalData.familyID = val.family_id
this.modalData.familyName = val.family_name this.modalData.familyName = val.family_name

12
src/views/modules/part/routingManagement.vue
View File

@ -1196,7 +1196,7 @@ export default {
columnWidth: 300 columnWidth: 300
}, },
{ {
columnProp: 'printUnit',
columnProp: 'printUnitName',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '计量单位', columnLabel: '计量单位',
@ -1207,7 +1207,7 @@ export default {
columnWidth: 100 columnWidth: 100
}, },
{ {
columnProp: 'partType',
columnProp: 'partType2',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '零件类型', columnLabel: '零件类型',
@ -1215,7 +1215,7 @@ export default {
columnImage: false, columnImage: false,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
} }
], ],
componentOperationColumnList: [ componentOperationColumnList: [
@ -1661,7 +1661,7 @@ export default {
columnWidth: 300 columnWidth: 300
}, },
{ {
columnProp: 'printUnit',
columnProp: 'printUnitName',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '计量单位', columnLabel: '计量单位',
@ -1672,7 +1672,7 @@ export default {
columnWidth: 100 columnWidth: 100
}, },
{ {
columnProp: 'partType',
columnProp: 'partType2',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '零件类型', columnLabel: '零件类型',
@ -1680,7 +1680,7 @@ export default {
columnImage: false, columnImage: false,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
columnWidth: 100
} }
], ],
standardOperationColumnList: [ standardOperationColumnList: [

8
src/views/modules/reportWorkOrder/reportDefectOrder.vue
View File

@ -1865,8 +1865,12 @@
this.$message.warning('请选择维修人员！') this.$message.warning('请选择维修人员！')
return return
} }
if (this.saveData.handlingMethod == null || this.saveData.handlingMethod === '') {
this.$message.warning('请填写处理方式！')
if (this.saveData.faultReason === '' || this.saveData.faultReason == null || this.saveData.faultReason.length < 11) {
this.$message.warning('请填写故障原因，且大于十个字数！')
return
}
if (this.saveData.handlingMethod === '' || this.saveData.handlingMethod == null || this.saveData.handlingMethod.length < 11) {
this.$message.warning('请填写处理方式，且大于十个字数！')
return return
} }
saveOrderReportForDefect(this.saveData).then(({data}) => { saveOrderReportForDefect(this.saveData).then(({data}) => {

Write Preview
Loading…
Cancel
Save