sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

hella_online_20240829
wangyufei 5 months ago
parent
f02508c786 86dc84c0e5
commit
4a3456ffd6
5 changed files with 337 additions and 145 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. 2
      src/views/qms/inspectionJob/addForm.vue
  2. 120
      src/views/wms/productionManage/productionplan/productionMain/index.vue
  3. 120
      src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
  4. 120
      src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
  5. 120
      src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue

2
src/views/qms/inspectionJob/addForm.vue
View File

@ -465,7 +465,7 @@
<el-input <el-input
v-model="cur.remark" v-model="cur.remark"
placeholder="请输入备注" placeholder="请输入备注"
type="text" type="text" maxlength="200"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>

120
src/views/wms/productionManage/productionplan/productionMain/index.vue
View File

@ -332,29 +332,39 @@ const buttonTableClick = async (val, row) => {
await ProductionMainApi.submit(row.masterId).then((res) => { await ProductionMainApi.submit(row.masterId).then((res) => {
if (res.status == '6') { if (res.status == '6') {
// 生成备料计划 // 生成备料计划
tableObject.loading = true // tableObject.loading = true
ProductionMainApi.generatePreparetoissue(row.number).then(() => { ProductionMainApi.generatePreparetoissue(row.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { // 生成收货申请
tableObject.loading = false // tableObject.loading = true
console.log(err) ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
}) message.success(t('common.createSuccess'))
// 生成收货申请 tableObject.loading = false
tableObject.loading = true getList()
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { }).catch(err => {
// message.success(t('common.createSuccess')) tableObject.loading = false
tableObject.loading = false console.log(err)
getList() })
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
message.success(t('common.updateSuccess')) // message.success(t('common.updateSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { }).catch(err => {
tableObject.loading = false tableObject.loading = false
console.log(err) console.log(err)
@ -398,23 +408,33 @@ const buttonTableClick = async (val, row) => {
}) })
// 生成备料计划 // 生成备料计划
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.generatePreparetoissue(row.number).then(() => { ProductionMainApi.generatePreparetoissue(row.number).then(() => {
// message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
// 生成收货申请
tableObject.loading = true
await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
}) })
@ -590,25 +610,35 @@ const submitForm = async (formType, submitData) => {
tableObject.loading = true tableObject.loading = true
ProductionMainApi.generatePreparetoissue(res.number).then(() => { ProductionMainApi.generatePreparetoissue(res.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { // 生成收货申请
tableObject.loading = false // tableObject.loading = true
console.log(err) ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
}) message.success(t('common.createSuccess'))
// 生成收货申请 tableObject.loading = false
tableObject.loading = true getList()
ProductionMainApi.generateProductreceiptRequest(res.number).then(() => { }).catch(err => {
// message.success(t('common.createSuccess')) tableObject.loading = false
tableObject.loading = false console.log(err)
getList() })
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
}) })
message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
} else { } else {
await ProductionMainApi.updateProductionMain(data) await ProductionMainApi.updateProductionMain(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))

120
src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
View File

@ -329,29 +329,39 @@ const buttonTableClick = async (val, row) => {
await ProductionMainApi.submit(row.masterId).then((res) => { await ProductionMainApi.submit(row.masterId).then((res) => {
if (res.status == '6') { if (res.status == '6') {
// 生成备料计划 // 生成备料计划
tableObject.loading = true // tableObject.loading = true
ProductionMainApi.generatePreparetoissue(row.number).then(() => { ProductionMainApi.generatePreparetoissue(row.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { // 生成收货申请
tableObject.loading = false // tableObject.loading = true
console.log(err) ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
}) message.success(t('common.createSuccess'))
// 生成收货申请 tableObject.loading = false
tableObject.loading = true getList()
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { }).catch(err => {
// message.success(t('common.createSuccess')) tableObject.loading = false
tableObject.loading = false console.log(err)
getList() })
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
message.success(t('common.updateSuccess')) // message.success(t('common.updateSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { }).catch(err => {
tableObject.loading = false tableObject.loading = false
console.log(err) console.log(err)
@ -395,23 +405,33 @@ const buttonTableClick = async (val, row) => {
}) })
// 生成备料计划 // 生成备料计划
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.generatePreparetoissue(row.number).then(() => { ProductionMainApi.generatePreparetoissue(row.number).then(() => {
// message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
// 生成收货申请
tableObject.loading = true
await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
}) })
@ -579,8 +599,42 @@ const submitForm = async (formType, submitData) => {
try { try {
if (formType === 'create') { if (formType === 'create') {
data.subList = tableData.value // 拼接子表数据参数 data.subList = tableData.value // 拼接子表数据参数
await ProductionMainApi.createProductionMain(data) await ProductionMainApi.createProductionMain(data).then((res) => {
message.success(t('common.createSuccess')) // console.log(565,res)
if (res.status == '6') {
// 生成备料计划
tableObject.loading = true
ProductionMainApi.generatePreparetoissue(res.number).then(() => {
// message.success(t('common.createSuccess'))
// tableObject.loading = false
// getList()
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}).catch(err => {
// tableObject.loading = false
console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
})
}
})
// message.success(t('common.createSuccess'))
} else { } else {
await ProductionMainApi.updateProductionMain(data) await ProductionMainApi.updateProductionMain(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))

120
src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
View File

@ -328,29 +328,39 @@ const buttonTableClick = async (val, row) => {
await ProductionMainApi.submit(row.masterId).then((res) => { await ProductionMainApi.submit(row.masterId).then((res) => {
if (res.status == '6') { if (res.status == '6') {
// 生成备料计划 // 生成备料计划
tableObject.loading = true // tableObject.loading = true
ProductionMainApi.generatePreparetoissue(row.number).then(() => { ProductionMainApi.generatePreparetoissue(row.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { // 生成收货申请
tableObject.loading = false // tableObject.loading = true
console.log(err) ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
}) message.success(t('common.createSuccess'))
// 生成收货申请 tableObject.loading = false
tableObject.loading = true getList()
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { }).catch(err => {
// message.success(t('common.createSuccess')) tableObject.loading = false
tableObject.loading = false console.log(err)
getList() })
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
message.success(t('common.updateSuccess')) // message.success(t('common.updateSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { }).catch(err => {
tableObject.loading = false tableObject.loading = false
console.log(err) console.log(err)
@ -394,23 +404,33 @@ const buttonTableClick = async (val, row) => {
}) })
// 生成备料计划 // 生成备料计划
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.generatePreparetoissue(row.number).then(() => { ProductionMainApi.generatePreparetoissue(row.number).then(() => {
// message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
// 生成收货申请
tableObject.loading = true
await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
}) })
@ -577,8 +597,42 @@ const submitForm = async (formType, submitData) => {
try { try {
if (formType === 'create') { if (formType === 'create') {
data.subList = tableData.value // 拼接子表数据参数 data.subList = tableData.value // 拼接子表数据参数
await ProductionMainApi.createProductionMain(data) await ProductionMainApi.createProductionMain(data).then((res) => {
message.success(t('common.createSuccess')) // console.log(565,res)
if (res.status == '6') {
// 生成备料计划
tableObject.loading = true
ProductionMainApi.generatePreparetoissue(res.number).then(() => {
// message.success(t('common.createSuccess'))
// tableObject.loading = false
// getList()
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}).catch(err => {
// tableObject.loading = false
console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
})
}
})
// message.success(t('common.createSuccess'))
} else { } else {
await ProductionMainApi.updateProductionMain(data) await ProductionMainApi.updateProductionMain(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))

120
src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
View File

@ -328,29 +328,39 @@ const buttonTableClick = async (val, row) => {
await ProductionMainApi.submit(row.masterId).then((res) => { await ProductionMainApi.submit(row.masterId).then((res) => {
if (res.status == '6') { if (res.status == '6') {
// 生成备料计划 // 生成备料计划
tableObject.loading = true // tableObject.loading = true
ProductionMainApi.generatePreparetoissue(row.number).then(() => { ProductionMainApi.generatePreparetoissue(row.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { // 生成收货申请
tableObject.loading = false // tableObject.loading = true
console.log(err) ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
}) message.success(t('common.createSuccess'))
// 生成收货申请 tableObject.loading = false
tableObject.loading = true getList()
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { }).catch(err => {
// message.success(t('common.createSuccess')) tableObject.loading = false
tableObject.loading = false console.log(err)
getList() })
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
message.success(t('common.updateSuccess')) // message.success(t('common.updateSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
}).catch(err => { }).catch(err => {
tableObject.loading = false tableObject.loading = false
console.log(err) console.log(err)
@ -394,23 +404,33 @@ const buttonTableClick = async (val, row) => {
}) })
// 生成备料计划 // 生成备料计划
tableObject.loading = true tableObject.loading = true
await ProductionMainApi.generatePreparetoissue(row.number).then(() => { ProductionMainApi.generatePreparetoissue(row.number).then(() => {
// message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
// 生成收货申请
tableObject.loading = true
await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
// message.success(t('common.createSuccess')) // message.success(t('common.createSuccess'))
tableObject.loading = false // tableObject.loading = false
getList() // getList()
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}).catch(err => { }).catch(err => {
tableObject.loading = false // tableObject.loading = false
console.log(err) console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(row.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}) })
} }
}) })
@ -578,8 +598,42 @@ const submitForm = async (formType, submitData) => {
try { try {
if (formType === 'create') { if (formType === 'create') {
data.subList = tableData.value // 拼接子表数据参数 data.subList = tableData.value // 拼接子表数据参数
await ProductionMainApi.createProductionMain(data) await ProductionMainApi.createProductionMain(data).then((res) => {
message.success(t('common.createSuccess')) // console.log(565,res)
if (res.status == '6') {
// 生成备料计划
tableObject.loading = true
ProductionMainApi.generatePreparetoissue(res.number).then(() => {
// message.success(t('common.createSuccess'))
// tableObject.loading = false
// getList()
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
}).catch(err => {
// tableObject.loading = false
console.log(err)
// 生成收货申请
// tableObject.loading = true
ProductionMainApi.generateProductreceiptRequest(res.number).then(() => {
message.success(t('common.createSuccess'))
tableObject.loading = false
getList()
}).catch(err => {
tableObject.loading = false
console.log(err)
})
})
}
})
// message.success(t('common.createSuccess'))
} else { } else {
await ProductionMainApi.updateProductionMain(data) await ProductionMainApi.updateProductionMain(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))

Write Preview
Loading…
Cancel
Save