Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

src/views/synchronization/eldertag/canaddet/CanAddElderTag.data.ts

@@ -20,6 +20,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'tagName',
   },
+  {
+    title: '说明',
+    align: 'center',
+    dataIndex: 'describ',
+  },
   {
     title: '价格(元)',
     align: 'center',

src/views/synchronization/eldertag/canaddet/components/CanAddElderTagForm.vue

@@ -16,6 +16,12 @@
                 <a-input v-model:value="formData.tagName" placeholder="请输入标签名称" allow-clear></a-input>
               </a-form-item>
             </a-col>
+            <a-col :span="24">
+              <a-form-item label="说明" v-bind="validateInfos.describ" id="ElderTagForm-tagName" name="tagName">
+                <a-textarea v-model:value="formData.describ" placeholder="请输入说明" :maxlength="200" :rows="3"
+                  :autosize="{ minRows: 3 }" :showCount="true" />
+              </a-form-item>
+            </a-col>
             <a-col :span="24">
               <a-form-item label="价格(元)" v-bind="validateInfos.price" id="ElderTagForm-price" name="price">
                 <a-input-number v-model:value="formData.price" placeholder="请输入价格" style="width: 100%" :min="0"
@@ -58,6 +64,7 @@ const formData = reactive<Record<string, any>>({
   price: undefined,
   createTime: '',
   sysOrgCode: '',
+  describ:'',
 });
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

src/views/synchronization/eldertag/eldertag/ElderTag.data.ts

@@ -15,6 +15,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'tagName',
   },
+  {
+    title: '说明',
+    align: 'center',
+    dataIndex: 'describ',
+  },
   {
     title: '价格(元)',
     align: 'center',
@@ -49,6 +54,11 @@ export const columnsNoMedia: BasicColumn[] = [
     align: 'center',
     dataIndex: 'tagName',
   },
+  {
+    title: '说明',
+    align: 'center',
+    dataIndex: 'describ',
+  },
   {
     title: '价格(元)',
     align: 'center',
@@ -84,6 +94,11 @@ export const sourceColumns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'tagName',
   },
+  {
+    title: '说明',
+    align: 'center',
+    dataIndex: 'describ',
+  },
   {
     title: '价格(元)',
     align: 'center',
@@ -112,6 +127,11 @@ export const targetSourceColumns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'tagName',
   },
+  {
+    title: '说明',
+    align: 'center',
+    dataIndex: 'describ',
+  },
   {
     title: '价格(元)',
     align: 'center',
@@ -140,6 +160,11 @@ export const targetColumns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'tagName',
   },
+  {
+    title: '说明',
+    align: 'center',
+    dataIndex: 'describ',
+  },
   {
     title: '价格(元)',
     align: 'center',

src/views/synchronization/eldertag/eldertag/components/ElderTagForm.vue

@@ -15,6 +15,12 @@
                 <a-input v-model:value="formData.tagName" placeholder="请输入标签名称" allow-clear></a-input>
               </a-form-item>
             </a-col>
+            <a-col :span="24">
+              <a-form-item label="说明" v-bind="validateInfos.describ" id="ElderTagForm-tagName" name="tagName">
+                <a-textarea v-model:value="formData.describ" placeholder="请输入说明" :maxlength="200" :rows="3"
+                  :autosize="{ minRows: 3 }" :showCount="true" />
+              </a-form-item>
+            </a-col>
             <a-col :span="24">
               <a-form-item label="价格(元)" v-bind="validateInfos.price" id="ElderTagForm-price" name="price">
                 <a-input-number v-model:value="formData.price" placeholder="请输入价格" style="width: 100%" :min="0"
@@ -88,6 +94,7 @@ const formData = reactive<Record<string, any>>({
   pic: '',
   sort: 99,
   izEnabled: '0',
+  describ:'',
 });
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });