|
@@ -422,14 +422,14 @@ export default {
|
|
if (datetime < 10) {
|
|
if (datetime < 10) {
|
|
datetime = '0' + datetime
|
|
datetime = '0' + datetime
|
|
}
|
|
}
|
|
- return year + mouth + datetime
|
|
|
|
|
|
+ return year +'' + mouth + datetime
|
|
},
|
|
},
|
|
// 随机验证码
|
|
// 随机验证码
|
|
verifyinit() {
|
|
verifyinit() {
|
|
var arr = []
|
|
var arr = []
|
|
for (var i = 48; i < 123; i++) {
|
|
for (var i = 48; i < 123; i++) {
|
|
if (i > 57 && i < 65) continue
|
|
if (i > 57 && i < 65) continue
|
|
- if (i > 90 && i < 97) continue
|
|
|
|
|
|
+ if (i > 90) continue
|
|
arr.push(String.fromCharCode(i))
|
|
arr.push(String.fromCharCode(i))
|
|
}
|
|
}
|
|
arr.sort(function() {
|
|
arr.sort(function() {
|
|
@@ -535,7 +535,7 @@ export default {
|
|
// this.dataList.outputCity = CodeToText[value[1]]
|
|
// this.dataList.outputCity = CodeToText[value[1]]
|
|
},
|
|
},
|
|
sendWarehousechange(e) {
|
|
sendWarehousechange(e) {
|
|
- console.log("sendWarehousechange",e)
|
|
|
|
|
|
+ console.log('sendWarehousechange',e)
|
|
|
|
|
|
for (let i = 0; i < this.warehouseList.length; i++) {
|
|
for (let i = 0; i < this.warehouseList.length; i++) {
|
|
if (this.warehouseList[i].warehouseName == e) {
|
|
if (this.warehouseList[i].warehouseName == e) {
|
|
@@ -550,7 +550,7 @@ export default {
|
|
this.warehouseList[i].warehouseCity
|
|
this.warehouseList[i].warehouseCity
|
|
][this.warehouseList[i].warehouseArea].code
|
|
][this.warehouseList[i].warehouseArea].code
|
|
this.selectedOptions = tmp
|
|
this.selectedOptions = tmp
|
|
- console.log("sendWarehousechange",this.warehouseList[i])
|
|
|
|
|
|
+ console.log('sendWarehousechange',this.warehouseList[i])
|
|
this.dataList.receiveWarehouseId = this.warehouseList[i].id
|
|
this.dataList.receiveWarehouseId = this.warehouseList[i].id
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -607,22 +607,9 @@ export default {
|
|
this.freightPayerList = response
|
|
this.freightPayerList = response
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- getdate() {
|
|
|
|
- var date = new Date()
|
|
|
|
- var year = date.getFullYear() //获取完整的年份(4位)
|
|
|
|
- var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
|
|
|
|
- var datetime = date.getDate() //获取当前日(1-31)
|
|
|
|
- if (mouth < 10) {
|
|
|
|
- mouth = '0' + mouth
|
|
|
|
- }
|
|
|
|
- if (datetime < 10) {
|
|
|
|
- datetime = '0' + datetime
|
|
|
|
- }
|
|
|
|
- return year + mouth + datetime
|
|
|
|
- },
|
|
|
|
MathRand()
|
|
MathRand()
|
|
{
|
|
{
|
|
-var Num="";
|
|
|
|
|
|
+var Num='';
|
|
for(var i=0;i<4;i++)
|
|
for(var i=0;i<4;i++)
|
|
{
|
|
{
|
|
Num+=Math.floor(Math.random()*10);
|
|
Num+=Math.floor(Math.random()*10);
|