From 9cbdd25bac81d784a7d09ae03bbed3aeef08bcbc Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 27 Feb 2025 16:03:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=EF=BC=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E3=80=81=E6=B5=8B=E7=82=B9=E4=B8=AD=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9B=B8=E5=85=B3=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipment_form.vue |  6 ++++++
 src/views/qm/testItem_form.vue  | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 36fb6379..3ab7d851 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -68,6 +68,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="采集数据地址">
+                <el-input v-model="form.cd_req_addr" placeholder="采集数据的请求地址" />
+              </el-form-item>
+            </el-col>
             <!-- <el-col :md="8" :sm="24">
                   <el-form-item label="是否删除">
               <el-switch v-model="form.is_deleted" style="--el-switch-on-color: #FF0000;"/>
@@ -311,6 +316,7 @@ export default {
         multiple: false,
         emitPath: false,
         checkStrictly: true,
+        project_code : this.$TOOL.data.get("BASE_INFO").base.base_code
       },
     };
   },
diff --git a/src/views/qm/testItem_form.vue b/src/views/qm/testItem_form.vue
index 993a9892..41543006 100644
--- a/src/views/qm/testItem_form.vue
+++ b/src/views/qm/testItem_form.vue
@@ -94,14 +94,11 @@
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="排序">
-								<el-input-number
-									v-model="form.sort"
-									clearable
-								></el-input-number>
+							<el-form-item label="采集表达式">
+								<el-input v-model="form.cd_expr" placeholder="采集表达式" />
 							</el-form-item>
 						</el-col>
-						<el-col v-if="type!=='cz'">
+						<el-col :md="12" :sm="24" v-if="type!=='cz'">
 							<el-form-item label="检验类型">
 								<el-checkbox-group v-model="form.tags">
 									<el-checkbox 
@@ -112,6 +109,14 @@
 								</el-checkbox-group>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="排序">
+								<el-input-number
+									v-model="form.sort"
+									clearable
+								></el-input-number>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="是否只读">
 								<el-switch v-model="form.readonly"></el-switch>
@@ -125,7 +130,6 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
-						
 						<el-col :span="24" v-if="mcateTagsOptions.length>0">
 							<el-form-item label="物料系列标签">
 								<el-checkbox-group v-model="form.mcate_tags">
@@ -201,6 +205,7 @@ export default {
 	},
 	data() {
 		return {
+			project_code : this.$TOOL.data.get("BASE_INFO").base.base_code,
 			apiObj: this.$API.qm.testitem.list,
 			loading: false,
 			mode: "add",