修改审核bug

boyang
1 parent 0e074a95
Showing 16 changed files with 158 additions and 60 deletions
src/views/project/approve/PayPanel.vue
src/views/project/config/costCreate.vue
src/views/project/config/costEdit.vue
src/views/project/finance/pay/FinanceEdit.vue
src/views/project/finance/pay/InvoiceUpload.vue
src/views/project/finance/pay/TrackEdit.vue
src/views/project/finance/pay/index.vue
src/views/project/finance/pay/pay.data.tsx
src/views/project/finance/receive/FinanceEdit.vue
src/views/project/finance/receive/InvoiceAnalysis.vue
src/views/project/finance/receive/TrackEdit.vue
src/views/project/finance/receive/index.vue
src/views/project/finance/receive/receive.data.tsx
src/views/project/order/FormDetail/BaseFormPanel.vue
src/views/project/order/ProductProfit.vue
src/views/project/order/ProductText.vue
@@ -183,15 +183,11 @@
         },
         {
           title: '生产科',
-          dataIndex: 'productionDepartment',
+          dataIndex: 'productionName',
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
-            if (record?.type === 40) {
-              return record?.fieldInfos?.checkBillOrderDO?.deductDept;
-            } else if (record?.type == 50) {
-              return record?.fieldInfos?.checkBillOrderDO?.productionName;
-            }
+            return record?.fieldInfos?.checkBillOrderDO?.productionName;
           },
         },
       ];
@@ -248,6 +244,7 @@
         }
       }
       function handleEdit(record, e) {
+        // console.log(record, '56565re');
         e?.stopPropagation();
         return false;
       }
@@ -259,6 +256,7 @@
           showInvoice.value = true;
         }
         openModal(true, { data });
+        id.value = data.id;
         itemArray.value = [];
         mockData.value = data.fieldInfos.checkBillOrderDO;
         const match = mockData.value.invoiceUrl.match(/aliyuncs\.com\/(.*?)\?/);
@@ -268,7 +266,6 @@
         } else {
           mockData.value.invoiceName = mockData.value.invoiceUrl;
         }
-        id.value = data.id;
       }
       async function handleTrue() {
@@ -107,7 +107,6 @@
           relationValue.value[0].relationValue = fixCost.value;
           relationValue.value[1].relationValue = ratio.value;
           relationValue.value[2].relationValue = spainRatio.value;
-          relationValue.value[3].relationValue = price.value;
           await addConfig({
             settingCode: 'customerCode',
             settingName: '客户提成成本配置',
@@ -39,14 +39,12 @@
     fixCost.value = relationValue.value[0].relationValue;
     ratio.value = relationValue.value[1].relationValue;
     spainRatio.value = relationValue.value[2].relationValue;
-    price.value = relationValue.value[3].relationValue;
   });
   //获取现有的列表
   const listAll = ref();
   const fixCost = ref();
   const ratio = ref();
   const spainRatio = ref();
-  const price = ref();
   const relationValue = ref();
   //完成编辑
@@ -54,7 +52,6 @@
     relationValue.value[0].relationValue = fixCost.value;
     relationValue.value[1].relationValue = ratio.value;
     relationValue.value[2].relationValue = spainRatio.value;
-    relationValue.value[3].relationValue = price.value;
     console.log(relationValue.value, '5656relationValue.value');
     await saveConfig({
       id: listAll.value.id,
@@ -49,6 +49,9 @@
         span: 23,
       },
       label: '实际应付金额1￥',
+      componentProps: () => ({
+        disabled: status.value === 10,
+      }),
     },
     {
       field: 'actualPayedAmount2',
@@ -58,6 +61,9 @@
         span: 23,
       },
       label: '实际应付金额2￥',
+      componentProps: () => ({
+        disabled: status.value === 10,
+      }),
     },
     {
       field: 'actualPayedAmount3',
@@ -67,6 +73,9 @@
         span: 23,
       },
       label: '实际应付金额3￥',
+      componentProps: () => ({
+        disabled: status.value === 10,
+      }),
     },
   ];
   const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
@@ -80,9 +89,11 @@
   });
   const update = ref();
