From 35b8f2e7b34875efebed526a7394ff50e65f8e90 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 22 十一月 2023 10:50:15 +0800
Subject: [PATCH] #
---
pages/business/plan/modiPlan2.vue | 241 +++++++++++++++++-----------------
pages/business/plan/modiPlan.vue | 29 +++
pages/business/plan/planDetails.vue | 36 +++--
pages.json | 32 ++++
pages/business/business.vue | 45 ++----
5 files changed, 213 insertions(+), 170 deletions(-)
diff --git a/pages.json b/pages.json
index db2bbef..332e6fb 100644
--- a/pages.json
+++ b/pages.json
@@ -310,6 +310,38 @@
"enablePullDownRefresh" : false
}
},
+ {
+ "path" : "pages/business/plan/modiPlan4",
+ "style" :
+ {
+ "navigationBarTitleText" : "闃佹ゼ璐ф灦/閽㈠钩鍙�",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/business/plan/modiPlan5",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍛ㄨ浆瀹瑰櫒",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/business/plan/modiPlan6",
+ "style" :
+ {
+ "navigationBarTitleText" : "骞冲簱",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/business/plan/modiPlan7",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍏朵粬",
+ "enablePullDownRefresh" : false
+ }
+ },
{
"path" : "pages/business/plan/addPlan7",
"style" :
diff --git a/pages/business/business.vue b/pages/business/business.vue
index 23d3456..ec0f70a 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -105,59 +105,42 @@
},
methods: {
select(id) {
+ let url = ''
switch(id) {
case 1:
- uni.navigateTo({
- url:'/pages/business/cstmr/csmtr'
- })
+ url = '/pages/business/cstmr/csmtr'
break;
case 2:
- uni.navigateTo({
- url:'/pages/business/saleManage/saleManage'
- })
+ url = '/pages/business/saleManage/saleManage'
break;
case 3:
- uni.navigateTo({
- url:'/pages/business/plan/plan'
- })
+ url = '/pages/business/plan/plan'
break;
case 4:
- uni.navigateTo({
- url:'/pages/business/cstmrInfo/cstmrInfo'
- })
+ url = '/pages/business/cstmrInfo/cstmrInfo'
break;
case 5:
- uni.navigateTo({
- url:'/pages/business/goBusiness/reimburseOnline'
- })
+ url = '/pages/business/goBusiness/reimburseOnline'
break;
case 6:
- uni.navigateTo({
- url:'/pages/business/goBusiness/goBusiness'
- })
+ url = '/pages/business/goBusiness/goBusiness'
break;
case 7:
- uni.navigateTo({
- url:'/pages/business/goBusiness/businessTripOther'
- })
+ url = '/pages/business/goBusiness/businessTripOther'
break;
case 8:
- uni.navigateTo({
- url:'/pages/business/pricing/priOnline'
- })
+ url = '/pages/business/pricing/priOnline'
break;
case 9:
- uni.navigateTo({
- url:'/pages/business/pricing/priQuote'
- })
+ url = '/pages/business/pricing/priQuote'
break;
case 10:
- uni.navigateTo({
- url:'/pages/business/pricing/contract'
- })
+ url = '/pages/business/pricing/contract'
break;
-
}
+ uni.navigateTo({
+ url:url
+ })
}
}
diff --git a/pages/business/plan/modiPlan.vue b/pages/business/plan/modiPlan.vue
index a329a57..4cca7d2 100644
--- a/pages/business/plan/modiPlan.vue
+++ b/pages/business/plan/modiPlan.vue
@@ -103,7 +103,7 @@
<uni-easyinput v-model="baseFormData.planLeaderBonus" placeholder="璇疯緭鍏ヨ鏍肩粍闀垮閲�" />
</uni-forms-item>
<uni-forms-item label="瀹屾垚鏃堕棿" name="finishTime">
- <uni-datetime-picker type="date" return-type="string" v-model="baseFormData.datetimesingle"/>
+ <uni-datetime-picker type="date" return-type="string" v-model="baseFormData.finishTime"/>
</uni-data-picker>
</uni-forms-item>
<uni-forms-item label="鏇存敼娆℃暟" name="changeTime">
@@ -293,11 +293,11 @@
changeValue: [
{
text: '鏄�',
- value: '1'
+ value: 1
},
{
text: '鍚�',
- value: '0'
+ value: 0
}
],
// 鍗曢�夋暟鎹簮
@@ -363,11 +363,32 @@
method: 'GET',
success(res) {
res = res.data
+ console.log(res);
if (res.code === 200) {
let planNeed = res.data.planNeed.split('-')
res.data.planNeed = []
for (let k of planNeed) {
res.data.planNeed.push(k)
+ }
+ switch(res.data.select_2) {
+ case 'value1':
+ res.data.select_2 = '妯寮�'
+ break;
+ case 'value2':
+ res.data.select_2 = '椹跺叆寮�'
+ break;
+ case 'value3':
+ res.data.select_2 = '鎮寮�'
+ break;
+ case 'value4':
+ res.data.select_2 = '娴佸埄寮�'
+ break;
+ case 'value5':
+ res.data.select_2 = '閲嶅姏寮�'
+ break;
+ case 'value6':
+ res.data.select_2 = '鍏朵粬'
+ break;
}
// planNeed.push()
that.baseFormData = res.data
@@ -497,7 +518,7 @@
success(result) {
var res = result.data
if (res.code === 200) {
- uni.navigateBack()
+ uni.navigateBack({delta:2})
} else if (res.code === 403) {
uni.showToast({title: res.msg, icon: "none", position: 'top'})
setTimeout(() => {
diff --git a/pages/business/plan/modiPlan2.vue b/pages/business/plan/modiPlan2.vue
index a329a57..363958f 100644
--- a/pages/business/plan/modiPlan2.vue
+++ b/pages/business/plan/modiPlan2.vue
@@ -11,7 +11,6 @@
v-model="baseFormData.orderId$" @input="autoLoad('order',baseFormData.orderId$)"></uni-combox>
</view>
</uni-forms-item>
-
<uni-forms-item label="瀹㈡埛鍚嶇О" required name="cstmrId">
<view @click="autoLoad('cstmr','')">
<uni-combox :candidates="cstmrs" placeholder="璇烽�夋嫨瀹㈡埛鍚嶇О"
@@ -23,13 +22,11 @@
<uni-easyinput v-model="baseFormData.userXmlSelPhone" placeholder="璇疯緭鍏ヤ笟鍔″憳鑱旂郴鏂瑰紡" />
</uni-forms-item>
<uni-forms-item label="涓氬姟绫诲瀷" required name="planType">
- <uni-easyinput disabled placeholder="璇疯緭鍏ュ唴瀹�" v-model="baseFormData.planType"></uni-easyinput>
+ <uni-easyinput disabled placeholder="璇疯緭鍏ヤ笟鍔＄被鍨�" v-model="baseFormData.planType"></uni-easyinput>
</uni-forms-item>
-
<uni-forms-item label="绔嬮」" name="beItem">
<uni-data-checkbox v-model="baseFormData.beItem" :localdata="beItem$" />
</uni-forms-item>
-
<uni-forms-item label="鎵�闇�" name="planNeed">
<uni-data-checkbox v-model="baseFormData.planNeed" multiple :localdata="planNeeds" />
</uni-forms-item>
@@ -38,61 +35,61 @@
- <uni-forms-item label="璐х墿瑙勬牸" required name="input_1">
- <uni-easyinput v-model="baseFormData.input_1" placeholder="璇疯緭鍏ヨ揣鐗╄鏍�" />
+ <uni-forms-item label="璐х墿瑙勬牸" required name="input_2">
+ <uni-easyinput v-model="baseFormData.input_2" placeholder="璇疯緭鍏ヨ揣鐗╄鏍�" />
</uni-forms-item>
- <uni-forms-item label="璐х墿閲嶉噺" required name="input_2">
- <uni-easyinput v-model="baseFormData.input_2" placeholder="璇疯緭鍏ヨ揣鐗╅噸閲�" />
+ <uni-forms-item label="璐х墿閲嶉噺" required name="input_5">
+ <uni-easyinput v-model="baseFormData.input_5" placeholder="璇疯緭鍏ヨ揣鐗╅噸閲�" />
</uni-forms-item>
- <uni-forms-item label="浠撳簱娓╁害" required name="input_6">
- <uni-easyinput v-model="baseFormData.input_6" placeholder="璇疯緭鍏ヤ粨搴撴俯搴�" />
+ <uni-forms-item label="鍘傛埧鍙敤楂樺害" required name="input_4">
+ <uni-easyinput v-model="baseFormData.input_4" placeholder="璇疯緭鍏ュ巶鎴垮彲鐢ㄩ珮搴�" />
</uni-forms-item>
- <uni-forms-item label="椤堕儴鏈�浣庣偣绂诲湴璺濈" required name="input_8">
- <uni-easyinput v-model="baseFormData.input_8" placeholder="璇疯緭鍏ヨ揣鐗╄鏍�" />
+ <uni-forms-item label="椤堕儴鏈�浣庣偣绂诲湴璺濈" required name="input_9">
+ <uni-easyinput v-model="baseFormData.input_9" placeholder="璇疯緭鍏ラ《閮ㄦ渶浣庣偣绂诲湴璺濈" />
</uni-forms-item>
- <uni-forms-item label="杩涘弶鏂瑰悜" required name="input_4">
- <uni-easyinput v-model="baseFormData.input_4" placeholder="璇疯緭鍏ヨ揣鐗╄鏍�" />
+ <uni-forms-item label="杩涘弶鏂瑰悜" required name="input_3">
+ <uni-easyinput v-model="baseFormData.input_3" placeholder="璇疯緭鍏ヨ繘鍙夋柟鍚�" />
</uni-forms-item>
- <uni-forms-item label="鍘傛埧鍙敤楂樺害" required name="input_5">
- <uni-easyinput v-model="baseFormData.input_5" placeholder="璇疯緭鍏ヨ揣鐗╄鏍�" />
+ <uni-forms-item label="浠撳簱娓╁害" required name="input_7">
+ <uni-easyinput v-model="baseFormData.input_7" placeholder="璇疯緭鍏ヤ粨搴撴俯搴�" />
</uni-forms-item>
- <uni-forms-item label="閫氶亾澶у皬鏈夋棤瑕佹眰" required name="input_7">
- <uni-easyinput v-model="baseFormData.input_7" placeholder="璇疯緭鍏ヨ揣鐗╄鏍�" />
+ <uni-forms-item label="鎶楅渿璁鹃槻鐑堝害" required name="input_6">
+ <uni-easyinput v-model="baseFormData.input_6" placeholder="璇疯緭鍏ユ姉闇囪闃茬儓搴�" />
</uni-forms-item>
- <uni-forms-item label="骞冲簱璐ф灦绫诲瀷" required name="select_2">
- <uni-combox :candidates="selList" placeholder="璇烽�夋嫨骞冲簱璐ф灦绫诲瀷"
- v-model="baseFormData.select_2"></uni-combox>
+ <uni-forms-item label="鍩烘湰鍦伴渿鍔犻�熷害" required name="input_11">
+ <uni-easyinput v-model="baseFormData.input_11" placeholder="璇疯緭鍏ュ熀鏈湴闇囧姞閫熷害" />
</uni-forms-item>
- <uni-forms-item label="鏄惁闇�瑕佽法姊�" name="radio_1">
- <uni-data-checkbox v-model="baseFormData.radio_1" :localdata="radio_1" />
+ <uni-forms-item label="绔嬩綋搴撹揣鏋剁被鍨�" required name="select_3">
+ <uni-combox :candidates="selList" placeholder="璇疯緭鍏ョ珛浣撳簱璐ф灦绫诲瀷"
+ v-model="baseFormData.select_3"></uni-combox>
</uni-forms-item>
- <uni-forms-item label="鏄惁闇�瑕佺綉灞傛澘" name="radio_2">
- <uni-data-checkbox v-model="baseFormData.radio_2" :localdata="radio_2" />
- </uni-forms-item>
- <uni-forms-item label="甯冨眬鍖哄煙鏄惁鎻愪緵CAD鍦哄湴鍥剧焊/鍦哄湴" name="radio_7">
- <uni-data-checkbox v-model="baseFormData.radio_7" :localdata="radio_7" />
+ <uni-forms-item label="瀹㈡埛鎶�鏈鎺ヨ仈绯绘柟寮忥紙閫夊～锛�" name="input_8">
+ <uni-easyinput v-model="baseFormData.input_8" placeholder="璇疯緭鍏ョ珛浣撳簱璐ф灦绫诲瀷" />
</uni-forms-item>
- <uni-forms-item label="鍦伴潰鏈夋棤鐢电紗娌�" name="radio_3">
- <uni-data-checkbox v-model="baseFormData.radio_3" :localdata="radio_3" />
- </uni-forms-item>
- <uni-forms-item label="鏄惁闇�瑕佸眰鏉�" name="radio_8">
- <uni-data-checkbox v-model="baseFormData.radio_8" :localdata="radio_8" />
- </uni-forms-item>
- <uni-forms-item label="鍦伴潰骞虫暣搴﹀拰鍦伴潰娌夐檷鏄惁婊¤冻鏍囧噯" name="radio_5">
+
+ <uni-forms-item label="鏄惁鏈夋秷闃茶姹�" name="radio_5">
<uni-data-checkbox v-model="baseFormData.radio_5" :localdata="radio_5" />
</uni-forms-item>
-
+ <uni-forms-item label="鍚﹂渶瑕佽揣鏋惰儗缃�" name="radio_8">
+ <uni-data-checkbox v-model="baseFormData.radio_8" :localdata="radio_8" />
+ </uni-forms-item>
+ <uni-forms-item label="鍦伴潰鏈夋棤鐢电紗娌�" name="radio_7">
+ <uni-data-checkbox v-model="baseFormData.radio_7" :localdata="radio_7" />
+ </uni-forms-item>
+ <uni-forms-item label="甯冨眬鍖哄煙鏄惁鎻愪緵CAD鍦哄湴鍥剧焊/鍦哄湴" name="radio_6">
+ <uni-data-checkbox v-model="baseFormData.radio_6" :localdata="radio_6" />
+ </uni-forms-item>
+ <uni-forms-item label="鍦伴潰骞虫暣搴﹀拰鍦伴潰娌夐檷鏄惁婊¤冻鏍囧噯" name="radio_10">
+ <uni-data-checkbox v-model="baseFormData.radio_10" :localdata="radio_10" />
+ </uni-forms-item>
<uni-forms-item label="鍏朵粬瑕佹眰鍙婃敞鎰忕偣" required name="textarea_2">
<uni-easyinput type="textarea" v-model="baseFormData.textarea_2" placeholder="璇疯緭鍏�" />
</uni-forms-item>
<br>
- <!-- <uni-forms-item label="瑙勫垝鍛�" name="planner$">
- <uni-easyinput v-model="baseFormData.planner$" placeholder="璇疯緭鍏ヨ鍒掑憳" />
- </uni-forms-item> -->
<uni-forms-item label="鏇存敼鏂规" name="change">
<uni-data-checkbox v-model="baseFormData.change" :localdata="changeValue" />
</uni-forms-item>
@@ -113,7 +110,7 @@
<uni-easyinput v-model="baseFormData.planBonus" placeholder="璇疯緭鍏ヨ鏍煎閲�" />
</uni-forms-item>
</uni-forms>
- <button type="primary" @click="addCstmr()">淇敼</button>
+ <button type="primary" @click="addCstmr()">娣诲姞</button>
</view>
</view>
</template>
@@ -136,17 +133,15 @@
userId: '',
appleTime: '',
cstmrId: '',
- planType: '绔嬩綋搴擄紙璐ф灦锛�',
+ planType: '绔嬩綋搴擄紙闆嗘垚锛�',
select_2: '',
changeReason: '',
changeTime: '',
planBonus: '',
planLeaderBonus: '',
- userXmlSelPhone: '',
- beItem: null
+ userXmlSelPhone: ''
},
- beItem: 0,
- selList: ['妯寮�','椹跺叆寮�','鎮寮�','娴佸埄寮�','閲嶅姏寮�','鍏朵粬'],
+ selList: ['鐗涜吙寮�','妯寮�','鏂拌兘婧�','鍏朵粬'],
rules: {
name: {
rules: [{
@@ -160,10 +155,22 @@
errorMessage: '璇烽�夋嫨璺熻釜椤圭洰',
}]
},
- userXmlSelPhone: {
+ userId: {
rules: [{
required: true,
errorMessage: '璇烽�夋嫨涓氬姟鍛�',
+ }]
+ },
+ userXmlSelPhone: {
+ rules: [{
+ required: true,
+ errorMessage: '璇峰～鍐欎笟鍔″憳鑱旂郴鏂瑰紡',
+ }]
+ },
+ appleTime: {
+ rules: [{
+ required: true,
+ errorMessage: '璇烽�夋嫨鐢宠鏃ユ湡',
}]
},
cstmrId: {
@@ -178,99 +185,73 @@
errorMessage: '璇疯緭鍏ヤ笟鍔＄被鍨�',
}]
},
- input_1: {
+ input_2: {
rules: [{
required: true,
errorMessage: '璇疯緭鍏ヨ揣鐗╄鏍�',
}]
},
- input_2: {
+ input_5: {
rules: [{
required: true,
errorMessage: '璇疯緭鍏ヨ揣鐗╅噸閲�',
}]
},
- input_6: {
- rules: [{
- required: true,
- errorMessage: '璇疯緭鍏ヤ粨搴撴俯搴�',
- }]
- },
- input_8: {
- rules: [{
- required: true,
- errorMessage: '璇疯緭鍏ラ《閮ㄦ渶浣庣偣绂诲湴璺濈',
- }]
- },
input_4: {
- rules: [{
- required: true,
- errorMessage: '璇疯緭鍏ヨ繘鍙夋柟鍚�',
- }]
- },
- input_5: {
rules: [{
required: true,
errorMessage: '璇疯緭鍏ュ巶鎴垮彲鐢ㄩ珮搴�',
}]
},
+ input_9: {
+ rules: [{
+ required: true,
+ errorMessage: '璇疯緭鍏ラ《閮ㄦ渶浣庣偣绂诲湴璺濈',
+ }]
+ },
+ input_3: {
+ rules: [{
+ required: true,
+ errorMessage: '璇疯緭鍏ヨ繘鍙夋柟鍚�',
+ }]
+ },
input_7: {
rules: [{
required: true,
- errorMessage: '璇疯緭鍏ラ�氶亾澶у皬鏈夋棤瑕佹眰',
+ errorMessage: '璇疯緭鍏ヤ粨搴撴俯搴�',
}]
},
- select_2: {
+ input_6: {
rules: [{
required: true,
- errorMessage: '璇烽�夋嫨骞冲簱璐ф灦绫诲瀷',
+ errorMessage: '璇疯緭鍏ユ姉闇囪闃茬儓搴�',
+ }]
+ },
+ input_11: {
+ rules: [{
+ required: true,
+ errorMessage: '璇疯緭鍏ュ熀鏈湴闇囧姞閫熷害',
+ }]
+ },
+ select_3: {
+ rules: [{
+ required: true,
+ errorMessage: '璇烽�夋嫨绔嬪簱璐ф灦绫诲瀷',
}]
},
},
- // 鏄惁闇�瑕佽法姊�
- radio_1: [
- {
- text: '鏄�',
- value: 'value1'
- },
- {
- text: '鍚�',
- value: 'value2'
- }
- ],
- // 鏄惁闇�瑕佺綉灞傛澘
- radio_2: [
- {
- text: '鏄�',
- value: 'value1'
- },
- {
- text: '鍚�',
- value: 'value2'
- }
- ],
- radio_8: [
- {
- text: '鏄�',
- value: 'value1'
- },
- {
- text: '鍚�',
- value: 'value2'
- }
- ],
- radio_3: [
- {
- text: '鏄�',
- value: 'value1'
- },
- {
- text: '鍚�',
- value: 'value2'
- }
- ],
radio_5: [
+ {
+ text: '鏄�',
+ value: 'value1'
+ },
+ {
+ text: '鍚�',
+ value: 'value2'
+ }
+ ],
+ radio_6: [
{
text: '鏄�',
value: 'value1'
@@ -290,14 +271,34 @@
value: 'value2'
}
],
- changeValue: [
+ radio_8: [
{
text: '鏄�',
- value: '1'
+ value: 'value1'
},
{
text: '鍚�',
- value: '0'
+ value: 'value2'
+ }
+ ],
+ radio_10: [
+ {
+ text: '鏄�',
+ value: 'value1'
+ },
+ {
+ text: '鍚�',
+ value: 'value2'
+ }
+ ],
+ changeValue: [
+ {
+ text: '鏄�',
+ value: 1
+ },
+ {
+ text: '鍚�',
+ value: 0
}
],
// 鍗曢�夋暟鎹簮
@@ -351,8 +352,6 @@
})
}
})
-
-
},
methods: {
init() {
@@ -363,6 +362,7 @@
method: 'GET',
success(res) {
res = res.data
+ console.log(res);
if (res.code === 200) {
let planNeed = res.data.planNeed.split('-')
res.data.planNeed = []
@@ -448,6 +448,7 @@
addCstmr() {
let that = this
var element
+
for (element of that.cstmrList) {
if(element.value == that.baseFormData.cstmrId$) {
that.baseFormData.cstmrId = element.id
@@ -464,11 +465,11 @@
// }
// }
for(var i = 1;i <= that.selList.length; i++) {
- if (that.selList[i] == that.baseFormData.select_2) {
- that.baseFormData.select_2 = 'value' + i
+ if (that.selList[i] == that.baseFormData.select_3) {
+ that.baseFormData.select_3 = 'value' + i
}
}
- that.baseFormData.planType = 4
+ that.baseFormData.planType = 5
var temp
for (var i = 0 ; i < that.baseFormData.planNeed.length; i++) {
if (i == 0) {
@@ -487,7 +488,7 @@
}
res['id'] = that.baseFormData.id
uni.request({
- url: that.baseUrl + '/plan/update/auth',
+ url: that.baseUrl + '/plan/add/auth',
header:{
'token':uni.getStorageSync('token'),
'content-type':'application/x-www-form-urlencoded',
diff --git a/pages/business/plan/planDetails.vue b/pages/business/plan/planDetails.vue
index 729f3b0..25efd8a 100644
--- a/pages/business/plan/planDetails.vue
+++ b/pages/business/plan/planDetails.vue
@@ -142,7 +142,7 @@
method: 'GET',
success(res) {
res = res.data
- // console.log(res);
+ console.log(res);
if (res.code === 200) {
that.detl = res.data
that.active = res.data.settle
@@ -151,21 +151,27 @@
key.desc = key.username
}
that.current = res.data.settle-1
- switch(res.data.select_3) {
- case 'value1':
- res.data.select_3 = '鐗涜吙寮�'
- break;
- case 'value2':
- res.data.select_3 = '妯寮�'
- break;
- case 'value3':
- res.data.select_3 = '鏂拌兘婧�'
- break;
- case 'value4':
- res.data.select_3 = '鍏朵粬'
- break;
- }
if (res.data.planType == 4) {
+ switch(res.data.select_2) {
+ case 'value1':
+ res.data.select_2 = '妯寮�'
+ break;
+ case 'value2':
+ res.data.select_2 = '椹跺叆寮�'
+ break;
+ case 'value3':
+ res.data.select_2 = '鎮寮�'
+ break;
+ case 'value4':
+ res.data.select_2 = '娴佸埄寮�'
+ break;
+ case 'value5':
+ res.data.select_2 = '閲嶅姏寮�'
+ break;
+ case 'value6':
+ res.data.select_2 = '鍏朵粬'
+ break;
+ }
that.info.push(
{name:'璐х墿瑙勬牸',val:res.data.input_1},
{name:'璐х墿閲嶉噺',val:res.data.input_2},
--
Gitblit v1.9.1