Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

maven

8 天以前 239f117fab7b05566914fb3f4f445203f08ded3d

Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

 src/api/salesManagement/invoiceLedger.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,92 @@
// å¼€ç¥¨å°è´¦é¡µé¢æŽ¥å£
import request from '@/utils/request'

// åˆ†é¡µæŸ¥è¯¢
export function invoiceLedgerList(query) {
    return request({
        url: '/invoiceLedger/page',
        method: 'get',
        params: query
    })
}

// æ–°å¢ž
export function invoiceLedgerSaveOrUpdate(query) {
    return request({
        url: '/invoiceLedger/saveOrUpdate',
        method: 'post',
        data: query
    })
}

// å¼€ç¥¨å°è´¦åˆ é™¤
export function invoiceLedgerDel(query) {
    return request({
        url: '/invoiceLedger/del',
        method: 'delete',
        data: query
    })
}

// è¯¦æƒ…查询
export function invoiceLedgerDetail(query) {
    return request({
        url: '/invoiceLedger/info',
        method: 'get',
        params: query
    })
}

// é™„件提交
export function commitFile(query) {
    return request({
        url: '/invoiceLedger/commitFile',
        method: 'post',
        data: query
    })
}

// å¼€ç¥¨å°è´¦éƒ¨åˆ†ä¹ŸæŸ¥è¯¢
export function invoiceLedgerListNoPage(query) {
    return request({
        url: '/invoiceLedger/list',
        method: 'get',
        data: query
    })
}

// åˆ†é¡µæŸ¥è¯¢
export function invoiceLedgerSalesAccount(query) {
    return request({
        url: '/invoiceLedger/salesAccount',
        method: 'get',
        params: query
    })
}

// äº§å“å¼€ç¥¨è®°å½•åˆ†é¡µæŸ¥è¯¢
export function registrationProductPage(query) {
    return request({
        url: '/invoiceLedger/registrationProductPage',
        method: 'get',
        params: query
    })
}

// äº§å“å¼€ç¥¨è¯¦æƒ…查询
export function invoiceLedgerProductInfo(query) {
    return request({
        url: '/invoiceLedger/invoiceLedgerProductInfo',
        method: 'get',
        params: query
    })
}

export function delInvoiceLedgerByRegProductId(invoiceRegistrationProductId) {
    return request({
        url: '/invoiceLedger/delInvoiceLedger/'+ invoiceRegistrationProductId,
        method: 'delete'
    })
}



 src/api/salesManagement/invoiceRegistration.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
// é”€å”®å°è´¦é¡µé¢æŽ¥å£
import request from '@/utils/request'

// åˆ†é¡µæŸ¥è¯¢
export function invoiceRegistrationList(query) {
    return request({
        url: '/invoiceRegistration/listPage',
        method: 'get',
        params: query
    })
}
// å¼€ç¥¨ç™»è®°æ–°å¢ž
export function invoiceRegistrationSave(query) {
    return request({
        url: '/invoiceRegistration/save',
        method: 'post',
        data: query
    })
}
// å¼€ç¥¨ç™»è®°åˆ é™¤
export function invoiceRegistrationDel(query) {
    return request({
        url: '/invoiceRegistration/del',
        method: 'delete',
        data: query
    })
}
// å­è¡¨æ ¼æŸ¥è¯¢
export function productList(query) {
    return request({
        url: '/invoiceRegistration/productList',
        method: 'get',
        params: query
    })
}

// å¼€ç¥¨ç™»è®°è¯¦æƒ…
export function invoiceRegistrationDetail(query) {
    return request({
        url: '/invoiceRegistration/detail',
        method: 'get',
        params: query
    })
}

// å¯¼å‡ºå¼€ç¥¨ç™»è®°
export function invoiceRegistrationExport(query) {
    return request({
        url: '/invoiceRegistration/export',
        method: 'get',
        params: query,
        responseType: 'blob'
    })
}

 src/api/salesManagement/receiptPayment.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
// å¼€ç¥¨ç™»è®°é¡µé¢æŽ¥å£
import request from '@/utils/request'

// æ–°å¢ž/修改
export function receiptPaymentSaveOrUpdate(query) {
    return request({
        url: '/receiptPayment/saveOrUpdate',
        method: 'post',
        data: query
    })
}

// å®¢æˆ·å¾€æ¥è®°å½•æŸ¥è¯¢
export function customerInteractions(query) {
    return request({
        url: '/receiptPayment/customerInteractions',
        method: 'get',
        params: query
    })
}

// è¯¦æƒ…
export function receiptPaymentInfo(query) {
    return request({
        url: '/receiptPayment/info',
        method: 'get',
        params: query
    })
}

// åˆ é™¤
export function receiptPaymentDel(query) {
    return request({
        url: '/receiptPayment/del',
        method: 'delete',
        data: query
    })
}

// æŸ¥è¯¢å·²ç»ç»‘定发票的开票台账
export function bindInvoiceNoRegPage(query) {
    return request({
        url: '/receiptPayment/bindInvoiceNoRegPage',
        method: 'get',
        params: query
    })
}

// å¼€ç¥¨å°è´¦è¯¦æƒ…
export function invoiceInfo(query) {
    return request({
        url: '/receiptPayment/invoiceInfo',
        method: 'get',
        params: query
    })
}

// è¯¢å›žæ¬¾è®°å½•
export function receiptPaymentHistoryList(query) {
    return request({
        url: '/receiptPayment/receiptPaymentHistoryList',
        method: 'get',
        params: query
    })
}

/**
 * æŸ¥è¯¢å›žæ¬¾è®°å½•åˆ†é¡µæŸ¥è¯¢
 */
export function receiptPaymentHistoryListPage(query) {
    return request({
        url: '/receiptPayment/receiptPaymentHistoryListPage',
        method: 'get',
        params: query
    })
}

export function receiptPaymentHistoryListNoPage(query) {
    return request({
        url: '/receiptPayment/receiptPaymentHistoryListNoPage',
        method: 'get',
        params: query
    })
}

 src/api/salesManagement/salesLedger.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,111 @@
// é”€å”®å°è´¦é¡µé¢æŽ¥å£
import request from "@/utils/request";

// åˆ†é¡µæŸ¥è¯¢
export function ledgerList(query) {
  return request({
    url: "/sales/ledger/list",
    method: "get",
    params: query,
  });
}
// å­è¡¨æ ¼æŸ¥è¯¢
export function productList(query) {
  return request({
    url: "/sales/product/list",
    method: "get",
    params: query,
  });
}
// æŸ¥è¯¢å®¢æˆ·åç§°åˆ—表
export function customerList(query) {
  return request({
    url: "/basic/customer/customerList",
    method: "get",
    params: query,
  });
}
// æ–°å¢žã€ä¿®æ”¹é”€å”®å°è´¦
export function addOrUpdateSalesLedger(query) {
  return request({
    url: "/sales/ledger/addOrUpdateSalesLedger",
    method: "post",
    data: query,
  });
}
// åˆ é™¤é”€å”®å°è´¦
export function delLedger(query) {
  return request({
    url: "/sales/ledger/delLedger",
    method: "delete",
    data: query,
  });
}
// æŸ¥è¯¢é”€å”®å°è´¦è¯¦æƒ…
export function getSalesLedgerWithProducts(query) {
  return request({
    url: "/sales/ledger/getSalesLedgerWithProducts",
    method: "get",
    params: query,
  });
}
// å®žæ—¶ä¿®æ”¹äº§å“ä¿¡æ¯
export function addOrUpdateSalesLedgerProduct(query) {
  return request({
    url: "/sales/product/addOrUpdateSalesLedgerProduct",
    method: "post",
    data: query,
  });
}
// åˆ é™¤äº§å“
export function delProduct(query) {
  return request({
    url: "/sales/product/delProduct",
    method: "delete",
    data: query,
  });
}
// ä¸Šä¼ é™„件
export function upload(query) {
  return request({
    url: "/file/upload",
    method: "post",
    data: query,
    responseType: "blob",
  });
}
// ç¼–辑时删除附件
export function delLedgerFile(query) {
  return request({
    url: "/sales/ledger/delLedgerFile",
    method: "delete",
    data: query,
  });
}

// é”€å”®ä¸åˆ†é¡µæŸ¥è¯¢
export function ledgerListNoPage(query) {
  return request({
    url: "/sales/ledger/listNoPage",
    method: "get",
    params: query,
  });
}

// åˆ†é¡µæŸ¥è¯¢
export function ledgerListPage(query) {
  return request({
    url: "/sales/ledger/listPage",
    method: "get",
    params: query,
  });
}

