Merge branch 'dev_HXSJ' of http://114.132.189.42:9002/r/product-inventory-m...

gongchunyi

4 天以前 f3867fda6adc7d5ab6b32f61981d87e080a39f8c

Merge branch 'dev_HXSJ' of http://114.132.189.42:9002/r/product-inventory-management into dev_HXSJ

 src/api/financialManagement/fixedAssets.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
import request from "@/utils/request";
// åˆ†é¡µæŸ¥è¯¢å›ºå®šèµ„产列表
export const listPage = (params) => {
  return request({
    url: "/enterpriseFixedAssets/listPage",
    method: "get",
    params,
  });
};
// æ–°å¢žå›ºå®šèµ„产
export function add(data) {
  return request({
    url: "/enterpriseFixedAssets/add",
    method: "post",
    data: data,
  });
}
// æ›´æ–°å›ºå®šèµ„产
export function update(data) {
  return request({
    url: "/enterpriseFixedAssets/update",
    method: "post",
    data: data,
  });
}
// åˆ é™¤å›ºå®šèµ„产
export const delFixedAssets = (query) => {
  return request({
    url: `/enterpriseFixedAssets/delete`,
    method: "delete",
    data: query,
  });
};

// å¯¼å‡ºå›ºå®šèµ„产
export const exportFixedAssets = (query) => {
  return request({
    url: "/financial/fixedAssets/export",
    method: "post",
    data: query,
    responseType: "blob",
  });
};

 src/views/financialManagement/fixedAssets/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,313 @@
<template>
  <div class="app-container">
    <div class="search_form">
      <div>
        <span class="search_title">资产名称：</span>
        <el-input v-model="searchForm.name"
                  style="width: 240px"
                  placeholder="请输入"
                  @change="handleQuery"
                  clearable
                  prefix-icon="Search" />
        <el-button type="primary"
                   @click="handleQuery"
                   style="margin-left: 10px">搜索</el-button>
      </div>
      <div>
        <el-button type="primary"
                   @click="openForm('add')">新增资产</el-button>
        <el-button type="danger"
                   plain
                   @click="handleDelete">删除</el-button>
      </div>
    </div>
    <div class="table_list">
      <el-table :data="tableData"
                border
                v-loading="tableLoading"
                @selection-change="handleSelectionChange"
                style="width: 100%"
                height="calc(100vh - 18.5em)">
        <el-table-column align="center"
                         type="selection"
                         width="55" />
        <el-table-column align="center"
                         label="序号"
                         type="index"
                         width="60" />
        <el-table-column label="资产名称"
                         prop="name"
                         show-overflow-tooltip />
        <el-table-column label="型号"
                         prop="model"
                         show-overflow-tooltip />
        <el-table-column label="ä»·æ ¼"
                         prop="price"
                         show-overflow-tooltip>
          <template #default="{ row }">
            Â¥{{ row.price ? row.price.toFixed(2) : '0.00' }}
          </template>
        </el-table-column>
        <el-table-column label="位置"
                         prop="address"
                         show-overflow-tooltip />
        <el-table-column label="创建时间"
                         prop="createTime"
                         show-overflow-tooltip>
          <template #default="{ row }">
            {{ row.createTime ? dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
          </template>
        </el-table-column>
        <el-table-column fixed="right"
                         label="操作"
                         min-width="100"
                         align="center">
          <template #default="scope">
            <el-button link
                       type="primary"
                       size="small"
                       @click="openForm('edit', scope.row);">编辑</el-button>
            <el-button link
                       type="danger"
                       size="small"
                       @click="handleDeleteSolo(scope.row)">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination v-show="total > 0"
                  :total="total"
                  layout="total, sizes, prev, pager, next, jumper"
                  :page="page.current"
                  :limit="page.size"
                  @pagination="paginationChange" />
    </div>
    <el-dialog v-model="dialogFormVisible"
               :title="operationType === 'add' ? '新增固定资产' : '编辑固定资产'"
               width="600px"
               @close="closeDia">
      <el-form :model="form"
               label-width="100px"
               :rules="rules"
               ref="formRef">
        <el-form-item label="资产名称"
                      prop="name">
          <el-input v-model="form.name"
                    placeholder="请输入资产名称"
                    clearable />
        </el-form-item>
        <el-form-item label="型号"
                      prop="model">
          <el-input v-model="form.model"
                    placeholder="请输入型号"
                    clearable />
        </el-form-item>
        <el-form-item label="ä»·æ ¼"
                      prop="price">
          <el-input-number v-model="form.price"
                           :min="0"
                           :precision="2"
                           :step="0.01"
                           style="width: 100%"
                           placeholder="请输入价格" />
        </el-form-item>
        <el-form-item label="位置"
                      prop="address">
          <el-input v-model="form.address"
                    type="textarea"
                    :rows="3"
                    placeholder="请输入位置" />
        </el-form-item>
      </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 pagination from "@/components/PIMTable/Pagination.vue";
  import { ref, reactive, toRefs, onMounted, getCurrentInstance } from "vue";
  import { ElMessageBox } from "element-plus";
  import useUserStore from "@/store/modules/user";
  import {
    listPage,
    add,
    update,
    delFixedAssets,
  } from "@/api/financialManagement/fixedAssets.js";
  import dayjs from "dayjs";

  const userStore = useUserStore();
  const { proxy } = getCurrentInstance();

  const tableData = ref([]);
  const selectedRows = ref([]);
  const tableLoading = ref(false);
  const loading = ref(false);

  const page = reactive({
    current: 1,
    size: 100,
  });
  const total = ref(0);

  const operationType = ref("");
  const dialogFormVisible = ref(false);
  const data = reactive({
    searchForm: {
      name: "",
    },
    form: {
      id: null,
      name: "",
      model: "",
      price: 0,
      address: "",
    },
    rules: {
      name: [{ required: true, message: "请输入资产名称", trigger: "blur" }],
      model: [{ required: true, message: "请输入型号", trigger: "blur" }],
      price: [{ required: true, message: "请输入价格", trigger: "blur" }],
      address: [{ required: true, message: "请输入位置", trigger: "blur" }],
    },
  });
  const { searchForm, form, rules } = toRefs(data);

  const handleQuery = () => {
    page.current = 1;
    getList();
  };

  const paginationChange = obj => {
    page.current = obj.page;
    page.size = obj.limit;
    getList();
  };

  const getList = () => {
    tableLoading.value = true;
    listPage({ ...searchForm.value, ...page })
      .then(res => {
        tableLoading.value = false;
        tableData.value = res.data.records;
        total.value = res.data.total;
      })
      .catch(() => {
        tableLoading.value = false;
      });
  };

  const handleSelectionChange = selection => {
    selectedRows.value = selection;
  };

  const openForm = async (type, row) => {
    operationType.value = type;
    dialogFormVisible.value = true;

    if (type === "add") {
      form.value = {
        id: null,
        name: "",
        model: "",
        price: 0,
        address: "",
      };
    } else {
      form.value = {
        id: row.id,
        name: row.name,
        model: row.model,
        price: row.price,
        address: row.address,
      };
    }
  };

  const submitForm = async () => {
    try {
      await proxy.$refs.formRef.validate();
      loading.value = true;

      if (operationType.value === "add") {
        await add(form.value);
        proxy.$modal.msgSuccess("新增资产成功");
      } else {
        await update(form.value);
        proxy.$modal.msgSuccess("修改资产成功");
      }
      closeDia();
      getList();
    } catch (error) {
      console.error("提交失败:", error);
      if (!error.errors) {
        proxy.$modal.msgError("操作失败，请重试");
      }
    } finally {
      loading.value = false;
    }
  };

  const closeDia = () => {
    proxy.$refs.formRef.resetFields();
    dialogFormVisible.value = false;
  };
  const handleDeleteSolo = row => {
    ElMessageBox.confirm("该资产将被删除，是否确认删除？", "删除提示", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
    })
      .then(() => {
        const ids = [row.id];
        delFixedAssets(ids)
          .then(res => {
            proxy.$modal.msgSuccess("删除成功");
            getList();
          })
          .catch(() => {
            proxy.$modal.msgError("删除失败");
          });
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
      });
  };

  const handleDelete = () => {
    if (selectedRows.value.length === 0) {
      proxy.$modal.msgWarning("请选择要删除的数据");
      return;
    }
    ElMessageBox.confirm("选中的内容将被删除，是否确认删除？", "删除提示", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
    })
      .then(() => {
        const ids = selectedRows.value.map(item => item.id);
        delFixedAssets(ids)
          .then(res => {
            proxy.$modal.msgSuccess("删除成功");
            getList();
          })
          .catch(() => {
            proxy.$modal.msgError("删除失败");
          });
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
      });
  };

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

