From 325e771ebdbe407f4c098531aae0c7e20cefc1a0 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 15 一月 2026 14:44:41 +0800
Subject: [PATCH] Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津军泰伟业

---
 src/views/inventoryManagement/receiptManagement/index.vue |  819 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 499 insertions(+), 320 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index bfe6200..577e0f3 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -1,359 +1,538 @@
 <template>
   <div class="app-container">
-    <div class="search_form">
-      <div>
-        <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
-        <el-input v-model="searchForm.customerName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
-          clearable prefix-icon="Search" />
-        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
-      </div>
-      <div>
-        <el-button type="primary" @click="openForm('add')">鏂板鍏ュ簱</el-button>
-        <el-button @click="handleOut">瀵煎嚭</el-button>
-        <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
-      </div>
-    </div>
-    <div class="table_list">
-      <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
-        :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"
-        :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="100" show-overflow-tooltip />
-        <el-table-column label="鍏ュ簱浜�" prop="executionDate" 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>
-          </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="salesContractNo">
-              <el-input v-model="form.salesContractNo" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="浜у搧澶х被锛�" prop="salesman">
-              <el-select v-model="form.salesman" placeholder="璇烽�夋嫨" clearable>
-                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
-                  :value="item.nickName" />
-              </el-select>
-            </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.customerContractNo" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鍗曚綅锛�" prop="customerId">
-              <el-input v-model="form.customerContractNo" 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.entryDate" 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.customerContractNo" 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.customerContractNo" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鍚◣鍗曚环锛�" prop="customerId">
-              <el-input v-model="form.customerContractNo" 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.customerContractNo" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="绋庣巼锛�" prop="customerId">
-              <el-input v-model="form.customerContractNo" 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.customerContractNo" placeholder="璇疯緭鍏�" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="鍏ュ簱浜猴細" prop="entryPerson">
-              <el-select v-model="form.entryPerson" 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>
+    <el-tabs v-model="activeTab"
+             @tab-change="handleTabChange">
+      <el-tab-pane label="鎴愬搧鍏ュ簱"
+                   name="production">
+        <div class="search_form">
+          <div>
+            <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"/>
+            <span class="search_title ml10">浜у搧澶х被锛�</span>
+            <el-input v-model="searchForm.productCategory"
+                      style="width: 240px"
+                      placeholder="璇疯緭鍏�"
+                      clearable/>
+            <el-button type="primary"
+                       @click="handleQuery"
+                       style="margin-left: 10px">鎼滅储
+            </el-button>
+          </div>
+          <div>
+            <el-button @click="handleOut">瀵煎嚭</el-button>
+            <el-button type="danger"
+                       plain
+                       @click="handleDelete">鍒犻櫎
+            </el-button>
+          </div>
         </div>
