achao 3 年之前
父节点
当前提交
f432d2c11a

+ 2 - 0
package.json

@@ -14,9 +14,11 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@tinymce/tinymce-vue": "^5.0.0",
     "axios": "0.18.1",
     "core-js": "^3.6.5",
+    "element-china-area-data": "^5.0.2",
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",

+ 10 - 1
src/api/cargoOwnerManagement.js

@@ -55,4 +55,13 @@ export function toGrantExamine(data) {
     method: 'post',
      data: data,
   })
-}
+}
+
+
+export function getBillList(data) {
+  return request({
+    url: '/hyCargoOwnerCapitalInfo/selectBill',
+    method: 'get',
+     params: data,
+  })
+}

+ 9 - 1
src/api/enterpriseManagement.js

@@ -14,4 +14,12 @@ export function toallowExamine(data) {
     method: 'post',
      data: data,
   })
-}
+}
+
+export function getBillList(data) {
+  return request({
+    url: '/hyCargoOwnerCapitalInfo/selectBill',
+    method: 'get',
+     params: data,
+  })
+}

+ 151 - 0
src/components/mapdrag/indexMap.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="positionBox">
+    <div id="allmap"></div>
+  </div>
+</template>
+<script>
+  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'],
+    watch: {
+      radio: function(val1, val2) {
+        if(val1==1) {
+          this.path = this.path1
+        }else{
+          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);
+            });
+        });
+      },
+      // 轨迹
+      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, //所属的地图实例
+
+            getPath: function(pathData, pathIndex) {
+              return pathData.path;
+            },
+            getHoverTitle: function(pathData, pathIndex, pointIndex) {
+              if (pointIndex >= 0) {
+                //point
+                return (
+                  pathData.name +
+                  ",点:" +
+                  pointIndex +
+                  "/" +
+                  pathData.path.length
+                );
+              }
+
+              return pathData.name + ",点数量" + pathData.path.length;
+            },
+            renderOptions: {
+              renderAllPointsIfNumberBelow: 100 //绘制路线节点,如不需要可设置为-1
+            }
+          });
+
+          window.pathSimplifierIns = pathSimplifierIns;
+
+          //设置数据
+          pathSimplifierIns.setData([{
+            name: "路线0",
+            path: this.path
+          }]);
+
+          //对第一条线路(即索引 0)创建一个巡航器
+          let trajectory = pathSimplifierIns.createPathNavigator(0, {
+            loop: true, //循环播放
+            speed: 1000000 //巡航速度,单位千米/小时
+          });
+
+          trajectory.start();
+        });
+      }
+    },
+    mounted() {
+       this.path = this.path1
+      this.loadmap();
+    }
+  };
+</script>
+<style scoped>
+  #allmap {
+    width: 100%;
+    height:calc(100vh  - 150px);
+  }
+</style>

+ 1 - 1
src/router/cargoOwnerManagement/index.js

@@ -16,7 +16,7 @@ const cargoOwnerManagementRouter = {
         name: 'empowerExamine',
         component: () => import('@/views/cargoOwnerManagement/empowerExamine'),
         meta: {
-            title: '身份审核',
+            title: '货主信息',
             icon: ''
         }
     },

+ 1 - 1
src/router/enterpriseManagement/index.js

@@ -17,7 +17,7 @@ const enterpriseManagementRouter = {
         name: 'enterpriseAudit',
         component: () => import('@/views/enterpriseManagement/enterpriseAudit'),
         meta: {
-            title: '企业审核',
+            title: '企业信息',
             icon: ''
         }
     }

+ 12 - 1
src/router/orderManagement/index.js

@@ -12,7 +12,8 @@ const orderManagementRouter = {
         icon: 'dingdanguanli'
     },
     alwaysShow: true,
