Explorar o código

修改动火审批

“yueshang” hai 1 ano
pai
achega
61fc90253d

+ 11 - 0
api/fireSpecial/index.js

@@ -90,4 +90,15 @@ export function fireWorkDelete(data) {
 				'content-type': 'application/x-www-form-urlencoded'
 			},
 	})
+}
+//  审核
+export function fireWorkShenHe(data) {
+	return request({
+		url: '/admin-api/backend/fire-work/setstatus',
+		method: 'post',
+		data: data,
+		header: {
+				'content-type': 'application/x-www-form-urlencoded'
+			},
+	})
 }

+ 11 - 4
pagesB/fire/fireWork/addWork/index.vue

@@ -13,9 +13,11 @@
 						@click="showExecutor = true; hideKeyboard()">
 						<u-input v-model="formData.executor" placeholder="请选择" :disabled="isview" />
 					</u-form-item>
-					<u-form-item label="动火台账状态" prop="workStatus" :required="true"
-						@click="showSex = true; hideKeyboard()" v-if="isview">
-						<u-input v-model="formData.workStatus" placeholder="请选择" :disabled="isview" />
+					<u-form-item label="动火台账状态" prop="workStatus" :required="true" 
+						 v-if="isview">
+							 <u-input  v-model="formData.workStatus" placeholder="请选择" :disabled="isview" />
+						 <!-- @click="showSex = true; hideKeyboard()" -->
+						
 					</u-form-item>
 					<picker mode="date" :value="dateTime" @change="bindDateChange" :disabled="isview">
 						<view class="datatime-street">
@@ -109,7 +111,7 @@
 					orgId: '',
 					workReason: '',
 					executor: '',
-					workStatus: '未审核',
+					workStatus: '0',
 					workBegin: '',
 					workEnd: '',
 					att: '',
@@ -154,6 +156,7 @@
 				dateTime: '',
 				showSex: false,
 				actionsSex: getDictDatas(DICT_TYPE.FIRE_WORK_STATUS), //性别
+				workStatus:getDictDatas(DICT_TYPE.FIRE_WORK_STATUS),//台账状态
 				orgaction: [], //单位
 				showOrg: false
 			}
@@ -251,6 +254,10 @@
 					id: this.parentId
 				}).then(response => {
 					this.formData = response.data
+					this.workStatus.map(i=>{
+						if(this.formData.workStatus==i.value)
+						this.formData.workStatus=i.label
+					})
 					console.log(response, 'response')
 				})
 			},

+ 15 - 15
pagesB/fire/fireWork/index.vue

@@ -39,15 +39,15 @@
 						</view>
 						<view style="margin-top: 80rpx;">
 							<!-- 删除按钮 -->
-							<view class="an-niu" @click.native="showModal(item.id)" v-if="item.workStatus=='未审核'">
+							<view class="an-niu" @click.native="showModal(item.id)" v-if="item.workStatus=='未审核'||item.workStatus=='0'">
 								<text class="detailDel">删除</text>
 							</view>
 							<view @click.native="onClick(item.id)" link  class="an-niu" ><text class="detail">查看详情</text>
 							</view>
 							<view @click.native="editClick(item.id)" link  class="an-niu" ><text class="solve"
-									v-if="item.workStatus=='未审核'">编辑</text>
+									v-if="item.workStatus=='未审核'||item.workStatus=='0'">编辑</text>
 							</view>
-							<view @click.native="processClick(item.id)" link  class="an-niu" v-if="item.workStatus=='未审核'&&juese=='fire_leader'"><text class="solve"
+							<view @click.native="processClick(item.id)" link  class="an-niu" v-if="item.workStatus=='未审核'&&juese=='fire_leader'||item.workStatus=='0'&&juese=='fire_leader'"><text class="solve"
 								>审核</text>
 							</view>
 						</view>
@@ -83,7 +83,8 @@
 	import {
 		fireWorkPage,
 		fireWorkUpdate,
-		fireWorkDelete
+		fireWorkDelete,
+		fireWorkShenHe
 	} from '@/api/fireSpecial';
 	import config from '@/config'
 	const baseUrlImg = config.baseUrlImg
@@ -119,7 +120,8 @@
 				show: false,
 				showtimeStart: false,
 				showtimeEnd: false,
-				juese: {}
+				juese: {},
+				ShenHeids:''
 			};
 		},
 		// 在 vue页面,向起始页通过事件传递数据
@@ -163,20 +165,18 @@
 		onReady() {},
 		mixins: [uni.$u.mixin],
 		methods: {
-			processClick() { //审核
+			processClick(ShenHeids) { //审核
                this.showShenHe=true
+			   this.ShenHeids=ShenHeids
 			},
 			//审核通过
 			confirmShenHe() {
 				this.showShenHe = false
-				// verifytask({
-				// }).then(response => {
-				// 	if (response.data) {
-						
-				// 		this.tableData = []
-				// 		this.getData()
-				// 	}
-				// })
+				fireWorkShenHe({ids:this.ShenHeids
+				}).then(response => {
+						this.tableData = []
+						this.getData()
+				})
 			},
 			//审核不通过	
 			cancelShenHe() {
@@ -254,7 +254,7 @@
 			onClick(val) {
 				this.isLoaded = false
 				uni.navigateTo({
-					url: `/pagesB/fire/fireWork/addWork/index?title=查看动火审批&&viewData=${val}`
+					url: `/pagesB/fire/fireWork/addWork/index?title=查看动火审批&&viewData=${val}`
 				})
 			},
 			editClick(val) {