Merge remote-tracking branch 'origin/template_pda_vue' into template_pda_vue

src/api/incomeWmsBox.js

@@ -103,3 +103,19 @@ export function checkIsZero(data) {
     }
   })
 }
+
+const manufacturer = [
+  {
+    value: '1',
+    label: 'baidu'
+  },
+  {
+    value: '2',
+    label: 'ali'
+  },
+  {
+    value: '3',
+    label: 'taobao'
+  }
+]
+export default manufacturer

src/views/setup/enterbound.vue

@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import {
+import manufacturer, {
   batchAddIncomeWmsBox, checkIsZero, getJcCode, queryPass
 } from '@/api/incomeWmsBox'
 import { findByLocation, updateIncomeWmsLabel } from '@/api/incomeWmsLabel'
@@ -126,19 +126,7 @@ export default {
       userList: {
         nickName: ''
       },
-      manufacturer: [{
-        value: '1',
-        label: 'baidu'
-
-      }, {
-        value: '2',
-        label: 'ali'
-
-      }, {
-        value: '3',
-        label: 'taobao'
-
-      }],
+      manufacturer: {},
       // 表单校验
       rules: {
         value1: [
@@ -152,10 +140,15 @@ export default {
     }
   },
   created() {
+    console.log('manufacturer', manufacturer)
+    this.manufacturer = manufacturer
     this.getDictData()
     this.focusing()
     this.getOrderCode()
     this.getLoginUser()
+    // this.queryForm.cj = this.manufacturer[0].value
+  },
+  mounted() {
     this.queryForm.cj = this.manufacturer[0].value
   },
   methods: {