e2faef4edc8c200b20d9a82206755042dbe5fead..bfdfceb60b41a541d9d9087323079bc64c144209
2 天以前 chenrui
客户/供应商修改
dev
bfdfce 对比 | 目录
2 天以前 chenrui
自动填充功能修改
274894 对比 | 目录
已修改7个文件
71 ■■■■ 文件已修改
src/store/modules/user.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/customerFile/index.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/supplierManage/index.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/invoiceLedger/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/invoiceRegistration/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/receiptPayment/index.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/user.js
@@ -35,6 +35,7 @@
      getInfo() {
        return new Promise((resolve, reject) => {
          getInfo().then(res => {
            console.log('user',res)
            const user = res.user
            let avatar = user.avatar || ""
            if (!isHttp(avatar)) {
@@ -49,6 +50,7 @@
            this.id = user.userId
            this.name = user.userName
            this.avatar = avatar
            this.nickName = user.nickName
            resolve(res)
          }).catch(error => {
            reject(error)
src/views/basicData/customerFile/index.vue
@@ -64,13 +64,13 @@
      <el-row :gutter="30">
        <el-col :span="12">
          <el-form-item label="维护人:" prop="maintainer">
            <el-select v-model="form.maintainer" placeholder="请选择" clearable>
            <el-select v-model="form.maintainer" placeholder="请选择" clearable disabled>
              <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="维护时间:" prop="maintenanceTime">
          <el-form-item label="维护时间:" prop="maintenanceTime" >
            <el-date-picker
                style="width: 100%"
                v-model="form.maintenanceTime"
@@ -79,6 +79,7 @@
                type="date"
                placeholder="请选择"
                clearable
                disabled
            />
          </el-form-item>
        </el-col>
@@ -100,20 +101,25 @@
import {addCustomer, delCustomer, getCustomer, listCustomer, updateCustomer} from "@/api/basicData/customerFile.js";
import {ElMessageBox } from "element-plus";
import {userListNoPage} from "@/api/system/user.js";
import useUserStore from "@/store/modules/user"
const { proxy } = getCurrentInstance()
const userStore = useUserStore()
const tableColumn = ref([
  {
    label: '客户名称',
    prop: 'customerName',
    width: 220,
  },
  {
    label: '纳税人识别码',
    prop: 'taxpayerIdentificationNumber'
    prop: 'taxpayerIdentificationNumber',
    width: 220,
  },
  {
    label: '地址及联系方式',
    prop: 'addressPhone'
    prop: 'addressPhone',
    width: 220,
  },
  {
    label: '联系人',
@@ -213,6 +219,8 @@
const openForm = (type, row) => {
  operationType.value = type
  form.value = {}
  form.value.maintainer = userStore.nickName
  form.value.maintenanceTime = getCurrentDate();
  userListNoPage().then(res => {
    userList.value = res.data
  })
@@ -299,9 +307,19 @@
    proxy.$modal.msg("已取消")
  })
}
// 获取当前日期并格式化为 YYYY-MM-DD
function getCurrentDate() {
  const today = new Date();
  const year = today.getFullYear();
  const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始
  const day = String(today.getDate()).padStart(2, '0');
  return `${year}-${month}-${day}`;
}
getList()
</script>
<style scoped lang="scss">
</style>
</style>
src/views/basicData/supplierManage/index.vue
@@ -76,7 +76,7 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="维护人:" prop="maintainUserId">
              <el-select v-model="form.maintainUserId" placeholder="请选择" clearable>
              <el-select v-model="form.maintainUserId" placeholder="请选择" clearable disabled>
                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.userId"/>
              </el-select>
            </el-form-item>
@@ -91,6 +91,7 @@
                  type="date"
                  placeholder="请选择"
                  clearable
                  disabled
              />
            </el-form-item>
          </el-col>
@@ -113,16 +114,20 @@
import {ElMessageBox } from "element-plus";
import {userListNoPage} from "@/api/system/user.js";
import {addSupplier,getSupplier,listSupplier,updateSupplier} from "@/api/basicData/supplierManageFile.js";
import useUserStore from "@/store/modules/user"
const { proxy } = getCurrentInstance()
const userStore = useUserStore()
const tableColumn = ref([
  {
    label: '供应商名称',
    prop: 'supplierName',
    width: 250,
  },
  {
    label: '公司地址',
    prop: 'companyAddress'
    prop: 'companyAddress',
    width: 220,
  },
  {
    label: '联系方式',
@@ -239,6 +244,8 @@
const openForm = (type, row) => {
  operationType.value = type
  form.value = {}
  form.value.maintainUserId = userStore.id
  form.value.maintainTime = getCurrentDate();
  userListNoPage().then(res => {
    userList.value = res.data
  })
@@ -325,6 +332,16 @@
    proxy.$modal.msg("已取消")
  })
}
// 获取当前日期并格式化为 YYYY-MM-DD
function getCurrentDate() {
  const today = new Date();
  const year = today.getFullYear();
  const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始
  const day = String(today.getDate()).padStart(2, '0');
  return `${year}-${month}-${day}`;
}
getList()
</script>
src/views/salesManagement/invoiceLedger/index.vue
@@ -310,6 +310,7 @@
};
// 上传前校检
function handleBeforeUpload(file) {
  console.log('file',file)
  // 校检文件大小
  if (file.size > 1024 * 1024 * 10) {
    proxy.$modal.msgError('上传文件大小不能超过10MB!')
src/views/salesManagement/invoiceRegistration/index.vue
@@ -199,7 +199,7 @@
// 表格选择数据
const handleSelectionChange = (selection) => {
  console.log('selection', selection)
  selectedRows.value = selection.filter(item => item.children !== undefined);
  selectedRows.value = selection.filter(item => item.salesContractNo !== undefined);
}
const expandedRowKeys = ref([])
// 展开行
src/views/salesManagement/receiptPayment/index.vue
@@ -73,7 +73,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="本次回款金额:" prop="receiptPaymentAmount">
              <el-input type="number" v-model="form.receiptPaymentAmount" placeholder="请输入" :step="0.01" clearable/>
              <el-input type="number" min="0" v-model="form.receiptPaymentAmount" placeholder="请输入" :step="0.01" clearable/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -87,7 +87,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="登记人:" prop="registrant">
              <el-input v-model="form.registrant" placeholder="请输入" clearable/>
              <el-input v-model="form.registrant" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -125,6 +125,8 @@
  bindInvoiceNoRegPage,
  invoiceInfo
} from "../../../api/salesManagement/receiptPayment.js";
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
const tableData = ref([])
const selectedRows = ref([])
@@ -222,10 +224,17 @@
    proxy.$modal.msgError("请选择一条数据")
    return
  }
  //
  console.log('(selectedRows.value',selectedRows.value)
  if(selectedRows.value[0].noReceiptAmount === 0){
    proxy.$modal.msgError("待回款金额为0元")
    return
  }
  invoiceInfo({id: selectedRows.value[0].id}).then(res => {
    form.value = {...res.data}
    form.value.invoiceLedgerId = form.value.id
    form.value.id = ''
    form.value.registrant = userStore.nickName
  })
  dialogFormVisible.value = true
}
src/views/salesManagement/salesLedger/index.vue
@@ -104,7 +104,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="录入人:" prop="entryPerson">
              <el-select v-model="form.entryPerson" placeholder="请选择" clearable @change="changs">
              <el-select v-model="form.entryPerson" placeholder="请选择" clearable @change="changs" disabled>
                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
              </el-select>
            </el-form-item>
@@ -284,7 +284,6 @@
import { getToken } from "@/utils/auth"
import pagination from '@/components/PIMTable/Pagination.vue'
import { ref } from 'vue'
import {Search} from "@element-plus/icons-vue";
import {ElMessageBox } from "element-plus";
import useUserStore from '@/store/modules/user'
import {userListNoPage} from "@/api/system/user.js";
@@ -537,6 +536,7 @@
  customerList().then(res => {
    customerOption.value = res
  })
  form.value.entryPerson = userStore.id
  if (type === 'edit') {
    currentId.value = row.id;
    getSalesLedgerWithProducts({id: row.id, type: 1}).then(res => {