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

src/api/V2/taskspost/index.js

@@ -39,4 +39,6 @@ export const API_GET_OUT_MOVELOOK = '/inOutWarehouseTask/getInOutWarehouseTaskRe
 //运输任务状态修改
 export const API_POST_OUT_STATES = '/tranTaskInfo/api/editStatus'
 //移库任务状态修改
-export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'
+export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'
+// 删除运输阶段
+export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess'

src/model/tasksport/index.js

@@ -21,7 +21,8 @@ import {
     API_POST_INOUTWAREHOUSETASK,
     API_GET_OUT_MOVELOOK,
     API_POST_OUT_STATES,
-    API_POST_OUT_MOVESTATES
+    API_POST_OUT_MOVESTATES,
+    API_POST_DEL_HAULAGE_STAGE
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -62,4 +63,6 @@ export const moveLook = appRx.get(API_GET_OUT_MOVELOOK, errorCatcher, errorHandl
 //运输任务状态修改
 export const states = appRx.post(API_POST_OUT_STATES, errorCatcher, errorHandle, filter)
 //移库任务状态修改
-export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, errorHandle, filter)
+export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, errorHandle, filter)
+//删除运输阶段
+export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)

src/views/contractManagement/purchaseContract.vue

@@ -709,7 +709,7 @@ export default {
   z-index: 2005;
 }
 .vertical-line {
-  height: 100px;
+  height: 64px;
   border-left: 2px solid #e9ecf7;
   margin-left: 4px;
   padding: 0 3px;

src/views/home/index.vue

@@ -7,182 +7,6 @@
         <!-- 任务、消息、提醒、超期 -->
         <Panel :data-list="panelList"
                @click="gotoNewRw"></Panel>
-        <div style="display:flex;justify-content: space-between;">
-          <!-- 新闻 -->
-          <div :class="vesselBankFlag === 'V' ? 'news-list v-width' : 'news-list'"
-               ref="newsList">
-            <div class="list-title">
-              <div class="list-title-name">{{ $t('home.news') }}</div>
-              <div class="list-title-more"
-                   @click="goNews">
-                {{ $t('home.more') }}
-              </div>
-            </div>
-            <div class="new-list-box"
-                 style="height: calc(100% - 44px); overflow: hidden; position: relative;">
-              <img v-show="newList.length === 0"
-                   class="noMore"
-                   src="@/assets/newhome/nomore.png" />
-              <div v-show="newList.length > 0"
-                   class="new-list-body"
-                   v-for="(item, index) in newList"
-                   :key="index"
-                   @click="goNewsDetail(item.id)">
-                <div class="new-list-img">
-                  <div class="newsTJ"
-                       v-show="item.systemFlag && item.systemFlag * 1 == 1">
-                    <img src="@/assets/newhome/recommend.png" />
-                  </div>
-                  <img v-lazy="$store.getters.baseInfo.fileUrl + item.coverUrl" />
-                </div>
-                <div style="padding:0 15px;width:80%">
-                  <div class="new-list-title">
-                    <span>{{ item.title }}</span>
-                  </div>
-                  <div class="new-list-content">
-                    <span>{{ item.newContent }}</span>
-                  </div>
-                  <div class="new-list-date">
-                    <span>{{ item.issueDate.substr(0, 16) }}</span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <!-- end 新闻 -->
-          <!-- 通知通函 -->
-          <div ref="noticeList"
-               :class="
-              vesselBankFlag === 'V' ? 'notice-list v-width' : 'notice-list'
-            ">
-            <div class="list-title">
-              <div class="list-title-name">{{ $t('home.notification') }}</div>
-              <div class="list-title-more"
-                   @click="goNoticeMore('0')">
-                {{ $t('home.more') }}
-              </div>
-            </div>
-            <div style="padding: 10px;overflow: hidden;height: calc(100% - 44px); position: relative;">
-              <img v-show="noticeList.length === 0"
-                   class="noMore"
-                   src="@/assets/newhome/nomore.png" />
-              <div v-show="noticeList.length > 0"
-                   class="home-tzthList"
-                   v-for="(item, index) in noticeList"
-                   :key="index"
-                   @click="goNotice(item)">
-                <div style="width:90%">
-                  <div class="home-tzthList-type">
-                    <div class="home-tzthList-type-title"><span>{{ item.circularTypeName + $t('common.colon') }}</span></div>
-                    <div class="home-tzthList-type-theme"><span>{{ item.theme }}</span></div>
-                  </div>
-                  <div class="home-tzthList-people">
-                    <div class="home-tzthList-Personnel"
-                         style="display:flex">
-                      <span>{{
-                        $t('home.sendPersonnel') +
-                          $t('common.colon')
-                      }}</span>
-                      <span>
-                        {{$ph( item.sender) }}
-                      </span>
-                    </div>
-                    <div class="home-tzthList-timer">
-                      <span>{{ item.dateOfIssue }}</span>
-                    </div>
-                  </div>
-                </div>
-                <div class="home-tzthList-timer-left"
-                     @click.stop="downloadNotification(item)"
-                     v-if="item.attachmentPath">
-                  <img src="../../assets/images/page/home/down.png">
-                </div>
-              </div>
-            </div>
-          </div>
-          <!-- end 通知通函 -->
-        </div>
-        <!-- 船舶动态 -->
-        <div class="ship-list"
-             style="margin-top: 10px;"
-             v-if="isShowShipList">
-          <div class="list-title">
-            <div class="list-title-name">
-              {{ $t('home.dynamicTrajectory') }}
-            </div>
-            <div class="list-title-more">
-              <div @click="toMap"
-                   style="color: #666666;margin-right: 20px">
-                <img src="@/assets/images/page/home/travel.png" />
-                <span>{{ $t('home.dynamicTrajectory') }}</span>
-              </div>
-              <ws-dropdown>
-                <span class="el-dropdown-link">
-                  <img class="shortcut-entrance-right"
-                       src="@/assets/images/page/home/set.png" />
-                </span>
-                <ws-dropdown-menu slot="dropdown">
-                  <ws-dropdown-item>
-                    <div @click="toHide(1)">{{ $t('home.hide') }}</div>
-                  </ws-dropdown-item>
-                </ws-dropdown-menu>
-              </ws-dropdown>
-            </div>
-          </div>
-          <div style="padding: 0 20px;height:105px;min-width:1000px;position: relative;">
-            <img v-show="shipList.length === 0"
-                 class="noMore"
-                 src="@/assets/newhome/nomore.png" />
-            <vue-seamless-scroll v-show="shipList.length > 0"
-                                 :data="shipList"
-                                 :class-option="optionSingleHeightTime"
-                                 class="seamless-warp">
-              <div style="display:flex">
-                <div class="ship-list-body"
-                     v-for="(item, index) in shipList"
-                     :key="index">
-                  <div class="shipList-box">
-                    <img class="shipList-icon"
-                         src="@/assets/images/page/home/circle.png" />
-                    <div style="display:flex">
-                      <div class="shipList-name">{{ item.vesselName }}</div>
-                      <div :class="getNaviStatusBg(item.navistatus)"
-                           class="ship-list-status bg0">
-                        {{ getNaviStatusStr(item.navistatus) || '-' }}
-                      </div>
-                    </div>
-                    <div class="shipList-address">
-                      {{
-                      (getLanguage == 'en' ? 'destination：' : '目的地：') +
-                        (item.dest_std ? item.dest_std : '-')
-                    }}
-                    </div>
-                    <div class="shipList-time">
-                      {{
-                      (getLanguage == 'en'
-                        ? 'Prearrival time：'
-                        : '预到时间：') + (item.eta_std ? item.eta_std : '-')
-                    }}
-                    </div>
-                    <div style="clear:both"></div>
-                  </div>
-                </div>
-              </div>
-            </vue-seamless-scroll>
-          </div>
-        </div>
-        <!-- end 船舶动态 -->
-        <div class="chart"
-             v-if="showEchart">
-          <!-- 维修保养 -->
-          <maintenance></maintenance>
-          <!-- 船舶证书 -->
-          <shipCertificate></shipCertificate>
-          <!-- 备件物料管理 -->
-          <sparePartsMaterial></sparePartsMaterial>
-          <!-- 采购管理 -->
-          <procurement></procurement>
-        </div>
       </div>
     </div>
     <div id="mapXY"></div>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -921,7 +921,13 @@ export default {
             this.dataList = response[0]
             this.dataList1 = response[1]
           } else {
-            this.dataList = response[0]
+            console.log(response[0].taskTypeKey)
+            if(response[0].taskTypeKey==2){
+              
+              this.dataList1 = response[0]
+            }else{
+              this.dataList = response[0]
+            }
           }
         })
     },

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -40,13 +40,19 @@
           <span style="margin-left: 14px"
             >出货库：{{ shipment1.sendWarehouse }}</span
           >
