php
/
ZhiHuiJiaoWu_UniApp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://gitlab.frkj.cc:222/php/ZhiHuiJiaoWu_UniApp

master
王泽彦 10 months ago
parent
c3e7e630af be6a904904
commit
73644fb3d8
7 changed files with 436 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages.json
  2. 253
      pages/common/my_attendance.vue
  3. 121
      pages/market/clue/add_clues.vue
  4. 119
      pages/market/clue/edit_clues.vue
  5. 44
      pages/market/clue/edit_clues_log.vue
  6. 7
      pages/market/my/index.vue
  7. 2
      pages/student/my/my.vue

2
pages.json
View File

@ -490,7 +490,7 @@
"navigationBarTitleText": "线索",
"navigationStyle": "default",
"navigationBarBackgroundColor": "#292929",
"navigationBarTextStyle": "black"
"navigationBarTextStyle": "white"
}
},
{

253
pages/common/my_attendance.vue
View File

@ -25,28 +25,35 @@
<view class="li"
v-for="(v,k) in tableList"
:key="k"
@click="openInfo(v)"
>
<view class="left">
<!-- <image src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png" model="aspectFill"></image>-->
</view>
<view class="right">
<view class="left" @click="openInfo(v)">
<view class="content">普通考勤</view>
<view class="content">
{{v.status_name}}
</view>
<view class="content">
校区：{{v.campus_id_name}}
校区：{{v.campus_id_name || ''}}
</view>
<view class="content">
备注：{{v.remarks || ''}}
</view>
<view class="content">
<text>{{v.attendance_date}} {{v.check_in_time}}</text>
<text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
<text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
<view class="item" v-if="v.status != 'leave'">
<!--考勤-->
<text>开始时间：{{ v.attendance_date }} {{ v.check_in_time || '' }}</text>
<text v-if="v.check_out_time">结束时间：{{ v.attendance_date }} {{ v.check_out_time || '' }}</text>
</view>
<!--请假-->
<view class="item" v-else>
<text>开始时间：{{ v.attendance_date }} {{v.leave_start_time || ''}}</text>
<text>结束时间：{{ v.attendance_date }} {{v.leave_end_time || ''}}</text>
</view>
</view>
</view>
<view class="right">
<view v-if="v.status == 'present' && !v.check_out_time" class="btn" style="background-color: #00b0f0;" @click="openSignInShow('sign_out',v)">签退</view>
</view>
</view>
</view>
@ -67,7 +74,21 @@
:key="k"
>
<view class="left">
<!-- <image src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png" model="aspectFill"></image>-->
<view class="content">普通考勤</view>
<view class="content">
{{v.status_name}}
</view>
<view class="content">
校区：{{v.campus_id_name}}
</view>
<view class="content">
备注：{{v.remarks || ''}}
</view>
<view class="content">
<text>{{v.attendance_date}} {{v.check_in_time}}</text>
<text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
<text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
</view>
</view>
<view class="right">
<view class="content">普通考勤</view>
@ -105,7 +126,21 @@
:key="k"
>
<view class="left">
<!-- <image src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png" model="aspectFill"></image>-->
<view class="content">普通考勤</view>
<view class="content">
{{v.status_name}}
</view>
<view class="content">
校区：{{v.campus_id_name}}
</view>
<view class="content">
备注：{{v.remarks || ''}}
</view>
<view class="content">
<text>{{v.attendance_date}} {{v.check_in_time}}</text>
<text v-if="v.check_out_time" style="padding: 0 20rpx">-</text>
<text v-if="v.check_out_time">{{v.attendance_date}} {{v.check_out_time}}</text>
</view>
</view>
<view class="right">
<view class="content">普通考勤</view>
@ -150,8 +185,69 @@
<text class="fui-descr">{{signIn_content}}</text>
<fui-form class="form-section" ref="form" top="0" :model="formData" :show="false">
<view class="input-style">
<!-- 请假日期选择-->
<fui-form-item
v-if="formData.status == 'leave'"
label="选择日期"
asterisk
asteriskPosition="right"
labelSize='26'
prop=""
background='#fff'
labelColor='#000'
:bottomBorder='true'
>
<view class="input-title" style="margin-right:14rpx;">
<view
class="input-title"
style="margin-right:14rpx;"
@click="openLeaveData()">
{{ (formData.attendance_date) ? formData.attendance_date : '点击选择' }}
</view>
<fui-date-picker
:show="showLeaveData"
type="3"
:minDate="leaveMinDate"
:maxDate="leaveMaxDate"
@change="changeLeaveData"
@cancel="cancelLeaveData"
></fui-date-picker>
</view>
</fui-form-item>
<!-- 请假时间选择-->
<fui-form-item
v-if="formData.status == 'leave'"
label="选择时间范围"
asterisk
asteriskPosition="right"
labelSize='26'
prop=""
background='#fff'
labelColor='#000'
:bottomBorder='true'
>
<view class="input-title" style="margin-right:14rpx;">
<view
class="input-title"
style="margin-right:14rpx;"
@click="openLeaveStartTime()">
{{ (formData.leave_time) ? formData.leave_time : '点击选择' }}
</view>
<fui-date-picker
:show="showLeaveStartTime"
range
type="6"
@change="changeLeaveStartTime"
@cancel="cancelLeaveStartTime"
></fui-date-picker>
</view>
</fui-form-item>
<!--校区选择-->
<fui-form-item
v-if="picker_options.length"
label="选择校区"
asterisk
asteriskPosition="right"
@ -172,7 +268,6 @@
</fui-form-item>
<!--备注-->
<fui-form-item
v-if="formData.status == 'leave'"
label="备注"
labelSize='26'
prop=""
@ -256,7 +351,7 @@
<!-- 选择器 -->
<!-- 校区下拉选择器 -->
<fui-picker
:linkage='picker_linkage'
:options="picker_options"
@ -266,6 +361,10 @@
@cancel="cancelCicker">
</fui-picker>
<!-- 请假日期选择器-->
<!-- 请假时间范围选择器-->
</view>
</template>
@ -324,6 +423,9 @@ export default {
status:'',//考勤状态: present-出勤, absent-缺勤, late-迟到, leave_early-早退,leave-请假,sign_out-签退
remarks:'',//备注
attendance_date:'',//请假/打卡日期
leave_time:'',//请假时间范围
leave_start_time:'',//请假开始时间
leave_end_time:'',//请假结束时间
longitude:'',//经度
latitude:'',//纬度
},
@ -349,6 +451,16 @@ export default {
// },
],//选择器可选值列表
//请假日期选择器相关
showLeaveData:false,
leaveMinDate:'',//请假日期选择器的最小可选日期
leaveMaxDate:'',//请假日期选择器的最大可选日期
//请假开始时间选择器相关
showLeaveStartTime:false,
//详情模态窗
info_show:false,//是否展示|true=是,false=否
info_data:{},//详情数据
@ -399,11 +511,20 @@ export default {
this.userInfo = res.data
this.picker_options = []
res.data.cameus_dept_arr.forEach((v,k)=>{
this.picker_options.push({
text: v.campus_id_name,
value: v.campus_id
})
if(v.campus_id){
this.picker_options.push({
text: v.campus_id_name,
value: v.campus_id
})
}
})
//当前用户没校区时
if(!this.picker_options.length){
this.formData.campus_id = 0
this.formData.campus_id_name = ''
}
console.log(123123,this.picker_options)
},
@ -420,7 +541,17 @@ export default {
this.formData.attendance_date = res
},
//最小可选的请假日期
this.leaveMinDate = res
//最大可选的请假日期
const minDate = new Date(this.leaveMinDate);
minDate.setMonth(minDate.getMonth() + 6);
const max_year = minDate.getFullYear();
const max_month = String(minDate.getMonth() + 1).padStart(2, '0');
const max_day = String(minDate.getDate()).padStart(2, '0');
this.leaveMaxDate = `${max_year}-${max_month}-${max_day}`; },
//切换tag列表
async segmented(e) {
@ -531,10 +662,19 @@ export default {
//打卡签到相关
//显示打卡弹窗
openSignInShow(status){
openSignInShow(status,obj={}){
this.formData.status = status
console.log('123123',obj);
let attendance_date = this.formData.attendance_date
if(obj.id){
this.formData.id = obj.id
attendance_date = obj.attendance_date
}else{
this.formData.id = ''
}
switch (status){
case 'present':
this.signIn_title = `是否确认打卡?`
@ -546,7 +686,7 @@ export default {
break;
case 'sign_out':
this.signIn_title = `是否确认签退?`
this.signIn_content = `${this.formData.attendance_date} 是否确认签退?`
this.signIn_content = `${attendance_date} 是否确认签退?`
break;
}
@ -571,7 +711,8 @@ export default {
//取消按钮
this.closeSignInShow()
}else{
if(!this.formData.campus_id){
console.log('提交',this.formData)
if(!this.formData.campus_id && this.picker_options.length){
uni.showToast({
title: '请选择校区',
icon: 'none'
@ -706,6 +847,10 @@ export default {
async submitFormData() {
this.closeSignInShow()
if(!this.formData.campus_id && !this.picker_options.length){
this.formData.campus_id = 0
}
let param = {...this.formData}
let res = await apiRoute.common_attendanceEdit(param)
if (res.code != 1) {
@ -773,6 +918,43 @@ export default {
return [data];
},
//请假日期相关
//监听-请假日期选择
changeLeaveData(e){
console.log('请假日期选择',e)
this.formData.attendance_date = e.result
this.cancelLeaveData()
},
//打开请假日期选择器
openLeaveData(){
this.showLeaveData = true
},
//关闭请假日期选择器
cancelLeaveData(){
this.showLeaveData = false
},
//监听-请假开始时间选择
changeLeaveStartTime(e){
console.log('请假开始时间选择',e)
let leave_start_time = e.startDate.result
let leave_end_time = e.endDate.result
this.formData.leave_time = `${leave_start_time}-${leave_end_time}`
this.formData.leave_start_time = leave_start_time
this.formData.leave_end_time = leave_end_time
this.cancelLeaveStartTime()
},
//打开请假日期选择器
openLeaveStartTime(){
this.showLeaveStartTime = true
},
//关闭请假日期选择器
cancelLeaveStartTime(){
this.showLeaveStartTime = false
},
}
}
</script>
@ -820,29 +1002,38 @@ export default {
.li{
border: 1px solid #5f5f5f;
border-radius: 15rpx;
padding: 20rpx 0;
padding: 20rpx 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
gap: 43rpx;
.left{
image{
width: 174rpx;
height: 174rpx;
border-radius: 24rpx;
background-color: #333333;
}
}
.right{
width: 70%;
display: flex;
flex-direction: column;
gap: 18rpx;
.content{
font-size: 24rpx;
.item{
display: flex;
flex-direction: column;
}
}
.content:nth-child(1){
font-size: 28rpx;
}
}
.right{
.btn{
width: 120rpx;
height: 60rpx;
line-height: 60rpx;
border-radius: 8rpx;
color: rgba(255,255,255,1);
font-size: 28rpx;
text-align: center;
}
}
}
}
.title_box{
@ -856,6 +1047,7 @@ export default {
}
.section_btn{
margin-top: 20rpx;
display: flex;
justify-content: center;
display: flex;
@ -901,6 +1093,7 @@ export default {
.input-style {
text-align: right !important;
.input-title{}
}
.button_box{
margin-top: 30rpx;

121
pages/market/clue/add_clues.vue
View File

@ -27,9 +27,9 @@
<view class="title" style="margin-top: 20rpx;">基础信息</view>
<view class="input-style">
<!--来源渠道-->
<!--来源-->
<fui-form-item
label="来源渠道"
label="来源"
asterisk asteriskPosition="right"
labelSize='26'
prop=""
@ -41,14 +41,15 @@
<view
class="input-title"
style="margin-right:14rpx;"
@click="openCicker(`source_channel`)">
{{ (formData.source_channel) ? picker_config.source_channel.text : '点击选择' }}
@click="openCicker(`source`)">
{{ (formData.source) ? picker_config.source.text : '点击选择' }}
</view>
</view>
</fui-form-item>
<!--来源-->
<!--来源渠道-->
<fui-form-item
label="来源"
v-if="formData.source == 1"
label="来源渠道"
asterisk asteriskPosition="right"
labelSize='26'
prop=""
@ -60,11 +61,12 @@
<view
class="input-title"
style="margin-right:14rpx;"
@click="openCicker(`source`)">
{{ (formData.source) ? picker_config.source.text : '点击选择' }}
@click="openCicker(`source_channel`)">
{{ (formData.source_channel) ? picker_config.source_channel.text : '点击选择' }}
</view>
</view>
</fui-form-item>
<!--顾问-->
<!--
<fui-form-item
@ -87,6 +89,7 @@
</fui-form-item>
-->
<fui-form-item
v-show="false"
label="顾问"
asterisk asteriskPosition="right"
labelSize='26'
@ -188,6 +191,7 @@
backgroundColor="#434544"
size="26"
color="#fff"
@blur="handlePhoneBlur"
></fui-input>
</view>
</fui-form-item>
@ -222,15 +226,12 @@
labelColor='#fff'
:bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<fui-input
:borderBottom="false"
:padding="[0]"
placeholder="点击填写"
v-model="formData.decision_maker"
backgroundColor="#434544"
size="26"
color="#fff"
></fui-input>
<view
class="input-title"
style="margin-right:14rpx;"
@click="openCicker(`decision_maker`)">
{{ (formData.decision_maker) ? picker_config.decision_maker.text : '点击选择' }}
</view>
</view>
</fui-form-item>
<!--客户初步意向度-->
@ -254,6 +255,7 @@
</fui-form-item>
<!--客户状态-->
<fui-form-item
v-show="false"
label="客户状态"
asterisk asteriskPosition="right"
labelSize='26'
@ -373,16 +375,14 @@
labelColor='#fff'
:bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<fui-input
:borderBottom="false"
:padding="[0]"
placeholder="点击填写"
v-model="formData.distance"
backgroundColor="#434544"
size="26"
color="#fff"
></fui-input>
<view
class="input-title"
style="margin-right:14rpx;"
@click="openCicker(`distance`)">
{{ (formData.distance) ? picker_config.distance.text : '点击选择' }}
</view>
</view>
</fui-form-item>
<!--沟通备注-->
<fui-form-item
@ -448,8 +448,8 @@
<!--数据列表-->
<view class="ul" v-else>
<view class="li" v-for="(v,k) in clientUserList" :key="k">
<view class="left_box" @click="openViewClueInfo(v)">
<view class="li" v-for="(v,k) in clientUserList" :key="k" @click="openViewClueInfo(v)">
<view class="left_box">
<view class="box_1">
<image
class="img"
@ -496,8 +496,8 @@
</view>
</view>
<view class="right_box">
<image v-if="v.member_id" class="img" :src="$util.img('/uniapp_src/static/images/index/message.png')" @click="openViewMyMessage(v)"></image>
<image v-if="v.phone_number" class="img" :src="$util.img('/uniapp_src/static/images/index/phone.png')" @click="dialTel(v)"></image>
<!-- <image v-if="v.member_id" class="img" :src="$util.img('/uniapp_src/static/images/index/message.png')" @click="openViewMyMessage(v)"></image>-->
<!-- <image v-if="v.phone_number" class="img" :src="$util.img('/uniapp_src/static/images/index/phone.png')" @click="dialTel(v)"></image>-->
</view>
</view>
</view>
@ -605,7 +605,7 @@ export default {
demand:'',//需求
decision_maker:'',//决策人
initial_intent:'',//客户初步意向度: high-高, medium-中, low-低
status:'',//客户状态: active-活跃, inactive-不活跃, pending-待定
status:'pending',//客户状态: active-活跃, inactive-不活跃, pending-待定
//六要素信息
purchasing_power:'',//购买力
@ -663,6 +663,11 @@ export default {
text:'',
options:[],
},
//决策人
decision_maker:{
text:'',
options:[],
},
//所属校区
campus:{
text:'',
@ -672,7 +677,12 @@ export default {
status:{
text:'',
options:[],
}
},
//距离
distance:{
text:'',
options:[],
},
},//选择器选项配置
// 年月日选择组件
@ -721,6 +731,8 @@ export default {
await this.getDict('initial_intent')//获取字典-客户初步意向度
await this.getDict('cognitive_idea')//获取字典-认知理念
await this.getDict('status')//获取字典-客户状态
await this.getDict('decision_maker')//获取字典-决策人
await this.getDict('distance')//获取字典-距离
// this.getStaffList()//获取人员列表
// this.getAreaTree()//获取地区树形结构
},
@ -851,6 +863,10 @@ export default {
case 'cognitive_idea':
key = 'cognitive_concept'
break;
//决策人
case 'decision_maker':
key = 'decision_maker'
break;
//客户初步意向度
case 'initial_intent':
key = 'preliminarycustomerintention'
@ -859,6 +875,11 @@ export default {
case 'status':
key = 'kh_status'
break;
//距离
case 'distance':
key = 'distance'
break;
}
if(!key){
return
@ -1006,7 +1027,32 @@ export default {
//联系电话失去焦点时间
async handlePhoneBlur(){
if(!this.formData.phone_number){
return
}
this.clientUserList = []
let param = {
phone_number:this.formData.phone_number
}
let res = await apiRoute.xs_getAllCustomerResources(param)
if(res.code != 1){
if(res.msg == '暂无数据'){
return
}
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
console.log('查重',res)
this.clientUserList = res.data
this.openDuplicateCheck()
},
@ -1106,10 +1152,19 @@ export default {
},
//监听-下拉选择器
changeCicker(e) {
console.log('监听-下拉选择器', this.picker_input_name, e)
console.log('监听-下拉选择器', this.picker_input_name, e,this.formData)
let input_name = this.picker_input_name
this.formData[input_name] = e.value
this.picker_config[input_name]['text'] = e.text
if(input_name == 'source'){
if(e.value != 1){
this.formData.source_channel = '0'//0=线下
}else{
this.formData.source_channel = ''//线下
}
}
this.cancelCicker()
},
//关闭下拉选择器

119
pages/market/clue/edit_clues.vue
View File

@ -27,9 +27,9 @@
<view class="title" style="margin-top: 20rpx;">基础信息</view>
<view class="input-style">
<!--来源渠道-->
<!--来源-->
<fui-form-item
label="来源渠道"
label="来源"
asterisk asteriskPosition="right"
labelSize='26'
prop=""
@ -41,14 +41,16 @@
<view
class="input-title"
style="margin-right:14rpx;"
@click="openCicker(`source_channel`)">
{{ (formData.source_channel) ? picker_config.source_channel.text : '点击选择' }}
@click="openCicker(`source`)">
{{ (formData.source) ? picker_config.source.text : '点击选择' }}
</view>
</view>
</fui-form-item>
<!--来源-->
<!--来源渠道-->
<fui-form-item
label="来源"
v-if="formData.source == 1"
label="来源渠道"
asterisk asteriskPosition="right"
labelSize='26'
prop=""
@ -60,11 +62,12 @@
<view
class="input-title"
style="margin-right:14rpx;"
@click="openCicker(`source`)">
{{ (formData.source) ? picker_config.source.text : '点击选择' }}
@click="openCicker(`source_channel`)">
{{ (formData.source_channel) ? picker_config.source_channel.text : '点击选择' }}
</view>
</view>
</fui-form-item>
<!--顾问-->
<!--
<fui-form-item
@ -188,6 +191,7 @@
backgroundColor="#434544"
size="26"
color="#fff"
@blur="handlePhoneBlur"
></fui-input>
</view>
</fui-form-item>
@ -222,15 +226,12 @@
labelColor='#fff'
:bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<fui-input
:borderBottom="false"
:padding="[0]"
placeholder="点击填写"
v-model="formData.decision_maker"
backgroundColor="#434544"
size="26"
color="#fff"
></fui-input>
<view
class="input-title"
style="margin-right:14rpx;"
@click="openCicker(`decision_maker`)">
{{ (formData.decision_maker) ? picker_config.decision_maker.text : '点击选择' }}
</view>
</view>
</fui-form-item>
@ -374,15 +375,12 @@
labelColor='#fff'
:bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<fui-input
:borderBottom="false"
:padding="[0]"
placeholder="点击填写"
v-model="formData.distance"
backgroundColor="#434544"
size="26"
color="#fff"
></fui-input>
<view
class="input-title"
style="margin-right:14rpx;"
@click="openCicker(`distance`)">
{{ (formData.distance) ? picker_config.distance.text : '点击选择' }}
</view>
</view>
</fui-form-item>
<!--沟通备注-->
@ -715,7 +713,17 @@ export default {
status:{
text:'',
options:[],
}
},
//决策人
decision_maker:{
text:'',
options:[],
},
//距离
distance:{
text:'',
options:[],
},
},//选择器选项配置
// 年月日选择组件
@ -765,6 +773,8 @@ export default {
await this.getDict('initial_intent')//获取字典-客户初步意向度
await this.getDict('cognitive_idea')//获取字典-认知理念
await this.getDict('status')//获取字典-客户状态
await this.getDict('decision_maker')//获取字典-决策人
await this.getDict('distance')//获取字典-距离
// this.getStaffList()//获取人员列表
// this.getAreaTree()//获取地区树形结构
@ -829,9 +839,12 @@ export default {
this.picker_config.initial_intent.text = customerResource.initial_intent_name || '点击选择'//客户初步意向度
this.picker_config.status.text = customerResource.status_name || '点击选择'//客户状态
this.picker_config.decision_maker.text = customerResource.decision_maker || '点击选择'//决策人
//六要素相关
this.picker_config.purchasing_power.text = sixSpeed.purchase_power_name || '点击选择'//购买力
this.picker_config.cognitive_idea.text = sixSpeed.concept_awareness_name || '点击选择'//认知理念
this.picker_config.distance.text = sixSpeed.distance || '点击选择'//距离
},
@ -943,6 +956,10 @@ export default {
case 'cognitive_idea':
key = 'cognitive_concept'
break;
//决策人
case 'decision_maker':
key = 'decision_maker'
break;
//客户初步意向度
case 'initial_intent':
key = 'preliminarycustomerintention'
@ -951,6 +968,10 @@ export default {
case 'status':
key = 'kh_status'
break;
//距离
case 'distance':
key = 'distance'
break;
}
if(!key){
return
@ -1075,7 +1096,43 @@ export default {
},
//联系电话失去焦点时间
async handlePhoneBlur(){
if(!this.formData.phone_number){
return
}
this.clientUserList = []
let param = {
phone_number:this.formData.phone_number
}
let res = await apiRoute.xs_getAllCustomerResources(param)
if(res.code != 1){
if(res.msg == '暂无数据'){
return
}
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
console.log('查重',res)
this.clientUserList = res.data
if(this.clientUserList.length == 1){
if (this.clientUserList[0].id == this.formData.id) {
//查重后的手机号是自己,就不展示查重结果了
return
}
}
this.openDuplicateCheck()
},
@ -1180,6 +1237,13 @@ export default {
let input_name = this.picker_input_name
this.formData[input_name] = e.value
this.picker_config[input_name]['text'] = e.text
if(input_name == 'source'){
if(e.value != 1){
this.formData.source_channel = '0'//0=线下
}else{
this.formData.source_channel = ''//线下
}
}
this.cancelCicker()
},
//关闭下拉选择器
@ -1220,6 +1284,7 @@ export default {
},
//表单验证
async validatorForm(data) {
console.log('tijiao',data)
//客户基础信息
//来源渠道

44
pages/market/clue/edit_clues_log.vue
View File

@ -9,7 +9,7 @@
type="button"
radius="8"
height="80"
color="#465cff"
color="#29d3b4"
bold="true"
@click="segmented">
</fui-segmented-control>
@ -25,9 +25,9 @@
>
<!--时间轴-->
<view class="table_list">
<fui-timeaxis background="#f8f8f8" :padding="['36rpx','16rpx']">
<fui-timeaxis background="#292929" :padding="['36rpx','16rpx']">
<fui-timeaxis-node
:lineColor="k<3?v.activeColor:'#ccc'"
:lineColor="k<3 ? v.activeColor:'#ccc'"
:lined="k!==tableList.length-1"
v-for="(v,k) in tableList"
:key="k"
@ -35,7 +35,7 @@
<!--inco-->
<view
class="fui-node"
:style="{borderColor:(k != tableList.length-1 ? '#465CFF' :'' ) }"
:style="{borderColor:(k != tableList.length-1 ? '#29d3b4' :'' ) }"
>
</view>
<template v-slot:right>
@ -57,17 +57,17 @@
<thead>
<tr>
<th style="width: 30%; border: 1px solid #ddd; padding: 12rpx;">字段名称</th>
<th style="width: 35%; border: 1px solid #ddd; padding: 12rpx;">原数据</th>
<th style="width: 35%; border: 1px solid #ddd; padding: 12rpx;">新数据</th>
<th style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">原数据</th>
<th style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">新数据</th>
</tr>
</thead>
<!-- 自定义每一行数据 -->
<tbody>
<tr v-for="(row, index) in v.update_arr" :key="index">
<td style="border: 1px solid #ddd; padding: 12rpx;">{{ row.field_name_zh }}</td>
<td style="border: 1px solid #ddd; padding: 12rpx;">{{ row.old_value }}</td>
<td style="border: 1px solid #ddd; padding: 12rpx;">{{ row.new_value }}</td>
<td style="width: 30%; border: 1px solid #ddd; padding: 12rpx;">{{ row.field_name_zh }}</td>
<td style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">{{ row.old_value }}</td>
<td style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">{{ row.new_value }}</td>
</tr>
</tbody>
</table>
@ -90,7 +90,7 @@
>
<!--时间轴-->
<view class="table_list">
<fui-timeaxis background="#f8f8f8" :padding="['36rpx','16rpx']">
<fui-timeaxis background="#292929" :padding="['36rpx','16rpx']">
<fui-timeaxis-node
:lineColor="k<3?v.activeColor:'#ccc'"
:lined="k!==tableList.length-1"
@ -100,7 +100,7 @@
<!--inco-->
<view
class="fui-node"
:style="{borderColor:(k != tableList.length-1 ? '#465CFF' :'' ) }"
:style="{borderColor:(k != tableList.length-1 ? '#29d3b4' :'' ) }"
>
</view>
<template v-slot:right>
@ -122,17 +122,17 @@
<thead>
<tr>
<th style="width: 30%; border: 1px solid #ddd; padding: 12rpx;">字段名称</th>
<th style="width: 35%; border: 1px solid #ddd; padding: 12rpx;">原数据</th>
<th style="width: 35%; border: 1px solid #ddd; padding: 12rpx;">新数据</th>
<th style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">原数据</th>
<th style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">新数据</th>
</tr>
</thead>
<!-- 自定义每一行数据 -->
<tbody>
<tr v-for="(row, index) in v.update_arr" :key="index">
<td style="border: 1px solid #ddd; padding: 12rpx;">{{ row.field_name_zh }}</td>
<td style="border: 1px solid #ddd; padding: 12rpx;">{{ row.old_value }}</td>
<td style="border: 1px solid #ddd; padding: 12rpx;">{{ row.new_value }}</td>
<td style="width: 30%; border: 1px solid #ddd; padding: 12rpx;">{{ row.field_name_zh }}</td>
<td style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">{{ row.old_value }}</td>
<td style="width: 34%; border: 1px solid #ddd; padding: 12rpx;">{{ row.new_value }}</td>
</tr>
</tbody>
</table>
@ -281,13 +281,18 @@ export default {
.assemble{
width: 100%;
height: 100%;
//background-color: #292929;
background-color: #292929;
overflow: auto;
.tab_section{
padding: 0 20rpx;
padding-top: 30rpx;
}
.table_list{
color: #fff;
::v-deep .fui-timeaxis__line{
background-color: #fff;
}
.itme_box {
margin-top: 30rpx;
display: flex;
@ -301,6 +306,11 @@ export default {
width: 100%;
border-collapse: collapse;
table-layout: fixed;
tr{
display: flex;
th{}
td{}
}
}
}

7
pages/market/my/index.vue
View File

@ -23,12 +23,12 @@
<view class="bottom" v-for="(v,k) in userInfo.cameus_dept_arr">
<view class="left">
<view class="title">校区：</view>
<view class="title">{{v.campus_id_name}}</view>
<view class="title">{{v.campus_id_name || ''}}</view>
</view>
<view class="division"></view>
<view class="right">
<view class="title">部门：</view>
<view class="title dept">{{v.dept_name_str}}</view>
<view class="title dept">{{v.dept_name_str || ''}}</view>
</view>
</view>
</view>
@ -279,7 +279,8 @@ export default {
/* 小程序端样式 */
// #ifdef MP-WEIXIN
padding: 80rpx 0rpx;
padding-top: 110rpx;
padding-bottom: 40rpx;
// #endif
font-size: 30rpx;

2
pages/student/my/my.vue
View File

@ -174,7 +174,7 @@
<style lang="less" scoped>
.main_box {
background: #292929;
min-height: 28vh;
height: 100%;
}
//自定义导航栏

Write Preview
Loading…
Cancel
Save