// æ ¹æ®é”€å”®åˆåŒå·æŸ¥äº§å“ä¿¡æ¯
export function getProductInfoByContractNo(query) {
  return request({
    url: "/purchase/ledger/getProductBySalesNo",
    method: "get",
    params: query,
  });
}

 src/views/accountReceivableLedger/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,224 @@
<template>
  <div class="app-container">
    <el-form :model="searchForm" :inline="true">
      <el-form-item label="客户名称">
        <el-input
          v-model="searchForm.customer"
          placeholder="输入客户名称搜索"
          @change="handleQuery"
          clearable
          :prefix-icon="Search"
        />
      </el-form-item>
      <el-form-item label="煤种">
        <el-input
          v-model="searchForm.coal"
          placeholder="输入煤种"
          @change="handleQuery"
          clearable
          :prefix-icon="Search"
        />
      </el-form-item>
      <!-- <el-form-item label="项目名称">
        <el-input
          v-model="searchForm.projectName"
          placeholder="输入项目名称"
          @change="handleQuery"
          clearable
          :prefix-icon="Search"
        />
      </el-form-item> -->
      <el-form-item label="应收日期">
        <el-date-picker
          v-model="searchForm.receiptPaymentDate"
          value-format="YYYY-MM-DD"
          format="YYYY-MM-DD"
          type="daterange"
          start-placeholder="开始时间"
          end-placeholder="结束时间"
          clearable
          style="width: 300px"
          @change="changeDateRange"
          @clear="clearRange"
        />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="handleQuery"> æœç´¢ </el-button>
      </el-form-item>
    </el-form>
    <div class="table_list">
      <PIMTable
        rowKey="id"
        :column="tableColumn"
        :tableData="tableData"
        :page="page"
        :isSelection="true"
        :isShowSummary="isShowSummarySon"
        :summaryMethod="summarizeMainTable1"
        :tableLoading="tableLoading"
        :total="page.total"
        @pagination="pagination"
        @selection-change="handleSelectionChange"
      ></PIMTable>
    </div>
  </div>
</template>

<script setup>
import { ref } from "vue";
import { Search } from "@element-plus/icons-vue";
import { receiptPaymentHistoryListPage } from "@/api/salesManagement/receiptPayment.js";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import useFormData from "@/hooks/useFormData";
import dayjs from "dayjs";

const { proxy } = getCurrentInstance();
const tableColumn = ref([
  {
    label: "客户名称",
    prop: "customer",
    width:300
  },
  {
    label: "煤种",
    prop: "coal",
    width:240
  },
  {
    label: "应收日期",
    prop: "receiptPaymentDate",
    width:300
  },
  // {
  //   label: "客户名称",
  //   prop: "customerName",
  //   width:240
  // },
  // {
  //   label: "项目名称",
  //   prop: "projectName",
  //   width:200
  // },
  {
    label: "应收金额（元）",
    prop: "receiptPaymentAmount",
    width:200,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },
  },
  {
    label: "应收方式",
    prop: "receiptPaymentType",
    width:200,
    dataType: "tag",
    formatData: (params) => {
      if (params == 0) {
        return "电汇";
      } else if (params == 1) {
        return "承兑";
      } else {
        return null;
      }
    },
    formatType: (params) => {
      return "info";
    },
  },
  {
    label: "登记人",
    prop: "registrant",
    width:200
  },
  {
    label: "登记日期",
    prop: "createTime",
    width:300
  },
]);
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
const page = reactive({
  current: 1,
  size: 100,
    total: 0,
});
const total = ref(0);