-          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{ shipment1.taskStatus }}</span>
-           <span class="status2" v-show="shipment1.taskStatus == '执行中'">{{ shipment1.taskStatus }}</span>
-          <span class="status1" v-show="shipment1.taskStatus == '已完成'">{{ shipment1.taskStatus }}</span>
+          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{
+            shipment1.taskStatus
+          }}</span>
+          <span class="status2" v-show="shipment1.taskStatus == '执行中'">{{
+            shipment1.taskStatus
+          }}</span>
+          <span class="status1" v-show="shipment1.taskStatus == '已完成'">{{
+            shipment1.taskStatus
+          }}</span>
         </div>
         <!--出库经办人-->
         <ws-form-item label="出库经办人：" span="1" prop="agent">
-          {{shipment1.agent}}
+          {{ shipment1.agent }}
         </ws-form-item>
         <el-divider direction="vertical" class="line"></el-divider>
         <!--出库重量（吨）-->
@@ -71,9 +77,15 @@
           <span style="margin-left: 14px">
             入货库：{{ enter.warehouseName }}</span
           >
-          <span class="status" v-show="enter.taskStatus == '待审核'">{{ enter.taskStatus }}</span>
-            <span class="status2" v-show="enter.taskStatus == '执行中'">{{ enter.taskStatus }}</span>
-          <span class="status1" v-show="enter.taskStatus  == '已完成'">{{ enter.taskStatus  }}</span>
+          <span class="status" v-show="enter.taskStatus == '待审核'">{{
+            enter.taskStatus
+          }}</span>
+          <span class="status2" v-show="enter.taskStatus == '执行中'">{{
+            enter.taskStatus
+          }}</span>
+          <span class="status1" v-show="enter.taskStatus == '已完成'">{{
+            enter.taskStatus
+          }}</span>
         </div>
         <!--入库经办人-->
         <ws-form-item label="入库经办人：" span="1" prop="agent">
