From 4d97a259f3069f9b18d87ac3fab710618f2c6087 Mon Sep 17 00:00:00 2001
From: lishenao <3065849776@qq.com>
Date: 星期四, 03 七月 2025 15:19:31 +0800
Subject: [PATCH] 库存管理数据修改

---
 src/views/inventoryManagement/receiptManagement/index.vue |  503 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 334 insertions(+), 169 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 8f492ad..ad9a9d8 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -3,7 +3,7 @@
     <div class="search_form">
       <div>
         <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
-        <el-input v-model="searchForm.customerName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
+        <el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
           clearable prefix-icon="Search" />
         <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
       </div>
@@ -19,18 +19,18 @@
         :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
         <el-table-column align="center" type="selection" width="55" />
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-        <el-table-column label="鍏ュ簱鏃堕棿" prop="salesContractNo" width="100" show-overflow-tooltip />
-        <el-table-column label="鍏ュ簱鎵规" prop="customerContractNo" width="160" show-overflow-tooltip />
-        <el-table-column label="渚涘簲鍟嗗悕绉�" prop="customerName" width="160" show-overflow-tooltip />
-        <el-table-column label="浜у搧澶х被" prop="salesman" width="100" show-overflow-tooltip />
-        <el-table-column label="瑙勬牸鍨嬪彿" prop="projectName" width="160" show-overflow-tooltip />
-        <el-table-column label="鍗曚綅" prop="contractAmount" width="70" show-overflow-tooltip />
-        <el-table-column label="鍏ュ簱鏁伴噺" prop="entryPersonName" width="90" show-overflow-tooltip />
-        <el-table-column label="鍚◣鍗曚环(鍏�)" prop="entryDate" width="100" show-overflow-tooltip />
-        <el-table-column label="鍚◣鎬讳环(鍏�)" prop="executionDate" width="100" show-overflow-tooltip />
-        <el-table-column label="绋庣巼(%)" prop="executionDate" width="80" show-overflow-tooltip />
-        <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="executionDate" width="180" show-overflow-tooltip />
-        <el-table-column label="鍏ュ簱浜�" prop="executionDate" width="80" show-overflow-tooltip />
+        <el-table-column label="鍏ュ簱鏃堕棿" prop="inboundTime" width="100" show-overflow-tooltip />
+        <el-table-column label="鍏ュ簱鎵规" prop="inboundBatch" width="160" show-overflow-tooltip />
+        <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="160" show-overflow-tooltip />
+        <el-table-column label="浜у搧澶х被" prop="productName" width="100" show-overflow-tooltip />
+        <el-table-column label="瑙勬牸鍨嬪彿" prop="model" width="160" show-overflow-tooltip />
+        <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
+        <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundQuantity" width="90" show-overflow-tooltip />
+        <el-table-column label="鍚◣鍗曚环" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />
+        <el-table-column label="鍚◣鎬讳环" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />
+        <el-table-column label="绋庣巼(%)" prop="taxRate" width="80" show-overflow-tooltip />
+        <el-table-column label="涓嶅惈绋庢�讳环" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />
+        <el-table-column label="鍏ュ簱浜�" prop="nickName" width="80" show-overflow-tooltip />
         <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
           <template #default="scope">
             <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
@@ -106,18 +106,26 @@
 import useUserStore from '@/store/modules/user'
 import { userListNoPage } from "@/api/system/user.js";
 import {
-  ledgerListPage,
-  customerList,
-  addOrUpdateSalesLedger,
-  getSalesLedgerWithProducts, delLedger
-} from "@/api/salesManagement/salesLedger.js";
+  getStockInPage,
+  updateStockIn,
+  addSutockIn,
+  delStockIn,
+  exportStockIn
+} from "@/api/inventoryManagement/stockIn.js";
+import {listSupplier} from "@/api/basicData/supplierManageFile.js";
+import {modelListPage, productTreeList} from "@/api/basicData/product.js";
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance()
 const tableData = ref([])
-const productData = ref([])
 const selectedRows = ref([])
 const userList = ref([])
