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

Merge remote-tracking branch 'origin/master'

java8
yuejiayang 1 year ago
parent
7fe08b4981 d86a6db1c5
commit
6f1373e7a0
7 changed files with 150 additions and 49 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. 2
      src/views/modules/eam/eamWorkPlanForCheck.vue
  2. 2
      src/views/modules/eam/eamWorkPlanForMaintenance.vue
  3. 48
      src/views/modules/part/partInformation.vue
  4. 84
      src/views/modules/part/routingManagement.vue
  5. 23
      src/views/modules/qc/qcItem.vue
  6. 17
      src/views/modules/qc/qcSamplingInspectionPlan.vue
  7. 23
      src/views/modules/qc/qcTemplate.vue

2
src/views/modules/eam/eamWorkPlanForCheck.vue
View File

@ -2076,7 +2076,7 @@
this.$message.warning("请选择BU!")
return
} else {
conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
this.$refs.baseList.init(val, strVal, conSql)
}
}

2
src/views/modules/eam/eamWorkPlanForMaintenance.vue
View File

@ -2064,7 +2064,7 @@
this.$message.warning("请选择BU!")
return
} else {
conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
this.$refs.baseList.init(val, strVal, conSql)
}
}

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

@ -1170,8 +1170,9 @@
partMesType: '',
productRev: '',
invtype: '',
remark: ''
remark: '',
codeNo: '',
codeDesc: ''
},
itemData: {
site: this.$store.state.user.site,
@ -2579,7 +2580,9 @@
partMesType: '',
productRev: '',
invtype: '',
remark: ''
remark: '',
codeNo: '',
codeDesc: ''
}
this.inventoryPartTable = 'General'
this.modalDisableFlag = false
@ -2635,7 +2638,9 @@
partMesType: row.partMesType,
productRev: row.productRev,
invtype: row.invtype,
remark: row.remark
remark: row.remark,
codeNo: row.codeNo,
codeDesc: row.codeDesc
}
this.inventoryPartTable = 'General'
this.modalDisableFlag = true
@ -3474,6 +3479,30 @@
}
},
// 属性输入校验
modelBlur (tagNo) {
if (this.modalData.codeNo != null && this.modalData.codeNo !== '') {
let tempData = {
tagno: tagNo,
conditionSql: " and code_no = '" + this.modalData.codeNo + "'" + " 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.codeNo = data.baseListData[0].code_no
this.modalData.codeDesc = data.baseListData[0].code_desc
} else {
this.$message.warning('该属性模板不存在！')
this.modalData.codeDesc = ''
}
} else {
this.$message.warning(data.msg)
this.modalData.codeDesc = ''
}
})
}
},
// ======== chooseList相关方法 ========
/**
* 获取基础数据列表S
@ -3485,8 +3514,16 @@
this.tempCodeNo = this.modalData.codeNo
this.$nextTick(() => {
let strVal = ''
let conSql = ''
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
if (val === 510) {
strVal = this.modalData.umId
conSql = ''
} else if (val === 211) {
strVal = this.modalData.otherGroup1
} else if (val === 212) {
@ -3495,12 +3532,13 @@
strVal = this.modalData.otherGroup3
} else if (val === 511) {
strVal = this.modalData.defaultWarehouseID
conSql = ''
} else if (val === 214) {
strVal = this.modalData.familyID
} else if (val === 219) {
strVal = this.modalData.codeNo
}
this.$refs.baseList.init(val, strVal)
this.$refs.baseList.init(val, strVal, conSql)
})
},
/**

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

@ -1642,7 +1642,7 @@ export default {
columnImage: false,
status: true,
fixed: '',
columnWidth: 200
columnWidth: 150
},
{
columnProp: 'workCenterNo',
@ -1653,7 +1653,7 @@ export default {
columnImage: false,
status: true,
fixed: '',
columnWidth: 120
columnWidth: 100
},
{
columnProp: 'workCenterDesc',
@ -1664,7 +1664,7 @@ export default {
columnImage: false,
status: true,
fixed: '',
columnWidth: 200
columnWidth: 150
},
{
columnProp: 'laborClassNo',
@ -1675,7 +1675,7 @@ export default {
columnImage: false,
status: true,
fixed: '',
columnWidth: 120
columnWidth: 100
},
{
columnProp: 'laborClassDesc',
@ -1686,7 +1686,73 @@ export default {
columnImage: false,
status: true,
fixed: '',
columnWidth: 200
columnWidth: 150
},
{
columnProp: 'setupLaborClassNo',
headerAlign: "center",
align: "center",
columnLabel: '调机时人员等级编码',
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 100
},
{
columnProp: 'setupLaborClassDesc',
headerAlign: "center",
align: "left",
columnLabel: '调机时人员等级描述',
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 150
},
{
columnProp: 'laborRunFactor',
headerAlign: 'center',
align: 'right',
columnLabel: '人工单位产出',
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 100
},
{
columnProp: 'machRunFactor',
headerAlign: 'center',
align: 'right',
columnLabel: '机器单位产出',
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 100
},
{
columnProp: 'laborCycleTime',
headerAlign: 'center',
align: 'right',
columnLabel: '人工处理时间',
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 100
},
{
columnProp: 'machCycleTime',
headerAlign: 'center',
align: 'right',
columnLabel: '机器处理时间',
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 100
},
],
// ======== 必填规则 ========
@ -2310,6 +2376,14 @@ export default {
// 基于标准工序快速创建
createByStandardOperation () {
if (this.detailData.alternativeNo === '' || this.detailData.alternativeNo == null) {
this.$message.warning('请先选择替代！')
return
}
if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') {
this.$message.warning('不可编辑的替代状态!')
return
}
getStandardOperations(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.standardOperationList = data.rows

23
src/views/modules/qc/qcItem.vue
View File

@ -1172,30 +1172,23 @@
this.$nextTick(() => {
let strVal = ''
let conSql = ''
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
if (val === 207) {
strVal = this.modalData.samplingProgrammeNo
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
this.$refs.baseList.init(val, strVal, conSql)
}
}
if (val === 208) {
strVal = this.modalData.samplingLevelNo
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
this.$refs.baseList.init(val, strVal, conSql)
}
}
if (val === 1036) {
strVal = this.modalData.methodNo
this.$refs.baseList.init(val, strVal)
conSql = ''
}
this.$refs.baseList.init(val, strVal, conSql)
})
},

17
src/views/modules/qc/qcSamplingInspectionPlan.vue
View File

@ -654,18 +654,21 @@
this.tagNo = val
this.$nextTick(() => {
let strVal = ''
let conSql = ''
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
if (val === 210) {
strVal = this.detailData.samplingQtyNo
this.$refs.baseList.init(val, strVal)
}
if (val === 209) {
} else if (val === 209) {
strVal = this.detailData.samplingQtyRankNo
this.$refs.baseList.init(val, strVal)
}
if (val === 208) {
} else if (val === 208) {
strVal = this.detailData.samplingLevelNo
this.$refs.baseList.init(val, strVal)
}
this.$refs.baseList.init(val, strVal, conSql)
})
},

23
src/views/modules/qc/qcTemplate.vue
View File

@ -1270,26 +1270,19 @@
this.$nextTick(() => {
let strVal = ''
let conSql = ''
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and site = '" + this.modalData.bu.split('_')[0] + "'" + " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
}
if (val === 207) {
strVal = this.modalData.samplingProgrammeNo
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
this.$refs.baseList.init(val, strVal, conSql)
}
}
if (val === 208) {
strVal = this.modalData.samplingLevelNo
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
this.$refs.baseList.init(val, strVal, conSql)
}
}
}
this.$refs.baseList.init(val, strVal, conSql)
})
},

Write Preview
Loading…
Cancel
Save