梅陇验收后问题修复

pageA/club/sicknessBenefit.vue

@@ -7,14 +7,14 @@
 			<hsInput label="疾病名称" v-model="form.jbmc" />
 			<hsInput label="住院日期" v-model="form.zhuyuanDate" model="date" />
 			<hsInput label="出院日期" v-model="form.chuyuanDate" model="date" />
-			<hsPhoto label="添加出院小结照片" limit="5" v-model="form.fjtp"></hsPhoto>
+			<hsPhoto label="添加出院小结照片，工会会员卡照片" limit="5" v-model="form.fjtp"></hsPhoto>
 		</view>
 		<view v-if="type === '2'">
 			<hsInput label="出院小结" v-model="form.cyxj" />
 			<hsInput label="疾病名称" v-model="form.jbmc" />
 			<hsInput label="住院日期" v-model="form.zhuyuanDate" model="date" />
 			<hsInput label="出院日期" v-model="form.chuyuanDate" model="date" />
-			<hsPhoto label="清添加”疾病病理报告” 和“出院小结” 照片" limit="5" v-model="form.fjtp"></hsPhoto>
+			<hsPhoto label="请添加疾病病理报告，出院小结照片，工会会员卡照片" limit="5" v-model="form.fjtp"></hsPhoto>
 		</view>
 		<view v-if="type === '3'">
 			<view class="desc">

pageA/integral/expenseCalendar.vue

@@ -46,17 +46,21 @@
 							@touchend="drawEnd" :style="'right:'+item.right+'px'">
 							<view class="listItemStyle">
 								<u-row>
-									<u-col span="3">
-										<view class="orderFoodStyle orderFoodType0">
+									<u-col span="2.7">
+										<view v-if="item.statusText === '已退单'" style="color:red;"
+											class="orderFoodStyle orderFoodType0">
+											{{item.statusText}}
+										</view>
+										<view v-else class="orderFoodStyle orderFoodType0">
 											{{item.statusText}}
 										</view>
 									</u-col>
-									<u-col span="5" class="orderFoodStyle orderFoodType">
+									<u-col span="7" class="orderFoodStyle orderFoodType">
 										<view style="font-size: 24rpx;">
 											订单：{{item.orderNumber}}
 										</view>
 									</u-col>
-									<u-col span="4" textAlign="right">
+									<u-col span="2.3" textAlign="right">
 										<view class="moneyText">
 											{{"- "+item.orderTotal+""}}
 										</view>
@@ -75,10 +79,10 @@
 										</view>
 									</u-col>
 									<u-col span="2" class="orderTimeText">
-										<view v-if="item.isNews === '1'"
+										<!-- <view v-if="item.isNews === '1'"
 											style="font-size: 22rpx;color: rgb(55,186,189);" @click="toJDPage(item)">
 											新消息
-										</view>
+										</view> -->
 									</u-col>
 								</u-row>
 							</view>
@@ -180,19 +184,24 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/giftBack?orderId=' + uni.getStorageSync("orderNumber"),
+					url: '/app/backOd?on=' + uni.getStorageSync("orderNumber"),
 					method: 'get',
 					data: this.from,
 					urlType: this.$getUrlType()
 				});
 				if (res.code === 200) {
-					this.$showModal('退单成功')
-					uni.redirectTo({
-						url: 'expenseCalendar'
-					});
+					uni.showModal({
+						content: "退单成功",
+						title: '提示',
+						showCancel: false,
+						success() {
+							uni.redirectTo({
+								url: 'expenseCalendar'
+							});
+						}
+					})
 				} else {
-					this.modalContent2.content = res.msg
-					this.modalContent2.show = true
+					this.$showModal(res.msg)
 				}
 			},
 			change(e) {
@@ -287,7 +296,7 @@
 			//删除方法
 			delData(item) {
 				this.modalContent1.show = true;
-				uni.setStorageSync("orderNumber", item.orderId)
+				uni.setStorageSync("orderNumber", item.orderNumber)
 				//关闭侧边滑动
 				item.right = 0
 			}
@@ -374,4 +383,4 @@
 		color: #bebebe;
 		font-size: 24rpx;
 	}
