|
|
@@ -140,7 +140,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<label class="el-form-item__label" style="width: auto;"
|
|
|
- >可装货时间</label
|
|
|
+ >可装货时间</label
|
|
|
>
|
|
|
<el-date-picker
|
|
|
class="textinput3"
|
|
|
@@ -315,10 +315,12 @@
|
|
|
>
|
|
|
</el-input>
|
|
|
<!--更改-->
|
|
|
- <i class="el-icon-edit"
|
|
|
- @click="changeMaterial(scope.$index)"
|
|
|
- style="font-size: 20px"
|
|
|
- v-if="isCellClick == 1"></i>
|
|
|
+ <i
|
|
|
+ class="el-icon-edit"
|
|
|
+ @click="changeMaterial(scope.$index)"
|
|
|
+ style="font-size: 20px"
|
|
|
+ v-if="isCellClick == 1"
|
|
|
+ ></i>
|
|
|
</template>
|
|
|
<!--规格型号-->
|
|
|
<template v-if="item.prop == 'Specification'">
|
|
|
@@ -372,10 +374,11 @@
|
|
|
>
|
|
|
</el-input>
|
|
|
<!--增加-->
|
|
|
- <i class="el-icon-folder-add"
|
|
|
- @click="ondrawer(scope.row, scope.$index)"
|
|
|
- v-if="isCellClick == 1"
|
|
|
- style="font-size: 20px"
|
|
|
+ <i
|
|
|
+ class="el-icon-folder-add"
|
|
|
+ @click="ondrawer(scope.row, scope.$index)"
|
|
|
+ v-if="isCellClick == 1"
|
|
|
+ style="font-size: 20px"
|
|
|
></i>
|
|
|
</template>
|
|
|
<!-- 收货日期 -->
|
|
|
@@ -412,7 +415,12 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!-- 操作列 -->
|
|
|
- <el-table-column fixed="right" label="操作" width="200" v-if="isCellClick == 1">
|
|
|
+ <el-table-column
|
|
|
+ fixed="right"
|
|
|
+ label="操作"
|
|
|
+ width="200"
|
|
|
+ v-if="isCellClick == 1"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
@click.native.prevent="deleteRow(scope.$index, selectionList)"
|
|
|
@@ -873,6 +881,14 @@ export default {
|
|
|
{
|
|
|
values1: "dgsm",
|
|
|
label1: "四川达钢商贸有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ values1: "jxjl",
|
|
|
+ label1: "江西久隆贸易有限公司"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ values1: "hnht",
|
|
|
+ label1: "海南瀚途贸易有限公司"
|
|
|
}
|
|
|
],
|
|
|
values1: "dzgt",
|
|
|
@@ -962,7 +978,7 @@ export default {
|
|
|
saleAreaId: null,
|
|
|
isNiTui: 0,
|
|
|
datalistindex: 0,
|
|
|
- temporarylist:[],
|
|
|
+ temporarylist: []
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -1934,15 +1950,15 @@ export default {
|
|
|
addAddressClick() {
|
|
|
//不管是外层还是内层都需要修改，如果存在都需要修改收货客户的电话
|
|
|
//定义一个正则表达式判断是否有电话
|
|
|
- var est=/\d{11}/g
|
|
|
- var string2=this.place.match(est)
|
|
|
- console.log("-----------这是抓取到的数据----------")
|
|
|
- console.log(string2)
|
|
|
- if (string2 != null){
|
|
|
- for(i=0;i<string2.length;i++){
|
|
|
- var reg=/^1[3456789]\d{9}$/
|
|
|
- if(reg.test(string2[i])){
|
|
|
- this.saleOrderConsigneeTel=string2
|
|
|
+ var est = /\d{11}/g;
|
|
|
+ var string2 = this.place.match(est);
|
|
|
+ console.log("-----------这是抓取到的数据----------");
|
|
|
+ console.log(string2);
|
|
|
+ if (string2 != null) {
|
|
|
+ for (i = 0; i < string2.length; i++) {
|
|
|
+ var reg = /^1[3456789]\d{9}$/;
|
|
|
+ if (reg.test(string2[i])) {
|
|
|
+ this.saleOrderConsigneeTel = string2;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -2011,15 +2027,15 @@ export default {
|
|
|
i++;
|
|
|
}
|
|
|
});
|
|
|
- let flag=0
|
|
|
+ let flag = 0;
|
|
|
await this.axios
|
|
|
- .post("/api/v1/ams/queryFormat",this.selectionList)
|
|
|
- .then(res=>{
|
|
|
- if (res.data.code=="500"){
|
|
|
- flag=1
|
|
|
+ .post("/api/v1/ams/queryFormat", this.selectionList)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code == "500") {
|
|
|
+ flag = 1;
|
|
|
}
|
|
|
- })
|
|
|
- if (flag== 1){
|
|
|
+ });
|
|
|
+ if (flag == 1) {
|
|
|
this.$message.error("规格型号有问题，请重新输入");
|
|
|
return;
|
|
|
}
|
|
|
@@ -2065,25 +2081,25 @@ export default {
|
|
|
var orderPlanWeightAllFill = 0;
|
|
|
//根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
|
|
|
//先把暂存区的数据清空
|
|
|
- this.temporarylist=[]
|
|
|
- let flag=0
|
|
|
+ this.temporarylist = [];
|
|
|
+ let flag = 0;
|
|
|
await this.axios
|
|
|
- .post("/api/v1/ams/queryMaterial",this.selectionList)
|
|
|
- .then(res=>{
|
|
|
- if (res.data.code === "500"){
|
|
|
- flag=1
|
|
|
+ .post("/api/v1/ams/queryMaterial", this.selectionList)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.code === "500") {
|
|
|
+ flag = 1;
|
|
|
}
|
|
|
- console.log(res.data.code)
|
|
|
+ console.log(res.data.code);
|
|
|
//给暂存区的数据赋值
|
|
|
- this.temporarylist=res.data.data
|
|
|
- console.log("以下是查询出来的数据")
|
|
|
- console.log(res.data.data)
|
|
|
- })
|
|
|
- if (flag===1){
|
|
|
- this.$message.error("规格型号不对")
|
|
|
- return
|
|
|
+ this.temporarylist = res.data.data;
|
|
|
+ console.log("以下是查询出来的数据");
|
|
|
+ console.log(res.data.data);
|
|
|
+ });
|
|
|
+ if (flag === 1) {
|
|
|
+ this.$message.error("规格型号不对");
|
|
|
+ return;
|
|
|
}
|
|
|
- this.selectionList=this.temporarylist
|
|
|
+ this.selectionList = this.temporarylist;
|
|
|
//初始化maplist
|
|
|
var mapList = [];
|
|
|
this.selectionList.forEach(item => {
|
|
|
@@ -2170,41 +2186,42 @@ export default {
|
|
|
.catch(_ => {});
|
|
|
},
|
|
|
//点击事件（上）
|
|
|
- clicks(index){
|
|
|
- console.log(index)
|
|
|
- console.log(this.materialList)
|
|
|
- console.log(this.materialList.length-1)
|
|
|
- console.log('clicks=e',arguments);
|
|
|
- if (index==0){
|
|
|
- console.log("向上1")
|
|
|
+ clicks(index) {
|
|
|
+ console.log(index);
|
|
|
+ console.log(this.materialList);
|
|
|
+ console.log(this.materialList.length - 1);
|
|
|
+ console.log("clicks=e", arguments);
|
|
|
+ if (index == 0) {
|
|
|
+ console.log("向上1");
|
|
|
//this.datalistindex=this.materialTableTop.length-1
|
|
|
- document.getElementById("input" + (this.materialList.length-1)).focus()
|
|
|
- }else {
|
|
|
- console.log("向上2")
|
|
|
+ document
|
|
|
+ .getElementById("input" + (this.materialList.length - 1))
|
|
|
+ .focus();
|
|
|
+ } else {
|
|
|
+ console.log("向上2");
|
|
|
//this.$refs.materialTableTop.bodyWrapper.scrollTop=index
|
|
|
- document.getElementById("input" + (index-1)).focus()
|
|
|
+ document.getElementById("input" + (index - 1)).focus();
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
//点击事件(下)
|
|
|
- clickx(index){
|
|
|
- console.log(index)
|
|
|
- console.log(this.materialList)
|
|
|
- console.log(this.materialList.length-1)
|
|
|
- if (index ==this.materialList.length-1){
|
|
|
- console.log("向下1")
|
|
|
- document.getElementById("input" + 0).focus()
|
|
|
- }else {
|
|
|
- console.log("向下2")
|
|
|
+ clickx(index) {
|
|
|
+ console.log(index);
|
|
|
+ console.log(this.materialList);
|
|
|
+ console.log(this.materialList.length - 1);
|
|
|
+ if (index == this.materialList.length - 1) {
|
|
|
+ console.log("向下1");
|
|
|
+ document.getElementById("input" + 0).focus();
|
|
|
+ } else {
|
|
|
+ console.log("向下2");
|
|
|
//this.datalistindex+=1
|
|
|
//this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
|
|
|
//var tbl=document.getElementById("table").childNodes[0]
|
|
|
//tbl.childNodes[len].childNodes[0].childNodes[0].focus()children[3]
|
|
|
//const rowlist=this.$refs.materialTableTop.$el.children[3].children[1].children[0]
|
|
|
- //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
|
|
|
+ //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
|
|
|
//console.log(rowlist)
|
|
|
var nextInput = document.getElementById("input" + (index + 1));
|
|
|
- nextInput.focus()
|
|
|
+ nextInput.focus();
|
|
|
}
|
|
|
}
|
|
|
}
|
zyf