From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 41 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
index ae2e910..1dc2390 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">
@@ -291,10 +291,10 @@
:scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
- :pagination="ipagination"
:loading="loading"
- @change="handleTableChange"
+ :pagination="false"
>
+ <!-- @change="handleTableChange" -->
<template
slot="photo"
slot-scope="text,record"
@@ -325,6 +325,7 @@
@click="handleOk()"
type="primary"
:loading="confirmLoading"
+ :disabled="disableSubmit || confirmLoading"
>纭畾</a-button>
</template>
@@ -377,42 +378,42 @@
},
width: 50,
},
- {
- title: '閮ㄤ綅',
- align: 'center',
- dataIndex: 'location'
- },
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location'
+ // },
{
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: 'photo',
- scopedSlots: { customRender: 'photo' },
- },
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: 'center',
+ // dataIndex: 'acceptabilityLimit'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'inspectionMethodName'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'inspectionTool'
+ // },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: "center",
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // },
],
title: "鎿嶄綔",
visible: false,
@@ -435,7 +436,7 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ澶囩紪鐮�!' },
+ { required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜!' },
]
},
equipmentId: {
@@ -476,6 +477,7 @@
getInspectionCycles: "/eam/inspectionOrder/getInspectionCycles",
getInspectionProjectId: "/eam/inspectionOrder/getInspectionProjectId",
// getEquipmentIdById: "/eam/equipment/list",
+ getNum: '/eam/sysIdentity/getNumNew'
},
dataSource: [],
@@ -487,7 +489,9 @@
methods: {
add() {
- this.edit({ startWorkCondition: "1", inspectionOrderDetails: [] })
+ this.edit({ inspectionOrderDetails: [] })
+ // this.edit({ startWorkCondition: "1", inspectionOrderDetails: [] })
+ this.getSeq()
},
edit(record) {
@@ -573,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) => {
@@ -590,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 = [];
@@ -620,7 +633,7 @@
this.inspectionStandardId = record.id;
this.form.setFieldsValue({ inspectionStandardId: record.id, inspectionStandardNum: record.num + "/" + record.version });
this.form.setFieldsValue({ equipmentId: record.equipmentId, equipmentName: record.equipmentNum + "/" + record.equipmentName });
- this.form.setFieldsValue({ assignMode: record.assignMode, teamId: record.teamId, teamName: record.teamName });
+ this.form.setFieldsValue({ assignMode: "1", teamId: record.teamId, teamName: record.teamName });
this.form.setFieldsValue({ effectiveTime: null, inspectionCycleId: null, unit: null });
this.getInspectionCycles(record.id)
if ("3" == record.assignMode) {
--
Gitblit v1.9.3