const { form: searchForm } = useFormData({
  searchText: undefined,
  receiptPaymentDate: [
    dayjs().startOf("month").format("YYYY-MM-DD"),
    dayjs().endOf("month").format("YYYY-MM-DD"),
  ],
  receiptPaymentDateStart: dayjs()
    .startOf("month")
    .format("YYYY-MM-DD 00:00:00"),
  receiptPaymentDateEnd: dayjs().endOf("month").format("YYYY-MM-DD 23:59:59"),
  customerContractNo: undefined,
  projectName: undefined,
});
const { receipt_payment_type } = proxy.useDict("receipt_payment_type");
const isShowSummarySon = ref(true);
// æŸ¥è¯¢åˆ—表
/** æœç´¢æŒ‰é’®æ“ä½œ */
const handleQuery = () => {
  page.current = 1;
  getList();
};
const pagination = (obj) => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
};
const getList = () => {
  tableLoading.value = true;
  const { receiptPaymentDate, ...rest } = searchForm;
  receiptPaymentHistoryListPage({ ...rest, ...page }).then((res) => {
    tableLoading.value = false;
    tableData.value = res.records;
        page.total = res.total;
  });
};
// å­è¡¨åˆè®¡æ–¹æ³•
const summarizeMainTable1 = (param) => {
  return proxy.summarizeTable(param, ["receiptPaymentAmount"], {
    ticketsNum: { noDecimal: true }, // ä¸ä¿ç•™å°æ•°
    futureTickets: { noDecimal: true }, // ä¸ä¿ç•™å°æ•°
  });
};
// è¡¨æ ¼é€‰æ‹©æ•°æ®
const handleSelectionChange = (selection) => {
  selectedRows.value = selection;
};

const changeDateRange = (date) => {
  if (date) {
    searchForm.receiptPaymentDateStart = dayjs(date[0]).format(
      "YYYY-MM-DD 00:00:00"
    );
    searchForm.receiptPaymentDateEnd = dayjs(date[1]).format(
      "YYYY-MM-DD 23:59:59"
    );
    getList();
  }
};

const clearRange = () => {
  searchForm.receiptPaymentDate = [];
  searchForm.receiptPaymentDateStart = undefined;
  searchForm.receiptPaymentDateEnd = undefined;
  getList();
};

onMounted(() => {
  getList();
});
</script>

<style scoped lang="scss">
.table_list {
  margin-top: unset;
}
</style>

 src/views/personnelManagement/contractManagement/components/formDia.vue

@@ -18,6 +18,14 @@
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
      <fileUpload
        ref="fileUploadRef"
        :fileSize="1024"
        :fileType="['pdf', 'docx', 'txt', 'xlsx', 'pptx....']"
        :limit="10"
        :drag="false"
        v-model:modelValue="modelValue"
    />
    </el-dialog>
  </div>
</template>
@@ -26,6 +34,7 @@
import {ref} from "vue";
import {staffOnJobInfo} from "@/api/personnelManagement/employeeRecord.js";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import fileUpload from "@/components/FileUpload/index.vue";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])


 src/views/personnelManagement/contractManagement/filesDia.vue

@@ -6,7 +6,7 @@
        width="50%"
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
      <!-- <div style="margin-bottom: 10px;text-align: right">
        <el-upload
            v-model:file-list="fileList"
            class="upload-demo"
@@ -20,6 +20,7 @@
        >
          <el-button type="primary">上传附件</el-button>
        </el-upload>

        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
      <PIMTable
@@ -39,12 +40,20 @@
                :total="total"
                :page="page.current"
                :limit="page.size"
            />
            /> -->
      <template #footer>
        <div class="dialog-footer">
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
      <fileUpload
        ref="fileUploadRef"
        :fileSize="1024"
        :fileType="['pdf', 'docx', 'txt', 'xlsx', 'pptx....']"
        :limit="10"
        :drag="false"
        v-model:modelValue="modelValue"
    />
    </el-dialog>
    <filePreview ref="filePreviewRef" />
  </div>
@@ -62,6 +71,7 @@
  fileListPage
} from "@/api/financialManagement/revenueManagement.js";
import Pagination from "@/components/PIMTable/Pagination.vue";
import fileUpload from "@/components/FileUpload/index.vue";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])

@@ -108,7 +118,7 @@
const headers = ref({
  Authorization: "Bearer " + getToken(),
});
const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // ä¸Šä¼ çš„图片服务器地址
// const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // ä¸Šä¼ çš„图片服务器地址

