From 1a3e4b7d1ac492b73d139add3e33b79bb612cff6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 10 Apr 2023 18:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B8=E5=8F=AF=E8=AF=81=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/workSpace/operation/workerList.vue | 37 +++++++++++++++++++-----
 pages/workSpace/opls/clear.vue           |  4 +--
 pages/workSpace/opls/cooler.vue          |  4 +--
 pages/workSpace/opls/fire.vue            |  8 +++--
 pages/workSpace/opls/high.vue            | 24 ++++++++-------
 pages/workSpace/opls/hoisting.vue        |  4 +--
 pages/workSpace/opls/normal.vue          |  4 +--
 pages/workSpace/opls/preheat.vue         |  4 +--
 pages/workSpace/opls/soil.vue            |  6 ++--
 pages/workSpace/opls/space.vue           |  6 ++--
 pages/workSpace/opls/usecl.vue           |  6 ++--
 11 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/pages/workSpace/operation/workerList.vue b/pages/workSpace/operation/workerList.vue
index 098e484..4041897 100644
--- a/pages/workSpace/operation/workerList.vue
+++ b/pages/workSpace/operation/workerList.vue
@@ -30,10 +30,14 @@
 					<view class="uni-form-item uni-column" style="border-bottom: 1upx solid #eeeeee;">
 						<view class="title">作业人员:</view>
 						<view style="position: relative;">
-							<ba-tree-picker ref="workerPicker" :multiple='false' @select-change="selectChange" title="选择作业人员"
+							<view  @click="showWorkerPicker"  style="position: relative;display: flex;">
+								<text type="text" >{{worker_name}}</text>
+								<uni-icons style="position: absolute; right: 0;" type="arrowright" color="#999999"/>
+							</view>
+							<!-- <ba-tree-picker ref="workerPicker" :multiple='false' @select-change="selectChange" title="选择作业人员"
 									:localdata="vuex_userRange" valueKey="id" textKey="name" childrenKey="children"  :selectParent='false'/>
 							<text type="text">{{worker_name}}</text>
-							<uni-icons style="position: absolute; right: 0;" @click="showPicker" type="arrowright" color="#999999"/>
+							<uni-icons style="position: absolute; right: 0;" @click="showPicker" type="arrowright" color="#999999"/> -->
 						</view>
 					</view>
 				
@@ -131,13 +135,19 @@
 			// this.getVpeopleList();
 		},
 		methods: {
+			showWorkerPicker() {
+				let params='?type=worker&typeName=worker_name'
+				uni.navigateTo({
+					url:"../../comm/userSelect/index"+params
+				})
+			},
 			showPicker() {
 				this.$refs.workerPicker._show();
 			},
-			selectChange(ids, names) {
-				this.formData.worker = ids[0];
-				this.worker_name = names;
-			},
+			// selectChange(ids, names) {
+			// 	this.formData.worker = ids[0];
+			// 	this.worker_name = names;
+			// },
 			showNext(){
 				if(["fire", "space", "cooler"].indexOf(this.oplCateCode)!=-1){
 					this.showN = true
@@ -147,7 +157,7 @@
 				let that = this;
 				that.$u.api.oplItem(that.oplId).then((res) => {
 					that.oplDetail = res; //作业开始时间
-					debugger;
+					// debugger;
 					console.log(res);
 				});
 			},
@@ -261,6 +271,19 @@
 			//提交工单
 			submitticket(id) {
 				let that = this;
+				if(that.oplDetail.ticket){
+					this.$u.api.ticketHandle(that.oplDetail.ticket, {transition: id}).then(res => {
+											 debugger;
+											 uni.reLaunch({
+											 	url: '/pages/home/list/ticket'
+											 })
+											uni.hideLoading()
+					}).catch(e => {
+											uni.hideLoading()
+					})
+					return
+				}
+				
 				let ticket = {};
 				ticket.workflow = that.initform.workflow;
 				ticket.ticket_data = {
diff --git a/pages/workSpace/opls/clear.vue b/pages/workSpace/opls/clear.vue
index 52f8317..239a028 100644
--- a/pages/workSpace/opls/clear.vue
+++ b/pages/workSpace/opls/clear.vue
@@ -148,8 +148,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/workSpace/opls/cooler.vue b/pages/workSpace/opls/cooler.vue
index d32aff4..3f95dbc 100644
--- a/pages/workSpace/opls/cooler.vue
+++ b/pages/workSpace/opls/cooler.vue
@@ -146,8 +146,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/workSpace/opls/fire.vue b/pages/workSpace/opls/fire.vue
index 692bb26..6c8b15f 100644
--- a/pages/workSpace/opls/fire.vue
+++ b/pages/workSpace/opls/fire.vue
@@ -157,8 +157,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
@@ -435,7 +435,6 @@
 			},
 			edit(row) {},
 			saveSubmit() {
-				debugger;
 				uni.showLoading({
 				    title: '提交中'
 				});
@@ -452,8 +451,11 @@
 					}
 				})
 				if (that.oplId !== null) {
+					debugger;
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();
+						 debugger;
+						 console.log(that.oplCateCode)
 						params = `?oplId=${that.oplId}&oplCateCode=${that.oplCateCode}`;
 						uni.navigateTo({
 							url: '/pages/workSpace/operation/workerList' + params
diff --git a/pages/workSpace/opls/high.vue b/pages/workSpace/opls/high.vue
index 03efdb8..525ad4c 100644
--- a/pages/workSpace/opls/high.vue
+++ b/pages/workSpace/opls/high.vue
@@ -156,8 +156,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
@@ -243,7 +243,7 @@
 			this.formData.operation = this.operationId;
 		},
 		onShow() {
-			debugger;
+			// debugger;
 			this.getOperation();
 			this.getOplcates();
 			this.getdept();
@@ -326,7 +326,9 @@
 					that.risklist = [];
 					that.measurelist = [];
 					that.oplCateName = res.name;
-					that.oplcateCode = res.code;
+					that.oplCateCode = res.code;
+					debugger;
+					console.log(0, that.oplCateCode)
 					let risklist = res.risk_options_;
 					let measurelist = res.measure_options_;
 					if (that.oplId !== null) {
@@ -348,7 +350,6 @@
 				});
 			},
 			editCheckShow(risklist, measurelist) {
-				debugger;
 				let that = this;
 				that.$u.api.oplItem(that.oplId).then((res) => {
 					that.formData = res; //作业开始时间
@@ -373,7 +374,6 @@
 						}
 						that.measurelist.push(obj)
 					})
-					debugger;
 					console.log(res);
 				});
 
