前端

src/views/customerFundManagement/customerFundList.vue

@@ -27,7 +27,7 @@
         /></ws-button>
 
         <!--添加客户-->
-        <ws-button type="primary" @click="customerAdd()"
+        <ws-button v-hasPermission=" `customerMoneyManagement.customerMoney.audit`" type="primary" @click="customerAdd()"
           ><img
             width="13"
             height="13"
@@ -82,6 +82,7 @@
               size="medium"
               type="text"
               class="record"
+               v-hasPermission=" `customerMoneyManagement.customerMoney.edit`"
               @click="customerEdit(scope.row)"
               >编辑</el-button
             >
@@ -89,6 +90,7 @@
               size="medium"
               type="text"
               class="record"
+               v-hasPermission=" `customerMoneyManagement.customerMoney.delete`"
               @click="customerDel(scope.row)"
               >删除</el-button
             >

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

@@ -9,7 +9,7 @@ const tranManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'taskManagement',
-    module: 'transportationTask',
+    module: 'transportationTask.transportation.transportationInfo',
     icon: '-renwuguanli'
   },
   children: [

src/views/taskManagement/tranManagementLook.vue

@@ -24,33 +24,27 @@
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
         <ws-info-table>
-          <!--任务编号-->
           <ws-form-item label="任务编号" span="1" prop="taskNo">
             {{ deptBudgetList.taskNo }}
           </ws-form-item>
-          <!--合同编号-->
           <ws-form-item label="合同编号/移库任务编号" span="1" prop="contractNo">
             {{ deptBudgetList.contractNo }}
           </ws-form-item>
-          <!--货名-->
           <ws-form-item label="货名" span="1" prop="goodsName" class="readonly">
             {{ deptBudgetList.goodsName }}
           </ws-form-item>
-          <!-- 重量（吨） -->
           <ws-form-item label="重量（吨）" span="1" prop="weight">
             {{ deptBudgetList.weight }}
           </ws-form-item>
         </ws-info-table>
         <div class="address">
           <ws-info-table>
-            <!-- 始发地 -->
             <ws-form-item label="始发地" span="1" prop="netWeight">
               {{ deptBudgetList.startPrivate }}{{ deptBudgetList.startCity
               }}{{ deptBudgetList.startArea
               }}{{ deptBudgetList.startDetailedAddress }}
               （{{deptBudgetList.sendWarehouse}}）
             </ws-form-item>
-            <!--终到地-->
             <ws-form-item label="终到地" span="1" prop="netWeight">
               {{ deptBudgetList.endPrivate }}{{ deptBudgetList.endCity
               }}{{ deptBudgetList.endArea
@@ -68,7 +62,7 @@
           </el-checkbox-group>
         </div>
       </div>
-      <div
+     <div
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
         :key="index"
         class="datafor"
@@ -84,17 +78,13 @@
             >粮款结算阶段</el-checkbox
           >
         </div>
-        <!-- <div class="neifor"> -->
-        <ws-info-table class="el-table">
-          <!--运输方式-->
-          <ws-form-item label="运输方式" span="1" prop="tranType">
+          <ws-info-table class="el-table">
+         <ws-form-item label="运输方式" span="1" prop="tranType">
             {{ item.tranType }}
           </ws-form-item>
-          <!--发货日期-->
           <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
             {{ item.deliveryDateStart }}
           </ws-form-item>
-          <!--最晚到货日期-->
           <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
             {{ item.deliveryDateEnd }}
           </ws-form-item>
@@ -102,38 +92,23 @@
             {{ item.weight }}
           </ws-form-item>
         </ws-info-table>
-        <!-- </div>-->
         <ws-info-table>
-          <!--发货地区-->
           <ws-form-item label="发货地区" span="1" prop="waterContent">
             {{ item.sendPrivate }}/{{ item.sendCity }}/{{ item.sendArea }}
           </ws-form-item>
-          <!--发货地详细地址-->
-          <ws-form-item
-            label="发货地详细地址"
-            span="1"
-            prop="sendDetailedAddress"
-          >
-            {{ item.sendDetailedAddress }}
-          </ws-form-item>
-          <!--发货人-->
+           <ws-form-item label="发货地详细地址" span="1" prop="sendDetailedAddress">{{ item.sendDetailedAddress }}</ws-form-item> 
           <ws-form-item label="发货人" span="1" prop="sender">
             {{ item.sender }}
           </ws-form-item>
-          <!--发货人电话-->
           <ws-form-item label="发货人电话" span="1" prop="senderPhone">
             {{ item.senderPhone }}
           </ws-form-item>
-        </ws-info-table>
-
-        <!-- <div class="nei"> -->
+        </ws-info-table>    
         <ws-info-table>
-          <!--收货地区-->
           <ws-form-item label="收货地区" span="1" prop="waterContent">
             {{ item.receivePrivate }}/{{ item.receiveCity
             }}/{{ item.receiveArea }}
           </ws-form-item>
-          <!--收货地详细地址-->
           <ws-form-item
             label="收货地详细地址"
             span="1"
@@ -141,17 +116,14 @@
           >
             {{ item.receiveDetailedAddress }}
           </ws-form-item>
-          <!--发货人-->
           <ws-form-item label="收货人" span="1" prop="receiver">
             {{ item.receiver }}
           </ws-form-item>
-          <!--发货人电话-->
           <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
             {{ item.receiverPhone }}
-          </ws-form-item>       
+          </ws-form-item>  
         </ws-info-table>
-        <!-- </div> -->
-      </div>
+      </div> 
       <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
@@ -260,6 +232,10 @@ export default {
         .then((response) => {
           this.checkList = response.tranType.split(',')
           this.deptBudgetList = response
+          // for (let i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
+          //   this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress='黑龙江省黑河市五大连池市沾河林业局'
+            
+          // }
         })
     },
     approve() {},

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -231,6 +231,9 @@
             <span class="servicedout" v-show="item.status == '已送达'"
               >已卸车</span
             >
+            <span class="servicedout" v-show="item.status == '已装车'"
+              >未卸车</span
+            >
             <span class="noserviceout" v-show="item.status == '未装车'">{{
               item.status
             }}</span>

vue.config.js

@@ -141,8 +141,8 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.122:9100/',
-        // target: 'http://192.168.1.119:8090/',
+        // target: 'http://192.168.1.122:9100/',
+        target: 'http://192.168.1.107:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址