-      </template>
-    </el-dialog>
+        <div class="table_list">
+          <el-table :data="tableData"
+                    border
+                    v-loading="tableLoading"
+                    @selection-change="handleSelectionChange"
+                    :expand-row-keys="expandedRowKeys"
+                    :row-key="row => row.id"
+                    show-summary
+                    style="width: 100%"
+                    :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="createTime"
+                             show-overflow-tooltip/>
+            <el-table-column label="閿�鍞悎鍚屽彿"
+                             prop="salesContractNo"
+                             width="180"
+                             show-overflow-tooltip/>
+            <el-table-column label="浜у搧澶х被"
+                             prop="productCategory"
+                             show-overflow-tooltip/>
+            <el-table-column label="瑙勬牸鍨嬪彿"
+                             prop="specificationModel"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍗曚綅"
+                             prop="unit"
+                             width="70"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍏ュ簱鏁伴噺"
+                             prop="inboundNum"
+                             width="100"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍗曚环(鍏�)"
+                             prop="unitPrice"
+                             width="150"></el-table-column>
+            <el-table-column label="鎬讳环(鍏�)"
+                             prop="totalPrice"
+                             width="150"></el-table-column>
+            <!-- <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, 'production');">缂栬緫</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-tab-pane>
+      <el-tab-pane label="鍘熸枡鍏ュ簱"
+                   name="purchase">
+        <div class="search_form">
+          <div>
+            <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"/>
+            <span class="search_title ml10">浜у搧澶х被锛�</span>
+            <el-input v-model="searchForm.productCategory"
+                      style="width: 240px"
+                      placeholder="璇疯緭鍏�"
+                      clearable/>
+            <el-button type="primary"
+                       @click="handleQuery"
+                       style="margin-left: 10px">鎼滅储
+            </el-button>
+          </div>
+          <div>
+            <el-button type="primary"
+                       @click="openForm('add', 'purchase')">鏂板鍏ュ簱
+            </el-button>
+            <el-button @click="handleOut">瀵煎嚭</el-button>
+            <el-button type="danger"
+                       plain
+                       @click="handleDelete">鍒犻櫎
+            </el-button>
+          </div>
+        </div>
+        <div class="table_list">
+          <el-table :data="tableData"
+                    border
+                    v-loading="tableLoading"
+                    @selection-change="handleSelectionChange"
+                    :expand-row-keys="expandedRowKeys"
+                    :row-key="row => row.id"
+                    show-summary
+                    style="width: 100%"
+                    :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="createTime"
+                             width="100"
+                             show-overflow-tooltip/>
+            <el-table-column label="閲囪喘鍚堝悓鍙�"
+                             prop="purchaseContractNumber"
+                             width="180"
+                             show-overflow-tooltip/>
+            <el-table-column label="渚涘簲鍟嗗悕绉�"
+                             prop="supplierName"
+                             width="240"
+                             show-overflow-tooltip/>
+            <el-table-column label="浜у搧澶х被"
+                             prop="productCategory"
+                             show-overflow-tooltip/>
+            <el-table-column label="瑙勬牸鍨嬪彿"
+                             prop="specificationModel"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍗曚綅"
+                             prop="unit"
+                             width="70"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍏ュ簱鏁伴噺"
+                             prop="inboundNum"
+                             width="100"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍚◣鍗曚环(鍏�)"
+                             prop="taxInclusiveUnitPrice"
+                             width="150"></el-table-column>
+            <el-table-column label="鍚◣鎬讳环(鍏�)"
+                             prop="taxInclusiveTotalPrice"
+                             width="150"></el-table-column>
+            <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
+                           :disabled="scope.row.type == 1"
+                           type="primary"
+                           size="small"
+                           @click="openForm('edit', scope.row, 'purchase');">缂栬緫
+                </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-tab-pane>
+      <el-tab-pane label="鐢熶骇鍏ュ簱"
+                   name="product">
+        <div class="search_form">
+          <div>
+            <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"/>
+            <span class="search_title ml10">浜у搧澶х被锛�</span>
+            <el-input v-model="searchForm.productCategory"
+                      style="width: 240px"
+                      placeholder="璇疯緭鍏�"
+                      clearable/>
+            <el-button type="primary"
+                       @click="handleQuery"
+                       style="margin-left: 10px">鎼滅储
+            </el-button>
+          </div>
+          <div>
+            <el-button type="primary"
+                       @click="openForm('add', 'purchase')">鏂板鍏ュ簱
+            </el-button>
+            <el-button @click="handleOut">瀵煎嚭</el-button>
+            <el-button type="danger"
+                       plain
+                       @click="handleDelete">鍒犻櫎
+            </el-button>
+          </div>
+        </div>
+        <div class="table_list">
+          <el-table :data="tableData"
+                    border
+                    v-loading="tableLoading"
+                    @selection-change="handleSelectionChange"
+                    :expand-row-keys="expandedRowKeys"
+                    :row-key="row => row.id"
+                    show-summary
+                    style="width: 100%"
+                    :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="createTime"
+                             width="100"
+                             show-overflow-tooltip/>
+            <el-table-column label="浜у搧澶х被"
+                             prop="productCategory"
+                             show-overflow-tooltip/>
+            <el-table-column label="瑙勬牸鍨嬪彿"
+                             prop="specificationModel"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍗曚綅"
+                             prop="unit"
+                             width="220"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍏ュ簱鏁伴噺"
+                             prop="inboundNum"
+                             width="220"
+                             show-overflow-tooltip/>
+            <el-table-column label="鍏ュ簱浜�"
+                             prop="createBy"
+                             width="220"
+                             show-overflow-tooltip/>
+          </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-tab-pane>
+    </el-tabs>
+    <form-dia ref="formDia"
+              @close="handleQuery"
+              @success="handleQuery"></form-dia>
+    <form-dia-product ref="formDiaProduct"
+                      @close="handleQuery"
+                      @success="handleQuery"></form-dia-product>
   </div>
 </template>
 
 <script setup>
