From 5f2ee03958a1a16dc27195c76ea7cffb422c95d1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期五, 19 十二月 2025 22:40:34 +0800
Subject: [PATCH] feat: 任务修改接口，删除一些不要的字段同步
---
app/pagesTask/edit-emergency.vue | 139 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 133 insertions(+), 6 deletions(-)
diff --git a/app/pagesTask/edit-emergency.vue b/app/pagesTask/edit-emergency.vue
index eefd5df..24f3a97 100644
--- a/app/pagesTask/edit-emergency.vue
+++ b/app/pagesTask/edit-emergency.vue
@@ -119,25 +119,61 @@
<view class="form-section-title">杞嚭鍖婚櫌淇℃伅</view>
<HospitalSelector
- label="鍖洪櫌鍚嶇О"
+ label="鍖婚櫌鍚嶇О"
address-label="杞嚭鍦板潃"
:required="true"
+ :show-department="false"
v-model="taskForm.hospitalOut"
:dept-id="selectedOrganizationId"
@change="onHospitalOutChange"
@address-selected="onHospitalOutAddressSelected"
/>
+ <DepartmentSelector
+ label="杞嚭绉戝"
+ :required="true"
+ v-model="taskForm.hospitalOut.department"
+ :department-id="taskForm.hospitalOut.departmentId"
+ :is-home="taskForm.hospitalOut.name === '瀹朵腑'"
+ @change="onHospitalOutDepartmentChange"
+ />
+
+ <view class="form-item">
+ <view class="form-label">搴婂彿</view>
+ <input
+ class="form-input"
+ placeholder="璇疯緭鍏ュ簥鍙�"
+ v-model="taskForm.hospitalOut.bedNumber"
+ />
+ </view>
<view class="form-section-title">杞叆鍖婚櫌淇℃伅</view>
<HospitalSelector
label="鍖婚櫌鍚嶇О"
address-label="杞叆鍦板潃"
:required="true"
+ :show-department="false"
v-model="taskForm.hospitalIn"
:dept-id="selectedOrganizationId"
@change="onHospitalInChange"
@address-selected="onHospitalInAddressSelected"
/>
+ <DepartmentSelector
+ label="杞叆绉戝"
+ :required="true"
+ v-model="taskForm.hospitalIn.department"
+ :department-id="taskForm.hospitalIn.departmentId"
+ :is-home="taskForm.hospitalIn.name === '瀹朵腑'"
+ @change="onHospitalInDepartmentChange"
+ />
+
+ <view class="form-item">
+ <view class="form-label">搴婂彿</view>
+ <input
+ class="form-input"
+ placeholder="璇疯緭鍏ュ簥鍙�"
+ v-model="taskForm.hospitalIn.bedNumber"
+ />
+ </view>
<view class="form-item">
<view class="form-label">杞繍璺濈</view>
@@ -195,7 +231,7 @@
import uniDatetimePicker from '@/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue'
import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue'
import { getTask, updateTask } from "@/api/task"
-import { baiduDistanceByAddress } from "@/api/map"
+import { tiandituDistanceByAddress } from "@/api/map"
import { calculateTransferPrice } from "@/api/price"
import MapSelector from './components/map-selector.vue'
import VehicleSelector from './components/VehicleSelector.vue'
@@ -204,6 +240,7 @@
import DiseaseSelector from './components/DiseaseSelector.vue'
import DepartureSelector from './components/DepartureSelector.vue'
import StaffSelector from './components/StaffSelector.vue'
+import DepartmentSelector from './components/DepartmentSelector.vue'
import distanceCalculator from '@/mixins/distanceCalculator.js'
export default {
@@ -216,7 +253,8 @@
HospitalSelector,
DiseaseSelector,
DepartureSelector,
- StaffSelector
+ StaffSelector,
+ DepartmentSelector
},
mixins: [distanceCalculator],
data() {
@@ -526,6 +564,13 @@
console.log('杞嚭鍖婚櫌鍙樺寲:', hospitalData)
// 缁勪欢宸茬粡閫氳繃 v-model 鏇存柊浜� taskForm.hospitalOut
+ // 濡傛灉閫夋嫨鐨勬槸"瀹朵腑"锛岃嚜鍔ㄨ缃瀹や负"鍏跺畠"
+ if (hospitalData.name === '瀹朵腑') {
+ this.taskForm.hospitalOut.department = '鍏跺畠'
+ this.taskForm.hospitalOut.departmentId = null
+ }
+ // 娉ㄦ剰锛氶�夋嫨鏂扮殑鍖婚櫌鏃讹紝涓嶈嚜鍔ㄦ洿鏂扮瀹や俊鎭紝淇濇寔鐢ㄦ埛宸查�夋嫨鐨勭瀹�
+
// 濡傛灉杞叆鍦板潃宸插～鍐�,鑷姩璁＄畻璺濈
if (this.taskForm.hospitalIn.address) {
// 濡傛灉涓や釜閮戒笉鏄�"瀹朵腑",浣跨敤鍖婚櫌璺濈璁＄畻
@@ -550,6 +595,13 @@
console.log('杞叆鍖婚櫌鍙樺寲:', hospitalData)
// 缁勪欢宸茬粡閫氳繃 v-model 鏇存柊浜� taskForm.hospitalIn
+ // 濡傛灉閫夋嫨鐨勬槸"瀹朵腑"锛岃嚜鍔ㄨ缃瀹や负"鍏跺畠"
+ if (hospitalData.name === '瀹朵腑') {
+ this.taskForm.hospitalIn.department = '鍏跺畠'
+ this.taskForm.hospitalIn.departmentId = null
+ }
+ // 娉ㄦ剰锛氶�夋嫨鏂扮殑鍖婚櫌鏃讹紝涓嶈嚜鍔ㄦ洿鏂扮瀹や俊鎭紝淇濇寔鐢ㄦ埛宸查�夋嫨鐨勭瀹�
+
// 濡傛灉杞嚭鍦板潃宸插～鍐�,鑷姩璁＄畻璺濈
if (this.taskForm.hospitalOut.address) {
// 濡傛灉涓や釜閮戒笉鏄�"瀹朵腑",浣跨敤鍖婚櫌璺濈璁＄畻
@@ -566,6 +618,30 @@
onHospitalInAddressSelected(data) {
if (this.taskForm.hospitalOut.address) {
this.calculateDistanceByManualAddress()
+ }
+ },
+
+ // 杞嚭绉戝鍙樺寲
+ onHospitalOutDepartmentChange(data) {
+ console.log('杞嚭绉戝鍙樺寲:', data)
+ if (data && typeof data === 'object') {
+ this.taskForm.hospitalOut.department = data.department
+ this.taskForm.hospitalOut.departmentId = data.departmentId
+ } else {
+ this.taskForm.hospitalOut.department = data
+ this.taskForm.hospitalOut.departmentId = null
+ }
+ },
+
+ // 杞叆绉戝鍙樺寲
+ onHospitalInDepartmentChange(data) {
+ console.log('杞叆绉戝鍙樺寲:', data)
+ if (data && typeof data === 'object') {
+ this.taskForm.hospitalIn.department = data.department
+ this.taskForm.hospitalIn.departmentId = data.departmentId
+ } else {
+ this.taskForm.hospitalIn.department = data
+ this.taskForm.hospitalIn.departmentId = null
}
},
@@ -754,6 +830,12 @@
return false
}
+ // 楠岃瘉鑱旂郴鐢佃瘽鏍煎紡
+ if (this.taskForm.patient.phone && !/^1[3-9]\d{9}$/.test(this.taskForm.patient.phone)) {
+ this.$modal.showToast('璇疯緭鍏ユ纭殑鎵嬫満鍙风爜')
+ return false
+ }
+
if (!this.taskForm.hospitalOut.name) {
this.$modal.showToast('璇疯緭鍏ヨ浆鍑哄尰闄㈠悕绉�')
return false
@@ -764,6 +846,11 @@
return false
}
+ if (!this.taskForm.hospitalOut.department) {
+ this.$modal.showToast('璇烽�夋嫨杞嚭绉戝')
+ return false
+ }
+
if (!this.taskForm.hospitalIn.name) {
this.$modal.showToast('璇疯緭鍏ヨ浆鍏ュ尰闄㈠悕绉�')
return false
@@ -771,6 +858,46 @@
if (!this.taskForm.hospitalIn.address) {
this.$modal.showToast('璇烽�夋嫨杞叆鍖婚櫌鍦板潃')
+ return false
+ }
+
+ if (!this.taskForm.hospitalIn.department) {
+ this.$modal.showToast('璇烽�夋嫨杞叆绉戝')
+ return false
+ }
+
+ // 楠岃瘉鎴愪氦浠峰繀濉�
+ if (!this.taskForm.price || this.taskForm.price.trim() === '') {
+ this.$modal.showToast('璇疯緭鍏ユ垚浜や环')
+ return false
+ }
+
+ // 楠岃瘉鎴愪氦浠锋牸寮忥紙蹇呴』鏄暟瀛楋級
+ if (isNaN(this.taskForm.price) || parseFloat(this.taskForm.price) < 0) {
+ this.$modal.showToast('璇疯緭鍏ユ湁鏁堢殑鎴愪氦浠�')
+ return false
+ }
+
+ // 楠岃瘉鎮ｈ�呰韩浠借瘉鏍煎紡锛堝鏋滃～鍐欎簡锛�
+ if (this.taskForm.patient.idCard && this.taskForm.patient.idCard.trim() !== '') {
+ const idCard = this.taskForm.patient.idCard.trim()
+ // 绠�鍗曢獙璇�18浣嶈韩浠借瘉
+ if (!/^\d{17}[\dXx]$/.test(idCard)) {
+ this.$modal.showToast('璇疯緭鍏ユ纭殑18浣嶈韩浠借瘉鍙风爜')
+ return false
+ }
+ }
+
+ // 楠岃瘉鐥呮儏鑷冲皯閫夋嫨涓�椤规垨濉啓鍏朵粬鎻忚堪
+ if ((!this.selectedDiseases || this.selectedDiseases.length === 0) &&
+ (!this.taskForm.patient.otherCondition || this.taskForm.patient.otherCondition.trim() === '')) {
+ this.$modal.showToast('璇烽�夋嫨鐥呮儏鎴栧～鍐欏叾浠栫梾鎯呮弿杩�')
+ return false
+ }
+
+ // 楠岃瘉鎵ц浜哄憳鑷冲皯閫夋嫨涓�涓�
+ if (!this.selectedStaff || this.selectedStaff.length === 0) {
+ this.$modal.showToast('璇疯嚦灏戦�夋嫨涓�涓墽琛屼汉鍛�')
return false
}
@@ -936,7 +1063,8 @@
// 璋冪敤鐧惧害鍦板浘API璁＄畻璺濈
const region = this.selectedRegion || '骞垮窞'
- baiduDistanceByAddress(fromAddress, region, toAddress, region)
+ //baiduDistanceByAddress(fromAddress, region, toAddress, region)
+ tiandituDistanceByAddress(fromAddress,toAddress)
.then(response => {
uni.hideLoading()
@@ -1261,5 +1389,4 @@
}
}
}
-}
-</style>
\ No newline at end of file
+}
\ No newline at end of file
--
Gitblit v1.9.1