@@ -156,28 +168,32 @@
       />
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
       <ws-info-table class="flow">
-        <el-table :data="weights"  border style="width: 100%">
+        <el-table :data="weights" border style="width: 100%">
           <el-table-column prop="weightOut" label="累计出库量（吨）">
           </el-table-column>
           <el-table-column prop="weightIn" label="累计入库量（吨）">
           </el-table-column>
-          <el-table-column prop="transportLoss" label="累计运输损耗（吨）"> 
+          <el-table-column prop="transportLoss" label="累计运输损耗（吨）">
             <template scope="scope">
-              {{scope.row.weightOut - scope.row.weightIn}}
+              {{ scope.row.weightOut - scope.row.weightIn }}
             </template>
           </el-table-column>
         </el-table>
       </ws-info-table>
       <ws-info-table class="flow1">
-        <el-table :data="enter.inOutWarehouseTaskList"  border style="width: 100%">
+        <el-table
+          :data="enter.inOutWarehouseTaskList"
+          border
+          style="width: 100%"
+        >
           <el-table-column prop="weight" label="累计退库量（吨）">
-             <template >
-             {{this.enter.stockReturnCount}}
-            </template> 
-             <template scope="scope">
-              {{scope.row.weight}}<span style="margin: 0 30px;color: #8890B1;">退至</span>{{scope.row.warehouseName}}
-              <div></div>
-            </template> 
+            <el-table-column :label="count">
+              <template scope="scope">
+                {{ scope.row.weight
+                }}<span style="margin: 0 30px; color: #8890b1">退至</span
+                >{{ scope.row.warehouseName }}
+              </template>
+            </el-table-column>
           </el-table-column>
         </el-table>
       </ws-info-table>
