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

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

lilei 2 месяцев назад
Родитель
Сommit
d3ae4db1fd

+ 1 - 1
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -76,7 +76,7 @@
               prop="productTypeSn2"
               :required="form.costTypeName=='促销费用'"
             >
-              <productTypeAll placeholder="请选择费用归属品类(单选,至少选到二级或三级)" showAllType @change="changeProductType" v-model="productType" id="allocateBill-basicInfo-productType"></productTypeAll>
+              <productTypeAll :isAll="true" placeholder="请选择费用归属品类(单选,至少选到二级或三级)" showAllType @change="changeProductType" v-model="productType" id="allocateBill-basicInfo-productType"></productTypeAll>
             </a-form-model-item>
           </a-col>
           <a-col :md="12" :sm="24">

+ 16 - 16
src/views/common/productTypeAll.js

@@ -21,7 +21,7 @@ const ProductType = {
         return []
       }
     },
-    placeholder:{
+    placeholder: {
       type: String,
       default: '请选择产品分类'
     },
@@ -35,7 +35,7 @@ const ProductType = {
     },
     isAll: {
       type: Boolean,
-      default: true
+      default: false
     },
     // 是否显示全分类
     showAllType: {
@@ -57,35 +57,35 @@ const ProductType = {
   mounted () {
     const a = this.$store.state.app.productTypeAllList
     // 如果有缓存
-    if(this.isAll && a){
+    if (this.isAll && a) {
       this.productTypeList = a || []
-    }else{
+    } else {
       this.getProductType()
     }
   },
   methods: {
-    filter(inputValue, path) {
+    filter (inputValue, path) {
       console.log(inputValue, path)
-      return path.some(option => option.productTypeName.indexOf(inputValue) > -1);
+      return path.some(option => option.productTypeName.indexOf(inputValue) > -1)
     },
-    setDefValue(defaultVal,row){
-      this.handleChange(defaultVal,row)
+    setDefValue (defaultVal, row) {
+      this.handleChange(defaultVal, row)
     },
-    handleChange (value,row) {
+    handleChange (value, row) {
       this.defaultVal = value
-      this.$emit('change', this.defaultVal, this.id,row)
+      this.$emit('change', this.defaultVal, this.id, row)
       this.$emit('input', this.defaultVal)
     },
-    showALLtype(){
+    showALLtype () {
       // 是否显示全分类
       const hasAll = this.productTypeList.some(item => item.productTypeSn == 'ALL')
-      if(this.showAllType&&!hasAll){
-        this.productTypeList.unshift({productTypeName:'全分类',productTypeSn:'ALL',children:[{productTypeName:'全分类',productTypeSn:'ALL'}]})
+      if (this.showAllType && !hasAll) {
+        this.productTypeList.unshift({ productTypeName: '全分类', productTypeSn: 'ALL', children: [{ productTypeName: '全分类', productTypeSn: 'ALL' }] })
       }
     },
     //  产品分类  列表
     getProductType () {
-      if(this.isAll){
+      if (this.isAll) {
         productTypeQueryAll({}).then(res => {
           if (res.status == 200) {
             if (res.data && res.data.length > 0) {
@@ -103,7 +103,7 @@ const ProductType = {
           // 是否显示全分类
           this.showALLtype()
         })
-      }else{
+      } else {
         productTypeQuery({}).then(res => {
           if (res.status == 200) {
             this.productTypeList = res.data
@@ -132,7 +132,7 @@ const ProductType = {
           }
         })
       }
-    },
+    }
   }
 }
 

+ 7 - 1
src/views/expenseManagement/expenseReimbursement/baseDataModal.vue

@@ -65,7 +65,13 @@
               prop="productTypeSn2"
               :required="form.expenseTypeName=='促销费用'"
             >
-              <productTypeAll placeholder="请选择费用归属品类(单选,至少选到二级或三级)" showAllType @change="changeProductType" v-model="productType" id="expenseReimbursementAddform-productType"></productTypeAll>
+              <productTypeAll
+                :isAll="true"
+                placeholder="请选择费用归属品类(单选,至少选到二级或三级)"
+                showAllType
+                @change="changeProductType"
+                v-model="productType"
+                id="expenseReimbursementAddform-productType"></productTypeAll>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">

+ 1 - 1
src/views/productManagement/foreignTradeGoods/importGuideModal.vue

@@ -51,7 +51,7 @@
           size="large"
           class="button-primary"
           @click="handlerNextStep"
-          style="padding: 0 60px;">下一步</a-button>
+          style="padding: 0 60px;">查询</a-button>
         <a-button
           id="importGuide-cancel"
           size="large"

+ 4 - 4
src/views/reportData/allocationOrderTotal/list.vue

@@ -26,7 +26,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称">
-                <dealerSubareaScopeList ref="custList" id="allocationOrderTotalList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
+                <dealerSubareaScopeList ref="custList" id="allocationOrderTotalList-dealerSn" :itemSn="queryParam.dealerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -178,7 +178,7 @@ export default {
         allocateCategory: undefined, //  调拨类型1
         allocateTypeSn: undefined, //  调拨类型2
         bizUserSn: undefined, // 客服
-        buyerSn: undefined, // 客户名称
+        dealerSn: undefined, // 客户名称
         dealerType: undefined// 客户类型
       },
       allocateTypeList: [], //  调拨类型
@@ -268,7 +268,7 @@ export default {
     },
     // 客户名称
     custChange (obj) {
-      this.queryParam.buyerSn = obj.key
+      this.queryParam.dealerSn = obj.key
     },
     //  调拨开单日期  change
     dateChange (date) {
@@ -330,7 +330,7 @@ export default {
       this.queryParam.allocateCategory = undefined
       this.queryParam.allocateTypeSn = undefined
       this.queryParam.bizUserSn = undefined
-      this.queryParam.buyerSn = undefined
+      this.queryParam.dealerSn = undefined
       this.queryParam.dealerType = undefined
       this.allocateTypeVal = []
       this.$refs.ruleForm.resetFields()