From 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:15:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue | 105 +++++++++++++++++-----------------------------------
1 files changed, 34 insertions(+), 71 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
index 9107a54..117a24a 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
@@ -35,7 +35,7 @@
>
<!-- <a-input-search
:disabled="disableSubmit"
- placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
enter-button
@search="onDepartList()"
:read-only="true"
@@ -123,21 +123,21 @@
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬Id"
+ label="浣跨敤閮ㄩ棬Id"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ璞￠儴闂╥d'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
v-decorator="['departId', validatorRules.useId ]"
/>
</a-form-item>
@@ -227,14 +227,14 @@
<!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="瀵硅薄閮ㄩ棬"
+ label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇峰璞￠儴闂�'"
+ :placeholder="disableSubmit?'':'璇蜂娇鐢ㄩ儴闂�'"
:triggerChange="true"
dictCode="sys_depart,depart_name,id,version = '7' and del_flag!='1'"
v-decorator="['departId', validatorRules.departId]"
@@ -339,43 +339,6 @@
<a>鍒犻櫎</a>
</a-popconfirm>
</span>
-
- <!-- <span
- slot="photo"
- slot-scope="text,record"
- >
- <Tooltip
- placement="top"
- title="棰勮鍥剧墖"
- >
- <img
- v-if=" record.upload.path && (record.upload.format.toLowerCase()=='jpg'||record.upload.format.toLowerCase()=='bmp'||record.upload.format.toLowerCase()=='png'||record.upload.format.toLowerCase()=='jpeg'||record.upload.format.toLowerCase()=='gif')"
- width="30"
- height="14"
- border="1"
- draggable="false"
- preview="1"
- :preview-text="''"
- :src="record.upload.src"
- />
- </Tooltip>
- <a
- v-if="record.upload.path && record.upload.format.toLowerCase()=='pdf'"
- href="javascript:;"
- @click="view(record.upload)"
- >
- 棰勮
- </a>
-
- <a-divider
- v-if="record.upload.path && (record.upload.format.toLowerCase()=='jpg'||record.upload.format.toLowerCase()=='bmp'||record.upload.format.toLowerCase()=='png'||record.upload.format.toLowerCase()=='jpeg'||record.upload.format.toLowerCase()=='gif'||record.upload.format.toLowerCase()=='pdf')"
- type="vertical"
- />
- <a
- href="javascript:;"
- @click="handleUpload(record)"
- >涓婁紶</a>
- </span> -->
</a-table>
<template slot="footer">
<a-button
@@ -486,31 +449,31 @@
// align: 'center',
// dataIndex: 'maintenanceSpecialtyName'
// },
- {
- title: '瀹夊叏瑕佹眰',
- align: 'center',
- dataIndex: 'maintenanceRequire',
- scopedSlots: { customRender: 'maintenanceRequire' },
- width: 150,
- },
- {
- title: '宸ユ椂瀹氶',
- align: 'center',
- dataIndex: 'workingHourQuota'
- },
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- width: 150,
- },
+ // {
+ // title: '瀹夊叏瑕佹眰',
+ // align: 'center',
+ // dataIndex: 'maintenanceRequire',
+ // scopedSlots: { customRender: 'maintenanceRequire' },
+ // width: 150,
+ // },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: 'center',
+ // dataIndex: 'workingHourQuota'
+ // },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // width: 150,
+ // },
{
title: '淇濆吇閮ㄤ綅',
align: 'center',
dataIndex: 'location',
- scopedSlots: { customRender: 'location' },
- width: 150,
+ // scopedSlots: { customRender: 'location' },
+ // width: 150,
},
{
title: '鍛ㄦ湡',
@@ -568,7 +531,7 @@
},
useDepartName: {
rules: [
- { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
]
},
equipmentName: {
@@ -596,7 +559,7 @@
list: "/eam/maintenanceStandardDetail/getMaintenanceStandardDetailListByIds",
add: "/eam/maintenanceStandard/add",
edit: "/eam/maintenanceStandard/edit",
- addDetail: "/eam/maintenanceStandardDetail/add",
+ // addDetail: "/eam/maintenanceStandardDetail/add",
getMaintenanceCycle: "/eam/maintenanceStandardDetail/getPeriodicMaintenanceCycle",
realDelete: "/eam/maintenanceStandardDetail/realDelete",
revise: '/eam/maintenanceStandard/revise',
@@ -676,7 +639,7 @@
edit(record) {
let that = this;
- this.initOptions();
+ // this.initOptions();
// this.getMaintenanceCycle()
this.dataSource = [];
this.form.resetFields();
@@ -731,7 +694,7 @@
onEquipmentList() {
let data = this.form.getFieldsValue(['departId']);
if (data.departId == null || data.departId == "") {
- this.$message.warning("璇峰厛閫夋嫨瀵硅薄閮ㄩ棬锛�");
+ this.$message.warning("璇峰厛閫夋嫨浣跨敤閮ㄩ棬锛�");
return
}
this.$refs.EquipmentList.list(data.departId);
@@ -747,7 +710,7 @@
onDepartList() {
this.$refs.DepartList.list();
- this.$refs.DepartList.title = "閫夋嫨瀵硅薄閮ㄩ棬";
+ this.$refs.DepartList.title = "閫夋嫨浣跨敤閮ㄩ棬";
},
sendDepartRecord(data) {
this.dataSource = [];
@@ -766,7 +729,6 @@
},
handleOk() {
- console.log("123")
const that = this;
this.form.validateFields((err, values) => {
if (!err) {
@@ -782,10 +744,12 @@
let obj;
if (!this.model.id) {
formData.versionStatus = '1'
+ formData.approvalStatus = '1'
obj = postAction(this.url.add, formData);
} else {
if (this.isRevise) {
formData.versionStatus = '1'
+ formData.approvalStatus = '1'
obj = postAction(this.url.revise, formData);
} else {
obj = requestPut(this.url.edit, formData, { id: this.model.id });
@@ -825,7 +789,6 @@
},
getMaintenanceCycle(equipmentId) {
- debugger
getAction(this.url.getMaintenanceCycle, { equipmentId: equipmentId }).then((res) => {
if (res.success) {
this.maintenanceCycles = res.result
--
Gitblit v1.9.3