From 60a702a3dbcbe6e16a26faab49e66d710d1f8656 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 十一月 2025 14:57:36 +0800
Subject: [PATCH] 湟水峡-销售台账/采购台账，有可能同一个公司不同单子，但是开票登记的时候会一起，一对多或者多对一

---
 src/views/inventoryManagement/receiptManagement/index.vue |  509 +++++++++++---------------------------------------------
 1 files changed, 101 insertions(+), 408 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index ad9a9d8..ba9c7f4 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -5,6 +5,16 @@
         <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
         <el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
           clearable prefix-icon="Search" />
+        <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
+        <el-date-picker
+          v-model="searchForm.timeStr"
+          type="date"
+          placeholder="璇烽�夋嫨鏃ユ湡"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+          clearable
+          @change="handleQuery"
+        />
         <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
       </div>
       <div>
@@ -19,170 +29,64 @@
         :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="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="createTime" width="100" show-overflow-tooltip />
+        <el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" width="160" show-overflow-tooltip />
+        <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" show-overflow-tooltip />
+        <el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
+        <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200" 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="inboundNum" 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 label="鍏ュ簱浜�" prop="createBy" 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>
+            <el-button link type="primary" size="small" @click="openForm('edit', scope.row);" :disabled="scope.row.createUser !== userStore.id">缂栬緫</el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
         :page="page.current" :limit="page.size" @pagination="paginationChange" />
     </div>
-    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍏ュ簱' : '缂栬緫鍏ュ簱'" width="70%"
-      @close="closeDia">
-      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
-        <el-form-item label="閲囪喘璁㈠崟鍙�" prop="salesContractNo">
-              <el-input v-model="form.salesContractNo" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-        <el-table
-          :data="productData"
-          border
-          @selection-change="productSelected"
-        >
-          <el-table-column align="center" type="selection" width="55" />
-          <el-table-column
-            align="center"
-            label="搴忓彿"
-            type="index"
-            width="60"
-          />
-          <el-table-column label="浜у搧澶х被" prop="productCategory" />
-          <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
-          <el-table-column label="鍗曚綅" prop="unit" width="70" />
-          <el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" />
-          <el-table-column label="寰呭叆搴撴暟閲�" prop="quantity0" width="100" />
-          <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="120">
-            <template #default="scope">
-              <el-input v-model="scope.row.quantityStock" type="number" :min="0" :max="scope.row.quantity0" />
-            </template>
-          </el-table-column>
-          <el-table-column label="绋庣巼(%)" prop="taxRate" width="120" />
-          <el-table-column
-            label="鍚◣鍗曚环(鍏�)"
-            prop="taxInclusiveUnitPrice"
-            :formatter="formattedNumber"
-            width="150"
-          />
-          <el-table-column
-            label="鍚◣鎬讳环(鍏�)"
-            prop="taxInclusiveTotalPrice"
-            :formatter="formattedNumber"
-            width="150"
-          />
-          <el-table-column
-            label="涓嶅惈绋庢�讳环(鍏�)"
-            prop="taxExclusiveTotalPrice"
-            :formatter="formattedNumber"
-            width="150"
-          />
-        </el-table>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">纭</el-button>
-          <el-button @click="closeDia">鍙栨秷</el-button>
-        </div>
-      </template>
-    </el-dialog>
+
+    <form-dia ref="formDia" @close="handleQuery" @success="handleQuery"></form-dia>
   </div>
 </template>
 
 <script setup>
 import pagination from '@/components/PIMTable/Pagination.vue'
-import { ref } from 'vue'
+import { ref, reactive, toRefs, onMounted, getCurrentInstance, nextTick } from 'vue'
 import { ElMessageBox } from "element-plus";
 import useUserStore from '@/store/modules/user'
-import { userListNoPage } from "@/api/system/user.js";
 import {
-  getStockInPage,
-  updateStockIn,
-  addSutockIn,
-  delStockIn,
-  exportStockIn
+	getStockInPage,
+	delStockIn,
 } from "@/api/inventoryManagement/stockIn.js";
-import {listSupplier} from "@/api/basicData/supplierManageFile.js";
-import {modelListPage, productTreeList} from "@/api/basicData/product.js";
+import FormDia from './components/formDia.vue'
+
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance()
+
 const tableData = ref([])
 const selectedRows = ref([])
