Browse Source

Merge branch 'develop_yh6' of jianguan-web/jg-ocs-html into pre-release

李磊 2 năm trước cách đây
mục cha
commit
a0048df0a4
4 tập tin đã thay đổi với 10 bổ sung38 xóa
  1. 2 1
      src/store/getters.js
  2. 2 2
      src/store/modules/app.js
  3. 2 1
      src/views/Home.vue
  4. 4 34
      src/views/common/returnReason.js

+ 2 - 1
src/store/getters.js

@@ -17,7 +17,8 @@ const getters = {
   closeTabPages: state => state.app.closeTabPages,
   loadingStatus: state => state.app.loadingStatus,
   employeeList: state => state.app.employeeList,
-  tempBillOfData: state => state.app.tempBillOfData
+  tempBillOfData: state => state.app.tempBillOfData,
+  returnReason: state => state.app.returnReason
 }
 
 export default getters

+ 2 - 2
src/store/modules/app.js

@@ -34,7 +34,7 @@ const app = {
     loadingStatus: false,
     closeTabPages: [], // 已关闭的页面
     employeeList: [], // 申请人列表
-    returnReason: [], // 申请退货列表
+    returnReason: [], // 申请退货原因列表
     tempBillOfData: null, // 临时存储收货单数据
   },
   mutations: {
@@ -151,7 +151,7 @@ const app = {
         }
       })
     },
-    getLookUpData({ commit }, code, isEnable) {
+    getReturnReasonData({ commit }, code, isEnable) {
       getLookUpData({
         pageNo: 1,
         pageSize: 1000,

+ 2 - 1
src/views/Home.vue

@@ -55,7 +55,7 @@ export default {
   created () {
   },
   methods: {
-    ...mapActions(['GetEmployeeList', 'getLookUpData']),
+    ...mapActions(['GetEmployeeList', 'getReturnReasonData']),
     hasNewProduct () {
       this.GetEmployeeList()
       queryNewProductPage({ pageNo: 1, pageSize: 20, onlineFalg: this.onlineFalg }).then(res => {
@@ -98,6 +98,7 @@ export default {
       } else {
         vm.openResetPwd = true
       }
+      vm.getReturnReasonData('RETURN_REASON')
     })
   }
 }

+ 4 - 34
src/views/common/returnReason.js

@@ -17,8 +17,8 @@ const ReturnReason = {
             @select="open=false"
             :open="open"
           >
-            <a-select-option v-for="item in list" :key="item" :value="item">
-              {{item}}
+            <a-select-option v-for="item in list" :key="item.code" :value="item.dispName">
+              {{item.dispName}}
             </a-select-option>
           </a-select>
     `,
@@ -44,41 +44,11 @@ const ReturnReason = {
     return {
       defaultVal: this.value,
       open: false,
-      list: [
-        '漏油或者不上油',
-        '外观不良:脏污、破损、脱胶、变形等',
-        '尺寸问题',
-        '泄压',
-        '无法安装',
-        '无法或不便安装',
-        '抖动或跳动',
-        '噪音',
-        '刮雨不干净',
-        '胶条断裂、脱落',
-        '喇叭无声',
-        '声音嘶哑或者变音',
-        '浸水',
-        '伤盘',
-        '摩擦块掉渣,脱落或有残渣',
-        '制动不足,刹车不灵敏',
-        '不耐磨',
-        '冒烟',
-        '缺少感应线',
-        '尺寸不标准',
-        '不点火,间歇式失火',
-        '漏电',
-        '击穿',
-        '烧蚀',
-        '包装型号不符',
-        '整体不亮/部分能亮',
-        '灯珠脱落',
-        '漏电短路',
-        '包装型号不符/包装破损',
-        '召回'
-        ]
+      list: []
     };
   },
   mounted() {
+    this.list = this.$store.state.app.returnReason
   },
   watch: {
     value(newValue, oldValue) {