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:
Joshi
2025-08-13 16:49:29 +08:00
parent 195a68dea4 53d57e4ccd
commit 03c4ed1717
20 changed files with 305 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-ui/src/App.vue
View File

@@ -18,8 +18,8 @@ export default {
this.$store.dispatch('category/getProductMap');
this.$store.dispatch('category/getRawMaterialMap');
this.$store.dispatch('category/getBomMap');
this.$store.dispatch('finance/getFinancialAccounts');
}
console.log(this.$store)
},
metaInfo() {
return {

46
klp-ui/src/components/KLPService/AmountSelect/index.vue
View File

@@ -0,0 +1,46 @@
<template>
<el-select v-model="_value" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</template>
<script>
import { mapGetters } from 'vuex';
export default {
name: 'AmountSelect',
computed: {
...mapGetters(['financialAccounts']),
_value: {
get() {
return this.value;
},
set(value) {
this.$emit('input', value);
}
}
},
props: {
value: {
type: String,
default: ''
}
},
data() {
return {
options: [],
}
},
mounted() {
this.getFinancialAccounts();
},
methods: {
getFinancialAccounts() {
this.options = this.financialAccounts.map(item => ({
label: item.accountName,
value: item.accountId
}));
},
}
}
</script>

1
klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
View File

@@ -52,7 +52,6 @@ export default {
},
mounted() {
this.options = this.rawMaterialList;
console.log(this.options, this.rawMaterialList);
},
computed: {
...mapGetters(['rawMaterialList'])

1
klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
View File

@@ -63,7 +63,6 @@ export default {
productId: {
handler(newVal) {
const res = this.productMap[this.productId] ? this.productMap[this.productId] : {};
console.log(res)
this.product = res;
},
immediate: true

1
klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
View File

@@ -48,7 +48,6 @@ export default {
materialId: {
handler: function (newVal) {
const res = this.materialMap[this.materialId] ? this.materialMap[this.materialId] : {};
console.log(res)
this.material = res;
},
immediate: true

1
klp-ui/src/components/VditorEditor.vue
View File

@@ -44,7 +44,6 @@ export default {
}
this.vditor = new Vditor('vditor', config);
if (this.readonly) {
console.log(this.vditor)
this.vditor.vditor.disabled()
}
},

3
klp-ui/src/store/getters.js
View File

@@ -18,6 +18,7 @@ const getters = {
sidebarRouters:state => state.permission.sidebarRouters,
productList: state => state.category.productList,
rawMaterialList: state => state.category.rawMaterialList,
bomMap: state => state.category.bomMap
bomMap: state => state.category.bomMap,
financialAccounts: state => state.finance.financialAccounts,
}
export default getters

4
klp-ui/src/store/index.js
View File

@@ -7,6 +7,7 @@ import tagsView from './modules/tagsView'
import permission from './modules/permission'
import settings from './modules/settings'
import category from './modules/category'
import finance from './modules/finance'
import getters from './getters'
Vue.use(Vuex)
@@ -19,7 +20,8 @@ const store = new Vuex.Store({
tagsView,
permission,
settings,
category
category,
finance
},
getters
})

26
klp-ui/src/store/modules/finance.js Normal file
View File

@@ -0,0 +1,26 @@
import { listAccount } from "@/api/finance/account";
const state = {
financialAccounts: [],
}
const mutations = {
SET_FINANCIAL_ACCOUNTS(state, financialAccounts) {
state.financialAccounts = financialAccounts;
},
}
const actions = {
getFinancialAccounts({ commit }) {
listAccount().then(response => {
commit('SET_FINANCIAL_ACCOUNTS', response.data);
});
}
}
export default {
namespaced: true,
state,
mutations,
actions
}

80
klp-ui/src/views/finance/document/components/Voucher.vue
View File

@@ -6,15 +6,12 @@
<el-input v-model="form.docNo" placeholder="请输入凭证编号" />
</el-form-item>
<el-form-item label="单据日期" prop="docDate">
<el-date-picker clearable
v-model="form.docDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker clearable v-model="form.docDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择单据日期">
</el-date-picker>
</el-form-item>
<el-form-item label="关联订单ID" prop="relatedOrderId">
<el-input v-model="form.relatedOrderId" placeholder="请输入关联订单ID" />
<el-form-item label="关联订单" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入关联订单" />
</el-form-item>
</el-form>
</el-row>
@@ -29,29 +26,19 @@
</el-table-column>
<el-table-column prop="accountingId" label="会计科目">
<template slot-scope="scope">
<el-input v-model="scope.row.accountingId" placeholder="请输入会计科目" @change="handleRowChange(scope.row)" />
<amount-select v-model="scope.row.accountId" placeholder="请输入会计科目" @change="handleRowChange(scope.row)" />
</template>
</el-table-column>
<el-table-column prop="debitAmount" label="借方金额">
<template slot-scope="scope">
<el-input
v-model.number="scope.row.debitAmount"
type="number"
placeholder="0.00"
@input="handleDebitInput(scope.row)"
@change="handleRowChange(scope.row)"
/>
<el-input v-model.number="scope.row.debitAmount" type="number" placeholder="0.00"
@input="handleDebitInput(scope.row)" @change="handleRowChange(scope.row)" />
</template>
</el-table-column>
<el-table-column prop="creditAmount" label="贷方金额">
<template slot-scope="scope">
<el-input
v-model.number="scope.row.creditAmount"
type="number"
placeholder="0.00"
@input="handleCreditInput(scope.row)"
@change="handleRowChange(scope.row)"
/>
<el-input v-model.number="scope.row.creditAmount" type="number" placeholder="0.00"
@input="handleCreditInput(scope.row)" @change="handleRowChange(scope.row)" />
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
@@ -61,12 +48,8 @@
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.$index)"
:disabled="tableData.length <= 1"
>
<el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)"
:disabled="tableData.length <= 1">
删除
</el-button>
</template>
@@ -96,13 +79,18 @@
</template>
<script>
import AmountSelect from '@/components/KLPService/AmountSelect/index.vue';
export default {
components: {
AmountSelect
},
data() {
return {
form: {
docNo: undefined,
docDate: undefined,
relatedOrderId: undefined
orderId: undefined
},
tableData: [{
summary: '',
@@ -269,6 +257,20 @@
row.creditAmount > 0;
});
// 凭证编号，单据日期和关联订单必填
if (!this.form.docNo) {
this.$message.error('凭证编号必填');
return;
}
if (!this.form.docDate) {
this.$message.error('单据日期必填');
return;
}
if (!this.form.orderId) {
this.$message.error('关联订单必填');
return;
}
if (invalidRows !== -1) {
this.$message.error('存在同时填写借方和贷方金额的行，请检查');
return;
@@ -282,7 +284,27 @@
return;
}
console.log('表单数据:', this.form);
// 所有的科目必须填写
const accountIds = validData.map(row => row.accountId);
if (accountIds.some(id => !id)) {
this.$message.error('请填写所有会计科目');
return;
}
// 每一行至少包含借方或贷方金额
const hasDebitOrCredit = validData.some(row => row.debitAmount > 0 || row.creditAmount > 0);
if (!hasDebitOrCredit) {
this.$message.error('请至少填写一行借方或贷方金额');
return;
}
// 借贷必须相同
if (this.debitAmount !== this.creditAmount) {
this.$message.error('借方和贷方金额必须相同');
return;
}
console.log('表单数据:', this.form, this.debitAmount, this.creditAmount);
console.log('表格数据:', validData);
// 这里可以添加提交逻辑

7
klp-ui/src/views/finance/pay/index.vue
View File

@@ -357,9 +357,14 @@ export default {
payableId: this.payForm.payableId,
paidAmount: this.payForm.amount
}
this.buttonLoading = true;
updatePaidAmount(payload).then(response => {
this.$modal.msgSuccess("付款成功");
})
this.payOpen = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
};

1
klp-ui/src/views/finance/receive/index.vue
View File

@@ -357,6 +357,7 @@ export default {
receivableId: this.receiveForm.receivableId,
paidAmount: this.receiveForm.amount
}
this.buttonLoading = true;
updatePaidAmount(payload).then(response => {
this.$modal.msgSuccess("收款成功");
this.receiveOpen = false;

1
klp-ui/src/views/login.vue
View File

@@ -136,6 +136,7 @@ export default {
this.$store.dispatch('category/getProductMap');
this.$store.dispatch('category/getRawMaterialMap');
this.$store.dispatch('category/getBomMap');
this.$store.dispatch('finance/getFinancialAccounts');
this.$router.push({ path: this.redirect || "/" }).catch(() => { });
}).catch(() => {
this.loading = false;

1
klp-ui/src/views/wms/product/index.vue
View File

@@ -355,7 +355,6 @@ export default {
});
},
handleAddBom(bom) {
console.log('回调触发', bom)
this.bomId = bom.bomId;
this.getList();
},

1
klp-ui/src/views/wms/product/semi.vue
View File

@@ -355,7 +355,6 @@ export default {
});
},
handleAddBom(bom) {
console.log('回调触发', bom)
this.bomId = bom.bomId;
this.getList();
},

1
klp-ui/src/views/wms/purchasePlan/panels/clac.vue
View File

@@ -47,7 +47,6 @@ export default {
orderId: this.orderId,
orderStatus: this.EOrderStatus.PRODUCTIONING,
}).then(response => {
console.log("状态变更成功")
this.$emit('confirm', submitData)
})

1
klp-ui/src/views/wms/purchasePlan/panels/detail.vue
View File

@@ -489,7 +489,6 @@ export default {
},
handleUploadQualityCertificate(row) {
this.uploadQualityCertificateOpen = true;
console.log(row, 'row');
this.uploadQualityCertificateInfo = row;
}
}

1
klp-ui/src/views/wms/purchasePlan/panels/merger.vue
View File

@@ -122,7 +122,6 @@ export default {
this.$store.dispatch('category/getBomMap');
this.$store.dispatch('category/getRawMaterialMap');
} else if (this.uploadQualityCertificateForm.qualityCertificateType === 3) {
console.log('创建新物料');
// 创建一个新的BOM
const bom = await addBom({
bomName: 'N' + new Date().getTime(),

3
klp-ui/src/views/wms/video/index.vue
View File

@@ -140,9 +140,8 @@
</el-dialog>
<el-dialog
:title="title"
title="视频播放"
:visible.sync="openVideo"
width="800px"
v-loading="loading"
element-loading-text="正在加载视频流..."
@close="handleCloseVideo"

1
klp-ui/src/views/workflow/work/own.vue
View File

@@ -253,7 +253,6 @@ export default {
procInsId: row.procInsId
}
})
console.log(row);
},
/** 取消流程申请 */
handleStop(row){