wsnet
/
pad-app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

装船指令静态完成

dev
wangchen 2023-07-13 11:12:15 +08:00
parent 92e67a3fe8
commit 9eeb8a0cb3
10 changed files with 772 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pages/index/instruct.vue
View File

@ -345,7 +345,6 @@
itemSum() {
return function(item) {
let sum = (60 / item) * 100
console.log(sum);
return sum
};
}

270
pages/index/instructDetails.vue
View File

@ -201,11 +201,160 @@
<uni-td>2</uni-td>
<uni-td>3</uni-td>
<uni-td>4</uni-td>
<uni-td align="center" class="blue" @click="cs">残损</uni-td>
<uni-td align="center">
<view class="uni-group">
<button class="uni-button" size="mini" type="primary" @click="open">残损</button>
</view>
</uni-td>
</uni-tr>
</uni-table>
</view>
<!-- 弹出层 -->
<uni-popup ref="popup" :mask-click="false">
<view class="dialog">
<view class="dtitle">
<text>残损信息</text>
<uni-icons type="closeempty" size="30" @click="close"></uni-icons>
</view>
<view class="tableContant">
<view class="nr">
<text class="text">品牌:</text>
<text class="text">车型:</text>
<text class="text">车架号/条形码:</text>
</view>
<view class="table">
<view class="title">
<view>质损发生环节: 收车交接</view>
<view class="tag">已收车</view>
</view>
<view class="row">
<view class="col">
质损上报人员: 张星星
</view>
<view class="col">
质损上报时间: 2023/09/08 23:00
</view>
<view class="col">
质损发生位置: 舱内
</view>
</view>
<view class="row">
<view class="col">
质损概况: 磕伤
</view>
<view class="col">
损坏情况: 凹陷
</view>
<view class="col">
处置情况: 其他 这是一段关于其他的描述
</view>
</view>
<view class="imgRow">
<view class="name">
质损照片:
</view>
<view class="imgList">
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
</view>
</view>
<view class="imgRow">
<view class="name">
车架号照片:
</view>
<view class="imgList">
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
</view>
</view>
</view>
<view class="table">
<view class="title">
<view>质损发生环节: 收车交接</view>
<view class="tag">已收车</view>
</view>
<view class="row">
备注：这段备注很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长
</view>
<view class="row">
<view class="col">
质损上报人员: 张星星
</view>
<view class="col">
质损上报时间: 2023/09/08 23:00
</view>
<view class="col">
质损发生位置: 舱内
</view>
</view>
<view class="row">
<view class="col">
质损概况: 磕伤
</view>
<view class="col">
损坏情况: 凹陷
</view>
<view class="col">
处置情况: 其他 这是一段关
</view>
</view>
<view class="imgRow">
<view class="name">
质损照片:
</view>
<view class="imgList">
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
</view>
</view>
<view class="imgRow">
<view class="name">
车架号照片:
</view>
<view class="imgList">
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
<view class="img">
<image src="../../static/images/testImg.jpg" mode="widthFix"></image>
</view>
</view>
</view>
</view>
</view>
</view>
</uni-popup>
</view>
</view>
</template>
@ -220,18 +369,17 @@
HeadInfo
},
methods: {
cs() {
console.log(1);
open() {
this.$refs.popup.open('center')
},
close() {
this.$refs.popup.close()
}
}
}
</script>
<style lang="less" scoped>
.blue {
color: #108ee9;
}
.details {
.container {
padding: 20px 30px;
@ -274,4 +422,112 @@
}
}
}
.dialog {
width: 90vh;
height: 80vh;
background-color: #fff;
border-radius: 10px;
.dtitle {
width: 100%;
height: 60px;
line-height: 60px;
border-radius: 10px 10px 0 0;
padding: 0 20px;
font-size: 18px;
font-weight: 700;
background-color: #f9f9f9;
text-align: left;
display: flex;
justify-content: space-between;
}
.tableContant {
height: calc(80vh - 60px);
overflow-y: auto;
.nr {
padding: 0 20px;
height: 60px;
line-height: 60px;
display: flex;
justify-content: flex-start;
.text {
min-width: 120px;
text-align: left;
}
}
.table {
width: calc(100% - 40px);
margin: 0 20px 20px;
padding: 0 20px;
border-bottom: 1px solid #ebebeb;
.title {
height: 40px;
line-height: 40px;
font-weight: 900;
text-align: left;
display: flex;
justify-content: flex-start;
.tag {
width: 60px;
margin: 10px 15px 0;
border-radius: 3px;
height: 20px;
line-height: 20px;
font-weight: 400;
color: #fff;
text-align: center;
background-color: #108ee9;
}
}
.row {
width: 100%;
display: flex;
justify-content: space-between;
font-size: 18px;
height: 40px;
font-size: 10px;
.col {
width: 32%;
text-align: left;
}
}
.imgRow {
margin-bottom: 25rpx;
display: flex;
justify-content: flex-start;
.name {
width: 80px;
text-align: left;
font-size: 10px;
}
.imgList {
width: calc(100% - 80px);
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
.img {
width: 100px;
margin-left: 10px;
margin-bottom: 10px;
}
}
}
}
}
}
</style>

