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 |  429 ++++++++++-------------------------------------------
 1 files changed, 83 insertions(+), 346 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index acf0b68..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>
@@ -41,104 +51,28 @@
         :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.purchaseContractNumber"
-                  placeholder="璇疯緭鍏ュ悎鍚屽彿"
-                  clearable
-                  @change="searchByContractNo"
-                  :disabled="operationType === 'edit'"
-              >
-                <template #append>
-                  <el-button
-                      icon="Search"
-                      @click="searchByContractNo"
-                      :loading="loadingProducts"
-                  />
-                </template>
-              </el-input>
-            </el-form-item>
-        <el-table
-          :data="productList"
-          border
-          v-loading="loadingProducts"
-          @selection-change="handleSelectionChange"
-        >
-          <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="supplierName" width="100" />
-          <el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" />
-          <el-table-column label="寰呭叆搴撴暟閲�" prop="quantity0" width="100" />
-          <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="150">
-            <template #default="scope">
-              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.quantityStock" :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 {
-  getStockInPage,
-  updateStockIn,
-  addSutockIn,
-  delStockIn,
-  selectProductRecordListByPuechaserId
+	getStockInPage,
+	delStockIn,
 } from "@/api/inventoryManagement/stockIn.js";
+import FormDia from './components/formDia.vue'
 
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance()
 
 const tableData = ref([])
 const selectedRows = ref([])
-const userList = ref([])
-
-
-const loading = ref(false);
 const tableLoading = ref(false)
+const formDia = ref()
 
 const page = reactive({
   current: 1,
@@ -146,36 +80,13 @@
 })
 const total = ref(0)
 
-// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref('')// 鎿嶄綔绫诲瀷: 'add' 鎴� 'edit'
-const dialogFormVisible = ref(false)// 寮规鏄剧ず鐘舵��
-const productList = ref([]);// 浜у搧鍒楄〃鏁版嵁
-const loadingProducts = ref(false);// 浜у搧鍔犺浇鐘舵��
-const productSelectedRows = ref([]) // 浜у搧琛ㄦ牸閫変腑琛�
 const data = reactive({
   searchForm: {
     supplierName: '',
+    timeStr: '',
   },
-  form: {
-    id: null,
-    purchaseContractNumber: '', // 閲囪喘璁㈠崟鍙�
-    supplierId: null,       // 渚涘簲鍟咺D
-    supplierName: '',       // 渚涘簲鍟嗗悕绉�
-    inboundTime: '',        // 鍏ュ簱鏃堕棿
-    inboundBatch: '',       // 鍏ュ簱鎵规
-    recorderId: userStore.userId, // 褰曞叆浜篒D
-    recorderName: userStore.name, // 褰曞叆浜哄鍚�
-    entryDate: getCurrentDate(),  // 褰曞叆鏃ユ湡
-    remark: '',             // 澶囨敞
-  },
-  rules: {
-    purchaseContractNumber: [{ required: true, message: "璇疯緭鍏ラ噰璐悎鍚屽彿", trigger: "blur" }],
-    supplierId: [{ required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }],
-    inboundTime: [{ required: true, message: "璇烽�夋嫨鍏ュ簱鏃堕棿", trigger: "change" }],
-    inboundBatch: [{ required: true, message: "璇疯緭鍏ュ叆搴撴壒娆�", trigger: "blur" }]
-  }
 })
