DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
朱昊天
2026-07-08 13:10:56 +08:00
parent 1be7612eb5 6e28ba0342
commit 6e8028c1a0
11 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-ui/src/api/erp/purchaseRequisition.js
View File

@@ -45,18 +45,20 @@ export function submitApproval(reqId, firstApproverId, firstApproverName) {
}
// 审批通过
export function approvePurchase(reqId) {
export function approvePurchase(reqId, approvalOpinion) {
return request({
url: '/erp/purchaseRequisition/' + reqId + '/approve',
method: 'put'
method: 'put',
params: { approvalOpinion }
})
}
// 驳回
export function rejectPurchase(reqId) {
export function rejectPurchase(reqId, approvalOpinion) {
return request({
url: '/erp/purchaseRequisition/' + reqId + '/reject',
method: 'put'
method: 'put',
params: { approvalOpinion }
})
}

16
klp-ui/src/views/erp/purchaseRequisition/index.vue
View File

@@ -363,9 +363,15 @@
<!-- 审批进度 -->
<div class="pv-section-title" style="margin-top:14px">审批进度</div>
<div style="display:flex;gap:24px;padding:8px 0;font-size:13px">
<div><label style="color:#909399">一审人：</label><span>{{ viewForm.signPurchaseHandler || '待审批' }}</span></div>
<div><label style="color:#909399">二审人（陈清鑫）：</label><span>{{ viewForm.signRequestGm || '待审批' }}</span></div>
<div style="padding:8px 0;font-size:13px">
<div style="margin-bottom:10px">
<div><label style="color:#909399">一审人：</label><span>{{ viewForm.signPurchaseHandler || '待审批' }}</span></div>
<div v-if="viewForm.firstApprovalOpinion" style="margin:4px 0 0 62px;color:#606266;font-size:12px;padding:4px 10px;background:#f5f7fa;border-radius:3px;display:inline-block">意见：{{ viewForm.firstApprovalOpinion }}</div>
</div>
<div>
<div><label style="color:#909399">二审人（陈清鑫）：</label><span>{{ viewForm.signRequestGm || '待审批' }}</span></div>
<div v-if="viewForm.secondApprovalOpinion" style="margin:4px 0 0 124px;color:#606266;font-size:12px;padding:4px 10px;background:#f5f7fa;border-radius:3px;display:inline-block">意见：{{ viewForm.secondApprovalOpinion }}</div>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
@@ -766,7 +772,7 @@ export default {
// 审批通过
doApprove() {
this.approvalLoading = true
approvePurchase(this.approvalReq.reqId).then(() => {
approvePurchase(this.approvalReq.reqId, this.approvalRemark).then(() => {
this.$modal.msgSuccess('审批通过')
this.approvalOpen = false
this.getList()
@@ -775,7 +781,7 @@ export default {
// 驳回
doReject() {
this.approvalLoading = true
rejectPurchase(this.approvalReq.reqId).then(() => {
rejectPurchase(this.approvalReq.reqId, this.approvalRemark).then(() => {
this.$modal.msgSuccess('已驳回')
this.approvalOpen = false
this.getList()

6
klp-ui/src/views/wms/coil/stock/index.vue
View File

@@ -497,7 +497,11 @@ export default {
loadDialogData() {
if (!this.currentWarehouse) return;
this.dialogLoading = true;
const baseParams = { warehouseId: this.currentWarehouse.warehouseId, dataType: 1, status: 0 };
const baseParams = {
warehouseId: this.currentWarehouse.warehouseId,
qualityStatusCsv: this.queryParams.qualityStatusCsv || '',
dataType: 1, status: 0,
};
Promise.all([
listLightCoil({ ...baseParams, pageSize: 99999, pageNum: 1 }),
listMaterialCoil({ ...baseParams, pageNum: this.dialogPageNum, pageSize: this.dialogPageSize }),

7
klp-ui/src/views/wms/report/components/CustomExport.vue
View File

@@ -98,7 +98,7 @@ export default {
const newSet = new Set(nv)
const oldSet = ov ? new Set(ov) : new Set()
this.orderedColumns = this.orderedColumns.filter(f => newSet.has(f))
const added = nv.filter(f => !oldSet.has(f))
const added = nv.filter(f => !oldSet.has(f) && !this.orderedColumns.includes(f))
if (added.length) {
this.orderedColumns.push(...added)
}
@@ -114,8 +114,9 @@ export default {
try {
const arr = JSON.parse(cached)
if (Array.isArray(arr) && arr.length) {
this.selectedColumns = [...arr]
this.orderedColumns = [...arr]
const uniqueArr = [...new Set(arr)]
this.selectedColumns = uniqueArr
this.orderedColumns = uniqueArr
this.$emit('update:visible', true)
return
}