2
uni_modules/uni-popup/changelog.md
View File

@ -1,3 +1,5 @@
## 1.8.3（2023-04-17）
- 修复 uni-popup 重复打开时的 bug
## 1.8.2（2023-02-02）
- uni-popup-dialog 组件新增 inputType 属性
## 1.8.1（2022-12-01）

3
uni_modules/uni-popup/components/uni-popup/uni-popup.vue
View File

@ -269,8 +269,7 @@
open(direction) {
// fix by mehaotian 处理快速打开关闭的情况
if (this.showPopup) {
clearTimeout(this.timer)
this.showPopup = false
return
}
let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
if (!(direction && innerType.indexOf(direction) !== -1)) {

2
uni_modules/uni-popup/package.json
View File

@ -1,7 +1,7 @@
{
"id": "uni-popup",
"displayName": "uni-popup 弹出层",
"version": "1.8.2",
"version": "1.8.3",
"description": " Popup 组件，提供常用的弹层",
"keywords": [
"uni-ui",

2
uni_modules/uni-transition/changelog.md
View File

@ -1,3 +1,5 @@
## 1.3.2（2023-05-04）
- 修复 NVUE 平台报错的问题
## 1.3.1（2021-11-23）
- 修复 init 方法初始化问题
## 1.3.0（2021-11-19）

5
uni_modules/uni-transition/components/uni-transition/createAnimation.js
View File

@ -10,7 +10,10 @@ const nvueAnimation = uni.requireNativePlugin('animation')
class MPAnimation {
constructor(options, _this) {
this.options = options
this.animation = uni.createAnimation(options)
// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
this.animation = uni.createAnimation({
...options
})
this.currentStepAnimates = {}
this.next = 0
this.$ = _this

13
uni_modules/uni-transition/components/uni-transition/uni-transition.vue
View File

@ -1,5 +1,10 @@
<template>
<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
<!-- #ifndef APP-NVUE -->
<view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
<!-- #endif -->
<!-- #ifdef APP-NVUE -->
<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
<!-- #endif -->
</template>
<script>
@ -48,7 +53,11 @@ export default {
customClass:{
type: String,
default: ''
}
},
onceRender:{
type:Boolean,
default:false
},
},
data() {
return {

11
uni_modules/uni-transition/package.json
View File

@ -1,7 +1,7 @@
{
"id": "uni-transition",
"displayName": "uni-transition 过渡动画",
"version": "1.3.1",
"version": "1.3.2",
"description": "元素的简单过渡动画",
"keywords": [
"uni-ui",
@ -17,11 +17,7 @@
"directories": {
"example": "../../temps/example_temps"
},
"dcloudext": {
"category": [
"前端组件",
"通用组件"
],
"dcloudext": {
"sale": {
"regular": {
"price": "0.00"
@ -38,7 +34,8 @@
"data": "无",
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
"type": "component-vue"
},
"uni_modules": {
"dependencies": ["uni-scss"],