@@ -241,20 +257,20 @@ export default {
       name: '',
       moveLookData: [],
       shipment: {},
-      shipment1:{},
-      enter: {},
+      shipment1: {},
+      enter: {
+        inOutWarehouseTaskList:[],
+      },
       moveTaskNo: '',
-      weights:[
+      weights: [
         {},
-        // {weightIn: 0},
-        // { transportLoss: 0}
       ],
       weightOut: 0,
       weightIn: 0,
       transportLoss: 0,
 
       weightIn: 0,
-     
+
       retreat: 0,
       goodsName: '',
       grade: '',
@@ -263,6 +279,7 @@ export default {
       weight: 0,
       unitPrice: 0,
       businessDescribe: '',
+      count: '0',
     }
   },
 
@@ -279,7 +296,6 @@ export default {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
     },
-
     confirmPositioncity() {
       this.listDate.level = 'city'
       this.listDate.country = this.name
@@ -310,16 +326,24 @@ export default {
             if (this.moveLookData[i].inOutType == '移库出库') {
               this.shipment = this.moveLookData[i]
               this.shipment1 = this.moveLookData[i]
-               this.weightOut = this.moveLookData[i].weight
-               this.$set(this.weights[0],'weightOut',this.moveLookData[i].weight)
-            } else  {
+              this.weightOut = this.moveLookData[i].weight
+              this.$set(
+                this.weights[0],
+                'weightOut',
+                this.moveLookData[i].weight
+              )
+            } else {
               // if (this.moveLookData[i].inOutType == '移库入库')
-               this.enter = this.shipment = this.moveLookData[i]
-                this.weightIn = this.moveLookData[i].weight
-                this.$set(this.weights[0],'weightIn',this.moveLookData[i].weight)
+              this.enter = this.shipment = this.moveLookData[i]
+              this.weightIn = this.moveLookData[i].weight
+              this.$set(
+                this.weights[0],
+                'weightIn',
+                this.moveLookData[i].weight
+              )
               this.businessDescribe = this.moveLookData[i].businessDescribe
             }
-           this.transportLoss = this.weightOut - this.weightIn
+            this.transportLoss = this.weightOut - this.weightIn
             this.goodsName = this.moveLookData[0].goodsName
             this.grade = this.moveLookData[0].grade
             this.bulkDensity = this.moveLookData[0].bulkDensity
@@ -327,7 +351,11 @@ export default {
             this.weight = this.moveLookData[0].weight
             this.unitPrice = this.moveLookData[0].unitPrice
           }
-          console.log(this.shipment1,"出库对象")
+          var num = 0
+          for (var i = 0; i < this.enter.inOutWarehouseTaskList.length; i++) {  
+            num += this.enter.inOutWarehouseTaskList[i].weight
+          }
+          this.count = ""+num
         })
     },
     selectChapterTwo(e) {
@@ -654,7 +682,7 @@ export default {
   // border-bottom: 0px;
   border-top: 0px;
 }
-.flow{
+.flow {
   height: 95px;
 }
 /deep/.flow .el-form-item {
@@ -689,28 +717,28 @@ export default {
   color: #000 !important;
   font-weight: 400;
 }
-/deep/.el-table td{
+/deep/.el-table td {
   text-align: center;
 }
-.status{
+.status {
   margin-left: 10px;
-  background: #E6EAF8;
+  background: #e6eaf8;
   padding: 2px 5px;
   border-radius: 3px;
-  color: #5473E8;
+  color: #5473e8;
 }
-.status1{
-   margin-left: 10px;
-background: #E5F1F7;
+.status1 {
+  margin-left: 10px;
+  background: #e5f1f7;
   padding: 2px 5px;
   border-radius: 3px;
-  color: #50CAD4;
+  color: #50cad4;
 }
-.status2{
-   margin-left: 10px;
-background: #E1E7FD;
+.status2 {
+  margin-left: 10px;
+  background: #e1e7fd;
   padding: 2px 5px;
   border-radius: 3px;
-  color: #5473E8;
+  color: #5473e8;
 }
 </style>

src/views/taskManagement/tranManagementTransport.vue

@@ -189,6 +189,9 @@
 import { gain, deltran,states } from '@/model/tasksport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
+import {
+  billoperatehis
+} from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -264,6 +267,14 @@ export default {
       this.currentPage = 1
       this.getList()
     },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
     deleteclick(row) {
       //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(`运输任务删除后不可恢复，是否确定删除？`, {
@@ -272,7 +283,6 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          console.log(row)
           deltran({
             id: row.id
           })
@@ -298,7 +308,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          console.log(response)
           this.gainList = response
           this.currentPage = response.current
           this.pageSize = response.size
@@ -477,11 +486,6 @@ export default {
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
-
-    find() {
-      this.currentPage = 1
-      this.getList()
-    },
   }
 }
 </script>
@@ -490,10 +494,6 @@ export default {
   width: 62px;
   text-align: right;
 }
-// .el-button--primary {
-//   background-color: #5878e8;
-//   border-color: #5878e8;
-// }
 .el-pagination{
   padding-top: 20px;
   text-align: center;
@@ -616,4 +616,34 @@ text-align: center;
 /deep/.typeselect .el-input__inner{
    color: #8890B1;
 }
+// 操作历史
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.vertical-circle {
+  width: 10px;
+  height: 10px;
+  border: 2px solid #5878e8;
+  background-color: #ffffff;
+  -webkit-border-radius: 100px;
+}
+.vertical-circle:first-child {
+  color: red;
+}
+.vertical-text {
+  margin: 0 10px;
+  color: #8890b1;
+  font-size: 12px;
+  margin-top: -4px;
+}
+.vertical-line {
+  height: 64px;
+  border-left: 2px solid #e9ecf7;
+  margin-left: 4px;
+  padding: 0 3px;
+  // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+  // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+  // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+}
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -118,7 +118,7 @@
           label="始发地详细地址"
           span="1"
           prop="startDetailedAddress"
-         
+         style="width:31.333%"
         >
           <el-input
             v-model="deptBudgetList.startDetailedAddress"
@@ -425,13 +425,6 @@ export default {
     this.showType = this.isShow
   },
   computed: {
-    // weight:function(){
-    //     var maxStorage = 0
-    //     for(var i =0 ; i<this.deptBudgetList.tranProcessInfoList.length;i++){
-    //       maxStorage += Number(this.deptBudgetList.tranProcessInfoList[i].weight)
-    //     }
-    //     return maxStorage
-    //   },
     warehouse: function() {
       if (
         this.deptBudgetList.taskType == '销售出库' ||
@@ -454,8 +447,8 @@ export default {
           tmp[2]=TextToCode[this.warehouseList[i].warehousePrivate][this.warehouseList[i].warehouseCity][this.warehouseList[i].warehouseArea].code
           this.selectedOptions=tmp
           this.deptBudgetList.tranProcessInfoList[0].selectedOptions=tmp
-          this.deptBudgetList.startDetailedAddress=this.warehouseList[i].detailedAddress
-          this.deptBudgetList.tranProcessInfoList[0].sendDetailedAddress = this.warehouseList[i].detailedAddress
+          this.$set(this.deptBudgetList,'startDetailedAddress',this.warehouseList[i].detailedAddress)
+          this.$set(this.deptBudgetList.tranProcessInfoList[0],'sendDetailedAddress',this.deptBudgetList.startDetailedAddress)
         }
       }
     },
@@ -467,7 +460,7 @@ export default {
           tmp[1]=TextToCode[this.warehouseList1[i].warehousePrivate][this.warehouseList1[i].warehouseCity].code
           tmp[2]=TextToCode[this.warehouseList1[i].warehousePrivate][this.warehouseList1[i].warehouseCity][this.warehouseList1[i].warehouseArea].code
           this.selectedOptions1=tmp
-          this.deptBudgetList.endDetailedAddress=this.warehouseList1[i].detailedAddress
+          this.$set(this.deptBudgetList,'endDetailedAddress',this.warehouseList1[i].detailedAddress)
         }
       }
     },

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -214,7 +214,7 @@
             width="22"
             height="22"
             class="del"
-            @click="del(index)"
+            @click="del(index,item)"
             src="../../../public/img/del.png"
             alt=""
           />
@@ -378,6 +378,7 @@ import {
   getwarehousename,
   xialaNo,
   examinetran,
+  delhaulagestage
 } from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -458,10 +459,12 @@ export default {
             ][this.warehouseList[i].warehouseArea].code
           this.selectedOptions = tmp
           this.deptBudgetList.tranProcessInfoList[0].selectedOptions = tmp
-          this.deptBudgetList.startDetailedAddress =
-            this.warehouseList[i].detailedAddress
-          this.deptBudgetList.tranProcessInfoList[0].sendDetailedAddress =
-            this.warehouseList[i].detailedAddress
+          // this.deptBudgetList.startDetailedAddress =
+          //   this.warehouseList[i].detailedAddress
+          // this.deptBudgetList.tranProcessInfoList[0].sendDetailedAddress =
+          //   this.warehouseList[i].detailedAddress
+           this.$set(this.deptBudgetList,'startDetailedAddress',this.warehouseList[i].detailedAddress)
+          this.$set(this.deptBudgetList.tranProcessInfoList[0],'sendDetailedAddress',this.deptBudgetList.startDetailedAddress)
         }
       }
     },
@@ -659,10 +662,29 @@ export default {
       })
       this.number++
     },
-    del(index) {
-      if (this.deptBudgetList.tranProcessInfoList.length > 1) {
-        this.deptBudgetList.tranProcessInfoList.splice(index, 1)
+    del(index,row) {
+      console.log(row)
+      if(row.id){
+        this.$confirm('任务阶段删除后不可恢复，是否确定删除？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+        delhaulagestage({id:row.id}).toPromise()
+            .then((response) => {
+              this.$message.success('删除成功')
+              if (this.deptBudgetList.tranProcessInfoList.length > 1) {
+                this.deptBudgetList.tranProcessInfoList.splice(index, 1)
+              }
+            })
+        })
+      }else{
+        if (this.deptBudgetList.tranProcessInfoList.length > 1) {
+          this.deptBudgetList.tranProcessInfoList.splice(index, 1)
+        }
       }
+      
     },
     handleChange(value) {
       this.selectedOptions = value

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -265,7 +265,7 @@ export default {
       ) {
         text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
       } else {
-        text = `运输任务删除后不可恢复，是否确定删除？`
+        text = `任务删除后不可恢复，是否确定删除？`
       }
       //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(text, {

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -32,12 +32,13 @@
         <div class="nav">
         <span class="ziti">
           任务类型：
-          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+          <h1 v-if='dataList.inOutType' class="ziti1">{{dataList.inOutType}}</h1>
+          <h1 v-if='dataList1.inOutType' class="ziti1">{{dataList1.inOutType}}</h1>
         </span>
       </div>
       </div>
       <div class="ding"></div>
-       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
+       <div v-if="dataList.taskTypeKey == 1&dataList.taskTypeKey == 3||dataList1.taskTypeKey == 1&dataList.taskTypeKey1 == 3" class="center1">
           <img
             style="position: relative; top: 40px; left: 300px;" 
             width="19"
@@ -241,7 +242,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div v-show="dataList.taskTypeKey != 1" class="center1">
+      <div v-show="dataList.taskTypeKey != 1||dataList1.taskTypeKey != 1" class="center1">
         <img
             style="position: relative; top: 40px; left: 300px;" 
             width="19"
@@ -922,7 +923,7 @@ export default {
           addoreditoutput(list)
             .toPromise()
             .then((response) => {
-              this.$message.success('添加成功')
+              this.$message.success('编辑成功')
               this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
             })
     },
@@ -1093,12 +1094,17 @@ export default {
               this.dataList = response[0]
               this.dataList1 = response[1]
             } else {
+              console.log(response[0].taskTypeKey)
                if(response[0].taskTypeKey==3){
                 this.deletetask=true
                 this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
               }
+              if(response[0].taskTypeKey==2){
+              this.dataList1 = response[0]
+            }else{
               this.dataList = response[0]
             }
+            }
           })
       } else {
         this.tasknumber()

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -130,11 +130,11 @@
             />
           </ws-form-item>
           <!--到站日期-->
-          <ws-form-item label="到站日期" span="1" prop="receiveDateEnd">
+          <ws-form-item label="预计到站日期" span="1" prop="receiveDateEnd">
             <ws-date-picker
               v-model="item.receiveDateEnd"
               type="date"
-              placeholder="请选择到站日期"
+              placeholder="请选择预计到站日期"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>

src/views/tranManagement/tranManagementVehicle.vue

@@ -416,6 +416,7 @@ export default {
         })
     },
     find() {
+      if(this.inOutDate != null){
        if (this.inOutDate.length > 0) {
         this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
         this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
@@ -423,6 +424,7 @@ export default {
         this.startDate = ''
         this.endDate = ''
       }
+        }
       this.currentPage = 1
       this.getList()
     }

vue.config.js

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