// æ‰“开弹框
const openDialog = (row,type) => {

 src/views/salesOutbound/index.vue

@@ -37,6 +37,7 @@
      </el-tabs>
      <!-- æ“ä½œæŒ‰é’®åŒº -->
      <el-space>
        <el-button type="primary" @click="openForm('add')">新增应收</el-button>
        <el-button type="primary" :icon="Plus" @click="openDia(undefined, 'add')">新建</el-button>
        <el-button type="danger" :icon="Delete" @click="handleDelete">删除</el-button>
        <el-button type="info" plain :icon="Download" @click="handleExport">导出</el-button>
@@ -65,18 +66,136 @@
      />
    </el-card>
    <form-dia ref="formDia" @closeDia="handleQuery"></form-dia>
    
    <!-- æ–°å¢žåº”收弹窗 -->
    <el-dialog
      v-model="dialogFormVisible"
      title="新增应收"
      width="70%"
      @close="closeDia"
    >
      <el-form
        :model="former"
        label-width="140px"
        label-position="top"
        :rules="rules"
        ref="formRef"
      >
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="客户名称：" prop="customer">
              <el-input
                v-model="former.customer"
                placeholder="自动填充"
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="煤种：" prop="coal">
              <el-input
                v-model="former.coal"
                placeholder="自动填充"
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="销售总金额(元)：" prop="totalAmount">
              <el-input
                type="number"
                v-model="former.totalAmount"
                placeholder="自动填充"
                :step="0.01"
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="本次应收金额：" prop="receiptPaymentAmount">
              <el-input-number :step="0.01" :min="0" style="width: 100%"
                                                             :precision="2"
                v-model="former.receiptPaymentAmount"
                placeholder="请输入"
                clearable
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="回款形式：" prop="receiptPaymentType">
              <el-select
                v-model="former.receiptPaymentType"
                placeholder="请选择"
                clearable
              >
                <el-option
                  v-for="item in receipt_payment_type"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="登记人：" prop="registrant">
              <el-input
                v-model="former.registrant"
                placeholder="请输入"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="来款日期：" prop="receiptPaymentDate">
              <el-date-picker
                style="width: 100%"
                v-model="former.receiptPaymentDate"
                value-format="YYYY-MM-DD"
                format="YYYY-MM-DD"
                type="date"
                placeholder="请选择"
                clearable
              />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>

<script setup>
import {ref, reactive, onMounted} from "vue";
import {ref, reactive, onMounted, nextTick} from "vue";
const { proxy } = getCurrentInstance()
const { receipt_payment_type } = proxy.useDict("receipt_payment_type");
import {Delete, Download, Plus} from "@element-plus/icons-vue";
import { ElMessage } from "element-plus";
import ETable from "@/components/Table/ETable.vue";
import Pagination from "@/components/Pagination/index.vue";
import FormDia from "@/views/salesOutbound/components/formDia.vue";
import {delSalesRecord, salesRecordList} from "@/api/salesOutbound/index.js";
import {
  receiptPaymentSaveOrUpdate,
  bindInvoiceNoRegPage,
  invoiceInfo,
  receiptPaymentHistoryListNoPage,
  receiptPaymentDel,
} from "@/api/salesManagement/receiptPayment.js";


const formDia = ref()
const activeTab = ref("out");
@@ -87,6 +206,7 @@
// è¡¨æ ¼æ•°æ®
const operationsArr = ref(['edit', 'viewRow']);
const tableLoading = ref(false);
const dialogFormVisible = ref(false);
const tableData = ref([]);
const columns = ref([
  { prop: "saleDate", label: "销售日期", minWidth: 160 },
@@ -111,6 +231,8 @@
const total = ref(0);
const pageNum = ref(1);
const pageSize = ref(10);
const former = ref({})

// æŸ¥è¯¢å‚æ•°
const queryParams = reactive({
    saleDate: "",
@@ -200,6 +322,39 @@
const handleSelectionChange = (selection) => {
  selectedRows.value = selection;
};

// æ‰“开弹框
const openForm = () => {
  if (selectedRows.value.length !== 1) {
    proxy.$modal.msgError("请选择一条数据");
    return;
  }
  invoiceInfo({ id: selectedRows.value[0].id }).then((res) => {
    console.log(res.data)
    former.value = { ...res.data };
    former.value.salesRecordId = former.value.id;
    former.value.id = "";
    // form.value.registrant = userStore.nickName;
  });
  dialogFormVisible.value = true;
};
// æäº¤è¡¨å•
const submitForm = () => {
  proxy.$refs["formRef"].validate((valid) => {
    if (valid) {
      receiptPaymentSaveOrUpdate(former.value).then((res) => {
        proxy.$modal.msgSuccess("提交成功");
        closeDia();
        getList();
      });
    }
  });
};
// å…³é—­å¼¹æ¡†
const closeDia = () => {
  proxy.resetForm("formRef");
  dialogFormVisible.value = false;
};
</script>

<style scoped>