Browse Source

bug 修复

lilei 3 years ago
parent
commit
6c486dc69d

+ 1 - 0
src/views/common/dealerSubareaScopeList.vue

@@ -8,6 +8,7 @@
     style="width: 100%"
     :filter-option="false"
     :not-found-content="fetching ? undefined : null"
+    :dropdownMatchSelectWidth="false"
     @search="fetchUser"
     @change="handleChange"
     allowClear

+ 3 - 3
src/views/salesManagement/pushOrderManagement/chooseTypeModal.vue

@@ -20,7 +20,7 @@
         <a-form-model-item label="产品分类" prop="id">
           <a-select id="pushOrderManagement-print-form" v-model="form.id" placeholder="请选择产品分类">
             <a-select-option v-for="item in typeList" :value="item.id" :key="item.id">
-              <span v-if="item.id != 'all'">{{ item.productBrandName }} - {{ item.productTypeName3 }}</span>
+              <span v-if="item.id != 'all'">{{ item.productBrandName }} {{ item.productTypeName?('-'+item.productTypeName):'' }}</span>
               <span v-else>全部</span>
             </a-select-option>
           </a-select>
@@ -58,7 +58,7 @@ export default {
       },
       formItemLayout: {
         labelCol: { span: 6 },
-        wrapperCol: { span: 18 }
+        wrapperCol: { span: 15 }
       },
       spinning: false,
       typeList: []
@@ -74,7 +74,7 @@ export default {
           if (item) {
             const obj = {
               productBrandSn: item.productBrandSn,
-              productTypeSn3: item.productTypeSn3
+              productTypeSn: item.productTypeSn
             }
             _this.$emit('ok', obj)
           }

+ 1 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -9,7 +9,7 @@
           <a-button
             key="2"
             type="primary"
-            class="button-success"
+            class="button-error"
             id="salesDetail-fhdy-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('DISPATCH_BILL')">发货打印</a-button>