| src/views/consumablesLogistics/dispatchLog/Record.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/consumablesLogistics/receiptManagement/Record.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/consumablesLogistics/stockManagement/New.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/consumablesLogistics/stockManagement/Qualified.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/qualityManagement/rawMaterial/components/formDia.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vite.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/consumablesLogistics/dispatchLog/Record.vue
@@ -72,13 +72,13 @@ show-overflow-tooltip /> <el-table-column label="出库数量" prop="stockOutNum" label="数量" prop="qualitity" show-overflow-tooltip /> <el-table-column label="净重(吨)" prop="netWeight" label="采购员" prop="purchaser" show-overflow-tooltip /> <el-table-column @@ -93,20 +93,7 @@ {{ getRecordType(scope.row.recordType) }} </template> </el-table-column> --> <el-table-column label="车牌" prop="licensePlateNo" show-overflow-tooltip /> <el-table-column label="操作" width="120" align="center"> <template #default="scope"> <el-button type="primary" size="mini" @click="handlePreview(scope.row)">导出过磅单</el-button> </template> </el-table-column> <!-- 不再展示过磅相关字段与导出操作 --> </el-table> <pagination v-show="total > 0" src/views/consumablesLogistics/receiptManagement/Record.vue
@@ -70,24 +70,11 @@ <el-table-column label="单位" prop="unit" show-overflow-tooltip/> <el-table-column label="入库数量" prop="stockInNum" <el-table-column label="数量" prop="qualitity" show-overflow-tooltip/> <el-table-column label="车牌号" prop="licensePlateNo" v-if="type === '0'" show-overflow-tooltip/> <el-table-column label="毛重(吨)" prop="grossWeight" v-if="type === '0'" show-overflow-tooltip/> <el-table-column label="皮重(吨)" prop="tareWeight" v-if="type === '0'" show-overflow-tooltip/> <el-table-column label="净重(吨)" prop="netWeight" v-if="type === '0'" <el-table-column label="采购员" prop="purchaser" show-overflow-tooltip/> <el-table-column label="入库人" prop="createBy" @@ -99,14 +86,6 @@ {{ getRecordType(scope.row.recordType) }} </template> </el-table-column> --> <el-table-column label="过磅日期" prop="weighingDate" v-if="type === '0'" show-overflow-tooltip/> <el-table-column label="过磅员" prop="weighingOperator" v-if="type === '0'" show-overflow-tooltip/> <el-table-column label="操作" width="120" align="center"> src/views/consumablesLogistics/stockManagement/New.vue
@@ -37,85 +37,30 @@ <el-input v-model="formState.unit" disabled /> </el-form-item> <!-- productType === 0：原材料 --> <el-form-item v-if="type === 'qualified' && formState.productType === 0" label="车牌号" prop="licensePlateNo" :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]" > <el-input v-model="formState.licensePlateNo" /> </el-form-item> <el-form-item v-if="type === 'qualified' && formState.productType === 0" label="毛重(吨)" prop="grossWeight" :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]" v-if="type === 'qualified'" label="数量" prop="qualitity" :rules="[{ required: true, message: '请输入数量', trigger: ['blur', 'change'] }]" > <el-input-number v-model="formState.grossWeight" :step="0.01" v-model="formState.qualitity" :min="0" :step="1" :precision="0" style="width: 100%" @change="computeNetWeight" controls-position="right" placeholder="请输入数量" /> </el-form-item> <el-form-item v-if="type === 'qualified' && formState.productType === 0" label="皮重(吨)" prop="tareWeight" :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]" v-if="type === 'qualified'" label="采购员" prop="purchaser" :rules="[{ required: true, message: '请输入采购员', trigger: ['blur', 'change'] }]" > <el-input-number v-model="formState.tareWeight" :step="0.01" :min="0" style="width: 100%" @change="computeNetWeight" /> </el-form-item> <el-form-item v-if="type === 'qualified' && formState.productType === 0" label="净重(吨)" prop="netWeight" :rules="[{ required: true, message: '请先输入毛重和皮重自动计算净重', trigger: ['blur','change'] }]" > <el-input-number v-model="formState.netWeight" :step="0.01" :min="0" style="width: 100%" disabled /> </el-form-item> <el-form-item v-if="type === 'qualified' && formState.productType === 0" label="过磅日期" prop="weighingDate" :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]" > <el-date-picker style="width: 100%" v-model="formState.weighingDate" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择过磅日期" clearable /> </el-form-item> <el-form-item v-if="type === 'qualified' && formState.productType === 0" label="过磅员" prop="weighingOperator" :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]" > <el-input v-model="formState.weighingOperator" /> <el-input v-model="formState.purchaser" placeholder="请输入采购员" /> </el-form-item> <el-form-item label="备注" prop="remark"> @@ -169,13 +114,8 @@ productModelName: "", unit: "", productType: undefined, // 过磅相关字段（仅原材料合格品使用） licensePlateNo: "", grossWeight: undefined, tareWeight: undefined, netWeight: undefined, weighingDate: undefined, weighingOperator: "", qualitity: undefined, purchaser: "", remark: '', }); @@ -193,23 +133,24 @@ let { proxy } = getCurrentInstance() const closeModal = () => { // 重置表单数据 formState.value = { productId: undefined, productModelId: undefined, productName: "", productModelName: "", description: '', unit: "", productType: undefined, qualitity: undefined, purchaser: "", remark: '', }; isShow.value = false; }; // 产品选择处理 const handleProductSelect = async (products) => { formState.value.weighingDate = undefined; formState.value.grossWeight = undefined; formState.value.tareWeight = undefined; formState.value.netWeight = undefined; formState.value.qualitity = undefined; formState.value.purchaser = ""; if (products && products.length > 0) { const product = products[0]; formState.value.productId = product.productId; @@ -221,19 +162,6 @@ showProductSelectDialog.value = false; // 触发表单验证更新 proxy.$refs["formRef"]?.validateField('productModelId'); } }; // 净重 = 毛重 - 皮重 const computeNetWeight = () => { const { grossWeight, tareWeight } = formState.value; if (grossWeight != null && tareWeight != null) { const net = Number(grossWeight) - Number(tareWeight); // 保留两位小数，且不为负 const safeNet = Number(net.toFixed(2)); formState.value.netWeight = safeNet > 0 ? safeNet : 0; } else { formState.value.netWeight = undefined; } };
@@ -27,10 +27,8 @@ <el-table-column label="产品大类" prop="productName" show-overflow-tooltip /> <el-table-column label="规格型号" prop="model" show-overflow-tooltip /> <el-table-column label="单位" prop="unit" show-overflow-tooltip /> <el-table-column label="库存数量" prop="qualitity" show-overflow-tooltip /> <el-table-column label="冻结数量" prop="lockedQuantity" show-overflow-tooltip /> <!-- <el-table-column label="库存预警数量" prop="warnNum" show-overflow-tooltip /> --> <el-table-column label="净重(吨)" prop="netWeight" show-overflow-tooltip /> <el-table-column label="数量" prop="qualitity" show-overflow-tooltip /> <el-table-column label="采购员" prop="purchaser" show-overflow-tooltip /> <el-table-column label="备注" prop="remark" show-overflow-tooltip /> <el-table-column label="最近更新时间" prop="updateTime" show-overflow-tooltip /> <el-table-column fixed="right" label="操作" min-width="60" align="center"> src/views/index.vue
@@ -243,7 +243,7 @@ const barSeries1 = ref([ { name: '原材料不合格数', name: '入厂不合格数', type: 'bar', barGap: 0, emphasis: { @@ -252,7 +252,7 @@ data: [] }, { name: '过程不合格数', name: '车间不合格数', type: 'bar', emphasis: { focus: 'series' @@ -284,7 +284,7 @@ } const barLegend = { show: true, data: ['原材料不合格数', '过程不合格数', '出厂不合格数'] data: ['入厂不合格数', '车间不合格数', '出厂不合格数'] } const barLegend1 = { show: true, src/views/qualityManagement/rawMaterial/components/formDia.vue
@@ -203,6 +203,14 @@ const currentProductId = ref(0); const modelOptions = ref([]); const getTodayStr = () => { const now = new Date(); const y = now.getFullYear(); const m = String(now.getMonth() + 1).padStart(2, "0"); const d = String(now.getDate()).padStart(2, "0"); return `${y}-${m}-${d}`; }; // 打开弹框 const openDialog = async (type, row) => { operationType.value = type; @@ -211,7 +219,7 @@ }) // 先重置表单数据（保持字段完整，避免弹窗首次渲染时触发必填红框“闪一下”） form.value = { checkTime: "", checkTime: getTodayStr(), supplier: "", productName: "", productId: "", vite.config.js
@@ -51,7 +51,7 @@ }, // vite 相关配置 server: { port: 80, port: 8001, host: true, open: true, proxy: {
