فهرست منبع

前端孟祥旭

mxx 4 سال پیش
والد
کامیت
08a9f6ce0d
4فایلهای تغییر یافته به همراه50 افزوده شده و 38 حذف شده
  1. 6 0
      src/lang/zh.js
  2. 16 0
      src/views/tranManagement/component/routers/route.js
  3. 27 37
      src/views/warehouse/warehouseManagementPerfectput.vue
  4. 1 1
      vue.config.js

+ 6 - 0
src/lang/zh.js

@@ -506,6 +506,7 @@
     tranManagementDriver:'司机管理',
     tranManagementDriver:'司机管理',
     tranManagementDriverAdd:'添加司机',
     tranManagementDriverAdd:'添加司机',
     warehouseManagementPerfectDelivery:'编辑',
     warehouseManagementPerfectDelivery:'编辑',
+    tranManagementTransport:'运输任务',
 
 
     // 采购模块
     // 采购模块
     procurement: '采购管理',
     procurement: '采购管理',
@@ -4706,6 +4707,11 @@
   tranManagement:{
   tranManagement:{
     tranManagementDriver:'司机管理',
     tranManagementDriver:'司机管理',
     tranManagementDriverAdd:'添加司机',
     tranManagementDriverAdd:'添加司机',
+   
+    
+  },
+  tranManagementTransport:{
+    tranManagementTransport:'运输任务',
   },
   },
   // 年度培训
   // 年度培训
   annualTraining: {
   annualTraining: {

+ 16 - 0
src/views/tranManagement/component/routers/route.js

@@ -26,6 +26,20 @@ const tranManagementRouter = {
         keepAlive: true
         keepAlive: true
       }
       }
     },
     },
+    //运输任务
+    {
+      path: 'tranManagementTransport',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
+      name: 'tranManagementTransport',
+      meta: {
+        title: 'tranManagementTransport',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+        permissicon: [],
+        keepAlive: true
+      },
+    },
     //添加司机
     //添加司机
     {
     {
       path: 'tranManagementDriverAdd',
       path: 'tranManagementDriverAdd',
@@ -42,6 +56,8 @@ const tranManagementRouter = {
       hidden: true
       hidden: true
     },
     },
     
     
+    
+    
   ],
   ],
 
 
 };
 };

+ 27 - 37
src/views/warehouse/warehouseManagementPerfectput.vue

@@ -338,7 +338,6 @@ export default {
         warehouseInOutDetail: {},
         warehouseInOutDetail: {},
       },
       },
       historyList: [],
       historyList: [],
-
       pickerBeginDateBefore: {
       pickerBeginDateBefore: {
         disabledDate: (time) => {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
           return time.getTime() > Date.now()
@@ -389,7 +388,6 @@ export default {
                 .toPromise()
                 .toPromise()
                 .then((response) => {
                 .then((response) => {
                   this.$message.success('暂存成功')
                   this.$message.success('暂存成功')
-                  this.deptBudgetList=response
                   this.$router.push({ path: 'warehouseManagementList' })
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
                 })
             } else {
             } else {
@@ -404,43 +402,35 @@ export default {
     },
     },
     //提交按钮
     //提交按钮
     submit() {
     submit() {
-      if (
-        this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
-        deptBudgetList.warehouseInOutDetail.qualityInspector > 10
-      ) {
-        this.$message({
-          message: '质检员姓名长度错误!',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.deptBudgetList.warehouseInOutDetail.qualityInspector.length < 2 ||
-        deptBudgetList.warehouseInOutDetail.qualityInspector > 10
-      ) {
-        this.$message({
-          message: '质检员姓名长度错误!',
-          type: 'warning',
+      console.log(123456)
+      this.$confirm(`确定提交入库信息`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              this.deptBudgetList.compId = sessionStorage.getItem(
+                'ws-pf_compId'
+              )
+              this.deptBudgetList.inOutFlag = 1
+              this.deptBudgetList.statusFlag = 3
+              addstorageputList(this.deptBudgetList)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('添加成功')
+                  this.$router.push({ path: 'warehouseManagementList' })
+                })
+            } else {
+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
         })
         })
-        return
-      }
-
-      this.$refs.deptBudgetList.validate((valid) => {
-        if (valid) {
-          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.inOutFlag = 1
-          this.deptBudgetList.statusFlag = 3
-          addstorageputList(this.deptBudgetList)
-            .toPromise()
-            .then((response) => {
-              this.$message.success('添加成功')
-              this.$router.push({ path: 'warehouseManagementList' })
-            })
-        } else {
-          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+        .catch(() => {
           return false
           return false
-        }
-      })
+        })
     },
     },
     //暂存按钮
     //暂存按钮
     returnWarehouse() {
     returnWarehouse() {

+ 1 - 1
vue.config.js

@@ -143,7 +143,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.121:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.124:8090/',
         // target: 'http://192.168.1.124:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://192.168.24.5:8098',//目标地址