Merge remote-tracking branch 'origin/master'

jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/ProjectBaseINfo.data.tsx

@@ -0,0 +1,100 @@
+import { BasicColumn } from '/@/components/Table/src/types/table';
+
+import { Badge } from 'ant-design-vue';
+
+export const refundTimeTableSchema: BasicColumn[] = [
+  {
+    title: '指标类别(参考分值)	',
+    align:"center",
+    dataIndex: 'indexClass_dictText'
+  },
+  {
+    title: '序号',
+    align:"center",
+    dataIndex: 'seq'
+  },
+  {
+    title: '指标名称	',
+    align:"center",
+    dataIndex: 'indexName'
+  },
+  {
+    title: '预期指标名称(参考举例)',
+    align:"center",
+    dataIndex: 'expectIndexName'
+  },
+  {
+    title: '考核方式方法',
+    align:"center",
+    dataIndex: 'checkMethod'
+  },
+  {
+    title: '考核指标分值',
+    align:"center",
+    dataIndex: 'indexVal'
+  },
+  {
+    title: '备注',
+    align:"center",
+    dataIndex: 'remark'
+  },
+  /*{
+    title: '时间',
+    width: 150,
+    dataIndex: 't1',
+  },
+  {
+    title: '当前进度',
+    width: 150,
+    dataIndex: 't2',
+  },
+  {
+    title: '状态',
+    width: 150,
+    dataIndex: 't3',
+    customRender: ({ record }) => {
+      return <Badge status="success" text={record.t3} />;
+    },
+  },
+  {
+    title: '操作员ID	',
+    width: 150,
+    dataIndex: 't4',
+  },
+  {
+    title: '耗时',
+    width: 150,
+    dataIndex: 't5',
+  },*/
+];
+
+export const refundTimeTableData: any[] = [
+  {
+    t1: '2017-10-01 14:10',
+    t2: '联系客户',
+    t3: '进行中',
+    t4: '取货员 ID1234',
+    t5: '5mins',
+  },
+  {
+    t1: '2017-10-01 14:10',
+    t2: '取货员出发',
+    t3: '成功',
+    t4: '取货员 ID1234',
+    t5: '5mins',
+  },
+  {
+    t1: '2017-10-01 14:10',
+    t2: '取货员接单',
+    t3: '成功',
+    t4: '系统',
+    t5: '5mins',
+  },
+  {
+    t1: '2017-10-01 14:10',
+    t2: '申请审批通过',
+    t3: '成功',
+    t4: '用户',
+    t5: '1h',
+  },
+];

jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/ProjectBaseInfoDemo.vue

@@ -53,14 +53,13 @@ const {tableContext} = useListPage({
     api: list,
     columns,
     canResize: false,
-    formConfig: {
-      //labelWidth: 120,
-      // schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-      showAdvancedButton: true,
-      fieldMapToNumber: [],
-      fieldMapToTime: [],
-    },
+    showTableSetting: false,
+    striped: true,
+    useSearchForm: true,
+    showActionColumn: false,
+    bordered: true,
+    showIndexColumn: false,
+    pagination: false,
   }
 })
 
@@ -114,12 +113,7 @@ const schema: DescItem[] = [
     label: '地址',
   },
 ];
-// export default defineComponent({
-// components: {
-//   Description, PageWrapper, BasicTable
-// }
-// ,
-// setup() {
+
 const [register] = useDescription({
   title: 'useDescription',
   // data: mockData,
@@ -144,13 +138,7 @@ async function getData() {
   projectBaseInfoData.value = obj
 }
 
-
 onMounted(() => {
   getData()
 });
-
-
-// return {mockData, projectBaseInfoData, schema, register/*, register1*/};
-// },
-// });
 </script>