Kaynağa Gözat

Merge branch 'deploy' of jianguan-web/jg-ocs-html into master

陈瑞 4 yıl önce
ebeveyn
işleme
7cc502f32a

+ 8 - 1
src/components/UploadFile/index.vue

@@ -194,9 +194,16 @@ export default {
     beforeUpload (file, tip) {
       // 不限制
       if (this.fileType == '*') {
+        // 文件大小
+        const isLt2M = file.size / 1024 / 1024 < this.fileSize
+        if (!isLt2M) {
+          if (tip != 0) {
+            this.$message.error('上传文件不能超过 ' + this.fileSize + 'MB!')
+          }
+          return isLt2M
+        }
         return true
       }
-
       const isType = this.fileType.indexOf(file.type) >= 0 && file.type != ''
       if (!isType) {
         if (tip != 0) {

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

@@ -114,7 +114,7 @@ export default {
       this.fetching = true
       dealerSubareaScopeList({ nameLike: value, pageNo: 1, pageSize: 20 }).then(res => {
         if (res.status == 200) {
-          this.dealerData = res.data.list
+          this.dealerData = res.data && res.data.list ? res.data.list : []
           this.fetching = false
         } else {
           this.dealerData = []

+ 1 - 1
src/views/common/custList.vue

@@ -44,7 +44,7 @@ export default {
         if (fetchId !== this.lastFetchId) {
           return
         }
-        this.data = res.data.list || []
+        this.data = res.data && res.data.list ? res.data.list : []
         this.fetching = false
       })
     },

+ 1 - 1
src/views/common/promoList.vue

@@ -44,7 +44,7 @@ export default {
         if (fetchId !== this.lastFetchId) {
           return
         }
-        this.data = res.data.list || []
+        this.data = res.data && res.data.list ? res.data.list : []
         this.fetching = false
       })
     },

+ 1 - 1
src/views/dealerManagement/dealerRelationshipBinding/queryChild.vue

@@ -50,7 +50,7 @@ export default {
         if (fetchId !== this.lastFetchId) {
           return
         }
-        this.data = res.data.list || []
+        this.data = res.data && res.data.list ? res.data.list : []
         this.fetching = false
       })
     },

+ 1 - 1
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -49,7 +49,7 @@ export default {
         if (fetchId !== this.lastFetchId) {
           return
         }
-        this.data = res.data.list || []
+        this.data = res.data && res.data.list ? res.data.list : []
         this.fetching = false
       })
     },

+ 1 - 1
src/views/productManagement/productInfo/edit.vue

@@ -106,7 +106,7 @@
                   </a-col>
                   <a-col :span="10">
                     <v-select
-                      code="PRODUCT_UNIT"
+                      code="PRODUCT_PACK_UNIT"
                       id="productLevelEdit-packQtyUnit"
                       v-model="form.packQtyUnit"
                       allowClear

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -158,7 +158,7 @@ export default {
       }
       supplierProductList(params).then(res => {
         if (res.status == 200) {
-          this.productData = res.data.list
+          this.productData = res.data && res.data.list ? res.data.list : []
           this.fetching = false
         } else {
           this.productData = []

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

@@ -81,11 +81,12 @@ export default {
     },
     // 获取该销售单产品二级分类
     getTypeData () {
+      this.typeList = [{ productTypeSn2: 'all', productTypeName2: '全部' }]
       dispatchDetailType({ dispatchBillSn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
-          this.typeList = res.data
-        } else {
-          this.typeList = []
+          if (res.data && res.data.length > 0) {
+            this.typeList = [...this.typeList, ...res.data]
+          }
         }
       })
     }

+ 3 - 3
src/views/salesManagement/salesQuery/queryPart.vue

@@ -22,7 +22,7 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
-                <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.brandSn"></ProductBrand>
+                <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -114,7 +114,7 @@ export default {
         productCode: '', //  产品编码
         productName: '', //  产品名称
         productOrigCode: '', //  原厂编码
-        brandSn: undefined, //  产品品牌
+        productBrandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '' //  产品三级分类
@@ -174,7 +174,7 @@ export default {
       this.queryParam.productCode = ''
       this.queryParam.productName = ''
       this.queryParam.productOrigCode = ''
-      this.queryParam.brandSn = undefined
+      this.queryParam.productBrandSn = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''

+ 1 - 1
src/views/salesManagement/salesReturn/chooseCustomModal.vue

@@ -120,7 +120,7 @@ export default {
       this.fetching = true
       dealerSubareaScopeList({ nameLike: value, pageNo: 1, pageSize: 20 }).then(res => {
         if (res.status == 200) {
-          this.dealerData = res.data.list
+          this.dealerData = res.data && res.data.list ? res.data.list : []
           this.fetching = false
         } else {
           this.dealerData = []