-    children: [{
+    children: [
+      {
         path: 'orderAudit',
         name: 'orderAudit',
         component: () => import('@/views/orderManagement/orderAudit'),
@@ -20,6 +21,16 @@ const orderManagementRouter = {
             title: '订单审核',
             icon: ''
         }
+    },
+    {
+        path: 'trajectory',
+        name: 'trajectory',
+        component: () => import('@/views/orderManagement/trajectory'),
+        meta: {
+            title: '轨迹',
+            icon: ''
+        },
+        	hidden: true
     }
     ]
 }

+ 62 - 6
src/views/cargoOwnerManagement/empowerExamine.vue

@@ -1,4 +1,4 @@
-// 货主身份审核
+// 货主信息
 <template>
 	<div class="center">
 		<div class="center_css">
@@ -11,8 +11,7 @@
 						<div class="screen">
 							<el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable></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>
+									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button>
 						</div>
 					</el-col>
 				</el-row>
@@ -65,11 +64,49 @@
 						<span class="btn_css">查看</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="cardAddressUrl" label="身份证">
+        <el-table-column prop="amountMoney" label="代理身份">
+        	<template slot-scope="scope">
+        		<span class="btn_css">查看</span>
+        	</template>
+        </el-table-column>
+				<el-table-column prop="advancePayment" label="垫付比例(%)" width="100px">
 					<template slot-scope="scope">
-						<span class="btn_css" @click="userSee(scope.row)">查看</span>
+            <div class="advancePayment-style">
+              <el-input placeholder="0" v-model="scope.row.advancePayment" clearable></el-input>
+              <i class="el-icon-edit"></i>
+              <!-- <span class="btn_css" @click="userSee(scope.row)">查看</span> -->
+            </div>
+
 					</template>
 				</el-table-column>
+        <el-table-column label="账单" min-width="133">
+          <template slot-scope="scope">
+            <el-popover
+              placement="right"
+              width="400"
+              trigger="click"
+              @show="getBillList(scope.row.id)"
+              >
+              <div class="bill-content">
+                <div class="bill-item" v-for="item in billList">
+                  <div class="row1">
+                    <div class="left">
+                      充值
+                    </div>
+                    <div class="right">1000</div>
+                  </div>
+                  <div class="row2">
+                    <div class="left">
+                      支付预付款
+                    </div>
+                    <div class="right">-1000</div>
+                  </div>
+                </div>
+              </div>
+              <el-button slot="reference">账单</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
 				<el-table-column prop="authenticationStatus" label="状态"></el-table-column>
 				<el-table-column label="操作" min-width="350">
 					<template slot-scope="scope">
@@ -153,11 +190,13 @@
 	import {
 		getList,
 		toExamine,
-		postNews
+		postNews,
+    getBillList
 	} from '@/api/cargoOwnerManagement'
 	export default {
 		data() {
 			return {
+        billList:[],
 				tableData: [],
 				//分页
 				searchkeyWord: "",
@@ -181,6 +220,20 @@
 			this.getList()
 		},
 		methods: {
+      getBillList(id) {
+        console.log('查看账单')
+        let _obj = {
+          commonId:id,
+          pageSize:1,
+          currentPage:999
+        }
+        getBillList(_obj).then(response => {
+            this.billList = response.data.records
+          })
+          .catch(() => {
+            this.loading = false
+          })
+      },
 			getList() {
 				this.loading = true
 				let _obj = {}
@@ -560,4 +613,7 @@
 			margin-top: 10px;
 		}
 	}
+  .advancePayment-style{
+    display: flex;
+  }
 </style>

+ 486 - 426
src/views/enterpriseManagement/enterpriseAudit.vue

@@ -1,71 +1,103 @@
-// 企业审核
+// 企业信息
 <template>
-	<div class="center">
-		<div class="center_css">
-			<div class="top_css">
-				<el-row>
-					<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-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>
-						</div>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col>
-						<div class="search_btn">
-							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
-								@click="searchBtn('')">
-								全部
-							</div>
-							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
-								待审核
-							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
-								已通过
-							</div>
-							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
-								已驳回
-							</div>
-							<div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
-								已过期
-							</div>
-						</div>
-					</el-col>
-				</el-row>
-			</div>
-			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<el-table-column prop="companyName" label="企业名称" min-width="150"></el-table-column>
-				<el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码" min-width="140"></el-table-column>
-				<el-table-column prop="legalPersonName" label="法定代表人" min-width="91"></el-table-column>
-				<el-table-column prop="accountNumber" label="账号" min-width="107"></el-table-column>
-				<el-table-column prop="registeredPaidAmount" label="实缴金额(万元)" min-width="133"></el-table-column>
-				<el-table-column prop="updateDate" label="认证日期"></el-table-column>
-				<el-table-column prop="siteLeaseDate" label="厂地租赁截止日期" min-width="132"></el-table-column>
-				<el-table-column prop="businessTermDate" label="营业期限"></el-table-column>
-				<el-table-column prop="status" label="状态"></el-table-column>
-				<el-table-column label="操作" min-width="200">
-					<template slot-scope="scope">
-						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">通过</el-link>
-						<el-divider direction="vertical"></el-divider>
-						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">驳回</el-link>
-						<el-divider direction="vertical"></el-divider>
-						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false">查看</el-link>
-						<!-- <span class="btn_css" @click="seeInfo(scope.row)"></span> -->
-					</template>
-				</el-table-column>
-			</el-table>
-		</div>
-		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
-			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
-		</el-pagination>
-		<!-- <el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+  <div class="center">
+    <div class="center_css">
+      <div class="top_css">
+        <el-row>
+          <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-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>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="search_btn">
+              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
+                @click="searchBtn('')">
+                全部
+              </div>
+              <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
+                待审核
+              </div>
+              <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+                已通过
+              </div>
+              <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+                已驳回
+              </div>
+              <div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
+                已过期
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
+        <el-table-column prop="companyName" label="企业名称" min-width="150"></el-table-column>
+        <el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码" min-width="140"></el-table-column>
+        <el-table-column prop="legalPersonName" label="法定代表人" min-width="91"></el-table-column>
+        <el-table-column prop="accountNumber" label="账号" min-width="107"></el-table-column>
+        <el-table-column prop="accountBalance" label="可用余额(元)" min-width="133"></el-table-column>
+        <el-table-column prop="frozenAmount" label="冻结金额(元)" min-width="133"></el-table-column>
+        <el-table-column label="账单" min-width="133">
+          <template slot-scope="scope">
+            <el-popover
+              placement="right"
+              width="400"
+              trigger="click"
+              @show="getBillList(scope.row.id)"
+              >
+              <div class="bill-content">
+                <div class="bill-item" v-for="item in billList">
+                  <div class="row1">
+                    <div class="left">
+                      充值
+                    </div>
+                    <div class="right">1000</div>
+                  </div>
+                  <div class="row2">
+                    <div class="left">
+                      支付预付款
+                    </div>
+                    <div class="right">-1000</div>
+                  </div>
+                </div>
+              </div>
+              <el-button slot="reference">账单</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <!-- 	<el-table-column prop="registeredPaidAmount" label="实缴金额(万元)" min-width="133"></el-table-column>
+				<el-table-column prop="updateDate" label="认证日期"></el-table-column> -->
+        <el-table-column prop="siteLeaseDate" label="厂地租赁截止日期" min-width="132"></el-table-column>
+        <el-table-column prop="businessTermDate" label="营业期限"></el-table-column>
+        <el-table-column prop="status" label="状态"></el-table-column>
+        <el-table-column label="操作" min-width="200">
+          <template slot-scope="scope">
+            <el-link target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false"
+              :disabled="scope.row.status != '审核中'">通过</el-link>
+            <el-divider direction="vertical"></el-divider>
+            <el-link target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false"
+              :disabled="scope.row.status != '审核中'">驳回</el-link>
+            <el-divider direction="vertical"></el-divider>
+            <el-link target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false">查看</el-link>
+            <!-- <span class="btn_css" @click="seeInfo(scope.row)"></span> -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
+    <!-- <el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
 				<div><span class="sign">*</span>选择驳回原因</div>
 				<div class="form_css">
@@ -88,375 +120,403 @@
 				</div>
 			</div>
 		</el-dialog> -->
-		<el-drawer title="企业详情" :visible.sync="rightSee" >
-			<div class="right_css">
-						<div class="right_title">企业名称</div>
-						<div class="right_item">{{infoData.companyName}}</div>
-						<div class="right_title">法定代表人姓名</div>
-						<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">
-							<img :src="infoData.businessLicenseAddressUrl" class="right_img">
-						</div>
-						<div class="right_title">营业期限截止日期</div>
-						<div class="right_item">{{infoData.businessTermDate}}</div>
-						<div class="right_title">统一社会信用代码</div>
-						<div class="right_item">{{infoData.unifiedSocialCreditCode}}</div>
-						<div class="right_title">{{infoData.landOwnership == 0 ? "房产证":"租赁合同"}}</div>
-						<div class="right_item" v-if="infoData.imgs.length > 0" v-for="(item , index) in infoData.imgs">
-							<img :src="item" class="right_img">
-						</div>
-						
-						<div class="right_title">视频验证</div>
-						<div class="right_item">
-							<img src="../../../public/img/yonghu.jpg" class="right_img">
-						</div>
-						<div class="right_item">{{infoData.advanceFreightService == 1 ? "申请开通平台垫付运费业务" : "未申请开通平台垫付运费业务"}}</div>
-						<div class="right_btn">
-							<el-button @click="submit(1)" v-if="infoData.status == '审核中'">通过</el-button>
-							<el-button @click="submit(2)" v-if="infoData.status == '审核中'">驳回</el-button>
-							<el-button @click="rightSee = false">关闭</el-button>
-						</div>
-					</div>
-		</el-drawer>
-	</div>
+    <el-drawer title="企业详情" :visible.sync="rightSee">
+      <div class="right_css">
+        <div class="right_title">企业名称</div>
+        <div class="right_item">{{infoData.companyName}}</div>
+        <div class="right_title">法定代表人姓名</div>
+        <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">
+          <img :src="infoData.businessLicenseAddressUrl" class="right_img">
+        </div>
+        <div class="right_title">营业期限截止日期</div>
+        <div class="right_item">{{infoData.businessTermDate}}</div>
+        <div class="right_title">统一社会信用代码</div>
+        <div class="right_item">{{infoData.unifiedSocialCreditCode}}</div>
+        <div class="right_title">{{infoData.landOwnership == 0 ? "房产证":"租赁合同"}}</div>
+        <div class="right_item" v-if="infoData.imgs.length > 0" v-for="(item , index) in infoData.imgs">
+          <img :src="item" class="right_img">
+        </div>
+
+        <div class="right_title">视频验证</div>
+        <div class="right_item">
+          <img src="../../../public/img/yonghu.jpg" class="right_img">
+        </div>
+        <div class="right_item">{{infoData.advanceFreightService == 1 ? "申请开通平台垫付运费业务" : "未申请开通平台垫付运费业务"}}</div>
+        <div class="right_btn">
+          <el-button @click="submit(1)" v-if="infoData.status == '审核中'">通过</el-button>
+          <el-button @click="submit(2)" v-if="infoData.status == '审核中'">驳回</el-button>
+          <el-button @click="rightSee = false">关闭</el-button>
+        </div>
+      </div>
+    </el-drawer>
+  </div>
 </template>
 <script>
-	import {
-		getList,
-		toallowExamine
-	} from '@/api/enterpriseManagement'
-	export default {
-		data() {
-			return {
-				tableData: [],
-				//分页
-				searchkeyWord: "",
-				currentPage: 1,
-				pageSize: 10,
-				deptBudgetTotal: 0,
-				deptCircularPage: {},
-				search: "",
-				addressUrl: [],
-				disabled: false,
-				rejectInfo: false,
-				checkList: [],
-				form: {
-					checkList: [],
-					textarea: "",
-				},
-				rightSee:false,
-				infoData:{},
-				
-
-			};
-		},
-		mounted() {
-			this.getList()
-		},
-		methods: {
-			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
-					})
-					.catch(() => {
-						this.loading = false
-					})
-			},
-			submit(num){
-				var _allowObj = {}
-				_allowObj.id = this.infoData.id
-				let allowTitle = ""
-				if(num == 1){
-					_allowObj.flag = 1
-					allowTitle = "通过"
-				}else if(num == 2){
-					_allowObj.flag = 2
-					allowTitle = "驳回"
-				}
-				this.$confirm("确定"+ allowTitle +"企业审核?", '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {
-						this.listLoading = true
-						
-						toallowExamine(_allowObj).then(response => {
-							this.rightSee = false
-								this.infoData = {}
-								this.$notify({
-									title: '成功',
-									message: allowTitle+'成功!',
-									type: 'success'
-								});
-								this.getList()
-								this.listLoading = false
-							})
-							.catch(() => {
-								this.loading = false
-							})
-					})
-			},
-			seeInfo(row){
-				this.infoData = row
-				this.infoData.imgs = []
-				if(this.infoData.propertyAddressUrl){
-					this.infoData.imgs = this.infoData.propertyAddressUrl.split(',')
-				}
-				this.rightSee = true
-			},
-			
-			searchBtn(num) {
-				this.search = num;
-				this.getList();
-			},
-			find() {
-				this.getList();
-			},
-			onChange() {
-				this.$refs.upload
-					.handleSaveBill()
-					.then(async (response) => {
-						this.formData.addressUrl = response;
-					})
-					.catch((res) => {
-						EventBus.$emit("error", (JSON.parse(res) || {}).message);
-						this.$refs.upload.clearFiles();
-					});
-			},
-			handleSizeChange(val) {
-				console.log(`每页 ${val} 条`);
-				this.pageSize = val;
-				this.getList();
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val;
-				console.log(`当前页: ${val}`);
-				this.getList();
-			},
-		},
-	};
+  import {
+    getList,
+    toallowExamine,
+    getBillList
+  } from '@/api/enterpriseManagement'
+  export default {
+    data() {
+      return {
+        billList:[],
+        tableData: [],
+        //分页
+        searchkeyWord: "",
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        deptCircularPage: {},
+        search: "1",
+        addressUrl: [],
+        disabled: false,
+        rejectInfo: false,
+        checkList: [],
+        form: {
+          checkList: [],
+          textarea: "",
+        },
+        rightSee: false,
+        infoData: {},
+
+
+      };
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      getBillList(id) {
+        console.log('查看账单')
+        let _obj = {
+          companyId:id,
+          pageSize:1,
+          currentPage:999
+        }
+        getBillList(_obj).then(response => {
+            this.billList = response.data.records
+          })
+          .catch(() => {
+            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
+          })
+          .catch(() => {
+            this.loading = false
+          })
+      },
+      submit(num) {
+        var _allowObj = {}
+        _allowObj.id = this.infoData.id
+        let allowTitle = ""
+        if (num == 1) {
+          _allowObj.flag = 1
+          allowTitle = "通过"
+        } else if (num == 2) {
+          _allowObj.flag = 2
+          allowTitle = "驳回"
+        }
+        this.$confirm("确定" + allowTitle + "企业审核?", '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            this.listLoading = true
+
+            toallowExamine(_allowObj).then(response => {
+                this.rightSee = false
+                this.infoData = {}
+                this.$notify({
+                  title: '成功',
+                  message: allowTitle + '成功!',
+                  type: 'success'
+                });
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.loading = false
+              })
+          })
+      },
+      seeInfo(row) {
+        this.infoData = row
+        this.infoData.imgs = []
+        if (this.infoData.propertyAddressUrl) {
+          this.infoData.imgs = this.infoData.propertyAddressUrl.split(',')
+        }
+        this.rightSee = true
+      },
+
+      searchBtn(num) {
+        this.search = num;
+        this.getList();
+      },
+      find() {
+        this.getList();
+      },
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async (response) => {
+            this.formData.addressUrl = response;
+          })
+          .catch((res) => {
+            EventBus.$emit("error", (JSON.parse(res) || {}).message);
+            this.$refs.upload.clearFiles();
+          });
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.pageSize = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val;
+        console.log(`当前页: ${val}`);
+        this.getList();
+      },
+    },
+  };
 </script>
 <style lang="scss" scoped>
