Sfoglia il codice sorgente

修改详情样式

chenrui 2 anni fa
parent
commit
e02d152d71

+ 3 - 3
src/views/numsGoodsShelves/vinAnalysis/detailModal.vue

@@ -29,7 +29,7 @@
         </tr>
         <!-- 空调滤清器 -->
         <tr v-for="(item,index) in itemData.airConditionerFilter" :key="index">
-          <td v-if="index==0" colSpan="1">空调滤清器</td>
+          <td v-if="index==0" colSpan="1" :rowSpan="itemData.airFilterFlag.length">空调滤清器</td>
           <td>{{ item.productCode|| '--' }}</td>
           <td>{{ item.productName|| '--' }}</td>
           <td>{{ item.origCode || '--' }}</td>
@@ -38,7 +38,7 @@
         </tr>
         <!-- 空气滤清器 -->
         <tr v-for="(item,index) in itemData.airFilterFlag" :key="index">
-          <td v-if="index==0" colSpan="1">空气滤清器</td>
+          <td v-if="index==0" colSpan="1" :rowSpan="itemData.airFilterFlag.length">空气滤清器</td>
           <td>{{ item.productCode|| '--' }}</td>
           <td>{{ item.productName|| '--' }}</td>
           <td>{{ item.origCode || '--' }}</td>
@@ -47,7 +47,7 @@
         </tr>
         <!-- 机油滤清器 -->
         <tr v-for="(item,index) in itemData.engineOilFilterFlag" :key="index">
-          <td v-if="index==0" colSpan="1">机油滤清器</td>
+          <td v-if="index==0" colSpan="1" :rowSpan="itemData.airFilterFlag.length">机油滤清器</td>
           <td>{{ item.productCode|| '--' }}</td>
           <td>{{ item.productName|| '--' }}</td>
           <td>{{ item.origCode || '--' }}</td>

+ 1 - 1
src/views/numsGoodsShelves/vinAnalysis/spList.vue

@@ -86,7 +86,7 @@
         bordered>
         <template slot="type" slot-scope="text, record">
           <div>
-            {{ record.productTypeSn2 }}->{{ record.productTypeSn3 }}
+            {{ record.productTypeName2 }}->{{ record.productTypeName3 }}
           </div>
         </template>
       </s-table>

+ 5 - 5
src/views/numsGoodsShelves/vinAnalysis/vinList.vue

@@ -14,8 +14,8 @@
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="货架名称" prop="shelf_sn">
-              <shelfSList v-model="queryParam.shelf_sn" @change="shelfChange"></shelfSList>
+            <a-form-model-item label="货架名称" prop="shelfSn">
+              <shelfSList v-model="queryParam.shelfSn" @change="shelfChange"></shelfSList>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -132,14 +132,14 @@ export default {
         beginDate: '',
         endDate: '',
         vinCode: undefined,
-        shelf_sn: undefined,
+        shelfSn: undefined,
         brandName: undefined,
         modelName: undefined
       },
       isSearch: false,
       time: [],
       rules: {
-        'shelf_sn': [{ required: true, message: '请选择货架', trigger: 'change' }]
+        'shelfSn': [{ required: true, message: '请选择货架', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -237,7 +237,7 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.vinCode = undefined
-      this.queryParam.shelf_sn = undefined
+      this.queryParam.shelfSn = undefined
       this.queryParam.brandName = undefined
       this.queryParam.modelName = undefined
       this.$refs.rangeDate.resetDate(this.time)