chen
/
flying-monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改

master
tangyi 2022-04-06 17:56:49 +08:00
parent cd9365cfbb 95fa9b7aef
commit d12462d990
8 changed files with 156 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jsFile/tools.js
View File

@ -92,7 +92,6 @@ const tools = {
for(var i = 0; i < phoneStr.length; i++){ for(var i = 0; i < phoneStr.length; i++){
if (i==startNum||i==endNum){ if (i==startNum||i==endNum){
phoneArr.push(`${character}` + phoneStr.charAt(i)); phoneArr.push(`${character}` + phoneStr.charAt(i));
console.log(phoneArr);
} else { } else {
phoneArr.push(phoneStr.charAt(i)); phoneArr.push(phoneStr.charAt(i));
} }

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

@ -230,7 +230,7 @@
'/pagesB/personal-information/personal-information', '/pagesB/personal-information/personal-information',
'/pagesB/electronic-certificate/electronic-certificate', '/pagesB/electronic-certificate/electronic-certificate',
'/pagesB/service-range/service-range', '/pagesB/service-range/service-range',
'/pages/workOrder/workOrderLlsit?status=已完成', '/pages/workOrder/workOrderLlsit?status=已完成&statusId=8',
'/pagesB/my-account/my-account?index=0', '/pagesB/my-account/my-account?index=0',
'/pagesB/set-up/set-up', '/pagesB/set-up/set-up',
]; ];

49
pages/tabbar/pagehome/pagehome.vue
View File

@ -94,7 +94,7 @@
<view class="home-fun-box" v-if="role==4"> <view class="home-fun-box" v-if="role==4">
<view class="fun-title col3 fon28 disac bold">项目维修</view> <view class="fun-title col3 fon28 disac bold">项目维修</view>
<view class="disac mar-s40"> <view class="disac mar-s40">
<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in projectRepairList" :key="index"> <view @tap="stayEv(item.title,item.id)" class="disjcac fc width25" v-for="(item,index) in projectRepairList" :key="index">
<view class="posir" style="height: 58rpx;"> <view class="posir" style="height: 58rpx;">
<image :style="{width: [53,52,51][index]+'rpx',height:[58,58,58][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image> <image :style="{width: [53,52,51][index]+'rpx',height:[58,58,58][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
<view class="engineer-num" v-if="item.num!=0">{{item.num}}</view> <view class="engineer-num" v-if="item.num!=0">{{item.num}}</view>
@ -108,7 +108,7 @@
<view class="home-fun-box"> <view class="home-fun-box">
<view class="fun-title col3 fon28 disac bold">待办工单</view> <view class="fun-title col3 fon28 disac bold">待办工单</view>
<view class="disac mar-s40"> <view class="disac mar-s40">
<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in stayWorkOrderList" :key="index"> <view @tap="stayEv(item.title,item.id)" class="disjcac fc width25" v-for="(item,index) in stayWorkOrderList" :key="index">
<view class="posir" style="height: 58rpx;"> <view class="posir" style="height: 58rpx;">
<image :style="{width: [53,48,51,58][index]+'rpx',height:[58,58,58,53][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image> <image :style="{width: [53,48,51,58][index]+'rpx',height:[58,58,58,53][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
<view class="engineer-num" v-if="item.num!=0">{{item.num}}</view> <view class="engineer-num" v-if="item.num!=0">{{item.num}}</view>
@ -121,7 +121,7 @@
<view class="home-fun-box"> <view class="home-fun-box">
<view class="fun-title col3 fon28 disac bold">待办事件</view> <view class="fun-title col3 fon28 disac bold">待办事件</view>
<view class="disac mar-s40"> <view class="disac mar-s40">
<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in stayEventList" :key="index"> <view @tap="stayEv(item.title,item.id)" class="disjcac fc width25" v-for="(item,index) in stayEventList" :key="index">
<view class="posir" style="height: 58rpx;"> <view class="posir" style="height: 58rpx;">
<image :style="{width: [58,58,50][index]+'rpx',height:[58,54,58][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image> <image :style="{width: [58,58,50][index]+'rpx',height:[58,54,58][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
<view class="engineer-num" v-if="item.num!=0">{{item.num}}</view> <view class="engineer-num" v-if="item.num!=0">{{item.num}}</view>
@ -135,7 +135,7 @@
<view class="home-fun-box"> <view class="home-fun-box">
<view class="fun-title col3 fon28 disac bold">工单数据</view> <view class="fun-title col3 fon28 disac bold">工单数据</view>
<view class="disac mar-s40"> <view class="disac mar-s40">
<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in workOrderList" :key="index"> <view @tap="stayEv(item.title,item.id)" class="disjcac fc width25" v-for="(item,index) in workOrderList" :key="index">
<view class="posir" style="height: 60rpx;"> <view class="posir" style="height: 60rpx;">
<image :style="{width: [59,56,58,58][index]+'rpx',height:[49,58,58,60][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image> <image :style="{width: [59,56,58,58][index]+'rpx',height:[49,58,58,60][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
<view class="engineer-num" v-if="item.num!=0">{{item.num}}</view> <view class="engineer-num" v-if="item.num!=0">{{item.num}}</view>
@ -161,7 +161,7 @@
<view class="home-fun-box" v-if="role==4"> <view class="home-fun-box" v-if="role==4">
<view class="fun-title col3 fon28 disac bold">结算情况</view> <view class="fun-title col3 fon28 disac bold">结算情况</view>
<view class="disac mar-s40"> <view class="disac mar-s40">
<view @tap="stayEv(item.title)" class="disjcac fc width25" v-for="(item,index) in settlementList" :key="index"> <view @tap="stayEv(item.title,item.id)" class="disjcac fc width25" v-for="(item,index) in settlementList" :key="index">
<view class="posir" style="height: 58rpx;"> <view class="posir" style="height: 58rpx;">
<image :style="{width: [58,50,58][index]+'rpx',height:[54,58,58][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image> <image :style="{width: [58,50,58][index]+'rpx',height:[54,58,58][index] + 'rpx'}" style="width: 58rpx;height: 53rpx;" :src="item.imgsrc" mode="widthFix"></image>
<view class="engineer-num" v-if="item.num!=0">{{item.num}}</view> <view class="engineer-num" v-if="item.num!=0">{{item.num}}</view>
@ -243,6 +243,7 @@
data() { data() {
return { return {
role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 role: 4, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师
role: uni.getStorageSync('type_id'), // 1：业务员 2:表示客户 3:表示客服 4：表示工程师
statusHeight: uni.getSystemInfoSync().statusBarHeight + 50, statusHeight: uni.getSystemInfoSync().statusBarHeight + 50,
messageNumber: 16 ,// 消息数量 messageNumber: 16 ,// 消息数量
noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告 noticeList:['2021年11月06日公司团建，维修服务暂停一天服务暂停一天服务暂停一天。','51akslfj;dkpiojasdjf;j1ij'],//公告
@ -274,35 +275,35 @@
], ],
// 项目维修 // 项目维修
projectRepairList:[ projectRepairList:[
{imgsrc:'/static/public/icon-home-staySingle.png',title:'待接单',num:0}, {imgsrc:'/static/public/icon-home-staySingle.png',title:'待接单',num:0,id:2},
{imgsrc:'/static/public/icon-home-stayImplement.png',title:'待执行',num:99}, {imgsrc:'/static/public/icon-home-stayImplement.png',title:'待执行',num:99,id:0},
{imgsrc:'/static/public/icon-home-repairIng.png',title:'维修中',num:6}, {imgsrc:'/static/public/icon-home-repairIng.png',title:'维修中',num:6,id:4},
], ],
// 工单数据 // 工单数据
workOrderList:[ workOrderList:[
{imgsrc:'/static/public/icon-home-abnormalSingle.png',title:'异常单',num:0}, {imgsrc:'/static/public/icon-home-abnormalSingle.png',title:'异常单',num:0,id:100},
{imgsrc:'/static/public/icon-home-overdueSingle.png',title:'逾期单',num:0}, {imgsrc:'/static/public/icon-home-overdueSingle.png',title:'逾期单',num:0,id:101},
{imgsrc:'/static/public/icon-home-overtime.png',title:'超时单 ',num:0}, {imgsrc:'/static/public/icon-home-overtime.png',title:'超时单 ',num:0,id:0},
{imgsrc:'/static/public/icon-home-workOrderPool.png',title:'工单池',num:6,}, {imgsrc:'/static/public/icon-home-workOrderPool.png',title:'工单池',num:6,id:0},
], ],
// 结算情况 // 结算情况
settlementList:[ settlementList:[
{imgsrc:'/static/public/icon-home-stayCollection.png',title:'待收款',num:0}, {imgsrc:'/static/public/icon-home-stayCollection.png',title:'待收款',num:0,id:5},
{imgsrc:'/static/public/icon-home-received.png',title:'已收款',num:6}, {imgsrc:'/static/public/icon-home-received.png',title:'已收款',num:6,id:7},
{imgsrc:'/static/public/icon-home-commission.png',title:'佣金',num:0}, {imgsrc:'/static/public/icon-home-commission.png',title:'佣金',num:0,id:5},
], ],
// 待办工单 // 待办工单
stayWorkOrderList:[ stayWorkOrderList:[
{imgsrc:'/static/public/icon-home-stayImplement.png',title:'待受理',num:0}, {imgsrc:'/static/public/icon-home-stayImplement.png',title:'待受理',num:0,id:0},
{imgsrc:'/static/public/icon-home-stayAssign.png',title:'待指派',num:6}, {imgsrc:'/static/public/icon-home-stayAssign.png',title:'待指派',num:6,id:0},
{imgsrc:'/static/public/icon-home-stayRepair.png',title:'待维修',num:6}, {imgsrc:'/static/public/icon-home-stayRepair.png',title:'待维修',num:6,id:3},
{imgsrc:'/static/public/icon-home-returnVisit.png',title:'待回访',num:0}, {imgsrc:'/static/public/icon-home-returnVisit.png',title:'待回访',num:0,id:8},
], ],
// 待办事件 // 待办事件
stayEventList:[ stayEventList:[
{imgsrc:'/static/public/icon-home-stayBatch.png',title:'待审批',num:0}, {imgsrc:'/static/public/icon-home-stayBatch.png',title:'待审批',num:0,id:6},
{imgsrc:'/static/public/icon-home-stayCollection.png',title:'待收款',num:0}, {imgsrc:'/static/public/icon-home-stayCollection.png',title:'待收款',num:0,id:5},
{imgsrc:'/static/public/icon-home-received.png',title:'已收款',num:0}, {imgsrc:'/static/public/icon-home-received.png',title:'已收款',num:0,id:7},
], ],
// 数据查询 // 数据查询
dataQueryList:[ dataQueryList:[
@ -335,12 +336,12 @@
}) })
}, },
// 待办事件 // 待办事件
stayEv(title) { stayEv(title,statusId) {
let url = ''; let url = '';
if(title=='佣金') { if(title=='佣金') {
url = `/pagesB/my-account/my-account?index=1` url = `/pagesB/my-account/my-account?index=1`
} else { } else {
url = `/pages/workOrder/workOrderLlsit?status=${title}` url = `/pages/workOrder/workOrderLlsit?status=${title}&statusId=${statusId}`
} }
uni.navigateTo({ uni.navigateTo({
url:url url:url

14
pages/workOrder/workOrder.vue
View File

@ -130,7 +130,21 @@
uni.removeStorageSync('partsList'); uni.removeStorageSync('partsList');
uni.removeStorageSync('targetObj'); uni.removeStorageSync('targetObj');
}, },
onLoad(op) {
this.checkInfoSignIn(op.id);
},
methods: { methods: {
// 查看信息签到执行
checkInfoSignIn(id){
let params = {
order_id:3,
steps:1,
start_address:'四川省成都市成华区'
}
this.$requst.post('/universal/api.order/process_order',params).then(res=>{
})
},
// 上传图片 // 上传图片
chooseImg(){ chooseImg(){
uni.chooseImage({ uni.chooseImage({

46
pages/workOrder/workOrderLlsit.vue
View File

@ -32,7 +32,7 @@
</view> </view>
<view class="project-list"> <view class="project-list">
<!-- 列表循环体 --> <!-- 列表循环体 -->
<view class="li" @click="projectDetailsFun(item.order_status,item.order_id,item.statusText,item.backgroundColor)" v-for="(item,index) in dataList" :key="index"> <view class="li" @click="projectDetailsFun(item.order_status,item.order_id,item.attributes.text,item.attributes.color)" v-for="(item,index) in dataList" :key="index">
<view class="work-order-code">工单编号：{{item.order_number}}</view> <view class="work-order-code">工单编号：{{item.order_number}}</view>
<view class="message"> <view class="message">
<image class="img" src="../../static/del/img001.png" mode="aspectFill"></image> <image class="img" src="../../static/del/img001.png" mode="aspectFill"></image>
@ -47,10 +47,10 @@
<view class="date">{{item.failure_time}}</view> <view class="date">{{item.failure_time}}</view>
</view> </view>
<view class="specification scal09"> <view class="specification scal09">
紧急程度：<view class="text"> {{item.principal}}</view> 紧急程度：<view class="text"> {{item.emergency_level_view}}</view>
</view> </view>
<view class="specification scal09">主负责人：{{item.name}}</view> <view class="specification scal09">主负责人：{{item.principal}}</view>
<view class="installation-site scal09">故障描述：{{item.failure_description}}</view> <view class="installation-site scal09 clips1" style="margin-bottom: -10rpx;">故障描述：{{item.failure_description}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -66,7 +66,7 @@
</view> </view>
</view> </view>
</view> </view>
<nothing-page v-if="total==dataList.length" content="暂无更多列表数据" currentType="0"></nothing-page> <nothing-page v-if="dataList.length==0" content="暂无更多列表数据" currentType="0"></nothing-page>
</view> </view>
</container-subgroup-two> </container-subgroup-two>
@ -89,7 +89,7 @@
}) })
return { return {
statusBarHeight: uni.getSystemInfoSync().statusBarHeight + 40, statusBarHeight: uni.getSystemInfoSync().statusBarHeight + 40,
role: 1, // 1：业务员 2:表示客户 3:表示客服 4：表示工程师 role: uni.getStorageSync('type_id'), // 1：业务员 2:表示客户 3:表示客服 4：表示工程师
date: currentDate, date: currentDate,
workeOrderStatus:'工单状态', workeOrderStatus:'工单状态',
array: [ array: [
@ -104,26 +104,26 @@
keyword:"" keyword:""
}, },
total:0, total:0,
dataList:[] dataList:[],
statusId:0
} }
}, },
onLoad(option) { onLoad(op) {
if(op.statusId!=undefined) this.statusId = op.statusId;
// 调用获取工单状态事件 // 调用获取工单状态事件
this.getType();
this.getType(option);
}, },
methods: { methods: {
// 获取工单状态 // 获取工单状态
getType(option){ getType(){
this.$requst.get('/universal/api.order/order_type').then(res => { this.$requst.get('/universal/api.order/order_type').then(res => {
// this.$toolAll.tools.showToast(res.msg); // this.$toolAll.tools.showToast(res.msg);
if (res.code) { if (res.code) {
this.array=[...res.data] this.array=[...res.data]
// 调用获取工单列表事件 // 调用获取工单列表事件
if(option.status){ if(this.statusId){
this.workeOrderStatusIndex = this.array.findIndex(item=>item.id==option.status); this.workeOrderStatusIndex = this.array.findIndex(item=>item.id==this.statusId);
if(this.workeOrderStatusIndex!=-1) this.workeOrderStatus = ''; if(this.workeOrderStatusIndex!=-1) this.workeOrderStatus = '';
} }
this.getDatalist(); this.getDatalist();
@ -133,9 +133,13 @@
// 获取工单列表 // 获取工单列表
getDatalist(){ getDatalist(){
this.$requst.get('/universal/api.order/order_list',this.dataPage).then(res => { this.$requst.get('/universal/api.order/order_list',this.dataPage).then(res => {
if (res.code) { if (res.code==1) {
this.total = res.data.total; this.total = res.data.total;
this.dataList = res.data.data; this.dataList = res.data.data;
console.log(this.dataList,"---------1" )
}else{
this.dataList = [];
console.log(this.dataList,"---------2" )
} }
}) })
}, },
@ -145,8 +149,7 @@
}, },
// 查看工单详情和进入接单页面 // 查看工单详情和进入接单页面
projectDetailsFun(status,id,statusText,statusColor) { projectDetailsFun(status,id,statusText,statusColor) {
// if (uni.getStorageSync('type_id')==4 && status == 3) { if (uni.getStorageSync('type_id')==4 && status == 2) {
if (status == 3) {
// 工程师点击待接单工单 // 工程师点击待接单工单
uni.showModal({ uni.showModal({
cancelText:'取消', cancelText:'取消',
@ -156,9 +159,16 @@
content:'确认接单', content:'确认接单',
success: (res) => { success: (res) => {
if(res.confirm){ if(res.confirm){
this.$requst.post('/universal/api.order/accept_order',{order_id:id,is_order:1}).then(res=>{
if(res.code){
this.$toolAll.tools.showToast('接单成功');
setTimeout(()=>{
uni.navigateTo({ uni.navigateTo({
url: `/pages/workOrder/workOrder?id=${id}` url: `/pages/workOrder/workOrder?id=${id}`
}) })
},1000)
}
})
} }
} }
}) })
@ -385,7 +395,7 @@
.project-list .li .message .installation-site { .project-list .li .message .installation-site {
color: #9b9ba3; color: #9b9ba3;
font-size: 24rpx; font-size: 24rpx;
line-height: 24rpx; /* line-height: 24rpx; */
} }
.project-list-address { .project-list-address {

109
pages/workOrder/workOrderThree.vue
View File

@ -21,20 +21,20 @@
<view class="title">结算方式</view> <view class="title">结算方式</view>
<view class="clearing-form-content"> <view class="clearing-form-content">
<view class="li" @click="clearingFormFun(index)" v-for="(item,index) in clearingForm" :key="index"> <view class="li" @click="clearingFormFun(index)" v-for="(item,index) in clearingForm" :key="index">
<image class="icon" v-if="item.state" src="../../static/iocn/xuanz.png" mode="" lazy-load></image> <image class="icon" v-if="currentWay==index" src="../../static/iocn/xuanz.png" mode="" lazy-load></image>
<image class="icon" v-else src="../../static/iocn/xuan.png" mode="" lazy-load></image> <image class="icon" v-else src="../../static/iocn/xuan.png" mode="" lazy-load></image>
{{item.title}} {{item.title}}
</view> </view>
</view> </view>
</view> </view>
<view class="work-order-from"> <view class="work-order-from">
<picker mode="date" @change="serveDate"> <!-- <picker mode="date" @change="serveDate">
<view class="serve-date"> <view class="serve-date">
<view class="text" v-if="serviceTime==''">请选择服务时间</view> <view class="text" v-if="serviceTime==''">请选择服务时间</view>
<view class="text" style="color: #000000;" v-else>{{serviceTime}}</view> <view class="text" style="color: #000000;" v-else>{{serviceTime}}</view>
<image class="icon" src="../../static/iocn/jt.png" mode=""></image> <image class="icon" src="../../static/iocn/jt.png" mode=""></image>
</view> </view>
</picker> </picker> -->
<view class="total-cost"> <view class="total-cost">
<view class="li"> <view class="li">
<view class="text">上门费</view> <view class="text">上门费</view>
@ -42,15 +42,17 @@
</view> </view>
<view class="li"> <view class="li">
<view class="text on">税金</view> <view class="text on">税金</view>
<view class="price">￥{{detailObj.taxes}}</view> <view class="price">￥{{taxesPrice}}</view>
</view> </view>
<view class="li"> <view class="li">
<view class="text">材料费</view> <view class="text">材料费</view>
<view class="price">￥{{detailObj.materialCost}}</view> <view class="price">￥{{detailObj.materialCost}}</view>
</view> </view>
<view class="li"> <view class="li">
<view class="text">其他费用</view> <view class="text flexs">其他费用</view>
<view class="price">￥{{detailObj.otherCost}}</view> <view class="price disac">
<input class="tright fon28" type="digit" v-model="detailObj.otherCost" placeholder="0.00" />
</view>
</view> </view>
</view> </view>
<view class="total-price"> <view class="total-price">
@ -65,26 +67,31 @@
</picker> </picker>
<view class="is-invoice"> <view class="is-invoice">
<view class="text">是否开票</view> <view class="text">是否开票</view>
<view class="radio" @click="isInvoiceFun(true)"> <view class="radio" @click="isInvoiceFun(0)">
<image v-if="isInvoice" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image> <image v-if="billingIndex==0 && currentWay!=1 && currentWay!=2" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image>
<view v-else class="icon1"></view> <view v-else class="icon1"></view>
<text>是</text> <text>专票</text>
</view> </view>
<view class="radio" @click="isInvoiceFun(false)"> <view class="radio" @click="isInvoiceFun(1)">
<image v-if="!isInvoice" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image> <image v-if="billingIndex==1 && currentWay!=1 && currentWay!=2" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image>
<view v-else class="icon1"></view> <view v-else class="icon1"></view>
<text>否</text> <text>普票</text>
</view>
<view class="radio" @click="isInvoiceFun(2)">
<image v-if="billingIndex==2 && currentWay!=1 && currentWay!=2" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image>
<view v-else class="icon1"></view>
<text>不开票</text>
</view> </view>
</view> </view>
<view class="is-invoice"> <view class="is-invoice">
<view class="text">是否收款</view> <view class="text">是否收款</view>
<view class="radio" @click="isMoneyFun(true)"> <view class="radio" @click="isMoneyFun(true)">
<image v-if="isMoney" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image> <image v-if="isMoney && currentWay!=1 && currentWay!=2" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image>
<view v-else class="icon1"></view> <view v-else class="icon1"></view>
<text>是</text> <text>是</text>
</view> </view>
<view class="radio" @click="isMoneyFun(false)"> <view class="radio" @click="isMoneyFun(false)">
<image v-if="!isMoney" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image> <image v-if="!isMoney && currentWay!=1 && currentWay!=2" src="../../static/iocn/xz.png" class="icon" mode="" lazy-load></image>
<view v-else class="icon1"></view> <view v-else class="icon1"></view>
<text>否</text> <text>否</text>
</view> </view>
@ -160,11 +167,12 @@
data() { data() {
return { return {
clearingForm: [ clearingForm: [
{title: '单次付费',state: true,}, {title: '单次付费'},
{title: '质保免费',state: false,}, {title: '质保免费'},
{title: '验收扫尾',state: false,}, {title: '验收扫尾'},
{title: '包年签单',state: false,}, {title: '包年签单'},
], ],
currentWay:0,//结束方式类型
signatureState:false, signatureState:false,
array: ['微信', '支付宝', '现金', '类型'], array: ['微信', '支付宝', '现金', '类型'],
paymentModeIndex:0, paymentModeIndex:0,
@ -173,7 +181,7 @@
doorToDoorFee:'120.09', doorToDoorFee:'120.09',
taxes:'120.20', taxes:'120.20',
materialCost:'120.02', materialCost:'120.02',
otherCost:'121.03', otherCost:'',
address:'湖南省株洲市荷塘区红旗中路456号(五矿二十三冶)', address:'湖南省株洲市荷塘区红旗中路456号(五矿二十三冶)',
collectionCode:[ collectionCode:[
'/static/del/500478055.png', '/static/del/500478055.png',
@ -182,23 +190,36 @@
] ]
}, },
paymentMode:'',//支付方式 paymentMode:'',//支付方式
isInvoice: true,//是否开票 billingIndex:0,//开票类型 0:专票 1：普票 2：不开票
isMoney: true,//是否收款 isMoney: true,//是否收款
isCanvas: true, isCanvas: true,
signImage: '',//签名图片 signImage: '',//签名图片
ifCollectionCode:false,//是否显示收款码 ifCollectionCode:false,//是否显示收款码
remarkText:'',//备注内容 remarkText:'',//备注内容
saveTimer:null,//保存签名延迟时间事件 saveTimer:null,//保存签名延迟时间事件
flag:true//防抖 flag:true,//防抖
} }
}, },
computed:{ computed:{
totalPrice() { totalPrice() {
let prices = 0; let prices = 0;
prices = this.$toolAll.tools.operationEv(this.detailObj.doorToDoorFee,this.detailObj.taxes,'+',2); if(this.currentWay!=1 && this.currentWay!=2) {
prices = this.$toolAll.tools.operationEv(this.detailObj.doorToDoorFee,this.taxesPrice,'+',2);
prices = this.$toolAll.tools.operationEv(prices,this.detailObj.materialCost,'+',2); prices = this.$toolAll.tools.operationEv(prices,this.detailObj.materialCost,'+',2);
prices = this.$toolAll.tools.operationEv(prices,this.detailObj.otherCost,'+',2); prices = this.$toolAll.tools.operationEv(prices,this.detailObj.otherCost,'+',2);
}
return this.$toolAll.tools.addXiaoShu(prices); return this.$toolAll.tools.addXiaoShu(prices);
},
taxesPrice() {
let taxesResult = 0
if(this.billingIndex!=0) {
taxesResult = '0.00';
} else {
taxesResult = this.$toolAll.tools.operationEv(this.detailObj.doorToDoorFee,this.detailObj.materialCost,'+',2);
taxesResult = this.$toolAll.tools.operationEv(taxesResult,this.detailObj.otherCost,'+',2);
taxesResult = this.$toolAll.tools.operationEv(taxesResult,0.1,"*",2);
}
return taxesResult;
} }
}, },
onLoad: function(options) { onLoad: function(options) {
@ -211,7 +232,9 @@
//设置线两端端点样式更加圆润 //设置线两端端点样式更加圆润
content.setLineCap('round') content.setLineCap('round')
//设置两条线连接处更加圆润 //设置两条线连接处更加圆润
content.setLineJoin('round') content.setLineJoin('round');
// 调用税金换算事件
// this.conversionEv();
}, },
methods: { methods: {
// 提交审核事件 // 提交审核事件
@ -219,9 +242,8 @@
if(this.checkEmpty()) { if(this.checkEmpty()) {
if(this.flag) { if(this.flag) {
this.flag = false; this.flag = false;
let exist = this.clearingForm.findIndex(item=>item.state==true);
let params = { let params = {
a:this.clearingForm[exist].title, a:this.clearingForm[this.currentWay].title,
b:this.serviceTime, b:this.serviceTime,
c:this.detailObj.doorToDoorFee, c:this.detailObj.doorToDoorFee,
d:this.detailObj.taxes, d:this.detailObj.taxes,
@ -229,7 +251,7 @@
f:this.detailObj.otherCost, f:this.detailObj.otherCost,
g:this.totalPrice, g:this.totalPrice,
h:this.paymentMode, h:this.paymentMode,
i:this.isInvoice, i:this.billingIndex,
j:this.isMoney, j:this.isMoney,
k:this.signImage, k:this.signImage,
m:this.remarkText m:this.remarkText
@ -254,27 +276,40 @@
}, },
// 收款码点击事件 // 收款码点击事件
openCollectionCodeEv(){ openCollectionCodeEv(){
if(this.currentWay!=1 && this.currentWay!=2) {
this.ifCollectionCode = !this.ifCollectionCode; this.ifCollectionCode = !this.ifCollectionCode;
}
}, },
clearingFormFun(index) { clearingFormFun(index) {
for (var i = 0; i < this.clearingForm.length; i++) { this.currentWay = index;
this.clearingForm[i].state = false
}
this.clearingForm[index].state = true
}, },
bindPickerChange(data) { bindPickerChange(data) {
this.paymentModeIndex = data.detail.value; this.paymentModeIndex = data.detail.value;
this.paymentMode = this.array[this.paymentModeIndex]; this.paymentMode = this.array[this.paymentModeIndex];
}, },
serveDate(data) { // serveDate(data) {
console.log(data) // this.serviceTime = data.detail.value;
this.serviceTime = data.detail.value; // },
}, isInvoiceFun(index) {
isInvoiceFun(is) { if(this.currentWay!=1 && this.currentWay!=2) {
this.isInvoice = is this.billingIndex = index;
// this.conversionEv();
}
}, },
// 税金费用换算
// conversionEv(){
// if(this.billingIndex!=0) {
// this.detailObj.taxes = '0.00';
// } else {
// let priceTotal = this.$toolAll.tools.operationEv(this.detailObj.doorToDoorFee,this.detailObj.materialCost,'+',2);
// priceTotal = this.$toolAll.tools.operationEv(priceTotal,this.detailObj.otherCost,'+',2);
// this.detailObj.taxes = this.$toolAll.tools.operationEv(priceTotal,0.1,"*",2);
// }
// },
isMoneyFun(is) { isMoneyFun(is) {
this.isMoney = is if(this.currentWay!=1 && this.currentWay!=2) {
this.isMoney = is;
}
}, },
// 画布 // 画布
// 画布的触摸移动开始手势响应 // 画布的触摸移动开始手势响应

14
pages/workOrder/workorderTwo.vue
View File

@ -86,7 +86,7 @@
<view class="title">主维保人：</view> <view class="title">主维保人：</view>
<input type="text" disabled class="input input-black" :value="targetObj.maintainer" /> <input type="text" disabled class="input input-black" :value="targetObj.maintainer" />
</view> </view>
<view class="li"> <!-- <view class="li">
<view class="title">更换配件：</view> <view class="title">更换配件：</view>
<view class="rideo" style="margin-left: 14rpx;"> <view class="rideo" style="margin-left: 14rpx;">
<view class="isrideo" @click="isrideoFun(true)"> <view class="isrideo" @click="isrideoFun(true)">
@ -102,7 +102,7 @@
<view class="">否</view> <view class="">否</view>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
<view class="work-order-from"> <view class="work-order-from">
<view class="li"> <view class="li">
@ -170,7 +170,7 @@
}, },
data() { data() {
return { return {
isrideo: true, // isrideo: true,
accessoriesData: [], accessoriesData: [],
targetObj:'' targetObj:''
} }
@ -212,10 +212,10 @@
this.targetObj.maintenanceImgList.splice(index,1); this.targetObj.maintenanceImgList.splice(index,1);
}, },
// 更换配件切换事件 // 更换配件切换事件
isrideoFun(is) { //isrideoFun(is) {
this.isrideo = is; // this.isrideo = is;
this.targetObj.ifParts = this.isrideo; // this.targetObj.ifParts = this.isrideo;
}, //},
goWorkorderTwo(){ goWorkorderTwo(){
console.log(this.targetObj); console.log(this.targetObj);
if(this.checkEmpty()) { if(this.checkEmpty()) {

11
pagesB/personal-information/personal-information.vue
View File

@ -109,13 +109,10 @@
getData(){ getData(){
this.$requst.get('/universal/api.user/user_info').then(res => { this.$requst.get('/universal/api.user/user_info').then(res => {
if (res.code == 1 && res.data.length != 1) { if (res.code == 1 && res.data.length != 1) {
this.nickname=res.data.nickname this.nickname=res.data.nickname;
this.full_name=res.data.name this.full_name=res.data.name;
if(res.data.sex==0){ // res.data.sex ==> 2：男 1：女 0：未知
this.genderNum=1 res.data.sex != 1 ? this.genderNum = 1 : this.genderNum = 2;
}else{
this.genderNum=res.data.sex
}
this.contact_number=res.data.phone this.contact_number=res.data.phone
this.e_mail=res.data.email this.e_mail=res.data.email
this.id_card_no=res.data.idcard this.id_card_no=res.data.idcard