+  const status = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     // 方式1
     resetFields();
+    status.value = data.data.status;
     setDrawerProps({ confirmLoading: false });
     setFieldsValue({
       ...toRaw(data.data),
@@ -15,6 +15,7 @@
       :action="updateInvoiceUrl"
       @change="handleChange"
       @drop="handleDrop"
+      :disabled="status === 10"
     >
       <p class="ant-upload-drag-icon">
         <inbox-outlined></inbox-outlined>
@@ -36,8 +37,10 @@
   const updateInvoiceUrl = ref('http://47.104.8.35:8081/api/localStorage/upload_file_oss?name=');
   const invoiceUrl = ref();
   const id = ref();
-
+  const status = ref();
   const [register, { closeModal }] = useModalInner(async (data) => {
+    console.log(data);
+    status.value = data.data.status;
     // fileList.value = [];
     fileList.value = [];
     invoiceUrl.value = data.data.invoiceUrl;
@@ -8,16 +8,28 @@
       :isDetail="true"
       @ok="handleSubmit"
       :showDetailBack="false"
+      @visible-change="handleShow"
       okText="保存"
       showFooter
       :destroyOnClose="true"
     >
       <div>
         <div style="font-size: 15px">生产科扣款金额￥</div>
-        <a-input v-model:value="input1" placeholder="请输入" auto-size />
+        <a-input v-model="input1" placeholder="请输入" :disabled="status === 10" auto-size />
         <div style="margin: 16px 0"></div>
         <div style="font-size: 15px">扣款责任部门</div>
-        <a-input v-model:value="deductDept" placeholder="请输入" auto-size />
+        <a-input
+          v-model:value="deductDept"
+          placeholder="请输入"
+          :disabled="status === 10"
+          auto-size
+        />
+        <!-- <a-select
+          ref="select"
+          style="width: 60%"
+          v-model:value="selectedProductionDepartment"
+          :options="productionDepartmentOptions"
+        /> -->
         <div style="margin: 16px 0"></div>
         <div>上传扣款单</div
         ><a-space direction="vertical" style="width: 100%" size="large">
@@ -26,6 +38,7 @@
             :beforeUpload="beforeUpload"
             list-type="picture"
             :max-count="1"
+            :disabled="status === 10"
             :action="updateDeductUrl"
             @change="handleChange"
           >
@@ -42,36 +55,49 @@
 </template>
 <script lang="ts" setup>
   import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
-  import { defineComponent, ref, computed, unref, toRaw, reactive } from 'vue';
+  import { defineComponent, ref, computed, unref, toRaw, reactive, onMounted } from 'vue';
   import { getEmailList } from '/@/api/sys/config';
   import { UploadOutlined } from '@ant-design/icons-vue';
   import type { UploadProps } from 'ant-design-vue';
   import { updateDeductInfo } from '@/api/project/invoice';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { useOrderInfo } from '/@/hooks/component/order';
+  import { useOrderStoreWithOut } from '/@/store/modules/order';
   const emit = defineEmits(['success']);
   const fileList = ref<UploadProps['fileList']>([]);
+  // const orderStore = useOrderStoreWithOut();
+  // const { productionDepartment: productionDepartmentOptions } = useOrderInfo(orderStore);
+  // console.log(productionDepartmentOptions.value, '565656565665orderStore');
+  // onMounted(() => {
+  //   const { productionDepartment } = useOrderInfo(orderStore);
+  //   console.log(productionDepartment.value, '565656565665orderStore1');
+  // });
-  const input1 = ref();
+  const input1 = ref(0);
   const deductUrl = ref();
   const id = ref();
   const checkNo = ref();
-  const deductDept = ref();
+  const deductDept = ref('');
   const uploadUrl = ref('http://47.104.8.35:8081/api/localStorage/upload_file_oss?name=');
   const updateDeductUrl = ref('http://47.104.8.35:8081/api/localStorage/upload_file_oss?name=');
   const deductUrlOld = ref();
+  const selectedProductionDepartment = ref(); // 新增: 用于存储选中的生产科
   const { createMessage } = useMessage();
   const { error } = createMessage;
+  const status = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
+    console.log(data, '5656trackeditdata');
+    status.value = data.data.status;
     id.value = data.data.id;
     checkNo.value = data.data.checkNo;
     input1.value = data.data.deductAmount;
+    console.log(input1.value, '5656input1.value');
     deductDept.value = data.data.deductDept;
     deductUrl.value = data.data.deductUrl;
     deductUrlOld.value = data.data.deductUrl;
   });
-
   function handleChange(info) {
     if (info.file.status == 'done') {
       updateDeductUrl.value = info.file.response.data.fileUrl;
@@ -85,7 +111,13 @@
   function beforeUpload(info) {
     updateDeductUrl.value = uploadUrl.value + info.name;
   }
-
+  function handleShow() {
+    input1.value = '';
+    deductUrl.value = '';
+    deductDept.value = '';
+    updateDeductUrl.value = '';
+    fileList.value = [];
+  }
   //完成编辑
   async function handleSubmit() {
     if (!input1.value || deductUrl.value == '' || !deductDept.value) {
@@ -102,6 +134,7 @@
           deductDept: deductDept.value,
           deductUrl: deductUrl.value,
         });
+        // productionDepartment: selectedProductionDepartment.value,
         fileList.value = [];
         emit('success');
         closeDrawer();
 <template>
   <div class="p-4">
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable" :pagination="{ pageSize: 20 }">
       <template #toolbar>
         <a-button
           type="primary"
@@ -36,7 +36,12 @@
             :dropDownActions="[
               {
                 label: '提交审核',
-                onClick: handleCommit.bind(null, record),
+                popConfirm: {
+                  title: '是否确认提交审核',
+                  placement: 'left',
+                  confirm: handleCommit.bind(null, record),
+                },
+                // onClick: handleCommit.bind(null, record),
               },
               {
                 label: '订单信息',
@@ -44,7 +49,12 @@
               },
               {
                 label: '删除',
-                onClick: handleDelete.bind(null, record),
+                popConfirm: {
+                  title: '是否确认删除',
+                  placement: 'left',
+                  confirm: handleDelete.bind(null, record),
+                },
+                // onClick: handleDelete.bind(null, record),
               },
               {
                 label: '生产科发票',
@@ -76,6 +86,7 @@
   import { useModal } from '/@/components/Modal';
   import { getCheck, checkDelete, checkCommit, checkDetail } from '@/api/project/invoice';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { getOrderList } from '/@/api/project/order';
   const [registerCheckSum, { openModal: openCheckSum }] = useModal();
   const [registerFinanceEdit, { openDrawer: openFinanceEdit }] = useDrawer();
@@ -85,7 +96,12 @@
   const [registerInvoiceShow, { openModal: openInvoiceShow }] = useModal();
   const [registerInvoiceDetail, { openDrawer: openCheckDetail }] = useDrawer();
   const checkedKeys = ref<Array<string | number>>([]);
-
+  // 添加分页状态
+  const pagination = ref({
+    current: 1, // 当前页
+    pageSize: 10, // 每页条数
+    total: 0, // 数据总数
+  });
   const [registerTable, { reload }] = useTable({
     title: '',
     api: getCheck,
@@ -93,6 +109,9 @@
     bordered: true,
     clickToRowSelect: false,
     rowKey: 'id',
+    pagination: {
+      pageSize: 20,
+    },
     rowSelection: {
       type: 'checkbox',
       selectedRowKeys: checkedKeys,
@@ -239,7 +258,6 @@
   // 单选函数
   async function onSelect(record, selected: boolean) {
     const res = await checkDetail({ checkNo: record.checkNo });
-    console.log(res, '5656respau');
     const customerCode = res[0].customerCode;
     const productionDepartment = res[0].productionDepartment;
@@ -288,9 +306,9 @@
         }
       }
     }
-    console.log(checkedKeys.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    console.log(selectedCustomCodes.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    console.log(selectedProductionDepartment.value, 565666666); // 输出当前的 selectedCustomCodes 值
+    // console.log(checkedKeys.value, 565666666); // 输出当前的 selectedCustomCodes 值
+    // console.log(selectedCustomCodes.value, 565666666); // 输出当前的 selectedCustomCodes 值
+    // console.log(selectedProductionDepartment.value, 565666666); // 输出当前的 selectedCustomCodes 值
   }
   // 全选函数
@@ -368,9 +386,9 @@
       });
     }
-    console.log(checkedKeys.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    console.log(selectedCustomCodes.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    console.log(selectedProductionDepartment.value, 565666666); // 输出当前的 selectedCustomCodes 值
+    // console.log(checkedKeys.value, 565666666); // 输出当前的 selectedCustomCodes 值
+    // console.log(selectedCustomCodes.value, 565666666); // 输出当前的 selectedCustomCodes 值
+    // console.log(selectedProductionDepartment.value, 565666666); // 输出当前的 selectedCustomCodes 值
   }
   function handleFinanceEdit(record) {
@@ -26,8 +26,8 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         { label: '未提交审核', value: -1 },
         { label: '待审核', value: 0 },
-        { label: '审核通过', value: 1 },
-        { label: '审核驳回', value: 2 },
+        { label: '审核通过', value: 10 },
+        { label: '审核驳回', value: 20 },
       ],
     },
   },
@@ -71,7 +71,7 @@ export const columns: BasicColumn[] = [
       if (deductUrl == undefined) {
         return;
       }
-      return <FilePptOutlined style="font-size:25px" onClick={() => window.open(deductUrl)} />;
+      return <FilePptOutlined style="font-size:25px" />;
     },
   },
   {
@@ -48,6 +48,9 @@
       colProps: {
         span: 23,
       },
+      componentProps: () => ({
+        disabled: status.value === 10,
+      }),
       label: '实际应收金额1$',
     },
     {
@@ -57,6 +60,9 @@
       colProps: {
         span: 23,
       },
+      componentProps: () => ({
+        disabled: status.value === 10,
+      }),
       label: '实际应收金额2$',
     },
     {
@@ -66,6 +72,9 @@
       colProps: {
         span: 23,
       },
+      componentProps: () => ({
+        disabled: status.value === 10,
+      }),
       label: '实际应收金额3$',
     },
     {
@@ -75,6 +84,9 @@
       colProps: {
         span: 23,
       },
+      componentProps: () => ({
+        disabled: status.value === 10,
+      }),
       label: '其他费用金额$',
     },
   ];
@@ -89,8 +101,11 @@
   });
   const update = ref();
