diff --git a/pages/index/Neworder.vue b/pages/index/Neworder.vue
index 76a2034..4737d51 100644
--- a/pages/index/Neworder.vue
+++ b/pages/index/Neworder.vue
@@ -11,7 +11,7 @@
-
+
行驶证扫描
-
+
-
+
-
+
客户姓名
@@ -72,7 +72,7 @@
-
+
* 商品选择点击选择
@@ -81,7 +81,7 @@
-
+
新旧车 点击选择
@@ -100,34 +100,34 @@
-
+
检测流程
-
+
-
-
+
+
开始检测
-
+
-
+
-
+
-
-
+
+
@@ -144,7 +144,7 @@
customerSource:'',
buyName:'',
buyPhone:'',
- userAddress:'',
+ userAddress:'',
carNum:'',
carStatus:'',
carIdNo:'',
@@ -186,18 +186,18 @@
this.getinitialize()
uni.$on('selectProject', (data) => {
this.inspectionWorkNodes = data
- for (var i = 0; i < this.inspectionWorkNodes.length; i++) {
+ for (var i = 0; i < this.inspectionWorkNodes.length; i++) {
this.inspectionWorkNodeStr = this.inspectionWorkNodeStr + this.inspectionWorkNodes[i].projectName +" "
this.inspectionWorkNodes[i].orderNum = i+1
}
-
-
+
+
});
},
onShow() {
-
+
},
-
+
methods: {
changeHandler(e) {
console.log(e)
@@ -242,7 +242,7 @@
cancelzhi(){
this.showzhi= false
},
-
+
confirmsnature(e){
this.naturetext = e.value[0].label
this.shownature = false
@@ -259,11 +259,11 @@
cancelgoods(){
this.showgoods= false
},
- async getinitialize(){
+ async getinitialize(){
let res = await request({
url:'/partnerOwn/partner/getCustomerSource',
method: 'get',
-
+
})
this.columns.push(res.data)
let rescar = await request({
@@ -289,7 +289,7 @@
method: 'get',
})
this.zhilist.push(reszhi.data)
-
+
},
toSelectProject(){
uni.navigateTo({
@@ -311,7 +311,7 @@
})
return
}
-
+
let data = {
partnerId:uni.getStorageSync('partnerId'),
buyName:this.buyName,
@@ -327,7 +327,7 @@
carNature:this.carNature,
inspectionWorkNodes:this.inspectionWorkNodes
}
-
+
let res = await request({
url:'/system/info/add',
method: 'post',
@@ -342,14 +342,14 @@
setTimeout(() => {
uni.navigateBack()
}, 2000);
-
-
-
+
+
+
},
-
+
// 提交
async getgoods(){
-
+
let res = await request({
url:'/partnerOwn/partner/editPartnerInfo',
method: 'post',
@@ -367,7 +367,7 @@
},
getxz(e){
this.releasebox.goodsCategoryId = e.value[0].id
- console.log( e.value[0].categoryName)
+ console.log( e.value[0].categoryName)
this.ftitle = e.value[0].categoryName
},
gettapindex(index){
@@ -387,7 +387,7 @@
},
deletePic1(event) {
this[`fileList${event.name}`].splice(event.index, 1)
- },
+ },
async afterRead1(event) {
console.log(event,this[`fileList${event.name}`]);
// 当设置 multiple 为 true 时, file 为数组格式,否则为对象格式
@@ -396,7 +396,7 @@
lists.map((item) => {
this[`fileList${event.name}`].push({
...item,
-
+
})
})
for (let i = 0; i < lists.length; i++) {
@@ -409,14 +409,14 @@
}))
fileListLen++
}
- },
+ },
uploadFilePromise1(url) {
uni.showLoading({
-
+
title: '扫描中',
-
+
});
-
+
return new Promise((resolve, reject) => {
let a = uni.uploadFile({
url: this.$baseUrl+'/common/uploadImg', // 仅为示例,非真实的接口地址
@@ -433,11 +433,11 @@
try {
let img = JSON.parse(res.data);
this.imagePath = img.data.url
-
+
setTimeout(() => {
- this.vehicleLicenseOCR()
+ this.vehicleLicenseOCR()
}, 1000)
-
+
} catch (e) {
//TODO handle the exception
}
@@ -447,7 +447,7 @@
}
});
})
- },
+ },
async vehicleLicenseOCR(){
let data = {
imagePath :this.baseUrl +'/'+ this.imagePath
@@ -466,17 +466,17 @@
this.carIdNo=res.data.FrontInfo.Vin
this.carNature=res.data.FrontInfo.UseCharacter
uni.hideLoading();
- uni.showToast({
+ uni.showToast({
title: '识别成功',
});
-
- console.log(res);
-
- }
-
-
-
+ console.log(res);
+
+ }
+
+
+
+
}
}
@@ -488,7 +488,7 @@
height: calc(100vh);
background: white;
}
-
+
.top-heder{
width: 100%;
height: 46px;
@@ -520,7 +520,7 @@
padding: 0 15px;
display: flex;
align-items: center;
-
+
}
.top-ail{
width: 100%;
@@ -542,7 +542,7 @@
height: 126px;
border-radius: 8px;
box-sizing: border-box;
-
+
background-color: white;
image{
width: 100%;
@@ -601,7 +601,7 @@
align-items: center;
justify-content: center;
margin: 10px ;
-
+
}
.hui-right{
border-left:1px solid #DDDDDD;
@@ -658,7 +658,7 @@
display: flex;
align-items: center;
box-sizing: border-box;
-
+
}
.ipt-kuang{
width: 70%;
@@ -693,7 +693,7 @@
.da{
font-size: 16px;
}
- //
+ //
.top{
box-sizing: border-box;
padding: 0px 15px;
@@ -751,7 +751,7 @@
margin-top: 5px;
font-size: 12px;
font-weight: 400;
-
+
}
.tinput{
width: 100%;
diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue
index e2258f2..be1692a 100644
--- a/pages/index/orderdetails.vue
+++ b/pages/index/orderdetails.vue
@@ -1,947 +1,1039 @@
-
-
-
-
-
-
- 检测详情
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{detailData.workerName}}
-
-
+
+
+
+
+
+
+ 检测详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ detailData.workerName }}
+
+
-
-
-
-
-
-
- {{detailData.goodsName}}
-
- 预约人:
- {{detailData.buyUserName}}
-
-
- 手机号:
- {{detailData.buyUserPhone}}
-
-
- 车型:
- {{detailData.carType}}
-
-
- 车牌号:
- {{detailData.carNum}}
-
-
- 商品价格:
- {{detailData.goodsPrice/100}}元
-
-
-
-
-
- 联系用户
-
-
-
- 订单详情
-
- 订单编号:
- {{detailData.orderNo}}
-
-
- 折扣:
- {{detailData.reduceMoney/100}}
-
-
- 优惠金额:
- {{detailData.couponDiscount/100}}
-
-
- 核销人:
- {{detailData.validationRealName}}
-
-
- 核销时间:
- {{detailData.validationTime}}
-
-
- 结算
-
-
- 实付金额:
- {{(detailData.payMoney+detailData.balance)/100}}元
-
-
+
+
+
+
+
+
+ {{ detailData.goodsName }}
+
+ 预约人:
+ {{ detailData.buyUserName }}
+
+
+ 手机号:
+ {{ detailData.buyUserPhone }}
+
+
+ 车型:
+ {{ detailData.carType }}
+
+
+ 车牌号:
+ {{ detailData.carNum }}
+
+
+ 商品价格:
+ {{ detailData.goodsPrice / 100 }}元
+
+
+
+
+
+ 联系用户
+
+
+
+ 订单详情
+
+ 订单编号:
+ {{ detailData.orderNo }}
+
+
+ 折扣:
+ {{ detailData.reduceMoney / 100 }}
+
+
+ 优惠金额:
+ {{ detailData.couponDiscount / 100 }}
+
+
+ 核销人:
+ {{ detailData.validationRealName }}
+
+
+ 核销时间:
+ {{ detailData.validationTime }}
+
+
+ 结算
+
+
+ 实付金额:
+ {{ (detailData.payMoney + detailData.balance) / 100 }}元
+
+
-
-
- {{item.title}}
- {{item.createTime}}
-
-
- {{item.content}}
-
-
+
+
+ {{ item.title }}
+ {{ item.createTime }}
+
+
+ {{ item.content }}
+
+
-
+
-
- 结束检测
-
-
- 制证完成
-
-
-
-
+
+
-
-
-
+
+
-
- 商品价格:
- {{detailData.goodsPrice/100}}元
-
-
-
- 优惠金额:
-
-
-
-
- * 实付金额:
-
-
-
- * 付款方式:
-
-
-
-
-
- {{item.label}}
-
-
-
- 收款账号:
-
-
-
- 备注:
-
-
-
-
-
-
-
- 提交
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/pages/index/ordermanage.vue b/pages/index/ordermanage.vue
index a3a8294..fcdf1e7 100644
--- a/pages/index/ordermanage.vue
+++ b/pages/index/ordermanage.vue
@@ -18,15 +18,15 @@
-
+
-
+
-
+
重审中
@@ -34,7 +34,7 @@
-
+
{{item.goodsName}}
@@ -66,26 +66,26 @@
{{item.carNum}}
-
+
实付金额:
{{item.realPayMoney/100}}元
-
+
-
+
+ 添加线下订单
-
+
diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue
index 07e8ad6..056050d 100644
--- a/pages/staff/staff.vue
+++ b/pages/staff/staff.vue
@@ -26,7 +26,7 @@
-
+
重审中
@@ -67,8 +67,8 @@
- 同意
- 查看详情
+ 同意
+ 查看详情
@@ -181,7 +181,7 @@ export default {
godetails(item) {
console.log("111");
uni.navigateTo({
- url: "/pages/index/orderdetails?inspectionInfoId=" + item.id +"&workNodeId=" + item.workNodeId
+ url: "/pages/index/orderdetails?inspectionInfoId=" + item.id +"&workNodeId=" + item.workNodeId + "&workNodeStatus=" + item.workNodeStatus
})
},
orderTaking(data){
@@ -395,10 +395,13 @@ export default {
}
.button {
- flex: 1;
- margin: 0 10px;
+ flex: 0.5; /* 减小按钮的占比 */
+ margin: 0 5px; /* 缩小两侧间距 */
+ padding: 5px 10px; /* 缩小按钮内边距 */
+ font-size: 0.9rem; /* 缩小字体 */
}
+
.ju {
font-size: 24px;