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

gaoluyang

2 天以前 df1406d0f571972d033dffd6a93fb4b94febeb56

 src/views/basicInformation/mould/supplier.vue

@@ -4,7 +4,7 @@
               :before-close="handleClose">
      <el-form ref="formRef" style="max-width: 400px; margin: 0 auto" :model="formData" :rules="rules"
               label-width="auto">
        <el-form-item label="客户名称" prop="supplierName">
        <el-form-item label="供应商名称" prop="supplierName">
          <el-input v-model="formData.supplierName" placeholder="请输入供货商名称"/>
        </el-form-item>
        <el-form-item label="纳税人识别号" prop="taxpayerId">
@@ -13,8 +13,7 @@
        <el-form-item label="经营地址" prop="bids">
          <el-cascader placeholder="请选择经营地址" size="default" :options="addressSelectOptions"
                       v-model="formData.bids"
                       :props="cascaderProps"
                       @change="handleChange">
                       :props="cascaderProps" @change="handleChange">
          </el-cascader>
        </el-form-item>
        <el-form-item label="详细地址" prop="businessAddress">
@@ -32,13 +31,19 @@
        <el-form-item label="联系人电话" prop="contactPhone">
          <el-input v-model="formData.contactPhone" placeholder="请输入联系人电话"/>
        </el-form-item>
        <el-form-item label="联系人地址" prop="contactAddress">
        <el-form-item label="联系人地址" prop="cids">
          <el-cascader placeholder="请选择联系人地址" size="default" :options="addressSelectOptions"
                       v-model="formData.cids"
                       :props="cascaderProps" @change="handleChange">
          </el-cascader>
        </el-form-item>
        <el-form-item label="联系人详细地址" prop="contactAddress">
          <el-input v-model="formData.contactAddress" placeholder="请输入联系人地址"/>
        </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>
@@ -71,7 +76,10 @@
});

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

const copyForm = defineModel("copyForm", {
  required: true,
  type: Object,
});
onMounted(() => {
  fetchAreaOptions()
})
@@ -137,23 +145,27 @@
  if (!formRef.value) return;
  await formRef.value.validate(async (valid, fields) => {
    if (valid) {
      const obj = ref({});
      if (props.title.includes('新增')) {
        let result = await addOrEditSupply({
          ...formData.value,
        })
        let obj = {
        obj.value = {
          title: "新增",
          ...formData.value,
          result
        };
      } else {
        delete formData.value.createTime
        delete formData.value.updateTime
        let result = await addOrEditSupply({
          ...formData.value,
        })
        console.log(result)
        obj.value = {
          title: "编辑",
          ...formData.value,
          result
        };
      }
      emit("submit", obj);
      emit("submit", obj.value);
    }
  });
};
@@ -165,7 +177,7 @@
// 重置表单
const resetForm = () => {
  if (!formRef.value) return;
  formRef.value.resetFields();
  formData.value = JSON.parse(JSON.stringify(copyForm.value));
};
// 关闭弹窗
const handleClose = () => {
@@ -181,13 +193,13 @@
    {required: true, message: "请正确输入纳税人识别号", trigger: "blur"},
    {min: 17, max: 20, message: "请输入17-20位纳税人识别号", trigger: "blur"},
  ],
  bids: [
    {
      required: true,
      message: "请选择经营地址",
      trigger: "change",
    },
  ],
  // bids: [
  //   {
  //     required: true,
  //     message: "请选择经营地址",
  //     trigger: "change",
  //   },
  // ],
  bankName: [{required: true, message: "请输入银行账户", trigger: "blur"}],
  bankAccount: [{required: true, message: "请输入开户行", trigger: "blur"}],
  contactPerson: [{required: true, message: "联系人", trigger: "blur"}],
@@ -197,5 +209,11 @@
  ],
});
</script>
<style lang="sass" scoped>
<style lang="scss" scoped>
.dialog-footer {
  display: flex;
  justify-content: flex-end;
  margin-top: 20px;
  flex-direction: column;
}
</style>