周期优化

src/views/module_tpm/equipment/EquipmentList.vue

@@ -130,6 +130,10 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <template slot="equipmentCycle" slot-scope="text,record">
+          <span v-if="text">{{record.equipmentCycle + "（"}}{{record.cycleUnit_dictText +"）"}}</span>
+        </template>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -180,13 +184,15 @@
   import EquipmentModal from './modules/EquipmentModal.vue'
   import EquipmentDetail from './modulesDetail/EquipmentDetail.vue'
   import { httpAction, getAction } from '@/api/manage'
+import Template1 from '../../jeecg/JVxeDemo/layout-demo/Template1.vue'
 
   export default {
     name: 'EquipmentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
         EquipmentModal,
-        EquipmentDetail
+        EquipmentDetail,
+        Template1
     },
     props: {
       selectData: {
@@ -247,14 +253,15 @@
           {
             title:'送检周期',
             align:"center",
-            dataIndex: 'equipmentCycle'
-          },
-          {
-            title:'周期单位',
-            align:"center",
-            dataIndex: 'cycleUnit_dictText'
+            dataIndex: 'equipmentCycle',
+            scopedSlots: { customRender: 'equipmentCycle' }
           },
           // {
+          //   title:'周期单位',
+          //   align:"center",
+          //   dataIndex: 'cycleUnit_dictText'
+          // },
+          // {
           //   title:'出厂编号',
           //   align:"center",
           //   dataIndex: 'factoryNo'