bug修改

manifest.json

@@ -60,7 +60,7 @@
             "port" : 9090,
             "https" : false
         },
-        "title" : "Yudao-App",
+        "title" : "YunWeiQi-App",
         "router" : {
             "mode" : "hash",
             "base" : "./"

pages/index.vue

@@ -23,7 +23,8 @@
           </view>
         </view>
         <view @click="handleToInfo" class="flex align-center">
-          <view class="iconfont icon-right"></view>
+			<uni-icons style="color: #fff;" type="right" size="25"></uni-icons>
+          <!-- <view class="iconfont icon-right"></view> -->
         </view>
       </view>
     </view>

pages/message/index.vue

@@ -98,6 +98,7 @@
 			handleUpdate(ids) {
 				updateNotifyMessageRead(ids).then(response => {
 					// this.$modal.msgSuccess("消息已读！")
+					this.getUnreadCount();
 					this.page = 1;
 					this.getList(this.page, this.__pulldone)
 				});
@@ -105,6 +106,7 @@
 			handleUpdateAll() {
 				updateAllNotifyMessageRead().then(response => {
 					this.$modal.msgSuccess("全部已读！")
+					this.getUnreadCount();
 					this.page = 1;
 					this.getList(this.page, this.__pulldone)
 				});

pages/oa/business/detail.vue

@@ -58,7 +58,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -163,6 +163,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/business/edit.vue

@@ -74,8 +74,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>

pages/oa/business/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/conversion/detail.vue

@@ -55,7 +55,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -160,6 +160,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/conversion/edit.vue

@@ -71,8 +71,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>

pages/oa/conversion/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/entry/detail.vue

@@ -58,7 +58,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -163,6 +163,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/entry/edit.vue

@@ -81,8 +81,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>
@@ -98,7 +98,7 @@
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
 					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+						<pople-Select type="multiple" @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 

pages/oa/entry/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/expense/detail.vue

@@ -70,7 +70,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -174,6 +174,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/expense/edit.vue

@@ -103,8 +103,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>
@@ -120,7 +120,7 @@
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
 					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+						<pople-Select type="multiple" @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 

pages/oa/expense/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/leave/detail.vue

@@ -55,7 +55,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -163,6 +163,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/leave/edit.vue

@@ -73,8 +73,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>
@@ -90,7 +90,7 @@
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
 					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+						<pople-Select type="multiple" @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 

pages/oa/leave/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/out/detail.vue

@@ -55,7 +55,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -159,6 +159,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/out/edit.vue

@@ -70,8 +70,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>
@@ -87,7 +87,7 @@
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
 					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+						<pople-Select type="multiple" @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 

pages/oa/out/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/purchase/detail.vue

@@ -67,7 +67,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -171,6 +171,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/purchase/edit.vue

@@ -90,8 +90,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>
@@ -107,7 +107,7 @@
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
 					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+						<pople-Select type="multiple" @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 

pages/oa/purchase/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/receive/detail.vue

@@ -67,7 +67,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -171,6 +171,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/receive/edit.vue

@@ -87,8 +87,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>
@@ -104,7 +104,7 @@
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
 					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+						<pople-Select type="multiple" @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 

pages/oa/receive/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/renew/detail.vue

@@ -61,7 +61,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -166,6 +166,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/renew/edit.vue

@@ -77,8 +77,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>

pages/oa/renew/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/stamp/detail.vue

@@ -49,7 +49,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -166,6 +166,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/stamp/edit.vue

@@ -64,8 +64,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>
@@ -81,7 +81,7 @@
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
 					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+						<pople-Select type="multiple" @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 

pages/oa/stamp/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/turnover/detail.vue

@@ -49,7 +49,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -154,6 +154,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/turnover/edit.vue

@@ -67,8 +67,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>

pages/oa/turnover/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/oa/universal/detail.vue

@@ -46,7 +46,7 @@
 			<button size="mini" @click="handleAudit(false)">驳回</button>
 		</view>
 		<view class="button-group" v-if="name=='2'">
-			<button type="warning" size="mini" @click="handleRevocation('form')">撤回</button>
+			<button type="warning" v-if="form.auditStatus==1" size="mini" @click="handleRevocation('form')">撤回</button>
 		</view>
 	</view>
 </template>
@@ -150,6 +150,7 @@
 				               uni.showToast({
 				               	title: "撤回成功！"
 				               })
+							   that.$emit('popupClose');
 				              })
 				            } else if (res.cancel) {
 				              console.log('用户点击取消');

pages/oa/universal/edit.vue

@@ -61,8 +61,8 @@
 			</uni-forms-item>
 		</uni-forms>
 		<view class="button-group" v-if="name == '0'">
-			<button type="default" size="mini" @click="onReCommit('form')">提交</button>
-			<button type="primary" size="mini" @click="onClose()">关闭</button>
+			<button type="primary" size="mini" @click="onReCommit('form')">提交</button>
+			<button type="default" size="mini" @click="onClose()">关闭</button>
 		</view>
 		<view class="button-group" v-else>
 			<button type="primary" size="mini" @click="submit('form')">提交</button>
@@ -78,7 +78,7 @@
 						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
 					</view>
 					<view class="popup-content">
-						<pople-Select @submit="submitPeople" ref="popleSelect"></pople-Select>
+						<pople-Select type="multiple" @submit="submitPeople" ref="popleSelect"></pople-Select>
 					</view>
 				</view>
 

pages/oa/universal/index.vue

@@ -169,7 +169,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 	}
 	.purchase-list {

pages/popleSelect/choose.vue

@@ -350,7 +350,7 @@ export default {
 	display: flex;
 	flex-direction: row;
 	flex-wrap: nowrap;
-	font-size: 20rpx;
+	font-size: 35rpx;
 	justify-content: space-between;
 	padding: 50rpx 30rpx;
 }

pages/work/index.vue

@@ -12,7 +12,7 @@
 		<uni-popup ref="popup" background-color="#fff" border-radius="10px 10px 0 0">
 				<view class="popup-body">
 					<view class="popup-close">
-						<uni-icons type="closeempty" size="20" @click="popupClose"></uni-icons>
+						<uni-icons type="closeempty" size="20" @click="closePopup"></uni-icons>
 					</view>
 					<view class="popup-content">
 						<async-form-component :id="businessKey" :name="initIndex.toString()" @popupClose="popupClose"></async-form-component>
@@ -75,10 +75,17 @@
 				});
 				this.$refs.popup.open('bottom');
 			},
+				
+			closePopup(){
+				this.$refs.popup.close();
+			},
 			popupClose(){
 				this.$refs.popup.close();
-				this.page = 1;
-				this.getList(this.page,this.__pulldone)
+				// this.page = 1;
+				// this.getList(this.page,this.__pulldone)
+				setTimeout(() => {
+					this.$router.go(0)
+				}, 500)
 			},
 			/**
 			 * @name 获取列表
@@ -128,7 +135,7 @@
 								businessKey:v.businessKey,
 								path:v.processDefinition.formCustomViewPath,
 								title:v.name,
-								status: v.status,
+								status: v.statusDesc,
 								time:v.startTime,
 								nickname:v.currentAuditUser?v.currentAuditUser.nickname:''
 							})
@@ -191,7 +198,7 @@
 		border-bottom: 1px solid #eaecef;
 	}
 	.popup-content{
-		height: 450px;
+		height: 550px;
 		overflow-x: auto;
 		padding-bottom: 50px;
 	}