合并分支 'feature_dev_20221125_YW' 到 'master'

Feature dev 20221125 yw

查看合并请求 laws-nio/laws-weilai!259

jero-web/src/components/tableCollection/index1.vue

@@ -34,6 +34,7 @@
                        :placeholder="$t('pleaseEnter')"
                        v-model="record.remarks"/>
         </span>
+<!--        历史记录-->
         <template slot="Operation" slot-scope="text, record">
           <a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button>
         </template>
@@ -183,6 +184,11 @@
             <span v-html="text"></span>
       </a-tooltip>
        </span>
+        <span slot="detailText" slot-scope="text,record">
+              <span class="text" :title="text">
+               {{text && text.length > 10?text.slice(0,9)+'...':text}}
+              </span>
+        </span>
       </a-table>
       <div class="page" v-if="dataSourcehistory.length > 0">
         <a-pagination
@@ -338,6 +344,14 @@
             ellipsis: true,
             scopedSlots: { customRender: 'content' }
           },
+          {
+            title: this.$t('remarks'),
+            dataIndex: 'remarks',
+            align: 'center',
+            ellipsis: true,
+            width: 180,
+            scopedSlots: { customRender: 'detailText' }
+          },
           {
             title: this.$t('OperationTime'),
             dataIndex: 'createTime',