diff --git a/components/qianziyu-select/qianziyu-select.vue b/components/qianziyu-select/qianziyu-select.vue
index 2c2b31f..9c4074d 100644
--- a/components/qianziyu-select/qianziyu-select.vue
+++ b/components/qianziyu-select/qianziyu-select.vue
@@ -1,51 +1,51 @@
-
-
- {{ popupTitle }}
-
-
-
-
+
+
+ {{ popupTitle }}
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
- 取消
-
-
- 确认
-
-
-
-
-
-
+
+
+
+
+
+ 取消
+
+
+ 确认
+
+
+
+
+
+
-
+
+ .bottons {
+ background-color: white;
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ bottom: constant(safe-area-inset-bottom);
+ bottom: env(safe-area-inset-bottom);
+ }
+
\ No newline at end of file
diff --git a/components/staffTabBer/tabBar.vue b/components/staffTabBer/tabBar.vue
index 9382573..4acb947 100644
--- a/components/staffTabBer/tabBar.vue
+++ b/components/staffTabBer/tabBar.vue
@@ -61,9 +61,14 @@
deep: true,
},
methods: {
- dianyidain() {
+ dianyidain(msg) {
// console.log('执行了,dianyidain');
- innerAudioContext.src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3';
+ console.log('消息内容', msg);
+ let src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3'
+ if (msg == '客户即将到店') {
+ src = "https://www.nuoyunr.com/lananRsc/rescue/inspection.mp3"
+ }
+ innerAudioContext.src = src;
// 设置播放次数和计数器
const playCount = 3;
let currentCount = 0;
@@ -93,7 +98,7 @@
this.msgSocket.onMessage(res => {
console.log("发出提示音");
- this.dianyidain()
+ this.dianyidain(res.data)
})
}
diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue
index 9ffdefb..7d42824 100644
--- a/components/tabBar/tabBar.vue
+++ b/components/tabBar/tabBar.vue
@@ -40,7 +40,8 @@
export default {
data() {
return {
- msgSocket: null,
+ msgSocket: this.$msgSocket,
+ nowPageInterval: null,
aindex: 1,
chuan: 0,
arr: [{
@@ -66,8 +67,22 @@
},
mounted() {
- this.msgSocket = this.$msgSocket,
- this.aindex = this.msg
+ if (!this.nowPageInterval) {
+ this.nowPageInterval = setInterval(() => {
+ const newSocket = this.$msgSocket;
+ if (this.msgSocket !== newSocket) {
+ this.msgSocket = newSocket;
+ this.msgInfo();
+ }
+ }, 30000);
+ }
+ this.aindex = this.msg;
+ },
+ onUnload() {
+ if (this.nowPageInterval) {
+ clearInterval(this.nowPageInterval);
+ this.nowPageInterval = null;
+ }
},
watch: {
msgSocket(newVal, oldVal) {
@@ -78,8 +93,13 @@
},
methods: {
- dianyidain() {
- innerAudioContext.src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3';
+ dianyidain(msg) {
+ console.log('消息内容', msg);
+ let src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3'
+ if (msg == '客户即将到店') {
+ src = "https://www.nuoyunr.com/lananRsc/rescue/inspection.mp3"
+ }
+ innerAudioContext.src = src;
// 设置播放次数和计数器
const playCount = 3;
let currentCount = 0;
@@ -110,8 +130,8 @@
console.log('消息回调启动成功')
this.msgSocket.onMessage(res => {
console.log("发出提示音");
-
- this.dianyidain()
+ console.log(res.data);
+ this.dianyidain(res.data)
})
}
diff --git a/pages/index/Neworder.vue b/pages/index/Neworder.vue
index b793411..1bba95a 100644
--- a/pages/index/Neworder.vue
+++ b/pages/index/Neworder.vue
@@ -149,7 +149,7 @@
-
+
@@ -202,8 +202,12 @@
确认修改
-
+
+
+
@@ -265,6 +269,7 @@
title: '新增线下订单',
customerSource: '',
buyName: '',
+ driverLicenseTypeArr: [],
nickname: '',
buyPhone: '',
userAddress: '',
@@ -315,6 +320,7 @@
unitName: '',
kehui: '',
naturetext: '',
+ selectCustomerSource: {},
customerData: [],
inspectionWorkNodeStr: "",
leadManId: undefined,
@@ -410,7 +416,7 @@
}
},
confirms(e) {
- this.customerSource = e.value[0].label
+ this.customerSource = e.label
this.show = false
},
cancels() {
@@ -644,12 +650,23 @@
cancelgoods() {
this.showgoods = false
},
+ async getCustomerSource(searchValue) {
+ console.log('搜索内容', searchValue);
+ let res = await request({
+ url: '/partnerOwn/partner/getCustomerSource',
+ method: 'get',
+ params: {
+ searchValue: searchValue
+ }
+ })
+ this.columns = res.data
+ },
async getinitialize() {
let res = await request({
url: '/partnerOwn/partner/getCustomerSource',
method: 'get',
})
- this.columns.push(res.data)
+ this.columns = res.data
let rescar = await request({
url: '/rescue/dict/data/type/car_nature',
method: 'get',
diff --git a/pages/index/countEmployees.vue b/pages/index/countEmployees.vue
index deec9b2..d111847 100644
--- a/pages/index/countEmployees.vue
+++ b/pages/index/countEmployees.vue
@@ -5,18 +5,15 @@
-
+
-
-
-
+ -->
diff --git a/pages/index/meetCarOrder.vue b/pages/index/meetCarOrder.vue
index 84cd888..b972550 100644
--- a/pages/index/meetCarOrder.vue
+++ b/pages/index/meetCarOrder.vue
@@ -136,8 +136,12 @@
接车
-
+
+
+
@@ -209,7 +213,7 @@
showRecord: false,
showLeadMan: false,
showMeetMan: false,
- skuId: 0,
+ skuId: undefined,
inspectionWorkNodes: [],
defaultIndex: [0],
kehuDefaultIndex: [0],
@@ -284,6 +288,17 @@
})
}
},
+ async getCustomerSource(searchValue) {
+ console.log('搜索内容', searchValue);
+ let res = await request({
+ url: '/partnerOwn/partner/getCustomerSource',
+ method: 'get',
+ params: {
+ searchValue: searchValue
+ }
+ })
+ this.columns = res.data
+ },
async afterRead(event) {
// 当设置 multiple 为 true 时, file 为数组格式,否则为对象格式
let lists = [].concat(event.file)
@@ -353,7 +368,7 @@
}
},
confirms(e) {
- this.customerSource = e.value[0].label
+ this.customerSource = e.label
this.show = false
},
cancels() {
@@ -472,7 +487,7 @@
url: '/partnerOwn/partner/getCustomerSource',
method: 'get',
})
- this.columns.push(res.data)
+ this.columns = (res.data)
let rescar = await request({
url: '/rescue/dict/data/type/car_nature',
method: 'get',
diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue
index e884fe3..9607905 100644
--- a/pages/index/newindex.vue
+++ b/pages/index/newindex.vue
@@ -33,6 +33,11 @@
{{ dateStr || '' }} {{ week || '' }} {{ time || '' }}
+
+ 展开
+ 收起
+
+
当日订单
@@ -47,6 +52,25 @@
{{ threenum.jxzNum }}
+
+
+
+ 年审
+ {{ threenum.nsNum }}
+
+
+ 上户
+ {{ threenum.shNum }}
+
+
+ 非定检
+ {{ threenum.fdjNum }}
+
+
+ 双燃料
+ {{ threenum.srlNum }}
+
+
@@ -187,7 +211,7 @@
选择日期
-
+
@@ -218,6 +242,7 @@
msg: "1",
List: [],
show: false,
+ showMore: false,
status: 'loading',
warnMsg: [],
chuan: '',
@@ -265,7 +290,6 @@
// this.actList = ["1", "1", "1", "1", "1", ]
// this.status = "nomore" 底部刷新结束
this.partnerId = uni.getStorageSync('partnerId')
- this.$startSocketConnect(uni.getStorageSync('userId'))
this.getUserInfo()
this.getindex()
// this.getwarnMsglist()
@@ -297,7 +321,7 @@
},
onLoad() {
this.partnerId = uni.getStorageSync('partnerId')
- // this.$startSocketConnect(uni.getStorageSync('userId'))
+ this.$startSocketConnect(uni.getStorageSync('userId'))
this.getUserInfo()
this.getindex()
// this.getwarnMsglist()
@@ -811,7 +835,8 @@
padding: 30rpx;
display: flex;
align-items: center;
- justify-content: space-between;
+ // justify-content: space-between;
+ justify-content: center;
}
.jg_box {
@@ -829,6 +854,7 @@
.three_box1 {
width: 216rpx;
height: 116rpx;
+ margin: 0 10rpx;
background-image: url('/static/imgs/t1.png');
background-size: 100% 100%;
box-sizing: border-box;
@@ -843,6 +869,7 @@
height: 116rpx;
background-image: url('/static/imgs/t2.png');
background-size: 100% 100%;
+ margin: 0 10rpx;
box-sizing: border-box;
padding: 14rpx 18rpx;
font-size: 24rpx;
@@ -853,6 +880,19 @@
width: 216rpx;
height: 116rpx;
background-image: url('/static/imgs/t3.png');
+ margin: 0 10rpx;
+ background-size: 100% 100%;
+ box-sizing: border-box;
+ padding: 14rpx 18rpx;
+ font-size: 24rpx;
+ color: #101A3E;
+ }
+
+ .three_box4 {
+ width: 216rpx;
+ margin: 0 10rpx;
+ height: 116rpx;
+ background-image: url('/static/imgs/t3.png');
background-size: 100% 100%;
box-sizing: border-box;
padding: 14rpx 18rpx;
diff --git a/pages/index/oldOrder.vue b/pages/index/oldOrder.vue
index 76569de..72ea6c1 100644
--- a/pages/index/oldOrder.vue
+++ b/pages/index/oldOrder.vue
@@ -158,25 +158,29 @@
确认修改
-
+ <
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -297,6 +301,17 @@
})
}
},
+ async getCustomerSource(searchValue) {
+ console.log('搜索内容', searchValue);
+ let res = await request({
+ url: '/partnerOwn/partner/getCustomerSource',
+ method: 'get',
+ params: {
+ searchValue: searchValue
+ }
+ })
+ this.columns = res.data
+ },
confirmRegisterDate(e) {
//将时间戳转换
this.carRegisterDateStr = formatDate(e.value)
@@ -337,7 +352,7 @@
}
},
confirms(e) {
- this.customerSource = e.value[0].label
+ this.customerSource = e.label
this.show = false
},
cancels() {
@@ -433,7 +448,7 @@
url: '/partnerOwn/partner/getCustomerSource',
method: 'get',
})
- this.columns.push(res.data)
+ this.columns = (res.data)
let rescar = await request({
url: '/rescue/dict/data/type/car_nature',
method: 'get',
diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue
index 4a9399c..8f53810 100644
--- a/pages/index/orderdetails.vue
+++ b/pages/index/orderdetails.vue
@@ -42,6 +42,10 @@
检测类型:
{{ detailData.goodsName }}
+
+ 检测次数:
+ {{ detailData.infoCount }}次
+
¥:
{{ detailData.goodsPrice / 100 }}元
diff --git a/pages/index/ordermanage.vue b/pages/index/ordermanage.vue
index 308ddc1..cdc3d09 100644
--- a/pages/index/ordermanage.vue
+++ b/pages/index/ordermanage.vue
@@ -108,9 +108,9 @@
+ 接车
-->
-
+
接车
@@ -225,9 +225,10 @@
},
submitException(data) {
console.log('取消异常', data);
+ let this_ = this
uni.showModal({
title: '提示',
- content: '确认删除该条信息吗?',
+ content: '确认消除该条异常吗?',
success: function(res) {
if (res.confirm) {
// 执行确认后的操作
@@ -239,8 +240,9 @@
},
method: 'post'
})
- } else {
// 执行取消后的操作
+ this_.onRefresherrefresh()
+ } else {
return
}
}
diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue
index 0b2cac4..25932e5 100644
--- a/pages/staff/staff.vue
+++ b/pages/staff/staff.vue
@@ -275,6 +275,11 @@
// text: "待支付",
// value: "1"
// },
+
+ {
+ text: "接车转订单",
+ value: "8",
+ },
{
text: "待审核重检",
value: "7",
@@ -283,10 +288,6 @@
text: "待检测",
value: "1"
},
- {
- text: "接车转订单",
- value: "8",
- },
{
text: "待接车",
value: "6",
@@ -522,19 +523,20 @@
this.csId.forEach(item => {
let a = {
id: item,
- status: "3"
+ status: 2
}
workNodes.push(a)
})
inspectionInfo.workNodes = workNodes
- await request({
- url: '/system/info/recheck',
- method: 'post',
- data: inspectionInfo
- })
- this.onRefresherrefresh()
- this.closehge()
- return
+ status = 2
+ // await request({
+ // url: '/system/info/recheck',
+ // method: 'post',
+ // data: inspectionInfo
+ // })
+ // this.onRefresherrefresh()
+ // this.closehge()
+ // return
} else if (this.isExamine && this.tbindex == 2 && this.isRetrial == 2) {
//跳转到修改工单页面
//跳转到修改工单页面