朱兆平 / vue_cli · 提交

转到一个项目

作者 zhuzhaoping
提交 171b548769ba47b00870e0b088610f6dc42df289 2 个父辈 9e1c3fae 85c0925f

合并分支 'ExportOrder' 到 'master' 

Export order



查看合并请求 !33
内嵌 并排对比
正在显示 2 个修改的文件 包含 53 行增加 和 21 行删除
@@ -21,15 +21,17 @@ @@ -21,15 +21,17 @@
21 "eslint-plugin-html": "^6.0.2", 21 "eslint-plugin-html": "^6.0.2",
22 "eslint-plugin-vue": "^8.7.1", 22 "eslint-plugin-vue": "^8.7.1",
23 "fecha": "^4.2.0", 23 "fecha": "^4.2.0",
24 - "file-saver": "^2.0.2", 24 + "file-saver": "^2.0.5",
25 "font-awesome": "^4.7.0", 25 "font-awesome": "^4.7.0",
26 "form-gen-parser": "^1.0.3", 26 "form-gen-parser": "^1.0.3",
  27 + "fs": "0.0.1-security",
27 "html2canvas": "^1.4.1", 28 "html2canvas": "^1.4.1",
28 "install": "^0.12.2", 29 "install": "^0.12.2",
29 "js-cookie": "^2.2.1", 30 "js-cookie": "^2.2.1",
30 "js-file-download": "^0.4.12", 31 "js-file-download": "^0.4.12",
31 "jspdf": "^1.5.3", 32 "jspdf": "^1.5.3",
32 "jszip": "^3.2.2", 33 "jszip": "^3.2.2",
  34 + "minio": "^8.0.1",
