mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'projects/mesxc-test' into projects/mesxc-dy

Browse Source
This commit is contained in:
helloDy 2024-02-27 09:23:00 +08:00
commit 85791cc10c
7 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layout/components/NavbarRight.vue
View File

@ -68,7 +68,7 @@ export default {
getUserMsg() { getUserMsg() {
let id = this.$store.getters.userId let id = this.$store.getters.userId
getUserSimple(id).then(res => { getUserSimple(id).then(res => {
this.dept = res.data.deptName ? res.data.dept.deptName : '---' this.dept = res.data.deptName ? res.data.deptName : '---'
}) })
}, },
async logout() { async logout() {

2
src/views/energy/base/energyQuantityRealtime/index.vue
View File

@ -193,7 +193,7 @@ export default {
if (this.exportList.length > 0) { if (this.exportList.length > 0) {
let body = this.exportList.map((x) => [ let body = this.exportList.map((x) => [
x.objName, x.objName,
x.objRemark, x.objCode,
x.energyTypeName, x.energyTypeName,
x.startValue, x.startValue,
x.endValue, x.endValue,

24
src/views/energy/base/energyType/components/energyTypeAdd.vue
View File

@ -152,7 +152,7 @@ export default {
id: '', id: '',
name: '', name: '',
code: '', code: '',
nuit: '', unit: '',
pricingMethod: 2, pricingMethod: 2,
leaderName: '', leaderName: '',
push: false push: false
@ -186,16 +186,16 @@ export default {
if (res.code === 0) { if (res.code === 0) {
this.form.name = res.data.name this.form.name = res.data.name
this.form.code = res.data.code this.form.code = res.data.code
this.form.nuit = res.data.nuit this.form.unit = res.data.unit
this.form.pricingMethod = res.data.pricingMethod this.form.pricingMethod = res.data.pricingMethod
this.form.leaderName = res.data.leaderName this.form.leaderName = res.data.leaderName
this.form.push = res.data.push ? true : false this.form.push = res.data.push ? true : false
switch(this.form.pricingMethod) { switch(this.form.pricingMethod) {
case 0: case 0:
this.tableData1 = this.form.segPriceList || [] this.tableData1 = res.data.segPriceList || []
break; break;
case 1: case 1:
this.tableData2 = this.form.usedPriceList || [] this.tableData2 = res.data.usedPriceList || []
break; break;
default: default:
} }
@ -233,10 +233,10 @@ export default {
// 增加 // 增加
emitButtonClick1() { emitButtonClick1() {
let n = this.tableData1.length let n = this.tableData1.length
// if (n >=3) { if (n >=3) {
// this.$modal.msgWarning('最多可添加3档计价') this.$modal.msgWarning('最多可添加3档计价')
// return false return false
// } }
let obj = {} let obj = {}
obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
obj.endTime = '' obj.endTime = ''
@ -245,10 +245,10 @@ export default {
}, },
emitButtonClick2() { emitButtonClick2() {
let n = this.tableData2.length let n = this.tableData2.length
if (n >=3) { // if (n >=3) {
this.$modal.msgWarning('最多可添加3档计价') // this.$modal.msgWarning('最多可添加3档计价')
return false // return false
} // }
let obj = {} let obj = {}
obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
obj.endUsed = 0 obj.endUsed = 0

13
src/views/order/base/orderGroup/orderGroupDetailData.vue
View File

@ -44,7 +44,7 @@
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">加工平方数(平方米)</div> <div class="blodTip">加工平方数(平方米)</div>
<div class="lightTip">{{orderGroupMsg.actualArea}}</div> <div class="lightTip">{{orderGroupMsg.planArea}}</div>
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">状态</div> <div class="blodTip">状态</div>
@ -70,7 +70,7 @@
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">废片数量</div> <div class="blodTip">废片数量</div>
<div class="lightTip">该字段未绑定</div> <div class="lightTip">{{orderGroupMsg.nokQuantity}}</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -114,7 +114,7 @@
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">加工平方数(平方米)</div> <div class="blodTip">加工平方数(平方米)</div>
<div class="lightTip">{{item.actualArea}}</div> <div class="lightTip">{{item.planArea}}</div>
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">预计用时(时)</div> <div class="blodTip">预计用时(时)</div>
@ -144,7 +144,7 @@
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">废片数量</div> <div class="blodTip">废片数量</div>
<div class="lightTip">该字段未绑定</div> <div class="lightTip">{{item.nokQuantity}}</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -247,7 +247,7 @@ export default {
orderGroupId: '', orderGroupId: '',
tableProps, tableProps,
orderMsg: [], orderMsg: [],
tableH: this.tableHeight(510) / 2, tableH: 150,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
@ -257,9 +257,6 @@ export default {
} }
}, },
mounted() { mounted() {
window.addEventListener('resize', () => {
this.tableH = this.tableHeight(510) / 2
})
this.orderGroupId = location.href.split('?')[1].split('=')[1] this.orderGroupId = location.href.split('?')[1].split('=')[1]
this.getMsg() this.getMsg()
}, },

16
src/views/order/base/orderManage/components/addWorkOrder.vue
View File

@ -202,8 +202,8 @@ export default {
processFlowList: [], processFlowList: [],
productLineList: [], productLineList: [],
workOrderTypeList: [ workOrderTypeList: [
{id: 1,name:'标准工单'}, {id: 1,name:'普通'},
{id: 2, name:'特殊工单'} {id: 2, name:'特殊'}
], ],
planStartTime: '', planStartTime: '',
planFinishTime: '', planFinishTime: '',
@ -291,12 +291,12 @@ export default {
_this.$modal.msgSuccess("操作成功") _this.$modal.msgSuccess("操作成功")
let name = this.form.name let name = this.form.name
_this.$emit('addWorkOrderSubmit') _this.$emit('addWorkOrderSubmit')
// 询问是否添加预使用主原料 // // 询问是否添加预使用主原料
_this.$modal.confirm('是否添加预使用主原料信息?').then(function() { // _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
_this.$router.push({ // _this.$router.push({
path: '/core/core-work-order?workOrderName='+encodeURI(name) // path: '/core/core-work-order?workOrderName='+encodeURI(name)
}) // })
}) // })
} }
}) })
} else { } else {

18
src/views/order/base/orderManage/index.vue
View File

@ -401,9 +401,9 @@ export default {
}, },
// 完成,终止，作废 // 完成,终止，作废
handleEditStatus(val, tip, status) { handleEditStatus(val, tip, status) {
console.log(val) let _this = this
if (val.workOrderNum > 0) {//有下级工单 if (val.workOrderNum > 0) {//有下级工单
this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', { _this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', {
type: 'warning', type: 'warning',
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: '同步', confirmButtonText: '同步',
@ -411,26 +411,26 @@ export default {
}).then(function() { }).then(function() {
console.log('同步') console.log('同步')
orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => { orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}) })
}).catch(action => { }).catch(action => {
if (action === 'cancel') { if (action === 'cancel') {
console.log('不同步') console.log('不同步')
orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => { orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}) })
}else { }else {
return console.log('关闭') return console.log('关闭')
} }
}) })
}else{// 无下级工单 }else{// 无下级工单
this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() { _this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() {
return orderStatusSet({ id: val.id, status: status}) return orderStatusSet({ id: val.id, status: status})
}).then(() => { }).then(() => {
this.getList(); _this.getList();
this.$modal.msgSuccess("操作成功"); _this.$modal.msgSuccess("操作成功");
}).catch(() => {}); }).catch(() => {});
} }
}, },

2
src/views/order/base/orderManage/orderDetailData.vue
View File

@ -74,7 +74,7 @@
</el-col> </el-col>
<el-col :span='4'> <el-col :span='4'>
<div class="blodTip">废片数量</div> <div class="blodTip">废片数量</div>
<div class="lightTip">该字段未绑定</div> <div class="lightTip">{{orderMsg.nokQuantity}}</div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>