Commit ae151497 authored by Morson's avatar Morson

Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

parents c88cd3e4 0deb7b6f
......@@ -32,13 +32,13 @@
<script>
import adjustParts from "@/components/select-parts/adjust"
import arrMixin from './arrMixin'
import stringMixin from './stringMixin'
export default {
name: 'XhParts',
components: {
adjustParts
},
mixins: [arrMixin],
mixins: [stringMixin],
props: {
orderId: {
type: String,
......@@ -66,16 +66,16 @@
return process.uniEnv.qn_base_url + 'no_parts.png'
},
},
created() {
mounted() {
this.getWorkOrderParts()
},
methods: {
getWorkOrderParts() {
this.lists = this.dataValue || []
this.lists = JSON.parse(this.dataValue) || []
},
partsChange(val, index) {
this.$set(this.lists[index], 'quantity', val)
this.valueChange(this.lists)
this.valueChange(JSON.stringify(this.lists))
},
valChange(val) {
val.forEach(v => {
......@@ -86,7 +86,7 @@
this.$set(this.lists, index, v)
}
})
this.valueChange(this.lists)
this.valueChange(JSON.stringify(this.lists))
},
toParts() {
uni.navigateTo({
......
<!-- ******************* 扫码 ******************* -->
<template>
<view class="">
<view class="u-flex" @click="scanCode">
<view class="txt u-flex-1">扫描二维码(仅挚达充电桩可扫描)</view>
<u-icon name="arrow-right" color="#666" size="28"></u-icon>
<view class="">
<view class="u-flex" @click="scanCode">
<view class="txt u-flex-1">扫描二维码(仅挚达充电桩可扫描)</view>
<u-icon name="arrow-right" color="#666" size="28"></u-icon>
</view>
<view class="u-flex">
<u-input class="u-flex-1 input-item" v-model="dataValue" @input="valueChange" type="text" />
......@@ -23,33 +23,19 @@
return {}
},
computed: {
valueTxt() {
let str = ''
const dataValue = this.dataValue
if(dataValue && dataValue.length>1){
str = '经度:'+dataValue[0]+','+'维度:'+dataValue[1]
}
return str
}
},
watch: {},
mounted() {},
methods: {
scanCode(type){
const self = this
// qrCode 二维码;barCode 条形码
let scanType = type && [type] || ['qrCode']
uni.scanCode({
// scanType: scanType,
success: function (res) {
self.dataValue = res.result
self.valueChange(res.result)
self.dataValue = res.result
self.valueChange(res.result)
}
});
},
// setValue(txt) {
// this.valueChange(this.dataValue)
// }
}
}
}
</script>
......@@ -59,10 +45,10 @@
font-size: 28rpx;
line-height: 40rpx;
color: #fa3534;
}
.input-item{
background: #F4F5F7;
border-radius: 12rpx;
padding-left: 20rpx;
}
.input-item{
background: #F4F5F7;
border-radius: 12rpx;
padding-left: 20rpx;
}
</style>
<template>
<view class="spare-item">
<view class="left-view">
<u-checkbox v-if="showChecked" icon-size="28" size="40" v-model="check" @change="handleChange" shape="circle"/>
<image class="image-view" :src="imageUrl"></image>
<view class="info-view">
<view class="name-text">{{item.name}}</view>
<view>{{remarkText}}</view>
</view>
</view>
<view class="count-view">
<view v-if="showChecked">
<u-number-box v-model="value" :min="item.min || 0" :max="item.max || item[type]" @change="numChange"></u-number-box>
</view>
<text v-else>x{{item[type]|| 0}}</text>
</view>
</view>
</template>
<template>
<view class="spare-item">
<view class="left-view">
<u-checkbox v-if="showChecked" icon-size="28" size="40" v-model="check" @change="handleChange"
shape="circle" />
<image class="image-view" :src="imageUrl"></image>
<view class="info-view">
<view class="name-text">{{item.name}}</view>
<view>{{remarkText}}</view>
</view>
</view>
<view class="count-view">
<view v-if="showChecked">
<u-number-box v-model="value" :min="item.min || 0" :max="item.max || item[type]" @minus="numChange"
@plus="numChange" @blur="numChange"></u-number-box>
</view>
<text v-else>x{{item[type]|| 0}}</text>
</view>
</view>
</template>
<script>
export default {
props: {
showChecked: { // 是否显示勾选
type: Boolean,
default() {
return false
}
},
type: { // 'stock' 仓库; 'quantity' 订单
type: String,
default: 'quantity'
},
item: {
type: Object,
default() {
return {}
}
},
noteText: {
type: String,
default: ''
},
},
data() {
return {
value: 0,
check: false,
oldCount: 0
}
},
computed: {
remarkText() {
if (this.item.categoryName || this.item.brandName) {
return (this.item.categoryName || '通用') + '-' + (this.item.brandName || '通用')
} else {
return '通用'
}
},
imageUrl() {
return this.item.images ? process.uniEnv.systemUrl.apiUrl + this.item.images.split(',').shift() : this.placeholderImage
},
placeholderImage() {
return process.uniEnv.qn_base_url + 'morentupian.png'
},
},
watch: {
showChecked(val) {
this.oldCount = 0
},
'item.quantity'(val) {
this.value = val
},
'item.selected'(val) {
this.check = val
this.value= val ? this.item.stock : 0
},
},
methods: {
handleChange(event) {
this.value= event.value ? this.item.stock : 0
this.$emit('change', event.value)
},
numChange(event) {
if (event.value == 0 && this.oldCount > 0) {
this.check = false
this.$emit('change', this.check)
} else if (event.value > 0 && this.oldCount == 0) {
this.check = true
this.$emit('change', this.check)
}
this.oldCount = event.value
this.$emit('numChange', event.value)
},
}
}
</script>
<style lang="scss" scoped>
.spare-item {
display: flex;
// width: 100%;
justify-content: space-between;
align-items: flex-end;
// padding: 30rpx;
// background-color: #FFFFFF;
// border-radius: 12rpx;
.left-view {
display: flex;
align-items: center;
.image-view {
width: 120rpx;
height: 120rpx;
margin-right: 20rpx;
flex-shrink: 0;
}
.info-view {
font-size: 24rpx;
color: #333333;
.name-text {
font-size: 32rpx;
font-weight: bold;
color: #333333;
margin-bottom: 30rpx;
}
}
}
.count-view {
font-size: 28rpx;
color: #333333;
}
}
export default {
props: {
showChecked: { // 是否显示勾选
type: Boolean,
default () {
return false
}
},
type: { // 'stock' 仓库; 'quantity' 订单
type: String,
default: 'quantity'
},
item: {
type: Object,
default () {
return {}
}
},
noteText: {
type: String,
default: ''
},
},
data() {
return {
value: 0, // 选数
check: false, // 选中
oldCount: 0 // 旧选数
}
},
computed: {
remarkText() {
if (this.item.categoryName || this.item.brandName) {
return (this.item.categoryName || '通用') + '-' + (this.item.brandName || '通用')
} else {
return '通用'
}
},
imageUrl() {
return this.item.images ? process.uniEnv.systemUrl.apiUrl + this.item.images.split(',').shift() : this
.placeholderImage
},
placeholderImage() {
return process.uniEnv.qn_base_url + 'morentupian.png'
},
},
watch: {
showChecked(val) {
this.oldCount = 0
},
'item.quantity'(val) {
this.value = val
},
'item.selected'(val) {
this.check = val
this.value = val ? this.item.stock : 0
},
},
methods: {
handleChange(event) {
this.value = event.value ? this.item.stock : 0
this.oldCount = this.value
this.$emit('change', event.value)
},
numChange(event) {
if (event.value == 0 && this.oldCount > 0) {
this.check = false
this.$emit('change', this.check)
} else if (event.value > 0 && this.oldCount == 0) {
this.check = true
this.$emit('change', this.check)
}
this.oldCount = event.value
this.$emit('numChange', event.value)
},
}
}
</script>
<style lang="scss" scoped>
.spare-item {
display: flex;
justify-content: space-between;
align-items: flex-end;
.left-view {
display: flex;
align-items: center;
.image-view {
width: 120rpx;
height: 120rpx;
margin-right: 20rpx;
flex-shrink: 0;
}
.info-view {
font-size: 24rpx;
color: #333333;
.name-text {
font-size: 32rpx;
font-weight: bold;
color: #333333;
margin-bottom: 30rpx;
}
}
}
.count-view {
font-size: 28rpx;
color: #333333;
}
}
</style>
......@@ -5,7 +5,7 @@
</view>
<view class="u-flex right">
<view class="right-img">
<u-image :src="info.images" width="200rpx" height="200rpx" />
<u-image :src="info.images || noPartsImage" width="200rpx" height="200rpx" />
</view>
<view class="u-flex right-content">
<view class="right-content-name">{{ info.name }}</view>
......@@ -45,6 +45,11 @@
}
}
},
computed: {
noPartsImage() {
return process.uniEnv.qn_base_url + 'morentupian.png'
}
},
data() {
return {
}
......
......@@ -78,6 +78,8 @@
v.max = v.stock
v.checked = false
v.quantity = v.stock
const images = v.images ? v.images.split(',') : []
v.images = images[0]
return v
})
}
......
......@@ -152,7 +152,6 @@ export default {
this.$u.api.getBrandList({categoryId: this.categaryId}).then(res => {
if (res.code === 200) {
const data = res.data
console.log("data", data)
if (data.length > 0) {
this.brand = data.map(v => {
v.label = v.brandName
......@@ -184,6 +183,8 @@ export default {
v.quantity = 0
v.disabled = true
v.max = 999
const images = v.images ? v.images.split(',') : []
v.images = images[0]
return v
})
this.lists = this.lists.concat(lists)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment