朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 31ac8b9713d723e6651ae9b8436d818e2e34b993 1 个父辈 a8fff7bf

回执颜色区分

内嵌 并排对比
正在显示 8 个修改的文件 包含 126 行增加 和 31 行删除
@@ -1610,6 +1610,11 @@ @@ -1610,6 +1610,11 @@
1610 } 1610 }
1611 } 1611 }
1612 }, 1612 },
  1613 + "base64-arraybuffer": {
  1614 + "version": "0.2.0",
  1615 + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
  1616 + "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
  1617 + },
1613 "base64-js": { 1618 "base64-js": {
1614 "version": "1.3.1", 1619 "version": "1.3.1",
1615 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", 1620 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
@@ -1972,9 +1977,9 @@ @@ -1972,9 +1977,9 @@
1972 } 1977 }
1973 }, 1978 },
1974 "cfb": { 1979 "cfb": {
1975 - "version": "1.1.3",  
1976 - "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.1.3.tgz",  
1977 - "integrity": "sha512-joXBW0nMuwV9no7UTMiyVJnQL6XIU3ThXVjFUDHgl9MpILPOomyfaGqC290VELZ48bbQKZXnQ81UT5HouTxHsw==", 1980 + "version": "1.1.4",
  1981 + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.1.4.tgz",
  1982 + "integrity": "sha512-rwFkl3aFO3f+ljR27YINwC0x8vPjyiEVbYbrTCKzspEf7Q++3THdfHVgJYNUbxNcupJECrLX+L40Mjm9hm/Bgw==",
1978 "requires": { 1983 "requires": {
1979 "adler-32": "~1.2.0", 1984 "adler-32": "~1.2.0",
1980 "commander": "^2.16.0", 1985 "commander": "^2.16.0",
@@ -2754,6 +2759,14 @@ @@ -2754,6 +2759,14 @@
2754 "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", 2759 "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
2755 "dev": true 2760 "dev": true
2756 }, 2761 },
  2762 + "css-line-break": {
  2763 + "version": "1.1.1",
  2764 + "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz",
  2765 + "integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==",
  2766 + "requires": {
  2767 + "base64-arraybuffer": "^0.2.0"
  2768 + }
  2769 + },
2757 "css-loader": { 2770 "css-loader": {
2758 "version": "0.26.4", 2771 "version": "0.26.4",
2759 "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.4.tgz", 2772 "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.4.tgz",
@@ -5017,6 +5030,14 @@ @@ -5017,6 +5030,14 @@
5017 "toposort": "^1.0.0" 5030 "toposort": "^1.0.0"
5018 } 5031 }
5019 }, 5032 },
  5033 + "html2canvas": {
  5034 + "version": "1.0.0-rc.5",
  5035 + "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.5.tgz",
  5036 + "integrity": "sha512-DtNqPxJNXPoTajs+lVQzGS1SULRI4GQaROeU5R41xH8acffHukxRh/NBVcTBsfCkJSkLq91rih5TpbEwUP9yWA==",
  5037 + "requires": {
  5038 + "css-line-break": "1.1.1"
  5039 + }
  5040 + },
5020 "htmlparser2": { 5041 "htmlparser2": {
5021 "version": "3.10.1", 5042 "version": "3.10.1",
5022 "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", 5043 "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
@@ -11769,9 +11790,9 @@ @@ -11769,9 +11790,9 @@
11769 "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" 11790 "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
11770 }, 11791 },
11771 "ssf": { 11792 "ssf": {
11772 - "version": "0.10.2",  
11773 - "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.2.tgz",  
11774 - "integrity": "sha512-rDhAPm9WyIsY8eZEKyE8Qsotb3j/wBdvMWBUsOhJdfhKGLfQidRjiBUV0y/MkyCLiXQ38FG6LWW/VYUtqlIDZQ==", 11793 + "version": "0.10.3",
  11794 + "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz",
  11795 + "integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==",
11775 "requires": { 11796 "requires": {
11776 "frac": "~1.1.2" 11797 "frac": "~1.1.2"
11777 } 11798 }
@@ -13105,6 +13126,11 @@ @@ -13105,6 +13126,11 @@
13105 "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", 13126 "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
13106 "dev": true 13127 "dev": true
13107 }, 13128 },
  13129 + "wmf": {
  13130 + "version": "1.0.2",
  13131 + "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
  13132 + "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
  13133 + },
13108 "wordwrap": { 13134 "wordwrap": {
13109 "version": "1.0.0", 13135 "version": "1.0.0",
13110 "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", 13136 "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -13180,17 +13206,18 @@ @@ -13180,17 +13206,18 @@
13180 } 13206 }
13181 }, 13207 },
13182 "xlsx": { 13208 "xlsx": {
13183 - "version": "0.15.1",  
13184 - "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.1.tgz",  
13185 - "integrity": "sha512-z+o4+QPMc32EPboLCzJAz94o0Zyy+8jrmWTsVpfzwknFln9qDO6/HN1KrGGVC4//sGA7dh4R3HA4fhbGIKCDOA==", 13209 + "version": "0.15.6",
  13210 + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.6.tgz",
  13211 + "integrity": "sha512-7vD9eutyLs65iDjNFimVN+gk/oDkfkCgpQUjdE82QgzJCrBHC4bGPH7fzKVyy0UPp3gyFVQTQEFJaWaAvZCShQ==",
13186 "requires": { 13212 "requires": {
13187 "adler-32": "~1.2.0", 13213 "adler-32": "~1.2.0",
13188 - "cfb": "^1.1.3", 13214 + "cfb": "^1.1.4",
13189 "codepage": "~1.14.0", 13215 "codepage": "~1.14.0",
13190 "commander": "~2.17.1", 13216 "commander": "~2.17.1",
13191 "crc-32": "~1.2.0", 13217 "crc-32": "~1.2.0",
13192 "exit-on-epipe": "~1.0.1", 13218 "exit-on-epipe": "~1.0.1",
13193 - "ssf": "~0.10.2" 13219 + "ssf": "~0.10.3",
  13220 + "wmf": "~1.0.1"
13194 } 13221 }
13195 }, 13222 },
13196 "xtend": { 13223 "xtend": {
@@ -16,8 +16,10 @@ @@ -16,8 +16,10 @@
16 "eslint": "^5.14.1", 16 "eslint": "^5.14.1",
17 "file-saver": "^2.0.2", 17 "file-saver": "^2.0.2",
18 "font-awesome": "^4.7.0", 18 "font-awesome": "^4.7.0",
  19 + "html2canvas": "^1.0.0-rc.5",
19 "install": "^0.12.2", 20 "install": "^0.12.2",
20 "js-cookie": "^2.2.1", 21 "js-cookie": "^2.2.1",
  22 + "jspdf": "^1.5.3",
21 "jszip": "^3.2.2", 23 "jszip": "^3.2.2",
22 "moment": "^2.24.0", 24 "moment": "^2.24.0",
23 "npm": "^6.8.0", 25 "npm": "^6.8.0",
@@ -27,7 +29,7 @@ @@ -27,7 +29,7 @@
27 "vue-i18n": "^8.14.0", 29 "vue-i18n": "^8.14.0",
28 "vue-router": "^2.3.0", 30 "vue-router": "^2.3.0",
29 "vuex": "^2.0.0-rc.6", 31 "vuex": "^2.0.0-rc.6",
30 - "xlsx": "^0.15.1" 32 + "xlsx": "^0.15.6"
31 }, 33 },
32 "devDependencies": { 34 "devDependencies": {
33 "autoprefixer": "^6.7.2", 35 "autoprefixer": "^6.7.2",
@@ -91,12 +91,9 @@ axios.interceptors.response.use( @@ -91,12 +91,9 @@ axios.interceptors.response.use(
91 91
92 // 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面 92 // 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面
93 if (error.response.status === 401) { 93 if (error.response.status === 401) {
94 - router.push({  
95 - path: "/login"  
96 - });  
97 message({ 94 message({
98 // 饿了么的消息弹窗组件 95 // 饿了么的消息弹窗组件
99 - message: '授权超时，或未授权，请重新登录', 96 + message: '授权超时，或访问未授权，请重新登录',
100 type: "error" 97 type: "error"
101 }); 98 });
102 } 99 }
@@ -108,8 +105,10 @@ axios.interceptors.response.use( @@ -108,8 +105,10 @@ axios.interceptors.response.use(
108 }); 105 });
109 } 106 }
110 if (error.response.status === 500) { 107 if (error.response.status === 500) {
111 - router.push({  
112 - path: "/error/500" 108 + message({
  109 + // 饿了么的消息弹窗组件
  110 + message: error.message,
  111 + type: "error"
113 }); 112 });
114 } 113 }
115 if (error.response.status === 502) { 114 if (error.response.status === 502) {
@@ -118,13 +117,15 @@ axios.interceptors.response.use( @@ -118,13 +117,15 @@ axios.interceptors.response.use(
118 }); 117 });
119 } 118 }
120 if (error.response.status === 404) { 119 if (error.response.status === 404) {
121 - router.push({  
122 - path: "/error/404" 120 + message({
  121 + // 饿了么的消息弹窗组件
  122 + message: error.message,
  123 + type: "error"
123 }); 124 });
124 } 125 }
125 } 126 }
126 // 返回 response 里的错误信息 127 // 返回 response 里的错误信息
127 - let errorInfo = error.data.error ? error.data.error.message : error.data; 128 + let errorInfo = error.response ? error.response.statusText : (error.data.error ? error.data.error.message : error.message);
128 return Promise.reject(errorInfo); 129 return Promise.reject(errorInfo);
129 } 130 }
130 ); 131 );
@@ -35,7 +35,6 @@ import Waybill from './views/nmms_import/Waybill.vue' @@ -35,7 +35,6 @@ import Waybill from './views/nmms_import/Waybill.vue'
35 import AllocateSearch from './views/nmms_import/AllocateSearch.vue' 35 import AllocateSearch from './views/nmms_import/AllocateSearch.vue'
36 import Importallocation from './views/nmms_import/Importallocation.vue' 36 import Importallocation from './views/nmms_import/Importallocation.vue'
37 import Allocatearrive from './views/nmms_import/Allocatearrive.vue' 37 import Allocatearrive from './views/nmms_import/Allocatearrive.vue'
38 -  
39 import User from './views/nav1/user.vue' 38 import User from './views/nav1/user.vue'
40 import Page4 from './views/nav2/Page4.vue' 39 import Page4 from './views/nav2/Page4.vue'
41 import Page5 from './views/nav2/Page5.vue' 40 import Page5 from './views/nav2/Page5.vue'
@@ -134,9 +134,22 @@ @@ -134,9 +134,22 @@
134 width="100" :formatter="formatStatus"> 134 width="100" :formatter="formatStatus">
135 </el-table-column> 135 </el-table-column>
136 <el-table-column 136 <el-table-column
137 - prop="ext5"  
138 label="回执内容" 137 label="回执内容"
139 width="250"> 138 width="250">
  139 + <template slot-scope="scope">
  140 + <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
  141 + {{scope.row.ext5}}
  142 + </span>
  143 + <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
  144 + {{scope.row.ext5}}
  145 + </span>
  146 + <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">
  147 + {{scope.row.ext5}}
  148 + </span>
  149 + <span v-else style="color: #909399;">
  150 + {{scope.row.ext5}}
  151 + </span>
  152 + </template>
