From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
index 43b0850..72e4c19 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
@@ -7,14 +7,20 @@
cancelText="鍏抽棴"
@cancel="handleCancel"
:confirmLoading="confirmLoading"
+ title="闄勫綍4"
>
<!-- :title="title" -->
<a-spin :spinning="confirmLoading">
<a-form :form="form">
+ <span
+ class="ant-descriptions-title"
+ style="font-size: large;font-size: 15px;float: right;"
+ >{{this.model.receiptsNum}}</span>
<a-divider
orientation="center"
style="font-size: large;font-style: normal;font-size: 30px;color: #66aeed;"
- > 鐢熶骇璁惧涓夌骇淇濆吇楠屾敹鍗� </a-divider>
+ > {{this.model.receiptsName}} </a-divider>
+ <!-- 鐢熶骇璁惧涓夌骇淇濆吇楠屾敹鍗� -->
<a-row :gutter="24">
<a-col :span="8">
<a-form-item
@@ -109,8 +115,8 @@
</div>
</template>
</a-table>
- <!-- <div :style="{height: '140px',width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
- <a-row :gutter="24">
+ <div :style="{height: '140px',width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
:labelCol="labelCol"
@@ -119,25 +125,26 @@
>
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
:labelCol="{span:3}"
:wrapperCol="{span:21}"
- label="澶囨敞"
+ label="楠屾敹鏈�氳繃鍘熷洜"
>
<a-textarea
allow-clear
+ :rows='5'
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ娉�'"
- v-decorator="['remark', {}]"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ラ獙鏀舵湭閫氳繃鍘熷洜'"
+ v-decorator="['notPassReason', {}]"
/>
-
+
</a-form-item>
</a-col>
</a-row>
- </div> -->
+ </div>
</a-form>
</a-spin>
@@ -268,6 +275,7 @@
add: "/eam/maintenanceThreeAcceptance/add",
getMaintenance3Receipt: "/eam/maintenanceThreeAcceptance/getMaintenanceThreeAcceptanceList",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
+ getSysFileName: "/eam/sysFileName/getSysFileName",
},
}
},
@@ -280,12 +288,16 @@
edit(record) {
let that = this;
+ debugger
+ if (record.receipts == "" || record.receipts == null) {
+ this.getSysFileName()
+ }
this.form.resetFields();
this.model = Object.assign({}, record);
this.visible = true;
this.getMaintenance3Receipt()
that.$nextTick(() => {
- // that.form.setFieldsValue(pick(that.model, 'num', 'teamId', 'remark'));
+ that.form.setFieldsValue(pick(that.model, 'notPassReason'));
});
},
@@ -365,6 +377,14 @@
}
},
+ getSysFileName() {
+ getAction(this.url.getSysFileName, { name: '19' }).then((res) => {
+ if (res.success) {
+ this.model = Object.assign(this.model, res.result[0]);
+ }
+ })
+ },
+
},
}
</script>
--
Gitblit v1.9.3