From 3c63bfcb45c622fee76934a0cfefdc1a9396fc8d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 07 二月 2025 13:33:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
index d072897..d1db71d 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/CreateCustomer.vue
@@ -13,6 +13,13 @@
const route = useRoute()
let produceList = ref([])
const userStore = useUserInfoStore()
+const props = defineProps({
+ getOrderPage:null
+})
+
+let emit = defineEmits([
+ 'getOrderFunction'
+])
@@ -96,7 +103,12 @@
if(res.code==200 && res.data===true){
resetForm()
ElMessage.success(t('basicData.msg.saveSuccess'))
- router.push({path:'/main/customer/selectCustomer',query:{random:Math.random()}})
+ if(!props.getOrderPage){
+ router.push({path:'/main/customer/selectCustomer',query:{random:Math.random()}})
+ }else{
+ emit('getOrderFunction')
+ }
+
}else{
ElMessage.warning(t('basicData.msg.saveFail'))
}
@@ -121,41 +133,38 @@
<template>
<div class="main-div">
-
- <div class="order-primary" >
<el-row>
- <el-col :span="2"><el-text>{{ $t('customer.customerName') }}:</el-text></el-col>
+ <el-col :span="4"><el-text>{{ $t('customer.customerName') }}:</el-text></el-col>
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.customerName" ></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>{{ $t('customer.customerAbbreviation') }}:</el-text></el-col>
+ <el-col :span="4"><el-text>{{ $t('customer.customerAbbreviation') }}:</el-text></el-col>
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.customerAbbreviation" ></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>{{ $t('customer.customerGrade') }}:</el-text></el-col>
+ <el-col :span="4"><el-text>{{ $t('customer.customerGrade') }}:</el-text></el-col>
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.grade" ></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>{{ $t('customer.moneyLimit') }}:</el-text></el-col>
+ <el-col :span="4"><el-text>{{ $t('customer.moneyLimit') }}:</el-text></el-col>
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.moneyLimit" ></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>{{ $t('customer.address') }}:</el-text></el-col>
+ <el-col :span="4"><el-text>{{ $t('customer.address') }}:</el-text></el-col>
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.address" ></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>{{ $t('customer.contacts') }}:</el-text></el-col>
+ <el-col :span="4"><el-text>{{ $t('customer.contacts') }}:</el-text></el-col>
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.contact" ></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>{{ $t('customer.telephone') }}:</el-text></el-col>
+ <el-col :span="4"><el-text>{{ $t('customer.telephone') }}:</el-text></el-col>
<el-col :span="5"><el-input style="font-size: large;color: #181818" v-model="ruleForm.phone" ></el-input></el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-button type="primary" @click="submitForm()">{{ $t('basicData.save') }}</el-button></el-col>
- <el-col :span="2"><el-button @click="resetForm()">{{ $t('customer.resetting') }}</el-button></el-col>
+ <el-col :span="4"><el-button type="primary" @click="submitForm()">{{ $t('basicData.save') }}</el-button></el-col>
+ <el-col :span="4"><el-button @click="resetForm()">{{ $t('customer.resetting') }}</el-button></el-col>
</el-row>
- </div>
</div>
--
Gitblit v1.8.0