@@ -732,7 +761,6 @@ export default {
site: '',
userName: this.$store.state.user.name,
orderNo: '',
- corePartNo: '',
planID: '',
objectID: '',
planOperator: '',
@@ -809,7 +837,7 @@ export default {
tableName: "维修工单表",
columnProp: 'orderNo',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '工单编码',
columnHidden: false,
columnImage: false,
@@ -827,7 +855,7 @@ export default {
tableName: "维修工单表",
columnProp: 'planID',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '反馈单号',
columnHidden: false,
columnImage: false,
@@ -845,7 +873,7 @@ export default {
tableName: "维修工单表",
columnProp: 'feedBackDesc',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '反馈描述',
columnHidden: false,
columnImage: false,
@@ -853,7 +881,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100,
+ columnWidth: 200,
},
{
userId: this.$store.state.user.name,
@@ -863,7 +891,7 @@ export default {
tableName: "维修工单表",
columnProp: 'defectID',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '故障编码',
columnHidden: false,
columnImage: false,
@@ -871,7 +899,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80,
+ columnWidth: 100,
},
{
userId: this.$store.state.user.name,
@@ -881,7 +909,7 @@ export default {
tableName: "维修工单表",
columnProp: 'defectDesc',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '故障名称',
columnHidden: false,
columnImage: false,
@@ -889,7 +917,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80,
+ columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@@ -899,7 +927,7 @@ export default {
tableName: "维修工单表",
columnProp: 'objectID',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '设备编码',
columnHidden: false,
columnImage: false,
@@ -907,7 +935,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80,
+ columnWidth: 100,
},
{
userId: this.$store.state.user.name,
@@ -917,7 +945,7 @@ export default {
tableName: "维修工单表",
columnProp: 'objectDesc',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '设备名称',
columnHidden: false,
columnImage: false,
@@ -925,7 +953,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 120,
+ columnWidth: 150,
},
{
userId: this.$store.state.user.name,
@@ -935,7 +963,7 @@ export default {
tableName: "维修工单表",
columnProp: 'resourceDesc',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '机台名称',
columnHidden: false,
columnImage: false,
@@ -953,7 +981,7 @@ export default {
tableName: "维修工单表",
columnProp: 'departmentName',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '设备部门',
columnHidden: false,
columnImage: false,
@@ -979,7 +1007,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80,
+ columnWidth: 100,
},
{
userId: this.$store.state.user.name,
@@ -1069,7 +1097,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 130,
+ columnWidth: 140,
},
{
userId: this.$store.state.user.name,
@@ -1087,7 +1115,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 130,
+ columnWidth: 140,
},
{
userId: this.$store.state.user.name,
@@ -1105,7 +1133,7 @@ export default {
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 130,
+ columnWidth: 140,
},
{
userId: this.$store.state.user.name,
@@ -1143,24 +1171,6 @@ export default {
fixed: '',
columnWidth: 80,
},
- {
- userId: this.$store.state.user.name,
- functionId: 101004006,
- serialNumber: '101004006Table1Remark',
- tableId: "101004006Table1",
- tableName: "维修工单表",
- columnProp: 'remark',
- headerAlign: "center",
- align: "center",
- columnLabel: '备注说明',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 120,
- },
{
userId: this.$store.state.user.name,
functionId: 101004006,
@@ -1187,7 +1197,7 @@ export default {
tableName: "维修工单表",
columnProp: 'difficultyRemark',
headerAlign: "center",
- align: "center",
+ align: "left",
columnLabel: '难度备注',
columnHidden: false,
columnImage: false,
@@ -1287,78 +1297,6 @@ export default {
fixed: '',
columnWidth: 200,
},
- {
- userId: this.$store.state.user.name,
- functionId: 101004006,
- serialNumber: '101004006Table1CorePartNo',
- tableId: "101004006Table1",
- tableName: "维修执行表",
- columnProp: 'corePartNo',
- headerAlign: "center",
- align: "center",
- columnLabel: '更换配件编码',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 100,
- },
- {
- userId: this.$store.state.user.name,
- functionId: 101004006,
- serialNumber: '101004006Table1CorePartDescription',
- tableId: "101004006Table1",
- tableName: "维修执行表",
- columnProp: 'corePartDescription',
- headerAlign: "center",
- align: "left",
- columnLabel: '更换配件名称',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 100,
- },
- {
- userId: this.$store.state.user.name,
- functionId: 101004006,
- serialNumber: '101004006Table1OldSerialNo',
- tableId: "101004006Table1",
- tableName: "维修执行表",
- columnProp: 'oldSerialNo',
- headerAlign: "center",
- align: "left",
- columnLabel: '老序列号',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 120,
- },
- {
- userId: this.$store.state.user.name,
- functionId: 101004006,
- serialNumber: '101004006Table1NewSerialNo',
- tableId: "101004006Table1",
- tableName: "维修执行表",
- columnProp: 'newSerialNo',
- headerAlign: "center",
- align: "left",
- columnLabel: '新序列号',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 120,
- },
],
changeModelFlag: false,
planOperator: '',
@@ -1732,7 +1670,54 @@ export default {
fixed: '',
},
],
- knowledgeFlag: ''
+ columnCoreComponent: [
+ {
+ columnProp: 'partNo',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: '备件编码',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: false,
+ columnWidth: 120,
+ },
+ {
+ columnProp: 'partDescription',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: '备件名称',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: false,
+ columnWidth: 200,
+ },
+ {
+ columnProp: 'oldSerialNo',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: '老序列号',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: false,
+ columnWidth: 120,
+ },
+ {
+ columnProp: 'newSerialNo',
+ headerAlign: 'center',
+ align: 'left',
+ columnLabel: '新序列号',
+ columnHidden: false,
+ columnImage: false,
+ status: true,
+ fixed: false,
+ columnWidth: 120,
+ },
+ ],
+ knowledgeFlag: '',
+ corePartSpareList: []
}
},
@@ -2372,6 +2357,8 @@ export default {
this.queryKnowledgeRecord()
} else if (this.activeTable === 'spar_part_img') {
this.getSparPartImages()
+ } else if (this.activeTable === 'core_component') {
+ this.getCorePartSpareList()
}
},
@@ -2575,6 +2562,23 @@ export default {
}
this.coreComponentFlag = true
},
+
+ getCorePartSpareList () {
+ let tempData = {
+ site: this.detailData.site,
+ buNo: this.detailData.buNo,
+ objectID: this.detailData.objectID,
+ orderNo: this.detailData.orderNo,
+ }
+ getDeviceCorePartList(tempData).then(({data}) => {
+ if (data && data.code === 200) {
+ this.corePartSpareList = data.rows
+ } else {
+ this.corePartSpareList = []
+ }
+ })
+ },
+
}
}
diff --git a/src/views/modules/part/part_create.vue b/src/views/modules/part/part_create.vue
index 14bdb11..d059163 100644
--- a/src/views/modules/part/part_create.vue
+++ b/src/views/modules/part/part_create.vue
@@ -349,6 +349,10 @@
应用
保存
+
+ 应用
+ 保存
+
保存
关闭
@@ -1969,6 +1973,7 @@ export default {
},
methods: {
+
// 初始化组件的参数
init () {
this.modalData = {
@@ -2010,6 +2015,55 @@ export default {
// 物料信息编辑模态框
updateModal (data) {
+ // 如果物料编码为*，说明是询价传过来的 走新增方法
+ if (data.partNo === '*') {
+ this.addModal(data)
+ } else {
+ this.updateModalByNo(data)
+ }
+ },
+
+ // mainPart 新增模态框
+ addModal (data) {
+ this.modalData = {
+ flag: '3',
+ title: '物料新增',
+ site: data.site,
+ buNo: data.buNo,
+ bu: data.site + '_' + data.buNo,
+ partNo: data.partNo,
+ partDesc: data.partDesc,
+ umId2: '',
+ umName: '',
+ spec: '',
+ active: 'Y',
+ partType2: 'Manufactured',
+ standardBoxQty: '',
+ productGroupId1: '',
+ productGroupName1: '',
+ productGroupId2: '',
+ productGroupName2: '',
+ productGroupId3: '',
+ productGroupName3: '',
+ familyID: '',
+ familyName: '',
+ partDesceEn: '',
+ remark: '',
+ codeNo: '',
+ codeDesc: '',
+ tblBaseFlag: '',
+ createBy: this.$store.state.user.name,
+ templateNo: '',
+ templateName: ''
+ }
+ this.inventoryPartTable = 'General'
+ this.modalDisableFlag = false
+ this.modalFlag = true
+ this.getPreviousPartNo()
+ },
+
+ // 修改
+ updateModalByNo (data) {
getPartInfoByNo(data).then(({data}) => {
if (data && data.code === 0) {
this.modalData = {
@@ -2130,6 +2184,33 @@ export default {
}).catch(() => {
this.saveLoading = false
})
+ } else if (this.modalData.flag === '3') {
+ savePartInfo(this.modalData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.modalData = data.rows
+ this.modalData.title = '物料编辑'
+ if (isClose) {
+ // 保存
+ this.modalFlag = false
+ }
+ // 刷新页面数据
+ this.$emit('refreshPageTables2', data.rows)
+ this.modalDisableFlag = true
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {}
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ this.saveLoading = false
+ }).catch(() => {
+ this.saveLoading = false
+ })
} else {
// mainPart维护
saveMainPartInfo(this.modalData).then(({data}) => {
diff --git a/src/views/modules/part/quicklyCreateBom.vue b/src/views/modules/part/quicklyCreateBom.vue
index 7d6248b..cf1cdc1 100644
--- a/src/views/modules/part/quicklyCreateBom.vue
+++ b/src/views/modules/part/quicklyCreateBom.vue
@@ -327,8 +327,6 @@ export default {
columnWidth: 100
},
],
- // loading
-
// 控制
nodeModalFlag: false,
nodeModalDisableFlag: false,
@@ -346,6 +344,12 @@ export default {
this.favoriteIsOk()
// 获取树形结构
this.getNodeTree()
+ // this.searchData = {
+ // site: '2',
+ // buNo: '03-RFID',
+ // partNo: '*',
+ // partDesc: '***'
+ // }
},
mounted () {
this.$nextTick(() => {
@@ -707,7 +711,9 @@ export default {
}
let templateData = {
site: this.searchData.site,
- partNo: this.searchData.partNo
+ buNo: this.searchData.buNo,
+ partNo: this.searchData.partNo,
+ partDesc: this.searchData.partDesc
}
//打开组件 去做编辑业务
this.$nextTick(() => {
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 2c4d0e8..1e9d58d 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -45,9 +45,6 @@
-
-
-
@@ -251,7 +248,7 @@
备件图片
- 核心配件
+ 核心备件
@@ -427,6 +424,31 @@
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+