-	.center {
-		padding: 10px 20px;
-		background: #f5f6f7;
-		height: calc(100vh - 5vh);
+  .center {
+    padding: 10px 20px;
+    background: #f5f6f7;
+    height: calc(100vh - 5vh);
 
-		.top_css {
-			padding: 10px;
+    .top_css {
+      padding: 10px;
 
-			.search_btn {
+      .search_btn {
         height: 80px;
         background: linear-gradient(#fafbfb, #ffffff);
-				display: flex;
-				margin-top: 20px;
-        .search_block{
+        display: flex;
+        margin-top: 20px;
+
+        .search_block {
           margin-left: 20px;
         }
 
-				.search_item {
-					text-align: center;
-					font-size: 14px;
-					font-weight: 600;
-					line-height: 40px;
-					width: 112px;
-					height: 40px;
-					background: #f7f8f9;
-					cursor: pointer;
+        .search_item {
+          text-align: center;
+          font-size: 14px;
+          font-weight: 600;
+          line-height: 40px;
+          width: 112px;
+          height: 40px;
+          background: #f7f8f9;
+          cursor: pointer;
           margin-top: 30px;
-				}
-
-				.searchNo {
-					color: #323233;
-				}
-
-				.search {
-					color: #2f53eb;
-					background: #ffffff;
-				}
-			}
-		}
-
-		.center_css {
-			background: #ffffff;
-			border-radius: 1px;
-			margin-top: 10px;
-			padding-bottom: 10px;
-		}
-
-		.screen {
-			display: flex;
-
-			.search {
-				width: 40px;
-				height: 40px;
-				background: #f7f8fa;
-				border-radius: 0px 2px 2px 0px;
-				border: 1px solid #f0f1f2;
-			}
-
-			.count_css {
-				width: 80px;
-				text-align: center;
-				line-height: 40px;
-				color: #666666;
-			}
-		}
-
-		.el-button {
-			padding: 10px 20px !important;
-		}
-
-		.center_css {
-
-			::v-deep .el-table th,
-			::v-deep .el-table td {
-				text-align: center;
-			}
-
-			.fujian {
-				font-size: 24px;
-				color: #409eff;
-			}
-
-			.warning {
-				font-size: 14px;
-				color: #ed1d1d;
-			}
-		}
-	}
-
-	.car_css {
-		width: 50%;
-		display: inline-block;
-		text-align: center;
-		margin-top: 20px;
-	}
-
-	.car_item {
-		width: 100px;
-		height: 100px;
-	}
-
-	.user {
-		margin-bottom: 20px;
-
-		.user_id {
-			display: flex;
-			height: 30px;
-		}
-
-		.name_css,
-		.id_css {
-			width: 50%;
-		}
-
-		.name_css {
-			text-align: right;
-		}
-
-		.user_item {
-			width: 450px;
-			height: 300px;
-		}
-	}
-
-	::v-deep .el-table--border .el-table__header th {
-		background: #f7f8f9;
-	}
-
-	.btn_css {
-		color: #2f53eb;
-		cursor: pointer
-	}
-
-	.sign {
-		font-size: 14px;
-		color: red;
-	}
-
-	.form_css {
-		width: 100%;
-		margin: 20px auto 20px;
-
-		::v-deep .el-checkbox {
-			width: 40%;
-			height: 30px;
-		}
-
-		::v-deep .el-dialog__body {
-			padding: 10px 20px;
-		}
-
-		::v-deep .el-dialog__title {
-			font-size: 16px;
-		}
-
-		::v-deep .el-textarea__inner {
-			background: #F0F1F2;
-		}
-
-		.form_btn {
-			text-align: right;
-			margin-top: 10px;
-		}
-	}
-	//发送信息
-	.Info_css{
-		.Info_title{
-			color: #323233;
-			font-size: 16px;
-		}
-		.Info_item{
-			margin: 20px 0;
-		}
-		.Info_btn {
-			text-align: right;
-			margin-top: 10px;
-		}
-	}
-	
-	.right_css {
-			padding:0 20px;
-	
-			.right_title {
-				color: #9D9D9D;
-				font-size: 14px;
-			}
-	
-			.right_item {
-				color: #0D0D0D;
-				font-size: 14px;
-				margin-bottom: 20px;
-			}
-	
-			.right_btn {
-				text-align: right;
-				margin: 10px 0;
-			}
-	
-			.right_img {
-				width: 200px;
-				height: 120px;
-				margin-top: 10px;
-			}
-		}
-		::v-deep .el-drawer {
-			overflow: auto;
-		}
-	
+        }
+
+        .searchNo {
+          color: #323233;
+        }
+
+        .search {
+          color: #2f53eb;
+          background: #ffffff;
+        }
+      }
+    }
+
+    .center_css {
+      background: #ffffff;
+      border-radius: 1px;
+      margin-top: 10px;
+      padding-bottom: 10px;
+    }
+
+    .screen {
+      display: flex;
+
+      .search {
+        width: 40px;
+        height: 40px;
+        background: #f7f8fa;
+        border-radius: 0px 2px 2px 0px;
+        border: 1px solid #f0f1f2;
+      }
+
+      .count_css {
+        width: 80px;
+        text-align: center;
+        line-height: 40px;
+        color: #666666;
+      }
+    }
+
+    .el-button {
+      padding: 10px 20px !important;
+    }
+
+    .center_css {
+
+      ::v-deep .el-table th,
+      ::v-deep .el-table td {
+        text-align: center;
+      }
+
+      .fujian {
+        font-size: 24px;
+        color: #409eff;
+      }
+
+      .warning {
+        font-size: 14px;
+        color: #ed1d1d;
+      }
+    }
+  }
+
+  .car_css {
+    width: 50%;
+    display: inline-block;
+    text-align: center;
+    margin-top: 20px;
+  }
+
+  .car_item {
+    width: 100px;
+    height: 100px;
+  }
+
+  .user {
+    margin-bottom: 20px;
+
+    .user_id {
+      display: flex;
+      height: 30px;
+    }
+
+    .name_css,
+    .id_css {
+      width: 50%;
+    }
+
+    .name_css {
+      text-align: right;
+    }
+
+    .user_item {
+      width: 450px;
+      height: 300px;
+    }
+  }
+
+  ::v-deep .el-table--border .el-table__header th {
+    background: #f7f8f9;
+  }
+
+  .btn_css {
+    color: #2f53eb;
+    cursor: pointer
+  }
+
+  .sign {
+    font-size: 14px;
+    color: red;
+  }
+
+  .form_css {
+    width: 100%;
+    margin: 20px auto 20px;
+
+    ::v-deep .el-checkbox {
+      width: 40%;
+      height: 30px;
+    }
+
+    ::v-deep .el-dialog__body {
+      padding: 10px 20px;
+    }
+
+    ::v-deep .el-dialog__title {
+      font-size: 16px;
+    }
+
+    ::v-deep .el-textarea__inner {
+      background: #F0F1F2;
+    }
+
+    .form_btn {
+      text-align: right;
+      margin-top: 10px;
+    }
+  }
+
+  //发送信息
+  .Info_css {
+    .Info_title {
+      color: #323233;
+      font-size: 16px;
+    }
+
+    .Info_item {
+      margin: 20px 0;
+    }
+
+    .Info_btn {
+      text-align: right;
+      margin-top: 10px;
+    }
+  }
+
+  .right_css {
+    padding: 0 20px;
+
+    .right_title {
+      color: #9D9D9D;
+      font-size: 14px;
+    }
+
+    .right_item {
+      color: #0D0D0D;
+      font-size: 14px;
+      margin-bottom: 20px;
+    }
+
+    .right_btn {
+      text-align: right;
+      margin: 10px 0;
+    }
+
+    .right_img {
+      width: 200px;
+      height: 120px;
+      margin-top: 10px;
+    }
+  }
+
+  ::v-deep .el-drawer {
+    overflow: auto;
+  }
+  .bill-content{
+    .bill-item{
+      .row1,.row2{
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+  }
 </style>

+ 11 - 0
src/views/orderManagement/orderAudit.vue

@@ -127,6 +127,9 @@
                   <el-link target="_blank" type="primary" :underline="false" :disabled="scope.row.freightAdvance != 1 && scope.row.cargoOwnerStatusKey < 19">尾款</el-link>
                   <!-- 垫付类型的订单,平台确认卸车后从未进行过尾款操作(即尾款=0)时显示的按钮。 -->
                 </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-link target="_blank" type="primary" :underline="false" @click="toMapPage(scope.row)">轨迹</el-link>
+                </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -299,6 +302,14 @@
       this.getList()
     },
     methods: {
+      toMapPage(row){debugger
+        this.$router.push({
+          path: 'trajectory',
+          query: {
+            id: row.id,
+          }
+        })
+      },
       getList() {
         this.loading = true
         let _obj = {}

+ 56 - 0
src/views/orderManagement/trajectory.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="center">
+    <div class="center_css">
+      <div class="top_css">
+         <el-radio v-model="radio" label="1" @change="change">北斗导航</el-radio>
+          <el-radio v-model="radio" label="2" @change="change">平台绘制</el-radio>
+        <div class="order-detail">
+          <div>订单:123123123</div>
+          <div>发货地:辽宁省营口市鲅鱼圈红的储运库</div>
+          <div>发货地:黑龙江省齐齐哈尔市红的储运库</div>
+        </div>
+      </div>
+      <div class="map">
+        <map-drag :radio=' radio'></map-drag>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import mapDrag from '@/components/mapdrag/indexMap'
+  export default {
+    data() {
+      return {
+        radio: '1',
+      }
+    },
+    components: {
+      mapDrag
+    },
+    methods:{
+      change(val){
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .center {
+    padding: 20px;
+    background: #f5f6f7;
+    height: calc(100vh - 5vh);
+  }
+
+  .center_css {
+    background: #ffffff;
+    border-radius: 1px;
+    height: 100%;
+  }
+
+  .top_css {
+    padding: 10px;
+    display: flex;
+
+  }
+</style>