-const customerOption = ref([])
+const supplierLists = ref([])
+const productList = ref([]);
+const productModelList = ref([]);
+const purchaseRecords  = ref([]);
+const loadingProducts = ref(false);
+
+const loading = ref(false);
 const tableLoading = ref(false)
 const page = reactive({
   current: 1,
@@ -130,28 +138,48 @@
 const dialogFormVisible = ref(false)
 const data = reactive({
   searchForm: {
-    customerName: '',
+    supplierName: '',
   },
   form: {
-    salesContractNo: '',
-    salesman: '',
-    customerContractNo: '',
-    customerId: '',
-    projectName: '',
-    entryPerson: '',
-    entryDate: '',
-    maintenanceTime: '',
-    productData: [],
-    executionDate: ''
+    supplierId: null,
+    supplierName: '',
+    productId: null,
+    productName: '',
+    userId: userStore.userId,
+    nickName: '',
+    model: '',
+    productModelId: null,
+    unit: '',
+    productrecordId: null,
+    taxInclusiveUnitPrice: '',
+    taxInclusiveTotalPrice: '',
+    taxRate: '',
+    taxExclusiveTotalPrice: '',
+    inboundTime: '',
+    inboundBatch: '',
+    inboundQuantity: ''
   },
   rules: {
-    salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    customerContractNo: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    productId: [
+      { required: true, message: "璇烽�夋嫨浜у搧澶х被", trigger: "change" }
+    ],
+    productModelId: [
+      { required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change" }
+    ],
+    supplierId: [
+      { required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }
+    ],
+    inboundQuantity: [
+      { required: true, message: "璇疯緭鍏ュ叆搴撴暟閲�", trigger: "blur" }
+    ],
+    userId: [
+      { required: true, message: "璇烽�夋嫨鍏ュ簱浜�", trigger: "change" }
+    ],
+    unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    inboundTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+    inboundBatch: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    taxInclusiveUnitPrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    taxRate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
   }
 })
 const { searchForm, form, rules } = toRefs(data)
@@ -162,169 +190,306 @@
   page.current = 1
   getList()
 }
+
 const paginationChange = (obj) => {
   page.current = obj.page;
   page.size = obj.limit;
   getList()
 }
+
 const getList = () => {
   tableLoading.value = true
-  ledgerListPage({ ...searchForm.value, ...page }).then(res => {
+  getStockInPage({ ...searchForm.value, ...page }).then(res => {
     tableLoading.value = false
-    tableData.value = res.records
-    tableData.value.map(item => {
-      item.children = []
-    })
-    total.value = res.total
+    tableData.value = res.data.records
+    total.value = res.data.total
+    console.log('tableData:', tableData.value)
   }).catch(() => {
     tableLoading.value = false
   })
 }
-const findNodeById = (nodes, productId) => {
-  for (let i = 0; i < nodes.length; i++) {
-    if (nodes[i].value === productId) {
-      return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣
-    }
-    if (nodes[i].children && nodes[i].children.length > 0) {
-      const foundNode = findNodeById(nodes[i].children, productId);
-      if (foundNode) {
-        return foundNode.label; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐�
-      }
-    }
+
+// 姝ｇ‘鐨勪骇鍝佸垪琛ㄥ姞杞芥柟娉�
+const loadProductList = async () => {
+  loadingProducts.value = true;
+  try {
+    const res = await productTreeList();
+
+    // 鎵佸钩鍖栧鐞嗕骇鍝佹爲
+    const flattenProducts = (nodes, parentId = null) => {
+      let result = [];
+      nodes.forEach(node => {
+        // 鍙坊鍔犳湁id鍜宭abel鐨勮妭鐐�
+        if (node.id && node.label) {
+          result.push({
+            id: node.id,
+            productName: node.label,
+            parentId: parentId
+          });
+        }
+        // 閫掑綊澶勭悊瀛愯妭鐐�
+        if (node.children) {
+          result = result.concat(flattenProducts(node.children, node.id));
+        }
+      });
+      return result;
+    };
+
+    productList.value = flattenProducts(res.data);
+    console.log('鍔犺浇鐨勪骇鍝佸垪琛�:', productList.value);
+  } catch (error) {
+    console.error('鍔犺浇浜у搧鍒楄〃澶辫触:', error);
+    proxy.$modal.msgError('鍔犺浇浜у搧鍒楄〃澶辫触');
+  } finally {
+    loadingProducts.value = false;
   }
   return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
 };
+
 // 琛ㄦ牸閫夋嫨鏁版嵁
-const handleSelectionChange = (selection) => {
+// const handleSelectionChange = (selection) => {
 
-  // 杩囨护鎺夊瓙鏁版嵁
-  selectedRows.value = selection.filter(item => item.children !== undefined);
-  console.log('selection', selectedRows.value)
-}
-const expandedRowKeys = ref([])
+// 鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
+  const loadProductModels = async (productId) => {
+    if (!productId) {
+      productModelList.value = [];
+      return;
+    }
 
-// 涓昏〃鍚堣鏂规硶
-const summarizeMainTable = (param) => {
-  return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
-};
+    try {
+      const res = await modelListPage({
+        id: productId,
+        current: 1,
+        size: 100
+      });
+
+      productModelList.value = res.data.records.map(item => ({
+        id: item.id,
+        model: item.model,
+        unit: item.unit
+      }));
+
+    } catch (error) {
+      console.error('鍔犺浇瑙勬牸鍨嬪彿澶辫触:', error);
+      proxy.$modal.msgError('鍔犺浇瑙勬牸鍨嬪彿澶辫触');
+    }
+  };
+
+// 浜у搧閫夋嫨鍙樺寲
+  const handleProductChange = (productId) => {
+    form.value.productModelId = null
+    form.value.productrecordId = null
+    resetPurchaseFields()
+    if (productId) {
+      loadProductModels(productId)
+    } else {
+      productModelList.value = []
+    }
+  }
+
+// 瑙勬牸鍨嬪彿閫夋嫨鍙樺寲
+  const handleModelChange = async (modelId) => {
+    if (!form.value.productId || !modelId) return
+
+    try {
+      // 鏍规嵁浜у搧ID鍜屽瀷鍙稩D鏌ヨ閲囪喘璁板綍
+      const res = await getPurchaseRecords({
+        productId: form.value.productId,
+        productModelId: form.value.productModelId,
+        type: 2 // 鍋囪2琛ㄧず宸叉壒鍑嗙殑閲囪喘璁板綍
+      })
+
+      purchaseRecords.value = res.data.records
+
+      if (purchaseRecords.value.length > 0) {
+        // 榛樿鍙栫涓�鏉￠噰璐褰�
+        const record = purchaseRecords.value[0]
+        fillFormFromPurchaseRecord(record)
+      }
+    } catch (error) {
+      console.error('鏌ヨ閲囪喘璁板綍澶辫触:', error)
+      proxy.$modal.msgError('鏌ヨ閲囪喘璁板綍澶辫触')
+    }
+  }
+
+// 浠庨噰璐褰曞～鍏呰〃鍗�
+  const fillFormFromPurchaseRecord = (record) => {
+    form.value.productrecordId = record.id
+    form.value.taxInclusiveUnitPrice = record.taxInclusiveUnitPrice
+    form.value.taxRate = record.taxRate
+    form.value.taxInclusiveTotalPrice = record.taxInclusiveTotalPrice
+    form.value.taxExclusiveTotalPrice = record.taxExclusiveTotalPrice
+  }
+
+// 閲嶇疆閲囪喘鐩稿叧瀛楁
+  const resetPurchaseFields = () => {
+    form.value.productrecordId = null
+    form.value.unit = ''
+    form.value.taxInclusiveUnitPrice = null
+    form.value.taxRate = null
+    form.value.taxInclusiveTotalPrice = null
+    form.value.taxExclusiveTotalPrice = null
+  }
+
+  const loadUserList = async () => {
+    try {
+      const res = await userListNoPage()
+      userList.value = res.data
+    } catch (error) {
+      console.error('鍔犺浇鐢ㄦ埛鍒楄〃澶辫触:', error)
+    }
+  }
+
+  const loadSupplierList = async () => {
+    try {
+      const res = await listSupplier()
+      supplierLists.value = res.data.records
+    } catch (error) {
+      console.error('鍔犺浇渚涘簲鍟嗗垪琛ㄥけ璐�:', error)
+    }
+  }
 
 // 鎵撳紑寮规
-const openForm = async (type, row) => {
-  operationType.value = type
-  form.value = {}
-  productData.value = []
-  let userLists = await userListNoPage()
-  userList.value = userLists.data
-  customerList().then(res => {
-    customerOption.value = res
-  })
-  console.log('userStore.id', userStore.id)
-  form.value.entryPerson = userStore.id
-  if (type === 'edit') {
-    currentId.value = row.id;
-    getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => {
-      form.value = { ...res }
-      form.value.entryPerson = Number(res.entryPerson)
-      productData.value = form.value.productData
-    })
+  const openForm = async (type, row) => {
+    operationType.value = type
+    dialogFormVisible.value = true
+    // 鍔犺浇蹇呰鏁版嵁
+    await Promise.all([
+      loadUserList(),
+      loadSupplierList(),
+      loadProductList()
+    ])
+
+    if (type === 'add') {
+      // 鏂板鏃堕噸缃〃鍗�
+      form.value = {
+        userId: userStore.userId // 璁剧疆榛樿鍏ュ簱浜轰负褰撳墠鐢ㄦ埛
+      }
+    } else {
+      // 缂栬緫鏃跺～鍏呰〃鍗曟暟鎹�
+      form.value = {
+        ...row,
+        supplierId: row.supplierId,
+        productId: row.productId,
+        productModelId: row.productModelId,
+        userId: row.userId
+      }
+      if (row.productId) {
+        await loadProductModels(row.productId)
+      }
+    }
   }
-  // let userAll = await userStore.getInfo()
-  // userList.value.forEach(element => {
-  //   if(userAll.user.nickName === element.nickName && userAll.user.userName === element.userName) {
-  //     form.value.entryPerson = userAll.user.userId // 璁剧疆榛樿涓氬姟鍛樹负褰撳墠鐢ㄦ埛
-  //   }
-  // });
-  form.value.entryDate = getCurrentDate() // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
-  dialogFormVisible.value = true
-}
 
 // 鎻愪氦琛ㄥ崟
-const submitForm = () => {
-  proxy.$refs["formRef"].validate(valid => {
-    if (valid) {
-      if (productData.value.length > 0) {
-        form.value.productData = proxy.HaveJson(productData.value)
-      } else {
-        proxy.$modal.msgWarning('璇锋坊鍔犱骇鍝佷俊鎭�')
+  const submitForm = async () => {
+    try {
+      await proxy.$refs.formRef.validate()
+
+      if (!form.value.productrecordId) {
+        proxy.$modal.msgError('璇烽�夋嫨浜у搧澶х被鍜岃鏍煎瀷鍙蜂互鑾峰彇閲囪喘璁板綍')
         return
       }
-      let tempFileIds = []
-      form.value.tempFileIds = tempFileIds
-      form.value.type = 1
-      addOrUpdateSalesLedger(form.value).then(res => {
-        proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
-        closeDia()
-        getList()
-      })
+
+      const submitData = {
+        productrecordId: form.value.productrecordId,
+        supplierId: form.value.supplierId,
+        inboundQuantity: form.value.inboundQuantity,
+        userId: form.value.userId,
+      }
+
+      const apiMethod = operationType.value === 'add' ? addSutockIn : updateStockIn
+      await apiMethod(submitData)
+
+      proxy.$modal.msgSuccess(operationType.value === 'add' ? '鏂板鎴愬姛' : '淇敼鎴愬姛')
+      closeDia()
+      getList()
+    } catch (error) {
+      console.error('鎻愪氦澶辫触:', error)
+      if (!error.errors) {
+        proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯')
+      }
     }
-  })
-}
+  }
 // 鍏抽棴寮规
-const closeDia = () => {
-  proxy.resetForm("formRef")
-  dialogFormVisible.value = false
-}
+  const closeDia = () => {
+    proxy.$refs.formRef.resetFields()
+    dialogFormVisible.value = false
+  }
+// 琛ㄦ牸閫夋嫨鏁版嵁
+  const handleSelectionChange = (selection) => {
+    // 杩囨护鎺夊瓙鏁版嵁
+    selectedRows.value = selection.filter(item => item.id);
+    console.log('selection', selectedRows.value)
+  }
+  const expandedRowKeys = ref([])
+
+// 涓昏〃鍚堣鏂规硶
+  const summarizeMainTable = (param) => {
+    return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
+  };
 
 // 瀵煎嚭
-const handleOut = () => {
-  ElMessageBox.confirm(
-    '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
-    '瀵煎嚭', {
-    confirmButtonText: '纭',
-    cancelButtonText: '鍙栨秷',
-    type: 'warning',
-  }
-  ).then(() => {
-    proxy.download("/sales/ledger/export", {}, '鍏ュ簱鍙拌处.xlsx')
-  }).catch(() => {
-    proxy.$modal.msg("宸插彇娑�")
-  })
-}
-// 鍒犻櫎
-const handleDelete = () => {
-  let ids = []
-  if (selectedRows.value.length > 0) {
-    ids = selectedRows.value.map(item => item.id);
-  } else {
-    proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
-    return
-  }
-  ElMessageBox.confirm(
-    '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
-    '瀵煎嚭', {
-    confirmButtonText: '纭',
-    cancelButtonText: '鍙栨秷',
-    type: 'warning',
-  }
-  ).then(() => {
-    delLedger(ids).then(res => {
-      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
-      getList()
+  const handleOut = () => {
+    ElMessageBox.confirm(
+        '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
+        '瀵煎嚭', {
+          confirmButtonText: '纭',
+          cancelButtonText: '鍙栨秷',
+          type: 'warning',
+        }
+    ).then(() => {
+      proxy.download("/stockin/export", {}, '鍏ュ簱鍙拌处.xlsx')
+    }).catch(() => {
+      proxy.$modal.msg("宸插彇娑�")
     })
-  }).catch(() => {
-    proxy.$modal.msg("宸插彇娑�")
+  }
+// 鍒犻櫎
+  const handleDelete = () => {
+    let ids = []
+    if (selectedRows.value.length > 0) {
+      ids = selectedRows.value.map(item => item.id);
+    } else {
+      proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
+      return
+    }
+    ElMessageBox.confirm(
+        '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
+        '瀵煎嚭', {
+          confirmButtonText: '纭',
+          cancelButtonText: '鍙栨秷',
+          type: 'warning',
+        }
+    ).then(() => {
+      delStockIn(ids).then(res => {
+        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+        getList()
+      })
+    }).catch(() => {
+      proxy.$modal.msg("宸插彇娑�")
+    })
+  }
+
+// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+  function getCurrentDate() {
+    const today = new Date();
+    const year = today.getFullYear();
+    const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
+    const day = String(today.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  }
+
+  const productSelectedRows = ref([])
+  const productSelected = (selectedRows) => {
+    productSelectedRows.value = selectedRows;
+  };
+
+  const formattedNumber = (row, column, cellValue) => {
+    return parseFloat(cellValue).toFixed(2);
+  };
+  onMounted(() => {
+    getList()
   })
 }
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-function getCurrentDate() {
-  const today = new Date();
-  const year = today.getFullYear();
-  const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
-  const day = String(today.getDate()).padStart(2, '0');
-  return `${year}-${month}-${day}`;
-}
-
-const productSelectedRows = ref([])
-const productSelected = (selectedRows) => {
-  productSelectedRows.value = selectedRows;
-};
-
-const formattedNumber = (row, column, cellValue) => {
-  return parseFloat(cellValue).toFixed(2);
-};
-onMounted(() => {
-  getList()
-})
 </script>
 
 <style scoped lang="scss"></style>

--
Gitblit v1.9.3