-import pagination from '@/components/PIMTable/Pagination.vue'
-import { ref } from 'vue'
-import { ElMessageBox } from "element-plus";
-import useUserStore from '@/store/modules/user'
-import { userListNoPage } from "@/api/system/user.js";
+import pagination from "@/components/PIMTable/Pagination.vue";
 import {
-  ledgerListPage,
-  customerList,
-  addOrUpdateSalesLedger,
-  getSalesLedgerWithProducts, delLedger
-} from "@/api/salesManagement/salesLedger.js";
-const userStore = useUserStore()
-const { proxy } = getCurrentInstance()
-const tableData = ref([])
-const productData = ref([])
-const selectedRows = ref([])
-const userList = ref([])
-const customerOption = ref([])
-const tableLoading = ref(false)
+  ref,
+  reactive,
+  toRefs,
+  onMounted,
+  getCurrentInstance,
+  nextTick,
+} from "vue";
+import {ElMessageBox} from "element-plus";
+import useUserStore from "@/store/modules/user";
+import dayjs from "dayjs";
+import {
+  getStockInPage,
+  getStockInPageByProduction,
+  getStockInPageByProductProduction,
+  delStockIn,
+} from "@/api/inventoryManagement/stockIn.js";
+import FormDia from "./components/formDia.vue";
+import FormDiaProduct from "./components/formDiaProduct.vue";
+
+// 鑾峰彇褰撳墠鏃ユ湡
+function getCurrentDate() {
+  return dayjs().format("YYYY-MM-DD");
+}
+
+const {proxy} = getCurrentInstance();
+
+const tableData = ref([]);
+const selectedRows = ref([]);
+const tableLoading = ref(false);
+const formDia = ref();
+const formDiaProduct = ref();
+const activeTab = ref("production"); // 褰撳墠婵�娲荤殑 tab
+
 const page = reactive({
   current: 1,
   size: 100,
-})
-const total = ref(0)
-const fileList = ref([])
+});
+const total = ref(0);
 
-// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
-const operationType = ref('')
-const dialogFormVisible = ref(false)
 const data = reactive({
   searchForm: {
-    customerName: '',
+    supplierName: "",
+    customerName: "",
+    productCategory: "",
+    timeStr: "",
   },
-  form: {
-    salesContractNo: '',
-    salesman: '',
-    customerContractNo: '',
-    customerId: '',
-    projectName: '',
-    entryPerson: '',
-    entryDate: '',
-    maintenanceTime: '',
-    productData: [],
-    executionDate: ''
-  },
-  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" }],
-  }
-})
-const { searchForm, form, rules } = toRefs(data)
-
+});
+const {searchForm} = toRefs(data);
 // 鏌ヨ鍒楄〃
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 const handleQuery = () => {
-  page.current = 1
-  getList()
-}
-const paginationChange = (obj) => {
+  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 => {
-    tableLoading.value = false
-    tableData.value = res.records
-    tableData.value.map(item => {
-      item.children = []
-    })
-    total.value = res.total
-  }).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; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐�
-      }
-    }
-  }
-  return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
+  getList();
 };
