刘建成 / 物流 · 提交

转到一个项目

作者 许海潮
提交 05ea298e22f55704bee354b491cba37719ed012e 2 个父辈 5b9ab08e 2d91158e

合并分支 'brunch_li' 到 'master' 

提交李永春

合并

查看合并请求 !1
内嵌 并排对比
正在显示 5 个修改的文件 包含 180 行增加 和 210 行删除
... ... @@ -125,17 +125,16 @@
title="技术资料"
:visible.sync="dialogVisible"
width="80%"
style="margin-top: 20px"
:append-to-body="true"
>
<div class="jishus" style='height: 800px'>
<div class="jishus" style="height: 800px">
<div class="jichuss">
<div class="ges"></div>
<div class="jichusa">基础信息</div>
</div>
<div class="fahuo-li" style="margin-top:20px">
<div class="a" style="width:33.3%;">
<div class="fahuo-li" style="margin-top: 20px">
<div class="a" style="width: 33.3%">
<div class="sd">
<div class="fa-ji">当前状况</div>
<div class="conrt">车辆绕路、产品偏移、司机未按路线形式.5</div>
... ... @@ -150,20 +149,20 @@
</div>
<div class="sd">
<div class="fa-ji">加速度的加速数据</div>
<div class="biaos">
<div class="chaos">X轴(超速)</div>
<div class="chaos">Y轴</div>
<div class="chaos">Z轴</div>
</div>
<div class="biaoss">
<div class="chaoss">1000</div>
<div class="chaoss">60</div>
<div class="chaoss">55</div>
</div>
<div class="biaos">
<div class="chaos">X轴(超速)</div>
<div class="chaos">Y轴</div>
<div class="chaos">Z轴</div>
</div>
<div class="biaoss">
<div class="chaoss">1000</div>
<div class="chaoss">60</div>
<div class="chaoss">55</div>
</div>
</div>
<div class="sd">
<div class="fa-ji">GPS定位</div>
<div class="conrt">经度:117.201081309 纬度:39.1439299</div>
<div class="conrt">经度:117.201081309 纬度:39.1439299</div>
</div>
<div class="sd">
<div class="fa-ji">GPS位置精度</div>
... ... @@ -171,7 +170,7 @@
</div>
</div>
<div class="a" style="width:33.3%;">
<div class="a" style="width: 33.3%">
<div class="sd">
<div class="fa-ji">当前状况</div>
<div class="conrt">车辆绕路、产品偏移、司机未按路线形式.5</div>
... ... @@ -186,20 +185,20 @@
</div>
<div class="sd">
<div class="fa-ji">加速度的加速数据</div>
<div class="biaos">
<div class="chaos">X轴(超速)</div>
<div class="chaos">Y轴</div>
<div class="chaos">Z轴</div>
</div>
<div class="biaoss">
<div class="chaoss">1000</div>
<div class="chaoss">60</div>
<div class="chaoss">55</div>
</div>
<div class="biaos">
<div class="chaos">X轴(超速)</div>
<div class="chaos">Y轴</div>
<div class="chaos">Z轴</div>
</div>
<div class="biaoss">
<div class="chaoss">1000</div>
<div class="chaoss">60</div>
<div class="chaoss">55</div>
</div>
</div>
<div class="sd">
<div class="fa-ji">GPS定位</div>
<div class="conrt">经度:117.201081309 纬度:39.1439299</div>
<div class="conrt">经度:117.201081309 纬度:39.1439299</div>
</div>
<div class="sd">
<div class="fa-ji">GPS位置精度</div>
... ... @@ -207,7 +206,7 @@
</div>
</div>
<div class="a" style="width:33.3%;">
<div class="a" style="width: 33.3%">
<div class="sd">
<div class="fa-ji">当前状况</div>
<div class="conrt">车辆绕路、产品偏移、司机未按路线形式.5</div>
... ... @@ -222,27 +221,26 @@
</div>
<div class="sd">
<div class="fa-ji">加速度的加速数据</div>
<div class="biaos">
<div class="chaos">X轴(超速)</div>
<div class="chaos">Y轴</div>
<div class="chaos">Z轴</div>
</div>
<div class="biaoss">
<div class="chaoss">1000</div>
<div class="chaoss">60</div>
<div class="chaoss">55</div>
</div>
<div class="biaos">
<div class="chaos">X轴(超速)</div>
<div class="chaos">Y轴</div>
<div class="chaos">Z轴</div>
</div>
<div class="biaoss">
<div class="chaoss">1000</div>
<div class="chaoss">60</div>
<div class="chaoss">55</div>
</div>
</div>
<div class="sd">
<div class="fa-ji">GPS定位</div>
<div class="conrt">经度:117.201081309 纬度:39.1439299</div>
<div class="conrt">经度:117.201081309 纬度:39.1439299</div>
</div>
<div class="sd">
<div class="fa-ji">GPS位置精度</div>
<div class="conrt">50</div>
</div>
</div>
</div>
<div class="jichuss">
<div class="ges"></div>
... ... @@ -256,7 +254,12 @@
height="100%"
:header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
>
<el-table-column fixed prop="date" label="铲平货运单编号" width="292">
<el-table-column
fixed
prop="date"
label="铲平货运单编号"
width="292"
>
</el-table-column>
<el-table-column prop="name" label="收货单位" width="292">
</el-table-column>
... ... @@ -268,7 +271,7 @@
</el-table-column>
<el-table-column prop="city" label="总件数" width="292">
</el-table-column>
<el-table-column fixed="right" label="操作" width="292">
<template slot-scope="scope">
<el-button
... ... @@ -281,8 +284,8 @@
</el-table-column>
</el-table>
</div>
<div class="jichuss" style="margin-top: 23px;">
<div class="ges"></div>
<div class="jichuss" style="margin-top: 23px">
<div class="ges"></div>
<div class="jichusa">异常事件报告</div>
</div>
<div class="lista">
... ... @@ -293,7 +296,12 @@
height="100%"
:header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
>
<el-table-column fixed prop="date" label="铲平货运单编号" width="292">
<el-table-column
fixed
prop="date"
label="铲平货运单编号"
width="292"
>
</el-table-column>
<el-table-column prop="name" label="收货单位" width="292">
</el-table-column>
... ... @@ -305,7 +313,7 @@
</el-table-column>
<el-table-column prop="city" label="总件数" width="292">
</el-table-column>
<el-table-column fixed="right" label="操作" width="292">
<template slot-scope="scope">
<el-button
... ... @@ -319,8 +327,8 @@
</el-table>
</div>
<div class="chaknas">查看更多....</div>
<div class="jichuss" style="margin-top: 23px;">
<div class="ges"></div>
<div class="jichuss" style="margin-top: 23px">
<div class="ges"></div>
<div class="jichusa">途中检查记录</div>
</div>
<div class="lista">
... ... @@ -331,7 +339,12 @@
height="100%"
:header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
>
<el-table-column fixed prop="date" label="途中检查记录id" width="292">
<el-table-column
fixed
prop="date"
label="途中检查记录id"
width="292"
>
</el-table-column>
<el-table-column prop="name" label="检查转态" width="292">
</el-table-column>
... ... @@ -343,7 +356,7 @@
</el-table-column>
<el-table-column prop="city" label="总件数" width="292">
</el-table-column>
<el-table-column fixed="right" label="操作" width="292">
<template slot-scope="scope">
<el-button
... ... @@ -356,7 +369,7 @@
</el-table-column>
</el-table>
</div>
<div class="chaknas" style="margin-bottom: 20px;">查看更多....</div>
<div class="chaknas" style="margin-bottom: 20px">查看更多....</div>
</div>
</el-dialog>
<Tabbar :actives="1"></Tabbar>
... ... @@ -412,7 +425,7 @@ export default {
.el-dialog {
border-radius: 16px;
}
.el-dialog__body{
.el-dialog__body {
padding: 0 20px 20px 20px;
}
</style>
... ...
... ... @@ -6,8 +6,9 @@
<div class="ge"></div>
<div class="fa-text">发货计划</div>
</div>
<el-button type="primary" @click="dialogVisible = true">编制发货计划</el-button>
<el-button type="primary" @click="dialogVisible = true"
>编制发货计划</el-button
>
</div>
<div class="biaoge">
<div class="biao-box">
... ... @@ -64,13 +65,8 @@
>
</el-date-picker>
</div>
<div class="chaxun">
<img
src="../../assets/chaxun.png"
class="cha-imgs"
alt=""
@click="chaxun"
/>
<div class="chaxun" @click="chaxun">
<img src="../../assets/chaxun.png" class="cha-imgs" alt="" />
</div>
</div>
</div>
... ... @@ -207,7 +203,7 @@
title="新增发货计划"
:visible.sync="dialogVisible"
width="80%"
style="margin-top: 90px;"
style="margin-top: 90px"
:append-to-body="true"
>
<div class="liebiao">
... ... @@ -244,20 +240,22 @@
<div class="sd">
<div class="fa-ji">附带资料</div>
<div class="ziliao-list">
<div class="liulan" @click="handleFileChange">浏览</div>
<input
type="file"
ref="sa"
@change="handleFileChange"
style="display: none"
/>
<div class="ziliaotu">
<div class="ziliao-left">
<img src="../../assets/21.png" class="ziliao-img" alt="" />
<span class="text-sp">food.jpg</span>
<el-upload
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
multiple
:limit="3"
:on-exceed="handleExceed"
:file-list="fileList"
>
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">
只能上传jpg/png文件，且不超过500kb
</div>
<img src="../../assets/chen.png" class="chen-img" alt="" />
</div>
</el-upload>
</div>
</div>
</div>
... ... @@ -396,7 +394,13 @@
v-model="scope.row.productId"
placeholder="请输入产品型号"
filterable
@change="getCategoryOptions(scope.row.productId,scope.$index, tablelist)"
@change="
getCategoryOptions(
scope.row.productId,
scope.$index,
tablelist
)
"
>
<el-option
v-for="item in optionsas"
... ... @@ -479,9 +483,8 @@
</el-table>
</div>
<div class="queren">
<el-button type="primary" round @click="btn">确认</el-button>
<el-button type="primary" round @click="btn">确认</el-button>
<el-button round @click="dialogVisible = false">取消</el-button>
</div>
</div>
</el-dialog>
... ... @@ -490,7 +493,7 @@
title="发货计划审核"
:visible.sync="dialogVisibleg"
width="70%"
style="margin-top: 90px;"
style="margin-top: 90px"
:append-to-body="true"
>
<div class="liebiao">
... ... @@ -601,9 +604,10 @@
</el-table>
</div>
<div class="queren">
<el-button type="primary" round @click="tonguo(1)">审核通过</el-button>
<el-button type="primary" round @click="tonguo(1)"
>审核通过</el-button
>
<el-button round @click="butong(2)">审核不通过</el-button>
</div>
</div>
</el-dialog>
... ... @@ -612,7 +616,7 @@
title="完成发货计划"
:visible.sync="dialogVisibleq"
width="70%"
style="margin-top: 90px;"
style="margin-top: 90px"
:append-to-body="true"
>
<div class="liebiao">
... ... @@ -732,9 +736,10 @@
</el-table>
</div>
<div class="queren">
<el-button type="primary" round @click="dialogVisibleq = false">确认</el-button>
<el-button type="primary" round @click="dialogVisibleq = false"
>确认</el-button
>
<el-button round @click="dialogVisibleq = false">取消</el-button>
</div>
</div>
</el-dialog>
... ... @@ -743,7 +748,7 @@
title="查看详情"
:visible.sync="dialogVisibleh"
width="70%"
style="margin-top: 110px;"
style="margin-top: 110px"
:append-to-body="true"
>
<div class="liebiao">
... ... @@ -854,7 +859,9 @@
</el-table>
</div>
<div class="queren">
<el-button type="primary" round @click="dialogVisibleh = false">确认</el-button>
<el-button type="primary" round @click="dialogVisibleh = false"
>确认</el-button
>
<el-button round @click="dialogVisibleh = false">取消</el-button>
<!-- <div class="querens" @click="dialogVisibleh = false">确认</div>
<div class="quxiaos" @click="dialogVisibleh = false">取消</div> -->
... ... @@ -896,6 +903,8 @@ export default {
status: "",
},
],
fileList: [{ name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100' }, { name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100' }],
tablelists: [],
options: [],
dialogVisible: false,
... ... @@ -936,6 +945,20 @@ export default {
this.chan();
},
methods: {
//上传附件
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
},
handleExceed(files, fileList) {
this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`);
},
onSubmit(val) {
this.value = val;
this.dian();
... ... @@ -1010,14 +1033,14 @@ export default {
});
},
//搜索
getCategoryOptions(val,index, rows) {
getCategoryOptions(val, index, rows) {
console.log(val);
console.log()
this.chanping(val,index, rows)
this.chanping(val, index, rows)
// this.chan()
},
//根据产品id搜索
chanping(id,index, rows) {
chanping(id, index, rows) {
let that = this;
var url = "/api/system/product/" + id;
let params = {};
... ... @@ -1025,7 +1048,7 @@ export default {
.get(url)
.then(function (res) {
console.log(index, rows);
rows[index].detailId = res.data.productCoding
rows[index].detailId = res.data.productCoding
})
.catch(function (err) {
console.log(err);
... ... @@ -1084,6 +1107,7 @@ export default {
},
//获取发货计划列表
fahuo() {
console.log("11")
let that = this;
var url = "/api/ship/ship/list";
let params = {
... ... @@ -1094,14 +1118,12 @@ export default {
pageSize: that.pageSize,
shipId: that.shipId,
telegramListName: that.telegramListName,
};
that.$axios
.post(url, params)
.then(function (res) {
console.log(res);
that.tableData = res.rows;
that.total = res.total;
})
} || '';
that.$axios.post(url, params).then(res => {
console.log(res);
that.tableData = res.rows;
that.total = res.total;
})
.catch(function (err) {
console.log(err);
});
... ...
... ... @@ -87,15 +87,15 @@
</div>
<div class="tiaoshu">
<div class="left-io"></div>
<div class="gon">共400条</div>
<div class="gon"></div>
<div class="kls">
<el-pagination
<!-- <el-pagination
:page-size="20"
:pager-count="11"
layout="prev, pager, next"
:total="1000"
>
</el-pagination>
</el-pagination> -->
</div>
</div>
</div>
... ...
... ... @@ -6,19 +6,16 @@
<div class="ge"></div>
<div class="fa-text">部门管理</div>
</div>
<el-button type="primary" @click="dialogVisible = true">添加部门</el-button>
<el-button type="primary" @click="dialogVisible = true"
>添加部门</el-button
>
</div>
<div class="biaoge">
<div class="biao-box">
<div class="fhuo">
<div class="fahuos">
<div class="fas-text">部门ID</div>
<input
type="text"
placeholder="请输入部门ID"
class="fa-input"
/>
<input type="text" placeholder="请输入部门ID" class="fa-input" />
</div>
<div class="fahuos">
<div class="fas-text">部门名称</div>
... ... @@ -29,8 +26,12 @@
/>
</div>
<div class="fahuos">
<div class="fas-text">所属单位 </div>
<input type="text" placeholder="请输入所属单位 " class="fa-input" />
<div class="fas-text">所属单位</div>
<input
type="text"
placeholder="请输入所属单位 "
class="fa-input"
/>
</div>
<div class="fahuos">
<div class="fas-text">状态</div>
... ... @@ -76,13 +77,18 @@
</div>
<div class="tiaoshu">
<div class="left-io"></div>
<div class="gon">共400条</div>
<div class="gon" v-if="tableData.length == 0">共1页</div>
<div class="gon" v-if="tableData.length != 0">
共{{ tableData.length }}页
</div>
<div class="kls">
<el-pagination
:page-size="20"
:page-size="10"
:pager-count="11"
layout="prev, pager, next"
:total="1000"
:total="tableData.length"
hide-on-single-page
@prev-click="prevPage"
>
</el-pagination>
</div>
... ... @@ -93,7 +99,7 @@
title="添加部门"
:visible.sync="dialogVisible"
width="50%"
style='margin-top: 10%'
style="margin-top: 10%"
:append-to-body="true"
>
<div class="liebiao">
... ... @@ -108,26 +114,34 @@
<div class="a">
<div class="sd">
<div class="fa-ji">部门名称</div>
<input type="text" placeholder="请输入部门名称" class="inputsad" />
<input
type="text"
placeholder="请输入部门名称"
class="inputsad"
/>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">部门类型</div>
<input type="text" placeholder="请输入部门类型" class="inputsad" />
<input
type="text"
placeholder="请输入部门类型"
class="inputsad"
/>
</div>
</div>
</div>
</div>
<div class="queren">
<el-button type="primary" round @click='dialogVisible = false'>确认</el-button>
<el-button round @click='dialogVisible = false'>取消</el-button>
<el-button type="primary" round @click="dialogVisible = false"
>确认</el-button
>
<el-button round @click="dialogVisible = false">取消</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
... ... @@ -136,92 +150,14 @@ export default {
data() {
return {
tableData: [
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
'qqqq'
],
dialogVisible: false,
dialogImageUrl: "",
pages: ''
};
},
mounted(){
mounted() {
console.log('111')
},
methods: {
... ... @@ -237,7 +173,7 @@ export default {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
//查看订单
//查看订单
cha() {
this.dialogVisibleg = true;
},
... ... @@ -269,7 +205,6 @@ export default {
};
</script>
<style>
.el-dialog__body {
padding: 5px 20px;
padding-bottom: 68px;
... ... @@ -289,10 +224,10 @@ export default {
height: 107px !important;
line-height: 107px !important;
}
.el-carousel__container{
margin-top: 52px;
height: 629px;
}
.el-carousel__container {
margin-top: 52px;
height: 629px;
}
</style>
<style scoped>
@import "../../css/fa.css";
... ...
... ... @@ -10,7 +10,7 @@ Vue.config.productionTip = false
import axios from "./common.js";
Vue.prototype.$axios = axios;
Vue.config.productionTip = false
// sessionStorage.setItem('token','8de51490-befe-4966-babd-6127a4303176')
if (sessionStorage.getItem("token")) {
axios.defaults.headers.common["Authorization"] = sessionStorage.getItem("token");
}
... ...