linweizeng 3 ani în urmă
părinte
comite
a49fe76f34

+ 1 - 1
main.js

@@ -75,4 +75,4 @@ RouterMount(app, '#app');
 
 // #ifndef H5
 app.$mount(); //为了兼容小程序及app端必须这样写才有效果
-// #endif
+// #endif

+ 0 - 2
pages/jiance/jindu.vue

@@ -297,6 +297,4 @@
 		color: rgb(51, 51, 51);
 		font-size: 28rpx;
 	}
-
-	/* ------------------------------------------------------------- */
 </style>

+ 7 - 1
pages/jiance/order.vue

@@ -777,6 +777,9 @@
 				this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
 					if (res.data.state == 200) {
 						const datas = res.data.variables.data
+						datas.forEach(item => {
+							console.log(item.tao_can_zhu_jian_ == '1092492898412265472')
+						})
 						this.taoCanXiangmMuList = datas
 					}
 				})
@@ -1336,12 +1339,14 @@
 				this.$nextTick(() => {
 					this.$refs.lhypbMessage.getInit(obj)
 				})
+				this.getTotal()
 			},
 			deletSing(index) {
-				this.form.lhypb.splice(index, 1)
 				if (this.form.lhypb.length == index) {
 					this.lhypbIndex = this.form.lhypb.length - 1
 				}
+				this.form.lhypb.splice(index, 1)
+				this.getTotal()
 			},
 			//弹出框显示
 			qianming(index) {
@@ -1416,6 +1421,7 @@
 					this.lhypbShow = false
 					this.form.lhypb[this.lhypbIndex] = item
 				}
+				console.log(this.form.lhypb)
 				this.getTotal()
 			},
 			//退回原因

+ 6 - 1
pages/jiance/order/lhypbMessage.vue

@@ -518,6 +518,8 @@
 						return
 					}
 				} else {
+					console.log(it.id_)
+					console.log(itemData.taoCanXiangMuList[0].tao_can_zhu_jian_)
 					itemData.taoCanXiangMuList = itemData.taoCanXiangMuList.filter(item => item.tao_can_zhu_jian_ !== it
 						.id_)
 				}
