dianliang/driverSchool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:b9fb9bf81ca5ae4dd9bbf6486f5df14b80ada17a
Branches Tags
dianliang:master
..
compare: dianliang:639fa294126ac81f793f307be95fd972fc91ccc6
Branches Tags
dianliang:master

No commits in common. "b9fb9bf81ca5ae4dd9bbf6486f5df14b80ada17a" and "639fa294126ac81f793f307be95fd972fc91ccc6" have entirely different histories.
b9fb9bf81c ... 639fa29412

3 changed files with 461 additions and 480 deletions
Show Stats Expand all files Collapse all files

9
newPages/schoolDetail/index.vue
View File

@ -42,10 +42,11 @@
<view class="text-wrapper_4 flex-col"> <view class="text-wrapper_4 flex-col">
<view style="display: flex"> <view style="display: flex">
<text class="text_13" <text class="text_13"
style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx" style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{
v-if="item.tittle">{{ item.tittle }} item.tittle
}}
</text> </text>
<text class="text-wrapper_3 text_13" v-if="item.type" <text class="text-wrapper_3 text_13"
style="color: black;padding: 5rpx 10rpx">{{ item.type }}</text> style="color: black;padding: 5rpx 10rpx">{{ item.type }}</text>
</view> </view>
</view> </view>
@ -77,7 +78,7 @@
<image class="label_3" referrerpolicy="no-referrer" :src="imagesUrl + '/' + item.image" /> <image class="label_3" referrerpolicy="no-referrer" :src="imagesUrl + '/' + item.image" />
<view class="text-group_4 flex-col justify-between"> <view class="text-group_4 flex-col justify-between">
<text class="text_25">{{ item.name }}</text> <text class="text_25">{{ item.name }}</text>
<text class="text_27" v-if="item.seniority">教龄&nbsp;{{ item.seniority }}年</text> <text class="text_27">教龄&nbsp;{{ item.seniority }}年</text>
</view> </view>
</view> </view>
</view> </view>

139
pagesA/examinationAdd/index.vue
View File

