| src/views/productionManagement/productionReporting/components/Detail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/productionManagement/productionReporting/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/productionManagement/workOrder/components/CopperPrintingForm.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/productionManagement/workOrder/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/productionManagement/productionReporting/components/Detail.vue
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,52 @@ <script setup lang="ts"> import {computed} from "vue"; defineOptions({ name: "ReportingDetail" }); const props = defineProps({ isShow: { type: Boolean, required: true }, row: { type: Object, default: () => ({}), } }); const visible = computed({ get: () => props.isShow, set: (value: boolean) => emits("update:isShow", value), }); </script> <template> <el-dialog v-model="visible" :title="'详æ '" width="90%"> <el-descriptions title="æ¥å·¥è¯¦æ "> <el-descriptions-item label="æ¥å·¥åå·">{{ row.productNo || '-' }}</el-descriptions-item> <el-descriptions-item label="æ¥å·¥äººå">{{ row.nickName || '-' }}</el-descriptions-item> <el-descriptions-item label="å·¥åº">{{ row.process || '-' }}</el-descriptions-item> <el-descriptions-item label="å·¥åç¼å·">{{ row.workOrderNo || '-' }}</el-descriptions-item> <el-descriptions-item label="产ååç§°">{{ row.salesContractNo || '-' }}</el-descriptions-item> <el-descriptions-item label="产åè§æ ¼åå·">{{ row.productName || '-' }}</el-descriptions-item> <el-descriptions-item label="äº§åºæ°é">{{ row.productModelName || '-' }}</el-descriptions-item> <el-descriptions-item label="æ¥åºæ°é">{{ row.quantity || '-' }}</el-descriptions-item> <el-descriptions-item label="åä½">{{ row.scrapQty || '-' }}</el-descriptions-item> <el-descriptions-item label="å建æ¶é´">{{ row.createTime || '-' }}</el-descriptions-item> </el-descriptions> <template #footer> <span class="dialog-footer"> <el-button @click="visible = false">å ³é</el-button> </span> </template> </el-dialog> </template> <style scoped> </style> src/views/productionManagement/productionReporting/index.vue
@@ -21,7 +21,8 @@ </el-form-item> <el-form-item> <el-button type="primary" @click="handleQuery">æç´¢</el-button> @click="handleQuery">æç´¢ </el-button> </el-form-item> </el-form> </div> @@ -43,6 +44,27 @@ :tableLoading="tableLoading" @pagination="pagination" :total="page.total"> <template #productNoSlot="{ row }"> <el-button v-if="row.process ==='å°é' || row.process ==='å°é¶'" type="primary" link @click="openDetail(row)" > {{ row.productNo }} </el-button> <el-button v-else type="primary" link @click="(row) => { currentReportRowData = row showDetail = true }" > {{ row.productNo }} </el-button> </template> <template #expand="{ row }"> <el-table :data="expandData" border @@ -107,12 +129,14 @@ size="small" @click="changeEditType(scope.row)" v-if="!scope.row.editType" :disabled="scope.row.parentStatus === 3">ç¼è¾</el-button> :disabled="scope.row.parentStatus === 3">ç¼è¾ </el-button> <el-button link type="primary" size="small" @click="saveReceiptPayment(scope.row)" v-if="scope.row.editType">ä¿å</el-button> v-if="scope.row.editType">ä¿å </el-button> </template> </el-table-column> </el-table> @@ -124,6 +148,16 @@ <input-modal v-if="isShowInput" v-model:visible="isShowInput" :production-product-main-id="isShowingId" /> <CopperPrintingForm v-if="copperPrintingFormVisible" v-model:isShow="copperPrintingFormVisible" :isEdit="false" :row="currentReportRowData" @refreshData="getList"/> <Detail v-if="showDetail" v-model:isShow="showDetail" :row="currentReportRowData"/> </div> </template> @@ -139,6 +173,10 @@ import { productionProductMainListPage } from "@/api/productionManagement/productionProductMain.js"; import { userListNoPageByTenantId } from "@/api/system/user.js"; import InputModal from "@/views/productionManagement/productionReporting/Input.vue"; const CopperPrintingForm = defineAsyncComponent(() => import("@/views/productionManagement/workOrder/components/CopperPrintingForm.vue")); const Detail = defineAsyncComponent(() => import("@/views/productionManagement/productionReporting/components/Detail.vue")); const data = reactive({ searchForm: { @@ -156,6 +194,8 @@ label: "æ¥å·¥åå·", prop: "productNo", width: 120, dataType: 'slot', slot: 'productNoSlot', }, { label: "æ¥å·¥äººå", @@ -231,6 +271,7 @@ ], }, ]); const currentReportRowData = ref({}); const tableData = ref([]); const selectedRows = ref([]); const tableLoading = ref(false); @@ -392,6 +433,8 @@ // æå¼æå ¥æ¨¡ææ¡ const isShowInput = ref(false); const copperPrintingFormVisible = ref(false); const showDetail = ref(false); const isShowingId = ref(0); const showInput = row => { isShowInput.value = true; @@ -412,6 +455,10 @@ proxy.$modal.msg("已忶"); }); }; const openDetail = row => { currentReportRowData.value = row; copperPrintingFormVisible.value = true; }; onMounted(() => { getList(); }); src/views/productionManagement/workOrder/components/CopperPrintingForm.vue
@@ -18,10 +18,6 @@ type: Boolean, default: false }, detailData: { type: Object, default: () => ({}), }, row: { type: Object, default: () => ({}), @@ -150,8 +146,8 @@ const initData = () => { if (!props.isEdit) { formData.otherData = JSON.parse(props.detailData.otherData || '{}'); formData.quantity = props.detailData.quantity; formData.otherData = JSON.parse(props.row.otherData || '{}'); formData.quantity = props.row.quantity; } else { const row = props.row; formData.planQuantity = row.planQuantity @@ -174,7 +170,7 @@ <template> <el-dialog v-model="visible" title="å°éæ¥å·¥" :title="isEdit? 'å°éæ¥å·¥' : '详æ '" width="90%"> <el-form :model="formData"> <table class="report-table"> src/views/productionManagement/workOrder/index.vue
@@ -625,7 +625,7 @@ const showReportDialog = row => { currentReportRowData.value = row; if (row.processName === 'å°é') { if (row.processName === 'å°é' || row.processName === 'å°é¶') { copperPrintingFormVisible.value = true return }