Commit 9dfe276d by linjinhong

fix:修改日志问题

parent d958ec64
......@@ -254,8 +254,11 @@ export default {
if (canCallApi) {
console.log("生产完成");
await removeFromOrderInfo(data.newId);
bus.$emit("busEmit", { value: data.newId, type: "completeMessage" });
if (this.desktopDevice == 3) {
await removeFromOrderInfo(data.newId);
bus.$emit("busEmit", { value: data.newId, type: "completeMessage" });
}
console.log("本地数据removeFromOrderInfo:", getOrderInfoMap());
//生产完成后在本地删除
return;
......@@ -543,6 +546,13 @@ export default {
) {
await this.setData(this.detail);
}
if (this.detail && !this.isAutoFinish && this.desktopDevice == 3) {
bus.$emit("busEmit", {
value: this.detail.newId,
type: "completeFail",
});
}
//判断生产单号是否为空
if (this.productionNo === "")
return this.$message.warning("请录入生产单号");
......@@ -589,10 +599,8 @@ export default {
try {
//查询当前生产单号是否在本地数据
const localItem = getOrderInfoItem(this.productionNo, this.faceType)
? { data: getOrderInfoItem(this.productionNo, this.faceType) }
: null;
console.log("本地数据getOrderInfoItem", getOrderInfoMap());
let localItem = null;
let findByPodProductionNo;
const apiRequestParams = {
thirdSubOrderNumber: this.productionNo,
......@@ -602,6 +610,9 @@ export default {
//判断是否为惠立彩
if (this.desktopDevice === 3) {
const item = getOrderInfoItem(this.productionNo, this.faceType);
console.log("本地数据getOrderInfoItem", getOrderInfoMap());
localItem = item ? { data: item } : null;
findByPodProductionNo =
localItem ||
(await this.$api.post("/findByPodProductionNo", apiRequestParams));
......@@ -741,6 +752,7 @@ export default {
this.selectedOption = command; // 根据选中的项来更新 selectedOption
},
changeDesktopDeviceFn(value) {
this.faceType = "A";
if (value === 3) {
this.setting.gridValue == 5;
this.selectGridIndex = 5;
......
......@@ -48,7 +48,7 @@ export default {
},
item: {
handler(val) {
console.log("item11", this.item);
// console.log("item11", this.item);
if (val && this.newDesktopDevice == 3) {
return;
......@@ -70,7 +70,7 @@ export default {
r: 0,
};
}
console.log("item", this.item);
// console.log("item", this.item);
},
immediate: true,
deep: true,
......
......@@ -236,22 +236,25 @@ export default {
let bh = bw.clientHeight;
bw = bw.clientWidth;
this.$nextTick(() => {
let dom = document.getElementsByClassName("drr");
console.log(228, dom);
this.imgList.forEach((el, i) => {
let dom_i = document.getElementsByClassName("drr")[i];
dom_i.style.zIndex =
dom_i.style.zIndex === "" || !dom_i.style.zIndex
? 0
: dom_i.style.zIndex;
dom[i].addEventListener("click", () => {
this.selectIndex = i;
this.selectItem(i);
});
});
});
// this.$nextTick(() => {
// let dom = document.getElementsByClassName("drr");
// console.log(228, dom);
// this.imgList.forEach((el, i) => {
// let dom_i = document.getElementsByClassName("drr")[i];
// dom_i.style.zIndex =
// dom_i.style.zIndex === "" || !dom_i.style.zIndex
// ? 0
// : dom_i.style.zIndex;
// dom[i].addEventListener("click", () => {
// if (this.newDesktopDevice == 3) {
// return;
// }
// this.selectIndex = i;
// this.selectItem(i);
// });
// });
// });
const output = [
`-------------------------------------------------`,
......@@ -306,7 +309,9 @@ export default {
deep: true,
// immediate: true,
},
selectIndex() {
selectIndex(val) {
console.log(313, val);
if (this.selectIndex >= 0) {
if (!this.showImgSetting) {
this.showImgSetting = true;
......@@ -755,6 +760,7 @@ export default {
dom[i].classList.add("inactive");
}
}
this.selectIndex = index;
},
deSelect() {
......@@ -1049,7 +1055,6 @@ export default {
el.productionFile = newMap.get(el.designId).productionFile;
}
});
// console.log("selectImgList", this.selectImgList);
if (this.imgList.length) {
const fileNameExists = this.checkList.some(
......@@ -1315,6 +1320,10 @@ export default {
this.logList.unshift(`订单:${value}生产完成`);
this.localeData = getOrderInfoMap();
break;
case "completeFail":
this.logList.unshift(`订单:${value}打印完成,未点击生产完成`);
this.localeData = getOrderInfoMap();
break;
case "grid":
this.row = value.row;
this.col = value.col;
......@@ -1357,6 +1366,9 @@ export default {
} else {
this.selectImgIndex = 0;
}
console.log(777, this.selectImgIndex);
console.log("selectImgList", this.selectImgList);
if (this.selectImgIndex != -1) {
this.getBackFile(
{
......@@ -1465,7 +1477,7 @@ export default {
v-for="(img, i) in selectImgList"
:key="i"
class="img-item"
:class="{ borderStyle: i == selectIndex }"
:class="{ borderStyle: i === selectImgIndex }"
@click.stop.prevent="
newDesktopDevice !== 3 && selectImg(img, i)
"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment