From 72cfb31714c1b5e76b9750ec9d3bd61dc3e4ad15 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Sat, 15 Jun 2024 13:36:06 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acs2/nladmin-ui/src/i18n/langs/task/en.js                  | 1 +
 acs2/nladmin-ui/src/i18n/langs/task/in.js                  | 1 +
 acs2/nladmin-ui/src/i18n/langs/task/zh.js                  | 1 +
 acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue | 2 ++
 acs2/nladmin-ui/src/views/acs/task/index.vue               | 2 ++
 5 files changed, 7 insertions(+)

diff --git a/acs2/nladmin-ui/src/i18n/langs/task/en.js b/acs2/nladmin-ui/src/i18n/langs/task/en.js
index 5ff18b36a..5585ec735 100644
--- a/acs2/nladmin-ui/src/i18n/langs/task/en.js
+++ b/acs2/nladmin-ui/src/i18n/langs/task/en.js
@@ -27,6 +27,7 @@ export default {
       'Starting_layer': 'Starting Layer',
       'Destination': 'Destination',
       'Destination2': 'Destination 2',
+      'Interaction_json': 'Interaction Fields',
       'Ending_column': 'Ending Column',
       'Ending_layer': 'Ending Layer',
       'Description': 'Description',
diff --git a/acs2/nladmin-ui/src/i18n/langs/task/in.js b/acs2/nladmin-ui/src/i18n/langs/task/in.js
index e6b066706..ff60c0e7e 100644
--- a/acs2/nladmin-ui/src/i18n/langs/task/in.js
+++ b/acs2/nladmin-ui/src/i18n/langs/task/in.js
@@ -27,6 +27,7 @@ export default {
       'Starting_layer': 'Lapisan Awal',
       'Destination': 'Tujuan',
       'Destination2': 'Tujuan 2',
+      'Interaction_json': 'Bidang Interaksi',
       'Ending_column': 'Kolom Akhir',
       'Ending_layer': 'Lapisan Akhir',
       'Description': 'Deskripsi',
diff --git a/acs2/nladmin-ui/src/i18n/langs/task/zh.js b/acs2/nladmin-ui/src/i18n/langs/task/zh.js
index 243ed7fdb..045882c91 100644
--- a/acs2/nladmin-ui/src/i18n/langs/task/zh.js
+++ b/acs2/nladmin-ui/src/i18n/langs/task/zh.js
@@ -27,6 +27,7 @@ export default {
       'Starting_layer': '起点-层',
       'Destination': '终点',
       'Destination2': '终点2',
+      'Interaction_json': '交互字段',
       'Ending_column': '终点-列',
       'Ending_layer': '终点-层',
       'Description': '描述信息',
diff --git a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
index e8a87b8a1..845149f9c 100644
--- a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
@@ -295,6 +295,7 @@
         <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
         <el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
         <el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
+        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" :show-overflow-tooltip="true" />
         <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
         <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" />
@@ -329,6 +330,7 @@ const defaultForm = {
   start_point_code: null,
   start_device_code: null,
   next_point_code: null,
+  start_point_code: null,
   remark: null,
   material: null,
   route_plan_code: 'normal',
diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue
index 5b01edc92..1c4575bbf 100644
--- a/acs2/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/task/index.vue
@@ -502,6 +502,7 @@
         <el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
         <el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
         <el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
+        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true" />
         <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
         <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
@@ -671,6 +672,7 @@ export default {
         start_device_code2: null,
         next_point_code: null,
         next_point_code2: null,
+        interaction_json: null,
         remark: null,
         material: null,
         route_plan_code: 'normal',