Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
9a050e3a by 杨炀
Options

1.0.4 36库 修复12.18bug 及 修改意见

1 parent e17cf320
Expand all
Inline Side-by-side
Showing 8 changed files with 178 additions and 80 deletions
common/api.js
......@@ -30,10 +30,14 @@ function carUrl(data, type) {
return uni.uploadFile({
url: `${config.baseUrl_api}/person/info/getPersonInfoFromCert/${type}`,
header: {
'Authorization': uni.getStorageSync('token'),
'Authorization': uni.getStorageSync('token'),
'Content-Language': 'zh_CN',
'Accept-Language': 'zh-CN,zh',
},
name: 'pic',
filePath: data
}).then(res => {
return JSON.parse(res.data)
})
// return request({
// url: `/person/info/getPersonInfoFromCert/${type}`,
......@@ -226,7 +230,12 @@ function addTransferToRange(data) {
params: data
})
}
function deltransferRange(rids) {
return request({
url: `/person/transfer/${rids}`,
method: 'delete'
})
}
function commit(rangeIds) {
return request({
url: `/person/transferRange/commit/${rangeIds}`,
......@@ -240,7 +249,15 @@ function mobilizeAudit(data) {
method: 'post',
params: data
})
}
}
function delMobilize(rids) {
return request({
url: `/person/transferRange/${rids}`,
method: 'delete'
})
}
//文件上传
function uploadFile(e) {
const fileUrl = e.tempFilePaths[0]
......@@ -1058,5 +1075,6 @@ export {
getMemberInfoModRange,commitGroupChange,delGroupChange,
getChangeGroupByRangeId,groupInfoMod,addGroupInfoModeToRange,
groupChangeEditMod,groupChangeAudit,extractInfoFromChinaIdCard
,certifiedwithDraw,certifiedunMerge,getRemindCount,getGroupMemberInfoById
,certifiedwithDraw,certifiedunMerge,getRemindCount,getGroupMemberInfoById
,delMobilize,deltransferRange
}
\ No newline at end of file
......
common/login.js
......@@ -123,7 +123,7 @@ function getMyOwnMemberInfo() {
const app = getApp()
app.globalData.authenticationStatus = res.data.authenticationStatus
app.globalData.memberInfo = res.data.memberInfo
app.globalData.isExam = res.data?.dept?.isExam
app.globalData.isExam = res.data?.memberInfo?.isPoints
})
}
export {
......
config.js
......@@ -5,11 +5,11 @@
// staging 会员系统
// const baseUrl_api = "http://22yidpjzjifv.ngrok.xiaomiqiu123.top/stage-api/";
// const baseUrl_api = "http://123.60.96.243/stage-api/";
// const baseUrl_api = 'http://192.168.1.131:8787'
// const baseUrl_api = 'http://192.168.1.11:8787'
// const baseUrl_api = 'https://ztx.itechtop.cn/stage-api'
// const baseUrl_api = 'https://tkcn.19wk.cn:8443/stage-api'
const baseUrl_api = 'https://tkcn.19wk.cn:8443/stage-api'
const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api'
// const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api'
export default {
baseUrl_api
}
......
level/addApply.vue
......@@ -26,7 +26,7 @@
</uni-forms-item>
<uni-forms-item @updateData="updateData" :label="`考官${ec}`" v-for="ec in examinerForChoose"
:key="ec">
<view class="maskbox">
<view class="maskbox">
<view class="mask" @click="selectFN(ec)"></view>
<uni-easyinput v-model="form[`examiner_${ec}`]" clearable placeholder="点击选择考官" />
</view>
......@@ -41,7 +41,7 @@
<button class="btn-red-kx mini w100" @click="chooseOnline">
<uni-icons type="personadd" size="16" color="#AD181F"></uni-icons>
在线选择</button>
<!-- <button class="btn-red-kx mini w45" @click="handleUpdate">
<!-- <button class="btn-red-kx mini w45" @click="handleUpdate">
<uni-icons type="upload" size="16" color="#AD181F"></uni-icons>
上传成绩单</button> -->
</view>
......@@ -52,13 +52,13 @@
</view>
</view>
<view class="userlist">
<view class="item" v-for="(n,index) in infoList" :key="index" style="background-color: #fffafa;">
<view class="w100">
<view class="item" v-for="(n,index) in infoList" :key="index"
style="background-color: #fffafa;">
<view class="w100">
<view class="del" @click="handleDelete(n)">删除</view>
<view style="display: flex;">
<view class="photobox">
<image class="photo" v-if="n.photo" :src="n.photo"
mode='aspectFill'></image>
<image class="photo" v-if="n.photo" :src="n.photo" mode='aspectFill'></image>
<view class="colorful" v-else>{{n.realName?.slice(0,1)}}</view>
</view>
<view>
......@@ -72,9 +72,9 @@
<text style="padding: 15rpx 0;">{{ szToHz(n.levelOld) }}级</text>
</view>
<view style="width: 40%;">
考试级别
考试级别
<text style="padding: 15rpx 0;">{{ szToHz(n.levelNew) }}级</text>
<!-- <view @click="changeLevelfather(n)">
<!-- <view @click="changeLevelfather(n)">
<uni-data-select v-model="n.levelNew" :localdata="levelArr"
@change="changeLevel"></uni-data-select>
</view> -->
......@@ -84,7 +84,7 @@
<view style="width: 30%;">
是否通过
<view>
<uni-data-select v-model="n.isPass" :localdata="range"></uni-data-select>
<uni-data-select :clear="false" v-model="n.isPass" :localdata="range"></uni-data-select>
</view>
</view>
</view>
......@@ -111,12 +111,18 @@
<uni-popup ref="choseStudent" type="bottom" background-color="#fff" animation>
<view class="popBody">
<view class="userlist" style="max-height:80vh;overflow: auto;">
<view class="popBody">
<view class="searchbar">
<uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search"
v-model="studentQuery.name" placeholder="搜索姓名" @blur="chooseOnline" @clear="chooseOnline">
</uni-easyinput>
</view>
<view class="userlist" style="height:80vh;overflow: auto;">
<view class="item" v-for=" (n,index) in studentList" :key="index">
<view @click="checkThis(n)">
<image class="icon" v-if="n.checked" :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" />
<image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
<image class="icon" v-if="n.checked"
:src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" />
<image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
</view>
<view class="photobox">
<image class="photo" v-if="n.photo" :src="n.photo" mode='aspectFill'>
......@@ -135,7 +141,7 @@
<image mode="aspectFit" src="/static/nodata.png"></image>
<text>无可参加考试会员</text>
</view>
</view>
</view>
<button class="btn-red-kx" v-if="studentList.length!=0" @click="submitStudents">确定</button>
</view>
</uni-popup>
......@@ -188,7 +194,10 @@
const infoList = ref([])
const ids = ref([])
const tablePersonInfo = ref({})
const transcript = ref([])
const transcript = ref([])
const studentQuery = ref({
name:''
})
const levelArr = ref([{
value: '10',
text: '十级'
......@@ -365,13 +374,13 @@
save().then(() => {
// form.value.examId 下一步
active.value = 1
getChosedStudentList()
if(form.value.examId){
api.getLevelApplyInfo(form.value.examId).then(res=>{
if (res.data.transcript) {
transcript.value = JSON.parse(res.data.transcript)
}
})
getChosedStudentList()
if (form.value.examId) {
api.getLevelApplyInfo(form.value.examId).then(res => {
if (res.data.transcript) {
transcript.value = JSON.parse(res.data.transcript)
}
})
}
})
}
......@@ -398,24 +407,25 @@
}
function chooseOnline() {
uni.showLoading({
title:'加载中',
icon:'none'
uni.showLoading({
title: '加载中',
icon: 'none'
})
var obj = {
memId: memberInfo.memId,
examId: form.value.examId,
examType: form.value.type
examType: form.value.type,
name:studentQuery.value.name
}
api.chooseStudentsList(obj).then(response => {
studentList.value = response.rows
for (var s of studentList.value) {
s.checked = false
if(s.photo&&s.photo.indexOf('http')==-1){
s.photo = config.baseUrl_api + s.photo
}
}
s.checked = false
if (s.photo && s.photo.indexOf('http') == -1) {
s.photo = config.baseUrl_api + s.photo
}
}
uni.hideLoading()
choseStudent.value.open()
})
......@@ -473,9 +483,9 @@
if (!d.isPass) {
d.isPass = '1'
}
if(d.photo&&d.photo.indexOf('http')==-1){
d.photo = config.baseUrl_api + d.photo
}
if (d.photo && d.photo.indexOf('http') == -1) {
d.photo = config.baseUrl_api + d.photo
}
})
......@@ -644,36 +654,40 @@
}
}))
UpPop.value.close()
}
function handleDelete(row) {
uni.showModal({
title: '提示',
content: `确定删除${row.realName}?`,
success: function(res) {
if (res.confirm) {
api.dellevelPerson(row.id).then(res=>{
uni.showToast({
title:`操作成功`
})
getChosedStudentList()
})
}
}
})
}
function handleDelete(row) {
uni.showModal({
title: '提示',
content: `确定删除${row.realName}?`,
success: function(res) {
if (res.confirm) {
api.dellevelPerson(row.id).then(res => {
uni.showToast({
title: `操作成功`
})
getChosedStudentList()
})
}
}
})
}
</script>
<style lang="scss" scoped>
:deep(.uni-progress-bar) {
display: none;
}
.item{
.del{ color: #AD181F;
position: absolute;
right: 30rpx;
font-size: 28rpx;}
}
.item {
.del {
color: #AD181F;
position: absolute;
right: 30rpx;
font-size: 28rpx;
}
}
.wBox {
width: 700rpx;
padding: 30rpx;
......@@ -689,11 +703,22 @@
.popBody {
padding: 40rpx 30rpx;
}
.maskbox{position:relative;
.mask{position: absolute;width:calc(100% - 34px);height: 100%;z-index: 10;
background-color: red;opacity: 0;
}
}
:deep(.file-picker__progress){opacity:0;}
}
.maskbox {
position: relative;
.mask {
position: absolute;
width: calc(100% - 34px);
height: 100%;
z-index: 10;
background-color: red;
opacity: 0;
}
}
:deep(.file-picker__progress) {
opacity: 0;
}
</style>
\ No newline at end of file
......
personalVip/addMobilize.vue
......@@ -198,6 +198,27 @@
})
uni.navigateBack()
})
}
function handleDelete(row){
uni.showModal({
title: '提示',
content: `确定删除吗`,
success: function(res) {
if (res.confirm) {
api.deltransferRange([row.id]).then(Response=>{
uni.showToast({
icon:"none",
title:'删除成功！'
})
if (total.value == 1) {
baseFormData.value.rangeId = '-1'
queryParams.value.rangeId = '-1'
}
getList()
})
}
}
})
}
</script>
......
personalVip/mobilize.vue
......@@ -65,8 +65,9 @@
<button @click="audit(item.id,'1')">同意</button>
</view>
<view class="func" v-if="(deptType == 6&&(item.status == 0 || item.status == 2))">
<button @click="del(item)">删除</button>
<button @click="editThis(item)">编辑</button>
<button>提交审核</button>
<button v-if="item.status == 0 || item.status == 2" @click="handleSubmit(item)">提交审核</button>
</view>
</view>
</view>
......@@ -128,12 +129,12 @@
if (deptType.value == 1) {
queryParams.value.dgId = -2
queryParams.value.ztxRes = '0'
navs.value = ['审核中', '审核通过', '审核拒绝', '撤销申请']
navs.value = ['审核中', '审核通过', '审核拒绝']
}
if (deptType.value == 6) {
queryParams.value.dgId = 1
queryParams.value.status = '0'
navs.value = ['未提交', '审核中', '审核拒绝', '审核通过', '已撤回']
navs.value = ['未提交', '审核中', '审核拒绝', '审核通过']
}
getList()
}
......@@ -204,9 +205,42 @@
url: path
});
}
function handleSubmit(row){
uni.showModal({
title: '提示',
content: `确定提交吗`,
success: function(res) {
if (res.confirm) {
api.commit([row.id]).then(Response=>{
uni.showToast({
icon:"none",
title:'提交成功！'
})
getList()
})
}
}
})
}
function del(row){
uni.showModal({
title: '提示',
content: `确定删除吗`,
success: function(res) {
if (res.confirm) {
api.delMobilize(row.id).then(Response=>{
uni.showToast({
icon:"none",
title:'删除成功！'
})
getList()
})
}
}
})
}
function audit(rangeId, flag) {
if (flag == '0') {
if (flag == '2') {
// 拒绝
// 弹出框填写理由
uni.showModal({
......
personalVip/mobilizeDetail.vue
......@@ -38,7 +38,7 @@
</view>
</view>
<view class="fixedBottom" v-if="(deptType == 1)&&form.ztxRes == 0">
<!-- <view class="fixedBottom" v-if="(deptType == 1)&&form.ztxRes == 0">
<button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button>
<button class="btn-red" @click="audit(form.id,'1')">同意</button>
</view>
......@@ -46,7 +46,7 @@
<view class="fixedBottom" v-if="(deptType == 2 || deptType == 3)&&form.shenRes == 0">
<button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button>
<button class="btn-red" @click="audit(form.id,'1')">同意</button>
</view>
</view> -->
</view>
</template>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!