<style scoped lang="scss"></style>

 src/views/procurementManagement/advancedPriceManagement/index.vue

@@ -8,7 +8,7 @@
        </el-form-item>
        <el-form-item label="供应商：">
          <el-select v-model="searchForm.supplierId" placeholder="请选择供应商" clearable style="width: 200px">
            <el-option v-for="supplier in supplierList" :key="supplier.id" :label="supplier.name" :value="supplier.id" />
            <el-option v-for="supplier in supplierList" :key="supplier.id" :label="supplier.supplierName" :value="supplier.id" />
          </el-select>
        </el-form-item>
        <el-form-item>
@@ -454,15 +454,6 @@
  });

const supplierList = ref([
  { id: 1, name: '优质五金供应商' },
  { id: 2, name: '钢材贸易公司' },
  { id: 3, name: '建材批发商' }
])

const productList = ref([
  { id: 1, name: '高强度螺栓' },
  { id: 2, name: '不锈钢管' },
  { id: 3, name: '铝合金型材' }
])



 src/views/procurementManagement/procurementLedger/index.vue

@@ -552,6 +552,11 @@
                            </el-select>
                        </el-form-item>
                    </el-col>
          <el-col :span="24">
            <el-form-item label=" ">
              <el-button type="warning" :disabled="!(productForm.productId && productForm.productModelId && productForm.taxRate)" @click="showPriceReference" icon="Search">查看历史采购价格参考</el-button>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
@@ -636,6 +641,62 @@
          <el-button type="primary" @click="submitProduct">确认</el-button>
          <el-button @click="closeProductDia">取消</el-button>
        </div>
      </template>
    </el-dialog>

    <!-- åŽ†å²é‡‡è´­ä»·æ ¼å‚考弹窗 -->
    <el-dialog
      v-model="priceReferenceVisible"
      title="历史采购价格参考"
      width="1000px"
      append-to-body
    >
      <el-table 
        v-loading="priceReferenceLoading"
        :data="priceReferenceData" 
        border 
        style="width: 100%"
      >
        <el-table-column label="商品名称" prop="productName" min-width="150" show-overflow-tooltip />
        <el-table-column label="规格型号" prop="specification" width="150" show-overflow-tooltip />
        <el-table-column label="供应商" prop="supplierName" width="200" show-overflow-tooltip />
        <el-table-column label="基础价格" width="120" align="right">
          <template #default="{ row }">
            <span style="color: #f56c6c; font-weight: bold;">Â¥{{ row.basePrice }}</span>
          </template>
        </el-table-column>
        <el-table-column label="折扣信息" width="120" align="center">
          <template #default="{ row }">
            <el-tag v-if="row.discountType === 'percentage'" type="success">
              {{ row.discountValue }}%
            </el-tag>
            <el-tag v-else-if="row.discountType === 'fixed'" type="warning">
              -Â¥{{ row.discountValue }}
            </el-tag>
            <span v-else>无折扣</span>
          </template>
        </el-table-column>
        <el-table-column label="生效时间" prop="effectiveTime" width="180" align="center" />
        <el-table-column label="操作" width="100" align="center" fixed="right">
          <template #default="{ row }">
            <el-button type="primary" link @click="selectPriceReference(row)">选择</el-button>
          </template>
        </el-table-column>
      </el-table>

      <div class="pagination-container" style="margin-top: 20px; display: flex; justify-content: flex-end;">
        <el-pagination
          v-model:current-page="priceReferencePagination.current"
          v-model:page-size="priceReferencePagination.size"
          :page-sizes="[10, 20, 50]"
          :total="priceReferenceTotal"
          layout="total, sizes, prev, pager, next"
          @size-change="handlePriceReferenceSizeChange"
          @current-change="handlePriceReferenceCurrentChange"
        />
      </div>
      <template #footer>
        <el-button @click="priceReferenceVisible = false">关闭</el-button>
      </template>
    </el-dialog>

@@ -903,6 +964,7 @@
let nextApproverId = 2;
import useUserStore from "@/store/modules/user";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import { listPage as listAdvancedPrice } from "@/api/procurementManagement/advancedPriceManagement.js";
import dayjs from "dayjs";

const userStore = useUserStore();
@@ -996,6 +1058,72 @@
  },
});
const { productForm, productRules } = toRefs(productFormData);

// é‡‡è´­ä»·æ ¼ç®¡ç†å‚考弹窗
const priceReferenceVisible = ref(false);
const priceReferenceLoading = ref(false);
const priceReferenceData = ref([]);
const priceReferenceTotal = ref(0);
const priceReferencePagination = reactive({
  current: 1,
  size: 10
});

const showPriceReference = () => {
  priceReferenceVisible.value = true;
  handlePriceReferenceSearch();
};

const handlePriceReferenceSearch = () => {
  priceReferenceLoading.value = true;
  // æ¨¡æ‹Ÿæœç´¢å‚数：productId æ˜ å°„为 productName æˆ– ID，这里根据 advancedPriceManagement çš„ API ç¡®å®šå‚æ•°
  // å‡è®¾é«˜çº§ä»·æ ¼ç®¡ç†çš„ listPage æŽ¥æ”¶ productId
  const query = {
    productId: productForm.value.productId,
    specificationId: productForm.value.productModelId,
    current: priceReferencePagination.current,
    size: priceReferencePagination.size
  };
  listAdvancedPrice(query).then(res => {
    priceReferenceData.value = res.data.records;
    priceReferenceTotal.value = res.data.total;
    priceReferenceLoading.value = false;
  }).catch(() => {
    priceReferenceLoading.value = false;
  });
};

const handlePriceReferenceSizeChange = (size) => {
  priceReferencePagination.size = size;
  handlePriceReferenceSearch();
};

const handlePriceReferenceCurrentChange = (page) => {
  priceReferencePagination.current = page;
  handlePriceReferenceSearch();
};

const selectPriceReference = (row) => {
   // è®¡ç®—实际价格：基础价格 - æŠ˜æ‰£
   let actualPrice = row.basePrice;
   if (row.discountType === 'percentage') {
     actualPrice = row.basePrice * (1 - row.discountValue / 100);
   } else if (row.discountType === 'fixed') {
     actualPrice = row.basePrice - row.discountValue;
   }
   
   // å¡«å……含税单价，保留两位小数
   productForm.value.taxInclusiveUnitPrice = Number(Math.max(actualPrice, 0)).toFixed(2);
   
   // å¦‚果已经输入了数量，则自动计算总价
   if (productForm.value.quantity) {
     mathNum();
   }
   
   priceReferenceVisible.value = false;
   proxy.$modal.msgSuccess("已引用历史价格");
 };

const upload = reactive({
  // ä¸Šä¼ çš„地址
  url: import.meta.env.VITE_APP_BASE_API + "/file/upload",

 src/views/salesManagement/salesLedger/index.vue

@@ -1669,7 +1669,7 @@
    };
    deliveryFormVisible.value = true;
  }).catch(err => {
    ElMessage.error(err.msg);
    // ElMessage.error(err);
  });
};