Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-htqd

# Conflicts:
#	src/views/officialWebsiteManagement/publicityAdd.vue

README.md

@@ -34,7 +34,7 @@ npm install
 npm run dev
 ```
 
-This will automatically open http://localhost:9528
+This will automatically open http://0.0.0.0:9528
 
 ## Build
 

src/api/cargoOwnerManagement.js

@@ -73,4 +73,11 @@ export function editInfo(data) {
      data: data,
   })
 }
-
+// 货主身份
+export function getInfo(data) {
+  return request({
+    url: '/hyCargoOwnerPayeeInfo/getPayee',
+    method: 'get',
+     params: data,
+  })
+}

src/api/orderManagement.js

@@ -57,4 +57,20 @@ export function travelpath(data) {
     method: 'get',
     params: data,
   })
+}
+//预付
+export function preMoney(data) {
+  return request({
+    url: '/freightInfo/api/advance',
+    method: 'post',
+    data: data,
+  })
+}
+//尾款
+export function tailMoney(data) {
+  return request({
+    url: '/freightInfo/api/balance',
+    method: 'post',
+    data: data,
+  })
 }

src/components/mapdrag/indexMap.vue

@@ -4,202 +4,207 @@
   </div>
 </template>
 <script>
-  import {
-    travelpath
-  } from '@/api/orderManagement'
-  import AMapLoader from "@amap/amap-jsapi-loader";
-  export default {
-    name: "app",
-    data() {
-      return {
-        map: null,
-        path:[],
-        path1: [
-          [116.405289, 39.904987],
-          [113.964458, 40.54664],
-          [111.47836, 41.135964],
-          [108.949297, 41.670904],
-          [106.380111, 42.149509],
-          [103.774185, 42.56996],
-          [101.135432, 42.930601],
-          [98.46826, 43.229964],
-          [95.777529, 43.466798],
-          [93.068486, 43.64009],
-          [90.34669, 43.749086],
-          [87.61792, 43.793308]
-        ],
-        path2: [
-          [117.405289, 40.904987],
-          [114.964458, 41.54664],
-          [112.47836, 42.135964],
-          [109.949297, 43.670904],
-          [107.380111, 44.149509],
-          [104.774185, 43.56996],
-          [102.135432, 43.930601],
-          [99.46826, 44.229964],
-          [96.777529, 44.466798],
-          [94.068486, 44.64009],
-          [91.34669, 44.749086],
-          [88.61792, 44.793308]
-        ],
-      };
-    },
-    props: ['radio','orderid'],
-    watch: {
-      radio: function(val1, val2) {
-        if(val1==1) {
-          var that=this
-          travelpath({orderId:that.orderid}).then(response => {
-            that.path1=[]
-            var patharr=JSON.parse(response.data.longitudeLatitude)
+import { travelpath } from "@/api/orderManagement";
+import AMapLoader from "@amap/amap-jsapi-loader";
+export default {
+  name: "app",
+  data() {
+    return {
+      map: null,
+      path: [],
+      path1: [
+        [116.405289, 39.904987],
+        [113.964458, 40.54664],
+        [111.47836, 41.135964],
+        [108.949297, 41.670904],
+        [106.380111, 42.149509],
+        [103.774185, 42.56996],
+        [101.135432, 42.930601],
+        [98.46826, 43.229964],
+        [95.777529, 43.466798],
+        [93.068486, 43.64009],
+        [90.34669, 43.749086],
+        [87.61792, 43.793308],
+      ],
+      path2: [
+        [117.405289, 40.904987],
+        [114.964458, 41.54664],
+        [112.47836, 42.135964],
+        [109.949297, 43.670904],
+        [107.380111, 44.149509],
+        [104.774185, 43.56996],
+        [102.135432, 43.930601],
+        [99.46826, 44.229964],
+        [96.777529, 44.466798],
+        [94.068486, 44.64009],
+        [91.34669, 44.749086],
+        [88.61792, 44.793308],
+      ],
+    };
+  },
+  props: ["radio", "orderid"],
+  watch: {
+    radio: function (val1, val2) {
+      if (val1 == 1) {
+        var that = this;
+        travelpath({ orderId: that.orderid })
+          .then((response) => {
+            that.path1 = [];
+            var patharr = JSON.parse(response.data.longitudeLatitude);
             // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
             for (let i = 0; i < patharr.length; i++) {
-              that.path1.push([patharr[i].longitude,patharr[i].latitude])
+              that.path1.push([patharr[i].longitude, patharr[i].latitude]);
             }
-            that.path = that.path1
+            that.path = that.path1;
             that.loadmap();
           })
           .catch(() => {
             // console.log(121212)
-          })
-          // this.path = this.path1
-        }else{
-          var that=this
-          travelpath({orderId:that.orderid}).then(response => {
-            that.path2=[]
-            var patharr=JSON.parse(response.data.longitudeLatitude)
+          });
+        // this.path = this.path1
+      } else {
+        var that = this;
+        travelpath({ orderId: that.orderid })
+          .then((response) => {
+            that.path2 = [];
+            var patharr = JSON.parse(response.data.longitudeLatitude);
             // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
             for (let i = 0; i < patharr.length; i++) {
-              that.path2.push([patharr[i].longitude,patharr[i].latitude])
+              that.path2.push([patharr[i].longitude, patharr[i].latitude]);
             }
-            that.path = that.path2
+            that.path = that.path2;
             that.loadmap();
           })
           .catch(() => {
             // console.log(121212)
-          })
-          // travelpath({orderId:this.orderid}).then(response => {
-          //   console.log(response)
-          // })
-          // .catch(() => {
-          // })
-          // this.path = this.path2
-        }
-        // this.loadmap();
+          });
+        // travelpath({orderId:this.orderid}).then(response => {
+        //   console.log(response)
+        // })
+        // .catch(() => {
+        // })
+        // this.path = this.path2
       }
+      // this.loadmap();
     },
-    methods: {
-      loadmap() {
-        return new Promise((reslove, reject) => {
-          AMapLoader.load({
-              key: "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key，首次调用 load 时必填
-              // version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-              plugins: ["AMap.ToolBar", "AMap.Scale", "AMap.Geocoder"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-              AMapUI: {
-                // 是否加载 AMapUI，缺省不加载
-                version: "1.1", // AMapUI 缺省 1.1
-                plugins: [] // 需要加载的 AMapUI ui插件
-              }
-            }).then(AMap => {
-              this.map = new AMap.Map("allmap", {
-                resizeEnable: true,
-                zoom: 10,
-                // center: [116.397428, 39.90923] //中心点坐标
-              });
-
-              //地图控件
-              this.map.addControl(new AMap.Scale());
-              this.map.addControl(new AMap.ToolBar());
-              this.map.setZoom(14); //设置缩放大小
-              this.trajectory();
-              reslove();
-            })
-            .catch(e => {
-              console.log(e, "高德地图加载失败");
-              reject(e);
+  },
+  methods: {
+    loadmap() {
+      return new Promise((reslove, reject) => {
+        AMapLoader.load({
+          key: "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key，首次调用 load 时必填
+          // version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+          plugins: ["AMap.ToolBar", "AMap.Scale", "AMap.Geocoder"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+          AMapUI: {
+            // 是否加载 AMapUI，缺省不加载
+            version: "1.1", // AMapUI 缺省 1.1
+            plugins: [], // 需要加载的 AMapUI ui插件
+          },
+        })
+          .then((AMap) => {
+            this.map = new AMap.Map("allmap", {
+              resizeEnable: true,
+              zoom: 10,
+              // center: [116.397428, 39.90923] //中心点坐标
             });
-        });
-      },
-      // 轨迹
-      trajectory() {
-        AMapUI.load(["ui/misc/PathSimplifier", "lib/$"], (PathSimplifier, $) => {
-          if (!PathSimplifier.supportCanvas) {
-            alert("当前环境不支持 Canvas！");
-            return;
-          }
 
-          let pathSimplifierIns = new PathSimplifier({
-            zIndex: 100,
-            //autoSetFitView:false,
-            map: this.map, //所属的地图实例
+            //地图控件
+            this.map.addControl(new AMap.Scale());
+            this.map.addControl(new AMap.ToolBar());
+            this.map.setZoom(14); //设置缩放大小
+            this.trajectory();
+            reslove();
+          })
+          .catch((e) => {
+            console.log(e, "高德地图加载失败");
+            reject(e);
+          });
+      });
+    },
+    // 轨迹
+    trajectory() {
+      AMapUI.load(["ui/misc/PathSimplifier", "lib/$"], (PathSimplifier, $) => {
+        if (!PathSimplifier.supportCanvas) {
+          alert("当前环境不支持 Canvas！");
+          return;
+        }
 
-            getPath: function(pathData, pathIndex) {
-              return pathData.path;
-            },
-            getHoverTitle: function(pathData, pathIndex, pointIndex) {
-              if (pointIndex >= 0) {
-                //point
-                return (
-                  pathData.name +
-                  "，点：" +
-                  pointIndex +
-                  "/" +
-                  pathData.path.length
-                );
-              }
+        let pathSimplifierIns = new PathSimplifier({
+          zIndex: 100,
+          //autoSetFitView:false,
+          map: this.map, //所属的地图实例
 
-              return pathData.name + "，点数量" + pathData.path.length;
-            },
-            renderOptions: {
-              renderAllPointsIfNumberBelow: 100 //绘制路线节点，如不需要可设置为-1
+          getPath: function (pathData, pathIndex) {
+            return pathData.path;
+          },
+          getHoverTitle: function (pathData, pathIndex, pointIndex) {
+            if (pointIndex >= 0) {
+              //point
+              return (
+                pathData.name +
+                "，点：" +
+                pointIndex +
+                "/" +
+                pathData.path.length
+              );
             }
-          });
 
-          window.pathSimplifierIns = pathSimplifierIns;
+            return pathData.name + "，点数量" + pathData.path.length;
+          },
+          renderOptions: {
+            renderAllPointsIfNumberBelow: 100, //绘制路线节点，如不需要可设置为-1
+          },
+        });
 
-          //设置数据
-          pathSimplifierIns.setData([{
-            name: "路线0",
-            path: this.path
-          }]);
+        window.pathSimplifierIns = pathSimplifierIns;
 
-          //对第一条线路（即索引 0）创建一个巡航器
-          let trajectory = pathSimplifierIns.createPathNavigator(0, {
-            loop: true, //循环播放
-            speed: 100 //巡航速度，单位千米/小时
-          });
+        //设置数据
+        pathSimplifierIns.setData([
+          {
+            name: "路线0",
+            path: this.path,
+          },
+        ]);
 
-          trajectory.start();
+        //对第一条线路（即索引 0）创建一个巡航器
+        let trajectory = pathSimplifierIns.createPathNavigator(0, {
+          loop: true, //循环播放
+          speed: 100, //巡航速度，单位千米/小时
         });
-      }
+
+        trajectory.start();
+      });
     },
-    mounted() {
-      var that=this
-      // console.log(this.orderid)
-      this.$nextTick(function(){
-        travelpath({orderId:that.orderid}).then(response => {
-            that.path1=[]
-            var patharr=JSON.parse(response.data.longitudeLatitude)
+  },
+  mounted() {
+    var that = this;
+    // console.log(this.orderid)
+    this.$nextTick(function () {
+      travelpath({ orderId: that.orderid })
+        .then((response) => {
+          that.path1 = [];
+          if (response.data) {
+            var patharr = JSON.parse(response.data.longitudeLatitude);
             // console.log(JSON.parse(response.data.longitudeLatitude),11111111)
             for (let i = 0; i < patharr.length; i++) {
-              that.path1.push([patharr[i].longitude,patharr[i].latitude])
+              that.path1.push([patharr[i].longitude, patharr[i].latitude]);
             }
-            
-            that.path = that.path1
-            that.loadmap();
-          })
-          .catch(() => {
-            // console.log(121212)
-          })
-      })
-      
-       
-    }
-  };
+
+            that.path = that.path1;
+          }
+
+          that.loadmap();
+        })
+        .catch(() => {
+          // console.log(121212)
+        });
+    });
+  },
+};
 </script>
 <style scoped>
-  #allmap {
-    width: 100%;
-    height:calc(100vh  - 150px);
-  }
+#allmap {
+  width: 100%;
+  height: calc(100vh - 150px);
+}
 </style>

src/router/orderManagement/index.js

@@ -18,7 +18,7 @@ const orderManagementRouter = {
         name: 'orderAudit',
         component: () => import('@/views/orderManagement/orderAudit'),
         meta: {
-            title: '订单审核',
+            title: '订单信息',
             icon: ''
         }
     },

src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '智运管理平台',
+  title: '畅运通管理平台',
 
   /**
    * @type {boolean} true | false

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -4,12 +4,12 @@
     <div class="center_css">
       <div class="top_css">
         <el-row>
-          <el-col :span="14" style="height: 45px;">
+          <el-col :span="14" style="height: 45px">
             <!-- <el-button type="primary">添加</el-button> -->
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable></el-input>
+              <el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button>
             </div>
@@ -22,7 +22,7 @@
                 @click="searchBtn('')">
                 全部
               </div>
-              <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item " @click="searchBtn(1)">
+              <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
                 待审核
               </div>
               <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
@@ -56,8 +56,11 @@
         <el-table-column prop="accumulatedFreight" label="累计支付运费（元）" min-width="148"></el-table-column>
         <el-table-column prop="amountMoney" label="代理身份">
           <template slot-scope="scope">
-            <el-popover placement="top-start" title="" width="200" trigger="hover"
-              :content="scope.row.proxyIdentity?scope.row.proxyIdentity:'暂无代理企业'">
+            <el-popover placement="top-start" title="" width="200" trigger="hover" :content="
+                scope.row.proxyIdentity
+                  ? scope.row.proxyIdentity
+                  : '暂无代理企业'
+              ">
               <span class="btn_css" slot="reference">企业</span>
             </el-popover>
           </template>
@@ -66,21 +69,21 @@
           <template slot-scope="scope">
             <div class="advancePayment-style">
               <el-input placeholder="0" v-model="scope.row.advancePayment"></el-input>
-              <i class="el-icon-edit" style="margin-top:8px" @click="editRatio(scope.row)"></i>
+              <i class="el-icon-edit" style="margin-top: 8px" @click="editRatio(scope.row)"></i>
               <!-- <span class="btn_css" @click="userSee(scope.row)">查看</span> -->
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="账单" min-width="133">
+        <el-table-column label="账户" min-width="180">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click" @show="getBillList(scope.row.commonId)">
               <div class="bill-content">
-                <div class="bill-item" v-for="(item,index) in billList" :key="index">
+                <div class="bill-item" v-for="(item, index) in billList" :key="index">
                   <div class="row1">
                     <div class="left">
-                      {{item.types}}
+                      {{ item.types }}
                     </div>
-                    <div class="right">{{item.amountMoney}}元</div>
+                    <div class="right">{{ item.amountMoney }}元</div>
                   </div>
                   <!-- <div class="row2">
                     <div class="left">
@@ -90,8 +93,11 @@
                   </div> -->
                 </div>
               </div>
-              <el-button slot="reference">账单</el-button>
+              <!-- <el-button slot="reference">账单</el-button> -->
+              <span slot="reference" class="btn_css" style="margin-right:20px">账单</span>
             </el-popover>
+            <!-- <el-button @click="seeInfo(scope.row)">信息</el-button> -->
+            <span class="btn_css">信息</span>
           </template>
         </el-table-column>
         <el-table-column prop="authenticationStatus" label="身份证">
@@ -114,12 +120,14 @@
             <el-dropdown>
               <span class="btn_css">•••</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  :disabled="scope.row.authenticationStatus == '已禁用' && scope.row.authenticationStatus != '审核中'"><span
-                    @click="switchChange(scope.row,'1')">禁用</span></el-dropdown-item>
-                <el-dropdown-item
-                  :disabled="scope.row.authenticationStatus != '已禁用' && scope.row.authenticationStatus != '审核中'"><span
-                    @click="switchChange(scope.row,'2')">启用</span></el-dropdown-item>
+                <el-dropdown-item :disabled="
+                    scope.row.authenticationStatus == '已禁用' &&
+                    scope.row.authenticationStatus != '审核中'
+                  "><span @click="switchChange(scope.row, '1')">禁用</span></el-dropdown-item>
+                <el-dropdown-item :disabled="
+                    scope.row.authenticationStatus != '已禁用' &&
+                    scope.row.authenticationStatus != '审核中'
+                  "><span @click="switchChange(scope.row, '2')">启用</span></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -130,16 +138,19 @@
       style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
       layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
     </el-pagination>
-    <el-dialog :close-on-click-modal='false' title="身份信息" :visible.sync="userInfo" width="500px" :before-close="userInfoClose">
+    <el-dialog :close-on-click-modal="false" title="身份信息" :visible.sync="userInfo" width="500px"
+      :before-close="userInfoClose">
       <div class="user">
         <!-- .user -->
         <div class="title_css">姓名</div>
-        <div class="name_css">{{idSee.name}}</div>
+        <div class="name_css">{{ idSee.name }}</div>
         <div class="title_css">身份证号</div>
-        <div class="name_css">{{idSee.cardNumber}}</div>
+        <div class="name_css">{{ idSee.cardNumber }}</div>
         <div class="title_css">有效期</div>
-        <div class="name_css">{{idSee.cardValidityDate}} <span style="color: #EF4C33;margin-left: 10px"
-            v-if="false">已过期</span></div>
+        <div class="name_css">
+          {{ idSee.cardValidityDate }}
+          <span style="color: #ef4c33; margin-left: 10px" v-if="false">已过期</span>
+        </div>
         <div class="title_css">身份证人像面</div>
         <img :src="idSee.cardAddressUrl" class="user_item" @click="enlarge(idSee.cardAddressUrl)" />
         <div class="title_css">身份证国徽面</div>
@@ -149,7 +160,8 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal='false' title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+    <el-dialog :close-on-click-modal="false" title="驳回认证" :visible.sync="rejectInfo" width="400px"
+      :before-close="rejectClose">
       <div>
         <!-- <div><span class="sign">*</span>选择驳回原因</div> -->
         <div class="form_css">
@@ -161,7 +173,7 @@
 							<el-checkbox label="证件信息填写错误"></el-checkbox>
 							<el-checkbox label="其他"></el-checkbox>
 						</el-checkbox-group> -->
-            <div style="margin-bottom: 20px;">驳回原因描述（必填）</div>
+            <div style="margin-bottom: 20px">驳回原因描述（必填）</div>
             <el-input type="textarea" :rows="3" resize="none" placeholder="输入驳回原因，6-100个字" maxlength="100"
               v-model="form.rejectReasonDescription"></el-input>
             <div class="form_btn">
@@ -172,7 +184,8 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal='false' title="发送信息" :visible.sync="sendInfo" width="400px" :before-close="sendInfoClose">
+    <el-dialog :close-on-click-modal="false" title="发送信息" :visible.sync="sendInfo" width="400px"
+      :before-close="sendInfoClose">
       <div class="Info_css">
         <div class="Info_title">标题</div>
         <div class="Info_item">
@@ -189,7 +202,34 @@
         </div>
       </div>
     </el-dialog>
-    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
+    <!-- 账户信息 -->
+    <el-dialog :close-on-click-modal="false" title="账户信息" :visible.sync="payInfo" width="500px"
+      :before-close="payClose">
+      <div class="pay">
+        <div class="pay_css">
+          <div class="title_css">收款人：</div>
+          <div class="name_css">{{ paySee.cardholderName }}</div>
+        </div>
+        <div class="pay_css">
+          <div class="title_css">账号：</div>
+          <div class="id_css">{{ paySee.bankCard }}</div>
+        </div>
+        <div class="pay_css">
+          <div class="title_css">开户行：</div>
+          <div class="pay_name">{{ paySee.bankDeposit }}</div>
+        </div>
+        <div class="pay_css">
+          <div class="title_css">开户支行：</div>
+          <div class="pay_name">{{ paySee.bankDepositBranch }}</div>
+        </div>
+      </div>
+      <!-- <img
+          :src="paySee.payeeAddressUrl"
+          class="user_item"
+          @click="enlarge(paySee.payeeAddressUrl)"
+        /> -->
+    </el-dialog>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index: 9999" />
   </div>
 </template>
 <script>
@@ -198,8 +238,9 @@
     toExamine,
     postNews,
     getBillList,
-    editInfo
-  } from '@/api/cargoOwnerManagement'
+    editInfo,
+    getInfo,
+  } from "@/api/cargoOwnerManagement";
   export default {
     components: {
       "el-image-viewer": () =>
@@ -227,225 +268,262 @@
         //图片预览
         srcList: [],
         imgsVisible: false,
+        //账户信息
+        payInfo: false,
+        paySee: {},
       };
     },
     mounted() {
-      this.getList()
+      this.getList();
     },
     methods: {
+      seeInfo(val) {
+        this.listLoading = true;
+        getInfo({
+            commonId: val.commonId
+          })
+          .then((response) => {
+            if (response.code == 200) {
+              this.paySee = response.data
+              this.payInfo = true;
+              if (!this.paySee) {
+                this.$message.error("暂无数据！")
+              }
+            }
+          })
+          .catch(() => {
+            this.listLoading = false;
+          });
+
+      },
+      payClose() {
+        this.payInfo = false;
+      },
       closeImgViewer() {
-         this.srcList = []
+        this.srcList = [];
         this.imgsVisible = false;
       },
       enlarge(url) {
         this.imgsVisible = true;
-        this.srcList.push(url)
+        this.srcList.push(url);
       },
-      IDLook(val) { //查看身份证
-        this.idSee = val
-        this.userInfo = true
+      IDLook(val) {
+        //查看身份证
+        this.idSee = val;
+        this.userInfo = true;
       },
       editRatio(val) {
-        this.$confirm("确定修改该货主的垫付比例？", '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          })
-          .then(() => {
-            this.listLoading = true;
-            editInfo(val)
-              .then((response) => {
-                if (response.code == 200) {
-                  this.$notify({
-                    title: "成功",
-                    message: "修改成功！",
-                    type: "success",
-                  });
-                  this.getList()
-                }
-              }).catch(() => {
-                this.listLoading = false;
-              });
-
-          })
+        this.$confirm("确定修改该货主的垫付比例？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          this.listLoading = true;
+          editInfo(val)
+            .then((response) => {
+              if (response.code == 200) {
+                this.$notify({
+                  title: "成功",
+                  message: "修改成功！",
+                  type: "success",
+                });
+                this.getList();
+              }
+            })
+            .catch(() => {
+              this.listLoading = false;
+            });
+        });
       },
       getBillList(id) {
         let _obj = {
           commonId: id,
           pageSize: 999,
-          currentPage: 1
-        }
-        getBillList(_obj).then(response => {
-            this.billList = response.data.records
+          currentPage: 1,
+        };
+        getBillList(_obj)
+          .then((response) => {
+            this.billList = response.data.records;
           })
           .catch(() => {
-            this.loading = false
-          })
+            this.loading = false;
+          });
       },
       getList() {
-        this.loading = true
-        let _obj = {}
-        _obj.currentPage = this.currentPage
-        _obj.pageSize = this.pageSize
-        _obj.searchKeyWord = this.searchkeyWord
-        _obj.searchType = this.search
-        getList(_obj).then(response => {
-            this.tableData = response.data.records
-            this.deptBudgetTotal = response.data.total
-            this.listLoading = false
+        this.loading = true;
+        let _obj = {};
+        _obj.currentPage = this.currentPage;
+        _obj.pageSize = this.pageSize;
+        _obj.searchKeyWord = this.searchkeyWord;
+        _obj.searchType = this.search;
+        getList(_obj)
+          .then((response) => {
+            this.tableData = response.data.records;
+            this.deptBudgetTotal = response.data.total;
+            this.listLoading = false;
           })
           .catch(() => {
-            this.loading = false
-          })
+            this.loading = false;
+          });
       },
       switchChange(row, num) {
-        var _examine = {}
-        _examine.id = row.id
-        let title
+        var _examine = {};
+        _examine.id = row.id;
+        let title;
         if (num == 1) {
-          _examine.flag = 3
-          title = "禁用后客户将无法使用所有功能，是否确定禁用？"
+          _examine.flag = 3;
+          title = "禁用后客户将无法使用所有功能，是否确定禁用？";
         } else if (num == 2) {
-          title = "确定重新启用该用户？"
-          _examine.flag = 4
+          title = "确定重新启用该用户？";
+          _examine.flag = 4;
         }
-        this.$confirm(title, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          })
-          .then(() => {
-            this.listLoading = true
-            toExamine(_examine).then(response => {
-                if (num == 1) {
-                  this.$notify({
-                    title: '成功',
-                    message: '禁用成功！',
-                    type: 'success'
-                  });
-                } else if (num == 2) {
-                  this.$notify({
-                    title: '成功',
-                    message: '启用成功！',
-                    type: 'success'
-                  });
-                }
-                this.getList()
-                this.listLoading = false
-              })
-              .catch(() => {
-                this.loading = false
-              })
-          })
+        this.$confirm(title, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          this.listLoading = true;
+          toExamine(_examine)
+            .then((response) => {
+              if (num == 1) {
+                this.$notify({
+                  title: "成功",
+                  message: "禁用成功！",
+                  type: "success",
+                });
+              } else if (num == 2) {
+                this.$notify({
+                  title: "成功",
+                  message: "启用成功！",
+                  type: "success",
+                });
+              }
+              this.getList();
+              this.listLoading = false;
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        });
       },
       newInfo(row) {
-        this.Info.newsTypeKey = 1
-        this.Info.newsType = "系统消息"
-        this.Info.crtCommonId = JSON.parse(localStorage.getItem('UserInfo')).userId
-        this.Info.reCommonId = row.commonId
-        this.Info.bussId = row.id
-        this.sendInfo = true
+        this.Info.newsTypeKey = 1;
+        this.Info.newsType = "系统消息";
+        this.Info.crtCommonId = JSON.parse(
+          localStorage.getItem("UserInfo")
+        ).userId;
+        this.Info.reCommonId = row.commonId;
+        this.Info.bussId = row.id;
+        this.sendInfo = true;
       },
       sendInfoClose() {
-        this.Info = {}
-        this.sendInfo = false
+        this.Info = {};
+        this.sendInfo = false;
       },
       adopt(row) {
-        this.$confirm('确定通过身份审核？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          })
-          .then(() => {
-            this.listLoading = true
-            var _examine = {}
-            _examine.id = row.id
-            _examine.flag = 1
-            toExamine(_examine).then(response => {
-                this.$notify({
-                  title: '成功',
-                  message: '通过成功！',
-                  type: 'success'
-                });
-                this.getList()
-                this.listLoading = false
-              })
-              .catch(() => {
-                this.loading = false
-              })
-          })
+        this.$confirm("确定通过身份审核？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          this.listLoading = true;
+          var _examine = {};
+          _examine.id = row.id;
+          _examine.flag = 1;
+          toExamine(_examine)
+            .then((response) => {
+              this.$notify({
+                title: "成功",
+                message: "通过成功！",
+                type: "success",
+              });
+              this.getList();
+              this.listLoading = false;
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        });
       },
       reject(row) {
-        this.form.id = row.id
-        this.form.flag = 2
-        this.rejectInfo = true
+        this.form.id = row.id;
+        this.form.flag = 2;
+        this.rejectInfo = true;
       },
       rejectClose() {
-        this.form.rejectReasonDescription = ""
-        this.rejectInfo = false
+        this.form.rejectReasonDescription = "";
+        this.rejectInfo = false;
       },
       submit() {
         if (!this.form.rejectReasonDescription) {
-          this.$message.error("请输入驳回原因")
-          return
+          this.$message.error("请输入驳回原因");
+          return;
         }
-        if (this.form.rejectReasonDescription.length < 6 || this.form.rejectReasonDescription.length > 100) {
-          this.$message.error("驳回原因字数应在6-100之间")
-          return
+        if (
+          this.form.rejectReasonDescription.length < 6 ||
+          this.form.rejectReasonDescription.length > 100
+        ) {
+          this.$message.error("驳回原因字数应在6-100之间");
+          return;
         }
-        this.listLoading = true
-        toExamine(this.form).then(response => {
+        this.listLoading = true;
+        toExamine(this.form)
+          .then((response) => {
             this.$notify({
-              title: '成功',
-              message: '驳回成功！',
-              type: 'success'
+              title: "成功",
+              message: "驳回成功！",
+              type: "success",
             });
-            this.form = {}
-            this.rejectInfo = false
-            this.getList()
-            this.listLoading = false
+            this.form = {};
+            this.rejectInfo = false;
+            this.getList();
+            this.listLoading = false;
           })
           .catch(() => {
-            this.loading = false
-          })
+            this.loading = false;
+          });
       },
       submitInfo() {
         if (!this.Info.newsTitle) {
-          this.$message.error("请输入标题")
-          return
+          this.$message.error("请输入标题");
+          return;
         }
         if (!this.Info.newsContent) {
-          this.$message.error("请输入内容")
-          return
+          this.$message.error("请输入内容");
+          return;
         }
         if (this.Info.newsTitle.length < 4 || this.Info.newsTitle.length > 20) {
-          this.$message.error("标题字数应在4-20之间")
-          return
+          this.$message.error("标题字数应在4-20之间");
+          return;
         }
-        if (this.Info.newsContent.length < 10 || this.Info.newsContent.length > 100) {
-          this.$message.error("消息内容字数应在10-100之间")
-          return
+        if (
+          this.Info.newsContent.length < 10 ||
+          this.Info.newsContent.length > 100
+        ) {
+          this.$message.error("消息内容字数应在10-100之间");
+          return;
         }
-        this.listLoading = true
-        postNews(this.Info).then(response => {
+        this.listLoading = true;
+        postNews(this.Info)
+          .then((response) => {
             this.$notify({
-              title: '成功',
-              message: '发送成功！',
-              type: 'success'
+              title: "成功",
+              message: "发送成功！",
+              type: "success",
             });
-            this.sendInfoClose()
-            this.listLoading = false
+            this.sendInfoClose();
+            this.listLoading = false;
           })
           .catch(() => {
-            this.loading = false
-          })
+            this.loading = false;
+          });
       },
       userSee(row) {
-        this.idSee.cardAddressUrl = row.cardAddressUrl
-        this.idSee.cardBackAddressUrl = row.cardBackAddressUrl
-        this.idSee.name = row.name
-        this.idSee.cardNumber = row.cardNumber
-        this.idSee.cardValidityDate = row.cardValidityDate
+        this.idSee.cardAddressUrl = row.cardAddressUrl;
+        this.idSee.cardBackAddressUrl = row.cardBackAddressUrl;
+        this.idSee.name = row.name;
+        this.idSee.cardNumber = row.cardNumber;
+        this.idSee.cardValidityDate = row.cardValidityDate;
         this.userInfo = true;
       },
       userInfoClose() {
@@ -589,12 +667,12 @@
     margin-bottom: 20px;
 
     .title_css {
-      color: #9D9D9D;
+      color: #9d9d9d;
       margin-bottom: 6px;
     }
 
     .name_css {
-      color: #0D0D0D;
+      color: #0d0d0d;
       margin-bottom: 20px;
     }
 
@@ -614,8 +692,8 @@
   }
 
   .btn_css {
-    color: #409EFF;
-    cursor: pointer
+    color: #409eff;
+    cursor: pointer;
   }
 
   .sign {
@@ -640,9 +718,9 @@
       font-size: 16px;
     }
 
-    ::v-deep .el-textarea__inner {
-      background: #F0F1F2;
-    }
+    // ::v-deep .el-textarea__inner {
+    //   background: #F0F1F2;
+    // }
 
     .form_btn {
       text-align: right;
@@ -669,10 +747,16 @@
 
   .advancePayment-style {
     display: flex;
-
   }
 
   ::v-deep .advancePayment-style .el-input__inner {
     height: 30px;
   }
+
+  .pay {
+    .pay_css {
+      display: flex;
+      margin-bottom: 20px;
+    }
+  }
 </style>

src/views/cargoOwnerManagement/merchantVerification.vue

@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按货主姓名、账号和企业名称查找" v-model="searchkeyWord" clearable></el-input>
+							<el-input placeholder="可按货主姓名、账号和企业名称查找" v-model="searchkeyWord" clearable @change="find"></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -51,9 +51,9 @@
 				<el-table-column prop="status" label="状态"></el-table-column>
 				<el-table-column label="操作" min-width="350">
 					<template slot-scope="scope">
-						<el-link  target="_blank" @click="adopt(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">通过</el-link>
+						<el-link  target="_blank" @click="adopt(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '平台审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<el-link target="_blank" @click="reject(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">驳回</el-link>
+						<el-link target="_blank" @click="reject(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '平台审核中'">驳回</el-link>
 					</template>
 				</el-table-column>
 			</el-table>

src/views/cargoOwnerManagement/taskAudit.vue

@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable></el-input>
+							<el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>

src/views/driverManagement/fleetInfo.vue

@@ -7,7 +7,7 @@
           <el-col :span="14" style="height: 45px"> </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按队长姓名、账号、车队名称查找" v-model="searchkeyWord" clearable></el-input>
+              <el-input placeholder="可按队长姓名、账号、车队名称查找" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>

src/views/driverManagement/identityExamine.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按司机姓名、账号、身份证号查找" v-model="searchkeyWord" clearable></el-input>
+              <el-input placeholder="可按司机姓名、账号、身份证号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -877,9 +877,9 @@
       font-size: 16px;
     }
 
-    ::v-deep .el-textarea__inner {
-      background: #f0f1f2;
-    }
+    // ::v-deep .el-textarea__inner {
+    //   background: #f0f1f2;
+    // }
 
     .form_btn {
       text-align: right;

src/views/driverManagement/vehicleExamine.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" clearable></el-input>
+              <el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按法人姓名、账号、企业名称查找" v-model="searchkeyWord" clearable></el-input>
+              <el-input placeholder="可按法人姓名、账号、企业名称查找" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -128,8 +128,8 @@
         <div class="right_item">{{infoData.legalPersonName}}</div>
         <div class="right_title">联系方式</div>
         <div class="right_item">{{infoData.accountNumber}}</div>
-<!--        <div class="right_title">注册实缴金额（万元）</div>
-        <div class="right_item">{{infoData.registeredPaidAmount}}</div> -->
+       <div class="right_title">通讯地址</div>
+        <div class="right_item">{{infoData.mailingAddress}}</div>
         <div class="right_title">上传营业执照</div>
         <div class="right_item">
           <img :src="infoData.businessLicenseAddressUrl" class="right_img" @click="enlarge(infoData.businessLicenseAddressUrl)">
@@ -148,7 +148,7 @@
           <div class="right_title">身份证有效期</div>
         <div class="right_item">{{infoData.cardValidityDate}}</div>
 
-        <div class="right_title">{{infoData.landOwnership == 0 ? "房产证":"租赁合同"}}</div>
+        <div class="right_title" v-if="infoData.advanceFreightService == 1">{{infoData.landOwnership == 0 ? "房产证":"租赁合同"}}</div>
         <div class="right_item"  v-for="(item , index) in infoData.imgs" :key="index">
           <img :src="item" class="right_img" @click="enlarge(item)">
         </div>
@@ -196,7 +196,7 @@
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        search: '1',
+        search: '5',
         addressUrl: [],
         disabled: false,
         rejectInfo: false,
@@ -240,15 +240,44 @@
       },
       getList() {
         this.loading = true
-        let _obj = {}
-        _obj.currentPage = this.currentPage
-        _obj.pageSize = this.pageSize
-        _obj.searchKeyWord = this.searchkeyWord
-        _obj.searchType = this.search
-        getList(_obj).then(response => {
-            this.tableData = response.data.records
-            this.deptBudgetTotal = response.data.total
-            this.listLoading = false
+       let _obj = {}
+        let start_obj = {}
+        start_obj.currentPage = this.currentPage
+        start_obj.pageSize = this.pageSize
+        start_obj.searchKeyWord = this.searchkeyWord
+        start_obj.searchType = 1
+        console.log(start_obj)
+        getList(start_obj).then(response => {
+          if(response.data.records.length>0){
+            this.search=1
+            _obj.currentPage = this.currentPage
+            _obj.pageSize = this.pageSize
+            _obj.searchKeyWord = this.searchkeyWord
+            _obj.searchType = this.search
+            getList(_obj).then(response => {
+              this.tableData = response.data.records
+              this.deptBudgetTotal = response.data.total
+              this.listLoading = false
+            })
+              .catch(() => {
+            this.loading = false
+          })
+          }else{
+            this.search=''
+            _obj.currentPage = this.currentPage
+            _obj.pageSize = this.pageSize
+            _obj.searchKeyWord = this.searchkeyWord
+            _obj.searchType = this.search
+            getList(_obj).then(response => {
+              this.tableData = response.data.records
+              this.deptBudgetTotal = response.data.total
+              this.listLoading = false
+            })
+              .catch(() => {
+            this.loading = false
+          })
+          }
+            
           })
           .catch(() => {
             this.loading = false

src/views/feedbackManagement/userFeedback.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按工单编号、姓名、账号和反馈信息查找" v-model="searchkeyWord" clearable></el-input>
+              <el-input placeholder="可按工单编号、姓名、账号和反馈信息查找" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -39,7 +39,7 @@
         <el-table-column prop="initiatorNumber" label="发起方账号"></el-table-column>
         <el-table-column prop="passive" label="被动方"></el-table-column>
         <el-table-column prop="passiveNumber" label="被动方账号"></el-table-column>
-        <el-table-column prop="content" label="内容"></el-table-column>
+        <el-table-column prop="content" label="内容" min-width="200"></el-table-column>
         <el-table-column prop="authenticationStatus" label="附图">
           <template scope="scope">
             <span  class="btn_css" @click="seeUrl(scope.row)">查看</span>
@@ -56,7 +56,7 @@
             <span v-if="scope.row.processingResultsSatisfaction == 5">非常满意</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="300">
+        <el-table-column label="操作" min-width="100">
           <template slot-scope="scope">
             <el-link target="_blank" type="primary" :underline="false" @click="lookInfo(scope.row)">查看</el-link>
             <el-divider direction="vertical"></el-divider>

src/views/login/index.vue

@@ -3,7 +3,7 @@
 		<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
 			label-position="left">
 			<div class="title-container">
-				<h3 class="title">智运管理平台</h3>
+				<h3 class="title">畅运通管理平台</h3>
 			</div>
 
 			<el-form-item prop="username">

src/views/officialWebsiteManagement/newsAdd.vue

@@ -147,7 +147,6 @@
         return isIMAGE && isLt1M
       },
       uploadSuccess(res) {
-        debugger
         // 获取富文本组件实例
         let quill = this.$refs.QuillEditor.quill
         // 如果上传成功

src/views/officialWebsiteManagement/newsEdit.vue

@@ -127,12 +127,10 @@
     },
     methods: {
       getList() {
-        debugger
         this.listLoading = true
         var _obj = {}
         _obj.id = this.id
         seeData(_obj).then(response => {
-            debugger
             this.form = response.data
             console.log(this.form)
             this.listLoading = false
@@ -166,7 +164,6 @@
         return isIMAGE && isLt1M
       },
       uploadSuccess(res) {
-        debugger
         // 获取富文本组件实例
         let quill = this.$refs.QuillEditor.quill
         // 如果上传成功

src/views/officialWebsiteManagement/newsLook.vue

@@ -38,9 +38,8 @@
 				this.listLoading = true
 				var _obj = {}
 				_obj.id = this.id
-				seeData(_obj).then(response => {debugger
+				seeData(_obj).then(response => {
 						this.form = response.data
-            console.log(this.form)
 						this.listLoading = false
 					})
 					.catch(() => {

src/views/officialWebsiteManagement/noticeAdd.vue

@@ -147,7 +147,6 @@
         return isIMAGE && isLt1M
       },
       uploadSuccess(res) {
-        debugger
         // 获取富文本组件实例
         let quill = this.$refs.QuillEditor.quill
         // 如果上传成功

src/views/officialWebsiteManagement/noticeEdit.vue

@@ -127,12 +127,10 @@
     },
     methods: {
       getList() {
-        debugger
         this.listLoading = true
         var _obj = {}
         _obj.id = this.id
         seeData(_obj).then(response => {
-            debugger
             this.form = response.data
             console.log(this.form)
             this.listLoading = false
@@ -166,7 +164,6 @@
         return isIMAGE && isLt1M
       },
       uploadSuccess(res) {
-        debugger
         // 获取富文本组件实例
         let quill = this.$refs.QuillEditor.quill
         // 如果上传成功

src/views/officialWebsiteManagement/publicityEdit.vue

@@ -177,7 +177,6 @@
         return isIMAGE && isLt1M
       },
       uploadSuccess(res) {
-        debugger
         // 获取富文本组件实例
         let quill = this.$refs.QuillEditor.quill
         // 如果上传成功

src/views/officialWebsiteManagement/publicityLook.vue

@@ -38,9 +38,8 @@
 				this.listLoading = true
 				var _obj = {}
 				_obj.id = this.id
-				seeData(_obj).then(response => {debugger
+				seeData(_obj).then(response => {
 						this.form = response.data
-            console.log(this.form)
 						this.listLoading = false
 					})
 					.catch(() => {

src/views/orderManagement/orderAudit.vue

@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按订单编号、姓名、账号查找" v-model="searchkeyWord" clearable></el-input>
+              <el-input placeholder="可按订单编号、姓名、账号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -75,32 +75,23 @@
         <el-table-column prop="amountMoney" label="司机费用结算">
           <el-table-column prop="driverServiceCharge" label="服务费(元)"></el-table-column>
           <el-table-column prop="payable" label="应付(元)"></el-table-column>
-          <el-table-column prop="payabled" label="已付(元)">
-            <template slot-scope="scope">
-              <span>{{scope.row.freightAdvance == 0 ? "" : scope.row.alreadyRepaid}}</span>
-            </template>
-          </el-table-column>
+          <el-table-column prop="payabled" label="已付(元)"></el-table-column>
           <el-table-column prop="nopayable" label="未付(元)"></el-table-column>
         </el-table-column>
         <el-table-column prop="amountMoney" label="货主费用结算">
           <el-table-column prop="ownerServiceCharge" label="服务费(元)"></el-table-column>
           <el-table-column prop="overdueFee" label="超期费(元)">
             <template slot-scope="scope">
-              <span class="btn_css" @click="costLook(scope.row)">{{scope.row.freightAdvance == 0 ? "" : 0}}</span>
+              <span class="btn_css" @click="costLook(scope.row)">{{scope.row.overdueFee }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="receivable" label="应收(元)"></el-table-column>
-          <el-table-column prop="receivabled" label="已收(元)">
-            <template slot-scope="scope">
-              <span>{{scope.row.freightAdvance == 0 ? "" : scope.row.alreadyRepaid}}</span>
-            </template>
-          </el-table-column>
+          <el-table-column prop="receivabled" label="已收(元)"></el-table-column>
         </el-table-column>
-
         <el-table-column prop="invoicing" label="发票"></el-table-column>
         <el-table-column prop="driverContractUrl" label="合同">
           <template scope="scope">
-          <span @click="contract(scope.row)" class="btn_css">查看</span>
+          <span @click="contract(scope.row)" class="btn_css" v-if="scope.row.orderStatusKey>3 && scope.row.cargoOwnerStatus != '已终止'">查看</span>
          </template>
         </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" min-width="160"></el-table-column>
@@ -131,18 +122,21 @@
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
-                    :disabled="scope.row.cargoOwnerStatusKey != 29">完结</el-link>
+                    :disabled="scope.row.freightAdvance =='非垫付' && scope.row.cargoOwnerStatusKey != 29">完结</el-link>
                   <!-- 完结：支付完尾款后从未进行过完结操作前显示的操作。 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <!-- v-if="scope.row.freightAdvance == 1" -->
-                  <el-link target="_blank" type="primary" :underline="false"
-                    :disabled="scope.row.freightAdvance != 1 && scope.row.cargoOwnerStatusKey < 9">预付</el-link>
+                  <!-- 运输中的可以付预付款-->
+                  <el-link target="_blank" type="primary" :underline="false" v-if="scope.row.freightAdvance == '垫付'"
+                    :disabled="scope.row.cargoOwnerStatusKey == 13?'true':'false' && scope.row.payabled " @click="preMoneyChange(scope.row)">预付</el-link>
                   <!-- 垫付类型的订单，平台确认装车后从未进行过预付操作（即预付款=0）时显示的按钮。 -->
                 </el-dropdown-item>
+                <!-- 货主订单状态key（1待接单3未装车5待确认装车7已驳回装车信息9待平台确认装车11平台驳回装车信息13运输中15待收货17已驳回卸车信息19待平台确认卸车21平台驳回卸车信息
+                 * 23待结算25已结算27待还款29已还款31已完结33已终止） -->
                 <el-dropdown-item>
-                  <el-link target="_blank" type="primary" :underline="false"
-                    :disabled="scope.row.freightAdvance != 1 && scope.row.cargoOwnerStatusKey < 19">尾款</el-link>
+                  <!-- 垫付  待结算  未付过尾款的 -->
+                  <el-link target="_blank" type="primary" :underline="false" v-if="scope.row.freightAdvance == '垫付'"
+                    :disabled="scope.row.cargoOwnerStatusKey == 23?'false':'true' && scope.row.payabled == scope.row.payable" @click="tailmoneyChange(scope.row)">尾款</el-link>
                   <!-- 垫付类型的订单，平台确认卸车后从未进行过尾款操作（即尾款=0）时显示的按钮。 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
@@ -217,6 +211,21 @@
         </div>
         <div class="right_title">货名</div>
         <div class="right_item">{{costData.goodsName}}</div>
+        <div class="right_title">发货联系人</div>
+        <div class="right_item">{{costData.publishTaskInfo.sender}}</div>
+         <div class="right_title">发货联系人电话</div>
+        <div class="right_item">{{costData.publishTaskInfo.senderPhone}}</div>
+
+         <div class="right_title">收货联系人</div>
+        <div class="right_item">{{costData.publishTaskInfo.receiver}}</div>
+         <div class="right_title">收货联系人电话</div>
+        <div class="right_item">{{costData.publishTaskInfo.receiverPhone}}</div>
+         <div class="right_title">收货人身份证号</div>
+        <div class="right_item">{{costData.publishTaskInfo.receiverIdcard}}</div>
+          <div class="right_title">收货方信用代码（选填）</div>
+        <div class="right_item">{{costData.publishTaskInfo.receiverCreditCode?costData.publishTaskInfo.receiverCreditCode:'暂无'}}</div>
+
+
         <div class="right_title">距离</div>
         <div class="right_item">约{{costData.distance ? costData.distance : 0}}km</div>
         <div class="right_title">运费</div>
@@ -297,7 +306,9 @@
     auditData,
     endData,
     editEndData,
-    batchData
+    batchData,
+    preMoney,
+    tailMoney
   } from '@/api/orderManagement'
   export default {
     components: {
@@ -326,7 +337,9 @@
           textarea: "",
         },
         value1: "",
-        costData: {},
+        costData: {
+          publishTaskInfo:{}
+        },
         rightSee: false,
         modification: [],
         //图片预览
@@ -338,6 +351,61 @@
       this.getList()
     },
     methods: {
+      //预付
+      preMoneyChange(val){
+        this.$confirm('垫付预付款'+val.advanceCharge+'元?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            this.listLoading = true
+            preMoney({
+                id: val.freightId,
+                prepaidFreight:val.advanceCharge
+              }).then(response => {
+                 this.$notify({
+                  title: '成功',
+                  message: '操作成功！',
+                  type: 'success'
+                });
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.listLoading = false
+              })
+          })
+      },
+      //尾款
+      tailmoneyChange(val){
+        // 合计运费-预付款-司机服务费=尾款
+        let money = Number(val.actualFreight) - Number(val.prepaidFreight) - Number(val.driverServiceCharge)
+        this.$confirm('确定垫付尾款：'+ money+'元？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            this.listLoading = true
+            tailMoney({
+                id: val.freightId,
+                freightBalance:money
+              }).then(response => {
+                 this.$notify({
+                  title: '成功',
+                  message: '操作成功！',
+                  type: 'success'
+                });
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.listLoading = false
+              })
+          })
+
+      },
       closeImgViewer() {
         this.srcList = []
         this.imgsVisible = false;
@@ -347,7 +415,6 @@
         this.srcList.push(url)
       },
       toMapPage(row) {
-        debugger
         this.$router.push({
           path: 'trajectory',
           query: {
@@ -468,7 +535,7 @@
         this.getList()
       },
       contract(row) {
-        window.open(row.ownerContractUrl)
+        window.open(row.driverContractUrl)
         // this.userInfo = true;
       },
       userClose() {
@@ -497,7 +564,7 @@
         } else if (this.costData.orderStatusKey == 19) {
           _data.loadingFlag = 2
         }
-        this.$confirm('确定订单已完结？', '提示', {
+        this.$confirm(num==1?'确定通过订单？':'确定驳回订单？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning',

src/views/orderManagement/trajectory.vue

@@ -11,7 +11,7 @@
         </div>
       </div>
       <div class="map">
-        <map-drag :radio=' radio' :orderid='querydata.id'></map-drag>
+        <map-drag :radio='radio' :orderid='querydata.id'></map-drag>
       </div>
     </div>
   </div>

src/views/platformManagement/specifiedRecords.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input v-model="searchkeyWord" placeholder="可按版本号、编写单位、编撰人员查找" clearable />
+              <el-input v-model="searchkeyWord" placeholder="可按版本号、编写单位、编撰人员查找" clearable @change="find" />
               <el-button class="search" @click="find"><img
                 width="16"
                 height="16"