From 0c4bdf3dca76f9b8c348f2f7e48f9a6319dee4e1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 17 四月 2026 17:09:22 +0800
Subject: [PATCH] 进销存升级 1.销售台账不能删除和编辑别人维护的数据 2.产品维护固定产品大类为:成品、半成品、原材料。

---
 src/views/inventoryManagement/stockManagement/New.vue |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 8243748..df92c21 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -38,10 +38,35 @@
         </el-form-item>
 
         <el-form-item
-            label="鏁伴噺"
+            label="搴撳瓨绫诲瀷"
+            prop="type"
+            :rules="[
+                {
+                required: true,
+                message: '璇烽�夋嫨搴撳瓨绫诲瀷',
+                trigger: 'change',
+              }
+            ]"
+        >
+          <el-select v-model="formState.type" placeholder="璇烽�夋嫨搴撳瓨绫诲瀷">
+            <el-option label="鍚堟牸搴撳瓨" value="qualified" />
+            <el-option label="涓嶅悎鏍煎簱瀛�" value="unqualified" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+            label="搴撳瓨鏁伴噺"
             prop="qualitity"
         >
-          <el-input-number v-model="formState.qualitity" :step="1" :min="0" style="width: 100%" />
+          <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
+        </el-form-item>
+
+        <el-form-item
+            v-if="formState.type === 'qualified'"
+            label="搴撳瓨棰勮鏁伴噺"
+            prop="warnNum"
+        >
+          <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
         </el-form-item>
 
         <el-form-item label="澶囨敞" prop="remark">
@@ -53,8 +78,9 @@
       <ProductSelectDialog
           v-model="showProductSelectDialog"
           @confirm="handleProductSelect"
+          :top-product-parent-id="props.topProductParentId"
           single
-      />
+        />
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleSubmit">纭</el-button>
@@ -69,12 +95,18 @@
 import {ref, computed, getCurrentInstance} from "vue";
 import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
 import {createStockInventory} from "@/api/inventoryManagement/stockInventory.js";
+import {createStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
 
 const props = defineProps({
   visible: {
     type: Boolean,
     required: true,
   },
+  topProductParentId: {
+    type: Number,
+    default: undefined,
+    required: false,
+  }
 });
 
 const emit = defineEmits(['update:visible', 'completed']);
@@ -86,7 +118,9 @@
   productName: "",
   productModelName: "",
   unit: "",
+  type: undefined,
   qualitity: 0,
+  warnNum: 0,
   remark: '',
 });
 
@@ -119,7 +153,6 @@
 const handleProductSelect = async (products) => {
   if (products && products.length > 0) {
     const product = products[0];
-    console.log(product)
     formState.value.productId = product.productId;
     formState.value.productName = product.productName;
     formState.value.productModelName = product.model;
@@ -143,13 +176,25 @@
         proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
         return;
       }
-      createStockInventory(formState.value).then(res => {
-        // 鍏抽棴妯℃�佹
-        isShow.value = false;
-        // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
-        emit('completed');
-        proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
-      })
+      if (formState.value.type === 'qualified') {
+        createStockInventory(formState.value).then(res => {
+          // 鍏抽棴妯℃�佹
+          isShow.value = false;
+          // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
+          emit('completed');
+          proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+        })
+      } else {
+        formState.value.warnNum = 0;
+        createStockUnInventory(formState.value).then(res => {
+          // 鍏抽棴妯℃�佹
+          isShow.value = false;
+          // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
+          emit('completed');
+          proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+        })
+      }
+
     }
   })
 };

--
Gitblit v1.9.3