fix: bug修复

柏杨
1 parent 862e532e
Showing 25 changed files with 160 additions and 90 deletions
src/api/project/approve.ts
src/views/project/config/ProduCostCreate.vue
src/views/project/config/ProduCostEdit.vue
src/views/project/config/TablePanel.vue
src/views/project/config/costCreate.vue
src/views/project/config/costEdit.vue
src/views/project/config/data.tsx
src/views/project/config/index.vue
src/views/project/finance/financeList/index.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/FinanceEdit.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/HistoryDetail.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/index.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/ApproveReason.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/CheckDetail.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/FinanceEdit.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/HistoryDetail.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/index.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/HistoryDetail.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/FinanceEdit.vue
@@ -43,7 +43,6 @@ export const getApprovedListApi = async (params: any) =&gt; {
   res.records = res.records.map((item) => {
     return item;
   });
-  console.log(res, '56567ressss');
   return new Promise((resolve) => {
     resolve({ items: res.records, total: res.total });
   });
@@ -25,6 +25,12 @@
         ><span style="margin-right: 8px; width: 80%">提成单价：</span>
         <a-input v-model:value="ratio" />
       </div>
+      <div
+        ><span style="margin-right: 8px; width: 80%">年份：</span>
+        <a-select v-model:value="year" style="width: 100%">
+          <a-select-option v-for="y in yearOptions" :key="y" :value="y">{{ y }}</a-select-option>
+        </a-select>
+      </div>
     </a-space>
   </BasicModal>
 </template>
@@ -54,6 +60,13 @@
       //获取现有的列表
       const listAll = ref();
       const fixCost = ref();
+      const year = ref(new Date().getFullYear().toString());
+      // Generate year options from 2023 to current year
+      const currentYear = new Date().getFullYear();
+      const yearOptions = ref<string[]>([]);
+      for (let y = 2023; y <= currentYear; y++) {
+        yearOptions.value.push(y.toString());
+      }
       const ratio = ref();
       // const relationValue = ref();
       const customerCode = ref();
@@ -91,7 +104,7 @@
             settingValue: customerCode.value,
             settingType: 4,
             relationCode: 'ProduceSettingItem',
-            relationName: '成本配置项集合',
+            relationName: year.value,
             costSettingItemVOS: relationValue.value,
           });
           emit('modal-success');
@@ -108,6 +121,8 @@
         activeUser,
         fixCost,
         ratio,
+        year,
+        yearOptions,
         customerCode,
         customerCodeOptions,
         handleOk,
@@ -17,6 +17,7 @@
     <a-space direction="vertical" style="width: 100%">
       <a-input v-model:value="fixCost" addonBefore="固定成本  " />
       <a-input v-model:value="ratio" addonBefore="提成单价  " />
+      <a-input v-model:value="year" :disabled="true" addonBefore="年份  " />
     </a-space>
   </BasicDrawer>
 </template>
@@ -35,13 +36,14 @@
     relationValue.value = JSON.parse(listAll.value.relationValue);
     fixCost.value = relationValue.value[0].relationValue;
     ratio.value = relationValue.value[1].relationValue;
+    year.value = listAll.value.relationName;
   });
   //获取现有的列表
   const listAll = ref();
   const fixCost = ref();
   const ratio = ref();
   const relationValue = ref();
-
+  const year = ref();
   //完成编辑
   async function handleSubmit() {
     relationValue.value[0].relationValue = fixCost.value;
@@ -53,7 +55,7 @@
       settingValue: listAll.value.settingValue,
       settingType: 4,
       relationCode: 'ProduceSettingItem',
-      relationName: '成本配置项集合',
+      relationName: year.value,
       costSettingItemVOS: relationValue.value,
     });
     emit('success');
@@ -46,7 +46,7 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import CreateModal from './CreateModal.vue';
   import { deleteConfig, getList, saveConfig } from '/@/api/sys/config';
-  import { COLUMNS } from './data';
+  import { COLUMNS, searchFormSchema } from './data';
   import { useModal } from '/@/components/Modal';
   import { useDrawer } from '/@/components/Drawer';
   import CostEdit from './costEdit.vue';
@@ -74,6 +74,10 @@
     pagination: false,
     columns: COLUMNS[props.column!],
     rowKey: 'id',
