| src/views/inventoryManagement/dispatchLog/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/inventoryManagement/issueManagement/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/inventoryManagement/receiptManagement/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/inventoryManagement/stockManagement/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/productionManagement/productionDispatching/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/salesManagement/salesLedger/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/inventoryManagement/dispatchLog/index.vue
@@ -44,7 +44,8 @@ > <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" min-width="120" show-overflow-tooltip /> <el-table-column label="出库日期" prop="createTime" width="120" 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="80" show-overflow-tooltip /> @@ -107,7 +108,8 @@ > <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" min-width="120" show-overflow-tooltip /> <el-table-column label="出库日期" prop="createTime" width="120" show-overflow-tooltip /> <el-table-column label="采购合同号" prop="purchaseContractNumber" 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="80" show-overflow-tooltip /> @@ -170,7 +172,8 @@ > <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="createTime" show-overflow-tooltip width="130"/> <el-table-column label="批次号" prop="code" width="130" 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" show-overflow-tooltip /> @@ -215,7 +218,7 @@ <div v-for="(item, index) in printData" :key="index" class="print-page"> <div class="delivery-note"> <div class="header"> <div class="company-name">鼎诚瑞实业有限责任公司</div> <div class="company-name">海川开心食品有限公司</div> <div class="document-title">零售发货单</div> </div> @@ -658,7 +661,7 @@ <div class="print-page"> <div class="delivery-note"> <div class="header"> <div class="company-name">鼎诚瑞实业有限责任公司</div> <div class="company-name">海川开心食品有限公司</div> <div class="document-title">零售发货单</div> </div>
@@ -4,16 +4,6 @@ <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" @@ -32,15 +22,14 @@ :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" label="序号" type="index" width="60" /> <el-table-column label="入库时间" prop="createTime" width="100" 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="90" show-overflow-tooltip /> <el-table-column label="剩余库存" prop="inboundNum0" width="90" 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(scope.row);">领用</el-button> <el-button link type="primary" size="small" @click="openForm(scope.row);">发货</el-button> </template> </el-table-column> </el-table> @@ -52,16 +41,6 @@ <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" @@ -81,11 +60,10 @@ :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="purchaseContractNumber" 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="90" show-overflow-tooltip /> <el-table-column label="剩余库存" prop="inboundNum0" width="90" 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> @@ -103,16 +81,6 @@ <el-tab-pane label="材料出库" name="manual"> <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" @@ -132,12 +100,11 @@ :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="inboundDate" width="100" show-overflow-tooltip /> <el-table-column label="批次号" prop="code" width="130" 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="itemType" show-overflow-tooltip /> <el-table-column label="入库数量" prop="inboundNum" show-overflow-tooltip /> <el-table-column label="剩余库存" prop="inboundNum0" width="90" show-overflow-tooltip /> <el-table-column fixed="right" label="操作" width="100" align="center"> <template #default="scope"> @@ -150,17 +117,17 @@ </div> </el-tab-pane> </el-tabs> <el-dialog v-model="dialogFormVisible" :title="'新增出库'" width="40%" @close="closeDia"> <el-dialog v-model="dialogFormVisible" :title="getDialogTitle()" width="40%" @close="closeDia"> <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef"> <div>可出库数量:{{currentRowNum}}</div> <el-form-item label="出库数量：" prop="salesContractNo"> <div>{{getAvailableQuantityText()}}:{{currentRowNum}}</div> <el-form-item :label="getQuantityLabel()" prop="salesContractNo"> <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.inboundQuantity" placeholder="请输入" clearable /> </el-form-item> <el-form-item label="出库日期：" prop="projectName"> <el-form-item :label="getDateLabel()" 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-form-item label="出库人：" prop="entryPerson"> <el-form-item :label="getPersonLabel()" prop="entryPerson"> <el-select v-model="form.nickName" filterable default-first-option :reserve-keyword="false" placeholder="请选择" clearable> @@ -427,9 +394,62 @@ const day = String(today.getDate()).padStart(2, '0'); return `${year}-${month}-${day}`; } // 根据tab类型获取弹框标题 const getDialogTitle = () => { const titleMap = { production: '新增发货', purchase: '新增领用', manual: '新增领用' }; return titleMap[activeTab.value] || '新增出库'; }; // 根据tab类型获取可出库数量文本 const getAvailableQuantityText = () => { const textMap = { production: '可发货数量', purchase: '可领用数量', manual: '可领用数量' }; return textMap[activeTab.value] || '可出库数量'; }; // 根据tab类型获取数量字段标签 const getQuantityLabel = () => { const labelMap = { production: '发货数量：', purchase: '领用数量：', manual: '领用数量：' }; return labelMap[activeTab.value] || '出库数量：'; }; // 根据tab类型获取日期字段标签 const getDateLabel = () => { const labelMap = { production: '发货日期：', purchase: '领用日期：', manual: '领用日期：' }; return labelMap[activeTab.value] || '出库日期：'; }; // 根据tab类型获取人员字段标签 const getPersonLabel = () => { const labelMap = { production: '发货人：', purchase: '领用人：', manual: '领用人：' }; return labelMap[activeTab.value] || '出库人：'; }; onMounted(() => { getList() }) </script> <style scoped lang="scss"></style>
@@ -35,6 +35,7 @@ <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 /> @@ -87,6 +88,7 @@ <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 /> @@ -141,6 +143,7 @@ <el-table-column align="center" type="selection" width="55" /> <el-table-column align="center" label="序号" type="index" width="60" /> <el-table-column label="入库时间" prop="inboundDate" width="100" show-overflow-tooltip /> <el-table-column label="批次号" prop="code" width="130" 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 /> src/views/inventoryManagement/stockManagement/index.vue
@@ -36,10 +36,10 @@ <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="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="80" show-overflow-tooltip /> <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip /> <el-table-column label="已出库数量" prop="totalInboundNum" width="100" show-overflow-tooltip /> <el-table-column label="剩余库存" prop="inboundNum0" width="100" show-overflow-tooltip /> <el-table-column label="单价(元)" prop="unitPrice" width="150"></el-table-column> @@ -90,10 +90,10 @@ <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="productCategory" show-overflow-tooltip /> <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip /> <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip /> <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip /> <el-table-column label="已出库数量" prop="totalInboundNum" show-overflow-tooltip /> <el-table-column label="剩余库存" prop="inboundNum0" show-overflow-tooltip /> <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" width="150"></el-table-column> @@ -139,11 +139,11 @@ <el-table-column align="center" type="selection" width="55" /> <el-table-column align="center" label="序号" type="index" width="60" /> <el-table-column label="入库日期" prop="inboundDate" width="100" show-overflow-tooltip /> <el-table-column label="批次号" prop="code" width="130" 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="80" show-overflow-tooltip /> <el-table-column label="物品类型" prop="itemType" width="120" show-overflow-tooltip /> <el-table-column label="入库数量" prop="inboundNum" width="100" show-overflow-tooltip /> <el-table-column label="已出库数量" prop="totalInboundNum" width="100" show-overflow-tooltip /> <el-table-column label="剩余库存" prop="inboundNum0" width="100" show-overflow-tooltip /> <el-table-column label="单价(元)" prop="taxInclusiveUnitPrice" width="150"></el-table-column> src/views/productionManagement/productionDispatching/index.vue
@@ -117,21 +117,11 @@ prop: "salesContractNo", width: 220, }, // { // label: "客户合同号", // prop: "customerContractNo", // width: 250, // }, { label: "客户名称", prop: "customerName", width: 250, }, // { // label: "项目名称", // prop: "projectName", // width:300 // }, { label: "产品大类", prop: "productCategory", @@ -145,7 +135,7 @@ { label: "绑定机器", prop: "speculativeTradingName", width: 220, width: 160, }, { label: "单位", @@ -156,6 +146,32 @@ label: "录入日期", prop: "entryDate", width: 120, }, { label: "状态", prop: "status", dataType: "tag", formatType: (params) => { if (params == '生产中') { return "warning"; } else if (params == '未开始') { return "danger"; } else { return "success"; } }, }, { label: "生产进度", prop: "progress", formatData: (cellValue) => { // 如果值为空或undefined，显示空字符串 if (cellValue === null || cellValue === undefined || cellValue === '') { return ''; } // 直接在数字后面添加百分号 return `${cellValue}%`; } }, { label: "数量", @@ -605,3 +621,10 @@ white-space: nowrap; } </style>
@@ -65,6 +65,7 @@ </div> </template> </el-table-column> <el-table-column label="发货日期" prop="shippingDate" width="120" show-overflow-tooltip /> <el-table-column label="录入日期" prop="entryDate" width="120" show-overflow-tooltip /> <el-table-column label="签订日期" prop="executionDate" width="120" show-overflow-tooltip /> <el-table-column fixed="right" label="操作" min-width="200" align="center"> @@ -308,7 +309,7 @@ <div v-for="(item, index) in printData" :key="index" class="print-page"> <div class="delivery-note"> <div class="header"> <div class="company-name">鼎诚瑞实业有限责任公司</div> <div class="company-name">海川开心食品有限公司</div> <div class="document-title">零售发货单</div> </div> @@ -319,12 +320,15 @@ <span class="value">{{ formatDate(item.createTime) }}</span> </div> <div> <span class="label">客户名称：</span> <span class="value">{{ item.customerName || '张爱有' }}</span> <span class="label">发货车牌号：</span> <span class="value">{{ item.shippingCarNumber }}</span> </div> </div> <div class="info-row"> <div> <span class="label">客户名称：</span> <span class="value">{{ item.customerName || '张爱有' }}</span> </div> <span class="label">单号：</span> <span class="value">{{ item.salesContractNo }}</span> </div> @@ -1167,7 +1171,7 @@ <div class="print-page"> <div class="delivery-note"> <div class="header"> <div class="company-name">鼎诚瑞实业有限责任公司</div> <div class="company-name">海川开心食品有限公司</div> <div class="document-title">零售发货单</div> </div>