140 </el-table-column> 153 </el-table-column>
141 <el-table-column 154 <el-table-column
142 label="修改状态" 155 label="修改状态"
@@ -130,9 +130,22 @@ @@ -130,9 +130,22 @@
130 width="100" :formatter="formatStatus"> 130 width="100" :formatter="formatStatus">
131 </el-table-column> 131 </el-table-column>
132 <el-table-column 132 <el-table-column
133 - prop="customText"  
134 - label="回执信息"  
135 - width="180"> 133 + label="回执内容"
  134 + width="250">
  135 + <template slot-scope="scope">
  136 + <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
  137 + {{scope.row.ext5}}
  138 + </span>
  139 + <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
  140 + {{scope.row.ext5}}
  141 + </span>
  142 + <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">
  143 + {{scope.row.ext5}}
  144 + </span>
  145 + <span v-else style="color: #909399;">
  146 + {{scope.row.ext5}}
  147 + </span>
  148 + </template>
136 </el-table-column> 149 </el-table-column>
137 <el-table-column 150 <el-table-column
138 prop="operation" 151 prop="operation"
@@ -102,9 +102,22 @@ @@ -102,9 +102,22 @@
102 width="100" :formatter="formatStatus"> 102 width="100" :formatter="formatStatus">
103 </el-table-column> 103 </el-table-column>
104 <el-table-column 104 <el-table-column
105 - prop="ext5"  
106 - label="回执信息"  
107 - width="180"> 105 + label="回执内容"
  106 + width="250">
  107 + <template slot-scope="scope">
  108 + <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
  109 + {{scope.row.ext5}}
  110 + </span>
  111 + <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
  112 + {{scope.row.ext5}}
  113 + </span>
  114 + <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">
  115 + {{scope.row.ext5}}
  116 + </span>
  117 + <span v-else style="color: #909399;">
  118 + {{scope.row.ext5}}
  119 + </span>
  120 + </template>
