按钮操作

.gitignore

@@ -1 +1,2 @@
-unpackage/
+unpackage/
+anyangWebAPP/pages/myTask/workOrderList/workOrderDetail/buttons/buttons - 副本.vue

anyangWebAPP/pages/components/commonSelect/departSelect/departSelect.vue

@@ -1,5 +1,6 @@
 <template>
-	<uni-data-select class="uni-select" :localdata="deptData" @change="change" :clear="true" v-model="departid" placeholder="请选择部门"/>
+	<!-- <uni-data-select class="uni-select" :localdata="deptData" @change="change" :clear="true" v-model="departid" placeholder="请选择部门"/> -->
+	<uni-combox :candidates="candidates" placeholder="请选择部门"  @input="change" v-model="departid"></uni-combox>
 </template>
 
 <script>
@@ -7,7 +8,8 @@
 		data() {
 			return {
 				departid: '',
-				deptData: []
+				deptData: [],
+				candidates:[]
 			}
 		},
 		created() {
@@ -17,18 +19,28 @@
 			getDpartment() {
 				this.$http.get("Department/GetDeptList",{token: uni.getStorageSync("token")}).then((res)=>{
 					if(res.state.toLowerCase()==="success"){
-						let resultData = res.data
-						resultData.forEach((element, index) => {
-						  const obj = {}
-						  obj.value = element.F_DeptId
-						  obj.text = element.F_DeptName
-						  this.deptData.push(obj);
-						});
+						this.deptData = res.data
+						res.data.forEach(v =>{
+							this.candidates.push(v.F_DeptName)
+						})
+						// let resultData = res.data
+						// resultData.forEach((element, index) => {
+						//   const obj = {}
+						//   obj.value = element.F_DeptId
+						//   obj.text = element.F_DeptName
+						//   this.deptData.push(obj);
+						// });
 					}
 				})
 			},
 			change(data){
-				this.$emit('post-select-data',data)
+				let departid = ''
+				this.deptData.forEach(v => {
+					if(v.F_DeptName == data) {
+						departid = v.F_DeptId
+					}
+				})
+				this.$emit('post-select-data',departid)
 			},
 		}
 	}

anyangWebAPP/pages/login/login.vue

@@ -160,8 +160,8 @@
 							uni.setStorageSync('userName', data.user.F_UserName)
 							uni.setStorageSync('userCode', data.user.F_UserCode)
 							const code = uni.getStorageSync("roleCode");
-							
-							if (code === "ZXLD"||code === "MTDD"||code === "WLDW"||code === "EJWLDW") {
+							if (code === "ZXLD"||code === "MTDD"||code === "WLDW"||code === "EJWLDW"||code === "GLY") {
+							// if (code === "ZXLD"||code === "MTDD"||code === "WLDW"||code === "EJWLDW") {
 								uni.switchTab({
 									url: '/pages/myTask/myTask'
 								});

anyangWebAPP/pages/myTask/workOrderList/workOrderDetail/buttons/buttons.vue

@@ -43,7 +43,11 @@
 		},
 		watch: {
 			orderButtonData(val) {
-				console.log(this.orderButtonData)
+				this.orderButtonData.forEach(v=>{
+					if(v.key == 1) {
+						v.value = '查看'
+					}
+				})
 			}
 		},
 		data() {
@@ -112,6 +116,10 @@
 					this.cbreason = ''
 					this.auditPlaceholder = '请输入驳回重办原因'
 					this.$refs.inputDialog.open()
+				} else if (key == 35) { // 35拒绝
+					this.cbreason = ''
+					this.auditPlaceholder = '请输入拒绝原因'
+					this.$refs.inputDialog.open()
 				} else if (key == 38) { // 39 退回（审核员）
 					this.cbreason = ''
 					this.auditPlaceholder = '请输入退回原因'
@@ -177,6 +185,12 @@
 						iszb: 1,
 						ids: this.wid
 					}
+					this.workOrderContent("WorkOrder/SubReloadWorkOrder", addParams)
+				} else if (this.clickKey === 38) {
+					const addParams = {
+						reason: this.cbreason,
+						workorderid: this.wid
+					}
 					this.workOrderContent("WorkOrder/RefuseWorkOrder", addParams)
 				} else if (this.auditPlaceholder === '请输入审核通过并转办原因') {
 					this.toExamineWorkOrder(2)
@@ -208,12 +222,6 @@
 						type: 1
 					}
 					this.workOrderContent("WorkOrder/RemindWorkOrder", addParams)
-				} else if (this.auditPlaceholder === '请输入退回原因') {
-					const addParams = {
-						reason: this.cbreason,
-						workorderid: this.wid
-					}
-					this.workOrderContent("WorkOrder/BackWorkOrder", addParams)
 				} else if(this.auditPlaceholder === '请输入提交重办原因') {
 					const addParams = {reason: this.cbreason,ids: this.wid,iszb: 1}
 					this.workOrderContent("WorkOrder/SubReloadWorkOrder",addParams)
@@ -226,6 +234,9 @@
 				}else if(this.auditPlaceholder === '请输入拒收原因') {
 					const addParams = {reason: this.cbreason,workorderid: this.wid}
 					this.workOrderContent("WorkOrder/RefuseWorkOrder",addParams)
+				}else if(this.auditPlaceholder === '请输入拒绝原因') {
+					const addParams = {reason: this.cbreason,workorderid: this.wid}
+					this.workOrderContent("WorkOrder/RejectWorkOrder",addParams)
 				}
 				
 			},