前端孟祥旭

src/lang/zh.js

@@ -513,6 +513,7 @@
     tranManagementVehicle:'汽运调度',
     tranManagementVehicleDispatching:'汽车调度',
     tranManagementVehicleLook:'查看派车详情',
+    tranManagementTransporTationFire:'火运调度',
 
     // 采购模块
     procurement: '采购管理',
@@ -4727,6 +4728,9 @@
     tranManagementVehicleDispatching:'汽车调度',
     tranManagementVehicleLook:'查看派车详情',
   },
+  tranManagementTransporTationFire:{
+    tranManagementTransporTationFire:'火运调度'
+  },
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

src/model/transport/index.js

@@ -14,4 +14,4 @@ export const addDriver = appRx.post(API_POST_TRAN_DRIVERINFOADD, errorCatcher, e
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
 //运输任务添加
-export const addtrantask = appRx.post(API_POST_TRAN_ADD,errorCatcher, errorHandle, filter) 
+export const addTranTask = appRx.post(API_POST_TRAN_ADD,errorCatcher, errorHandle, filter) 

src/views/tranManagement/component/routers/route.js

@@ -12,6 +12,36 @@ const tranManagementRouter = {
     icon: 'cg'
   },
   children: [
+    //运输任务
+    {
+      path: 'tranManagementTransport',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
+      name: 'tranManagementTransport',
+      meta: {
+        title: 'tranManagementTransport',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+        permissicon: [],
+        keepAlive: true
+      },
+      // hidden: true
+    },
+    //火运调度
+    {
+      path: 'tranManagementTransporTationFire',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTationFire'),
+      name: 'tranManagementTransporTationFire',
+      meta: {
+        title: 'tranManagementTransporTationFire',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementTransporTationFire',
+        permissicon: [],
+        keepAlive: true
+      },
+      
+    },
     //汽运调度
     {
       path: 'tranManagementVehicle',
@@ -27,19 +57,49 @@ const tranManagementRouter = {
       },
       
     },
-     //司机管理
+     //司机查看
      {
-      path: 'tranManagementDriver',
+      path: 'tranManagementDriverLook',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriver'),
-      name: 'tranManagementDriver',
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverLook'),
+      name: 'tranManagementDriverLook',
       meta: {
-        title: 'tranManagementDriver',
+        title: 'tranManagementDriverLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver',
+        module: 'tranManagement.tranManagementDriver.tranManagementDriverLook',
         permissicon: [],
         keepAlive: true
-      }
+      },
+      hidden: true
+    }, //司机添加
+    {
+      path: 'tranManagementDriverAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverAdd'),
+      name: 'tranManagementDriverAdd',
+      meta: {
+        title: 'tranManagementDriverAdd',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+     //司机添加
+    {
+      path: 'tranManagementDriverAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverAdd'),
+      name: 'tranManagementDriverAdd',
+      meta: {
+        title: 'tranManagementDriverAdd',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
     },
     //汽车调度
     {
@@ -71,20 +131,34 @@ const tranManagementRouter = {
       },
       hidden: true
     },
-    //运输任务
+    //添加运输
     {
-      path: 'tranManagementTransport',
+      path: 'tranManagementTransportAdd',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
-      name: 'tranManagementTransport',
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransportAdd'),
+      name: 'tranManagementTransportAdd',
       meta: {
-        title: 'tranManagementTransport',
+        title: 'tranManagementTransportAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+        module: 'tranManagement.tranManagementTransportAdd',
         permissicon: [],
         keepAlive: true
       },
-      // hidden: true
+      hidden: true
+    },
+    //司机管理
+    {
+      path: 'tranManagementDriver',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriver'),
+      name: 'tranManagementDriver',
+      meta: {
+        title: 'tranManagementDriver',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver',
+        permissicon: [],
+        keepAlive: true
+      }
     },
     
   ],

src/views/tranManagement/tranManagementTransport.vue

@@ -17,7 +17,7 @@
         <ws-button
         class="but"
           type="primary"
-          @click="handleAdd()"
+          @click="handle()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
@@ -325,6 +325,10 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    //添加
+    add(){
+      this.$router.push({ path :'tranManagementTransportAdd'})
+    },
     //查找
       lookUp(){
         this.currentPage= 1

src/views/tranManagement/tranManagementTransportAdd.vue

@@ -32,7 +32,6 @@
         v-for="(item, index) in freightspace"
       >
         <div class="flex">
-          <!-- <div class="driver">货车信息-{{ index + 1 }}</div> -->
           <ws-info-table class="el-table">
             <!--任务编号-->
             <ws-form-item
@@ -43,7 +42,7 @@
               width="400px"
             >
               <ws-input
-                v-model="item.taskNo"
+                v-model="deptBudgetList.taskNo"
                 placeholder="请输入任务编号"
                 maxlength="20"
                 size="small"
@@ -52,7 +51,7 @@
             <!-- 任务类型 -->
           <ws-form-item prop="taskType" label="任务类型" span="1">
             <ws-select
-              v-model="taskType"
+              v-model="deptBudgetList.taskType"
               placeholder=""
               class="typeselect"
               @change="selectstorageType"
@@ -68,7 +67,7 @@
           <!-- 合同编号 -->
           <ws-form-item prop="contractNo" label="合同编号" span="1">
             <ws-select
-              v-model="contractNo"
+              v-model="deptBudgetList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
               @change="selectstorageType"
@@ -237,9 +236,9 @@
     </ws-form>
     <span class="zi">运输方式</span>
   <el-checkbox-group v-model="checkList" prop="tranType">
-    <el-checkbox label="汽运" prop="1"></el-checkbox>
-    <el-checkbox label="火运" prop="2"></el-checkbox>
-    <el-checkbox label="船运" prop="3"></el-checkbox>
+    <el-checkbox label="汽运" ></el-checkbox>
+    <el-checkbox label="火运"></el-checkbox>
+    <el-checkbox label="船运"></el-checkbox>
   </el-checkbox-group>
   
     <ws-form
@@ -389,8 +388,7 @@
 </template>
 <script>
 import { provinceAndCityData, CodeToText } from 'element-china-area-data'
-
-import {addtrantask} from '@/model/transport/index'
+import {addTranTask} from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -438,10 +436,10 @@ export default {
       unitList: [],
       freightspace: [
         {
-          carNumber: '',
-          carModel: '高栏',
-          carModelKey: '1',
-          carLength: '13',
+          waterContent:'',
+          taskType: '高栏',
+          goodsName: '1',
+          weight: '13',
           carLengthKey: '1',
           carLoad: '',
           yearManufacture: '',
@@ -468,8 +466,15 @@ export default {
   },
   computed: {},
   methods: {
-    addtrantask(){
-
+    getList(){
+      addtrantask({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+      })
+      .toPromise()
+      .then((response)=>{
+        this.deptBudgetList = response
+      })
+     
     },
     IdCard(UUserCard) {
       //获取年龄
@@ -574,17 +579,17 @@ export default {
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.residentCityProvincial =
-            CodeToText[this.selectedOptions[0]]
-          this.deptBudgetList.residentCityMunicipal =
-            CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.driverCarInfoList = this.freightspace
-          this.deptBudgetList.driverPayeeInfoList = this.freightspace1
-          addDriver(this.deptBudgetList)
+          // this.deptBudgetList.residentCityProvincial =
+          //   CodeToText[this.selectedOptions[0]]
+          // this.deptBudgetList.residentCityMunicipal =
+          //   CodeToText[this.selectedOptions[1]]
+          // this.deptBudgetList.driverCarInfoList = this.freightspace
+          // this.deptBudgetList.driverPayeeInfoList = this.freightspace1
+          addTranTask(this.deptBudgetList)
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementDriver' })
+              this.$router.push({ path: 'tranManagementTransport' })
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121: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://product-server.winsea.com/',