Browse Source

前端sdy

zhongtianhaoyuan 4 years ago
parent
commit
ab22df69fb

+ 0 - 12
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -538,18 +538,6 @@ export default {
         .then((response) => {
           this.contractNoList = response
         })
-      // // 车型
-      // packList({ constId: 'TRAN1' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.carModelList = response
-      //   })
-      // // 车长
-      // packList({ constId: 'TRAN2' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.carLengthList = response
-      //   })
     },
     confirmPositioncity() {
       this.listDate.level = 'city'

+ 2 - 2
src/views/taskManagement/tranManagementTransportEdit.vue

@@ -142,7 +142,6 @@
         >
           <el-select
             v-model="deptBudgetList.receiveWarehouse"
-            :disabled="warehouse"
             placeholder="请输入收货库点"
             class="typeselect"
             style="width: 100%"
@@ -392,6 +391,7 @@ export default {
       radio: '1',
       carModelList: [],
       carLengthList: [],
+      warehouseType: '1',
       options_: regionData,
       heightData: '600px',
       selectedOptions: [],
@@ -496,7 +496,7 @@ export default {
         })
       getwarehousename({
         compId: this.compId,
-        warehouseType: this.deptBudgetList.warehouseType,
+        warehouseType: this.warehouseType,
       })
         .toPromise()
         .then((response) => {

+ 1 - 27
src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -237,29 +237,6 @@ export default {
     },
   },
   methods: {
-    // dataFilter(val) {
-    //   this.deptBudgetList.personCharge = val
-    //   if (val) {
-    //     this.options = this.staffList.filter((item) => {
-    //       if (
-    //         !!~item.staffName.indexOf(val) ||
-    //         !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-    //       ) {
-    //         return true
-    //       }
-    //     })
-    //   } else {
-    //     this.options = this.staffList
-    //   }
-    // },
-    // selectstaff(e) {
-    //   for (var i = 0; i < this.staffList.length; i++) {
-    //     if (this.staffList[i].staffName == e) {
-    //       this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-    //       this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-    //     }
-    //   }
-    // },
     marker: function (item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
@@ -302,10 +279,8 @@ export default {
         .then((response) => {
           this.deptBudgetList = response
           this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          if (this.deptBudgetList.tranCarInfoList.length > 0) {
-            
+          if (this.deptBudgetList.tranCarInfoList.length > 0) {      
             if (response.tranCarInfoList[0].boxNo) {
-              // alert("数组拆分")
               this.list = response.tranCarInfoList[0].boxNo.split(',')
               for (var i = 0; i < this.list.length; i++) {
                 var num = this.list[i]
@@ -313,7 +288,6 @@ export default {
                   trainNo: num,
                 })
               }
-              console.log(this.freightspace,"拆分车厢号数组")
             }
           }
         })

+ 3 - 3
src/views/tranManagement/tranManagementVehicle.vue

@@ -3,11 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" :type="status==1?'primary':''" @click="changestatus(1)">
+        <ws-button class="but" :type="searchType == 1?'primary':''" @click="changestatus(1)">
           执行中</ws-button
         >
-        <ws-button class="but" :type="status1==1?'primary':''" @click="changestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="status2==1?'primary':''" @click="changestatus()">全部任务</ws-button>
+        <ws-button class="but" :type="searchType == 2?'primary':''" @click="changestatus(2)">已完成</ws-button>
+        <ws-button class="but" :type="searchType == undefined?'primary':''" @click="changestatus()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">

+ 1 - 1
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.119:8090/',
+        target: 'http://192.168.1.116:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',