Browse Source

bug 修复

lilei 4 years ago
parent
commit
20b174bdcc

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -32,7 +32,7 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="产品类别">
               <a-form-item label="产品类别">
-                <a-cascader :options="typeData" id="makeInventory-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+                <a-cascader :options="typeData" expand-trigger="hover" id="makeInventory-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
             <a-col :md="6" :sm="24" style="margin-bottom: 24px;">

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -38,7 +38,7 @@
                   </a-col>
                   </a-col>
                   <a-col :md="6" :sm="24">
                   <a-col :md="6" :sm="24">
                     <a-form-item label="产品分类">
                     <a-form-item label="产品分类">
-                      <a-cascader :options="typeData" id="selfDisk-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+                      <a-cascader :options="typeData" expand-trigger="hover" id="selfDisk-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
                     </a-form-item>
                     </a-form-item>
                   </a-col>
                   </a-col>
                   <template v-if="advanced">
                   <template v-if="advanced">

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -29,7 +29,7 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="产品类别">
               <a-form-item label="产品类别">
-                <a-cascader :options="typeData" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+                <a-cascader :options="typeData" expand-trigger="hover" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -73,7 +73,7 @@
                   <template v-if="advanced">
                   <template v-if="advanced">
                     <a-col :md="6" :sm="24">
                     <a-col :md="6" :sm="24">
                       <a-form-item label="适用车型">
                       <a-form-item label="适用车型">
-                        <a-cascader :options="typeData" id="purchaseOrderEdit-state" placeholder="请选择适用车型" allowClear v-model="queryParam.brand" />
+                        <a-cascader :options="typeData" expand-trigger="hover" id="purchaseOrderEdit-state" placeholder="请选择适用车型" allowClear v-model="queryParam.brand" />
                       </a-form-item>
                       </a-form-item>
                     </a-col>
                     </a-col>
                   </template>
                   </template>

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -34,7 +34,7 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="产品类别">
               <a-form-item label="产品类别">
-                <a-cascader :options="typeData" id="purchaseOrderWarehousing-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+                <a-cascader :options="typeData" expand-trigger="hover" id="purchaseOrderWarehousing-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
@@ -71,7 +71,7 @@
         </template>
         </template>
         <!-- 仓库仓位 -->
         <!-- 仓库仓位 -->
         <template slot="warehousePosition" slot-scope="text, record">
         <template slot="warehousePosition" slot-scope="text, record">
-          <a-cascader :options="typeData" id="purchaseOrderWarehousing-state" placeholder="请选择" allowClear v-model="record.brand" />
+          <a-cascader :options="typeData" expand-trigger="hover" id="purchaseOrderWarehousing-state" placeholder="请选择" allowClear v-model="record.brand" />
         </template>
         </template>
       </s-table>
       </s-table>
     </a-card>
     </a-card>

+ 1 - 1
src/views/salesManagement/quotation/edit.vue

@@ -71,7 +71,7 @@
                     </a-col>
                     </a-col>
                     <a-col :md="6" :sm="24">
                     <a-col :md="6" :sm="24">
                       <a-form-item label="产品类别">
                       <a-form-item label="产品类别">
-                        <a-cascader :options="typeData" id="quotationEdit-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
+                        <a-cascader :options="typeData" expand-trigger="hover" id="quotationEdit-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
                       </a-form-item>
                       </a-form-item>
                     </a-col>
                     </a-col>
                   </template>
                   </template>

+ 13 - 12
src/views/salesManagement/salesQuery/queryPart.vue

@@ -45,6 +45,7 @@
                   @change="changeProductType"
                   @change="changeProductType"
                   change-on-select
                   change-on-select
                   v-model="productType"
                   v-model="productType"
+                  expand-trigger="hover"
                   :options="productTypeList"
                   :options="productTypeList"
                   :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                   :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                   id="productInfoList-productType"
                   id="productInfoList-productType"
@@ -266,18 +267,6 @@ export default {
             data.list[i].salesNums = 1
             data.list[i].salesNums = 1
           }
           }
           this.disabled = false
           this.disabled = false
-          // 产品品牌
-          if (this.productBrandList.length == 0) {
-            this.getProductBrand()
-          }
-          // 产品分类
-          if (this.productTypeList.length == 0) {
-            this.getProductType()
-          }
-          // 仓库
-          if (this.warehouseList.length == 0) {
-            this.getWarehouse()
-          }
           return data
           return data
         })
         })
       },
       },
@@ -287,6 +276,18 @@ export default {
   created () {
   created () {
     this.columns = this.columnsBak
     this.columns = this.columnsBak
     this.onSettingChange()
     this.onSettingChange()
+    // 产品品牌
+    if (this.productBrandList.length == 0) {
+      this.getProductBrand()
+    }
+    // 产品分类
+    if (this.productTypeList.length == 0) {
+      this.getProductType()
+    }
+    // 仓库
+    if (this.warehouseList.length == 0) {
+      this.getWarehouse()
+    }
   },
   },
   methods: {
   methods: {
     // 设置列
     // 设置列