+  const status = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
     // 方式1
+    console.log(data, '56565dataaa');
+    status.value = data.data.status;
     resetFields();
     setDrawerProps({ confirmLoading: false });
     setFieldsValue({
@@ -54,7 +54,7 @@
     },
     {
       title: '实际收款金额汇总$',
-      dataIndex: 'totalPayAmount',
+      dataIndex: 'actualReceivableAmount',
       width: 50,
     },
     {
@@ -7,6 +7,7 @@
       width="30%"
       :isDetail="true"
       @ok="handleSubmit"
+      @visible-change="handleShow"
       :showDetailBack="false"
       okText="保存"
       showFooter
@@ -14,7 +15,7 @@
     >
       <div>
         <div style="font-size: 15px">客户扣款金额$</div>
-        <a-input v-model:value="input1" placeholder="请输入" auto-size />
+        <a-input v-model:value="input1" placeholder="请输入" :disabled="status === 10" auto-size />
         <div style="margin: 16px 0"></div>
         <div>上传扣款单</div
         ><a-space direction="vertical" style="width: 100%" size="large">
@@ -25,6 +26,7 @@
             :max-count="1"
             :action="updateDeductUrl"
             @change="handleChange"
+            :disabled="status === 10"
           >
             <a-button> 上传扣款单 </a-button>
           </a-upload>
@@ -58,8 +60,10 @@
   const deductUrlOld = ref();
   const { createMessage } = useMessage();
   const { error } = createMessage;
+  const status = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
+    status.value = data.data.status;
     id.value = data.data.id;
     invoiceNo.value = data.data.invoiceNo;
     input1.value = data.data.deductAmount;
@@ -80,6 +84,12 @@
   function beforeUpload(info) {
     updateDeductUrl.value = uploadUrl.value + info.name;
   }
+  function handleShow() {
+    input1.value = '';
+    deductUrl.value = '';
+    updateDeductUrl.value = '';
+    fileList.value = [];
+  }
   //完成编辑
   async function handleSubmit() {
@@ -28,7 +28,12 @@
               },
               {
                 label: '提交审核',
-                onClick: handleCommit.bind(null, record),
+                popConfirm: {
+                  title: '是否确认提交审核',
+                  placement: 'left',
+                  confirm: handleCommit.bind(null, record),
+                },
+                // onClick: handleCommit.bind(null, record),
               },
             ]"
             :dropDownActions="[
@@ -38,7 +43,12 @@
               },
               {
                 label: '删除',
-                onClick: handleDelete.bind(null, record),
+                popConfirm: {
+                  title: '是否确认删除',
+                  placement: 'left',
+                  confirm: handleDelete.bind(null, record),
+                },
+                // onClick: handleDelete.bind(null, record),
               },
               {
                 label: '扣款单',
@@ -99,6 +109,9 @@
       schemas: searchFormSchema,
       autoSubmitOnEnter: true,
     },