+    useSearchForm: props.column === 6 || props.column === 9,
+    formConfig: {
+      schemas: props.column === 6 || props.column === 9 ? searchFormSchema : [],
+    },
     actionColumn: {
       width: 160,
       title: 'Action',
@@ -29,6 +29,12 @@
         ><span style="margin-right: 8px; width: 80%">西班牙提成比例：</span>
         <a-input v-model:value="spainRatio" />
       </div>
+      <div
+        ><span style="margin-right: 8px; width: 80%">年份：</span>
+        <a-select v-model:value="year" style="width: 100%">
+          <a-select-option v-for="y in yearOptions" :key="y" :value="y">{{ y }}</a-select-option>
+        </a-select>
+      </div>
       <!-- <div
         ><span style="margin-right: 8px; width: 80%">生产提成单价：</span>
         <a-input v-model:value="price" />
@@ -65,6 +71,13 @@
       const ratio = ref();
       const spainRatio = ref();
       const price = ref();
+      const year = ref(new Date().getFullYear().toString());
+      // Generate year options from 2023 to current year
+      const currentYear = new Date().getFullYear();
+      const yearOptions = ref<string[]>([]);
+      for (let y = 2023; y <= currentYear; y++) {
+        yearOptions.value.push(y.toString());
+      }
       // const relationValue = ref();
       const customerCode = ref();
       const relationValue = ref([
@@ -89,8 +102,6 @@
         //   relationValue: '',
         // },
       ]);
-      // const loading = ref(true);
-
       const { customerCode: customerCodeOptions } = useOrderInfo(orderStore);
       function handleShow(visible: boolean) {
@@ -124,7 +135,7 @@
             settingValue: customerCode.value,
             settingType: 3,
             relationCode: 'costSettingItem',
-            relationName: '成本配置项集合',
+            relationName: year.value,
             costSettingItemVOS: relationValue.value,
           });
           emit('modal-success');
@@ -144,6 +155,8 @@
         spainRatio,
         price,
         customerCode,
+        year,
+        yearOptions,
         customerCodeOptions,
         handleOk,
       };
@@ -18,6 +18,7 @@
       <a-input v-model:value="fixCost" addonBefore="固定成本  " />
       <a-input v-model:value="ratio" addonBefore="提成比例  " />
       <a-input v-model:value="spainRatio" addonBefore="西班牙提成比例  " />
+      <a-input v-model:value="year" :disabled="true" addonBefore="年份  " />
       <!-- <a-input v-model:value="price" addonBefore="生产提成单价" /> -->
     </a-space>
   </BasicDrawer>
@@ -40,6 +41,7 @@
     spainRatio.value = relationValue.value[2].relationValue 
       ? (parseFloat(relationValue.value[2].relationValue) * 100).toFixed(2) + '%' 
       : '';
+    year.value = listAll.value.relationName;
   });
   //获取现有的列表
   const listAll = ref();
@@ -47,6 +49,7 @@
   const ratio = ref();
   const spainRatio = ref();
   const relationValue = ref();
+  const year = ref();
   // 格式化百分比值，去除百分号并除以100
   function formatPercentage(value) {
@@ -72,7 +75,7 @@
       settingValue: listAll.value.settingValue,
       settingType: 3,
       relationCode: 'costSettingItem',
-      relationName: '成本配置项集合',
+      relationName: year.value,
       costSettingItemVOS: relationValue.value,
     });
     emit('success');
 import { Tag } from 'ant-design-vue';
 import { BasicColumn } from '@/components/Table';
 import { h } from 'vue';
