From 72a4a671431d25095146dc7e36efbb4a871c39b9 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 02 十二月 2023 10:47:37 +0800
Subject: [PATCH] #
---
pages/business/cstmr/modiCsmter.vue | 50 +++++++++++++++++++-----
pages/business/cstmr/addCsmtr.vue | 31 ++++++++++++---
pages/user/user.vue | 4 +-
3 files changed, 66 insertions(+), 19 deletions(-)
diff --git a/pages/business/cstmr/addCsmtr.vue b/pages/business/cstmr/addCsmtr.vue
index 2ad5b3a..94d805f 100644
--- a/pages/business/cstmr/addCsmtr.vue
+++ b/pages/business/cstmr/addCsmtr.vue
@@ -19,10 +19,11 @@
v-model="baseFormData.cstmrType" @input="autoLoad('cstmrType',baseFormData.cstmrType)"></uni-combox>
</view>
</uni-forms-item>
- <uni-forms-item label="瀹㈡埛琛屼笟" required name="industry">
- <view >
- <uni-combox :candidates="industrys" placeholder="璇烽�夋嫨瀹㈡埛琛屼笟"
- v-model="baseFormData.industry"></uni-combox>
+ <uni-forms-item label="瀹㈡埛琛屼笟" name="industry" required>
+ <view @click="autoLoad('customerIndustryName','')">
+ <uni-combox :candidates="industrys" placeholder="璇烽�夋嫨瀹㈡埛琛屼笟"
+ v-model="baseFormData.industry"
+ @input="autoLoad('customerIndustryName',baseFormData.industry)"></uni-combox>
</view>
</uni-forms-item>
@@ -80,7 +81,8 @@
directorList: [],
names: [],
nameList: [],
- industrys: ['鍖昏嵂涓�','鍒堕�犱笟','绾虹粐涓�'],
+ industrys: [],
+ industryList: [],
productCategorys: [],
productCategoryList: [],
baseFormData: {
@@ -232,6 +234,7 @@
that.cstmrTypes = []
that.directors = []
that.directorList = []
+ that.industrys = []
var a = that.baseUrl + '/' + type + 'Query/auth'
uni.request({
url: that.baseUrl + '/' + type + 'Query' +'/auth',
@@ -263,7 +266,13 @@
}
return
}
-
+ if (type == 'customerIndustryName') {
+ for (element of res.data) {
+ that.industrys.push(element.value)
+ that.industryList.push(element)
+ }
+ return
+ }
}
}
})
@@ -282,6 +291,16 @@
that.baseFormData.cstmrType = element.id
}
}
+ for (element of that.productCategoryList) {
+ if(element.value == that.baseFormData.productCategory) {
+ that.baseFormData.productCategory = element.id
+ }
+ }
+ for (element of that.industryList) {
+ if(element.value == that.baseFormData.industry) {
+ that.baseFormData.industry = element.id
+ }
+ }
this.$refs.baseForm.validate().then(res=>{
if (res.rela == undefined) {
res.rela = ''
diff --git a/pages/business/cstmr/modiCsmter.vue b/pages/business/cstmr/modiCsmter.vue
index 42222d1..c51fd77 100644
--- a/pages/business/cstmr/modiCsmter.vue
+++ b/pages/business/cstmr/modiCsmter.vue
@@ -19,17 +19,19 @@
v-model="baseFormData.cstmrType$" @input="autoLoad('cstmrType',baseFormData.cstmrType$)"></uni-combox>
</view>
</uni-forms-item>
- <uni-forms-item label="瀹㈡埛琛屼笟" required name="industry">
- <view >
- <uni-combox :candidates="industrys" placeholder="璇烽�夋嫨瀹㈡埛琛屼笟"
- v-model="baseFormData.industry"></uni-combox>
+ <uni-forms-item label="瀹㈡埛琛屼笟" name="industry" required>
+ <view @click="autoLoad('customerIndustryName','')">
+ <uni-combox :candidates="industrys" placeholder="璇烽�夋嫨瀹㈡埛琛屼笟"
+ v-model="baseFormData.industry"
+ @input="autoLoad('customerIndustryName',baseFormData.industry)"></uni-combox>
</view>
</uni-forms-item>
- <uni-forms-item label="浜у搧绫诲埆" required name="productCategory">
- <view>
- <uni-combox :candidates="productCategorys" placeholder="璇烽�夋嫨浜у搧绫诲埆"
- v-model="baseFormData.productCategory"></uni-combox>
+ <uni-forms-item label="浜у搧绫诲瀷" name="productCategory" required>
+ <view @click="autoLoad('orderProductType','')">
+ <uni-combox :candidates="productCategorys" placeholder="璇烽�夋嫨浜у搧绫诲瀷"
+ v-model="baseFormData.productCategory"
+ @input="autoLoad('orderProductType',baseFormData.orderProductTypeId)"></uni-combox>
</view>
</uni-forms-item>
@@ -81,8 +83,10 @@
directorList: [],
names: [],
nameList: [],
- industrys: ['鍖昏嵂涓�','鍒堕�犱笟','绾虹粐涓�'],
- productCategorys: ['绔嬩綋搴擄紙璐ф灦锛�','绔嬩綋搴擄紙闆嗘垚锛�','鍥涘悜绌挎搴�/涓ゅ悜绌挎搴�','闃佹ゼ璐ф灦/閽㈠钩鍙�','鍛ㄨ浆瀹瑰櫒','骞冲簱'],
+ industrys: [],
+ industryList: [],
+ productCategorys: [],
+ productCategoryList: [],
baseFormData: {
name: '',
citysData: [],
@@ -261,6 +265,7 @@
that.cstmrTypes = []
that.directors = []
that.directorList = []
+ that.industrys = []
var a = that.baseUrl + '/' + type + 'Query/auth'
uni.request({
url: that.baseUrl + '/' + type + 'Query' +'/auth',
@@ -285,7 +290,20 @@
}
return
}
-
+ if (type == 'orderProductType') {
+ for (element of res.data) {
+ that.productCategorys.push(element.value)
+ that.productCategoryList.push(element)
+ }
+ return
+ }
+ if (type == 'customerIndustryName') {
+ for (element of res.data) {
+ that.industrys.push(element.value)
+ that.industryList.push(element)
+ }
+ return
+ }
}
}
})
@@ -304,6 +322,16 @@
that.baseFormData.cstmrType = element.id
}
}
+ for (element of that.productCategoryList) {
+ if(element.value == that.baseFormData.productCategory) {
+ that.baseFormData.productCategory = element.id
+ }
+ }
+ for (element of that.industryList) {
+ if(element.value == that.baseFormData.industry) {
+ that.baseFormData.industry = element.id
+ }
+ }
this.$refs.baseForm.validate().then(res=>{
if (res.rela == undefined) {
res.rela = ''
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 88cb154..bde3de5 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -42,11 +42,11 @@
username: '',
Data: [
{ field: 'planPendingTaskCount', title: '瑙勫垝鐢宠鍗�', hide: false,value: ''},
- { field: 'planPriOnlinePendingTaskCount', title: '鏍镐环瀹℃壒', hide: false,value: '' },
+ { field: 'priOnlinePendingTaskCount', title: '鏍镐环瀹℃壒', hide: false,value: '' },
{ field: 'priQuotePendingTaskCount', title: '鎶ヤ环瀹℃壒', hide: false,value: '' },
{ field: 'businessTripPendingTaskCount', title: '鍑哄樊瀹℃壒', hide: false,value: '' },
{ field: 'reimburseOnlinePendingTaskCount', title: '鎶ラ攢瀹℃壒', hide: false,value: '' },
- { field: 'priOnlinePendingTaskCount', title: '鍙帴鏀舵牳浠蜂换鍔�', hide: false,value: '' },
+ { field: 'planPriOnlinePendingTaskCount', title: '鍙帴鏀舵牳浠蜂换鍔�', hide: false,value: '' },
],
data2: []
}
--
Gitblit v1.9.1