From 2a4c325293b3c738d6606cc5ee244a15e4dee0a3 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 24 十月 2023 09:10:23 +0800
Subject: [PATCH] 小程序
---
web_standard/src/components/common/Header.vue | 8 +++++---
minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue | 5 +++--
minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue | 15 +++++++++++++--
minipro_standard/common/config.js | 13 ++++++++-----
web_standard/src/views/login.vue | 3 ++-
5 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/minipro_standard/common/config.js b/minipro_standard/common/config.js
index 3b27016..9e54f46 100644
--- a/minipro_standard/common/config.js
+++ b/minipro_standard/common/config.js
@@ -1,9 +1,12 @@
-module.exports = {
- // baseUrl: '/doumeeplant_api',
- // baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
- // https://lingyang.mes.show:1801/doumeeplant/doc.html
+module.exports = {
+ // 娴嬭瘯
+ baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
+ // 浠诲悍
+ // baseUrl: 'http://192.168.0.129:10021/',
+ // 缇氱緤 https://lingyang.mes.show:1801/doumeeplant/doc.html
// baseUrl: 'https://lingyang.mes.show:1801/doumeeplant',
- baseUrl: 'https://www.mes.red/doumeeplant',
+ // mes
+ // baseUrl: 'https://www.mes.red/doumeeplant',
phoneRegular: /^1[3456789]\d{9}$/,
mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
positiveInteger: /^[0-9]*[1-9][0-9]*$/,
diff --git a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
index d1fbfa3..cffe26d 100644
--- a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
+++ b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
@@ -83,7 +83,18 @@
</div>
</div>
</div>
- </div>
+ </div>
+ <!-- <div class="bg_list_item_h">
+ <div class="bg_list_item_num plr30">
+ <div class="bg_list_item_num_item">
+ <span>涓嶈壇鏁皗{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
+ <div class="bg_list_item_num_item_sr">
+ <view class="mr10">{{ produceFrom.undesirable }}</view>
+ <span v-if="info.umodel">{{ info.umodel.name }}</span>
+ </div>
+ </div>
+ </div>
+ </div> -->
</div>
<div class="bg_list_item">
<div class="bg_list_item_top">
@@ -236,6 +247,7 @@
let {duration, salaryNum, salaryTimes, qualifiedNum, unqualifiedNum, salaryUnqualified} = this.performance
// 鎶ュ伐鏃堕暱
if (!duration) return 0;
+ debugger
// 鎶ュ伐鏁伴噺
if (!qualifiedNum && !unqualifiedNum) return 0;
// 鏍囧噯鏁伴噺銆佹椂闀�
@@ -471,7 +483,6 @@
getWorkorderRecordListStandard({
workorderId: this.workorderId
}).then(res => {
- debugger
// console.log(res.data[0]);
if (res.data.length > 0) {
this.produceFrom.qualified = res.data[0].qualifiedNum
diff --git a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
index bd72004..db5473d 100644
--- a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
+++ b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
@@ -764,7 +764,8 @@
workorderId: this.workorderId,
duration: this.form.duration ? this.form.duration : 0,
qualifiedNum: this.produceFrom.qualified ? this.produceFrom.qualified : 0,
- unQualifiedNum: this.produceFrom.undesirable ? this.produceFrom.undesirable : 0
+ unQualifiedNum: this.produceFrom.undesirable ? this.produceFrom.undesirable : 0,
+ type: this.form.type
}
// id: route.query.id
comfirmDoneStandard({
@@ -1573,7 +1574,7 @@
}
}
.content {
- height: 100vh;
+ // height: 100vh;
background-color: #f7f7f7;
}
</style>
diff --git a/web_standard/src/components/common/Header.vue b/web_standard/src/components/common/Header.vue
index 674ffae..9c892d0 100644
--- a/web_standard/src/components/common/Header.vue
+++ b/web_standard/src/components/common/Header.vue
@@ -207,9 +207,11 @@
let companyId = this.$store.state.userInfo.company.id
this.setUserInfo(null)
this.$cache.twoFA.removePassword()
- this.$router.push({ name: 'login', params: {
- companyId
- }})
+ this.$store.commit('setCompanyId', companyId)
+ window.location.reload()
+ // this.$router.push({ name: 'login', params: {
+ // companyId
+ // }})
})
.catch(e => {
this.$tip.apiFailed(e)
diff --git a/web_standard/src/views/login.vue b/web_standard/src/views/login.vue
index c86ab0b..caaa85b 100644
--- a/web_standard/src/views/login.vue
+++ b/web_standard/src/views/login.vue
@@ -82,7 +82,8 @@
uuid: this.captcha.uuid
})
.then(() => {
- window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ // window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ window.location.reload()
})
.catch(e => {
this.refreshCaptcha()
--
Gitblit v1.9.3