From fd3e3b19aaf23c4f68d8b98d514499510b152e39 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期五, 11 七月 2025 15:54:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- src/views/inventoryManagement/stockManagement/index.vue | 136 ++++++++++++++++++++++++--------------------- 1 files changed, 73 insertions(+), 63 deletions(-) diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue index 452f945..612dbc4 100644 --- a/src/views/inventoryManagement/stockManagement/index.vue +++ b/src/views/inventoryManagement/stockManagement/index.vue @@ -8,7 +8,7 @@ <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 type="primary" @click="openForm('add')">鏂板</el-button> --> <el-button @click="handleOut">瀵煎嚭</el-button> <el-button type="danger" plain @click="handleDelete">鍒犻櫎</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="boundTime" width="100" show-overflow-tooltip /> - <el-table-column label="鍏ュ簱鏃ユ湡" prop="inboundTime" width="100" 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="100" show-overflow-tooltip /> + <el-table-column label="搴撳瓨鏃ユ湡" prop="createTime" width="100" show-overflow-tooltip /> + <el-table-column label="鍏ュ簱鏃ユ湡" prop="createTime" width="100" 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="80" show-overflow-tooltip /> - <el-table-column label="鍑哄簱鏁伴噺" prop="stockQuantity" width="100" show-overflow-tooltip /> + <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum0" width="100" 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="100" 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> @@ -40,20 +40,20 @@ <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%" + <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="supplierName"> - <el-input v-model="form.supplierName" placeholder="璇疯緭鍏�" clearable /> + <el-input disabled v-model="form.supplierName" placeholder="璇疯緭鍏�" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="浜у搧澶х被锛�" prop="productId"> - <el-select v-model="form.productId" placeholder="璇烽�夋嫨" clearable filterable @change="handleProductChange"> + <el-select disabled v-model="form.productCategory" placeholder="璇烽�夋嫨" clearable filterable @change="handleProductChange"> <el-option v-for="item in productList" :key="item.id" :label="item.productName" - :value="item.id" /> + :value="item.productName" /> </el-select> </el-form-item> </el-col> @@ -61,7 +61,7 @@ <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productManageId"> - <el-select v-model="form.productModelId" placeholder="璇峰厛閫夋嫨浜у搧澶х被" clearable filterable :disabled="!form.productId" + <el-select disabled v-model="form.specificationModel" placeholder="璇峰厛閫夋嫨浜у搧澶х被" clearable filterable :disabled="!form.productCategory" @change="handleModelChange"> <el-option v-for="item in productModelList" :key="item.id" :label="item.model" :value="item.id" /> @@ -69,65 +69,56 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鍗曚綅锛�" prop="customerId"> - <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable /> + <el-form-item label="鍗曚綅锛�" prop="customerId"> + <el-input disabled 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.boundTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD" + <el-date-picker style="width: 100%" v-model="form.updateTime" 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="projectName"> - <el-date-picker style="width: 100%" v-model="form.inboundTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD" + <el-date-picker style="width: 100%" v-model="form.createTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="date" 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.stockQuantity" 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 label="鍚◣鍗曚环锛�" prop="customerId"> + <el-input disabled v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable /> </el-form-item> </el-col> - + <el-col :span="12"> + <el-form-item label="鍚◣鎬讳环锛�" prop="customerContractNo"> + <el-input disabled v-model="form.taxInclusiveTotalPrice" 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 label="绋庣巼锛�" prop="customerId"> + <el-input disabled 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-input disabled v-model="form.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable /> </el-form-item> </el-col> + </el-row> + <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="鍑哄簱浜猴細" prop="entryPerson"> - <el-select v-model="form.nickName" placeholder="璇烽�夋嫨" clearable> + <el-select v-model="form.createUser" placeholder="璇烽�夋嫨" clearable> <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" /> </el-select> </el-form-item> @@ -149,19 +140,25 @@ import { ref } from 'vue' import { ElMessageBox } from "element-plus"; import useUserStore from '@/store/modules/user' -import { userListNoPage } from "@/api/system/user.js"; +import { userListNoPageByTenantId } from "@/api/system/user.js"; +import { productTreeList,modelList } from "@/api/basicData/product.js" import { getStockManagePage , updateStockManage, delStockManage, exportStockManage } from "@/api/inventoryManagement/stockManage.js"; +import { + updateManagement +} from "@/api/inventoryManagement/stockIn.js"; const userStore = useUserStore() const { proxy } = getCurrentInstance() const tableData = ref([]) const productData = ref([]) const selectedRows = ref([]) const userList = ref([]) +const productList = ref([]) +const productModelList = ref([]) // const customerOption = ref([]) const tableLoading = ref(false) const page = reactive({ @@ -260,7 +257,7 @@ operationType.value = type form.value = {} productData.value = [] - let userLists = await userListNoPage() + let userLists = await userListNoPageByTenantId() userList.value = userLists.data // customerList().then(res => { // customerOption.value = res @@ -268,13 +265,25 @@ // 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 + form.value = { ...row } + productTreeList().then(res =>{ + productList.value = res + productList.value.forEach(i =>{ + if (i.label === row.productCategory) { + modelList({ id: i.id }).then((res) => { + productModelList.value = res; + }); + } + }) }) + + + // getSalesLedgerWithProducts({ id: row.id, type: 1 }).then(res => { + + // form.value.entryPerson = Number(res.entryPerson) + // productData.value = form.value.productData + // fileList.value = form.value.salesLedgerFiles + // }) } form.value.entryDate = getCurrentDate() // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈� dialogFormVisible.value = true @@ -282,21 +291,22 @@ // 鎻愪氦琛ㄥ崟 const submitForm = () => { + console.log(form.value) 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 => { + // 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 + updateManagement(form.value).then(res => { proxy.$modal.msgSuccess("鎻愪氦鎴愬姛") closeDia() getList() @@ -313,14 +323,14 @@ // 瀵煎嚭 const handleOut = () => { ElMessageBox.confirm( - '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�', + '鏄惁纭瀵煎嚭锛�', '瀵煎嚭', { confirmButtonText: '纭', cancelButtonText: '鍙栨秷', type: 'warning', } ).then(() => { - proxy.download("/stockmanagement/export", {}, '搴撳瓨淇℃伅.xlsx') + proxy.download("/stockin/exportCopy", {}, '搴撳瓨淇℃伅.xlsx') }).catch(() => { proxy.$modal.msg("宸插彇娑�") }) @@ -342,7 +352,7 @@ type: 'warning', } ).then(() => { - delStockManage(ids).then(res => { + delStockManage({ids:ids}).then(res => { proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛") getList() }) -- Gitblit v1.9.3