Merge branch 'master' of http://git.scdxtc.com/chen/flying-monkey
commit
cc4f0a9b67
|
@ -73,9 +73,9 @@ uni-radio .uni-radio-input {border: 1rpx solid #444444;}
|
|||
width: 686rpx;
|
||||
border-radius: 50rpx;
|
||||
height: 90rpx;
|
||||
background-color: #02A2ea;
|
||||
background-color: #02A2ea !important;
|
||||
display: flex;justify-content: center;align-items: center;
|
||||
color: #FFFFFF;
|
||||
color: #FFFFFF !important;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
/* 登录 */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name" : "飞猴",
|
||||
"appid" : "__UNI__25FB71A",
|
||||
"appid" : "__UNI__C9AEDD9",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
|
|
|
@ -245,9 +245,9 @@
|
|||
margin-top: 58rpx;
|
||||
border-radius: 50rpx;
|
||||
height: 90rpx;
|
||||
background-color: #02A2ea;
|
||||
background-color: #02A2ea !important;
|
||||
line-height: 90rpx;
|
||||
color: #FFFFFF;
|
||||
color: #FFFFFF !important;
|
||||
text-align: center;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<statusNav navBarTitle="配件列表"></statusNav>
|
||||
<view class="mountingsList-input">
|
||||
<container-subgroup-two>
|
||||
<view slot="content" style="margin:0rpx -25rpx 0rpx" :style="{paddingTop:statusBarHeight-40 + 'px'}">
|
||||
<view class="mountingsList-input" :style="{top:statusBarHeight + 'px'}">
|
||||
<input type="text" class="int" value="" placeholder="请输入关键字" />
|
||||
<image class="search" src="../../static/iocn/ss.png" mode=""></image>
|
||||
<view class="xian">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="mountings-list">
|
||||
<view class="li" v-for="(item,index) in dataList">
|
||||
<view class="textCon">
|
||||
|
@ -63,20 +64,24 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<button class="submit-button" type="default">确认提交</button>
|
||||
</view>
|
||||
</container-subgroup-two>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import statusNav from '../../components/status-nav.vue';
|
||||
import containerSubgroupTwo from '@/components/containers/container-subgroup-two.vue';
|
||||
export default {
|
||||
components: {
|
||||
statusNav,
|
||||
containerSubgroupTwo
|
||||
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
|
||||
dataList: [{
|
||||
title: "全彩LED显示屏接收卡",
|
||||
state: true,
|
||||
|
@ -140,6 +145,7 @@
|
|||
.mountingsList-input .xian {
|
||||
width: 3rpx;
|
||||
height: 35rpx;
|
||||
z-index: 100;
|
||||
position: absolute;
|
||||
background-color: #EAEAEA;
|
||||
right: 100rpx;
|
||||
|
@ -160,8 +166,10 @@
|
|||
|
||||
.mountingsList-input {
|
||||
width: 100%;
|
||||
position: relative;
|
||||
position: fixed;
|
||||
padding: 40rpx 16rpx;
|
||||
|
||||
z-index: 2;
|
||||
box-sizing: border-box;
|
||||
background-color: #FFFFFF
|
||||
}
|
||||
|
@ -216,6 +224,8 @@
|
|||
.mountings-list .li .imgCon .img {
|
||||
width: 169rpx;
|
||||
height: 104rpx;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.mountings-list .li .title {
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<template>
|
||||
<view class="content" :style="{paddingTop: statusHeight + 'px'}">
|
||||
<view class="content" :style="{paddingTop: statusHeight+25 + 'px'}">
|
||||
<statusNav navBarTitle="项目列表" :ifReturn="false"></statusNav>
|
||||
<container-subgroup-two>
|
||||
<view slot="content" style="margin: -100rpx -30rpx;">
|
||||
<view slot="content" style="margin: -100rpx -30rpx 0rpx; ">
|
||||
|
||||
<view class="project-list-input">
|
||||
<view class="project-list-input" :style="{top: statusHeight + 'px'}">
|
||||
<input type="text" class="int" value="" placeholder="请输入关键字" />
|
||||
<view class="xian">
|
||||
|
||||
|
@ -79,6 +79,7 @@
|
|||
format: true
|
||||
})
|
||||
return {
|
||||
statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
|
||||
date: currentDate,
|
||||
array: ['类型', '类型', '类型', '类型'],
|
||||
index: 0,
|
||||
|
@ -127,6 +128,8 @@
|
|||
height: 114rpx;
|
||||
position: relative;
|
||||
padding: 20rpx 16rpx;
|
||||
position: fixed;
|
||||
z-index: 2;
|
||||
box-sizing: border-box;
|
||||
background-color: #FFFFFF
|
||||
}
|
||||
|
|
|
@ -123,7 +123,7 @@
|
|||
<view class="home-fun-box">
|
||||
<view class="fun-title col3 fon28 disac bold">工单数据</view>
|
||||
<view class="disac mar-s30">
|
||||
<view class="disjcac fc width25" v-for="(item,index) in workOrderList" :key="index">
|
||||
<view class="disjcac fc width25" @click="goWorkOrder(index)" v-for="(item,index) in workOrderList" :key="index">
|
||||
<view class="posir">
|
||||
<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>
|
||||
|
@ -267,7 +267,7 @@
|
|||
{imgsrc:'/static/public/icon-home-abnormalSingle.png',title:'异常单',num:0},
|
||||
{imgsrc:'/static/public/icon-home-overdueSingle.png',title:'逾期单',num:0},
|
||||
{imgsrc:'/static/public/icon-home-overtime.png',title:'超时单 ',num:0},
|
||||
{imgsrc:'/static/public/icon-home-workOrderPool.png',title:'工单池',num:6},
|
||||
{imgsrc:'/static/public/icon-home-workOrderPool.png',title:'工单池',num:6,},
|
||||
],
|
||||
// 结算情况
|
||||
settlementList:[
|
||||
|
@ -309,6 +309,23 @@
|
|||
this.getFaultsList();
|
||||
},
|
||||
methods: {
|
||||
// 工单跳转
|
||||
goWorkOrder(index){
|
||||
if(index==0){
|
||||
|
||||
}else if(index==1){
|
||||
|
||||
}
|
||||
else if(index==2){
|
||||
|
||||
}
|
||||
else if(index==3){
|
||||
uni.navigateTo({
|
||||
url:'/pages/workOrder/workOrderLlsit'
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
goNoticeDetail(e){
|
||||
console.log(e);
|
||||
},
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
<view class="content" >
|
||||
<statusNav :navBarTitle="textTitle"></statusNav>
|
||||
<container-subgroup-two>
|
||||
<view slot="content" style="margin:-25rpx 0rpx 0rpx;">
|
||||
<view class="details-nav">
|
||||
<view slot="content" style="margin:0rpx -25rpx; " :style="{paddingTop:statusBarHeight + 'px'}">
|
||||
<view class="details-nav" :style="{top:statusBarHeighta + 'px'}">
|
||||
<view class="li" @click="detailsNavpa(index)" :class="item.state?'on':''"
|
||||
v-for="(item,index) in detailsNav">
|
||||
{{item.title}}
|
||||
|
@ -504,6 +504,8 @@
|
|||
return {
|
||||
swiperCurrent: 0,
|
||||
swiHeight:0,
|
||||
statusBarHeight:uni.getSystemInfoSync().statusBarHeight + 30,
|
||||
statusBarHeighta:uni.getSystemInfoSync().statusBarHeight + 30,
|
||||
textTitle: "工单详情",
|
||||
isrideo: true,
|
||||
detailsNav: [{
|
||||
|
@ -612,7 +614,6 @@
|
|||
.content {}
|
||||
|
||||
.swiper {
|
||||
min-height: 88vh;
|
||||
width: 100%;
|
||||
|
||||
}
|
||||
|
@ -684,12 +685,20 @@
|
|||
justify-content: space-between;
|
||||
border-bottom: solid #D5D4D4 2rpx;
|
||||
padding: 0 24rpx;
|
||||
|
||||
|
||||
position: fixed;
|
||||
z-index: 2;
|
||||
box-sizing: border-box;
|
||||
width: 100%;
|
||||
background-color: #F7F7F7;
|
||||
left: 0rpx;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.details-nav .li {
|
||||
width: 130rpx;
|
||||
padding-top: 30rpx;
|
||||
padding-top: 60rpx;
|
||||
font-size: 30rpx;
|
||||
padding-bottom: 35rpx;
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
<view class="li">
|
||||
<view class="icon icon-after">
|
||||
2
|
||||
|
||||
</view>
|
||||
<view class="text">
|
||||
填写维保单
|
||||
|
@ -34,6 +35,7 @@
|
|||
<view class="li">
|
||||
<view class="title">
|
||||
工单编号:
|
||||
|
||||
</view>
|
||||
<input type="text" class="input" placeholder="" value="GD20211203-001" />
|
||||
|
||||
|
@ -50,13 +52,12 @@
|
|||
<view class="title">
|
||||
项目名称:
|
||||
</view>
|
||||
<input type="text" class="input input-black
|
||||
" placeholder="" value="湖南省林业科学院11楼会议室P2.5" />
|
||||
|
||||
<input type="text" class="input input-black" placeholder="" value="湖南省林业科学院11楼会议室P2.5" />
|
||||
</view>
|
||||
<view class="li">
|
||||
<view class="title">
|
||||
产品类型:
|
||||
>
|
||||
</view>
|
||||
<input type="text" class="input" placeholder="" value="Q2.5-E" />
|
||||
|
||||
|
@ -139,7 +140,7 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<button class="submit-button" type="default">签到</button>
|
||||
<button class="submit-button" @click="goWorkOrderThree()" type="default">签到</button>
|
||||
</view>
|
||||
</container-subgroup-two>
|
||||
|
||||
|
@ -162,23 +163,18 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
goWorkOrderThree() {
|
||||
uni.navigateTo({
|
||||
url: "/pages/workOrder/workorderTwo"
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
.submit-button {
|
||||
width: 686rpx;
|
||||
border-radius: 50rpx;
|
||||
height: 90rpx;
|
||||
background-color: #02A2ea;
|
||||
line-height: 90rpx;
|
||||
color: #FFFFFF;
|
||||
margin-top: 60rpx;
|
||||
text-align: center;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.work-order-schedule {
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
<status-nav navBarTitle="工单列表" returnColor="#c2c2c2"></status-nav>
|
||||
|
||||
<container-subgroup-two>
|
||||
<view slot="content" style="margin: 0 -25rpx;">
|
||||
<view class="project-list-input">
|
||||
<view slot="content" style="margin: -25rpx -25rpx 0rpx;">
|
||||
<view class="project-list-input" :style="{top:statusBarHeight + 'px'}">
|
||||
<input type="text" class="int" value="" placeholder="请输入关键字" />
|
||||
<image class="search" src="../../static/iocn/ss.png" mode=""></image>
|
||||
<view class="xian">
|
||||
|
@ -226,18 +226,31 @@
|
|||
format: true
|
||||
})
|
||||
return {
|
||||
statusBarHeight:uni.getSystemInfoSync().statusBarHeight+40,
|
||||
role: 4, // 1:业务员 2:表示客户 3:表示客服 4:表示工程师
|
||||
date: currentDate,
|
||||
array: ['类型', '类型', '类型', '类型'],
|
||||
index: 0,
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
|
||||
},
|
||||
methods: {
|
||||
projectDetailsFun() {
|
||||
// uni.navigateTo({
|
||||
// url: "/pages/project/details"
|
||||
// })
|
||||
|
||||
if(this.role==4){
|
||||
uni.navigateTo({
|
||||
url: "/pages/workOrder/workOrder"
|
||||
})
|
||||
}else{
|
||||
uni.navigateTo({
|
||||
url: "/pages/workOrder/details"
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
bindPickerChange(data) {
|
||||
console.log(data)
|
||||
|
@ -283,7 +296,8 @@
|
|||
.project-list-input {
|
||||
width: 100%;
|
||||
height: 114rpx;
|
||||
position: relative;
|
||||
position: fixed;
|
||||
z-index: 2;
|
||||
padding: 20rpx 16rpx;
|
||||
box-sizing: border-box;
|
||||
background-color: #FFFFFF
|
||||
|
@ -331,6 +345,8 @@
|
|||
.screen .li .img {
|
||||
width: 14rpx;
|
||||
height: 8rpx;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.screen .li .imgA {
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
<view class="li">
|
||||
<view class="icon on icon-after">
|
||||
2
|
||||
|
||||
</view>
|
||||
<view class="text">
|
||||
填写维保单
|
||||
|
@ -23,6 +24,7 @@
|
|||
<view class="li">
|
||||
<view class="icon">
|
||||
3
|
||||
|
||||
</view>
|
||||
<view class="text">
|
||||
结算审核
|
||||
|
@ -235,7 +237,7 @@
|
|||
<view class="title">
|
||||
费用明细
|
||||
</view>
|
||||
<view class="btn">
|
||||
<view @click="addMountingsList()" class="btn">
|
||||
添加配件
|
||||
</view>
|
||||
</view>
|
||||
|
@ -253,6 +255,7 @@
|
|||
数量
|
||||
</view>
|
||||
<view class="li">
|
||||
|
||||
价格
|
||||
</view>
|
||||
</view>
|
||||
|
@ -271,7 +274,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<button class="submit-button" type="default">下一步</button>
|
||||
<button class="submit-button" @click="goWorkorderTwo()" type="default">下一步</button>
|
||||
|
||||
</view>
|
||||
</container-subgroup-two>
|
||||
|
@ -320,12 +323,22 @@
|
|||
isrideoFun(is) {
|
||||
this.isrideo = is
|
||||
},
|
||||
goWorkorderTwo(){
|
||||
uni.navigateTo({
|
||||
url: "/pages/workOrder/workOrderThree"
|
||||
})
|
||||
},
|
||||
addMountingsList() {
|
||||
uni.navigateTo({
|
||||
url: "/pages/mountingsList/mountingsList"
|
||||
})
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
.submit-button {
|
||||
width: 686rpx;
|
||||
border-radius: 50rpx;
|
||||
|
@ -471,14 +484,17 @@ isrideoFun(is){
|
|||
border: 2rpx solid #00a2e9;
|
||||
|
||||
}
|
||||
|
||||
.cost-breakdown-content {
|
||||
padding: 0rpx 40rpx;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .title {
|
||||
display: flex;
|
||||
margin-bottom: 40rpx;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .title .li {
|
||||
font-size: 28rpx;
|
||||
font-weight: bold;
|
||||
|
@ -486,48 +502,61 @@ isrideoFun(is){
|
|||
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .text {
|
||||
display: flex;
|
||||
margin-bottom: 40rpx;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .text .li {
|
||||
color: #4c4c4c;
|
||||
font-size: 28rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .text .li:nth-child(1) {
|
||||
width: 80rpx;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .text .li:nth-child(2) {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .text .li:nth-child(3) {
|
||||
width: 80rpx;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .text .li:nth-child(4) {
|
||||
width: 120rpx;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .title .li:nth-child(1) {
|
||||
width: 80rpx;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .title .li:nth-child(2) {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .title .li:nth-child(3) {
|
||||
width: 80rpx;
|
||||
}
|
||||
|
||||
.cost-breakdown-content .title .li:nth-child(4) {
|
||||
width: 120rpx;
|
||||
}
|
||||
|
||||
.work-order-from .rideo {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.work-order-from .isrideo {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 41rpx;
|
||||
}
|
||||
|
||||
.work-order-from .isrideo .icon {
|
||||
width: 26rpx;
|
||||
border: 2rpx solid #818181;
|
||||
|
@ -538,6 +567,7 @@ isrideoFun(is){
|
|||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.work-order-from .isrideo .icon .icon-content {
|
||||
width: 19rpx;
|
||||
height: 19rpx;
|
||||
|
@ -548,6 +578,7 @@ isrideoFun(is){
|
|||
.work-order-from .isrideo .on {
|
||||
border: 2rpx solid #D81E06;
|
||||
}
|
||||
|
||||
.work-order-from .isrideo .on .icon-content {
|
||||
background-color: #D81E06
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue