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

src/pages/order/complete.vue

@@ -65,21 +65,10 @@
                     v-show="item.fieldsName != 'actualPaid' || show200"
                     :id="`item${item.fieldsId}`"
                   >
-                    <view
-                      class="label"
-                      v-if="
-                        item.formType !== 'location' &&
-                        item.formType !== 'form' &&
-                        item.formType !== 'label'
-                      "
-                    >
-                      <image
-                        class="item-image"
-                        :src="mixingImage"
-                        v-if="item.required"
-                      ></image>
-                      {{ item.fieldsTitle }}
-                    </view>
+                  <view class="label" v-if="!hiddenTitle.includes(item.formType)">
+                      <image class="item-image" :src="mixingImage" v-if="item.required"></image>
+                      {{item.fieldsTitle}}
+                  </view>
                     <template v-if="item.fieldsType">
                       <xh-input
                         v-if="item.formType === 'input'"
@@ -685,6 +674,7 @@ export default {
                   if (!this.$u.test.isEmpty(materRow)) {
                     panelResult.submitted++;
                   }
+				  panelResult.submitted++;
                 } else {
                   panelResult.submitted++;
                 }

src/pages/parts/addParts.vue

@@ -29,7 +29,7 @@
             class="u-flex"
             :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>
         </view>
         <view class="more u-flex" @click="handleClick">
@@ -94,7 +94,7 @@ export default {
       categaryIndex: 0,
       categaryId: '',
       brandIndex: 0,
-      brandId: '',
+      brandId: 0,
       scrollId: '',
       loadStatus: "loadmore",
       lists: [],
@@ -188,7 +188,7 @@ export default {
             if (item && index) {
               this.selectBrand(item, index)
               this.scrollId = `brand${item.brandId}`
-            } else {
+            } else {
               this.brandId = this.brand[0].brandId
               this.lists = []
               this.getPartsList()