jinhui.wang

逻辑修正,参数修正

......@@ -355,6 +355,9 @@ export default {
arr.push(this.formatDate(new Date().getTime()).split(" ")[0]);
this.sreachFormData.createTime = arr;
this.search(0);
if (this.status == 0) {
this.status = 1;
}
},
activated() {
if (this.status == 0) {
......
......@@ -290,6 +290,10 @@
class="item"
effect="dark"
:content="headData.shipperContactName"
:disabled="
headData.shipperContactName == '' ||
headData.shipperContactName == null
"
placement="top"
>
<el-input
......@@ -310,6 +314,10 @@
class="item"
effect="dark"
:content="headData.shipperCompany"
:disabled="
headData.shipperCompany == '' ||
headData.shipperCompany == null
"
placement="top"
>
<el-input
......@@ -330,6 +338,10 @@
class="item"
effect="dark"
:content="headData.shipperAddrLine"
:disabled="
headData.shipperAddrLine == '' ||
headData.shipperAddrLine == null
"
placement="top"
>
<el-input
......@@ -369,6 +381,9 @@
class="item"
effect="dark"
:content="headData.shipperCity"
:disabled="
headData.shipperCity == '' || headData.shipperCity == null
"
placement="top"
>
<el-input
......@@ -427,6 +442,10 @@
class="item"
effect="dark"
:content="headData.recipientContactName"
:disabled="
headData.recipientContactName == '' ||
headData.recipientContactName == null
"
placement="top"
>
<el-input
......@@ -447,6 +466,10 @@
class="item"
effect="dark"
:content="headData.recipientCompany"
:disabled="
headData.recipientCompany == '' ||
headData.recipientCompany == null
"
placement="top"
>
<el-input
......@@ -480,6 +503,10 @@
class="item"
effect="dark"
:content="headData.recipientAddrLine"
:disabled="
headData.recipientAddrLine == '' ||
headData.recipientAddrLine == null
"
placement="top"
>
<el-input
......@@ -519,6 +546,10 @@
class="item"
effect="dark"
:content="headData.recipientCity"
:disabled="
headData.recipientCity == '' ||
headData.recipientCity == null
"
placement="top"
>
<el-input
......@@ -890,35 +921,38 @@ export default {
this.dataBoxTtype = !this.dataBoxTtype;
},
//通过用户标志判断是否出现提示
tipOpen(id, blurType, status) {
tipOpen(data, blurType, status) {
let flag = 1;
if (status == 1) {
console.log(this.$store.getters.userData);
flag = this.$store.getters.userData.addflag1;
} else if (status == 2) {
flag = this.$store.getters.userData.addflag2;
}
if (flag == 1) {
if (flag == 1 && this.tipcontent != "" && this.tipcontent != null) {
this.tipVisible = true;
this.$refs.tipDialog.$on("cancel", (res) => {
this.tipVisible = false;
if (res) {
this.tipCancel(id, blurType);
this.tipCancel(data, blurType);
} else {
this.oldData.consignmentCode = this.headData.consignmentCode;
this.oldData.userInputShipperAccount =
this.headData.userInputShipperAccount;
}
});
} else if (flag == 2) {
this.tipCancel(id, blurType);
} else if (
flag == 2 ||
this.tipcontent == "" ||
this.tipcontent == null
) {
this.tipCancel(data, blurType);
}
},
//提示语操作状态
tipCancel(id, blurType) {
if (id != null && id != "") {
this.$emit("sreachEntry", id);
this.$emit("searchWaybillData", id);
} else {
this.formItemDisableType([true, false, false], id, blurType);
}
......
......@@ -55,10 +55,10 @@ export default {
watch: {
dialogVisible(val) {
if (val) {
if (typeStatus == 1) {
if (this.typeStatus == 1) {
this.checked =
this.$store.getters.userData.addflag1 == 1 ? false : true;
} else if (typeStatus == 2) {
} else if (this.typeStatus == 2) {
this.checked =
this.$store.getters.userData.addflag2 == 1 ? false : true;
}
......@@ -71,9 +71,9 @@ export default {
addFlag1: this.$store.getters.userData.addflag1,
addFlag2: this.$store.getters.userData.addflag1,
};
if (typeStatus == 1) {
if (this.typeStatus == 1) {
obj.addFlag1 = val ? 2 : 1;
} else if (typeStatus == 2) {
} else if (this.typeStatus == 2) {
obj.addFlag2 = val ? 2 : 1;
}
uploadUserTipFlag(obj)
......