From ef388d95770306b4eea7c7afa884c37439d41651 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 06 十一月 2023 11:43:13 +0800
Subject: [PATCH] 单据名称增加单据来源
---
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
index 245062d..ac7eaa1 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -26,7 +26,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
+ <!-- <a-col :span="12">
<a-form-item
label="寮�宸ユ潯浠�"
:labelCol="labelCol"
@@ -40,7 +40,7 @@
@change="handle2Switch(model.startWorkCondition)"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
<a-row :gutter="24">
<a-col :span="12">
@@ -180,6 +180,7 @@
hidden
:gutter="24"
>
+
<a-col :span="12">
<a-form-item
label="鏈夋晥鏃堕暱"
@@ -324,6 +325,7 @@
@click="handleOk()"
type="primary"
:loading="confirmLoading"
+ :disabled="disableSubmit || confirmLoading"
>纭畾</a-button>
</template>
@@ -384,28 +386,28 @@
{
title: '鐐规椤圭洰',
align: 'center',
- dataIndex: 'inspectionProjectNum'
+ dataIndex: 'inspectionProjectName'
},
{
title: '妫�娴嬫爣鍑�',
align: 'center',
dataIndex: 'detectionStandard'
},
- {
- title: '鍚堟牸鑼冨洿',
- align: 'center',
- dataIndex: 'acceptabilityLimit'
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'inspectionMethodName'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'inspectionTool'
- },
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: 'center',
+ // dataIndex: 'acceptabilityLimit'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'inspectionMethodName'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'inspectionTool'
+ // },
{
title: '绀烘剰鍥�',
align: "center",
@@ -475,6 +477,7 @@
getInspectionCycles: "/eam/inspectionOrder/getInspectionCycles",
getInspectionProjectId: "/eam/inspectionOrder/getInspectionProjectId",
// getEquipmentIdById: "/eam/equipment/list",
+ getNum: '/eam/sysIdentity/getNumNew'
},
dataSource: [],
@@ -486,7 +489,9 @@
methods: {
add() {
- this.edit({ startWorkCondition: "1", inspectionOrderDetails: [] })
+ this.edit({ inspectionOrderDetails: [] })
+ // this.edit({ startWorkCondition: "1", inspectionOrderDetails: [] })
+ this.getSeq()
},
edit(record) {
@@ -572,6 +577,15 @@
})
},
+
+ getSeq() {
+ getAction(this.url.getNum, { type: 'DailylnspectionOrder', length: 4 }).then(res => {
+ if (res.success) {
+ this.form.setFieldsValue({ "num": res.result })
+ }
+ })
+ },
+
// getEquipmentIdById(equipmentId) {
// if (equipmentId != null && equipmentId != "") {
// getAction(this.url.getEquipmentIdById, { id: equipmentId }).then((res) => {
@@ -589,13 +603,13 @@
// }
// },
- handle2Switch(startWorkCondition) {
- if ('1' == startWorkCondition) {
- this.model.startWorkCondition = '0'
- } else {
- this.model.startWorkCondition = '1'
- }
- },
+ // handle2Switch(startWorkCondition) {
+ // if ('1' == startWorkCondition) {
+ // this.model.startWorkCondition = '0'
+ // } else {
+ // this.model.startWorkCondition = '1'
+ // }
+ // },
// handle2Change(val) {
// this.inspectionCycles = [];
--
Gitblit v1.9.3