Commit 9f96c0b8 authored by Facius's avatar Facius

完工页面代码合并冲突解决;备件默认选中通用

parent 9bae991f
...@@ -65,21 +65,10 @@ ...@@ -65,21 +65,10 @@
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' && </view>
item.formType !== 'form' &&
item.formType !== 'label'
"
>
<image
class="item-image"
:src="mixingImage"
v-if="item.required"
></image>
{{ item.fieldsTitle }}
</view>
<template v-if="item.fieldsType"> <template v-if="item.fieldsType">
<xh-input <xh-input
v-if="item.formType === 'input'" v-if="item.formType === 'input'"
...@@ -685,6 +674,7 @@ export default { ...@@ -685,6 +674,7 @@ export default {
if (!this.$u.test.isEmpty(materRow)) { if (!this.$u.test.isEmpty(materRow)) {
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: [],
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
if (item && index) { if (item && index) {
this.selectBrand(item, index) this.selectBrand(item, index)
this.scrollId = `brand${item.brandId}` this.scrollId = `brand${item.brandId}`
} else { } else {
this.brandId = this.brand[0].brandId this.brandId = this.brand[0].brandId
this.lists = [] this.lists = []
this.getPartsList() this.getPartsList()
......
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