-</style>
+</style>

pageA/integral/list.vue

@@ -106,7 +106,7 @@
 				<u-row>
 					<u-col span="7">
 						<view class="sum_price_view">
-							<span>合计：</span>
+							<span>合计</span>
 							<u-row>
 								<u-col span="3">
 									<u-icon name="integral" color="#aa0000" size="30"></u-icon>
@@ -118,6 +118,19 @@
 								</u-col>
 							</u-row>
 						</view>
+						<view class="sum_price_view">
+							<span>可用余额</span>
+							<u-row>
+								<u-col span="2">
+									<u-icon name="integral" color="#000000" size="20"></u-icon>
+								</u-col>
+								<u-col span="10">
+									<view style="margin-left: 5rpx;color:#000000;font-size: 35rpx;">
+										{{dqye}}
+									</view>
+								</u-col>
+							</u-row>
+						</view>
 					</u-col>
 					<u-col span="5">
 						<u-button class="btnDoPay" shape="circle" @click="toOKPage" :disabled="isDisabled"
@@ -141,6 +154,7 @@
 				data: {
 					organizationName: "",
 				},
+				dqye: uni.getStorageSync('userInfo').integral,
 				jcd: [],
 				from: {
 					userNumber: '',
@@ -351,11 +365,7 @@
 				} else {
 					uni.hideLoading()
 					this.isDisabled = false
-					uni.showToast({
-						duration: 1500,
-						title: res.msg,
-						icon: 'none'
-					});
+					this.$showModal(res.msg)
 				}
 			},
 			submitDate() {},
@@ -460,7 +470,7 @@
 		left: 0px;
 		bottom: 0px;
 		width: 100%;
-		height: 80px;
+		height: 110px;
 		background-color: #ffffff;
 		z-index: 9999;
 	}
@@ -472,7 +482,7 @@
 
 	.sum_price_view {
 		margin-left: 10px;
-		display: flex;
+		// display: flex;
 		justify-content: unset;
 		align-items: baseline;
 	}
@@ -480,4 +490,4 @@
 	.btnDoPay {
 		width: 100%;
 	}
-</style>
+</style>

pageA/integral/shopcarTemporary.vue

@@ -130,23 +130,18 @@
 			},
 			toOKPage() {
 				let that = this
-				uni.requestSubscribeMessage({
-					tmplIds: ['-57EtxA5K6MUpKbvQwHblrKldu5j1tG6-JlYZNpIZ04'],
-					success(res) {
-						let data = uni.getStorageSync('shopData')
-						if (data && data.length > 0) {
-							uni.navigateTo({
-								url: 'list'
-							})
-						} else {
-							uni.showToast({
-								duration: 1500,
-								title: '请选择至少一个物品',
-								icon: 'none'
-							})
-						}
-					}
-				})
+				let data = uni.getStorageSync('shopData')
+				if (data && data.length > 0) {
+					uni.navigateTo({
+						url: 'list'
+					})
+				} else {
+					uni.showToast({
+						duration: 1500,
+						title: '请选择至少一个物品',
+						icon: 'none'
+					})
+				}
 			}
 		}
 	}
@@ -186,4 +181,4 @@
 	.btnDoPay {
 		width: 100%;
 	}
-</style>
+</style>

pageA/msg/userMsgList.vue

@@ -244,6 +244,7 @@
 						})
 					}
 				} else if (this.tabType === 3) {
+					console.log(item.msgType)
 					if (item.msgType) {
 						if (item.msgType === '1') {
 							this.gtdToId(item.remark, 1, '1')
@@ -275,6 +276,11 @@
 								url: "../club/welfareList"
 							})
 						}
+						if (item.msgType === '9') {
+							uni.navigateTo({
+								url: "../club/index"
+							})
+						}
 					}
 				}
 			},
@@ -329,6 +335,8 @@
 							this.$goto('../../pageApp/ge/gePurchase')
 						} else if (res.data[0].examplesId === uni.getStorageSync('contract_approval_flow_run_key')) {
 							this.$goto('../../pageApp/ge/geContract')
+						} else if (res.data[0].examplesId === uni.getStorageSync('use_seal_approval_flow_run_key')) {
+							this.$goto('../../pageApp/ge/geUseSeal')
 						}
 						uni.hideLoading({
 							mask: true

pageApp/administration/useSeal.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view style="padding:5rpx 20rpx 45rpx 20rpx;">
+		<view>
 			<view class="desc">
 				<hs-input label="申请人" v-model="form.name" :disabled="true" />
 			</view>
@@ -16,14 +16,14 @@
 			<view class="desc">
 				<hs-dict-select label="使用地点" dictKey="hzl_seal_use_address" v-model="form.usE" />
 			</view>
-			<view class="desc">
+			<view class="desc" v-if="form.usA==='2'">
 				<uni-row>
-					<uni-col :span="6">
+					<uni-col :span="7">
 						<view class="desc" style="font-size: 25rpx;">
 							用印开始时间
 						</view>
 					</uni-col>
-					<uni-col :span="18">
+					<uni-col :span="16">
 						<view>
 							<uni-datetime-picker type="date" :clear-icon="false" v-model="form.usFTime"
 								@maskClick="maskClick" @change="onchange()" />
@@ -31,14 +31,14 @@
 					</uni-col>
 				</uni-row>
 			</view>
-			<view class="desc">
+			<view class="desc" v-if="form.usA==='2'">
 				<uni-row>
-					<uni-col :span="6">
+					<uni-col :span=" 7">
 						<view class="desc" style="font-size: 25rpx;">
 							用印结束时间
 						</view>
 					</uni-col>
-					<uni-col :span="18">
+					<uni-col :span="16">
 						<view>
 							<uni-datetime-picker type="date" :clear-icon="false" v-model="form.usDTime"
 								@maskClick="maskClick" @change="onchange()" />
@@ -46,14 +46,14 @@
 					</uni-col>
 				</uni-row>
 			</view>
-			<view class="desc">
+			<view class="desc" v-if="form.usA==='2'">
 				<uni-row>
 					<uni-col :span="5">
 						<view class="desc" style="font-size: 25rpx;">
 							归还时间
 						</view>
 					</uni-col>
-					<uni-col :span="19">
+					<uni-col :span="18">
 						<view>
 							<uni-datetime-picker type="date" :clear-icon="false" v-model="form.usJTime"
 								@maskClick="maskClick" @change="onchange()" />
@@ -70,6 +70,32 @@
 			<view class="desc">
 				<hs-input label="文件份数" v-model="form.soI" />
 			</view>
+			<hs-photo label="文件预览照片" limit="10" v-model="form.photos"></hs-photo>
+			<!-- 	<view class="desc">
+				<uni-row>
+					<uni-col :span="9">
+						<view style="font-size: 25rpx;">
+							纸质文件是否有签字
+						</view>
+					</uni-col>
+					<uni-col :span="15">
+						<view>
+							<uni-row>
+								<radio-group @change="radioChange2">
+									<uni-col :span="12" v-for="(item, index) in radiolist2">
+										<label :key="item.value">
+											<radio color="rgb(55,186,189)" :value="item.value"
+												:checked="index === current">
+												{{item.value}}
+											</radio>
+										</label>
+									</uni-col>
+								</radio-group>
+							</uni-row>
+						</view>
+					</uni-col>
+				</uni-row>
+			</view> -->
 			<view class="desc">
 				<hs-input label="申请原因" v-model="form.conclusion" model="textarea" />
 			</view>
@@ -127,6 +153,7 @@
 	export default {
 		data() {
 			return {
+				current: 0,
 				isDisabled: false,
 				selectTitle: '',
 				hxForm: {},
@@ -139,8 +166,17 @@
 					deptDatas: [],
 					deptIndex: uni.getStorageSync('deptData'),
 				},
+				radiolist2: [{
+						value: '否'
+					},
+					{
+						value: '是'
+					}
+				],
 				defaultDept: '',
-				form: {}
+				form: {
+					isSign: '否'
+				}
 			}
 		},
 		onLoad() {
@@ -148,6 +184,9 @@
 			this.form.name = uni.getStorageSync("userInfo").nickName
 		},
 		methods: {
+			radioChange2: function(evt) {
+				this.form.isSign = evt.detail.value
+			},
 			async submit() {
 				this.isDisabled = true
 				setTimeout(() => {
@@ -226,7 +265,7 @@
 
 <style lang="scss" scoped>
 	.desc {
-		padding: 10rpx 5rpx;
+		padding: 10rpx 15rpx;
 		color: #818181;
 		font-size: 20rpx;
 	}
@@ -251,4 +290,4 @@
 		height: 40px;
 		background-color: #ffffff;
 	}
-</style>
+</style>

pageApp/components/ge.vue

@@ -33,7 +33,7 @@
 		<u-gap height="110"></u-gap>
 		<view v-if="data.pageType === 1 && zindeButtion === 1 && data.isEnd === '0'" class="bomButtonBody"
 			style="position: fixed;bottom: 0">
-			<uni-row>
+			<uni-row v-if="isEnd === 0">
 				<uni-col :span="10">
 					<view class="desc">
 						<u-button color="rgb(55,186,189)" shape="circle" size="large"
@@ -54,6 +54,33 @@
 					</view>
 				</uni-col>
 			</uni-row>
+			<uni-row v-if="isEnd === 1">
+				<uni-col :span="9">
+					<view class="desc">
+						<u-button color="rgb(55,186,189)" shape="circle" size="large"
+							@click="passTrue('同意','RESULT_TRUE','bottom')">同意，下一步
+						</u-button>
+					</view>
+				</uni-col>
+				<uni-col :span="5">
+					<view class="desc">
+						<u-button color="rgb(188, 188, 188)" shape="circle" size="large"
+							@click="passTrue('驳回','RESULT_FALSE','bottom')">驳回</u-button>
+					</view>
+				</uni-col>
+				<uni-col :span="5">
+					<view class="desc">
+						<u-button color="rgb(136, 188, 160)" shape="circle" size="large"
+							@click="passTrue('驳回','RESULT_CASE_OF','bottom')">转交</u-button>
+					</view>
+				</uni-col>
+				<uni-col :span="5">
+					<view class="desc">
+						<u-button color="rgb(136, 188, 160)" shape="circle" size="large"
+							@click="confirm1()">结束</u-button>
+					</view>
+				</uni-col>
+			</uni-row>
 		</view>
 		<view>
 			<!-- 普通弹窗 -->
@@ -116,6 +143,12 @@
 	 * 会山科技-会助理 审批操作功能组件
 	 * */
 	export default {
+		props: {
+			isEnd: {
+				type: Number,
+				default: 0
+			}
+		},
 		data() {
 			return {
 				baseUrl: this.$BASE_URL,
@@ -154,6 +187,42 @@
 			uni.hideLoading()
 		},
 		methods: {
+			confirm1(e) {
+				let that = this;
+				let id = this.data.taskId ? this.data.taskId : this.data.id
+				uni.showModal({
+					title: "提醒",
+					content: "确定在当前节点同意并结束吗？",
+					success(res) {
+						if (res.confirm) {
+							that.$httpRequest({
+								url: '/app/useSealEnd?taskId=' + id,
+								method: 'get'
+							}).then((res) => {
+								if (res.data.code === 200) {
+									uni.showModal({
+										title: "结束成功",
+										icon: "OK",
+										showCancel: false,
+										success() {
+											uni.navigateBack()
+										}
+									})
+								} else {
+									uni.showModal({
+										title: "结束失败",
+										content: res.msg,
+										showCancel: false,
+										success() {
+											uni.navigateBack()
+										}
+									})
+								}
+							})
+						}
+					}
+				})
+			},
 			nextApprovalChange(e) {
 				let nextUser = e.detail.value[1]
 				this.form.nextUserName = e.detail.value[1].text
@@ -254,7 +323,8 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/pL?taskId='+ this.data.id +'&groupId=' + this.data.baseGroupId + '&baseId=' + this.data.baseId,
+					url: '/app/pL?taskId=' + this.data.id + '&groupId=' + this.data.baseGroupId + '&baseId=' +
+						this.data.baseId,
 					method: 'get',
 					urlType: this.$getUrlType()
 				});
@@ -312,12 +382,16 @@
 						})
 					}
 					if (this.historyData[this.historyData.length - 1]) {
-						if (!(this.historyData[this.historyData.length - 1].comment === "同意并结束") &&
-							!(this.historyData[this.historyData.length - 1].comment === "自动结束")) {
+						if (!(this.historyData[this.historyData.length - 1].comment === "自动结束") && this.isEnd === 0) {
 							this.list1.push({
 								title: "待审批"
 							})
 						}
+						if (this.isEnd === 1 && this.data.isEnd === '1') {
+							this.list1.push({
+								title: "流程结束"
+							})
+						}
 					}
 					this.active = this.list1.length - 1
 					uni.hideLoading()
@@ -362,7 +436,8 @@
 				const {
 					data: res
 				} = await this.$httpRequest({
-					url: '/app/currentPL?taskId='+ this.data.id +'&groupId=' + this.data.baseGroupId + '&baseId=' + this.data.baseId,
+					url: '/app/currentPL?taskId=' + this.data.id + '&groupId=' + this.data.baseGroupId +
+						'&baseId=' + this.data.baseId,
 					method: 'get',
 					urlType: this.$getUrlType()
 				});
@@ -491,4 +566,4 @@
 		justify-content: space-between;
 		margin-bottom: 10px;
 	}
-</style>
+</style>

pageApp/ge/gePurchase.vue

@@ -21,22 +21,7 @@
 				</uni-file-picker>
 			</view>
 		</view>
-		<ge></ge>
-		<view class="content" v-if="data.pageType === 1">
-			<!-- @touchstart="handleStart" @touchmove="handleMove" @touchend="handleEnd" -->
-			<view :style="{'transform':'translate3d('+0+'px,'+-180+'px,0)'}" class="touch">
-				<view @click="confirm1">
-					<view style="margin-left: 25rpx;">
-						<uni-row>
-							同意
-						</uni-row>
-						<uni-row>
-							结束
-						</uni-row>
-					</view>
-				</view>
-			</view>
-		</view>
+		<ge :isEnd="1"></ge>
 	</view>
 </template>
 
@@ -53,41 +38,7 @@
 		},
 		mounted() {},
 		methods: {
-			confirm1(e) {
-				let that = this;
-				uni.showModal({
-					title: "提醒",
-					content: "确定在当前节点同意并结束吗？",
-					success(res) {
-						if (res.confirm) {
-							that.$httpRequest({
-								url: '/app/useSealEnd?taskId=' + that.data.id,
-								method: 'get'
-							}).then((res) => {
-								if (res.data.code === 200) {
-									uni.showModal({
-										title: "结束成功",
-										icon: "OK",
-										showCancel: false,
-										success() {
-											uni.navigateBack()
-										}
-									})
-								} else {
-									uni.showModal({
-										title: "结束失败",
-										content: res.msg,
-										showCancel: false,
-										success() {
-											uni.navigateBack()
-										}
-									})
-								}
-							})
-						}
-					}
-				})
-			}
+			
 		}
 	}
 </script>

pageApp/ge/geUseSeal.vue

@@ -12,25 +12,17 @@
 			<hs-show label="文件类型" :data="data.formData.so_g" mode="dict" dictKey="hzl_file_type"></hs-show>
 			<hs-show label="文件名称" :data="data.formData.so_h"></hs-show>
 			<hs-show label="文件份数" :data="data.formData.so_i"></hs-show>
+			<view class="desc">
+				文件预览图片
+			</view>
+			<view class="desc">
+				<uni-file-picker :value="data.formData.photos" file-mediatype="image" readonly>
+				</uni-file-picker>
+			</view>
 			<hs-show label="申请原因" :data="data.formData.conclusion"></hs-show>
 			<hs-show label="备注" :data="data.formData.remark"></hs-show>
 		</view>
-		<ge></ge>
-		<view class="content" v-if="data.pageType === 1 && data.isEnd === '0'">
-			<!-- @touchstart="handleStart" @touchmove="handleMove" @touchend="handleEnd" -->
-			<view :style="{'transform':'translate3d('+0+'px,'+-180+'px,0)'}" class="touch">
-				<view @click="confirm1">
-					<view style="margin-left: 25rpx;">
-						<uni-row>
-							同意
-						</uni-row>
-						<uni-row>
-							结束
-						</uni-row>
-					</view>
-				</view>
-			</view>
-		</view>
+		<ge :isEnd="1"></ge>
 	</view>
 </template>
 
@@ -45,8 +37,8 @@
 				data: uni.getStorageSync("approval"),
 			}
 		},
