朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 31ac8b9713d723e6651ae9b8436d818e2e34b993 1 个父辈 a8fff7bf master ... ExportOrder flightplan2.0 kako_vue master_dev master_dev_markdown master_dev_permission master_ffmTemp message_bus nmms-import-dev vehicle_dispatch zhidan

回执颜色区分

内嵌 并排对比
正在显示 8 个修改的文件 包含 126 行增加 和 31 行删除
... ... @@ -1610,6 +1610,11 @@
}
}
},
"base64-arraybuffer": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
"integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
},
"base64-js": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
... ... @@ -1972,9 +1977,9 @@
}
},
"cfb": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.1.3.tgz",
"integrity": "sha512-joXBW0nMuwV9no7UTMiyVJnQL6XIU3ThXVjFUDHgl9MpILPOomyfaGqC290VELZ48bbQKZXnQ81UT5HouTxHsw==",
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.1.4.tgz",
"integrity": "sha512-rwFkl3aFO3f+ljR27YINwC0x8vPjyiEVbYbrTCKzspEf7Q++3THdfHVgJYNUbxNcupJECrLX+L40Mjm9hm/Bgw==",
"requires": {
"adler-32": "~1.2.0",
"commander": "^2.16.0",
... ... @@ -2754,6 +2759,14 @@
"integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
"dev": true
},
"css-line-break": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz",
"integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==",
"requires": {
"base64-arraybuffer": "^0.2.0"
}
},
"css-loader": {
"version": "0.26.4",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.4.tgz",
... ... @@ -5017,6 +5030,14 @@
"toposort": "^1.0.0"
}
},
"html2canvas": {
"version": "1.0.0-rc.5",
"resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.5.tgz",
"integrity": "sha512-DtNqPxJNXPoTajs+lVQzGS1SULRI4GQaROeU5R41xH8acffHukxRh/NBVcTBsfCkJSkLq91rih5TpbEwUP9yWA==",
"requires": {
"css-line-break": "1.1.1"
}
},
"htmlparser2": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
... ... @@ -11769,9 +11790,9 @@
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"ssf": {
"version": "0.10.2",
"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.2.tgz",
"integrity": "sha512-rDhAPm9WyIsY8eZEKyE8Qsotb3j/wBdvMWBUsOhJdfhKGLfQidRjiBUV0y/MkyCLiXQ38FG6LWW/VYUtqlIDZQ==",
"version": "0.10.3",
"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz",
"integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==",
"requires": {
"frac": "~1.1.2"
}
... ... @@ -13105,6 +13126,11 @@
"integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
"dev": true
},
"wmf": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
},
"wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
... ... @@ -13180,17 +13206,18 @@
}
},
"xlsx": {
"version": "0.15.1",
"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.1.tgz",
"integrity": "sha512-z+o4+QPMc32EPboLCzJAz94o0Zyy+8jrmWTsVpfzwknFln9qDO6/HN1KrGGVC4//sGA7dh4R3HA4fhbGIKCDOA==",
"version": "0.15.6",
"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.6.tgz",
"integrity": "sha512-7vD9eutyLs65iDjNFimVN+gk/oDkfkCgpQUjdE82QgzJCrBHC4bGPH7fzKVyy0UPp3gyFVQTQEFJaWaAvZCShQ==",
"requires": {
"adler-32": "~1.2.0",
"cfb": "^1.1.3",
"cfb": "^1.1.4",
"codepage": "~1.14.0",
"commander": "~2.17.1",
"crc-32": "~1.2.0",
"exit-on-epipe": "~1.0.1",
"ssf": "~0.10.2"
"ssf": "~0.10.3",
"wmf": "~1.0.1"
}
},
"xtend": {
... ...
... ... @@ -16,8 +16,10 @@
"eslint": "^5.14.1",
"file-saver": "^2.0.2",
"font-awesome": "^4.7.0",
"html2canvas": "^1.0.0-rc.5",
"install": "^0.12.2",
"js-cookie": "^2.2.1",
"jspdf": "^1.5.3",
"jszip": "^3.2.2",
"moment": "^2.24.0",
"npm": "^6.8.0",
... ... @@ -27,7 +29,7 @@
"vue-i18n": "^8.14.0",
"vue-router": "^2.3.0",
"vuex": "^2.0.0-rc.6",
"xlsx": "^0.15.1"
"xlsx": "^0.15.6"
},
"devDependencies": {
"autoprefixer": "^6.7.2",
... ...
... ... @@ -91,12 +91,9 @@ axios.interceptors.response.use(
// 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面
if (error.response.status === 401) {
router.push({
path: "/login"
});
message({
// 饿了么的消息弹窗组件
message: '授权超时，或未授权，请重新登录',
message: '授权超时，或访问未授权，请重新登录',
type: "error"
});
}
... ... @@ -108,8 +105,10 @@ axios.interceptors.response.use(
});
}
if (error.response.status === 500) {
router.push({
path: "/error/500"
message({
// 饿了么的消息弹窗组件
message: error.message,
type: "error"
});
}
if (error.response.status === 502) {
... ... @@ -118,13 +117,15 @@ axios.interceptors.response.use(
});
}
if (error.response.status === 404) {
router.push({
path: "/error/404"
message({
// 饿了么的消息弹窗组件
message: error.message,
type: "error"
});
}
}
// 返回 response 里的错误信息
let errorInfo = error.data.error ? error.data.error.message : error.data;
let errorInfo = error.response ? error.response.statusText : (error.data.error ? error.data.error.message : error.message);
return Promise.reject(errorInfo);
}
);
... ...
... ... @@ -35,7 +35,6 @@ import Waybill from './views/nmms_import/Waybill.vue'
import AllocateSearch from './views/nmms_import/AllocateSearch.vue'
import Importallocation from './views/nmms_import/Importallocation.vue'
import Allocatearrive from './views/nmms_import/Allocatearrive.vue'
import User from './views/nav1/user.vue'
import Page4 from './views/nav2/Page4.vue'
import Page5 from './views/nav2/Page5.vue'
... ...
... ... @@ -134,9 +134,22 @@
width="100" :formatter="formatStatus">
</el-table-column>
<el-table-column
prop="ext5"
label="回执内容"
width="250">
<template slot-scope="scope">
<span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">
{{scope.row.ext5}}
</span>
<span v-else style="color: #909399;">
{{scope.row.ext5}}
</span>
</template>
</el-table-column>
<el-table-column
label="修改状态"
... ...
... ... @@ -130,9 +130,22 @@
width="100" :formatter="formatStatus">
</el-table-column>
<el-table-column
prop="customText"
label="回执信息"
width="180">
label="回执内容"
width="250">
<template slot-scope="scope">
<span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">
{{scope.row.ext5}}
</span>
<span v-else style="color: #909399;">
{{scope.row.ext5}}
</span>
</template>
</el-table-column>
<el-table-column
prop="operation"
... ...
... ... @@ -102,9 +102,22 @@
width="100" :formatter="formatStatus">
</el-table-column>
<el-table-column
prop="ext5"
label="回执信息"
width="180">
label="回执内容"
width="250">
<template slot-scope="scope">
<span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">
{{scope.row.ext5}}
</span>
<span v-else style="color: #909399;">
{{scope.row.ext5}}
</span>
</template>
</el-table-column>
<el-table-column
prop="operation"
... ...
... ... @@ -129,10 +129,23 @@
</template>
</el-table-column>
<el-table-column
prop="awba"
label="主单号"
width="115"
>
<template slot-scope="scope">
<span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#5BB75B;width: 100%;height:auto;display:block;">
{{scope.row.awba}}
</span>
<span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#12B399;width: 100%;height:100%;display:block;">
{{scope.row.awba}}
</span>
<span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#FA9403;width: 100%;height:100%;display:block;">
{{scope.row.awba}}
</span>
<span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#C55124;width: 100%;height:100%;display:block;">
{{scope.row.awba}}
</span>
</template>
</el-table-column>
<el-table-column
prop="awbh"
... ... @@ -166,9 +179,22 @@
width="90" :formatter="formatStatus">
</el-table-column>
<el-table-column
prop="ext5"
label="回执内容"
width="250">
<template slot-scope="scope">
<span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
{{scope.row.ext5}}
</span>
<span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">
{{scope.row.ext5}}
</span>
<span v-else style="color: #909399;">
{{scope.row.ext5}}
</span>
</template>
</el-table-column>
</el-table>
</template>
... ... @@ -287,6 +313,7 @@
this.tableloading=true;
QueryData(params).then(res =>{
let response=res.data.data;
console.log(response)
this.tableData=response.list;
this.total=response.total;
this.tableloading = false;
... ...