From 7282d4b49f4577c6807a78bdd6e705feb2fe0e2c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 14 八月 2025 20:47:04 +0800
Subject: [PATCH] art: 线边库管理，物料台账相关代码修改
---
src/views/base/modules/warehouse/WarehouseModel.vue | 129 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 63 deletions(-)
diff --git a/src/views/base/modules/warehouse/WarehouseModel.vue b/src/views/base/modules/warehouse/WarehouseModel.vue
index dfde18b..e8b6ce8 100644
--- a/src/views/base/modules/warehouse/WarehouseModel.vue
+++ b/src/views/base/modules/warehouse/WarehouseModel.vue
@@ -4,6 +4,7 @@
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
+ :maskClosable="false"
:okButtonProps="{ props: {disabled: disableSubmit} }"
@ok="handleOk"
@cancel="handleCancel"
@@ -15,12 +16,12 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
- :labelCol="{span:3}"
- :wrapperCol="{span:21}"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
label="绾胯竟搴撶紪鍙�"
>
<a-input
- :readOnly="disableSubmit"
+ :disabled="disableSubmit"
allow-clear
placeholder="璇疯緭鍏ョ嚎杈瑰簱缂栧彿"
v-decorator="['warehouseCode', validatorRules.warehouseCode ]"
@@ -32,12 +33,12 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
- :labelCol="{span:3}"
- :wrapperCol="{span:21}"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
label="绾胯竟搴撳悕绉�"
>
<a-input
- :readOnly="disableSubmit"
+ :disabled="disableSubmit"
allow-clear
placeholder="璇疯緭鍏ョ嚎杈瑰簱鍚嶇О"
v-decorator="['warehouseName', validatorRules.warehouseName ]"
@@ -46,19 +47,15 @@
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="24">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="浜х嚎"
>
- <j-dict-select-tag
- type="list"
- v-model="model.factoryId"
- :trigger-change="true"
- dictCode="base_factory,factory_name,id"
- placeholder="璇烽�夋嫨浜х嚎"
- />
+ <j-dict-select-tag :disabled="disableSubmit" type="list" placeholder="璇烽�夋嫨浜х嚎"
+ v-model="model.factoryId"
+ dictCode="base_factory,factory_name,id,del_flag='0' and factory_category='3'" />
</a-form-item>
</a-col>
</a-row>
@@ -68,34 +65,28 @@
</template>
<script>
-import { httpAction, getAction } from '@/api/manage'
-import JDate from '@/components/jeecg/JDate'
+import { httpAction } from '@/api/manage'
import pick from 'lodash.pick'
-import moment from 'moment'
-import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
-import JTreeDict from '@/components/jeecg/JTreeDict'//鍒嗙被瀛楀吀鏍戝舰涓嬫媺缁勪欢
+import { duplicateCheck } from '@/api/api' //閲嶅鏍￠獙
export default {
- name: "WarehouseModal",
- components: {
- JDate,
- JTreeDict,
- },
+ name: 'WarehouseModal',
+ components: {},
data() {
return {
- title: "鎿嶄綔",
+ title: '鎿嶄綔',
visible: false,
disableSubmit: false,
model: {},
treeData: [],
- warehouseId: "", //淇濆瓨绾胯竟搴搃d
+ warehouseId: '', //淇濆瓨绾胯竟搴搃d
labelCol: {
xs: { span: 24 },
- sm: { span: 6 },
+ sm: { span: 5 }
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 18 },
+ sm: { span: 16 }
},
confirmLoading: false,
@@ -105,70 +96,71 @@
rules: [
{ required: true, message: '璇疯緭鍏ョ嚎杈瑰簱缂栧彿' },
{ min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
- { validator: this.validateNum },
+ { validator: this.validateNum }
]
},
warehouseName: {
rules: [
{ required: true, message: '璇疯緭鍏ョ嚎杈瑰簱鍚嶇О' },
{ min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
- { validator: this.validateName },
+ { validator: this.validateName }
]
- },
+ }
},
url: {
- add: "/base/lineSideWarehouse/add",
- edit: "/base/lineSideWarehouse/edit",
+ add: '/base/lineSideWarehouse/add',
+ edit: '/base/lineSideWarehouse/edit'
},
+ nextFactoryOptions: []
}
},
created() {
},
methods: {
add() {
- this.edit({});
+ this.edit({})
},
edit(record) {
- this.form.resetFields();
- this.model = Object.assign({}, record);
- this.warehouseId = record.id;
- this.visible = true;
+ this.form.resetFields()
+ this.model = Object.assign({}, record)
+ this.warehouseId = record.id
+ this.visible = true
this.$nextTick(() => {
this.form.setFieldsValue(
pick(this.model, 'warehouseCode', 'warehouseName', 'factoryId')
)
- });
+ })
},
close() {
- this.$emit('close');
- this.visible = false;
+ this.$emit('close')
+ this.visible = false
},
handleOk() {
- const that = this;
+ const that = this
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.form.validateFields((err, values) => {
if (!err) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
+ that.confirmLoading = true
+ let httpurl = ''
+ let method = ''
if (!this.model.id) {
- httpurl += this.url.add;
- method = 'post';
+ httpurl += this.url.add
+ method = 'post'
} else {
- httpurl += this.url.edit;
- method = 'put';
+ httpurl += this.url.edit
+ method = 'put'
}
- let formData = Object.assign(this.model, values);
+ let formData = Object.assign(this.model, values)
httpAction(httpurl, formData, method).then((res) => {
if (res.success) {
- that.$message.success(res.message);
- that.$emit('ok');
+ that.$message.success(res.message)
+ that.$emit('ok')
} else {
- that.$message.warning(res.message);
+ that.$message.warning(res.message)
}
}).finally(() => {
- that.confirmLoading = false;
- that.close();
+ that.confirmLoading = false
+ that.close()
})
}
})
@@ -184,13 +176,13 @@
fieldVal: value,
dataId: this.warehouseId,
//鏁版嵁搴撲腑瀛樺湪瀛楁del_flag骞朵娇鐢ㄨ瀛楁浣滀负鏈垹闄ょ瓥鐣ワ紝鐪熷垹闄わ細false 鍋囧垹闄わ細true
- delFlag: 'true',
- };
+ delFlag: 'true'
+ }
duplicateCheck(params).then((res) => {
if (res.success) {
- callback();
+ callback()
} else {
- callback("绾胯竟搴撶紪鍙峰凡瀛樺湪!");
+ callback('绾胯竟搴撶紪鍙峰凡瀛樺湪!')
}
})
},
@@ -202,16 +194,27 @@
fieldVal: value,
dataId: this.warehouseId,
//鏁版嵁搴撲腑瀛樺湪瀛楁del_flag骞朵娇鐢ㄨ瀛楁浣滀负鏈垹闄ょ瓥鐣ワ紝鐪熷垹闄わ細false 鍋囧垹闄わ細true
- delFlag: 'true',
- };
+ delFlag: 'true'
+ }
duplicateCheck(params).then((res) => {
if (res.success) {
- callback();
+ callback()
} else {
- callback("绾胯竟搴撳悕绉板凡瀛樺湪!");
+ callback('绾胯竟搴撳悕绉板凡瀛樺湪!')
}
})
},
+ backFactoryInfo(info) {
+ this.model.factoryIds = this.model.factoryId
+ this.nextFactoryOptions = info.map((item, index, arr) => {
+ let c = { label: item.text, value: item.value + '' }
+ return c
+ })
+ },
+ // 鍏抽棴寮圭獥鏃舵竻闄よ〃鍗曟牎楠�
+ removeValidate() {
+ if (this.$refs.form) this.$refs.form.clearValidate()
+ }
}
}
</script>
--
Gitblit v1.9.3