-		onLoad() {
-
+		mounted() {
+			this.data.formData.photos = JSON.parse(this.data.formData.photos)
 		},
 		methods: {
 			confirm1(e) {
@@ -117,4 +109,4 @@
 		-webkit-tap-highlight-color: transparent;
 		/* 使用transform: translate3d 处理性能高 GUP */
 	}
-</style>
+</style>

pages/app/index.vue

@@ -174,7 +174,8 @@
 				workerAssociationAppData: [{
 					text: '福利领取',
 					imgPath: '../../static/img/app/fulilingqu.png',
-					link: "../../pageA/club/welfareList"
+					link: "../../pageA/club/welfareList",
+					count: 0
 				}, {
 					text: '社团预约',
 					imgPath: '../../static/img/app/shetuanyuyue.png',
@@ -272,6 +273,7 @@
 				this.me[2].count = data.m1 + data.m5
 				this.me[3].count = data.m7
 				this.personnel[3].count = data.m3
+				this.workerAssociationAppData[0].count = data.m8
 			},
 			toTXLPage() {
 				this.$goto("../../pageA/msg/index")

pages/home/index.vue

@@ -230,7 +230,7 @@
 					return
 				}
 				data = JSON.parse(data)
-				this.msgNum = data.m1 + data.m2 + data.m3 + data.m4 + data.m5 + data.m6 + data.m7
+				this.msgNum = data.m1 + data.m2 + data.m3 + data.m4 + data.m5 + data.m6 + data.m7 + data.m8 + data.m9
 			},
 			toPayCodePage() {
 				//跳转非pages.json>tabbar>配置过的页面，使用navigateTo
@@ -373,4 +373,4 @@
 		bottom: 110rpx;
 
 	}
-</style>
+</style>

pages/tabbar/wpTabbar.vue

@@ -226,13 +226,13 @@
 					return
 				}
 				data = JSON.parse(data)
-				let appSum = data.m1 + data.m2 + data.m3 + data.m4 + data.m5 + data.m6 + data.m7
+				let appSum = data.m1 + data.m2 + data.m3 + data.m4 + data.m5 + data.m6 + data.m7 + data.m8 + data.m9
 				// this.msgNums = []
 				let mData = []
 				mData.push(appSum)
 				mData.push(0)
 				if (this.$getUrlType() === 3) {
-					mData.push(data.m1 + data.m3 + data.m4 + data.m5 + data.m7)
+					mData.push(data.m1 + data.m3 + data.m4 + data.m5 + data.m7+ data.m8)
 				} else {
 					mData.push(0)
 				}