From 6b35989783d91899169f89e21a7d3734d8cadc1d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 04 一月 2026 15:19:54 +0800
Subject: [PATCH] 1.海川开心
---
src/views/personnelManagement/payrollManagement/components/formDia.vue | 1
src/views/personnelManagement/payrollManagement/index.vue | 2
src/views/basicData/product/index.vue | 3
src/views/equipmentManagement/measurementEquipment/components/formDia.vue | 1
src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue | 1
src/views/qualityManagement/rawMaterialInspection/index.vue | 1
src/views/qualityManagement/finalInspection/index.vue | 1
src/views/financialManagement/revenueManagement/Modal.vue | 2
src/views/personnelManagement/contractManagement/index.vue | 1
src/views/qualityManagement/processInspection/index.vue | 1
src/views/salesManagement/invoiceLedger/index.vue | 2
src/views/basicData/customerFile/index.vue | 2
src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue | 2
src/views/procurementManagement/invoiceEntry/indexOld.vue | 1
src/views/personnelManagement/contractManagement/components/formDia.vue | 1
src/views/energyManagement/energyPower/components/formDia.vue | 1
src/views/qualityManagement/metricMaintenance/index.vue | 1
src/views/equipmentManagement/ledger/index.vue | 2
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 23 ++++
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue | 1
src/components/ImageUpload/index.vue | 1
src/views/qualityManagement/processInspection/components/formDia.vue | 2
src/views/productionManagement/operationScheduling/components/formDia.vue | 1
src/views/equipmentManagement/repair/Modal/MaintainModal.vue | 2
src/views/customerService/afterSalesHandling/components/formDia.vue | 1
src/views/energyManagement/energyArea/index.vue | 3
src/views/equipmentManagement/repair/Modal/RepairModal.vue | 2
src/views/inventoryManagement/issueManagement/index.vue | 2
src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue | 2
src/views/procurementManagement/procurementLedger/index.vue | 2
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 11 ++
src/views/energyManagement/waterManagement/components/formDia.vue | 1
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 1
src/views/qualityManagement/processInspection/components/filesDia.vue | 1
src/views/collaborativeApproval/approvalProcess/fileList.vue | 2
src/views/inventoryManagement/receiptManagement/components/formDia.vue | 18 ++-
src/views/basicData/supplierManage/index.vue | 2
src/views/customerService/feedbackRegistration/components/formDia.vue | 1
src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue | 1
src/views/personnelManagement/employeeRecord/components/formDia.vue | 1
src/views/productionManagement/productionDispatching/components/formDia.vue | 1
src/views/procurementManagement/paymentEntry/index.vue | 1
src/views/salesManagement/salesLedger/index.vue | 4
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 1
src/views/basicData/product/ImportExcel/index.vue | 2
src/components/HeaderSearch/index.vue | 1
src/views/equipmentManagement/upkeep/Modal/PlanModal.vue | 1
src/views/qualityManagement/processInspection/components/inspectionFormDia.vue | 1
src/views/energyManagement/energyPeriodTime/index.vue | 1
src/views/financialManagement/expenseManagement/Modal.vue | 2
src/views/salesManagement/receiptPayment/index.vue | 1
src/views/monitor/job/index.vue | 2
src/views/qualityManagement/finalInspection/components/formDia.vue | 98 +++++++++++++++----
src/views/equipmentManagement/repair/Form/RepairForm.vue | 3
src/components/RightToolbar/index.vue | 2
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 1
src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue | 1
src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue | 1
src/views/salesManagement/invoiceRegistration/index.vue | 1
src/views/financialManagement/revenueManagement/filesDia.vue | 1
src/views/qualityManagement/finalInspection/components/filesDia.vue | 1
src/views/personnelManagement/dimission/components/formDia.vue | 1
src/views/equipmentManagement/ledger/Modal.vue | 2
src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue | 2
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue | 2
src/views/productionManagement/productionReporting/components/formDia.vue | 1
66 files changed, 191 insertions(+), 51 deletions(-)
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index b57fe69..2451435 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -4,6 +4,7 @@
<el-dialog
v-model="show"
width="600"
+ draggable
@close="close"
:show-close="false"
append-to-body
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 9670c72..7cfb13c 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -36,6 +36,7 @@
v-model="dialogVisible"
title="棰勮"
width="800px"
+ draggable
append-to-body
>
<img
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index e5dae99..d93e398 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -28,7 +28,7 @@
</el-dropdown>
</el-tooltip>
</el-row>
- <el-dialog :title="title" v-model="open" append-to-body>
+ <el-dialog :title="title" v-model="open" append-to-body draggable>
<el-transfer
:titles="['鏄剧ず', '闅愯棌']"
v-model="value"
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index ffa8643..21a565a 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -40,6 +40,7 @@
v-model="dialogFormVisible"
:title="operationType === 'add' ? '鏂板瀹㈡埛淇℃伅' : '缂栬緫瀹㈡埛淇℃伅'"
width="70%"
+ draggable
@close="closeDia"
>
<el-form
@@ -188,6 +189,7 @@
:title="upload.title"
v-model="upload.open"
width="400px"
+ draggable
append-to-body
>
<el-upload
diff --git a/src/views/basicData/product/ImportExcel/index.vue b/src/views/basicData/product/ImportExcel/index.vue
index c25d254..882f523 100644
--- a/src/views/basicData/product/ImportExcel/index.vue
+++ b/src/views/basicData/product/ImportExcel/index.vue
@@ -2,7 +2,7 @@
<el-button type="info" plain icon="Upload" @click="handleImport">
瀵煎叆
</el-button>
- <el-dialog v-model="upload.open" :title="upload.title">
+ <el-dialog v-model="upload.open" :title="upload.title" draggable>
<FileUpload
ref="fileUploadRef"
accept=".xlsx, .xls"
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index 85aefc2..350a704 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -97,7 +97,7 @@
@pagination="pagination"
></PIMTable>
</div>
- <el-dialog v-model="productDia" title="浜у搧" width="400px" @keydown.enter.prevent>
+ <el-dialog v-model="productDia" title="浜у搧" width="400px" @keydown.enter.prevent draggable>
<el-form
:model="form"
label-width="140px"
@@ -128,6 +128,7 @@
<el-dialog
v-model="modelDia"
title="瑙勬牸鍨嬪彿"
+ draggable
width="400px"
@close="closeModelDia"
@keydown.enter.prevent
diff --git a/src/views/basicData/supplierManage/index.vue b/src/views/basicData/supplierManage/index.vue
index 081fd9b..76c8704 100644
--- a/src/views/basicData/supplierManage/index.vue
+++ b/src/views/basicData/supplierManage/index.vue
@@ -42,6 +42,7 @@
v-model="dialogFormVisible"
:title="operationType === 'add' ? '鏂板渚涘簲鍟嗕俊鎭�' : '缂栬緫渚涘簲鍟嗕俊鎭�'"
width="70%"
+ draggable
@close="closeDia"
>
<el-form
@@ -183,6 +184,7 @@
v-model="upload.open"
width="400px"
append-to-body
+ draggable
>
<el-upload
ref="uploadRef"
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 9ff205f..38cf931 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -5,6 +5,7 @@
:title="operationType === 'add' ? '鏂板瀹℃壒娴佺▼' : '缂栬緫瀹℃壒娴佺▼'"
width="700px"
@close="closeDia"
+ draggable
>
<el-form :model="form" label-width="140px" label-position="top" ref="formRef">
<el-row>
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index abbd056..776b102 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -5,6 +5,7 @@
:title="operationType === 'add' ? '鏂板瀹℃壒娴佺▼' : '缂栬緫瀹℃壒娴佺▼'"
width="50%"
@close="closeDia"
+ draggable
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-row>
diff --git a/src/views/collaborativeApproval/approvalProcess/fileList.vue b/src/views/collaborativeApproval/approvalProcess/fileList.vue
index c0055fe..5cc65f1 100644
--- a/src/views/collaborativeApproval/approvalProcess/fileList.vue
+++ b/src/views/collaborativeApproval/approvalProcess/fileList.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialogVisible" title="闄勪欢" width="40%" :before-close="handleClose">
+ <el-dialog v-model="dialogVisible" title="闄勪欢" width="40%" :before-close="handleClose" draggable>
<el-table :data="tableData" border height="40vh">
<el-table-column label="闄勪欢鍚嶇О" prop="name" min-width="400" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
diff --git a/src/views/customerService/afterSalesHandling/components/formDia.vue b/src/views/customerService/afterSalesHandling/components/formDia.vue
index daccaca..f4a91fb 100644
--- a/src/views/customerService/afterSalesHandling/components/formDia.vue
+++ b/src/views/customerService/afterSalesHandling/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="鍞悗澶勭悊"
width="70%"
+ draggable
@close="closeDia"
>
<el-form
diff --git a/src/views/customerService/feedbackRegistration/components/formDia.vue b/src/views/customerService/feedbackRegistration/components/formDia.vue
index 41c8ac6..0221af4 100644
--- a/src/views/customerService/feedbackRegistration/components/formDia.vue
+++ b/src/views/customerService/feedbackRegistration/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="鍞悗鐧昏"
width="70%"
+ draggable
@close="closeDia"
>
<el-form
diff --git a/src/views/energyManagement/energyArea/index.vue b/src/views/energyManagement/energyArea/index.vue
index 63feff8..62b4e42 100644
--- a/src/views/energyManagement/energyArea/index.vue
+++ b/src/views/energyManagement/energyArea/index.vue
@@ -99,7 +99,7 @@
@pagination="pagination"
></PIMTable>
</div>
- <el-dialog v-model="productDia" title="鍖哄煙" width="400px" @keydown.enter.prevent>
+ <el-dialog v-model="productDia" title="鍖哄煙" width="400px" @keydown.enter.prevent draggable>
<el-form
:model="form"
label-width="140px"
@@ -129,6 +129,7 @@
</el-dialog>
<el-dialog
v-model="modelDia"
+ draggable
title="瀛愬尯鍩�"
width="400px"
@close="closeModelDia"
diff --git a/src/views/energyManagement/energyPeriodTime/index.vue b/src/views/energyManagement/energyPeriodTime/index.vue
index 49bb226..fcbfc8b 100644
--- a/src/views/energyManagement/energyPeriodTime/index.vue
+++ b/src/views/energyManagement/energyPeriodTime/index.vue
@@ -60,6 +60,7 @@
</div>
<el-dialog
v-model="dialogFormVisible"
+ draggable
title="鐢ㄧ數鏃舵绠＄悊"
width="70%"
@close="closeDia"
diff --git a/src/views/energyManagement/energyPower/components/formDia.vue b/src/views/energyManagement/energyPower/components/formDia.vue
index 3cb4455..035ac86 100644
--- a/src/views/energyManagement/energyPower/components/formDia.vue
+++ b/src/views/energyManagement/energyPower/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="璁惧鑳借��"
width="70%"
+ draggable
@close="closeDia"
>
<el-form
diff --git a/src/views/energyManagement/waterManagement/components/formDia.vue b/src/views/energyManagement/waterManagement/components/formDia.vue
index bf605ca..536df3b 100644
--- a/src/views/energyManagement/waterManagement/components/formDia.vue
+++ b/src/views/energyManagement/waterManagement/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="鐢ㄦ按璁惧"
width="70%"
+ draggable
@close="closeDia"
>
<el-form
diff --git a/src/views/equipmentManagement/ledger/Modal.vue b/src/views/equipmentManagement/ledger/Modal.vue
index 0cea56c..16166c6 100644
--- a/src/views/equipmentManagement/ledger/Modal.vue
+++ b/src/views/equipmentManagement/ledger/Modal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :title="modalOptions.title" v-model="visible" @close="close">
+ <el-dialog :title="modalOptions.title" v-model="visible" @close="close" draggable>
<Form ref="formRef"></Form>
<template #footer>
<el-button type="primary" @click="sendForm" :loading="loading">
diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index 83512ae..8cdbf32 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -82,7 +82,7 @@
</PIMTable>
</div>
<Modal ref="modalRef" @success="getTableData"></Modal>
- <el-dialog v-model="qrDialogVisible" title="浜岀淮鐮�" width="300px">
+ <el-dialog v-model="qrDialogVisible" title="浜岀淮鐮�" width="300px" draggable>
<div style="text-align:center;">
<img :src="qrCodeUrl" alt="浜岀淮鐮�" style="width:200px;height:200px;" />
<div style="margin:10px 0;">
diff --git a/src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue b/src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue
index 6fd5e71..d4ac2e1 100644
--- a/src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue
+++ b/src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="璁￠噺鍣ㄥ叿"
width="50%"
+ draggable
@close="closeDia"
>
<el-form
diff --git a/src/views/equipmentManagement/measurementEquipment/components/formDia.vue b/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
index 3d48b28..7b6097b 100644
--- a/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
+++ b/src/views/equipmentManagement/measurementEquipment/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="璁￠噺鍣ㄥ叿"
width="50%"
+ draggable
@close="closeDia"
>
<el-form
diff --git a/src/views/equipmentManagement/repair/Form/RepairForm.vue b/src/views/equipmentManagement/repair/Form/RepairForm.vue
index dcd8bc9..6697906 100644
--- a/src/views/equipmentManagement/repair/Form/RepairForm.vue
+++ b/src/views/equipmentManagement/repair/Form/RepairForm.vue
@@ -68,6 +68,7 @@
</template>
<script setup>
+import dayjs from "dayjs";
import useFormData from "@/hooks/useFormData";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
import useUserStore from "@/store/modules/user";
@@ -90,7 +91,7 @@
deviceLedgerId: undefined, // 璁惧Id
deviceName: undefined, // 璁惧鍚嶇О
deviceModel: undefined, // 瑙勬牸鍨嬪彿
- repairTime: undefined, // 鎶ヤ慨鏃ユ湡
+ repairTime: dayjs().format("YYYY-MM-DD"), // 鎶ヤ慨鏃ユ湡锛岄粯璁ゅ綋澶�
repairName: userStore.nickName, // 鎶ヤ慨浜�
remark: undefined, // 鏁呴殰鐜拌薄
status: 0, // 鎶ヤ慨鐘舵��
diff --git a/src/views/equipmentManagement/repair/Modal/MaintainModal.vue b/src/views/equipmentManagement/repair/Modal/MaintainModal.vue
index 309be0e..a578a58 100644
--- a/src/views/equipmentManagement/repair/Modal/MaintainModal.vue
+++ b/src/views/equipmentManagement/repair/Modal/MaintainModal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr">
+ <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr" draggable>
<MaintainForm ref="maintainFormRef" />
<template #footer>
<el-button type="primary" @click="sendForm" :loading="loading">
diff --git a/src/views/equipmentManagement/repair/Modal/RepairModal.vue b/src/views/equipmentManagement/repair/Modal/RepairModal.vue
index 0ae3bbe..c21b47a 100644
--- a/src/views/equipmentManagement/repair/Modal/RepairModal.vue
+++ b/src/views/equipmentManagement/repair/Modal/RepairModal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="visible" :title="modalOptions.title" @close="close">
+ <el-dialog v-model="visible" :title="modalOptions.title" @close="close" draggable>
<RepairForm ref="repairFormRef" :id="id" />
<template #footer>
<el-button type="primary" @click="sendForm" :loading="loading">
diff --git a/src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue b/src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue
index 0afd512..0b44221 100644
--- a/src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue
+++ b/src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr">
+ <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr" draggable>
<MaintenanceForm ref="maintenanceFormRef" />
<template #footer>
<el-button type="primary" @click="sendForm" :loading="loading">
diff --git a/src/views/equipmentManagement/upkeep/Modal/PlanModal.vue b/src/views/equipmentManagement/upkeep/Modal/PlanModal.vue
index 0fb15f2..249c9c3 100644
--- a/src/views/equipmentManagement/upkeep/Modal/PlanModal.vue
+++ b/src/views/equipmentManagement/upkeep/Modal/PlanModal.vue
@@ -3,6 +3,7 @@
v-model="visible"
:title="modalOptions.title"
width="30%"
+ draggable
@close="close"
>
<PlanForm ref="planFormRef" :id="id"></PlanForm>
diff --git a/src/views/financialManagement/expenseManagement/Modal.vue b/src/views/financialManagement/expenseManagement/Modal.vue
index 8e5b171..56da9e9 100644
--- a/src/views/financialManagement/expenseManagement/Modal.vue
+++ b/src/views/financialManagement/expenseManagement/Modal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%">
+ <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%" draggable>
<Form ref="formRef"></Form>
<template #footer>
<el-button type="primary" @click="sendForm" :loading="loading">
diff --git a/src/views/financialManagement/revenueManagement/Modal.vue b/src/views/financialManagement/revenueManagement/Modal.vue
index 480b4fd..b155c52 100644
--- a/src/views/financialManagement/revenueManagement/Modal.vue
+++ b/src/views/financialManagement/revenueManagement/Modal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%">
+ <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%" draggable>
<Form ref="formRef"></Form>
<template #footer>
<el-button type="primary" @click="sendForm" :loading="loading">
diff --git a/src/views/financialManagement/revenueManagement/filesDia.vue b/src/views/financialManagement/revenueManagement/filesDia.vue
index f752496..dad60f3 100644
--- a/src/views/financialManagement/revenueManagement/filesDia.vue
+++ b/src/views/financialManagement/revenueManagement/filesDia.vue
@@ -3,6 +3,7 @@
<el-dialog
v-model="dialogFormVisible"
title="涓婁紶闄勪欢"
+ draggable
width="50%"
@close="closeDia"
>
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 02106f6..cafba7a 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -117,7 +117,7 @@
</div>
</el-tab-pane>
</el-tabs>
- <el-dialog v-model="dialogFormVisible" :title="getDialogTitle()" width="40%" @close="closeDia">
+ <el-dialog v-model="dialogFormVisible" :title="getDialogTitle()" width="40%" @close="closeDia" draggable>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<div>{{getAvailableQuantityText()}}:{{currentRowNum}}</div>
<el-form-item :label="getQuantityLabel()" prop="salesContractNo">
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDia.vue b/src/views/inventoryManagement/receiptManagement/components/formDia.vue
index d71c3f5..a736b52 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDia.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDia.vue
@@ -219,13 +219,17 @@
productList.value = [];
return
}
- productList.value = productRes.data.map(item => ({
- ...item,
- quantityStock: 0,
- taxInclusiveUnitPrice: Number(item?.taxInclusiveUnitPrice ?? 0),
- taxInclusiveTotalPrice: 0,
- originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
- }))
+ productList.value = productRes.data.map(item => {
+ const quantityStock = Number(item?.quantity0 ?? 0);
+ const taxInclusiveUnitPrice = Number(item?.taxInclusiveUnitPrice ?? 0);
+ return {
+ ...item,
+ quantityStock,
+ taxInclusiveUnitPrice,
+ taxInclusiveTotalPrice: quantityStock * taxInclusiveUnitPrice,
+ originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
+ };
+ })
} catch (error) {
console.error('鏌ヨ浜у搧璁板綍澶辫触:', error)
proxy.$modal.msgError('鏌ヨ浜у搧璁板綍澶辫触')
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
index 5fa7fc7..e1bdc68 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -171,7 +171,7 @@
specificationModel: '',
unit: '',
supplierName: form.value.supplierName || '',
- itemType: '',
+ itemType: '鐗╂枡',
inboundNum: 0,
inboundDate: getCurrentDate(), // 榛樿褰撳ぉ鏃ユ湡
quantityStock: 0,
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index ee291a4..9d65268 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -138,7 +138,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰畾鏃朵换鍔″璇濇 -->
- <el-dialog :title="title" v-model="open" width="820px" append-to-body>
+ <el-dialog :title="title" v-model="open" width="820px" append-to-body draggable>
<el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
diff --git a/src/views/personnelManagement/contractManagement/components/formDia.vue b/src/views/personnelManagement/contractManagement/components/formDia.vue
index 3c9674c..407d7c4 100644
--- a/src/views/personnelManagement/contractManagement/components/formDia.vue
+++ b/src/views/personnelManagement/contractManagement/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="璇︽儏"
width="70%"
+ draggable
@close="closeDia"
>
<PIMTable
diff --git a/src/views/personnelManagement/contractManagement/index.vue b/src/views/personnelManagement/contractManagement/index.vue
index f691bf3..3945b44 100644
--- a/src/views/personnelManagement/contractManagement/index.vue
+++ b/src/views/personnelManagement/contractManagement/index.vue
@@ -29,6 +29,7 @@
:title="upload.title"
v-model="upload.open"
width="400px"
+ draggable
append-to-body
>
<el-upload
diff --git a/src/views/personnelManagement/dimission/components/formDia.vue b/src/views/personnelManagement/dimission/components/formDia.vue
index 91473c2..983aae3 100644
--- a/src/views/personnelManagement/dimission/components/formDia.vue
+++ b/src/views/personnelManagement/dimission/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
:title="operationType === 'add' ? '鏂板绂昏亴' : '缂栬緫绂昏亴'"
width="70%"
+ draggable
@close="closeDia"
>
<!-- 鍛樺伐淇℃伅灞曠ず鍖哄煙 -->
diff --git a/src/views/personnelManagement/employeeRecord/components/formDia.vue b/src/views/personnelManagement/employeeRecord/components/formDia.vue
index 6f66f9b..be85f09 100644
--- a/src/views/personnelManagement/employeeRecord/components/formDia.vue
+++ b/src/views/personnelManagement/employeeRecord/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="璇︽儏"
width="70%"
+ draggable
@close="closeDia"
>
<el-descriptions class="detail-descriptions" :column="2" border size="small">
diff --git a/src/views/personnelManagement/payrollManagement/components/formDia.vue b/src/views/personnelManagement/payrollManagement/components/formDia.vue
index 8da9fb3..a941c04 100644
--- a/src/views/personnelManagement/payrollManagement/components/formDia.vue
+++ b/src/views/personnelManagement/payrollManagement/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
:title="operationType === 'add' ? '鏂板钖祫' : '缂栬緫钖祫'"
width="50%"
+ draggable
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
diff --git a/src/views/personnelManagement/payrollManagement/index.vue b/src/views/personnelManagement/payrollManagement/index.vue
index a116316..71bb3f0 100644
--- a/src/views/personnelManagement/payrollManagement/index.vue
+++ b/src/views/personnelManagement/payrollManagement/index.vue
@@ -49,7 +49,7 @@
<form-dia ref="formDia" @close="handleQuery"></form-dia>
<!-- 瀵煎叆寮圭獥 -->
- <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body @close="handleUploadClose">
+ <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body @close="handleUploadClose" draggable>
<el-upload
ref="uploadRef"
:limit="1"
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index 475eabc..90b8a9a 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :title="modalOptions.title" v-model="visible" width="70%">
+ <el-dialog :title="modalOptions.title" v-model="visible" width="70%" draggable>
<el-form
ref="formRef"
:model="form"
@@ -408,7 +408,6 @@
// 璁剧疆琛ㄥ崟鏁版嵁锛堜娇鐢ㄧ涓�涓悎鍚岀殑鍩烘湰淇℃伅锛岄噰璐悎鍚屽彿鐣欑┖锛�
form.purchaseLedgerNo = ""; // 閲囪喘鍚堝悓鍙风暀绌猴紝鍥犱负浼氬湪浜у搧琛ㄦ牸涓垎鍒樉绀�
- form.invoiceAmount = 0;
form.invoiceNumber = "";
form.entryDate = dayjs().format("YYYY-MM-DD");
form.enterDate = dayjs().format("YYYY-MM-DD");
@@ -419,8 +418,28 @@
form.issUerId = userStore.id;
form.issUer = userStore.nickName;
+ // 璁剧疆浜у搧鏁版嵁锛屽苟鍒濆鍖栧紑绁ㄦ暟閲忓拰閲戦
+ allProductData.forEach(item => {
+ // 鏈寮�绁ㄦ暟榛樿涓烘�绘暟閲�
+ item.ticketsNum = Number(item.quantity || 0);
+ // 鏈寮�绁ㄩ噾棰濋粯璁や负鍚◣鎬讳环
+ item.ticketsAmount = Number(item.taxInclusiveTotalPrice || 0);
+ // 淇濆瓨鍘熷鏈潵绁ㄦ暟鍜岄噾棰濓紙鐢ㄤ簬璁＄畻锛�
+ item.tempFutureTickets = Number(item.quantity || 0);
+ item.tempFutureTicketsAmount = Number(item.taxInclusiveTotalPrice || 0);
+ // 鏈潵绁ㄦ暟鍜岄噾棰濆垵濮嬩负0锛堝洜涓哄叏閮ㄥ紑绁級
+ item.futureTickets = 0;
+ item.futureTicketsAmount = 0;
+ });
+
form.productData = allProductData;
+ // 璁＄畻鍙戠エ閲戦锛氭墍鏈変骇鍝佺殑鍚◣鎬讳环涔嬪拰
+ const totalAmount = allProductData.reduce((sum, item) => {
+ return sum + (Number(item.taxInclusiveTotalPrice) || 0);
+ }, 0);
+ form.invoiceAmount = totalAmount.toFixed(2);
+
// 瀛樺偍閫変腑鐨勫悎鍚屾暟鎹�
selectedContracts.value = selectedRows;
});
diff --git a/src/views/procurementManagement/invoiceEntry/indexOld.vue b/src/views/procurementManagement/invoiceEntry/indexOld.vue
index 1b4c6b9..2bf49ef 100644
--- a/src/views/procurementManagement/invoiceEntry/indexOld.vue
+++ b/src/views/procurementManagement/invoiceEntry/indexOld.vue
@@ -156,6 +156,7 @@
</div>
<el-dialog
v-model="dialogFormVisible"
+ draggable
:title="operationType === 'add' ? '鏂板鏉ョエ鐧昏' : '缂栬緫鏉ョエ鐧昏'"
width="80%"
@close="closeDia"
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index 70c254e..2a49a8a 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -129,6 +129,7 @@
</div>
<el-dialog
v-model="dialogFormVisible"
+ draggable
:title="operationType === 'add' ? '鏂板浠樻鐧昏' : '缂栬緫浠樻鐧昏'"
width="60%"
@close="closeDia"
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue b/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
index 82b4164..b5a2c55 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog :title="modalOptions.title" v-model="visible" @close="close">
+ <el-dialog :title="modalOptions.title" v-model="visible" @close="close" draggable>
<EditForm ref="editFormRef" />
<template #footer>
<el-button type="primary" :loading="loading" @click="sendForm">
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue b/src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue
index b82bd10..18ee67a 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="upload.open" :title="upload.title" :width="500">
+ <el-dialog v-model="upload.open" :title="upload.title" :width="500" draggable>
<FileUpload
ref="fileUploadRef"
accept=".xlsx, .xls, .pdf"
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 668e82a..92cfd76 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -180,6 +180,7 @@
</div>
<el-dialog
v-model="dialogFormVisible"
+ draggable
:title="operationType === 'add' ? '鏂板閲囪喘鍙拌处椤甸潰' : '缂栬緫閲囪喘鍙拌处椤甸潰'"
width="70%"
@close="closeDia"
@@ -410,6 +411,7 @@
</el-dialog>
<el-dialog
v-model="productFormVisible"
+ draggable
:title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'"
width="40%"
@close="closeProductDia"
diff --git a/src/views/productionManagement/operationScheduling/components/formDia.vue b/src/views/productionManagement/operationScheduling/components/formDia.vue
index 4733a6e..8017ee5 100644
--- a/src/views/productionManagement/operationScheduling/components/formDia.vue
+++ b/src/views/productionManagement/operationScheduling/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="宸ュ簭鎺掍骇"
width="70%"
+ draggable
@close="closeDia"
>
<el-button type="primary" @click="addRow" style="margin-bottom: 10px;">鏂板</el-button>
diff --git a/src/views/productionManagement/productionDispatching/components/formDia.vue b/src/views/productionManagement/productionDispatching/components/formDia.vue
index 971bc6e..ce94dc3 100644
--- a/src/views/productionManagement/productionDispatching/components/formDia.vue
+++ b/src/views/productionManagement/productionDispatching/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="鐢熶骇娲惧伐"
width="50%"
+ draggable
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
diff --git a/src/views/productionManagement/productionReporting/components/formDia.vue b/src/views/productionManagement/productionReporting/components/formDia.vue
index 5d8fcea..ecb7d81 100644
--- a/src/views/productionManagement/productionReporting/components/formDia.vue
+++ b/src/views/productionManagement/productionReporting/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="鐢熶骇鎶ュ伐"
width="70%"
+ draggable
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
diff --git a/src/views/qualityManagement/finalInspection/components/filesDia.vue b/src/views/qualityManagement/finalInspection/components/filesDia.vue
index 7fe250a..372d2bb 100644
--- a/src/views/qualityManagement/finalInspection/components/filesDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/filesDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="涓婁紶闄勪欢"
width="50%"
+ draggable
@close="closeDia"
>
<div style="margin-bottom: 10px;text-align: right">
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 2ab020d..3285750 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
:title="operationType === 'add' ? '鏂板鍑哄巶妫�楠�' : '缂栬緫鍑哄巶妫�楠�'"
width="70%"
+ draggable
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -31,7 +32,10 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable/>
+ <el-select v-model="form.unit" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+ <el-option label="绠�" value="绠�" />
+ <el-option label="鎻�" value="鎻�" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -99,7 +103,7 @@
</template>
<script setup>
-import {ref, computed} from "vue";
+import {ref, computed, reactive, toRefs, getCurrentInstance} from "vue";
import dayjs from "dayjs";
import useUserStore from "@/store/modules/user.js";
import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
@@ -184,22 +188,26 @@
let userLists = await userListNoPage();
userList.value = userLists.data;
form.value = {}
- getProductOptions();
if (operationType.value === 'edit') {
form.value = {...row}
- currentProductId.value = row.productId || 0
- // 鍔犺浇褰撳墠浜у搧涓嬬殑瑙勬牸鍒楄〃锛屽苟鏍规嵁鍚庣杩斿洖鐨� model 鍙嶆煡骞惰缃� modelId锛屽疄鐜拌鏍间笅鎷夋鍙嶆樉
- if (currentProductId.value) {
- modelList({ id: currentProductId.value }).then((res) => {
- modelOptions.value = res;
- const target = res.find((item) => item.model === row.model);
- if (target) {
- form.value.modelId = target.id;
- }
- });
- }
- getQualityInspectParamList(row.id)
+ currentProductId.value = row.productId || 0
+ // 鍔犺浇褰撳墠浜у搧涓嬬殑瑙勬牸鍒楄〃锛屽苟鏍规嵁鍚庣杩斿洖鐨� model 鍙嶆煡骞惰缃� modelId锛屽疄鐜拌鏍间笅鎷夋鍙嶆樉
+ if (currentProductId.value) {
+ modelList({ id: currentProductId.value }).then((res) => {
+ modelOptions.value = res;
+ const target = res.find((item) => item.model === row.model);
+ if (target) {
+ form.value.modelId = target.id;
+ }
+ });
+ }
+ getQualityInspectParamList(row.id)
+ } else {
+ // 鏂板鏃惰缃粯璁ゅ��
+ form.value.unit = "绠�"; // 鍗曚綅榛樿涓虹
+ form.value.checkResult = "鍚堟牸"; // 妫�楠岀粨鏋滈粯璁や负鍚堟牸
}
+ await getProductOptions();
// 榛樿妫�楠屽憳涓哄綋鍓嶇櫥褰曚汉锛屾娴嬫棩鏈熼粯璁や负褰撳ぉ锛堢┖鏃跺～鍏咃級
if (currentUserName.value && !form.value.checkName) {
form.value.checkName = currentUserName.value;
@@ -208,10 +216,52 @@
form.value.checkTime = getToday();
}
}
-const getProductOptions = () => {
- productTreeList({productName: '璐ㄩ噺'}).then((res) => {
- productOptions.value = convertIdToValue(res);
- });
+const findNodeByLabel = (nodes, label) => {
+ for (let i = 0; i < nodes.length; i++) {
+ // 鍏堝皾璇曠簿纭尮閰�
+ if (nodes[i].label === label) {
+ return nodes[i].value; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣鐨剉alue
+ }
+ // 濡傛灉绮剧‘鍖归厤澶辫触锛屽皾璇曟ā绯婂尮閰嶏紙鍖呭惈鍏抽敭璇嶏級
+ if (nodes[i].label && nodes[i].label.includes(label)) {
+ return nodes[i].value;
+ }
+ if (nodes[i].children && nodes[i].children.length > 0) {
+ const foundValue = findNodeByLabel(nodes[i].children, label);
+ if (foundValue) {
+ return foundValue; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐圭殑value
+ }
+ }
+ }
+ return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
+};
+
+const getProductOptions = async () => {
+ const res = await productTreeList({productName: '璐ㄩ噺'});
+ productOptions.value = convertIdToValue(res);
+ // 鏂板妯″紡涓嬶紝榛樿閫夋嫨"鎴愬搧妫�楠�"
+ if (operationType.value === 'add') {
+ const finishedProductId = findNodeByLabel(productOptions.value, '鎴愬搧妫�楠�');
+ if (finishedProductId) {
+ form.value.productId = finishedProductId;
+ // 鎵惧埌瀵瑰簲鐨勮妭鐐癸紝浣跨敤瀹為檯鐨� label 浣滀负 productName
+ const findNode = (nodes, value) => {
+ for (let i = 0; i < nodes.length; i++) {
+ if (nodes[i].value === value) {
+ return nodes[i];
+ }
+ if (nodes[i].children && nodes[i].children.length > 0) {
+ const found = findNode(nodes[i].children, value);
+ if (found) return found;
+ }
+ }
+ return null;
+ };
+ const node = findNode(productOptions.value, finishedProductId);
+ form.value.productName = node ? node.label : '鎴愬搧妫�楠�';
+ getModels(finishedProductId);
+ }
+ }
};
const getModels = (value) => {
currentProductId.value = value
@@ -287,12 +337,18 @@
}
const getList = () => {
qualityInspectDetailByProductId(currentProductId.value).then(res => {
- tableData.value = res.data;
+ tableData.value = res.data.map(item => ({
+ ...item,
+ testValue: item.testValue ?? 0
+ }));
})
}
const getQualityInspectParamList = (id) => {
qualityInspectParamInfo(id).then(res => {
- tableData.value = res.data;
+ tableData.value = res.data.map(item => ({
+ ...item,
+ testValue: item.testValue ?? 0
+ }));
})
}
// 鍏抽棴寮规
diff --git a/src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue b/src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue
index 32a36fa..c1d3e69 100644
--- a/src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="濉啓妫�楠岃褰�"
width="70%"
+ draggable
@close="closeDia"
>
<div style="margin-bottom: 10px;text-align: right">
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index 3fcd206..561a11f 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -42,6 +42,7 @@
<DetailDia ref="detailDia"></DetailDia>
<files-dia ref="filesDia" @close="handleQuery"></files-dia>
<el-dialog v-model="dialogFormVisible" title="缂栬緫妫�楠屽憳" width="30%"
+ draggable
@close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
diff --git a/src/views/qualityManagement/metricMaintenance/index.vue b/src/views/qualityManagement/metricMaintenance/index.vue
index 5758897..208c793 100644
--- a/src/views/qualityManagement/metricMaintenance/index.vue
+++ b/src/views/qualityManagement/metricMaintenance/index.vue
@@ -72,6 +72,7 @@
></PIMTable>
</div>
<el-dialog
+ draggable
v-model="modelDia"
title="妫�娴嬫寚鏍�"
width="400px"
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index 13a231d..62d4791 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -2,6 +2,7 @@
<div>
<el-dialog
v-model="dialogFormVisible"
+ draggable
:title="operationType === 'add' ? '鏂板涓嶅悎鏍肩鐞�' : '缂栬緫涓嶅悎鏍肩鐞�'"
width="70%"
@close="closeDia"
@@ -123,7 +124,8 @@
</template>
<script setup>
-import {ref} from "vue";
+import {ref, reactive, toRefs, getCurrentInstance} from "vue";
+import dayjs from "dayjs";
import {productTreeList} from "@/api/basicData/product.js";
import {
getQualityUnqualifiedInfo,
@@ -132,6 +134,7 @@
} from "@/api/qualityManagement/nonconformingManagement.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
+const getToday = () => dayjs().format("YYYY-MM-DD")
const dialogFormVisible = ref(false);
const operationType = ref('')
@@ -151,6 +154,8 @@
inspectType: '',
defectivePhenomena: '',
dealResult: '',
+ dealName: '',
+ dealTime: '',
},
rules: {
checkTime: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" },],
@@ -177,6 +182,10 @@
getQualityUnqualifiedInfo(row.id).then(res => {
form.value = {...res.data}
})
+ } else {
+ // 鏂板鏃惰缃粯璁ゅ��
+ form.value.dealName = "鍐伒鑺�"; // 澶勭悊浜洪粯璁や负鍐伒鑺�
+ form.value.dealTime = getToday(); // 澶勭悊鏃ユ湡榛樿涓哄綋澶�
}
}
const getProductOptions = () => {
diff --git a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
index 68621fe..b5bedab 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
:title="operationType === 'add' ? '鏂板涓嶅悎鏍煎鐞�' : '澶勭悊涓嶅悎鏍�'"
width="70%"
+ draggable
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
diff --git a/src/views/qualityManagement/processInspection/components/filesDia.vue b/src/views/qualityManagement/processInspection/components/filesDia.vue
index 768ea5b..8b7dd2e 100644
--- a/src/views/qualityManagement/processInspection/components/filesDia.vue
+++ b/src/views/qualityManagement/processInspection/components/filesDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="涓婁紶闄勪欢"
width="50%"
+ draggable
@close="closeDia"
>
<div style="margin-bottom: 10px;text-align: right">
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 924d7a8..36f9cf9 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
:title="operationType === 'add' ? '鏂板杩囩▼妫�楠�' : '缂栬緫杩囩▼妫�楠�'"
width="70%"
+ draggable
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -209,6 +210,7 @@
getQualityInspectParamList(row.id)
} else {
// 鏂板鏃惰缃粯璁ゅ��
+ form.value.process = "璇曞帇"; // 宸ュ簭榛樿涓鸿瘯鍘�
form.value.unit = "鍖�"; // 鍗曚綅榛樿涓哄寘
form.value.quantity = 3; // 鏁伴噺榛樿涓�3
form.value.checkResult = "鍚堟牸"; // 妫�楠岀粨鏋滈粯璁や负鍚堟牸
diff --git a/src/views/qualityManagement/processInspection/components/inspectionFormDia.vue b/src/views/qualityManagement/processInspection/components/inspectionFormDia.vue
index 32a36fa..c1d3e69 100644
--- a/src/views/qualityManagement/processInspection/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/processInspection/components/inspectionFormDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="濉啓妫�楠岃褰�"
width="70%"
+ draggable
@close="closeDia"
>
<div style="margin-bottom: 10px;text-align: right">
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index b1e4b3a..c6eb44f 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -42,6 +42,7 @@
<DetailDia ref="detailDia"></DetailDia>
<files-dia ref="filesDia" @close="handleQuery"></files-dia>
<el-dialog v-model="dialogFormVisible" title="缂栬緫妫�楠屽憳" width="30%"
+ draggable
@close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
index 3208c6c..eb46972 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
title="涓婁紶闄勪欢"
width="50%"
+ draggable
@close="closeDia"
>
<div style="margin-bottom: 10px;text-align: right">
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index d26eaf2..6de151f 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -4,6 +4,7 @@
v-model="dialogFormVisible"
:title="operationType === 'add' ? '鏂板鍘熸潗鏂欐楠�' : '缂栬緫鍘熸潗鏂欐楠�'"
width="70%"
+ draggable
@close="closeDia"
>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
index 32a36fa..d75c1d1 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
@@ -3,6 +3,7 @@
<el-dialog
v-model="dialogFormVisible"
title="濉啓妫�楠岃褰�"
+ draggable
width="70%"
@close="closeDia"
>
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index ac6c551..aa50538 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -43,6 +43,7 @@
<DetailDia ref="detailDia"></DetailDia>
<files-dia ref="filesDia" @close="handleQuery"></files-dia>
<el-dialog v-model="dialogFormVisible" title="缂栬緫妫�楠屽憳" width="30%"
+ draggable
@close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index f2ba229..1fe8508 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -64,7 +64,7 @@
<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="寮�绁ㄥ彴璐﹂〉闈�" width="70%" @close="closeDia">
+ <el-dialog v-model="dialogFormVisible" title="寮�绁ㄥ彴璐﹂〉闈�" width="70%" @close="closeDia" draggable>
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-row :gutter="30">
<el-col :span="12">
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index be11c2b..1e037b6 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -163,6 +163,7 @@
/>
</div>
<el-dialog
+ draggable
v-model="dialogFormVisible"
title="鏂板寮�绁ㄧ櫥璁伴〉闈�"
width="85%"
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 2324c6a..e132b44 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -201,6 +201,7 @@
</div>
<el-dialog
v-model="dialogFormVisible"
+ draggable
title="鏂板鍥炴椤甸潰"
width="70%"
@close="closeDia"
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 4538790..b2e73d9 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -90,6 +90,7 @@
:page="page.current" :limit="page.size" @pagination="paginationChange" />
</div>
<el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板閿�鍞彴璐﹂〉闈�' : '缂栬緫閿�鍞彴璐﹂〉闈�'" width="70%"
+ draggable
@close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<el-row :gutter="30">
@@ -206,6 +207,7 @@
</template>
</el-dialog>
<el-dialog v-model="productFormVisible" :title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'" width="40%"
+ draggable
@close="closeProductDia">
<el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
<el-row :gutter="30">
@@ -299,6 +301,7 @@
</el-dialog>
<!-- 鎵撳嵃棰勮寮圭獥 -->
<el-dialog
+ draggable
v-model="printPreviewVisible"
title="鎵撳嵃棰勮"
width="90%"
@@ -416,6 +419,7 @@
</el-dialog>
<!-- 鍙戣揣寮规 -->
<el-dialog
+ draggable
v-model="deliveryFormVisible"
title="鍙戣揣淇℃伅"
width="40%"
--
Gitblit v1.9.3