[dev]

1、修复接单状态的bug
2、修复接口传送处方号的bug，改为处方id
3、增加一个接口，在调配完处方后调用

components/nav-bar/nav-bar.vue

@@ -52,7 +52,7 @@ const props = defineProps({
 		type: Object
 	},
 	workStatus: {
-		default:true,
+		default:'0',
 		type: String
 	}
 })
@@ -89,7 +89,7 @@ const handleChange =async()=>{
 	console.log("props.userInfo.workStatus》》》", props.workStatus)
 	const token = uni.getStorageSync('token')
 	const userId = uni.getStorageSync('userId')
-	if(props.workStatus=='1'){
+	// if(props.workStatus=='1'){
 		const params = {
 			token: uni.getStorageSync('token'),
 			data: {
@@ -107,7 +107,7 @@ const handleChange =async()=>{
 		} else {
 			emit('updateUser', props.workStatus)
 		}
-	}
+	// }
 }
 
 const handleScanbara = ()=>{

components/order-card/order-card.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container" v-if="props.status=='1'" @click="handleDetail">
+  <view class="container" v-if="props.workStatus=='0'" @click="handleDetail">
 		<view class="t">
 			<view class="d1"></view>
 			<view class="d2">
@@ -96,8 +96,8 @@ const props = defineProps({
 		},
 		type: Object
 	},
-	status: {
-		default: '0',
+	workStatus: {
+		default:'0',
 		type: String
 	},
 	// 当前tab
@@ -111,7 +111,7 @@ const selected = ref(false)
 
 const emit = defineEmits(['emitSelect'])
 
-console.log('props.v',props.v)
+console.log('props.workStatus',props.workStatus)
 
 
 const deployStateName = computed(()=>{

pages/edit/edit.vue

@@ -153,7 +153,7 @@
 
 <script setup>
 import { onMounted, ref, getCurrentInstance } from 'vue'
-import { selectOrderDetail, upload, sendToUser } from "@/static/js/request.js"
+import { selectOrderDetail, upload, sendToUser, updateOrderStatus } from "@/static/js/request.js"
 import { saveDepoly } from '@/static/js/api.js'
 
 import { onLoad } from '@dcloudio/uni-app'
@@ -308,7 +308,7 @@ const editForm =ref({
 	userId:uni.getStorageSync('userId'),
 	comments:'',
 	weight:v.value.weight,
-	coreId: v.value.preNo
+	coreId: v.value.id
 })
 onMounted(() => {
 
@@ -353,7 +353,8 @@ onLoad(async(options) => {
 		v.value.concentration = res.data.concentration
 		v.value.frequency = res.data.frequency
 		v.value.medicationTime = res.data.medicationTime
-		
+		v.value.id = res.data.id
+		console.log('onLoad v.value.v.value.id', v.value.id)
 		v.value.disName = res.data.disName,
 		v.value.symName = res.data.symName,
 		v.value.preNo = res.data.preNo,
@@ -481,13 +482,20 @@ const handleSubmit = async()=>{
 			token: uni.getStorageSync('token'),
 			data: JSON.stringify({id:uni.getStorageSync('userId')})
 		})
+		const ret = await updateOrderStatus({
+			token: uni.getStorageSync('token'),
+			data: {
+				id:v.value.id,
+				status:'1',
+			}
+		})
 		uni.redirectTo({
 			url:"/pages/index/index"
 		})
 		
 	} else {
 		// 弹窗提醒
-		// console.log("handleSubmit proxy.$refs.alertDialog",proxy.$refs.alertDialog)
+		console.log("handleSubmit proxy.$refs.alertDialog",proxy.$refs.alertDialog)
 		proxy.$refs.alertDialog.open('center')
 	}
 	
@@ -515,8 +523,15 @@ const dialogConfirm = async()=>{
 		url:"/pages/index/index"
 	})
 }
-const dialogClose = ()=>{
+const dialogClose = async()=>{
 	console.log('dialogClose直接调用接口，不打印')
+	const ret = await updateOrderStatus({
+		token: uni.getStorageSync('token'),
+		data: {
+			id:v.value.id,
+			status:'1',
+		}
+	})
 	uni.redirectTo({
 		url:"/pages/index/index"
 	})

pages/index/index.vue

@@ -80,7 +80,7 @@
 						@scrolltolower="loadMoreList"
 					>
 						<template v-for="(v,i) in orderList" :key="i">
-							<orderCard v-if="v" :v="v" :state="workStatus" :index="i" :c=tabActive class="order-card"
+							<orderCard v-if="v" :v="v" :work-Status="workStatus" :index="i" :c=tabActive class="order-card"
 								@emit-select="emitSelect"
 							/>
 						</template>
@@ -207,7 +207,8 @@ onLoad(async () => {
 // 子传父，更新userInfo
 const updateUser = (v)=>{
 	console.log('updateUserStatus', v)
-	workStatus.value = v
+	workStatus.value = v+''
+	console.log('workStatus.value', workStatus.value)
 }
 
 const emitSelect = (v)=>{

static/js/request.js

@@ -161,6 +161,33 @@ export const releaseOrder = (params = {}) => {
 };
 
 
+export const updateOrderStatus = (params = {}) => {
+	return new Promise((resolve, reject) => {
+		uni.request({
+			// url: 'http://zhongyao.fscuc.cn' + '/login/v2',
+			url: hostUrl + `/prescription/prescriptionCore/updateOrderStatus?prescriptionCoreId=${params.data.id}&status=${params.data.status}`,
+			method: params.method || 'POST',
+			data: JSON.stringify(params), 
+			header: {
+				'Authorization':'Bearer '+ params.data.token,
+			},
+			success: res => {
+				if (res.statusCode !== 200 && res.statusCode !== 201) {
+					return uni.$showMsg('请求失败！请联系平台客服', 2000)
+				} else {
+					// console.log('api request response>>>', res.data)
+					resolve(res)
+				}
+			},
+			fail: err => {
+				return uni.$showMsg('请求接口失败！', 2000)
+				reject(err)
+			}
+		})
+	})
+};
+
+
 export const upload = (params = {}) => {
 	console.log('upload api params', params)
 	return new Promise((resolve, reject) => {