Commit 3b230076 authored by 高铭波's avatar 高铭波

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

parents db7bf890 9f96c0b8
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<text class="amount-view">{{total}}</text> <text class="amount-view">{{total}}</text>
<text>件</text> <text>件</text>
</view> </view>
<u-button v-if="buttonText" :custom-style="customStyle" shape="circle" @click.stop="handleOperate" type="primary">{{buttonText}}</u-button> <u-button v-if="showButton" :custom-style="customStyle" shape="circle" @click.stop="handleOperate" type="primary">{{buttonText}}</u-button>
</view> </view>
</view> </view>
</template> </template>
...@@ -74,9 +74,13 @@ ...@@ -74,9 +74,13 @@
'20': '', '20': '',
'-2': '', '-2': '',
'-1': '', '-1': '',
'100': '' '100': '',
'91': ''
} }
}, },
showButton() {
return this.info.status == '1' || this.info.status == '15'
},
isHorizontal() { isHorizontal() {
return this.type == 'horizontal' return this.type == 'horizontal'
}, },
...@@ -88,7 +92,8 @@ ...@@ -88,7 +92,8 @@
'20': '', '20': '',
'-2': '', '-2': '',
'-1': '', '-1': '',
'100': '' '100': '',
'91': ''
} }
}, },
buttonOperateType() { buttonOperateType() {
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="bottom-view" v-if="buttonText"> <view class="bottom-view" v-if="showButton">
<view class="total-view"> <view class="total-view">
<text>合计:</text> <text>合计:</text>
<text class="amount-view">{{total}}</text> <text class="amount-view">{{total}}</text>
...@@ -84,12 +84,16 @@ ...@@ -84,12 +84,16 @@
'20': '', '20': '',
'-2': '', '-2': '',
'-1': '', '-1': '',
'100': '' '100': '',
'91': ''
} }
}, },
buttonText() { buttonText() {
return this.texts[this.info.status] return this.texts[this.info.status]
}, },
showButton() {
return this.info.status == '1' || this.info.status == '15'
},
hasExpress() { hasExpress() {
return this.$u.test.isEmpty(this.info.express) ? false : true return this.$u.test.isEmpty(this.info.express) ? false : true
}, },
......
...@@ -65,20 +65,9 @@ ...@@ -65,20 +65,9 @@
v-show="item.fieldsName != 'actualPaid' || show200" v-show="item.fieldsName != 'actualPaid' || show200"
:id="`item${item.fieldsId}`" :id="`item${item.fieldsId}`"
> >
<view <view class="label" v-if="!hiddenTitle.includes(item.formType)">
class="label" <image class="item-image" :src="mixingImage" v-if="item.required"></image>
v-if=" {{item.fieldsTitle}}
item.formType !== 'location' &&
item.formType !== 'form' &&
item.formType !== 'label'
"
>
<image
class="item-image"
:src="mixingImage"
v-if="item.required"
></image>
{{ item.fieldsTitle }}
</view> </view>
<template v-if="item.fieldsType"> <template v-if="item.fieldsType">
<xh-input <xh-input
...@@ -687,6 +676,7 @@ export default { ...@@ -687,6 +676,7 @@ export default {
if (!hasMate || !this.$u.test.isEmpty(mateRow)) { if (!hasMate || !this.$u.test.isEmpty(mateRow)) {
panelResult.submitted++; panelResult.submitted++;
} }
panelResult.submitted++;
} else { } else {
panelResult.submitted++; panelResult.submitted++;
} }
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
class="u-flex" class="u-flex"
:scroll-into-view="scrollId" :scroll-into-view="scrollId"
> >
<view :id="`brand${item.brandId}`" :class="['label-title', { selected: item.brandId === brandId }]" v-for="(item, index) in brand" :key="index" @click="selectBrand(item, index)">{{ item.label }}</view> <view :id="`brand${item.brandId}`" :class="['label-title', { selected: item.brandId == brandId }]" v-for="(item, index) in brand" :key="index" @click="selectBrand(item, index)">{{ item.label }}</view>
</scroll-view> </scroll-view>
</view> </view>
<view class="more u-flex" @click="handleClick"> <view class="more u-flex" @click="handleClick">
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
categaryIndex: 0, categaryIndex: 0,
categaryId: '', categaryId: '',
brandIndex: 0, brandIndex: 0,
brandId: '', brandId: 0,
scrollId: '', scrollId: '',
loadStatus: "loadmore", loadStatus: "loadmore",
lists: [], lists: [],
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
var pages = getCurrentPages(); var pages = getCurrentPages();
if(pages.length >= 2) { if(pages.length >= 2) {
var prevPage = pages[pages.length - 2]; //上一个页面 var prevPage = pages[pages.length - 2]; //上一个页面
const parts = prevPage.$vm._data.selectedParts const parts = prevPage.$vm.selectedParts
if(this.$u.test.isEmpty(parts)) { if(this.$u.test.isEmpty(parts)) {
this.$u.route({type: 'back'}) this.$u.route({type: 'back'})
} }
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
}, },
validateForm() { validateForm() {
if(this.$u.test.isEmpty(this.parts)) { if(this.$u.test.isEmpty(this.parts)) {
this.$u.toast('物流公司不能为空') this.$u.toast('备件不能为空')
return false return false
} }
if(this.curWay == 0) { if(this.curWay == 0) {
......
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