From 9ced1289954c75ae3c8f55b6a1da16d9518853ae Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 20 三月 2026 15:14:15 +0800
Subject: [PATCH] fix: 生产详细接口对接90%
---
src/views/procurementManagement/procurementLedger/index.vue | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 858b633..0ebff95 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -157,6 +157,10 @@
prop="entryDate"
width="100"
show-overflow-tooltip />
+ <el-table-column label="澶囨敞"
+ prop="remarks"
+ width="200"
+ show-overflow-tooltip />
<el-table-column fixed="right"
label="鎿嶄綔"
width="120"
@@ -229,7 +233,7 @@
<el-option v-for="item in supplierList"
:key="item.id"
:label="item.supplierName"
- :value="item.id" />
+ :value="item.id" >{{item.supplierName + '---' + item.supplierType}}</el-option>
</el-select>
</el-form-item>
</el-col>
@@ -450,8 +454,8 @@
<el-row :gutter="30">
<el-col :span="24">
<el-form-item label="澶囨敞路锛�"
- prop="remark">
- <el-input v-model="form.remark"
+ prop="remarks">
+ <el-input v-model="form.remarks"
placeholder="璇疯緭鍏�"
clearable
type="textarea"
@@ -462,7 +466,7 @@
<el-row :gutter="30">
<el-col :span="24">
<el-form-item label="闄勪欢鏉愭枡锛�"
- prop="remark">
+ prop="purchaseLedgerFiles">
<el-upload v-model:file-list="fileList"
:action="upload.url"
multiple
@@ -1470,6 +1474,22 @@
if (type === "edit") {
// 澶嶅埗琛屾暟鎹�
productForm.value = { ...row };
+
+ // el-radio-group 鐨� value 鏄竷灏� true/false
+ // 鍚庣/琛ㄦ牸鏁版嵁鍙兘鏄� 0/1 鎴栧瓧绗︿覆锛岄渶鍋氫竴娆″綊涓�鍖栵紝閬垮厤涓嶅洖鏄�/鎻愪氦榛樿鈥滃惁鈥�
+ const normalizeIsChecked = (val) => {
+ if (val === true) return true;
+ if (val === false) return false;
+ if (val === 1 || val === "1") return true;
+ if (val === 0 || val === "0") return false;
+ if (typeof val === "string") {
+ const s = val.trim().toLowerCase();
+ if (["鏄�", "yes", "true", "y"].includes(s)) return true;
+ if (["鍚�", "no", "false", "n"].includes(s)) return false;
+ }
+ return !!val;
+ };
+ productForm.value.isChecked = normalizeIsChecked(row?.isChecked);
// 濡傛灉鏄粠妯℃澘鍔犺浇鐨勬暟鎹紝鍙兘娌℃湁 productId 鍜� productModelId
// 闇�瑕佹牴鎹� productCategory 鍜� specificationModel 鏉ユ煡鎵惧搴旂殑 ID
@@ -1528,9 +1548,25 @@
};
const getProductOptions = () => {
return productTreeList().then(res => {
- productOptions.value = convertIdToValue(res);
+ const tree = convertIdToValue(res);
+ productOptions.value = filterOutSemiFinished(tree);
return res;
});
+ };
+
+ const filterOutSemiFinished = (nodes = []) => {
+ return (nodes || [])
+ .filter(node => {
+ const label = String(node?.label ?? "");
+ return !label.includes("鍗婃垚鍝�");
+ })
+ .map(node => {
+ const next = { ...node };
+ if (next.children && next.children.length > 0) {
+ next.children = filterOutSemiFinished(next.children);
+ }
+ return next;
+ });
};
const getModels = value => {
if (value) {
@@ -1644,7 +1680,7 @@
delProduct(ids).then(res => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
closeProductDia();
- getSalesLedgerWithProducts({ id: currentId.value, type: 2 }).then(
+ getPurchaseById({ id: currentId.value, type: 2 }).then(
res => {
productData.value = res.productData;
}
@@ -1679,14 +1715,6 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
- const unauthorizedData = selectedRows.value.filter(
- item => item.recorderName !== userStore.nickName
- );
- if (unauthorizedData.length > 0) {
- proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
- return;
- }
ids = selectedRows.value.map(item => item.id);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
--
Gitblit v1.9.3