From 40ee74ed787bbdebf915e50a5c42a72d410dbc15 Mon Sep 17 00:00:00 2001 From: duxiaoning <17621883433@163.com> Date: Wed, 8 Feb 2023 15:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E6=96=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E7=94=A8=E6=88=B7=E5=90=8D=E4=BB=A5=E5=8F=8AID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/lang/pendingOrder.js | 9 +++++++++ src/components/ration/otgCorrection/index.vue | 6 +++--- .../Daichuli/Feedback/Inspection/Report/index.vue | 10 ++++++++-- src/views/Daichuli/Feedback/Inspection/index.vue | 7 ++++++- src/views/Daichuli/Feedback/index.vue | 2 ++ src/views/Daichuli/index.vue | 2 +- 6 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/api/lang/pendingOrder.js b/src/api/lang/pendingOrder.js index 174c954..2c2df96 100644 --- a/src/api/lang/pendingOrder.js +++ b/src/api/lang/pendingOrder.js @@ -213,3 +213,12 @@ export function getProjPos(options) { data: options }); } + +// 重新检验 +export function resetCheck(data) { + return request({ + url: "validation/validation/restartInspection", + method: "post", + data + }); +} \ No newline at end of file diff --git a/src/components/ration/otgCorrection/index.vue b/src/components/ration/otgCorrection/index.vue index 6b88d54..d7d2ebc 100644 --- a/src/components/ration/otgCorrection/index.vue +++ b/src/components/ration/otgCorrection/index.vue @@ -395,7 +395,7 @@ export default { } }); } else { - console.log("111111", st); + // console.log("111111", st); const spFrom = new FormData(); spFrom.append("sampleFun", Number(ssf[0])); //抽样方法 spFrom.append("minNum", 0); @@ -431,7 +431,7 @@ export default { this.ckPoint = false; const cus = this.configration.urlprefix.samePoiImgsUrl; if (row.collectPointSignPic !== null) { - console.log("111111", row.collectPointSignPic); + // console.log("111111", row.collectPointSignPic); this.collectPointSignPic = row.collectPointSignPic; var alImgDom = document.getElementById("alImg"); alImgDom.src = this.collectPointSignPic; @@ -494,7 +494,7 @@ export default { }, getSqlData() { getSamplesList(this.orderId).then((res) => { - console.log("111111111", res); + // console.log("111111111", res); if (res.code == 200) { this.multipleSelection = this.allSampleData = diff --git a/src/views/Daichuli/Feedback/Inspection/Report/index.vue b/src/views/Daichuli/Feedback/Inspection/Report/index.vue index 8489697..e9feeb0 100644 --- a/src/views/Daichuli/Feedback/Inspection/Report/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/Report/index.vue @@ -188,6 +188,7 @@ import { downloadPdf, updateOrderStage, exportWord, + resetCheck } from "@/api/lang/pendingOrder"; import { productSubTypeVal, truthFunVal } from "@/lib/contract.js"; @@ -302,6 +303,8 @@ export default { init() { const self = this; const rpm = (self.reportMsg = this.queryParams); + console.log('1111111',rpm); + self.realRes = rpm.reportResult; self.pdSubType = rpm.pdSubType; const rsl = (self.sampleData = rpm.sampleList); @@ -341,7 +344,6 @@ export default { }, // 生产报告 exportPdf(rpm) { - console.log("11111111", rpm); const self = this; const asmo = rpm.orderMsg; const asmp = rpm.productMsg; @@ -512,7 +514,11 @@ export default { reExamine() { const os = 0; this.updateOrder(os); - window.location.href =`${DAICHULI_URL}?orderid=${this.reportMsg.orderId}&token=${this.reportMsg.token}`; + resetCheck({orderId:this.reportMsg.orderId}).then(res=>{ + if(res.code === 200){ + window.location.href =`${DAICHULI_URL}?orderid=${this.reportMsg.orderId}&token=${this.reportMsg.token}`; + } + }) }, // 更新订单状态 updateOrder(orderStatus) { diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index 059859a..666d644 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -339,6 +339,7 @@ import { delSampleData, upDateAnalyseMethod, checkReality, + resetCheck } from "@/api/lang/pendingOrder"; import qs from "qs"; @@ -489,7 +490,11 @@ export default { } }, todaichuli() { - window.location.href =`${DAICHULI_URL}?orderid=${this.orderId}&token=${this.token}`; + resetCheck({orderId:this.orderId}).then(res=>{ + if(res.code === 200){ + window.location.href =`${DAICHULI_URL}?orderid=${this.orderId}&token=${this.token}`; + } + }) }, changepage() { if (this.hasPixelFun && this.pixelFun === "") { diff --git a/src/views/Daichuli/Feedback/index.vue b/src/views/Daichuli/Feedback/index.vue index 38ce5b0..4470a2a 100644 --- a/src/views/Daichuli/Feedback/index.vue +++ b/src/views/Daichuli/Feedback/index.vue @@ -277,6 +277,8 @@ export default { if (userMsg.code === 200) { self.userId = userMsg.data.userid; self.userName = userMsg.data.username; + localStorage.setItem("userId",self.userId); + localStorage.setItem("userName",self.userName); } const orderId = (self.orderId = this.$route.query.orderId); getOrderMsg(orderId).then((res) => { diff --git a/src/views/Daichuli/index.vue b/src/views/Daichuli/index.vue index e5e23a2..7071687 100644 --- a/src/views/Daichuli/index.vue +++ b/src/views/Daichuli/index.vue @@ -160,7 +160,7 @@ export default { }, changePage(orderMsg) { // 正射：150424 土水：150208 地表覆盖：150166 - this.$router.push("/orderUnprocessed?orderId=150208&token=WEB*1673425993482@L3W7_ZZX-yg000087_06848633de364ec7b63c8f53f9e43b19"); + this.$router.push("/orderUnprocessed?orderId=150208&token=WEB*1675826560592@VBSA_ZZX-yg000087_903ced0b26f74d5abcbbb70a4458de72"); }, }, };