From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/main.js | 8 ++++----
src/components/do/b1-inspect-order-plan/Inspection.vue | 2 +-
src/components/view/b1-expenses.vue | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index ad88d9b..eeeb86d 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -4528,7 +4528,7 @@
getAsk(id) {
for (var a in this.currentSample.insProduct) {
if (this.currentSample.insProduct[a].id == id) {
- return this.currentSample.insProduct[a].ask;
+ return this.currentSample.insProduct[a].tell;
}
}
},
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 62fd65a..d444071 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -50,9 +50,9 @@
<div>
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;">璐圭敤缁熻</el-col>
- <el-col :span="12" style="text-align: right;">
+ <!-- <el-col :span="12" style="text-align: right;">
<el-button size="small" type="primary">OA鎺ㄩ��</el-button>
- </el-col>
+ </el-col> -->
</el-row>
</div>
<div class="search">
diff --git a/src/main.js b/src/main.js
index e59dcaf..856d2ce 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,9 +20,9 @@
Vue.prototype.PROJECT = "妫�娴嬩腑蹇�";
// Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
-// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = "http://192.168.0.104:8001";
+Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+const javaApi = "http://127.0.0.1:8001";
+// const javaApi = "http://192.168.0.170:8001";
//閫氫俊娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
@@ -30,8 +30,8 @@
// 閫氫俊姝ｅ紡搴�
// Vue.prototype.LOCATIONVUE = "http://192.168.22.29:8080";
-// const javaApi = 'http://192.168.22.29:8001/lims/';
// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+// const javaApi = 'http://192.168.22.29:8001/lims/';
// //浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
--
Gitblit v1.9.3