@@ -688,6 +690,7 @@
 
 			//保存事件
 			sumbitSing() {
+				console.log("6")
 				if (this.form.yangPinZongJia == '') {
 					this.form.yangPinZongJia = 0
 				}
@@ -702,11 +705,12 @@
 				// if (itemShow && this.form.taoCanXiangMuList.length == 0) {
 				// 	return meth.getPrompt('请选择常规项目或者套餐项目')
 				// }
+				console.log(meth.getJudge(this.form))
 
 				if (!meth.getJudge(this.form)) {
 					return
 				}
-
+				console.log(meth.getJudge(this.form))
 
 
 
@@ -721,6 +725,7 @@
 				// }
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
+						console.log(this.form)
 						this.$emit("sumbitSingClick", this.form)
 					} else {
 						uni.showToast({

+ 4 - 3
pages/jiance/order/meth.js

@@ -107,12 +107,13 @@ export default {
 			//套餐项目处理
 			let tCXmList = JSON.parse(JSON.stringify(taoCanXiangmMuList))
 			let tcXmlist = []
-			if (item.tao_can_xiang_mu_) {
-				let taoCanXiangMu = item.tao_can_xiang_mu_.split(",")
+			if (item.tao_can_zi_biao_i) {
+				let taoCanXiangMu = item.tao_can_zi_biao_i.split(",")
 				if (tCXmList.length > 0 && taoCanXiangMu.length > 0) {
 					taoCanXiangMu.forEach(ite => {
-						let showData = tCXmList.find(itg => itg.id_ == ite)
+						let showData = tCXmList.find(itg => itg.tczbId == ite)
 						if (showData) {
+							console.log(showData)
 							tcXmlist.push(showData)
 						}
 					})

+ 34 - 39
pages/jiance/tousu.vue

@@ -59,16 +59,16 @@
 		</uni-section>
 
 		<view v-if="id != ''">
-			<uni-section title="确认意见" type="line">
+			<uni-section title="确认意见" type="line" v-if="form.shiFouGuoShen == '已反馈' || form.shiFouGuoShen == '已审核' || form.shiFouGuoShen == '已处理' || form.shiFouGuoShen == '已处理结果确认' || form.shiFouGuoShen == '1'">
 				<view class="u-m-15 u-p-b-15">
 					{{form.youWuYouXiaoTouSu}}
 				</view>
 				<view class="u-m-15 u-p-b-15">
-					{{option2}}
+					审批意见:{{option2}}
 				</view>
 			</uni-section>
 
-			<uni-section title="处理措施" type="line">
+			<uni-section title="处理措施" type="line" v-if="form.shiFouGuoShen == '已反馈' || form.shiFouGuoShen == '已处理' || form.shiFouGuoShen == '已处理结果确认' || form.shiFouGuoShen == '1'">
 				<view class="u-m-15 u-p-b-15">
 					调查情况:{{form.officeSurvey}}
 				</view>
@@ -76,53 +76,55 @@
 					处理措施:{{form.chuLiCuoShi}}
 				</view>
 				<view class="u-m-15 u-p-b-15">
-					{{option3}}
+					审批意见:{{option3}}
 				</view>
 			</uni-section>
 
-			<uni-section title="处理结果确认" type="line">
+			<uni-section title="处理结果确认" type="line" v-if="form.shiFouGuoShen == '已反馈' || form.shiFouGuoShen == '已处理结果确认' || form.shiFouGuoShen == '1'">
 				<view class="u-m-15 u-p-b-15">
 					处理时间:{{form.chuLiShiJian}}
 				</view>
 				<view class="u-m-15 u-p-b-15">
-					{{option4}}
+					审批意见:{{option4}}
 				</view>
 			</uni-section>
 
-			<uni-section title="处理结果是否通知当事人" type="line">
+			<uni-section title="处理结果是否通知当事人" type="line" v-if="form.shiFouGuoShen == '已反馈'  || form.shiFouGuoShen == '1'">
 				<view class="u-m-15 u-p-b-15">
 					通知:{{form.chuLiJieGuoShiFou}}
 				</view>
 				<view class="u-m-15 u-p-b-15">
-					{{option}}
+					审批意见:{{option}}
 				</view>
 			</uni-section>
 		</view>
 
-		<uni-section title="客户确认" type="line" v-if="id != ''">
-			<view class="u-m-15 u-p-b-15">
-				<uni-data-checkbox selectedColor="red" v-model="form.shiFouTongYi" :localdata="sexList" v-if="type == '1'">
-				</uni-data-checkbox>
-				<view v-if="type == '2'">{{form.shiFouTongYi}}</view>
-			</view>
-		</uni-section>
+		<view v-if="(id != '' && form.shiFouGuoShen == '1') || (id != '' && type == '1')">
+			<uni-section title="客户确认" type="line">
+				<view class="u-m-15 u-p-b-15">
+					<uni-data-checkbox selectedColor="red" v-model="form.shiFouTongYi" :localdata="sexList" v-if="type == '1'">
+					</uni-data-checkbox>
+					<view v-if="type == '2'">{{form.shiFouTongYi}}</view>
+				</view>
+			</uni-section>
 
-		<uni-section title="投诉签名" type="line" padding v-if="id != ''">
-			<view style="width: 100%;">
-				<view style="text-align: right;width: 100%;" v-if="type == '1'">
-					<view v-if="id != ''">
-						<u-button type="primary" size="mini" @click="qianming(0)">
-							签名</u-button>
-						<u-button type="primary" size="mini" @click="deqianming(0)" style="margin-left: 15rpx;" v-if="form.qianMing != ''">
-							取消</u-button>
+			<uni-section title="签名" type="line" padding>
+				<view style="width: 100%;">
+					<view style="text-align: right;width: 100%;" v-if="type == '1'">
+						<view v-if="id != ''">
+							<u-button type="primary" size="mini" @click="qianming">
+								签名</u-button>
+							<u-button type="primary" size="mini" @click="deqianming" style="margin-left: 15rpx;" v-if="form.qianMing != ''">
+								取消</u-button>
+						</view>
+					</view>
+					<view style="width: 100%;" v-if="form.qianMing != ''">
+						<image :src="form.qianMing" style="width: 100%;height: 500rpx;border: 1px #eee solid;">
+						</image>
 					</view>
 				</view>
-				<view style="width: 100%;" v-if="form.qianMing != ''">
-					<image :src="form.qianMing" style="width: 100%;height: 500rpx;border: 1px #eee solid;">
-					</image>
-				</view>
-			</view>
-		</uni-section>
+			</uni-section>
+		</view>
 
 		<view class="padding flex flex-direction">
 			<u-button type="success" class="btn btn-back-color" @click="onSubmit" v-if="id == ''">提交
@@ -576,23 +578,16 @@
 			},
 			//清除签名
 			deqianming(index) {
-				if (index == 0) {
-					this.form.qianMing = ''
-				}
+				this.form.qianMing = ''
 			},
 			//保存签名
 			save(val) {
-				if (this.qianIndex == 0) {
-					this.form.qianMing = val
-				}
-				this.qianshow = false
+				this.form.qianMing = val
 				this.popupShow = false
 			},
 			//清除签名
 			clear(val) {
-				if (this.qianIndex == 0) {
-					this.form.qianMing = ''
-				}
+				this.form.qianMing = ''
 			},
 			getShow() {
 				if (this.id != '') {

+ 4 - 32
pages/user/people.vue

@@ -7,8 +7,7 @@
 				</u-avatar>
 			</view>
 			<view class="padding flex text-center text-grey bg-white shadow-warp">
-				<view class="flex flex-sub flex-direction solid-right animation-slide-top"
-					:style="[{animationDelay: '0.2s'}]">
+				<view class="flex flex-sub flex-direction solid-right animation-slide-top" :style="[{animationDelay: '0.2s'}]">
 					<view class="text-xl text-orange">{{user.name}}</view>
 					<view class="margin-top-sm"><text class="cuIcon-people"></text> 用户</view>
 				</view>
@@ -20,45 +19,18 @@
 			</view>
 			<!-- 列表list-->
 			<view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg radius">
-				<navigator class="cu-item arrow animation-slide-bottom" url="/pages/wallet/wallet"
-					:style="[{animationDelay: '0.6s'}]">
+				<navigator class="cu-item arrow animation-slide-bottom" url="/pages/wallet/wallet" :style="[{animationDelay: '0.6s'}]">
 					<view class="content">
 						<text class="cuIcon-redpacket_fill text-red"></text>
 						<text class="text-grey">我的钱包</text>
 					</view>
 				</navigator>
-				<!--
-			<view class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.3s'}]" @tap="scan">
-			  <view class="content">
-			    <text class="cuIcon-scan text-red"></text>
-			    <text class="text-grey">扫码</text>
-			  </view>
-			</view>
-			
-			<view class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.1s'}]">
-			  <view class="content" >
-			    <text class="cuIcon-favorfill text-yellow"></text>
-			    <text class="text-grey">收藏</text>
-			  </view>
-			</view>
-			
-
-			
-			<navigator class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.4s'}]" url="/pages/user/location" hover-class="none">
-				<view class="content" >
-				    <text class="cuIcon-location text-cyan"></text>
-					<text class="text-grey">定位</text>
-				</view>
-			</navigator>
-			-->
-				<navigator class="cu-item arrow animation-slide-bottom" url="/pages/user/userdetail"
-					:style="[{animationDelay: '0.6s'}]">
+				<navigator class="cu-item arrow animation-slide-bottom" url="/pages/user/userdetail" :style="[{animationDelay: '0.6s'}]">
 					<view class="content">
 						<text class="cuIcon-settingsfill text-cyan"></text>
 						<text class="text-grey">个人信息</text>
 					</view>
 				</navigator>
-
 				<view class="cu-item arrow animation-slide-bottom" :style="[{animationDelay: '0.7s'}]" @click="getQuit">
 					<view class="content">
 						<text class="cuIcon-exit text-cyan"></text>
@@ -222,4 +194,4 @@
 		text-overflow: ellipsis;
 		width: 340rpx;
 	}
-</style>
+</style>

+ 0 - 1
pages/user/userdetail.vue

@@ -102,7 +102,6 @@
 					this.$methCommon.getPrompt('请填写正确的手机号码')
 					return
 				}
-				this.$methCommon.getShowToast()
 				this.$http.post('ibps/platform/v3/employee/update', {
 					partyEmployeePo: this.user,
 					user: this.user,