From 9a34ff2378be183e5dd80dc1b7ac98579589ff62 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 15 七月 2024 18:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 10 +++++-----
src/components/do/b1-inspect-order-plan/Inspection.vue | 1 +
src/components/view/a6-device-management.vue | 23 ++++++++++++++++++-----
src/assets/api/controller.js | 1 +
src/components/view/b1-expenses.vue | 18 +++++++++++++++++-
5 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a7ffa68..00ab72b 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -166,6 +166,7 @@
delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
+ costStatistics2: "/insOrder/costStatistics2", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index c9a54f0..e86f0eb 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -2135,6 +2135,7 @@
this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ this.param = {}
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index c9a0423..f7973f5 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -438,7 +438,7 @@
v-model="configForm.y"></el-input>
</div>
<div class="search_thing">
- <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍏紡锛�</div>
+ <div class="search_label">鍏紡锛�</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="configForm.formula"></el-input>
</div>
@@ -700,6 +700,23 @@
this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
return m
})
+ this.options.forEach(item=>{
+ if(item.children.length==0){
+ item.children = null;
+ }else{
+ item.children.forEach(m=>{
+ if(m.children.length==0){
+ m.children = null;
+ }else{
+ m.children.forEach(n=>{
+ if(n.children&&n.children.length==0){
+ n.children = null;
+ }
+ })
+ }
+ })
+ }
+ })
})
},
handleClose() {
@@ -940,10 +957,6 @@
}
if(!this.configForm.y){
this.$message.error('璇峰～鍐橸');
- return
- }
- if(!this.configForm.formula){
- this.$message.error('璇峰～鍐欏叕寮�');
return
}
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 5867f38..786e791 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -74,6 +74,7 @@
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
+ <div class="search_thing" style="padding-left: 70px;">鎬讳环锛歿{total}}</div>
</div>
<div class="table">
<ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData" :key="upIndex"
@@ -185,7 +186,8 @@
upIndex: 0,
claimVisible: false,
dates: [],
- index2: 0
+ index2: 0,
+ total: 0
}
},
mounted() {
@@ -195,6 +197,17 @@
this.getPower()
},
methods: {
+ getTotal(){
+ this.$axios.post(this.$api.insOrder.costStatistics2, {
+ entity:this.componentData.entity
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.total = res.data.total
+ })
+ },
getDates(){
//褰撳墠鏈堢涓�澶�
var y = new Date().getFullYear(); //鑾峰彇骞翠唤
@@ -215,11 +228,13 @@
},
refreshTable() {
this.$refs['ValueTable'].selectList()
+ this.getTotal()
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
this.componentData.init = true
this.getDates()
+ this.getTotal()
this.upIndex++
},
handleWeave() {
@@ -255,6 +270,7 @@
}
this.componentData.entity.dates = JSON.stringify(val)
this.$refs['ValueTable'].selectList()
+ this.getTotal()
}
}
}
diff --git a/src/main.js b/src/main.js
index 421b5e3..ce6e72e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,12 +15,12 @@
Vue.prototype.$Big = Big;
// 椤圭洰鍒囨崲
-// Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
-Vue.prototype.PROJECT = '瑁呭鐢电紗'
+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.47.249:8001';
+const javaApi = 'http://172.20.10.5:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
@@ -31,8 +31,8 @@
// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
-Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
-const javaApi = 'http://10.16.173.59:8001';
+// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
+// const javaApi = 'http://10.16.173.59:8001';
// const javaApi = 'http://192.168.47.2:8001';
Vue.prototype.HaveJson = (val) => {
--
Gitblit v1.9.3