From 4c8b185fea72bc3bb8fc380a196b8fe2a8e5f1af Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 03 七月 2025 20:13:28 +0800
Subject: [PATCH] 设备管理问题修改
---
src/views/eam/dispose/modules/EamEquipmentScrapModal.vue | 295 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 175 insertions(+), 120 deletions(-)
diff --git a/src/views/eam/dispose/modules/EamEquipmentScrapModal.vue b/src/views/eam/dispose/modules/EamEquipmentScrapModal.vue
index 8883a9b..870c891 100644
--- a/src/views/eam/dispose/modules/EamEquipmentScrapModal.vue
+++ b/src/views/eam/dispose/modules/EamEquipmentScrapModal.vue
@@ -1,53 +1,95 @@
<template>
<j-modal
- :title="title"
- :width="800"
- :visible="visible"
+ :confirmLoading='confirmLoading'
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
- :confirmLoading="confirmLoading"
+ :title='title'
+ :visible='visible'
+ :width='800'
+ cancelText='鍏抽棴'
switchFullscreen
- @ok="handleOk"
- @cancel="handleCancel"
- cancelText="鍏抽棴">
+ @cancel='handleCancel'
+ @ok='handleOk'
+ >
- <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-spin :spinning='confirmLoading'>
+ <a-form-model
+ ref='form'
+ :model='model'
+ :rules='validatorRules'
+ >
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='鍗曟嵁鍙�'
+ prop='code'
+ >
+ <a-input
+ v-model='model.code'
+ disabled
+ placeholder='缂栫爜绯荤粺鑷姩鐢熸垚'
+ />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="鍗曟嵁鍙�">
- <a-input placeholder="璇疯緭鍏ュ崟鎹彿" v-model="model.code" />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='璁惧'
+ prop='equipmentId'
+ >
+ <lx-search-equipment-select
+ v-model='model.equipmentId'
+ :disabled='disableSubmit'
+ placeholder='璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储'
+ ></lx-search-equipment-select>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="璁惧ID">
- <a-input placeholder="璇疯緭鍏ヨ澶嘔D" v-model="model.equipmentId" />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='澶勭悊绫诲瀷'
+ prop='scrapType'
+ >
+ <j-dict-select-tag
+ v-model='model.scrapType'
+ :disabled='disableSubmit || initialAcceptanceDisable'
+ dictCode='scrap_sell'
+ placeholder='璇烽�夋嫨澶勭悊绫诲瀷'
+ type='radio'
+ />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapType" label="杞/鎶ュ簾">
- <a-input placeholder="璇疯緭鍏ヨ浆璁�/鎶ュ簾" v-model="model.scrapType" />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='澶勭疆鐞嗙敱'
+ prop='scrapReason'
+ >
+ <a-input
+ v-model='model.scrapReason'
+ placeholder='璇疯緭鍏ュ缃悊鐢�'
+ />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser" label="鐢宠浜�">
- <a-input placeholder="璇疯緭鍏ョ敵璇蜂汉" v-model="model.reportUser" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapTime" label="澶勭疆鏃堕棿">
- <a-input placeholder="璇疯緭鍏ュ缃椂闂�" v-model="model.scrapTime" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapReason" label="澶勭疆鐞嗙敱">
- <a-input placeholder="璇疯緭鍏ュ缃悊鐢�" v-model="model.scrapReason" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapAmount" label="澶勭疆閲戦">
- <a-input placeholder="璇疯緭鍏ュ缃噾棰�" v-model="model.scrapAmount" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalUser" label="瀹℃牳浜�">
- <a-input placeholder="璇疯緭鍏ュ鏍镐汉" v-model="model.approvalUser" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="瀹℃牳鎰忚">
- <a-input placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="model.approvalComment" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalTime" label="瀹℃牳鏃堕棿">
- <a-input placeholder="璇疯緭鍏ュ鏍告椂闂�" v-model="model.approvalTime" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="澶囨敞">
- <a-input placeholder="璇疯緭鍏ュ娉�" v-model="model.remark" />
+ <div v-if='model.scrapType == 2'>
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='澶勭疆閲戦'
+ prop='scrapAmount'
+ >
+ <a-input
+ v-model='model.scrapAmount'
+ placeholder='璇疯緭鍏ュ缃噾棰�'
+ />
+ </a-form-model-item>
+ </div>
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='澶囨敞'
+ prop='remark'
+ >
+ <a-textarea
+ v-model='model.remark'
+ :disabled='disableSubmit'
+ placeholder='璇疯緭鍏ュ娉�'
+ />
</a-form-model-item>
</a-form-model>
@@ -56,90 +98,103 @@
</template>
<script>
- import { httpAction } from '@/api/manage'
- import moment from "moment"
+import { httpAction } from '@/api/manage'
+import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
- export default {
- name: "EamEquipmentScrapModal",
- data () {
- return {
- title:"鎿嶄綔",
- visible: false,
- model: {},
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
- confirmLoading: false,
- validatorRules:{
- },
- url: {
- add: "/eam/eamEquipmentScrap/add",
- edit: "/eam/eamEquipmentScrap/edit",
- },
+export default {
+ name: 'EamEquipmentScrapModal',
+ components: { LxSearchEquipmentSelect },
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+
+ confirmLoading: false,
+ validatorRules: {
+ scrapReason: [
+ { required: true, message: '璇疯緭鍏ュ缃師鍥狅紒' }
+ ],
+ equipmentId: [
+ { required: true, message: '璇烽�夋嫨璁惧锛�' }
+ ],
+ transferReason: [
+ { required: true, message: '璇疯緭鍏ュ彉鍔ㄥ師鍥狅紒' }
+ ],
+ scrapType: [
+ { required: true, message: '璇烽�夋嫨绫诲瀷锛�' }
+ ]
+ },
+ url: {
+ add: '/eam/eamEquipmentScrap/add',
+ edit: '/eam/eamEquipmentScrap/edit'
}
- },
- created () {
- },
- methods: {
- add () {
- //鍒濆鍖栭粯璁ゅ��
- this.edit({});
- },
- edit (record) {
- this.model = Object.assign({}, record);
- this.visible = true;
- },
- close () {
- this.$emit('close');
- this.visible = false;
- this.$refs.form.clearValidate();
- },
- handleOk () {
- const that = this;
- // 瑙﹀彂琛ㄥ崟楠岃瘉
- 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';
- }
- httpAction(httpurl,this.model,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- that.close();
- })
- }else{
- return false;
- }
- })
- },
- handleCancel () {
- this.close()
- },
-
-
}
+ },
+ created() {
+ },
+ methods: {
+ add() {
+ //鍒濆鍖栭粯璁ゅ��
+ this.edit({})
+ },
+ edit(record) {
+ this.model = Object.assign({}, record)
+ this.visible = true
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ this.$refs.form.clearValidate()
+ },
+ handleOk() {
+ const that = this
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ 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'
+ }
+ httpAction(httpurl, this.model, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$emit('ok')
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.close()
+ })
+ } else {
+ return false
+ }
+ })
+ },
+ handleCancel() {
+ this.close()
+ }
+
+
}
+}
</script>
-<style lang="less" scoped>
-
+<style lang='less' scoped>
</style>
\ No newline at end of file
--
Gitblit v1.9.3