From 9be2e2f91332ed341406acf9739d8912dddbf6fe Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue | 196 +++++++++++++++++++++---------------------------
1 files changed, 87 insertions(+), 109 deletions(-)
diff --git a/src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue b/src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue
index 6a92710..c8e2087 100644
--- a/src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue
+++ b/src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue
@@ -1,66 +1,30 @@
<template>
- <j-modal
- :title="title"
- :width="800"
- :visible="visible"
- :confirmLoading="confirmLoading"
- switchFullscreen
- @ok="handleOk"
- @cancel="handleCancel"
- cancelText="鍏抽棴">
-
+ <j-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
+ @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
- <a-form-model ref="form" :model="model" :rules="validatorRules">
-
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="鍒犻櫎鏍囪">
- <a-input-number v-model="model.delFlag"/>
+ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item prop="factoryOrgCode" label="鐢宠閮ㄩ棬">
+ <a-tree-select v-model="model.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
+ :disabled="!editable"
+ show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
+ @change="()=>delete model.equipmentId"
+ treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨鐢宠閮ㄩ棬"
+ :allow-clear="false" tree-default-expand-all/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationOrderNum" label="鐢宠鍗曞彿">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" v-model="model.applicationOrderNum" />
+ <a-form-model-item prop="equipmentId" label="缁熶竴缂栫爜">
+ <lx-search-equipment-select :disabled="!editable||!model.factoryOrgCode"
+ :placeholder="!model.factoryOrgCode?'璇烽�夋嫨鐢宠閮ㄩ棬':'璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�'"
+ v-model="model.equipmentId" :allow-clear="false"
+ :factoryOrgCode="model.factoryOrgCode"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicant" label="鐢宠浜�">
- <a-input placeholder="璇疯緭鍏ョ敵璇蜂汉" v-model="model.applicant" />
+ <a-form-model-item prop="evaluationDate" label="鎶�鏈姸鎬侀壌瀹氭棩鏈�">
+ <a-date-picker value-format="YYYY-MM-DD" v-model="model.evaluationDate" :allow-clear="false"
+ style="width: 100%"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryOrgCode" label="鐢宠閮ㄩ棬">
- <a-input placeholder="璇疯緭鍏ョ敵璇烽儴闂�" v-model="model.factoryOrgCode" />
+ <a-form-model-item label="澶囨敞">
+ <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applyDate" label="鐢宠鏃ユ湡">
- <a-input placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" v-model="model.applyDate" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationStatus" label="鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟鐘舵��;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚" v-model="model.applicationStatus" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignature" label="鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟浣嶅绾ч瀵肩瀛�" v-model="model.departHeaderSignature" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignatureTime" label="鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧鏃堕棿">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟浣嶅绾ч瀵肩瀛楁椂闂�" v-model="model.departHeaderSignatureTime" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderComment" label="鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟浣嶅绾ч瀵兼剰瑙�" v-model="model.departHeaderComment" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignature" label="鐢熶骇璁惧绠＄悊涓荤绛惧瓧">
- <a-input placeholder="璇疯緭鍏ョ敓浜ц澶囩鐞嗕富绠＄瀛�" v-model="model.productionHeaderSignature" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignatureTime" label="鐢熶骇璁惧绠＄悊涓荤绛惧瓧鍥涗欢">
- <a-input placeholder="璇疯緭鍏ョ敓浜ц澶囩鐞嗕富绠＄瀛楀洓浠�" v-model="model.productionHeaderSignatureTime" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderComment" label="鐢熶骇璁惧绠＄悊涓荤鎰忚">
- <a-input placeholder="璇疯緭鍏ョ敓浜ц澶囩鐞嗕富绠℃剰瑙�" v-model="model.productionHeaderComment" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignature" label="鐢熶骇淇濋殰閮ㄩ瀵肩瀛�">
- <a-input placeholder="璇疯緭鍏ョ敓浜т繚闅滈儴棰嗗绛惧瓧" v-model="model.productionSupportSignature" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignatureTime" label="鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�">
- <a-input placeholder="璇疯緭鍏ョ敓浜т繚闅滈儴棰嗗绛惧瓧鏃堕棿" v-model="model.productionSupportSignatureTime" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportComment" label="鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�">
- <a-input placeholder="璇疯緭鍏ョ敓浜т繚闅滈儴棰嗗鎰忚" v-model="model.productionSupportComment" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hfCode" label="HF缂栫爜">
- <a-input placeholder="璇疯緭鍏F缂栫爜" v-model="model.hfCode" />
- </a-form-model-item>
-
</a-form-model>
</a-spin>
</j-modal>
@@ -68,89 +32,103 @@
<script>
import { httpAction } from '@/api/manage'
- import moment from "moment"
+ import LxSearchEquipmentSelect from '../../equipment/modules/LxSearchEquipmentSelect'
export default {
- name: "EamTechnicalStatusEvaluationApplicationModal",
- data () {
+ name: 'EamTechnicalStatusEvaluationApplicationModal',
+ components: { LxSearchEquipmentSelect },
+ props: {
+ productionTreeData: {
+ type: Array
+ }
+ },
+ data() {
return {
- title:"鎿嶄綔",
+ title: '鎿嶄綔',
+ editable: true,
visible: false,
model: {},
labelCol: {
xs: { span: 24 },
- sm: { span: 5 },
+ sm: { span: 5 }
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 16 },
+ sm: { span: 16 }
},
confirmLoading: false,
- validatorRules:{
+ validatorRules: {
+ factoryOrgCode: [{ required: true, message: '璇烽�夋嫨鐢宠閮ㄩ棬', trigger: 'change' }],
+ equipmentId: [{ required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�', trigger: 'change' }],
+ evaluationDate: [{ required: true, message: '璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氭棩鏈�', trigger: 'change' }]
},
url: {
- add: "/eam/eamTechnicalStatusEvaluationApplication/add",
- edit: "/eam/eamTechnicalStatusEvaluationApplication/edit",
- },
+ add: '/eam/eamTechnicalStatusEvaluationApplication/add',
+ edit: '/eam/eamTechnicalStatusEvaluationApplication/edit'
+ }
}
},
- created () {
- },
methods: {
- add () {
- //鍒濆鍖栭粯璁ゅ��
- this.edit({});
+ add() {
+ this.model = {}
+ this.editable = true
+ this.visible = true
},
- edit (record) {
- this.model = Object.assign({}, record);
- this.visible = true;
+
+ edit(record) {
+ this.model = Object.assign({}, record)
+ this.editable = false
+ this.visible = true
},
- close () {
- this.$emit('close');
- this.visible = false;
- this.$refs.form.clearValidate();
- },
- handleOk () {
- const that = this;
+
+ handleOk() {
+ const that = this
// 瑙﹀彂琛ㄥ崟楠岃瘉
- this.$refs.form.validate(valid => {
+ this.$refs.form.validate(valid => {
if (valid) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if(!this.model.id){
- httpurl+=this.url.add;
- method = 'post';
- }else{
- httpurl+=this.url.edit;
- method = 'put';
+ that.confirmLoading = true
+ let httpurl = ''
+ let method = ''
+ if (!this.model.id) {
+ httpurl += this.url.add
+ method = 'post'
+ } else {
+ httpurl += this.url.edit
+ method = 'put'
}
- httpAction(httpurl,this.model,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
+ httpAction(httpurl, this.model, method).then((res) => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.close()
+ that.$emit('ok')
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
}
}).finally(() => {
- that.confirmLoading = false;
- that.close();
+ that.confirmLoading = false
})
- }else{
- return false;
+ } else {
+ return false
}
})
},
- handleCancel () {
+
+ handleCancel() {
this.close()
},
-
+ close() {
+ this.$emit('close')
+ this.visible = false
+ this.$refs.form.clearValidate()
+ }
}
}
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
--
Gitblit v1.9.3