From 37436ffec6f763d6d298d6f42d1ff946f27c71be Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 六月 2025 13:53:47 +0800
Subject: [PATCH] 表格不要删除按钮,统一用上面的

---
 src/views/basicInformation/mould/coal.vue |  132 -------------------------------------------
 1 files changed, 2 insertions(+), 130 deletions(-)

diff --git a/src/views/basicInformation/mould/coal.vue b/src/views/basicInformation/mould/coal.vue
index 7c8a9c7..0694d23 100644
--- a/src/views/basicInformation/mould/coal.vue
+++ b/src/views/basicInformation/mould/coal.vue
@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
     <div>
         <el-dialog
             v-model="dialogVisible"
@@ -40,6 +39,8 @@
                     <el-button type="primary" @click="submitForm">
                         纭畾
                     </el-button>
+                    <el-button v-if="addOrEdit === 'edit'" @click="resetForm">閲嶇疆</el-button>
+                    <el-button v-if="addOrEdit === 'add'" @click="cancelForm">鍙栨秷</el-button>
                 </el-form-item>
             </el-form>
         </el-dialog>
@@ -112,135 +113,6 @@
     emit("handleBeforeClose")
     emit('update:coalDialogFormVisible', false)
 }
-=======
-  <div>
-    <el-dialog
-      v-model="dialogVisible"
-      :title="title"
-      width="800"
-      :close-on-click-modal="false"
-      :before-close="handleClose"
-    >
-      <el-form
-        ref="formRef"
-        style="max-width: 600px; margin: 0 auto"
-        :model="formData"
-        :rules="rules"
-        label-width="auto"
-      >
-        <el-form-item label="鍗¤儭" prop="supplierName">
-          <el-input
-            v-model="formData.supplierName"
-            placeholder="璇疯緭鍏ヤ緵璐у晢鍚嶇О"
-          />
-        </el-form-item>
-        <el-form-item label="绾崇◣浜鸿瘑鍒彿" prop="identifyNumber">
-          <el-input
-            v-model="formData.identifyNumber"
-            placeholder="璇疯緭鍏ョ撼绋庝汉璇嗗埆鍙�"
-          />
-        </el-form-item>
-        <el-form-item label="缁忚惀鍦板潃" prop="address">
-          <el-select v-model="formData.address" placeholder="璇烽�夋嫨缁忚惀鍦板潃">
-            <el-option label="Zone one" value="shanghai" />
-            <el-option label="Zone two" value="beijing" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="閾惰璐︽埛" prop="bankAccount">
-          <el-input
-            v-model="formData.bankAccount"
-            placeholder="璇疯緭鍏ラ摱琛岃处鎴�"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitForm"> 纭畾 </el-button>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import { ref, watch, defineProps } from "vue";
-
-const props = defineProps({
-  beforeClose: {
-    type: Function,
-    default: () => {},
-  },
-  form: {
-    type: Object,
-    default: () => ({}),
-  },
-  addOrEdit: {
-    type: String,
-    default: "add",
-  },
-  title: {
-    type: String,
-    default: "",
-  },
-});
-
-const emit = defineEmits([
-  "submit",
-  "handleBeforeClose",
-  "update:coalDialogFormVisible",
-]);
-
-// 琛ㄥ崟寮曠敤
-const formRef = ref(null);
-// 琛ㄥ崟鏁版嵁
-const formData = ref({ ...props.form });
-// 寮圭獥鍙鎬�
-const dialogVisible = defineModel("coalDialogFormVisible", {
-  required: true,
-  type: Boolean,
-});
-
-// 鐩戝惉澶栭儴浼犲叆鐨勮〃鍗曟暟鎹彉鍖�
-watch(
-  () => props.form,
-  (newVal) => {
-    formData.value = { ...newVal };
-  },
-  { deep: true }
-);
-
-// 鐩戝惉鍐呴儴寮圭獥鐘舵�佸彉鍖�
-watch(
-  () => dialogVisible.value,
-  (newVal) => {
-    emit("update:coalDialogFormVisible", newVal);
-  }
-);
-
-// 鎻愪氦琛ㄥ崟
-const submitForm = async () => {
-  if (!formRef.value) return;
-  await formRef.value.validate((valid, fields) => {
-    if (valid) {
-      emit("submit", formData.value);
-    }
-  });
-};
-// 鍙栨秷琛ㄥ崟
-const cancelForm = () => {
-  emit("update:coalDialogFormVisible", false);
-  formData.value = {};
-};
-// 閲嶇疆琛ㄥ崟
-const resetForm = () => {
-  if (!formRef.value) return;
-  formRef.value.resetFields();
-};
-// 鍏抽棴寮圭獥
-const handleClose = () => {
-  // 瑙﹀彂鐖剁粍浠剁殑鍏抽棴鍑芥暟
-  emit("handleBeforeClose");
-  emit("update:coalDialogFormVisible", false);
-};
->>>>>>> master
 const rules = reactive({
   supplierName: [
     { required: true, message: "璇疯緭鍏ヤ緵璐у晢鍚嶇О", trigger: "blur" },

--
Gitblit v1.9.3