From 27ba504441037666e787ded85b4af2f65be65c17 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 29 4月 2025 18:06:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.ts | 144 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 126 insertions(+), 18 deletions(-)
diff --git a/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.ts b/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.ts
index 1941fd4..377b8fb 100644
--- a/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.ts
+++ b/HIAWms/web/src/widgets/HIAWms/Controllers/WmsMaterialDrawer.ts
@@ -7,8 +7,7 @@
import { cloneDeep } from 'lodash'
export const useWmsMaterialDrawer = (props: any, ctx?: any) => {
- const wmsmaterialDrawer =
- injectModel<WmsMaterialDrawer>('wmsmaterialDrawer')
+ const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('wmsMaterialDrawer')
/**
* 鐢ㄦ潵瀵规瘮鐨勫垵濮嬪寲鏁版嵁
*/
@@ -33,23 +32,111 @@
*/
const formItems = reactive([
{
- label: '鍚嶇О',
- prop: 'name',
+ label: '鐗╂枡缂栫爜',
+ prop: 'materialCode',
el: 'input',
- placeholder: '璇疯緭鍏ュ悕绉�',
- rules: [{ required: true, message: '鍚嶇О', trigger: 'blur' }],
+ placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
+ rules: [{ required: true, message: '鐗╂枡缂栫爜涓嶈兘涓虹┖', trigger: 'blur' }],
},
{
- label: '缂栧彿',
- prop: 'code',
+ label: '鐗╂枡鍚嶇О',
+ prop: 'materialName',
el: 'input',
- placeholder: '璇疯緭鍏ョ紪鍙�',
- rules: [{ required: true, message: '缂栧彿', trigger: 'blur' }],
+ placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ rules: [{ required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
+ },
+ {
+ label: '閲囪喘绫诲瀷',
+ prop: 'purchaseType',
+ el: 'select',
+ placeholder: '璇烽�夋嫨閲囪喘绫诲瀷',
+ options: [
+ { label: '绫诲瀷1', value: 1 },
+ { label: '绫诲瀷2', value: 2 },
+ // Add all enum values
+ ],
+ rules: [{ required: true, message: '璇烽�夋嫨閲囪喘绫诲瀷', trigger: 'change' }],
+ },
+ {
+ label: '鐗╂枡绫诲瀷',
+ prop: 'materialType',
+ el: 'select',
+ placeholder: '璇烽�夋嫨鐗╂枡绫诲瀷',
+ options: [
+ { label: '绫诲瀷A', value: 1 },
+ { label: '绫诲瀷B', value: 2 },
+ // Add all enum values
+ ],
+ rules: [{ required: true, message: '璇烽�夋嫨鐗╂枡绫诲瀷', trigger: 'change' }],
+ },
+ {
+ label: '涓诲崟浣�',
+ prop: 'primaryUnit',
+ el: 'input',
+ placeholder: '璇疯緭鍏ヤ富鍗曚綅(濡�: kg, m, 涓�)',
+ },
+ {
+ label: '瑙勬牸/鏍囧噯',
+ prop: 'standard',
+ el: 'input',
+ placeholder: '璇疯緭鍏ヨ鏍�/鏍囧噯(濡�: GB/T 8163-2018)',
+ },
+ {
+ label: '澶栧緞(mm)',
+ prop: 'outerDiameter',
+ el: 'input-number',
+ placeholder: '璇疯緭鍏ュ寰�',
+ step: 0.01,
+ precision: 2,
+ },
+ {
+ label: '澹佸帤(mm)',
+ prop: 'wallThickness',
+ el: 'input-number',
+ placeholder: '璇疯緭鍏ュ鍘�',
+ step: 0.01,
+ precision: 2,
+ },
+ {
+ label: '鏉愯川',
+ prop: 'materialQuality',
+ el: 'input',
+ placeholder: '璇疯緭鍏ユ潗璐�(濡�: 304涓嶉攬閽�)',
+ },
+ {
+ label: '闀垮害(m)',
+ prop: 'length',
+ el: 'input-number',
+ placeholder: '璇疯緭鍏ラ暱搴�',
+ step: 0.1,
+ precision: 2,
+ },
+ {
+ label: '鏄惁涓绘敮绠�',
+ prop: 'isMainBranch',
+ el: 'select',
+ options: [
+ { label: '鏄�', value: 1 },
+ { label: '鍚�', value: 2 },
+ ],
+ },
+ {
+ label: '鐢熶骇宸ュ巶',
+ prop: 'factory',
+ el: 'input',
+ placeholder: '璇疯緭鍏ョ敓浜у伐鍘�',
+ },
+ {
+ label: '璇佷功缂栧彿',
+ prop: 'certification',
+ el: 'input',
+ placeholder: '璇疯緭鍏ヨ瘉涔︾紪鍙�',
},
{
label: '澶囨敞',
prop: 'remark',
el: 'input',
+ type: 'textarea',
placeholder: '璇疯緭鍏ュ娉�',
},
])
@@ -87,16 +174,26 @@
const onConfirm = async () => {
await formRef.value?.validate()
const data = {
- name: formData.value.name,
- code: formData.value.code,
+ materialCode: formData.value.materialCode,
+ materialName: formData.value.materialName,
+ purchaseType: formData.value.purchaseType,
+ materialType: formData.value.materialType,
+ primaryUnit: formData.value.primaryUnit,
+ standard: formData.value.standard,
+ outerDiameter: formData.value.outerDiameter,
+ wallThickness: formData.value.wallThickness,
+ materialQuality: formData.value.materialQuality,
+ length: formData.value.length,
+ isMainBranch: formData.value.isMainBranch === 1,
+ factory: formData.value.factory,
+ certification: formData.value.certification,
remark: formData.value.remark,
- sort: props.sort,
}
if (!current.value) {
- await wmsmaterialDrawer.addWmsMaterial(data)
+ await wmsMaterialDrawer.addWmsMaterial(data)
} else {
const id = current.value.id
- await wmsmaterialDrawer.updateWmsMaterial(id, data)
+ await wmsMaterialDrawer.updateWmsMaterial(id, data)
}
ElMessage.success('淇濆瓨鎴愬姛')
ctx.emit('confirm')
@@ -114,11 +211,22 @@
*/
const onOpen = async () => {
if (current.value) {
- const res = await wmsmaterialDrawer.getWmsMaterialDetail(current.value)
+ const res = await wmsMaterialDrawer.getWmsMaterialDetail(current.value)
formData.value = {
- name: res.name,
- code: res.code,
+ materialCode: res.materialCode,
+ materialName: res.materialName,
+ purchaseType: res.purchaseType,
+ materialType: res.materialType,
+ primaryUnit: res.primaryUnit,
+ standard: res.standard,
+ outerDiameter: res.outerDiameter,
+ wallThickness: res.wallThickness,
+ materialQuality: res.materialQuality,
+ length: res.length,
+ isMainBranch: res.isMainBranch ? 1 : 2,
+ factory: res.factory,
+ certification: res.certification,
remark: res.remark,
id: res.id,
}
--
Gitblit v1.9.3