+    pagination: {
+      pageSize: 20,
+    },
     useSearchForm: true,
     showTableSetting: true,
     showIndexColumn: false,
@@ -152,8 +165,8 @@
       checkedKeys.value = checkedKeys.value.filter((id) => id !== record.id);
     }
-    console.log(selectedCustomCodes.value, 56561);
-    console.log(checkedKeys.value, 56562);
+    // console.log(selectedCustomCodes.value, 56561);
+    // console.log(checkedKeys.value, 56562);
   }
   async function onSelectAll(selected: boolean, selectedRows: any[], changeRows: any[]) {
@@ -21,8 +21,8 @@ export const searchFormSchema: FormSchema[] = [
       options: [
         { label: '未提交审核', value: -1 },
         { label: '待审核', value: 0 },
-        { label: '审核通过', value: 1 },
-        { label: '审核驳回', value: 2 },
+        { label: '审核通过', value: 10 },
+        { label: '审核驳回', value: 20 },
       ],
     },
   },
@@ -77,7 +77,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '实际应收金额$',
-    dataIndex: 'totalPayAmount',
+    dataIndex: 'actualReceivableAmount',
     width: 120,
   },
   {
@@ -130,7 +130,7 @@ export const columnsAnalysis: BasicColumn[] = [
   },
   {
     title: '实际应收金额总计$',
-    dataIndex: 'totalPayAmount',
+    dataIndex: 'actualReceivableAmount',
     width: 50,
   },
   {
@@ -145,7 +145,7 @@ export const columnsAnalysis: BasicColumn[] = [
   },
   {
     title: '实际应收金额总计$',
-    dataIndex: 'totalPayAmount',
+    dataIndex: 'actualReceivableAmount',
     width: 50,
   },
   {
@@ -75,7 +75,6 @@
         // businessPerson,
       } = useOrderInfo(orderStore);
-
       var schemas = computed(() => {
         const options = {
           customerCode,
@@ -133,8 +133,8 @@
   const innerProduceTotalPrice = ref(); // 内部生产提成
   const innerProduceTotalProfit = ref(); // 内部生产净利润
   const predictRatio = ref(); // 预算占比
-  const predictRatioDeduct = ref(0); // 预算占比差
-  const productionActualPrice = ref(); // 实际发生费用
+  const predictRatioDeduct = ref(''); // 预算占比差
+  const productionActualPrice = ref(''); // 实际发生费用
   const productionDepartmentPredictPrice = ref(); // 生产科预算金额
   const productionDepartmentTotalPrice = ref(0); // 生产科总价合计
   const projectDays = ref(); // 生产持续时间
@@ -243,8 +243,8 @@
       innerProduceFixProfit.value = null; // 内部生产固定成本
       innerProduceTotalPrice.value = null; // 内部生产提成
       innerProduceTotalProfit.value = null; // 内部生产净利润
-      predictRatio.value = null; // 预算占比
-      predictRatioDeduct.value = 0; // 预算占比差
+      predictRatio.value = ''; // 预算占比
+      predictRatioDeduct.value = ''; // 预算占比差
       productionDepartmentTotalPrice.value = 0; // 生产科总价合计
       projectDays.value = null; // 生产持续时间
       sumCount.value = 0; // 总计数量
@@ -273,12 +273,14 @@
     innerProduceFixProfit.value = res.innerProduceFixProfit;
     innerProduceTotalPrice.value = res.innerProduceTotalPrice;
     innerProduceTotalProfit.value = res.innerProduceTotalProfit;
-    predictRatio.value = res.predictRatio;
+    // predictRatio.value = res.predictRatio;
+    predictRatio.value = `${res.predictRatio}%`;
     productionActualPrice.value = res.productionActualPrice;
     productionDepartmentPredictPrice.value = res.productionDepartmentPredictPrice;
     productionDepartmentTotalPrice.value = res.productionDepartmentTotalPrice;
     projectDays.value = res.projectDays;
-    predictRatioDeduct.value = res.predictAndActualRatio;
+    // predictRatioDeduct.value = res.predictAndActualRatio;
+    predictRatioDeduct.value = `${res.predictAndActualRatio}%`;
     console.log(filteredItems.value, '5656filteredItems');
     // filteredItems.value.forEach((item) => {
     //   sumMoney.value += item.profitAnalysisInfo.productionDepartmentTotalPrice;
@@ -21,7 +21,7 @@
     :bodyStyle="{ height: '210px' }"
   >
     <div class="container">
-      <div v-if="isShow1 == true" style="margin-top: 50px; text-align: center">
+      <div v-if="isShow1 == true" style="margin-top: 50px">
         <RadioGroup v-model:value="choose" :options="options" />
       </div>
       <div class="showPdf" v-if="isShow2 == true" style="margin-top: 35px; text-align: center">
@@ -83,7 +83,7 @@
         // 运营总监-基本信息，跟单，质检
         return [
           { label: '青岛翱特逸格饰品有限公司', value: '青岛翱特逸格饰品有限公司' },
-          { label: '青岛吉庆天成饰品有限公司', value: '青岛吉庆天成饰品有限公司' },
+          { label: ' 青岛吉庆天成饰品有限公司', value: '青岛吉庆天成饰品有限公司' },
         ];
       });
       const { createMessage } = useMessage();
@@ -139,10 +139,11 @@
       //生成pdf
       const resText = ref();
       // const customerCodeList: string[] = props.customerCodes;
+      //三秒内不能再次点击生成标志
       let isDisabled = false;
       async function handleProduct() {
         if (isDisabled) {
-          error('请勿连续点击生成按钮，需要等待三秒再点击生成');
+          error('请勿连续点击生成按钮,需要等待三秒再点击生成');
           return;
         }
         const customerCodeList = props.customerCodes;
@@ -164,7 +165,6 @@
               ids: checkedKeys.value,
               companyName: choose.value,
             });
-            console.log(resText.value, '5656restextF');
             //此处设置接口,传递选择的公司值
             isShow1.value = false;
             isShow2.value = true;
@@ -173,10 +173,11 @@
       }
       //查看pdf
       function handlePdf() {
-        window.open(resText.value.productionUrl, '_blank');
+        window.open(resText.value.productionUrl);
       }
       //发送按钮
       async function handleExport() {
+        console.log(resText.value.produceFile, resText.value.productionDepartment, 5656);
         const res = await exportProductText({
           productionUrl: resText.value.productionUrl,
           productionDepartment: resText.value.productionDepartment,
@@ -217,13 +218,13 @@
   .container {
     display: flex;
     flex-direction: column;
-    min-height: 20vh;
+    /* min-height: 20vh; */
   }
   .bottom {
-    margin-top: auto;
-    margin-right: 20px;
-    margin-left: auto;
+    margin-top: 40px;
+    /* margin-right: auto; */
+    margin-left: 300px;
   }
   .showPdf {