From c1b5f6edeacfa0326931d06de6773b936dbabe27 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 26 八月 2025 15:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY
---
src/views/basicInformation/mould/coal.vue | 37 +++++++------------------------------
1 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/src/views/basicInformation/mould/coal.vue b/src/views/basicInformation/mould/coal.vue
index 36e599e..5702bca 100644
--- a/src/views/basicInformation/mould/coal.vue
+++ b/src/views/basicInformation/mould/coal.vue
@@ -18,11 +18,12 @@
<el-input
v-model="formData.coal"
placeholder="璇疯緭鍏ョ叅绉嶅悕绉�"
+ :disabled="isViewMode"
/>
</el-form-item>
<el-form-item label="缁存姢浜哄鍚�" prop="maintainerId">
<el-input
- :value="userStore.name || ''"
+ :value="userStore.nickName || ''"
placeholder="缁存姢浜哄鍚�"
disabled
/>
@@ -37,8 +38,8 @@
<el-form-item class="dialog-footer">
<el-button v-if="addOrEdit === 'edit'" @click="resetForm">閲嶇疆</el-button>
- <el-button v-if="addOrEdit === 'add'" @click="cancelForm">鍙栨秷</el-button>
- <el-button type="primary" @click="submitForm">
+ <el-button v-if="addOrEdit === 'add'||addOrEdit.includes('viewRow')" @click="cancelForm">鍙栨秷</el-button>
+ <el-button type="primary" @click="submitForm" v-if="!isViewMode">
纭畾
</el-button>
</el-form-item>
@@ -73,30 +74,11 @@
default: ''
},
})
+const isViewMode = computed(() => props.addOrEdit.includes("viewRow"));
const copyForm = defineModel("copyForm", {
required: true,
type: Object,
});
-// 鍦ㄧ粍浠舵寕杞芥椂鑾峰彇鐢ㄦ埛淇℃伅
-onMounted(async () => {
- // 濡傛灉store涓病鏈夌敤鎴蜂俊鎭紝鍒欒幏鍙栫敤鎴蜂俊鎭�
- if (!userStore.name) {
- try {
- await userStore.getInfo()
- // 鑷姩濉厖缁存姢浜篒D
- if (props.addOrEdit === 'add') {
- formData.value.maintainerId = userStore.id
- }
- } catch (error) {
- console.error('鑾峰彇鐢ㄦ埛淇℃伅澶辫触:', error)
- }
- } else {
- // 鑷姩濉厖缁存姢浜篒D
- if (props.addOrEdit === 'add') {
- formData.value.maintainerId = userStore.id
- }
- }
-})
const emit = defineEmits(['submit', 'handleBeforeClose', 'update:coalDialogFormVisible'])
// 琛ㄥ崟寮曠敤
@@ -125,7 +107,6 @@
if (!formRef.value) return
await formRef.value.validate(async (valid, fields) => {
if (valid) {
- delete formData.value.maintainerName // 鍒犻櫎鏄剧ず鐢ㄧ殑瀛楁锛屽彧淇濈暀ID
// 纭繚maintainerId鏈夊��
if (!formData.value.maintainerId) {
@@ -164,12 +145,8 @@
emit('update:coalDialogFormVisible', false)
}
const rules = reactive({
- supplierName: [
- {required: true, message: "璇疯緭鍏ヤ緵璐у晢鍚嶇О", trigger: "blur"},
- ],
- identifyNumber: [
- {required: true, message: "璇锋纭緭鍏ョ撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
- {min: 17, max: 20, message: "璇疯緭鍏�17-20浣嶇撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
+ coal: [
+ {required: true, message: "璇疯緭鍏ョ叅绉嶅悕绉�", trigger: "blur"},
],
});
--
Gitblit v1.9.3