From a1235a07a8919120d0c971c600b67340a42d2eb5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 01 十一月 2024 11:23:03 +0800
Subject: [PATCH] 修改互调、标签打印格式
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 19 ++++++++-
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 18 ++++++++-
src/main.js | 4 +-
src/components/view/b1-inspection-order.vue | 28 +++++++-------
4 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
index 07e0c6d..59dafee 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -133,10 +133,18 @@
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
<table border="1" cellpadding="10" class="thermal-table">
<tr>
- <td>棰戠偣</td>
+ <td>棰戞</td>
<td :colspan="n.portList.length+1">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="棰戠偣" v-model="n.often" :disabled="state>1" @blur="handlePort(n)"></el-input>
+ <!-- <el-input size="small" placeholder="棰戞" v-model="n.often" :disabled="state>1" @blur="handlePort(n)"></el-input> -->
+ <el-select v-model="n.often" placeholder="璇烽�夋嫨" size="small" style="width: 200px;" :disabled="state>1">
+ <el-option
+ v-for="item in bandList0"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
</div>
</td>
</tr>
@@ -270,6 +278,7 @@
return {
value: "",
bandList:[],
+ bandList0:[],
portList:[
{
value:'1',
@@ -344,6 +353,7 @@
resValue:''
},
],
+
allBandList:[],//棰戞
insProductNew:[],
isMore:false,
@@ -416,6 +426,11 @@
}).then(res => {
this.bandList = res.data
})
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "浜掕皟-棰戞"
+ }).then(res => {
+ this.bandList0 = res.data
+ })
},
// 鍒濆鍖栨暟鎹�
initData(){
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
index 75d357a..f9fcd1b 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -133,10 +133,18 @@
<div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
<table border="1" cellpadding="10" class="thermal-table">
<tr>
- <td>棰戠偣</td>
+ <td>棰戞</td>
<td :colspan="n.portList.length+1">
<div style="display: flex;align-items: center;">
- <el-input size="small" placeholder="棰戠偣" v-model="n.often" :disabled="state>1" @blur="handlePort(n)"></el-input>
+ <!-- <el-input size="small" placeholder="棰戠偣" v-model="n.often" :disabled="state>1" @blur="handlePort(n)"></el-input> -->
+ <el-select v-model="n.often" placeholder="璇烽�夋嫨" size="small" style="width: 200px;" :disabled="state>1">
+ <el-option
+ v-for="item in bandList0"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
</div>
</td>
</tr>
@@ -181,6 +189,7 @@
return {
value: "",
bandList:[],
+ bandList0:[],
portList:[
{
value:'1',
@@ -288,6 +297,11 @@
}).then(res => {
this.bandList = res.data
})
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "浜掕皟-棰戞"
+ }).then(res => {
+ this.bandList0 = res.data
+ })
},
// 鍒濆鍖栨暟鎹�
initData(){
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 9e26214..d4a5e28 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -402,19 +402,19 @@
<div>
<div style="width: 100%;line-height: 30px;">
<el-row style="font-size: 16px;">
- <el-col :span="16"><span> 鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
- <el-col :span="8"><span> 瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
+ <el-col :span="16"><span>&n style="text-align: left;"bsp; 鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col :span="16"><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
- <el-col :span="8"><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span> 濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col :span="16"><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
- <el-col :span="8"><span> 鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span> 鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="8" style="text-align: left;"><span> 鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
- <el-col><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ <el-col style="text-align: left;"><span> 妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
</div>
</div>
@@ -439,19 +439,19 @@
<div>
<div style="width: 100%;line-height: 30px;">
<el-row style="font-size: 16px;">
- <el-col :span="16"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
- <el-col :span="7"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ <el-col :span="7" style="text-align: left;"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col :span="16"><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
- <el-col :span="7"><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
+ <el-col :span="7" style="text-align: left;"><span>鐢垫満缂栧彿: </span>{{ item.motorNumber }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;">
- <el-col :span="16"><span>鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
- <el-col :span="7"><span>鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
+ <el-col :span="16" style="text-align: left;"><span>鏍锋満瀹屾垚鏃堕棿: </span>{{ item.issueTime }}</el-col>
+ <el-col :span="7" style="text-align: left;"><span>鏍锋満鍛�: </span>{{ item.issueName }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 16px;" class="ellipsis-multiline">
- <el-col><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
+ <el-col style="text-align: left;"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
</div>
</div>
diff --git a/src/main.js b/src/main.js
index afa39b8..b6fd273 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,11 +21,11 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://172.20.10.5:8001';
+// const javaApi = 'http://172.20.10.5:8001';
// //閫氫俊娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-// const javaApi = 'http://10.1.13.77:8001';
+const javaApi = 'http://10.1.13.77:8001';
// 閫氫俊姝ｅ紡搴�
// Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
--
Gitblit v1.9.3