资产审批

apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue

@@ -12,19 +12,11 @@ import type { CleanVO } from '#/api/property/clean/model';
 import { clean_orderAdd, clean_orderInfo, clean_orderUpdate } from '#/api/property/clean_order';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 import { resident_unitList } from '#/api/property/resident/unit';
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import type { VxeGridProps } from '#/adapter/vxe-table';
-import cleanDetailModal from './clean-detail-modal.vue';
-import { Table, Button } from 'ant-design-vue';
+
 import { modalSchema } from './data';
 
-const totalSumPeices = computed(() => {
-  return detailTable.value
-    .reduce((total: number, item: any) => total + (Number(item.sumPeices) || 0), 0)
-    .toFixed(2);
-});
-
 const emit = defineEmits<{ reload: [] }>();
+
 const isUpdate = ref(false);
 const title = computed(() => {
   return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
@@ -107,9 +99,8 @@ const [BasicModal, modalApi] = useVbenModal({
 
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
-
     if (isUpdate.value && id) {
-      const record:any = await clean_orderInfo(id);
+      const record = await clean_orderInfo(id);
       if (record.starTime) record.starTime = dayjs(record.starTime);
       if (record.endTime) record.endTime = dayjs(record.endTime);
       editUnitId.value = record.unitId || '';
@@ -121,121 +112,6 @@ const [BasicModal, modalApi] = useVbenModal({
   },
 });
 
-// 添加订单详情表格配置
-const detailGridOptions: VxeGridProps = {
-  height: '300px',
-  columns: [
-    { type: 'checkbox', width: 60 },
-    {
-      title: '序号',
-      field: 'index',
-      slots: {
-        default: ({ rowIndex }) => {
-          return (rowIndex + 1).toString();
-        },
-      },
-    },
-    {
-      title: '劳务名称',
-      field: 'name',
-    },
-    {
-      title: '计量单位',
-      field: 'measure',
-    },
-    {
-      title: '计算方式',
-      field: 'method',
-    },
-    {
-      title: '申报单价含税（元）',
-      field: 'peices',
-    },
-    {
-      title: '保洁频率',
-      field: 'frequency',
-    },
-    {
-      title: '保洁标准',
-      field: 'standard',
-    },
-    {
-      title: '备注',
-      field: 'remark',
-    },
-    {
-      title: '状态',
-      field: 'stater',
-      slots: {
-        default: ({ row }) => row.stater === 1 ? '启用' : '禁用',
-      },
-    },
-    {
-      title: '保洁面积',
-      field: 'area',
-    },
-    {
-      title: '合计费用',
-      field: 'sumPeices',
-    },
-    {
-      field: 'action',
-      fixed: 'right',
-      slots: { default: 'action' },
-      title: '操作',
-      width: 120,
-    },
-  ],
-  data: [],
-};
-const detailColumns = [
-  { title: '序号', key: 'index'},
-  { title: '劳务名称', dataIndex: 'name', key: 'name' },
-  { title: '计量单位', dataIndex: 'measure', key: 'measure' },
-  { title: '计算方式', dataIndex: 'method', key: 'method' },
-  { title: '申报单价含税（元）', dataIndex: 'peices', key: 'peices' },
-  { title: '保洁频率', dataIndex: 'frequency', key: 'frequency' },
-  { title: '保洁标准', dataIndex: 'standard', key: 'standard' },
-  { title: '备注', dataIndex: 'remark', key: 'remark' },
-  {
-    title: '状态',
-    dataIndex: 'stater',
-    key: 'stater',
-    customRender: ({ value }: { value: number }) => (value === 1 ? '启用' : '禁用')
-  },
-  { title: '保洁面积', dataIndex: 'area', key: 'area' },
-  { title: '合计费用', dataIndex: 'sumPeices', key: 'sumPeices' },
-  {
-    title: '操作',
-    key: 'action',
-    fixed: 'right',
-    width: 120,
-  },
-]
-
-const [DetailTable, detailTableApi] = useVbenVxeGrid({
-  gridOptions: detailGridOptions,
-});
-const detailTable = ref<any>([])
-
-const [CleanDetailModal, detailModalApi] = useVbenModal({
-  connectedComponent: cleanDetailModal,
-});
-
-function handleAddDetail() {
-  detailModalApi.setData({});
-  detailModalApi.open();
-}
-
-function handleDetailReload(data: any) {
-  detailTable.value.push(data)
-}
-
-function handleDeleteDetail(record: any,index: number) {
-  console.log(record,index);
-  detailTable.value.splice(index,1)
-}
-
 async function handleConfirm() {
   try {
     modalApi.lock(true);
@@ -244,13 +120,15 @@ async function handleConfirm() {
       return;
     }
     const data = cloneDeep(await formApi.getValues());
-    console.log(data);
+console.log(data);
+
     // 单位数据缓存
     if (unitListData.length === 0) {
       const res = await resident_unitList();
       unitListData = res.rows || [];
     }
     // 劳务数据缓存 cleanListData 已有
+
     // 查找label
     const unitObj = unitListData.find(item => item.id === data.unit);
     const cleanObj = cleanListData.find(item => item.id === data.name);
@@ -282,54 +160,8 @@ async function handleClosed() {
 </script>
 
 <template>
-  <BasicModal :title="title" >
+  <BasicModal :title="title">
     <BasicForm />
-    <!-- 添加订单详情部分 -->
-    <div class="mt-4">
-      <div class="flex items-center justify-between mb-2">
-        <h3 class="text-lg font-medium">添加保洁订单详情</h3>
-        <a-button type="primary" @click="handleAddDetail">
-          {{ $t('pages.common.add') }}
-        </a-button>
-      </div>
-    <Table :dataSource="detailTable" :columns="detailColumns" :pagination="false"  >
-  <template #bodyCell="{ column, index,record }">
-    <template v-if="column.key === 'index'">
-      {{ index + 1 }}
-    </template>
-        <template v-else-if="column.key === 'action'">
-          <Button danger @click="handleDeleteDetail(record,index)">删除</Button>        
-        </template>
-  </template>
-</Table>
-<div>费用合计：{{ totalSumPeices }}元</div>
-      </div>
-    <CleanDetailModal @reload="handleDetailReload" />
   </BasicModal>
 </template>
 
-<style scoped>
-.mt-4 {
-  margin-top: 1rem;
-}
-.mb-2 {
-  margin-bottom: 0.5rem;
-}
-.flex {
-  display: flex;
-}
-.items-center {
-  align-items: center;
-}
-.justify-between {
-  justify-content: space-between;
-}
-.text-lg {
-  font-size: 1.125rem;
-  line-height: 1.75rem;
-}
-.font-medium {
-  font-weight: 500;
-}
-</style>
-

apps/web-antd/src/views/property/clean/cleanOrders/data.ts

@@ -131,28 +131,28 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
-  // {
-  //   label: '劳务名称',
-  //   fieldName: 'name',
-  //   component: 'ApiSelect',
-  //   componentProps: {
-  //     api: cleanList,
-  //     resultField: 'rows',
-  //     labelField: 'name',
-  //     valueField: 'id',
-  //   },
-  //   rules: 'required',
-  // },
-  // {
-  //   label: '服务单价',
-  //   fieldName: 'prices',
-  //   component: 'Input',
-  //   rules: 'required',
-  //   componentProps: {
-  //     placeholder: '',
-  //     disabled: true,
-  //   },
-  // },
+  {
+    label: '劳务名称',
+    fieldName: 'name',
+    component: 'ApiSelect',
+    componentProps: {
+      api: cleanList,
+      resultField: 'rows',
+      labelField: 'name',
+      valueField: 'id',
+    },
+    rules: 'required',
+  },
+  {
+    label: '服务单价',
+    fieldName: 'prices',
+    component: 'Input',
+    rules: 'required',
+    componentProps: {
+      placeholder: '',
+      disabled: true,
+    },
+  },
   // {
   //   label: '保洁频率',
   //   fieldName: 'frequency',