Просмотр исходного кода

Merge branch 'develop_yh39' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh39

lilei 1 год назад
Родитель
Сommit
647e9aa270

+ 1 - 0
src/views/allocationManagement/transferOut/edit.vue

@@ -585,6 +585,7 @@ export default {
         price: isEdit ? row.price : row.productPrice,
         qty: row.qty, //  添加时调出数量默认为1
         productSn: row.productSn,
+        productBrandSn: row.productBrandSn,
         departmentSn: row.departmentSn,
         departmentName: row.departmentName,
         productTypeSn1: row.productTypeSn1,

+ 2 - 1
src/views/allocationManagement/transferReturn/edit.vue

@@ -338,7 +338,8 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'left', width: '29%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '单位', dataIndex: 'productUnit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '价格级别', dataIndex: 'priceLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单价', scopedSlots: { customRender: 'returnPrice' }, width: '10%', align: 'right' },
         { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }

+ 16 - 3
src/views/dealerManagement/merchantInfoManagement/chooseTypeList.vue

@@ -3,12 +3,22 @@
     <div ref="tableSearch" class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
-          <a-col :md="9" :sm="24">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="品牌分类">
+              <v-select
+                code="BRAND_TYPE"
+                id="inventoryQueryList-productBrandType"
+                v-model="queryParam.productBrandType"
+                allowClear
+                placeholder="请选择价格级别"></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
             <a-form-item label="产品品牌">
               <ProductBrand id="inventoryQueryList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
             </a-form-item>
           </a-col>
-          <a-col :md="9" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-model-item label="产品分类">
               <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
             </a-form-model-item>
@@ -48,10 +58,11 @@ import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
 import { Empty } from 'ant-design-vue'
 import { queryWaitingData } from '@/api/dealerScope'
+import { VSelect } from '@/components'
 export default {
   name: 'DetailProductList',
   mixins: [commonMixin],
-  components: { ProductType, ProductBrand },
+  components: { ProductType, ProductBrand, VSelect },
   props: {
     maxHeight: {
       type: [String, Number],
@@ -68,6 +79,7 @@ export default {
       chooseDataList: [],
       selectedRowKeys: [],
       queryParam: {
+        productBrandType: undefined,
         productBrandSn: undefined,
         productTypeSn1: undefined, //  产品一级分类
         productTypeSn2: undefined, //  产品二级分类
@@ -141,6 +153,7 @@ export default {
     },
     resetSearchForm () {
       this.queryParam = {
+        productBrandType: undefined,
         productBrandSn: undefined,
         productTypeSn1: undefined, //  产品一级分类
         productTypeSn2: undefined, //  产品二级分类

+ 9 - 6
src/views/dealerManagement/merchantInfoManagement/chooseTypeModal.vue

@@ -26,11 +26,11 @@
             allowClear
             placeholder="请选择价格级别"></v-select>
         </a-form-model-item>
-        <a-form-model-item label="添加品类" prop="productScopeList">
-          <div class="typeListBox">
-            <chooseTypeList ref="chooseTypeInfo" :maxHeight="500"></chooseTypeList>
-          </div>
-        </a-form-model-item>
+        <a-form-model-item label="添加品类" prop="productScopeList"></a-form-model-item>
+        <div class="typeListBox">
+          <chooseTypeList ref="chooseTypeInfo" :maxHeight="500"></chooseTypeList>
+        </div>
+
       </a-form-model>
       <div class="btn-cont">
         <a-button id="chooseType-modal-back" @click="isShow = false" >取消</a-button>
@@ -58,7 +58,7 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       spinning: false,
       formItemLayout: {
-        labelCol: { span: 4 },
+        labelCol: { span: 2 },
         wrapperCol: { span: 18 }
       },
       form: {
@@ -136,4 +136,7 @@ export default {
       margin: 35px 0 10px;
     }
   }
+  .has-error .ant-form-explain, .has-error .ant-form-split{
+    margin-top:9px;
+  }
 </style>