-const { searchForm, form, rules } = toRefs(data)
+const { searchForm } = toRefs(data)
 
 // 鏌ヨ鍒楄〃
 /** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -190,262 +101,88 @@
 }
 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
   })
 }
 
-
-// 璋冪敤selectProductRecordListByPuechaserId杩欎釜鏂规硶鏍规嵁鍚堝悓鏌ヨ鍒癷d锛屽啀璋冪敤getProductRecordByhetong杩欎釜鏂规硶鏍规嵁id鏌ヨ鍒颁骇鍝佽鍗曡褰�
-// 鏂板鏍规嵁鍚堝悓鍙锋煡璇骇鍝佽褰曠殑鏂规硶
-const searchByContractNo = async () =>
-{
-  if (!form.value.purchaseContractNumber) {
-    proxy.$modal.msgWarning('璇疯緭鍏ュ悎鍚屽彿')
-    return
-  }
-  try {
-    loadingProducts.value = true
-    // 鏍规嵁鍚堝悓鏌ヨ浜у搧璁板綍
-    const productRes = await selectProductRecordListByPuechaserId({
-      purchaseContractNumber: form.value.purchaseContractNumber
-    });
-    console.log('productRes:', productRes)
-    if (!productRes.data || productRes.data.length === 0) {
-      proxy.$modal.msgWarning('璇ュ悎鍚屼笅娌℃湁浜у搧璁板綍')
-      productList.value = [];
-      return
-    }
-    // 澶勭悊浜у搧鏁版嵁锛屾坊鍔犳湰娆″叆搴撴暟閲忓瓧娈�
-    productList.value = productRes.data.map(item => ({
-      ...item,
-      quantityStock: 0 // 鍒濆鍖栨湰娆″叆搴撴暟閲忎负0
-    }))
-  } catch (error) {
-    console.error('鏌ヨ浜у搧璁板綍澶辫触:', error)
-    proxy.$modal.msgError('鏌ヨ浜у搧璁板綍澶辫触')
-    productList.value = [];
-  } finally {
-    loadingProducts.value = false
-  }
+// 鎵撳紑寮规
+const openForm = async (type, row) => {
+  await nextTick(() => {
+    formDia.value?.openDialog(type, row)
+  })
 }
 
-
-// 鎵撳紑寮规
-  const openForm = async (type, row) => {
-    operationType.value = type
-    dialogFormVisible.value = true
-    selectedRows.value = []
-
-    if (type === 'add') {
-      // 鏂板鏃跺垵濮嬪寲琛ㄥ崟
-      form.value = {
-        id: null,
-        purchaseContractNumber: '',
-        supplierId: null,
-        supplierName: '',
-        inboundTime: '',
-        inboundBatch: '',
-        recorderId: userStore.userId,
-        recorderName: userStore.name,
-        entryDate: getCurrentDate(),
-        remark: ''
-      }
-      productList.value = [] // 娓呯┖浜у搧鍒楄〃
-    } else {
-      form.value = JSON.parse(JSON.stringify(row))
-      try {
-        loadingProducts.value = true
-        // 鏍规嵁鍚堝悓鍙峰姞杞藉搴旂殑浜у搧鍒楄〃锛堝亣璁� getProductByContract 鏄彲鐢ㄦ帴鍙ｏ級
-        const res = await selectProductRecordListByPuechaserId({
-          purchaseContractNumber: form.value.purchaseContractNumber,
-          id: row.id
-        });
-        productList.value = res.data.map(item => ({
-          ...item,
-          quantityStock: row.inboundNum // 濡傛灉宸叉湁鍏ュ簱鏁伴噺鍒欎繚鐣�
-        }))
-        selectedRows.value = productList.value
-      } catch (error) {
-        console.error('鍔犺浇浜у搧澶辫触:', error)
-        proxy.$modal.msgError('鍔犺浇浜у搧澶辫触')
-        productList.value = []
-      } finally {
-        loadingProducts.value = false
-      }
-    }
-  }
-
-  const updatePro = async () => {
-    // 鍑嗗鎻愪氦鏁版嵁
-    // 鍑嗗鎻愪氦鏁版嵁 - 淇敼涓哄悗绔渶瑕佺殑鏍煎紡
-    const stockInData = {
-      id: selectedRows.value[0].recordId,
-      quantityStock: Number(selectedRows.value[0].quantityStock),// 浣跨敤鏂版牸寮忓寲鍑芥暟
-    };
-    await updateStockIn(stockInData)
-    proxy.$modal.msgSuccess('淇敼鍏ュ簱鎴愬姛')
-    closeDia()
-    getList() // 鍒锋柊鍒楄〃
-  }
-
-// 鎻愪氦琛ㄥ崟
-  const submitForm = async () => {
-    // 楠岃瘉鑷冲皯閫夋嫨浜嗕竴涓骇鍝�
-    if (selectedRows.value.length === 0) {
-      proxy.$modal.msgError('璇峰厛鏌ヨ骞堕�夋嫨浜у搧')
-      return
-    }
-    if(operationType.value !== 'add'){
-      await updatePro()
-      return
-    }
-    try {
-      await proxy.$refs.formRef.validate()
-      // 楠岃瘉鍏ュ簱鏁伴噺
-      const invalidProducts = selectedRows.value.filter(
-          product => product.quantityStock <= 0 || product.quantityStock > product.quantity0
-      )
-
-      if (invalidProducts.length > 0) {
-        proxy.$modal.msgError('璇蜂负鎵�鏈変骇鍝佽緭鍏ユ湁鏁堢殑鍏ュ簱鏁伴噺')
-        return
-      }
-
-      // 鍑嗗鎻愪氦鏁版嵁
-      // 鍑嗗鎻愪氦鏁版嵁 - 淇敼涓哄悗绔渶瑕佺殑鏍煎紡
-      const stockInData = {
-        // 鍏ュ簱鍗曞熀鏈俊鎭�
-        ...form.value,
-        inboundTime: formatDateTime(form.value.inboundTime),
-        nickName: userStore.nickName,// 浣跨敤鏂版牸寮忓寲鍑芥暟
-        details: selectedRows.value.map(product => ({
-          id: product.id,
-          inboundQuantity: Number(product.quantityStock)
-        })),
-      };
-      console.log('鍑嗗鎻愪氦鐨勬暟鎹�:', JSON.parse(JSON.stringify(stockInData)));
-      // 璋冪敤API
-      loading.value = true
-      await addSutockIn(stockInData)
-
-      proxy.$modal.msgSuccess('鏂板鍏ュ簱鎴愬姛')
-      closeDia()
-      getList() // 鍒锋柊鍒楄〃
-
-    } catch (error) {
-      console.error('鎻愪氦澶辫触:', error)
-      if (!error.errors) {
-        proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯')
-      }
-    } finally {
-      loading.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 handleSelectionChange = (selection) => {
+  selectedRows.value = selection.filter(item => item.id)
+}
 
-  const expandedRowKeys = ref([])
+const expandedRowKeys = ref([])
 
 // 涓昏〃鍚堣鏂规硶
-  const summarizeMainTable = (param) => {
-    return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
-  };
+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) {
-			// 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
-			const unauthorizedData = selectedRows.value.filter(item => item.createUser !== userStore.id);
-			if (unauthorizedData.length > 0) {
-				proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
-				return;
-			}
-      ids = selectedRows.value.map(item => item.id);
-    } else {
-      proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
-      return
-    }
-    ElMessageBox.confirm(
-        '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
-        '瀵煎嚭', {
-          confirmButtonText: '纭',
-          cancelButtonText: '鍙栨秷',
-          type: 'warning',
-        }
-    ).then(() => {
-      delStockIn({ids:ids}).then(res => {
-        proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
-        getList()
-      })
-    }).catch(() => {
-      proxy.$modal.msg("宸插彇娑�")
-    })
-  }
-
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-// 淇敼涓烘洿閫氱敤鐨勬棩鏈熸椂闂存牸寮忓寲鍑芥暟
-function formatDateTime(date = new Date(), includeTime = true) {
-  const d = new Date(date);
-  const year = d.getFullYear();
-  const month = String(d.getMonth() + 1).padStart(2, '0');
-  const day = String(d.getDate()).padStart(2, '0');
-
-  if (!includeTime) {
-    return `${year}-${month}-${day}`; // 淇濇寔鍘熸湁 getCurrentDate 鍔熻兘
-  }
-
-  // 鏂板鏃堕棿閮ㄥ垎鏍煎紡鍖�
-  const hours = String(d.getHours()).padStart(2, '0');
-  const minutes = String(d.getMinutes()).padStart(2, '0');
-  const seconds = String(d.getSeconds()).padStart(2, '0');
-
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-}
-
-// 淇濇寔鍘熸湁 getCurrentDate 鐨勫吋瀹规��
-function getCurrentDate() {
-  return formatDateTime(new Date(), false);
-}
-
-
-
-
-  onMounted(() => {
-    getList()
+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