@@ -473,7 +473,7 @@
 			},
 			edit(row) {},
 			saveSubmit() {
-				debugger;
+				//
 				uni.showLoading({
 				    title: '提交中'
 				});
@@ -490,9 +490,13 @@
 					}
 				})
 				if (that.oplId !== null) {
+					console.log(1, that.oplCateCode)
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();
-						params = `?oplId=${that.oplId}`;
+						 debugger;
+						 
+						 console.log(1, that.oplCateCode)
+						params = `?oplId=${that.oplId}&oplCateCode=${that.oplCateCode}`;
 						uni.navigateTo({
 							url: '/pages/workSpace/operation/workerList' + params
 						})
@@ -501,7 +505,7 @@
 				} else {
 					that.$u.api.oplCreate(that.formData).then(res => {
 						 uni.hideLoading();
-						params = `?oplId=${res.id}`;
+						params = `?oplId=${res.id}&oplCateCode=${that.oplCateCode}`;
 						uni.navigateTo({
 							url: '/pages/workSpace/operation/workerList' + params
 						})
@@ -520,7 +524,6 @@
 				params.transition = that.transition;
 				that.formData.create_imgs = [];
 				that.fileList.forEach(item=>{
-					debugger;
 					if(item.id){
 						console.log(item.id);
 						that.formData.create_imgs.push(item.id)
@@ -530,7 +533,6 @@
 					}
 				})
 				that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
-					debugger;
 					console.log(this.formData.ticket)
 					console.log(params)
 					 this.$u.api.ticketHandle(this.formData.ticket, params).then(res => {
diff --git a/pages/workSpace/opls/hoisting.vue b/pages/workSpace/opls/hoisting.vue
index 63bc9a1..bc6a8d3 100644
--- a/pages/workSpace/opls/hoisting.vue
+++ b/pages/workSpace/opls/hoisting.vue
@@ -155,8 +155,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/workSpace/opls/normal.vue b/pages/workSpace/opls/normal.vue
index 7d1c785..9c61fc3 100644
--- a/pages/workSpace/opls/normal.vue
+++ b/pages/workSpace/opls/normal.vue
@@ -148,8 +148,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/workSpace/opls/preheat.vue b/pages/workSpace/opls/preheat.vue
index f0c1583..6eb11f6 100644
--- a/pages/workSpace/opls/preheat.vue
+++ b/pages/workSpace/opls/preheat.vue
@@ -146,8 +146,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/workSpace/opls/soil.vue b/pages/workSpace/opls/soil.vue
index 8674f73..47eff9d 100644
--- a/pages/workSpace/opls/soil.vue
+++ b/pages/workSpace/opls/soil.vue
@@ -156,8 +156,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
@@ -319,7 +319,7 @@
 					that.risklist = [];
 					that.measurelist = [];
 					that.oplCateName = res.name;
-					that.oplcateCode = res.code;
+					that.oplCateCode = res.code;
 					let risklist = res.risk_options_;
 					let measurelist = res.measure_options_;
 					if (that.oplId !== null) {
diff --git a/pages/workSpace/opls/space.vue b/pages/workSpace/opls/space.vue
index 77a6152..529935e 100644
--- a/pages/workSpace/opls/space.vue
+++ b/pages/workSpace/opls/space.vue
@@ -155,8 +155,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
@@ -321,7 +321,7 @@
 					that.risklist = [];
 					that.measurelist = [];
 					that.oplCateName = res.name;
-					that.oplcateCode = res.code;
+					that.oplCateCode = res.code;
 					let risklist = res.risk_options_;
 					let measurelist = res.measure_options_;
 					if (that.oplId !== null) {
diff --git a/pages/workSpace/opls/usecl.vue b/pages/workSpace/opls/usecl.vue
index 0d510b2..0e8777c 100644
--- a/pages/workSpace/opls/usecl.vue
+++ b/pages/workSpace/opls/usecl.vue
@@ -248,8 +248,8 @@
 
 		</view>
 		<view class="btn">
-			<button v-if="formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button>
-			<button v-else type="primary" class="save-btn" @click="saveSubmit">下一步</button>
+			<!-- <button v-if="formData.ticket_&&formData.ticket_.act_state===2" type="primary" class="save-btn" @click="saveChange">提交</button> -->
+			<button  type="primary" class="save-btn" @click="saveSubmit">下一步</button>
 		</view>
 	</view>
 </template>
@@ -431,7 +431,7 @@
 					that.risklist = [];
 					that.measurelist = [];
 					that.oplCateName = res.name;
-					that.oplcateCode = res.code;
+					that.oplCateCode = res.code;
 					let risklist = res.risk_options_;
 					let measurelist = res.measure_options_;
 					if (that.oplId !== null) {