From 7ca6e58cb69cb1fa88df4b8779ad0de8ff01a210 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 01 四月 2026 17:42:40 +0800
Subject: [PATCH] 军泰伟业 1.军泰伟业-库存管理增加库位 2.军泰伟业-生产入库要审核，加个入库审核菜单，入库数量，库位，通过不通过
---
src/views/salesManagement/salesLedger/index.vue | 87 +++++++++++++++++++++++++++----------------
1 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index e148094..bdd2d94 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -323,21 +323,23 @@
<el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="浜у搧澶х被锛�" prop="productCategory">
- <!-- <el-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
- </el-select> -->
- <el-tree-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable check-strictly
- @change="getModels" :data="productOptions" :render-after-expand="false" filterable style="width: 100%" />
+ <el-form-item label="浜у搧閫夋嫨锛�" prop="productSelect">
+ <div style="display: flex; gap: 10px;">
+ <el-input
+ v-model="productForm.productCategory"
+ placeholder="璇烽�夋嫨浜у搧"
+ disabled
+ style="flex: 1;"
+ />
+ <el-button type="primary" @click="openProductSelectDialog">閫夋嫨</el-button>
+ </div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="鍥剧焊缂栧彿锛�" prop="productModelId">
- <el-select v-model="productForm.productModelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel" filterable>
- <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
- </el-select>
+ <el-form-item label="鍥剧焊缂栧彿锛�" prop="specificationModel">
+ <el-input v-model="productForm.specificationModel" placeholder="璇疯緭鍏ュ浘绾哥紪鍙�" disabled />
</el-form-item>
</el-col>
</el-row>
@@ -615,6 +617,13 @@
</div>
</template>
</el-dialog>
+
+ <!-- 浜у搧閫夋嫨瀵硅瘽妗� -->
+ <ProductSelectDialog
+ v-model="productSelectVisible"
+ :single="true"
+ @confirm="handleProductSelect"
+ />
</div>
</template>
@@ -622,6 +631,7 @@
import { getToken } from "@/utils/auth";
import pagination from "@/components/PIMTable/Pagination.vue";
import {onMounted, ref, getCurrentInstance} from "vue";
+import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
import { ElMessageBox, ElMessage } from "element-plus";
import { UploadFilled, Download } from "@element-plus/icons-vue";
@@ -701,6 +711,7 @@
const productFormVisible = ref(false);
const productOperationType = ref("");
const currentId = ref("");
+const productSelectVisible = ref(false);
const productFormData = reactive({
productForm: {
productCategory: "",
@@ -1317,6 +1328,22 @@
proxy.resetForm("productFormRef");
productFormVisible.value = false;
};
+
+// 鎵撳紑浜у搧閫夋嫨瀵硅瘽妗�
+const openProductSelectDialog = () => {
+ productSelectVisible.value = true;
+};
+
+// 澶勭悊浜у搧閫夋嫨
+const handleProductSelect = (selectedProducts) => {
+ if (selectedProducts && selectedProducts.length > 0) {
+ const product = selectedProducts[0];
+ productForm.value.productCategory = product.productName;
+ productForm.value.specificationModel = product.model;
+ productForm.value.unit = product.unit;
+ }
+};
+
// 瀵煎叆
const handleImport = () => {
importUpload.title = "瀵煎叆閿�鍞彴璐�";
@@ -1964,26 +1991,23 @@
// 鐘舵�佹槸瀛楃涓�
const statusStr = String(status).trim();
- // 濡傛灉鐘舵�佹槸"宸叉挙閿�"锛岀洿鎺ヨ繑鍥�
- if (statusStr === '宸叉挙閿�') {
- return '宸叉挙閿�';
- }
-
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
- if (row.shippingDate || row.shippingCarNumber) {
- return '宸插彂璐�';
- }
-
const statusTextMap = {
'寰呭彂璐�': '寰呭彂璐�',
'寰呭鏍�': '寰呭鏍�',
'瀹℃牳涓�': '瀹℃牳涓�',
+ '鍙戣揣涓�': '鍙戣揣涓�',
'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
'宸插彂璐�': '宸插彂璐�',
'宸叉挙閿�': '宸叉挙閿�'
};
- return statusTextMap[statusStr] || '寰呭彂璐�';
+
+ // 濡傛灉鐘舵�佸湪鏄犲皠琛ㄤ腑锛岀洿鎺ヨ繑鍥炲搴旀枃鏈�
+ if (statusTextMap[statusStr]) {
+ return statusTextMap[statusStr];
+ }
+
+ return '寰呭彂璐�';
};
/**
@@ -2002,16 +2026,6 @@
// 鐘舵�佹槸瀛楃涓�
const statusStr = String(status).trim();
- // 濡傛灉鐘舵�佹槸"宸叉挙閿�"锛屾樉绀烘鑹�
- if (statusStr === '宸叉挙閿�') {
- return 'warning';
- }
-
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
- if (row.shippingDate || row.shippingCarNumber) {
- return 'success';
- }
-
const typeTextMap = {
'寰呭彂璐�': 'info',
'寰呭鏍�': 'info',
@@ -2019,9 +2033,16 @@
'瀹℃牳鎷掔粷': 'danger',
'宸叉挙閿�': 'warning',
'瀹℃牳閫氳繃': 'success',
- '宸插彂璐�': 'success'
+ '宸插彂璐�': 'success',
+ '鍙戣揣涓�': 'warning'
};
- return typeTextMap[statusStr] || 'info';
+
+ // 濡傛灉鐘舵�佸湪鏄犲皠琛ㄤ腑锛岀洿鎺ヨ繑鍥炲搴旂被鍨�
+ if (typeTextMap[statusStr]) {
+ return typeTextMap[statusStr];
+ }
+
+ return 'info';
};
/**
--
Gitblit v1.9.3