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 |  347 +++++++++++----------------------------------------------
 1 files changed, 67 insertions(+), 280 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 2691509..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,380 +29,157 @@
         :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-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="浜у搧鍚嶇О锛�" prop="productId">
-              <el-select v-model="form.productId" placeholder="璇烽�夋嫨" clearable>
-                <el-option v-for="item in productList" :key="item.id" :label="item.productName"
-                           :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productManageId">
-              <el-select v-model="form.productManageId" placeholder="璇烽�夋嫨" clearable>
-                <el-option v-for="item in productmodelList" :key="item.id" :label="item.model"
-                           :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="salesContractNo">
-              <el-select v-model="form.supplierId" placeholder="璇烽�夋嫨" clearable>
-                <el-option v-for="item in supplierLists" :key="item.id" :label="item.supplierName"
-                           :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="浜у搧澶х被锛�" prop="salesman">
-              <el-input v-model="form.productCategory" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-
-          <el-col :span="12">
-            <el-form-item label="鍗曚綅锛�" prop="customerId">
-              <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="鍏ュ簱鏃堕棿锛�" prop="projectName">
-              <el-date-picker style="width: 100%" v-model="form.inboundTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
-                type="date" placeholder="璇烽�夋嫨" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鍏ュ簱鎵规锛�" prop="entryPerson">
-              <el-input v-model="form.inboundBatch" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="鍏ュ簱鏁伴噺锛�" prop="customerContractNo">
-              <el-input v-model="form.inboundQuantity" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鍚◣鍗曚环锛�" prop="customerId">
-              <el-input v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="鍚◣鎬讳环锛�" prop="customerContractNo">
-              <el-input v-model="form.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="绋庣巼锛�" prop="customerId">
-              <el-input v-model="form.taxRate" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="涓嶅惈绋庢�讳环锛�" prop="entryDate">
-              <el-input v-model="form.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鍏ュ簱浜猴細" prop="entryPerson">
-              <el-select v-model="form.nickname" placeholder="璇烽�夋嫨" clearable>
-                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </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 productTree = ref([]);  // 浜у搧鏍戞暟鎹�
-const modelList = ref([]);    // 瑙勬牸鍨嬪彿鍒楄〃
-const currentProductId = ref(null); // 褰撳墠閫変腑鐨勪骇鍝両D
-const loading = ref(false);
 const tableLoading = ref(false)
+const formDia = ref()
+
 const page = reactive({
   current: 1,
   size: 100,
 })
 const total = ref(0)
-// const fileList = ref([])
 
-// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref('')
-const dialogFormVisible = ref(false)
 const data = reactive({
   searchForm: {
     supplierName: '',
+    timeStr: '',
   },
-  form: {
-    productManageId: null,
-    supplierId: null,
-    productId: null,
-    userId: null,
-    supplierName: '',
-    productName: '',
-    model: '',
-    unit: '',
-    inboundTime: '',
-    inboundBatch: '',
-    inboundQuantity: '',
-    taxInclusiveUnitPrice: '',
-    taxInclusiveTotalPrice: '',
-    taxRate: '',
-    taxExclusiveTotalPrice: '',
-    nickname: ''
-  },
-  rules: {
-    supplierName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    productName: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    model: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    inboundTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-    inboundBatch: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    inboundQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    taxInclusiveUnitPrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    taxRate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-    nickname: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
-  }
 })
-const { searchForm, form, rules } = toRefs(data)
-// 3. 鑾峰彇浜у搧鏍戞柟娉�
-const getProductTree = async () => {
-  try {
-    loading.value = true;
-    const res = await productTreeList();
-    productTree.value = res.data; // 鏍规嵁瀹為檯API杩斿洖缁撴瀯璋冩暣
-  } finally {
-    loading.value = false;
-  }
-};
+const { searchForm } = toRefs(data)
 