-// 琛ㄦ牸閫夋嫨鏁版嵁
-const handleSelectionChange = (selection) => {
+const pageProductChange = obj => {
+  page.current = obj.page;
+  page.size = obj.limit;
+  getList();
+};
+const getList = () => {
+  tableLoading.value = true;
+  const params = {...page};
 
-  // 杩囨护鎺夊瓙鏁版嵁
-  selectedRows.value = selection.filter(item => item.children !== undefined);
-  console.log('selection', selectedRows.value)
-}
-const expandedRowKeys = ref([])
+  // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷浼犻�掍笉鍚岀殑鏌ヨ鍙傛暟
+  if (activeTab.value === "production") {
+    params.customerName = searchForm.value.customerName;
+    params.timeStr = searchForm.value.timeStr;
+  } else {
+    params.supplierName = searchForm.value.supplierName;
+    params.timeStr = searchForm.value.timeStr;
+  }
+  params.productCategory = searchForm.value.productCategory;
+  if (activeTab.value === "production") {
+    getStockInPageByProductProduction(params)
+        .then(res => {
+          tableLoading.value = false;
+          tableData.value = res.data.records;
+        });
 
-// 涓昏〃鍚堣鏂规硶
-const summarizeMainTable = (param) => {
-  return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
+  }else {
+    // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
+    const apiCall =
+        activeTab.value === "production"
+            ? getStockInPageByProduction(params)
+            : getStockInPage(params);
+
+    apiCall
+        .then(res => {
+          tableLoading.value = false;
+          tableData.value = res.data.records;
+
+          // 鍓嶇璁$畻鎬讳环锛氭�讳环 = unitPrice * inboundNum
+          tableData.value = tableData.value.map(item => {
+            // 浣跨敤鍏ュ簱鏁伴噺璁$畻鎬讳环
+            const inboundNum = Number(item.inboundNum) || 0;
+            const unitPrice = Number(item.unitPrice) || 0;
+            const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
+
+            // 鏍规嵁鏍囩椤电被鍨嬭绠椾笉鍚岀殑鎬讳环
+            if (activeTab.value === "production") {
+              // 鎴愬搧搴撳瓨锛氭�讳环 = unitPrice * 鍏ュ簱鏁伴噺
+              item.totalPrice = (unitPrice * inboundNum).toFixed(2);
+            } else {
+              // 鍘熸枡鍜屾潗鏂欏簱瀛橈細鍚◣鎬讳环 = taxInclusiveUnitPrice * 鍏ュ簱鏁伴噺
+              item.taxInclusiveTotalPrice = (
+                  taxInclusiveUnitPrice * inboundNum
+              ).toFixed(2);
+            }
+
+            return item;
+          });
+
+          total.value = res.data.total;
+        })
+        .catch(() => {
+          tableLoading.value = false;
+        });
+  }
+
+};
+
+// 鍒囨崲 tab
+const handleTabChange = tabName => {
+  page.current = 1;
+  // 鍒囨崲 tab 鏃舵竻绌烘悳绱㈡潯浠�
+  searchForm.value.supplierName = "";
+  searchForm.value.customerName = "";
+  searchForm.value.timeStr = "";
+  searchForm.value.productCategory = "";
+  getList();
 };
 
 // 鎵撳紑寮规
-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
-      fileList.value = form.value.salesLedgerFiles
-    })
-  }
-  // 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('璇锋坊鍔犱骇鍝佷俊鎭�')
-        return
-      }
-      let tempFileIds = []
-      if (fileList.value.length > 0) {
-        tempFileIds = fileList.value.map(item => item.tempId)
-      }
-      form.value.tempFileIds = tempFileIds
-      form.value.type = 1
-      addOrUpdateSalesLedger(form.value).then(res => {
-        proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
-        closeDia()
-        getList()
-      })
+const openForm = async (type, row, tabType) => {
+  const currentTab = tabType || activeTab.value;
+  await nextTick(() => {
+    if (currentTab === "production") {
+      formDiaProduct.value?.openDialog(type, row);
+    } else {
+      formDia.value?.openDialog(type, row);
     }
-  })
-}
-// 鍏抽棴寮规
-const closeDia = () => {
-  proxy.resetForm("formRef")
-  dialogFormVisible.value = false
-}
+  });
+};
+
+// 琛ㄦ牸閫夋嫨鏁版嵁
+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("/sales/ledger/export", {}, '鍏ュ簱鍙拌处.xlsx')
-  }).catch(() => {
-    proxy.$modal.msg("宸插彇娑�")
+  ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+    confirmButtonText: "纭",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
   })
-}
+      .then(() => {
+        // 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
+        let exportUrl = "/stockin/export";
+        if (activeTab.value === "production") {
+          exportUrl = "/stockin/exportOne";
+        }
+        proxy.download(exportUrl, {}, "鍏ュ簱鍙拌处.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
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+    return;
   }
-  ElMessageBox.confirm(
-    '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�',
-    '瀵煎嚭', {
-    confirmButtonText: '纭',
-    cancelButtonText: '鍙栨秷',
-    type: 'warning',
-  }
-  ).then(() => {
-    delLedger(ids).then(res => {
-      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
-      getList()
-    })
-  }).catch(() => {
-    proxy.$modal.msg("宸插彇娑�")
+  const ids = selectedRows.value.map(item => item.id);
+
+  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
+    confirmButtonText: "纭",
+    cancelButtonText: "鍙栨秷",
+    type: "warning",
   })
-}
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� 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}`;
-}
+      .then(() => {
+        // 鏍规嵁褰撳墠 tab 绫诲瀷閫夋嫨涓嶅悓鐨勫垹闄ゆ帴鍙e拰type鍙傛暟
+        let deleteApi, deleteParams;
+
+        if (activeTab.value === "production") {
+          // 鎴愬搧鍒犻櫎锛宼ype浼�2
+          deleteApi = delStockIn;
+          deleteParams = {ids, type: 2};
+        } else {
+          // 鍘熸枡鍒犻櫎锛宼ype浼�1
+          deleteApi = delStockIn;
+          deleteParams = {ids, type: 1};
+        }
+
+        deleteApi(deleteParams)
+            .then(() => {
+              proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+              getList();
+            })
+            .catch(() => {
+              proxy.$modal.msgError("鍒犻櫎澶辫触");
+            });
+      })
+      .catch(() => {
+        proxy.$modal.msg("宸插彇娑�");
+      });
+};
+
 onMounted(() => {
-  getList()
-})
+  getList();
+});
 </script>
 
 <style scoped lang="scss"></style>
+
+
+

--
Gitblit v1.9.3