Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -444,7 +444,7 @@ import download from '../../components/WsDownload/download'
               
               var arr=[]
               for (let i = 0; i < response.length; i++) {
-                arr.push({fileUrl:response[i],renameFileName:'发票'+i})
+                arr.push({fileUrl:response[i],renameFileName:'发票'+i+'.xml'})
                 //创建标签下载文件
                 // window.open(response[i],)
                 // let a = document.createElement('a');
@@ -975,6 +975,7 @@ import download from '../../components/WsDownload/download'
         sessionStorage.setItem('cwprint', true)
       },
       print(row) {
+        this.printType = 2
         sessionStorage.setItem('cwprint', false)
         getpaymentexamine({
             id: row.id

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

@@ -13,7 +13,7 @@ const tradeServicesManagementRouter = {
     icon: '-renwuguanli'
   },
   children: [
-    //贸易服务
+    //贸易服务管理
     {
       path: 'warehouseReceiptRegulation',
       component: () =>
@@ -21,7 +21,7 @@ const tradeServicesManagementRouter = {
       name: 'warehouseReceiptRegulation',
       meta: {
         title: 'warehouseReceiptRegulation',
-        shortcutEntrance: 'tranManagement',
+        shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
@@ -36,7 +36,7 @@ const tradeServicesManagementRouter = {
       name: 'warehouseReceiptAdd',
       meta: {
         title: 'warehouseReceiptAdd',
-        shortcutEntrance: 'tranManagement',
+        shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
@@ -51,7 +51,7 @@ const tradeServicesManagementRouter = {
       name: 'reviewWarehouseReceipt',
       meta: {
         title: 'reviewWarehouseReceipt',
-        shortcutEntrance: 'tranManagement',
+        shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
@@ -66,7 +66,7 @@ const tradeServicesManagementRouter = {
       name: 'approveWarehouseReceipt',
       meta: {
         title: 'approveWarehouseReceipt',
-        shortcutEntrance: 'tranManagement',
+        shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
@@ -81,7 +81,7 @@ const tradeServicesManagementRouter = {
       name: 'inOutRecord',
       meta: {
         title: 'inOutRecord',
-        shortcutEntrance: 'tranManagement',
+        shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
@@ -96,7 +96,7 @@ const tradeServicesManagementRouter = {
       name: 'warehouseReceiptEdit',
       meta: {
         title: 'warehouseReceiptEdit',
-        shortcutEntrance: 'tranManagement',
+        shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
@@ -111,7 +111,7 @@ const tradeServicesManagementRouter = {
       name: 'warehouseReceiptLook',
       meta: {
         title: 'warehouseReceiptLook',
-        shortcutEntrance: 'tranManagement',
+        shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
@@ -126,7 +126,7 @@ const tradeServicesManagementRouter = {
       name: 'repayment',
       meta: {
         title: 'repayment',
-        shortcutEntrance: 'tranManagement',
+        shortcutEntrance: 'tradeServicesManagement',
         module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true

src/views/tradeServicesManagement/reviewWarehouseReceipt.vue

@@ -1,3 +1,4 @@
+//审核仓单
 <template>
 	<div>
 		

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -1,3 +1,4 @@
+//贸易服务管理
 <template>
   <div class="container">
     <map-drag :class="{active:isActive}"></map-drag>

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -80,6 +80,7 @@
           </el-row>
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <el-row class="myTest">
+
             <!--当前运输总价-->
             <el-form-item label="当前运输总价(元/吨):" prop="tranPrice" label-width="150px" class="input-item-margin">
               <el-input v-model="deptBudgetList.tranPrice" maxlength="70" disabled />
@@ -770,8 +771,11 @@
     // background: green;
     padding-left: 20px;
     align-items: center;
+    width: 800px;
   }
-
+.myTest .el-form-item {
+  width: 33.333%;
+}
   .content3 {
     width: calc(100% + 20px);
 

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -187,7 +187,7 @@
               </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
-              仓位号-{{ index + 1 }}
+              仓位-{{ index + 1 }}
               <span class="noservice" v-show="item.status == '未装车'"
                 >未装船</span
               >
@@ -200,7 +200,7 @@
             </div>
             <!--箱号-->
             <el-form-item
-              label="箱号"
+              label="箱号:"
               prop="caseNo"
               v-if="item.shipType == '集装箱'"
             >
@@ -218,7 +218,7 @@
             </el-form-item>
             <!--封号-->
             <el-form-item
-              label="封号"
+              label="封号:"
               prop="titleNo"
               v-if="item.shipType == '集装箱'"
             >
@@ -237,6 +237,7 @@
             <!-- 仓位号 -->
             <ws-form-item
               span="1"
+              label="仓位号:"
               prop="binNumber"
               v-if="item.shipType == '散船'"
               >{{ item.binNumber }}</ws-form-item

src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -83,7 +83,7 @@
               </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
-              仓位号-{{ index + 1 }}
+              仓位-{{ index + 1 }}
               <span class="noservice" v-show="item.status == '未装车'">未装船</span>
               <span class="service" v-show="item.status == '已装车'">已装船</span>
               <span class="serviced" v-show="item.status == '已送达'">
@@ -101,7 +101,7 @@
               <span>{{ item.titleNo }}</span>
             </ws-form-item>
             <!-- 仓位号 -->
-            <ws-form-item span="1" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
+            <ws-form-item span="1" label="仓位号:" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
             <!-- 计划重量 -->
             <ws-form-item label="计划重量(吨)" span="1" prop="positionWeight" v-if="item.shipType == '散船'">
               {{ item.positionWeight }}</ws-form-item>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -392,13 +392,13 @@
     }
 
     .el-input__inner {
-      background-color: #fff;
-      border-color: #fff !important;
-      color: #000 !important;
+      // background-color: #fff;
+      // border-color: #fff !important;
+      color: #c0c4cc !important;
       font-size: 14px;
       cursor: text;
-      padding: 0 !important;
-      border: none;
+      padding: 0 10px !important;
+      // border: none;
     }
   }
 

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -95,7 +95,7 @@
               <ws-input
                 v-model="deptBudgetList.tranPrice"
                 maxlength="70"
-                :disabled="readonly"
+                disabled
                 size="small"
                 style="width:70px"
               />
@@ -553,12 +553,11 @@ export default {
     display: none;
   }
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
+    color: #c0c4cc !important;
     font-size: 14px;
     cursor: text;
-    padding: 0 !important;
+    padding: 0 10px !important;
+
   }
 }
 .winseaview-view {

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -103,24 +103,25 @@
                   style="width:70px"
                 />
             </ws-form-item>
-            <ws-form-item>
-
+            <!-- <ws-form-item>
+            </ws-form-item> -->
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
               v-hasPermission="`tranManager.transportationInfo.trian`" 
               size="small"
               @click="examine()"
+              class="submit"
               >审核中</el-button
             >
              <el-button
              v-else
               type="primary"
               size="small"
+              class="submit"
               @click="priceSubmit()"
               >提交</el-button
             >
-            </ws-form-item>
           </div>
       <div
         class="liaison"
@@ -752,7 +753,7 @@ export default {
   margin: 0 auto;
 }
 .el-form-item {
-  width: 50%;
+  width: 33.333%;
 }
 .el-form-item__label {
   text-align: center;
@@ -811,10 +812,10 @@ export default {
     display: none;
   }
   .el-input__inner {
-    color: #000 !important;
+     color: #c0c4cc !important;
     font-size: 14px;
     cursor: text;
-    padding: 0 !important;
+    padding: 0 10px !important;
   }
 }
 //减号
@@ -940,10 +941,14 @@ export default {
   padding: 0px;
 }
  .myTest{
-    width: 800px;
     display: flex;
-    height: 40px;
     margin: 20px 0;
+    // background: green;
+    padding-left: 20px;
+    align-items: center;
+    width: 800px;
   }
-
+.myTest .submit{
+ margin-top: -16px;
+}
 </style>

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -186,7 +186,7 @@
               </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
-              仓位号-{{ index + 1 }}
+              仓位-{{ index + 1 }}
               <span class="noservice" v-show="item.status == '未装车'">
                 未装船
               </span>
@@ -216,6 +216,7 @@
             <!-- 仓位号 -->
             <ws-form-item
               span="1"
+              label="仓位号:"
               prop="binNumber"
               v-if="item.shipType == '散船'"
             >

src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -146,7 +146,7 @@
                 </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
-              仓位号-{{ index + 1 }}
+              仓位-{{ index + 1 }}
               <span class="noservice" v-show="item.status == '未装车'">
                   未装船
                 </span>
@@ -166,7 +166,7 @@
              <span>{{ item.titleNo }}</span>
             </ws-form-item>
             <!--仓位号-->
-            <ws-form-item  span="1" prop="binNumber" v-if="item.shipType == '散船'">
+            <ws-form-item label="仓位号:" span="1" prop="binNumber" v-if="item.shipType == '散船'">
              <span>{{ item.binNumber }}</span>
             </ws-form-item>
             <!--装船净重-->

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -336,7 +336,7 @@
                   maxlength="120"
                   size="small"
                 />
-              </ws-form-item>
+              </ws-form-item> 
             </ws-info-table>
             <span
               v-if="item.status == '未装车'||item.temporaryDriverFlag!=0"