-const userList = 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 formDia = ref()
+
 const page = reactive({
   current: 1,
   size: 100,
 })
 const total = ref(0)
 
-// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref('')
-const dialogFormVisible = ref(false)
 const data = reactive({
   searchForm: {
     supplierName: '',
+    timeStr: '',
   },
-  form: {
-    supplierId: null,
-    supplierName: '',
-    productId: null,
-    productName: '',
-    userId: userStore.userId,
-    nickName: '',
-    model: '',
-    productModelId: null,
-    unit: '',
-    productrecordId: null,
-    taxInclusiveUnitPrice: '',
-    taxInclusiveTotalPrice: '',
-    taxRate: '',
-    taxExclusiveTotalPrice: '',
-    inboundTime: '',
-    inboundBatch: '',
-    inboundQuantity: ''
-  },
-  rules: {
-    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)
+const { searchForm } = toRefs(data)
 
 // 鏌ヨ鍒楄〃
 /** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -190,306 +94,95 @@
   page.current = 1
   getList()
 }
-
 const paginationChange = (obj) => {
   page.current = obj.page;
   page.size = obj.limit;
   getList()
 }
-
 const getList = () => {
   tableLoading.value = true
-  getStockInPage({ ...searchForm.value, ...page }).then(res => {
+  const params = { 
+    ...page,
+    supplierName: searchForm.value.supplierName,
+    timeStr: searchForm.value.timeStr
+  }
+  
+  getStockInPage(params).then(res => {
     tableLoading.value = false
     tableData.value = res.data.records
     total.value = res.data.total
-    console.log('tableData:', tableData.value)
   }).catch(() => {
     tableLoading.value = false
   })
 }
 
-// 姝ｇ‘鐨勪骇鍝佸垪琛ㄥ姞杞芥柟娉�
-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 loadProductModels = async (productId) => {
-    if (!productId) {
-      productModelList.value = [];
-      return;
-    }
-
-    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
-    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)
-      }
-    }
-  }
-
-// 鎻愪氦琛ㄥ崟
-  const submitForm = async () => {
-    try {
-      await proxy.$refs.formRef.validate()
-
-      if (!form.value.productrecordId) {
-        proxy.$modal.msgError('璇烽�夋嫨浜у搧澶х被鍜岃鏍煎瀷鍙蜂互鑾峰彇閲囪喘璁板綍')
-        return
-      }
-
-      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.$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("/stockin/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(() => {
-      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()
+const openForm = async (type, row) => {
+  await nextTick(() => {
+    formDia.value?.openDialog(type, row)
   })
 }
+
+// 琛ㄦ牸閫夋嫨鏁版嵁
+const handleSelectionChange = (selection) => {
+  selectedRows.value = selection.filter(item => item.id)
+}
+
+const expandedRowKeys = ref([])
+
+// 涓昏〃鍚堣鏂规硶
+const summarizeMainTable = (param) => {
+  return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice'])
+}
+
+// 瀵煎嚭
+const handleOut = () => {
+  ElMessageBox.confirm('鏄惁纭瀵煎嚭锛�', '瀵煎嚭', {
+    confirmButtonText: '纭',
+    cancelButtonText: '鍙栨秷',
+    type: 'warning',
+  }).then(() => {
+    proxy.download("/stockin/export", {}, '鍏ュ簱鍙拌处.xlsx')
+  }).catch(() => {
+    proxy.$modal.msg("宸插彇娑�")
+  })
+}
+
+// 鍒犻櫎
+const handleDelete = () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
+    return
+  }
+
+  // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
+  const unauthorizedData = selectedRows.value.filter(item => item.createBy !== userStore.nickName)
+  if (unauthorizedData.length > 0) {
+    proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�")
+    return
+  }
+
+  const ids = selectedRows.value.map(item => item.id)
+  
+  ElMessageBox.confirm('閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�', '鍒犻櫎', {
+    confirmButtonText: '纭',
+    cancelButtonText: '鍙栨秷',
+    type: 'warning',
+  }).then(() => {
+    delStockIn({ ids }).then(() => {
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+      getList()
+    }).catch(() => {
+      proxy.$modal.msgError("鍒犻櫎澶辫触")
+    })
+  }).catch(() => {
+    proxy.$modal.msg("宸插彇娑�")
+  })
+}
+
+onMounted(() => {
+  getList()
+})
 </script>
 
 <style scoped lang="scss"></style>

--
Gitblit v1.9.3