Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

昨天 df1406d0f571972d033dffd6a93fb4b94febeb56

 src/views/basicInformation/mould/coal.vue

@@ -1,159 +1,46 @@
<template>
<<<<<<< HEAD
    <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)
}
=======
  <div>
    <el-dialog
      v-model="dialogVisible"
      :title="title"
      width="800"
      :close-on-click-modal="false"
      :before-close="handleClose"
        v-model="dialogVisible"
        :title="title"
        width="500"
        :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"
          ref="formRef"
          style="max-width: 600px; margin: 0 auto"
          :model="formData"
          :rules="rules"
          label-width="120px"
      >
        <el-form-item label="卡胡" prop="supplierName">
        <el-form-item label="煤种名称" prop="coal">
          <el-input
            v-model="formData.supplierName"
            placeholder="请输入供货商名称"
              v-model="formData.coal"
              placeholder="请输入煤种名称"
          />
        </el-form-item>
        <el-form-item label="纳税人识别号" prop="identifyNumber">
        <el-form-item label="维护人姓名" prop="maintainerId">
          <el-input
            v-model="formData.identifyNumber"
            placeholder="请输入纳税人识别号"
              :value="userStore.name || ''"
              placeholder="维护人姓名"
              disabled
          />
        </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-form-item label="维护日期" prop="maintenanceDate">
          <el-input
            v-model="formData.bankAccount"
            placeholder="请输入银行账户"
              :value="getCurrentDate()"
              placeholder="维护日期"
              disabled
          />
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="submitForm"> 确定 </el-button>

        <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>
        </el-form-item>
      </el-form>
    </el-dialog>
@@ -161,110 +48,146 @@
</template>

<script setup>
import { ref, watch, defineProps } from "vue";
import {ref, watch, defineProps, reactive, onMounted} from 'vue'
import {addOrEditCoalInfo} from '@/api/basicInformation/coal'
import useUserStore from '@/store/modules/user'

const userStore = useUserStore()

const props = defineProps({
  beforeClose: {
    type: Function,
    default: () => {},
    default: () => {
    }
  },
  form: {
    type: Object,
    default: () => ({}),
    default: () => ({})
  },
  addOrEdit: {
    type: String,
    default: "add",
    default: 'add'
  },
  title: {
    type: String,
    default: "",
    default: ''
  },
});

const emit = defineEmits([
  "submit",
  "handleBeforeClose",
  "update:coalDialogFormVisible",
]);

// 表单引用
const formRef = ref(null);
// 表单数据
const formData = ref({ ...props.form });
// 弹窗可见性
const dialogVisible = defineModel("coalDialogFormVisible", {
})
const copyForm = defineModel("copyForm", {
  required: true,
  type: Boolean,
  type: Object,
});
// 在组件挂载时获取用户信息
onMounted(async () => {
  // 如果store中没有用户信息，则获取用户信息
  if (!userStore.name) {
    try {
      await userStore.getInfo()
      // 自动填充维护人ID
      if (props.addOrEdit === 'add') {
        formData.value.maintainerId = userStore.id
      }
    } catch (error) {
      console.error('获取用户信息失败:', error)
    }
  } else {
    // 自动填充维护人ID
    if (props.addOrEdit === 'add') {
      formData.value.maintainerId = userStore.id
    }
  }
})

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(() => props.form, (newVal) => {
  formData.value = {...newVal}
  // 如果是新增模式，设置维护人
  if (props.addOrEdit === 'add' && userStore.id) {
    formData.value.maintainerId = userStore.id
  }
}, {deep: true})

// 监听内部弹窗状态变化
watch(
  () => dialogVisible.value,
  (newVal) => {
    emit("update:coalDialogFormVisible", newVal);
  }
);
watch(() => dialogVisible.value, (newVal) => {
  emit('update:coalDialogFormVisible', newVal)
})

// 提交表单
const submitForm = async () => {
  if (!formRef.value) return;
  await formRef.value.validate((valid, fields) => {
  if (!formRef.value) return
  await formRef.value.validate(async (valid, fields) => {
    if (valid) {
      emit("submit", formData.value);
      delete formData.value.maintainerName // 删除显示用的字段，只保留ID

      // 确保maintainerId有值
      if (!formData.value.maintainerId) {
        formData.value.maintainerId = userStore.id
      }

      // 设置维护日期
      formData.value.maintenanceDate = getCurrentDate()

      let result = await addOrEditCoalInfo({
        ...formData.value,
      })
      let obj = {
        title: props.title,
        result,
      }
      emit('submit', obj)
    }
  });
};
  })
}
// 取消表单
const cancelForm = () => {
  emit("update:coalDialogFormVisible", false);
  formData.value = {};
};
  emit('update:coalDialogFormVisible', false)
  formData.value = {}
}
// 重置表单
const resetForm = () => {
  if (!formRef.value) return;
  formRef.value.resetFields();
};
  if (!formRef.value) return
  formData.value = JSON.parse(JSON.stringify(copyForm.value));
  // formRef.value.resetFields()
}
// 关闭弹窗
const handleClose = () => {
  // 触发父组件的关闭函数
  emit("handleBeforeClose");
  emit("update:coalDialogFormVisible", false);
};
>>>>>>> master
  emit("handleBeforeClose")
  emit('update:coalDialogFormVisible', false)
}
const rules = reactive({
  supplierName: [
    { required: true, message: "请输入供货商名称", trigger: "blur" },
    {required: true, message: "请输入供货商名称", trigger: "blur"},
  ],
  identifyNumber: [
    { required: true, message: "请正确输入纳税人识别号", trigger: "blur" },
    { min: 17, max: 20, message: "请输入17-20位纳税人识别号", trigger: "blur" },
  ],
  address: [
    {
      required: true,
      message: "请选择经营地址",
      trigger: "change",
    },
  ],
  bankAccount: [{ required: true, message: "请输入银行账户", trigger: "blur" }],
  bank: [{ required: true, message: "请输入开户行", trigger: "blur" }],
  contacts: [{ required: true, message: "请输入开户行", trigger: "blur" }],
  contactsPhone: [
    { required: true, message: "请输入联系人", trigger: "blur" },
    { min: 11, max: 11, message: "请输入11位联系人电话", trigger: "blur" },
    {required: true, message: "请正确输入纳税人识别号", trigger: "blur"},
    {min: 17, max: 20, message: "请输入17-20位纳税人识别号", trigger: "blur"},
  ],
});

// 获取当前日期并格式化为 YYYY-MM-DD
function getCurrentDate() {
  const today = new Date();
  const year = today.getFullYear();
  const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始
  const day = String(today.getDate()).padStart(2, '0');
  return `${year}-${month}-${day}`;
}
</script>

<style lang="sass" scoped>
<style lang="scss" scoped>
.dialog-footer {
  display: flex;
  margin-top: 20px;
  flex-direction: column;
  align-items: flex-end;
}
</style>