+import { queryNoOptions } from '/@/api/project/order';
 export const COLUMNS = {
   1: [
@@ -66,6 +67,11 @@ export const COLUMNS = {
       width: 150,
     },
     {
+      title: '年份',
+      dataIndex: 'relationName',
+      width: 150,
+    },
+    {
       title: '固定成本',
       dataIndex: 'relationValue',
       width: 150,
@@ -137,6 +143,11 @@ export const COLUMNS = {
       width: 150,
     },
     {
+      title: '年份',
+      dataIndex: 'relationName',
+      width: 150,
+    },
+    {
       title: '固定成本',
       dataIndex: 'relationValue',
       width: 150,
@@ -256,3 +267,23 @@ export const columnsProduct: BasicColumn[] = [
     editRow: true,
   },
 ];
+
+export const searchFormSchema = [
+  {
+    field: 'relationName',
+    label: '年份',
+    component: 'Select',
+    colProps: { span: 8 },
+    componentProps: {
+      showSearch: true,
+      options: (() => {
+        const options = [];
+        const currentYear = new Date().getFullYear();
+        for (let y = 2023; y <= currentYear; y++) {
+          options.push({ label: y.toString(), value: y.toString() });
+        }
+        return options;
+      })(),
+    },
+  },
+]
 \ No newline at end of file
@@ -22,7 +22,7 @@
           <TablePanel :searchInfo="{ relationCode: 'orderHodTime' }" :column="5" />
         </Tabs.TabPane>
         <Tabs.TabPane key="6" tab="提成成本配置">
-          <TablePanel :searchInfo="{ relationCode: 'costSettingItem' }" :column="6" />
+          <TablePanel :searchInfo="{ relationCode: 'costSettingItem', relationName: currentYear }" :column="6" />
         </Tabs.TabPane>
         <Tabs.TabPane key="7" tab="销售额配置" v-if="role !== ROLE.FINANCE">
           <TablePanel :searchInfo="{ relationCode: 'salesAmount' }" :column="7" />
@@ -31,7 +31,7 @@
           <TablePanel :searchInfo="{ relationCode: 'produHodTime' }" :column="8" />
         </Tabs.TabPane>
         <Tabs.TabPane key="9" tab="生产科固定成本">
-          <TablePanel :searchInfo="{ relationCode: 'ProduceSettingItem' }" :column="9" />
+          <TablePanel :searchInfo="{ relationCode: 'ProduceSettingItem', relationName: currentYear }" :column="9" />
         </Tabs.TabPane>
         <Tabs.TabPane key="10" tab="客户公司" v-if="role !== ROLE.FINANCE">
           <TablePanel :searchInfo="{ relationCode: 'companyConfiguration' }" :column="10" />
@@ -56,6 +56,7 @@
   const orderStore = useOrderStoreWithOut();
   const userStore = useUserStoreWithOut();
   const user = userStore.getUserInfo;
+  const currentYear = new Date().getFullYear().toString();
   const role = computed(() => {
     return user?.roleSmallVO?.code;
   });
@@ -497,7 +497,6 @@
     });
   }
   function handleDeleteDeduct(record) {
-    console.log(record, '5656record');
     deleteDeduct({ id: record.invoiceId });
   }
   function handleCheckDeleteDeduct(record) {
@@ -51,7 +51,7 @@
 <script lang="ts" setup>
   import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
   import { BasicForm, FormSchema, useForm } from '@/components/Form';
-  import { defineComponent, ref, computed, unref, toRaw, reactive } from 'vue';
+  import { defineComponent, ref, computed, watch, toRaw, reactive } from 'vue';
   import { getPackageEdit } from '@/api/project/invoice';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { ROLE } from './type.d';
@@ -141,8 +141,14 @@
   const input3 = ref();
   const orderCount = ref();
   const id = ref();
+  watch(input3, (newVal) => {
+    if (newVal && orderCount.value) {
+      input1.value = (parseFloat(newVal) * parseFloat(orderCount.value)).toFixed(2);
+    } else {
+      input1.value = '';
+    }
+  });
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
-    console.log(data,'5656fdsfa');
     // 方式1
     if (data.data?.lockFields) {
       status1.value = data.data?.lockFields?.productionDepartmentPredictPrice;
@@ -136,7 +136,7 @@
         if (index === 1) {
           const res = await getOrderCostDetailedOptLog({
             orderId: data,
-            type: 40,
+            type: [40],
             page: page,
             pageSize: 20,
           });
@@ -146,7 +146,7 @@
         } else {
           const res = await getOrderCostDetailedOptLog({
             orderId: data,
-            type: 70,
+            type: [90,91],
             page: page,
             pageSize: 20,
           });
@@ -111,7 +111,7 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys }] = useTable({
+  const [registerTable, { reload, setSelectedRowKeys, getForm }] = useTable({
     api: getInnerProfit,
     bordered: true,
     columns: COLUMNS,
@@ -298,28 +298,35 @@
   }
   function handleExport() {
-    console.log('Selected data:', {
-      orderIds: orderIds.value,
-      projectNo: projectNo.value,
-      customerCode: customerCode.value,
-      innerNo: innerNo.value,
-      productionDepartment: productionDepartment.value
-    });
-    if (checkedKeys.value.length <= 0) {
-      createMessage.warn('请选择数据!');
-      return;
+    // Get current search parameters from the form
+    const values = getForm().getFieldsValue();
+    
+    // Create export parameters based on whether orderIds are selected
+    let exportParams;
+    
+    // If orderIds are selected, only use those and ignore search params
+    if (orderIds.value.length > 0) {
+      exportParams = {
+        orderIds: orderIds.value
+      };
+    } 
+    // Otherwise use the search parameters
+    else {
+      exportParams = {
+        ...values,
+        projectNo: values.projectNo || undefined,
+        customerCode: values.customerCode || undefined,
+        innerNo: values.innerNo || undefined,
+        productionDepartment: values.productionDepartment || undefined
+      };
     }
+    
+    
     const token = userStore.getToken;
     axios
       .post(
         '/basic-api/order/cost/innerProfitDetail/exportExcel',
-        { 
-          orderIds: orderIds.value,
-          projectNo: projectNo.value,
-          customerCode: customerCode.value,
-          innerNo: innerNo.value,
-          productionDepartment: productionDepartment.value
-        },
+        exportParams,
         {
           headers: {
             Authorization: `${token}`,
@@ -25,7 +25,6 @@
   const [register, { setModalProps, redoModalHeight, closeModal }] = useModalInner(async (data) => {
     baseFieldValues.value = data.data;
     baseFieldValues.value.projectNoPrefix = data.id;
-    console.log(data, '5656appr');
   });
   async function handleOk() {
     baseFieldValues.value.applyRemark = input.value;
@@ -77,7 +77,6 @@
       const [register, { closeDrawer }] = useDrawerInner((data) => {
         Object.assign(lockFields, data.lockFields);
         id.value = data.projectNoPrefix;
-        console.log(data, '5656checkdetail');
       });
       function handleCloseModal() {
         closeDrawer();
@@ -188,7 +188,6 @@
       status6.value = data?.data?.lockFields?.actualExchangeRate;
     }
     id.value = data?.data?.projectNoPrefix;
-    console.log(data.data, '5656datafff');
     input1.value = data?.data?.developmentCopyRmbTotalPrice?.toFixed(2);
     input2.value = data?.data?.spainPaidRmbCommission?.toFixed(2);
     input3.value = data?.data?.produceStartTime ? dayjs(data?.data?.produceStartTime) : null;
@@ -136,7 +136,7 @@
         if (index === 1) {
           const res = await getProjectOptLog({ 
             projectNoPrefix: data, 
-            type: 30, 
+            type: [30], 
             page: page, 
             pageSize: 20 
           });
@@ -146,7 +146,7 @@
         } else {
           const res = await getProjectOptLog({ 
             projectNoPrefix: data, 
-            type: 1, 
+            type: [1,3], 
             page: page, 
             pageSize: 20 
           });
@@ -212,7 +212,6 @@
   });
   function handleFinanceEdit(record) {
-    console.log(record, '565656ddd');
     openFinanceEdit(true, {
       data: record,
     });
@@ -360,7 +359,6 @@
     setSelectedRowKeys(checkedKeys.value as any);
   }
   function handleExport() {
-    console.log(detailProjectNoKeys.value, '5656detailProjectNoKeys.value');
     if (checkedKeys.value.length <= 0) {
       createMessage.warn('请选择数据!');
       return;
@@ -136,7 +136,7 @@
         if (index === 1) {
           const res = await getOrderCostDetailedOptLog({
             orderId: data,
-            type: 20,
+            type: [20],
             page: page,
             pageSize: 20
           });
@@ -146,7 +146,7 @@
         } else {
           const res = await getOrderCostDetailedOptLog({
             orderId: data,
-            type: 60,
+            type: [80,81],
             page: page,
             pageSize: 20
           });
@@ -115,7 +115,7 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys }] = useTable({
+  const [registerTable, { reload, setSelectedRowKeys, getForm }] = useTable({
     api: getPackageProfit,
     bordered: true,
     columns: COLUMNS,
@@ -301,28 +301,36 @@
   }
   function handleExport() {
-    console.log('Selected data:', {
-      orderIds: orderIds.value,
-      projectNo: projectNo.value,
-      customerCode: customerCode.value,
-      innerNo: innerNo.value,
-      productionDepartment: productionDepartment.value
-    });
-    if (checkedKeys.value.length <= 0) {
-      createMessage.warn('请选择数据!');
-      return;
+    // Get current search parameters from the form
+    const values = getForm().getFieldsValue();
+    
+    // Create export parameters based on whether orderIds are selected
+    let exportParams;
+    
+    // If orderIds are selected, only use those and ignore search params
+    if (orderIds.value.length > 0) {
+      exportParams = {
+        orderIds: orderIds.value
+      };
+    } 
+    // Otherwise use the search parameters
+    else {
+      exportParams = {
+        ...values,
+        projectNo: values.projectNo || undefined,
+        customerCode: values.customerCode || undefined,
+        innerNo: values.innerNo || undefined,
+        productionDepartment: values.productionDepartment || undefined
+      };
     }
+    
+    console.log('Export parameters:', exportParams);
+    
     const token = userStore.getToken;
     axios
       .post(
         '/basic-api/order/cost/businessProfitDetail/exportExcel',
-        { 
-          orderIds: orderIds.value,
-          projectNo: projectNo.value,
-          customerCode: customerCode.value,
-          innerNo: innerNo.value,
-          productionDepartment: productionDepartment.value
-        },
+        exportParams,
         {
           headers: {
             Authorization: `${token}`, // 去掉引号
@@ -46,14 +46,6 @@
         auto-size
       />
       <div style="margin: 16px 0"></div>
-      <div style="font-size: 15px">实际汇率￥</div>
-      <a-input
-        v-model:value="input6"
-        placeholder="请输入"
-        :disabled="status6 === 'LOCKED'"
-        auto-size
-      />
-      <div style="margin: 16px 0"></div>
       <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
       <template #appendFooter>
         <!-- <a-button type="primary" @click="onGoCheckDetail"> 申请权限</a-button> -->
@@ -146,7 +138,6 @@
   const status3 = ref();
   const status4 = ref();
   const status5 = ref();
-  const status6 = ref();
   const input1 = ref();
   const input2 = ref();
@@ -154,7 +145,6 @@
   const input4 = ref();
   const input5 = ref();
-  const input6 = ref();
   const id = ref();
   // function formatDate(dateStr: string): string {
   //   const date = new Date(dateStr);
@@ -185,7 +175,6 @@
       status3.value = data?.data?.lockFields?.projectStartTime;
       status4.value = data?.data?.lockFields?.projectEndTime;
       status5.value = data?.data?.lockFields?.paidRmbCommission;
-      status6.value = data?.data?.lockFields?.actualExchangeRate;
     }
     id.value = data?.data?.projectNoPrefix;
     input1.value = data?.data?.developmentCopyRmbTotalPrice.toFixed(2);
@@ -193,7 +182,6 @@
     input3.value = dayjs(formatDateToDateOnly(data?.data?.projectStartTime));
     input4.value = dayjs(formatDateToDateOnly(data?.data?.projectEndTime));
     input5.value = data?.data?.paidRmbCommission.toFixed(2);
-    input6.value = data?.data?.actualExchangeRate.toFixed(2);
     resetFields();
     setDrawerProps({ confirmLoading: false });
@@ -220,7 +208,6 @@
         projectStartTime: input3.value,
         projectEndTime: input4.value,
         paidRmbCommission: input5.value,
-        actualExchangeRate: input6.value,
       });
       emit('success');
       closeDrawer();
@@ -233,7 +220,6 @@
       input3.value = '';
       input4.value = '';
       input5.value = '';
-      input6.value = '';
     }
   }
 </script>
@@ -136,18 +136,17 @@
         if (index === 1) {
           const res = await getProjectOptLog({ 
             projectNoPrefix: data, 
-            type: 10,
+            type: [10],
             page: page,
             pageSize: 20 
           });
-          console.log(res, '5656res');
           list1.value = res.items;
           total1.value = res.total;
           page1.value = page;
         } else {
           const res = await getProjectOptLog({ 
             projectNoPrefix: data, 
-            type: 0, 
+            type: [0,2], 
             page: page, 
             pageSize: 20 
           });
@@ -302,14 +302,6 @@ export const COLUMNS = [
     },
   },
   {
-    title: '实际汇率￥',
-    dataIndex: 'actualExchangeRate',
-    width: 120,
-    customRender: (column) => {
-      return column.record?.actualExchangeRate?.toFixed(2);
-    },
-  },
-  {
     title: '综合收益￥',
     dataIndex: 'comprehensiveProfit',
     width: 120,
@@ -207,7 +207,6 @@
   }
   function handleExport() {
-    console.log(detailProjectNoKeys.value, '5656detailProjectNoKeys.value');
     if (checkedKeys.value.length <= 0) {
       createMessage.warn('请选择数据!');
       return;
@@ -62,5 +62,19 @@ export const FIELDS_BASE_INFO = [
     label: '实际汇率￥',
     rules: [{ required: true }],
   },
+  {
+    field: 'projectInnerProfitInfoStartTime',
+    component: 'Select',
+    labelWidth: 150,
+    label: '项目开始时间',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'projectInnerProfitInfoEndTime',
+    component: 'Select',
+    labelWidth: 150,
+    label: '项目结束时间',
+    rules: [{ required: true }],
+  },
 ];
@@ -322,9 +322,6 @@
       });
     }
-    // console.log(checkedKeys.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    // console.log(selectedCustomCodes.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    // console.log(selectedProductionDepartment.value, 565666666); // 输出当前的 selectedCustomCodes 值
   }
   function handleFinanceEdit(record) {