-// 4. 鑾峰彇瑙勬牸鍨嬪彿鏂规硶
-const getModelList = async (productId) => {
-  try {
-    loading.value = true;
-    const res = await modelListPage({
-      id: productId,
-      current: 1,  // 椤电爜
-      size: 10     // 姣忛〉鏉℃暟
-    });
-    modelList.value = res.data.records; // 鏍规嵁瀹為檯API杩斿洖缁撴瀯璋冩暣
-  } finally {
-    loading.value = false;
-  }
-};
 // 鏌ヨ鍒楄〃
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
   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
-    ttotal.value = res.data.total
+    total.value = res.data.total
   }).catch(() => {
     tableLoading.value = false
   })
 }
-const getProductTreeList = () => {
-  treeLoad.value = true;
-  productTreeList()
-      .then((res) => {
-        list.value = res;  // 灏嗚繑鍥炵殑鏁版嵁璧嬬粰list
-        list.value.forEach((a) => {
-          expandedKeys.value.push(a.label); // 榛樿灞曞紑鎵�鏈夎妭鐐�
-        });
-        treeLoad.value = false;
-      })
-      .catch((err) => {
-        treeLoad.value = false;
-      });
-};
+
+// 鎵撳紑寮规
+const openForm = async (type, row) => {
+  await nextTick(() => {
+    formDia.value?.openDialog(type, row)
+  })
+}
 
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = (selection) => {
-  // 杩囨护鎺夊瓙鏁版嵁
-  selectedRows.value = selection.filter(item => item.id);
-  console.log('selection', selectedRows.value)
+  selectedRows.value = selection.filter(item => item.id)
 }
+
 const expandedRowKeys = ref([])
 
 // 涓昏〃鍚堣鏂规硶
 const summarizeMainTable = (param) => {
-  return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
-};
-
-// 鎵撳紑寮规
-const openForm = async (type, row) => {
-  operationType.value = type
-  dialogFormVisible.value = true
-  let userLists = await userListNoPage()
-  userList.value = userLists.data
-  console.log('userList', userList.value)
-
-  let supplierlists = await listSupplier()
-  supplierLists.value = supplierlists.data.records
-  console.log('supplierList', supplierLists.value)
-
-  await getProductTree();
-
-
-
-
-
-
-  if (type === 'add') {
-    // 鏂板鏃堕噸缃〃鍗�
-    form.value = {
-      nickname: userStore.userId // 璁剧疆榛樿鍏ュ簱浜轰负褰撳墠鐢ㄦ埛
-    }
-  } else {
-    // 缂栬緫鏃跺～鍏呰〃鍗曟暟鎹�
-    form.value = { ...row }
-  }
-  }
-
-// 鎻愪氦琛ㄥ崟
-const submitForm = () => {
-  proxy.$refs["formRef"].validate(valid => {
-    if (valid) {
-      const apiMethod = operationType.value === 'add' ? addSutockIn : updateStockIn
-      apiMethod(form.value).then(res => {
-        proxy.$modal.msgSuccess(operationType.value === 'add' ? "鏂板鎴愬姛" : "淇敼鎴愬姛")
-        closeDia()
-        getList()
-      })
-    }
-  })
-}
-// 鍏抽棴寮规
-const closeDia = () => {
-  proxy.resetForm("formRef")
-  dialogFormVisible.value = false
+  return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice'])
 }
 
 // 瀵煎嚭
 const handleOut = () => {
-  ElMessageBox.confirm(
-    '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�',
-    '瀵煎嚭', {
+  ElMessageBox.confirm('鏄惁纭瀵煎嚭锛�', '瀵煎嚭', {
     confirmButtonText: '纭',
     cancelButtonText: '鍙栨秷',
     type: 'warning',
-  }
-  ).then(() => {
+  }).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 {
+  if (selectedRows.value.length === 0) {
     proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
     return
   }
-  ElMessageBox.confirm(
-    '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
-    '瀵煎嚭', {
+
+  // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
+  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(res => {
+  }).then(() => {
+    delStockIn({ ids }).then(() => {
       proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
       getList()
+    }).catch(() => {
+      proxy.$modal.msgError("鍒犻櫎澶辫触")
     })
   }).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}`;
-}
+
 onMounted(() => {
   getList()
 })

--
Gitblit v1.9.3