33 "moment": "^2.29.4", 35 "moment": "^2.29.4",
34 "npm": "^6.8.0", 36 "npm": "^6.8.0",
35 "nprogress": "^0.2.0", 37 "nprogress": "^0.2.0",
@@ -46,6 +48,7 @@ @@ -46,6 +48,7 @@
46 "xlsx": "^0.15.6" 48 "xlsx": "^0.15.6"
47 }, 49 },
48 "devDependencies": { 50 "devDependencies": {
  51 + "@babel/plugin-syntax-class-properties": "^7.12.13",
49 "autoprefixer": "^6.7.2", 52 "autoprefixer": "^6.7.2",
50 "axios-mock-adapter": "^1.7.1", 53 "axios-mock-adapter": "^1.7.1",
51 "babel-core": "^6.22.1", 54 "babel-core": "^6.22.1",
@@ -1346,7 +1346,7 @@ Handling Information @@ -1346,7 +1346,7 @@ Handling Information
1346 <el-row style="margin-bottom: -5px"> 1346 <el-row style="margin-bottom: -5px">
1347 <el-col style="width: 95%"> 1347 <el-col style="width: 95%">
1348 <el-form-item> 1348 <el-form-item>
1349 - <el-input v-model="addForm.cvd.cvd_charge_code" auto-complete="off" placeholder="收费代码" size="mini"></el-input> 1349 + <el-input v-model="addForm.cvd.cvd_charge_code" disabled auto-complete="off" placeholder="收费代码" size="mini"></el-input>
1350 </el-form-item> 1350 </el-form-item>
1351 </el-col> 1351 </el-col>
1352 </el-row> 1352 </el-row>
@@ -1691,6 +1691,8 @@ Handling Information @@ -1691,6 +1691,8 @@ Handling Information
1691 <el-form-item> 1691 <el-form-item>
1692 <el-input minlength="1" maxlength="20" onkeyup="this.value=this.value.toUpperCase()" 1692 <el-input minlength="1" maxlength="20" onkeyup="this.value=this.value.toUpperCase()"
1693 @keyup.native="addForm.hbs.hbs_manifest_description.replace(/[^A-Za-z0-9\s]/g,'')" 1693 @keyup.native="addForm.hbs.hbs_manifest_description.replace(/[^A-Za-z0-9\s]/g,'')"
  1694 + :max-length="15"
  1695 + @paste.native="handlePaste($event, 15)"
1694 v-model="addForm.hbs.hbs_manifest_description" auto-complete="off" placeholder="货物品名" size="mini"></el-input> 1696 v-model="addForm.hbs.hbs_manifest_description" auto-complete="off" placeholder="货物品名" size="mini"></el-input>
1695 </el-form-item> 1697 </el-form-item>
1696 </el-col> 1698 </el-col>
@@ -2119,27 +2121,27 @@ Handling Information @@ -2119,27 +2121,27 @@ Handling Information
2119 }, 2121 },
2120 cvd:{ 2122 cvd:{
2121 cvd_amount_of_insurance:'XXX', 2123 cvd_amount_of_insurance:'XXX',
2122 - cvd_charge_code:'', 2124 + cvd_charge_code:'PP',
2123 cvd_charge_prepaid:'PP', 2125 cvd_charge_prepaid:'PP',
2124 - cvd_currency_code:'', 2126 + cvd_currency_code:'EUR',
2125 cvd_value_for_carriage:'NVD', 2127 cvd_value_for_carriage:'NVD',
2126 cvd_value_for_customs:'NCV', 2128 cvd_value_for_customs:'NCV',
2127 }, 2129 },
2128 flt:{ 2130 flt:{
2129 - cariier:"",  
2130 - day:'',  
2131 - flightNumber:'',  
2132 - cariier2:"",  
2133 - day2:'',  
2134 - flightNumber2:'', 2131 + cariier:"HQ",
  2132 + day:'02',
  2133 + flightNumber:'405',
  2134 + cariier2:"HQ",
  2135 + day2:'02',
  2136 + flightNumber2:'4055',
2135 cariier3:"", 2137 cariier3:"",
2136 day3:'', 2138 day3:'',
2137 flightNumber3:'', 2139 flightNumber3:'',
2138 }, 2140 },
2139 isu:{ 2141 isu:{
2140 - isu_day_mounth_year:'',  
2141 - isu_place_or_airport_code:'',  
2142 - isu_signature:'', 2142 + isu_day_mounth_year:'2024-11-01',
  2143 + isu_place_or_airport_code:'ZHENGZHOU',
  2144 + isu_signature:'CHINA',
2143 }, 2145 },
2144 nfy:{ 2146 nfy:{
2145 nfy_contacts:[], 2147 nfy_contacts:[],
@@ -2201,10 +2203,10 @@ Handling Information @@ -2201,10 +2203,10 @@ Handling Information
2201 } 2203 }
2202 , 2204 ,
2203 rtg:{ 2205 rtg:{
2204 - destinationAirport:'',  
2205 - destinationCarrier:'',  
2206 - onwardAirport:'',  
2207 - onwardCarrier:'', 2206 + destinationAirport:'SOF',
  2207 + destinationCarrier:'HQ',
  2208 + onwardAirport:'LGG',
  2209 + onwardCarrier:'HQ',
2208 onwardAirport3:'', 2210 onwardAirport3:'',
2209 onwardCarrier3:'', 2211 onwardCarrier3:'',
2210 }, 2212 },
@@ -2219,13 +2221,13 @@ Handling Information @@ -2219,13 +2221,13 @@ Handling Information
2219 shp_postcode:'', 2221 shp_postcode:'',
2220 }, 2222 },
2221 ssr:{ 2223 ssr:{
2222 - ssr_request_content:[], 2224 + ssr_request_content:["BUP DO NOT BREAKDOWN"],
2223 }, 2225 },
2224 cer:{ 2226 cer:{
2225 - cer_signature:'' 2227 + cer_signature:'GATE INTERNATIONAL'
2226 } 2228 }
2227 }, 2229 },
2228 - ssr_content:"", 2230 + ssr_content:"BUP DO NOT BREAKDOWN",
2229 cne_contact:{ 2231 cne_contact:{
2230 contact_id:'TE', 2232 contact_id:'TE',
2231 contact_number:'', 2233 contact_number:'',
@@ -2303,7 +2305,7 @@ Handling Information @@ -2303,7 +2305,7 @@ Handling Information
2303 }, 2305 },
2304 // 分单 2306 // 分单
2305 addForm:{ 2307 addForm:{
2306 - companyName1:'', 2308 + companyName1:'Q',
2307 fhl:{ 2309 fhl:{
2308 waybillNum:'', 2310 waybillNum:'',
2309 quantity_weight_code:'', 2311 quantity_weight_code:'',
@@ -2392,6 +2394,32 @@ Handling Information @@ -2392,6 +2394,32 @@ Handling Information
2392 } 2394 }
2393 }, 2395 },
2394 methods:{ 2396 methods:{
  2397 + handlePaste(event, maxLength) {
  2398 + // 阻止默认的粘贴行为
  2399 + event.preventDefault();
  2400 + // 获取粘贴的内容
  2401 + let pasteData = (event.clipboardData || window.clipboardData).getData('text').toUpperCase();
  2402 + // 获取当前输入框的内容
  2403 + let currentValue = this.addForm.hbs.hbs_manifest_description;
  2404 + // 计算总长度
  2405 + let totalLength = currentValue.length + pasteData.length;
  2406 + if (totalLength > 15) {
  2407 + // 如果总长度超过15，只粘贴允许的部分
  2408 + pasteData = pasteData.slice(0, 15 - currentValue.length);
  2409 + }
  2410 + // 更新输入框的内容
  2411 + this.addForm.hbs.hbs_manifest_description += pasteData;
  2412 + // 再次限制总长度
  2413 + this.addForm.hbs.hbs_manifest_description = this.limitInputLength(this.addForm.hbs.hbs_manifest_description);
  2414 + },
  2415 +
  2416 + limitInputLength(value, maxLength) {
  2417 + // 如果输入值的长度超过15，则截取前15个字符
  2418 + if (value.length > 15) {
  2419 + return value.slice(0, 15);
  2420 + }
  2421 + return value;
  2422 + },
2395 handleInput(value) { 2423 handleInput(value) {
2396 // 这里可以进一步处理输入值，例如去空格等 2424 // 这里可以进一步处理输入值，例如去空格等
2397 this.form.bill.waybillNum = value.trim(); 2425 this.form.bill.waybillNum = value.trim();
@@ -2701,6 +2729,7 @@ Handling Information @@ -2701,6 +2729,7 @@ Handling Information
2701 this.addForm.fhl.origin = res.data.data.origin; 2729 this.addForm.fhl.origin = res.data.data.origin;
2702 this.addForm.fhl.destination = res.data.data.destination; 2730 this.addForm.fhl.destination = res.data.data.destination;
2703 this.addForm.fhl.quantity_weight_code = res.data.data.quantity_weight_code; 2731 this.addForm.fhl.quantity_weight_code = res.data.data.quantity_weight_code;
  2732 + this.addForm.hbs.hbs_origin=res.data.data.origin;
2704 } 2733 }
2705 return this.$message.success(res.data.msg); 2734 return this.$message.success(res.data.msg);
2706 } 2735 }