From c8fe283ff544c0268c88b1944613f94b2f05793d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 8 May 2026 13:45:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20labeltemplate=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=89=93=E7=A0=81=E5=99=A8=E5=88=97=E5=90=88=E5=B9=B6=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA,=20=E6=8F=90=E4=BA=A4=E6=97=B6=E7=A9=BA=20IP=20?=
 =?UTF-8?q?=E8=BD=AC=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 列表 IP 与端口合并为单列, 无 IP 则整列留空
- submitHandle 提交前空 coder_ip 转 null, 避免后端 IPAddressField 拒空串

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/views/sys/labeltemplate.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/sys/labeltemplate.vue b/src/views/sys/labeltemplate.vue
index 30f86a68..45f9d027 100644
--- a/src/views/sys/labeltemplate.vue
+++ b/src/views/sys/labeltemplate.vue
@@ -13,8 +13,11 @@
 			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="模板名称" prop="name" min-width="100"></el-table-column>
-				<el-table-column label="打码器IP" prop="coder_ip" min-width="130"></el-table-column>
-				<el-table-column label="端口" prop="coder_port" width="80"></el-table-column>
+				<el-table-column label="打码器" min-width="170">
+					<template #default="scope">
+						<span v-if="scope.row.coder_ip">{{ scope.row.coder_ip }}:{{ scope.row.coder_port }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
@@ -118,13 +121,14 @@
 			},
 			submitHandle(){
 				let that = this;
-				
+
 				this.$refs.addForm.validate( (valid) => {
 					if (valid) {
 						this.isSaveing = true;
 						let arr = [];
 						arr = that.addForm.commands.split("\n");
 						that.addForm.commands = arr;
+						if (!that.addForm.coder_ip) that.addForm.coder_ip = null;
 						if(this.type==='add'){
 							this.$API.cm.labeltemplate.create.req(that.addForm).then(res=>{
 								this.isSaveing = false;