diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue index 3d22112..6d75c03 100644 --- a/pages-home/home/home.vue +++ b/pages-home/home/home.vue @@ -16,7 +16,7 @@ - {{noReadNum}} + {{noReadNum}} @@ -76,43 +76,62 @@ 维修中 {{ bossNum.workingNum }} - + + + 未结算 + {{ bossNum.noPayNum }} + + 在厂数 {{ bossNum.inCompanyNum }} + + + + + + + + + + + + + + - - - {{ item }} - - - - - - - - - {{ item }} - - - + + + + + + + + + + + + + + + + + + + - 进场数 + 进厂数 {{ bossNum.newOrderNum }} - + - 已完成 + 已竣工 {{ bossNum.overNum }} - + 已交车 {{ bossNum.giveCusNum }} @@ -122,33 +141,40 @@ - 待审批配件申请单 - {{serviceNum}} + 待审批配件申请单{{serviceNum}} + + + + + + + + 待办工单{{total}} - - 待办工单 - 当前共 - {{total}} - 个工单需要处理 - - + + + + + + + - - - - {{cusFromList[cusFromIndex]}} - - - - - - {{repairTypeList[repairTypeIndex]}} - - - - --> + + + + + + + + + + + + + @@ -166,10 +192,10 @@ - + - @@ -282,13 +308,14 @@ export default { }, //服务顾问待处理数量 serviceNum:0, - //总检查看维修中、已完成的工单数量 + //总检查看维修中、已竣工的工单数量 bossNum:{ workingNum:0, inCompanyNum:0, newOrderNum:0, overNum:0, - giveCusNum:0 + giveCusNum:0, + noPayNum:0 }, defaultAvatar: require('@/static/icons/avatar.png'), //未读消息数量 @@ -318,6 +345,8 @@ export default { cusFromValueList:[''], // 客户来源选中下标 cusFromIndex:0, + //有下角菜单显示文字 + myText:"工单", } }, watch: { @@ -365,6 +394,7 @@ export default { //总检或管理员 this.setChooseDate("nowMonth") this.getBossTodo() + this.myText="我的" this.getServiceTodo() } } @@ -596,7 +626,7 @@ export default { }) }, /** - * 客户不在场，手动输入 + * 客户不在厂，手动输入 */ dialogClose() { this.$refs.inputDialog.open() @@ -757,7 +787,7 @@ export default { }) }, /** - * 从总检的角度差维修中、已完成的工单数量 + * 从总检的角度差维修中、已竣工的工单数量 */ getBossTodo(){ let params={} @@ -974,7 +1004,7 @@ export default { flex: 1; height: 0; overflow: auto; - padding-bottom: 30rpx; + //padding-bottom: 30rpx; } .company-text { font-size: 30rpx; @@ -1154,7 +1184,7 @@ export default { margin: 0 40rpx 18rpx; background: #FFFFFF; border-radius: 8rpx 8rpx 8rpx 8rpx; - padding: 20rpx; + padding: 15rpx; display: flex; align-items: center; .orderCountItem { @@ -1181,8 +1211,8 @@ export default { } .todoListBox { - margin: 40rpx 32rpx; - height: calc(100vh - 500rpx); + margin: 20rpx 32rpx; + height: calc(100vh - 370rpx); .title { margin-bottom: 30rpx; @@ -1206,7 +1236,7 @@ export default { display: flex; flex-direction: column; //row-gap: 20rpx; - height: 98%; + height: 100%; } } @@ -1396,5 +1426,17 @@ export default { } } + .number-box{ + width: 45rpx; + height: 45rpx; + line-height: 45rpx; + text-align: center; + font-weight: 800; + font-size: 26rpx; + border-radius: 50%; + display: inline-block; + background: #d74a43; + color: white; + } } diff --git a/pages-order/addOrder/addOrder.vue b/pages-order/addOrder/addOrder.vue index 55f915e..e0901fe 100644 --- a/pages-order/addOrder/addOrder.vue +++ b/pages-order/addOrder/addOrder.vue @@ -155,7 +155,7 @@ - 进场时间 + 进厂时间 - - - - 搜索 - 清空 - - - - + + + + + 清空 + + + {{cusFromList[cusFromIndex]}} @@ -29,15 +28,25 @@ {{repairTypeList[repairTypeIndex]}} + + + + {{ticketsStatusList[ticketsStatusIndex]}} + + - + + - + + @@ -94,6 +103,8 @@ export default { isRepairWarehouse : false, //是否是仓库管理员 //下来刷新状态 isTriggered:false, + //日期默认选中范围 + range: [], imageUrl: '', tabList: [ { @@ -121,9 +132,32 @@ export default { cusFromValueList:[''], // 客户来源选中下标 cusFromIndex:0, + //工单状态可选值 + ticketsStatusList:['按工单状态','进厂','维修中','已竣工','已交车','未结算','在厂'], + //工单状态可选值--值 + ticketsStatusValueList:['','jinchang','weixiuzhong','yijungong','yijiaoche','weijiesuan','zaichang'], + //工单状态选中下标 + ticketsStatusIndex:0, twId: null, } }, + watch: { + range(newval) { + this.onRefresherrefresh() + }, + searchText(newval) { + this.onRefresherrefresh() + }, + repairTypeIndex(newval) { + this.onRefresherrefresh() + }, + cusFromIndex(newval) { + this.onRefresherrefresh() + }, + ticketsStatusIndex(newval) { + this.onRefresherrefresh() + }, + }, onLoad(data){ if (data && data.twId){ this.twId = data.twId @@ -149,6 +183,7 @@ export default { //查2个数据字典备用---客户注册方式-cus_sign_type、维修业务分类-repair_type this.initDict("repair_type") this.initDict("cus_sign_type") + // this.initDict("repair_tickets_status") } }, onShow() { @@ -161,19 +196,29 @@ export default { } }, methods: { + maskClick(e){ + console.log('maskClick事件:', e); + }, /** * 切换客户来源 */ bindCusFromChange(e){ this.cusFromIndex = e.detail.value - this.onRefresherrefresh() + // this.onRefresherrefresh() }, /** * 切换维修项目类型 */ bindRepairTypeChange(e){ this.repairTypeIndex = e.detail.value - this.onRefresherrefresh() + // this.onRefresherrefresh() + }, + /** + * 切换工单状态 + */ + bindTicketsStatusChange(e){ + this.ticketsStatusIndex = e.detail.value + // this.onRefresherrefresh() }, /** * 查2个数据字典备用---客户注册方式-cus_sign_type、维修业务分类-repair_type @@ -208,10 +253,14 @@ export default { //维修项目 this.repairTypeList.push(item.label) this.repairTypeValueList.push(item.value) - }else{ + }else if("cus_sign_type"==dictCode){ //客户来源 this.cusFromList.push(item.label) this.cusFromValueList.push(item.value) + }else if("repair_tickets_status"==dictCode){ + //工单状态 + this.ticketsStatusList.push(item.label) + this.ticketsStatusValueList.push(item.value) } }, /** @@ -226,10 +275,12 @@ export default { //页码+1,调用获取数据的方法获取第二页数据 this.pageNo++ //此处调用自己获取数据列表的方法 - if (this.isRepairWarehouse) { - this.getRepairSoList() - }else{ - this.getOrderList() + if(this.repairSoList.length>0 || this.orderList.length>0){ + if (this.isRepairWarehouse) { + this.getRepairSoList() + }else{ + this.getOrderList() + } } }, /** @@ -252,7 +303,6 @@ export default { */ clearText(){ this.searchText = "" - this.onRefresherrefresh() }, /** * 开始施工 @@ -301,11 +351,22 @@ export default { } }, getOrderList(){ - let paramsObj = {pageNo: this.pageNo, pageSize: this.pageSize, isFinish: "0",cusFrom:this.cusFromValueList[this.cusFromIndex],repairType:this.repairTypeValueList[this.repairTypeIndex]} + let paramsObj = { + pageNo: this.pageNo, + pageSize: this.pageSize, + isFinish: "0", + cusFrom: this.cusFromValueList[this.cusFromIndex], + repairType: this.repairTypeValueList[this.repairTypeIndex], + ticketsStatus: this.ticketsStatusValueList[this.ticketsStatusIndex] + } console.log("this.searchText",this.searchText) if(''!=this.searchText){ paramsObj['ticketNo'] = this.searchText } + if(this.range.length==2){ + paramsObj['startDate'] = this.range[0] + paramsObj['endDate'] = this.range[1] + } if(1==this.activeKey){ //查所有订单 paramsObj['selectType'] = "all" @@ -411,7 +472,7 @@ export default { color: #333333; .header { - padding: 100rpx 32rpx 20rpx; + padding: 20rpx 32rpx 0 32rpx; background-color: #fff; .searchBox { @@ -441,9 +502,11 @@ export default { } .body-top-tab { + background: white; display: flex; font-size: 30rpx; - margin: 0 32rpx; + padding: 5rpx 0; + align-items: center; .line { width: 2rpx; @@ -477,7 +540,7 @@ export default { .tabList { background: #FFFFFF; - border-radius: 12rpx 12rpx 12rpx 12rpx; + border-radius: 12rpx 12rpx 0 0; display: flex; align-items: center; padding: 0 40rpx; @@ -510,7 +573,7 @@ export default { .orderList { //padding: 30rpx 0; padding-top: 10rpx; - height: calc(100% - 90rpx); + height: calc(100% - 340rpx); display: flex; flex-direction: column; diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue index 9f6102f..4e0ed62 100644 --- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue +++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue @@ -869,7 +869,7 @@ .uni-date-x--border { box-sizing: border-box; border-radius: 4px; - border: 1px solid #e5e5e5; + //border: 1px solid #e5e5e5; } .uni-date-editor--x { diff --git a/utils/utils.js b/utils/utils.js index d9e840a..b40b05e 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -29,12 +29,12 @@ export function getWXStatusHeight() { } /** - * 根据订单的状态获取订单的文字展示状态 + * 根据订单的状态获取订单的文字展示状态(这个状态范围少，是按李总意思整理出来的状态) * @param ticketsStatus 订单状态 * @param workStatus 维修工作状态 */ export function getOrderStatusText(ticketsStatus,workStatus){ - let str = ""; + let str = "已进厂"; if("04"==ticketsStatus){ //待派工 str = "待维修" @@ -63,6 +63,42 @@ export function getOrderStatusText(ticketsStatus,workStatus){ return str; } +/** + * 根据订单的状态获取订单的文字展示状态(这个状态多，就是系统初始状态) + * @param ticketsStatus 订单状态 + * @param workStatus 维修工作状态 + */ +export function getOrderStatusTextAll(ticketsStatus,workStatus){ + let str = "已进厂"; + if("04"==ticketsStatus){ + //待派工 + str = "待派工" + }else if("05"==ticketsStatus){ + //维修中 + str = "维修中" + }else if("01"==ticketsStatus){ + //待取车结算 + str = "待取车结算" + }else if("06"==ticketsStatus){ + //挂单/记账 + str = "已挂单/记账待交车" + }else if("07"==ticketsStatus){ + //待通知客户取车 + str = "待通知客户取车" + }else if("08"==ticketsStatus){ + //已交车 + str = "已交车" + }else if("02"==ticketsStatus){ + //已结账 + str = "已结账待交车" + }else if("03"==ticketsStatus){ + //已作废 + str = "已作废" + } + return str; +} + + /** * 查询字典可选值 * @param dictCode @@ -217,7 +253,7 @@ export function builderOrder(order) { flag: 1, ticketsStatus: order.ticketsStatus, ticketsWorkStatus: order.ticketsWorkStatus, - flagStr: getOrderStatusText(order.ticketsStatus, order.ticketsWorkStatus), + flagStr: getOrderStatusTextAll(order.ticketsStatus, order.ticketsWorkStatus), carNum: order.carNo, nowRepairId: order.nowRepairId, carModel: order.carBrandName,