108 </el-table-column> 121 </el-table-column>
109 <el-table-column 122 <el-table-column
110 prop="operation" 123 prop="operation"
@@ -129,10 +129,23 @@ @@ -129,10 +129,23 @@
129 </template> 129 </template>
130 </el-table-column> 130 </el-table-column>
131 <el-table-column 131 <el-table-column
132 - prop="awba"  
133 label="主单号" 132 label="主单号"
134 width="115" 133 width="115"
135 > 134 >
  135 + <template slot-scope="scope">
  136 + <span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#5BB75B;width: 100%;height:auto;display:block;">
  137 + {{scope.row.awba}}
  138 + </span>
  139 + <span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#12B399;width: 100%;height:100%;display:block;">
  140 + {{scope.row.awba}}
  141 + </span>
  142 + <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#FA9403;width: 100%;height:100%;display:block;">
  143 + {{scope.row.awba}}
  144 + </span>
  145 + <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#C55124;width: 100%;height:100%;display:block;">
  146 + {{scope.row.awba}}
  147 + </span>
  148 + </template>
136 </el-table-column> 149 </el-table-column>
137 <el-table-column 150 <el-table-column
138 prop="awbh" 151 prop="awbh"
@@ -166,9 +179,22 @@ @@ -166,9 +179,22 @@
166 width="90" :formatter="formatStatus"> 179 width="90" :formatter="formatStatus">
167 </el-table-column> 180 </el-table-column>
168 <el-table-column 181 <el-table-column
169 - prop="ext5"  
170 label="回执内容" 182 label="回执内容"
171 width="250"> 183 width="250">
  184 + <template slot-scope="scope">
  185 + <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
  186 + {{scope.row.ext5}}
  187 + </span>
  188 + <span v-else-if="scope.row.status=='02' || scope.row.status=='03'" style="color: #E6A23C">
  189 + {{scope.row.ext5}}
  190 + </span>
  191 + <span v-else-if="scope.row.status=='12' || scope.row.status=='13'" style="color: #F56C6C">
  192 + {{scope.row.ext5}}
  193 + </span>
  194 + <span v-else style="color: #909399;">
  195 + {{scope.row.ext5}}
  196 + </span>
  197 + </template>
172 </el-table-column> 198 </el-table-column>
173 </el-table> 199 </el-table>
174 </template> 200 </template>
@@ -287,6 +313,7 @@ @@ -287,6 +313,7 @@
287 this.tableloading=true; 313 this.tableloading=true;
288 QueryData(params).then(res =>{ 314 QueryData(params).then(res =>{
289 let response=res.data.data; 315 let response=res.data.data;
  316 + console.log(response)
290 this.tableData=response.list; 317 this.tableData=response.list;
291 this.total=response.total; 318 this.total=response.total;
292 this.tableloading = false; 319 this.tableloading = false;