@ -19,8 +19,11 @@
<uni-icons type="left" color="#000000" size="22px"></uni-icons> <uni-icons type="left" color="#000000" size="22px"></uni-icons>
</headers> </headers>
</view> </view>
<view> <view >
<scroll-view :style="{ height: scrollHeight + 'px' }" scroll-y="true" class="scroll-view"> <scroll-view
:style="{ height: scrollHeight + 'px' }"
scroll-y="true" class="scroll-view"
>
<view class="group_4 flex-col"> <view class="group_4 flex-col">
<view class="block_1 flex-row justify-between" @click="show = true"> <view class="block_1 flex-row justify-between" @click="show = true">
<text class="text_19">是否通过</text> <text class="text_19">是否通过</text>
@ -34,17 +37,28 @@
<view class="text-wrapper_7 flex-row justify-between"> <view class="text-wrapper_7 flex-row justify-between">
<text class="text_4">分数</text> <text class="text_4">分数</text>
<view class="text_5_1 "> <view class="text_5_1 ">
<u--input placeholder="请输入分数" border="none" v-model="process.examScore" maxlength="3" <u--input
inputAlign="right">分 placeholder="请输入分数"
border="none"
v-model="process.examScore"
maxlength="3"
inputAlign="right"
>分
</u--input> </u--input>
</view> </view>
</view> </view>
<view class="text-wrapper_8 flex-row justify-between"> <view class="text-wrapper_8 flex-row justify-between">
<text class="text_20">时间</text> <text class="text_20">时间</text>
<view> <view>
<u-datetime-picker :show="showTimePicker" v-model="process.examTime" mode="datetime" <u-datetime-picker
:minDate="minTime" :maxDate="maxTime" @confirm="onConfirmExamTime" :show="showTimePicker"
@cancel="showTimePicker = false"></u-datetime-picker> v-model="process.examTime"
mode="datetime"
:minDate="minTime"
:maxDate="maxTime"
@confirm="onConfirmExamTime"
@cancel="showTimePicker = false"
></u-datetime-picker>
<text class="text_3" @click="showTimePicker = true"> <text class="text_3" @click="showTimePicker = true">
{{ process.examTime ? formatDate(process.examTime) : '选择时间' }} {{ process.examTime ? formatDate(process.examTime) : '选择时间' }}
</text> </text>
@ -97,8 +111,14 @@
<u--textarea class="text_17" v-model="process.remark" placeholder="请输入内容" count></u--textarea> <u--textarea class="text_17" v-model="process.remark" placeholder="请输入内容" count></u--textarea>
<text class="text_18">图片</text> <text class="text_18">图片</text>
<view class="image-wrapper_4 flex-row justify-between"> <view class="image-wrapper_4 flex-row justify-between">
<u-upload :fileList="displayFileList" @afterRead="afterRead" @delete="deletePic" multiple <u-upload
:maxCount="2"></u-upload>
:fileList="displayFileList"
@afterRead="afterRead"
@delete="deletePic"
multiple
:maxCount="2"
></u-upload>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
@ -111,14 +131,12 @@
</view> </view>
</template> </template>
<script> <script>
import upload from '@/utils/upload.js' import upload from '@/utils/upload.js'
import request from '@/utils/request.js' import request from '@/utils/request.js'
import { import {getLocalUserInfo} from '../../utils/auth';
getLocalUserInfo import headers from "@/components/header/headers.vue";
} from '../../utils/auth';
import headers from "@/components/header/headers.vue";
export default { export default {
components: { components: {
headers headers
}, },
@ -127,12 +145,8 @@
show: false, show: false,
showTimePicker: false, showTimePicker: false,
subjectShow: false, subjectShow: false,
ifPassColumns: [ ifPassColumns: [['已通过', '未通过']],
['已通过', '未通过'] subjectColumns: [['科目一']],
],
subjectColumns: [
['科目一']
],
selectedValue: '', selectedValue: '',
subjectValue: '', subjectValue: '',
fileList: [], fileList: [],
@ -172,7 +186,6 @@
onLoad(options) { onLoad(options) {
console.log('options', options) console.log('options', options)
this.userInfo = getLocalUserInfo() this.userInfo = getLocalUserInfo()
console.log('userInfo', this.userInfo)
// this.getUserOrderDetails() // this.getUserOrderDetails()
this.process.subject = options.subject this.process.subject = options.subject
this.opTenantId = options.tenantId this.opTenantId = options.tenantId
@ -203,9 +216,9 @@
} }
const prefix = this.$imagesUrl.endsWith('/') ? this.$imagesUrl : `${this.$imagesUrl}/`; const prefix = this.$imagesUrl.endsWith('/') ? this.$imagesUrl : `${this.$imagesUrl}/`;
const fullUrl = item.url.startsWith('/') ? const fullUrl = item.url.startsWith('/')
`${prefix}${item.url.slice(1)}` : ? `${prefix}${item.url.slice(1)}`
`${prefix}${item.url}`; : `${prefix}${item.url}`;
return { return {
...item, ...item,
@ -271,12 +284,9 @@
formatSubject(subject) { formatSubject(subject) {
switch (Number(subject)) { switch (Number(subject)) {
case 2: case 2: return '科目二';
return '科目二'; case 3: return '科目三';
case 3: default: return '未知科目';
return '科目三';
default:
return '未知科目';
} }
}, },
@ -357,21 +367,18 @@
courseId: this.process.courseId, courseId: this.process.courseId,
} }
}).then(res => { }).then(res => {
console.log('res123', res) console.log('res123',res)
this.courseCompleteStatusList = res.data.records this.courseCompleteStatusList = res.data.records
if (this.courseCompleteStatusList.length > 0) { if (this.courseCompleteStatusList.length > 0) {
const subject2 = this.courseCompleteStatusList.find(item => item.subject === 2) const subject2 = this.courseCompleteStatusList.find(item => item.subject === 2)
const subject3 = this.courseCompleteStatusList.find(item => item.subject === 3) const subject3 = this.courseCompleteStatusList.find(item => item.subject === 3)
const subject1Or4 = this.courseCompleteStatusList.find(item => item.subject === 1 || item const subject1Or4 = this.courseCompleteStatusList.find(item => item.subject === 1 || item.subject === 4)
.subject === 4)
if (subject1Or4) { if (subject1Or4) {
this.courseType = subject1Or4.courseType this.courseType = subject1Or4.courseType
} }
if (subject2?.status === '2' && subject3?.status === '2') { if (subject2?.status === '2' && subject3?.status === '2') {
this.subjectColumns = [ this.subjectColumns = [['科目一', '科目四']]
['科目一', '科目四']
]
} }
} }
}) })
@ -387,12 +394,8 @@
saveData() { saveData() {
console.log('process', this.process) console.log('process', this.process)
if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process.examStatus === null || !this.process.examTime) {
.examStatus === null || !this.process.examTime) { uni.showToast({title: '信息填写不完整', icon: 'none'});
uni.showToast({
title: '信息填写不完整',
icon: 'none'
});
return; return;
} }
if (this.process.subject == 1 || this.process.subject == 4) { if (this.process.subject == 1 || this.process.subject == 4) {
@ -404,35 +407,24 @@
}, },
saveDataOne() { saveDataOne() {
if (this.process.subject === 1 && this.courseCompleteStatusList.length <= 0) { if (this.process.subject === 1 && this.courseCompleteStatusList.length <= 0) {
uni.showToast({ uni.showToast({title: '请联系驾校人员!', icon: 'none'});
title: '请联系驾校人员!',
icon: 'none'
});
return; return;
} }
if (this.process.subject === 4 && this.courseCompleteStatusList.length <= 0) { if (this.process.subject === 4 && this.courseCompleteStatusList.length <= 0) {
uni.showToast({ uni.showToast({title: '请联系驾校人员!', icon: 'none'});
title: '请联系驾校人员!',
icon: 'none'
});
return; return;
} }
const postData = { const postData = {
...this.process, // 先拷贝 process 原有数据 ...this.process, // 先拷贝 process 原有数据
remark: this.process.remark, remark: this.process.remark,
userName: this.userInfo.nickname,
images: this.fileList?.map(item => item.url).join(',') || '', images: this.fileList?.map(item => item.url).join(',') || '',
} }
// this.process.images = this.fileList?.map(item => item.url).join(',') || ''; // this.process.images = this.fileList?.map(item => item.url).join(',') || '';
if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process.examStatus === null || !this.process.examTime) {
.examStatus === null || !this.process.examTime) { uni.showToast({title: '信息填写不完整', icon: 'none'});
uni.showToast({
title: '信息填写不完整',
icon: 'none'
});
return; return;
} }
console.log('postData', postData) console.log('postData', postData)
@ -454,10 +446,7 @@
}); });
}, 1500); }, 1500);
} else { } else {
uni.showToast({ uni.showToast({title: res.data?.message || '保存失败', icon: 'none'});
title: res.data?.message || '保存失败',
icon: 'none'
});
} }
}) })
}, },
@ -466,24 +455,18 @@
...this.process, // 先拷贝 process 原有数据 ...this.process, // 先拷贝 process 原有数据
tenantId: this.opTenantId, tenantId: this.opTenantId,
fraction: this.process.examScore, fraction: this.process.examScore,
ifPass: this.process.examStatus === 1, ifPass: this.process.examStatus,
id: this.batchItemId, id: this.batchItemId,
remark: this.process.remark, remark: this.process.remark,
userName: this.userInfo.nickname,
images: this.fileList?.map(item => item.url).join(',') || '', images: this.fileList?.map(item => item.url).join(',') || '',
} }
console.log('postData', postData)
/* this.process.userId = this.userInfo.id /* this.process.userId = this.userInfo.id
this.process.tenantId = this.opTenantId this.process.tenantId = this.opTenantId
this.process.fraction = this.process.examScore this.process.fraction = this.process.examScore
this.process.ifPass = this.process.examStatus this.process.ifPass = this.process.examStatus
this.process.images = this.fileList?.map(item => item.url).join(',') || ''; */ this.process.images = this.fileList?.map(item => item.url).join(',') || ''; */
if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process if (!this.process.userId || !this.process.subject || this.process.examScore === null || this.process.examStatus === null || !this.process.examTime) {
.examStatus === null || !this.process.examTime) { uni.showToast({title: '信息填写不完整', icon: 'none'});
uni.showToast({
title: '信息填写不完整',
icon: 'none'
});
return; return;
} }
request({ request({
@ -504,18 +487,16 @@
}); });
}, 1500); }, 1500);
} else { } else {
uni.showToast({ uni.showToast({title: res.data?.message || '保存失败', icon: 'none'});
title: res.data?.message || '保存失败',
icon: 'none'
});
} }
}) })
} }
} }
}; };
</script> </script>
<style lang='scss'> <style lang='scss'>
@import '../common/common.scss'; @import '../common/common.scss';
@import './assets/style/index.rpx.scss'; @import './assets/style/index.rpx.scss';
</style> </style>

9
pagesA/examinationList/index.vue
View File

@ -13,8 +13,9 @@
<view class="block_3 flex-row justify-between"> <view class="block_3 flex-row justify-between">
<view class="text-group_1 flex-col justify-between"> <view class="text-group_1 flex-col justify-between">
<text class="text_2" <text class="text_2" v-if="item.subject == 1 || item.subject == 4">{{
v-if="item.subject == 1 || item.subject == 4">{{ formatDate(item.examTime) }} formatDate(item.examTime)
}}
</text> </text>
<text class="text_2" v-else>{{ formatDate(item.startTime) }}</text> <text class="text_2" v-else>{{ formatDate(item.startTime) }}</text>
<text class="text_3">{{ item.courseName }}</text> <text class="text_3">{{ item.courseName }}</text>
@ -22,9 +23,7 @@
<view class="text-group_2 flex-col justify-between"> <view class="text-group_2 flex-col justify-between">
<text class="text_4" v-if="item.examScore">{{ item.examScore }}</text> <text class="text_4" v-if="item.examScore">{{ item.examScore }}</text>
<text class="text_4" v-else>{{ '--' }}</text> <text class="text_4" v-else>{{ '--' }}</text>
<text class="text_5" <text class="text_5">{{ getStatusText(item.examStatus) }}</text>
v-if="item.ifPassStatus === '9'">{{ getStatusText(item.ifPassStatus) }}</text>
<text class="text_5" v-else>{{ getStatusText(item.examStatus) }}</text>
</view> </view>
</view> </view>
<view class="block_4 flex-row justify-between"> <view class="block_4 flex-row justify-between">