Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -422,7 +422,6 @@ export default {
   data() {
     let self = this
     return {
-      flag: 2,
       checkList: [],
       deptBudgetList: {
         taskNo: '',
@@ -694,6 +693,7 @@ export default {
         })
       xialaNo({
         compId: this.compId,
+        flag: 8,
       })
         .toPromise()
         .then((response) => {

src/views/warehouse/warehouseManagementPut.vue

@@ -535,7 +535,7 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.carNo > 7) {
+      if (this.deptBudgetList.carNo.length > 7) {
         this.$message({
           message: '车牌号输入错误,请输入7个字符之内',
           type: 'warning'

vue.config.js

@@ -141,8 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.122:8090/',
-        // target: 'http://192.168.1.122:9100/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',