1.协同审批页面联调 2.已添加的销售台账编辑删除原有的产品后，销售台账数据未对应 3.供应商档案分页展示有误

gaoluyang

4 天以前 306e2d7cda410f7b24ae9e485dde5f31d717ba1f

1.协同审批页面联调
2.已添加的销售台账编辑删除原有的产品后，销售台账数据未对应
3.供应商档案分页展示有误

 src/api/collaborativeApproval/approvalProcess.js

@@ -45,4 +45,12 @@
        method: 'delete',
        data: query,
    })
}
// 删除审批流程
export function approveProcessDetails(query) {
    return request({
        url: '/approveNode/details',
        method: 'get',
        params: query,
    })
}

 src/views/basicData/customerFile/index.vue

@@ -310,7 +310,7 @@
const tableLoading = ref(false);
const page = reactive({
  current: 1,
  size: 10,
  size: 100,
  total: 0,
});
const total = ref(0);

 src/views/basicData/supplierManage/index.vue

@@ -35,6 +35,7 @@
        :isSelection="true"
        @selection-change="handleSelectionChange"
        :tableLoading="tableLoading"
                @pagination="pagination"
      ></PIMTable>
    </div>
    <el-dialog
@@ -297,7 +298,7 @@
const tableLoading = ref(false);
const page = reactive({
  current: 1,
  size: 10,
  size: 100,
  total: 0,
});


 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue

@@ -49,6 +49,7 @@

<script setup>
import {getCurrentInstance, ref} from "vue";
import {approveProcessDetails} from "../../../../api/collaborativeApproval/approvalProcess.js";
const emit = defineEmits(['close'])
const { proxy } = getCurrentInstance()

@@ -79,6 +80,9 @@
const openDialog = (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
    approveProcessDetails({id: row.approveId}).then((res) => {
        console.log(res)
    })
}
// 提交审批
const submitForm = () => {

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -81,7 +81,17 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="申请人：" prop="approveUser">
              <el-input v-model="form.approveUser" placeholder="请输入" clearable/>
                            <el-select
                                v-model="form.approveUser"
                                placeholder="选择人员"
                            >
                                <el-option
                                    v-for="user in userList"
                                    :key="user.userId"
                                    :label="user.nickName"
                                    :value="user.userId"
                                />
                            </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -171,7 +181,8 @@
    approverNodes.value = [
        { id: 1, userId: null }
    ]
  form.value.approveUser = userStore.nickName;
    console.log(userStore)
  form.value.approveUser = userStore.id;
  form.value.approveTime = getCurrentDate();
  if (operationType.value === 'edit') {
    approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => {

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -2,11 +2,11 @@
  <div class="app-container">
    <div class="search_form">
      <div>
        <span class="search_title">供应商：</span>
        <span class="search_title">流程编号：</span>
        <el-input
            v-model="searchForm.supplier"
            v-model="searchForm.approveId"
            style="width: 240px"
            placeholder="请输入供应商搜索"
            placeholder="请输入流程编号搜索"
            @change="handleQuery"
            clearable
            :prefix-icon="Search"
@@ -43,14 +43,13 @@
import { Search } from "@element-plus/icons-vue";
import {onMounted, ref} from "vue";
import {ElMessageBox} from "element-plus";
import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js";
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";

const data = reactive({
  searchForm: {
    supplier: "",
        approveId: "",
  },
});
const { searchForm } = toRefs(data);
@@ -85,7 +84,7 @@
  {
    label: "流程编号",
    prop: "approveId",
    width: 230
    width: 170
  },
  {
    label: "申请部门",
@@ -94,6 +93,7 @@
  {
    label: "审批事由",
    prop: "approveReason",
        width: 200
  },
  {
    label: "申请人",
@@ -199,7 +199,7 @@
const handleDelete = () => {
  let ids = [];
  if (selectedRows.value.length > 0) {
    ids = selectedRows.value.map((item) => item.id);
    ids = selectedRows.value.map((item) => item.approveId);
  } else {
    proxy.$modal.msgWarning("请选择数据");
    return;

 src/views/salesManagement/salesLedger/index.vue

@@ -153,7 +153,7 @@
        <el-row>
          <el-form-item label="产品信息：" prop="entryDate">
            <el-button type="primary" @click="openProductForm('add')">添加</el-button>
            <el-button plain type="danger" @click="deleteProduct">删除</el-button>
            <el-button plain type="danger" @click="deleteProduct" >删除</el-button>
          </el-form-item>
        </el-row>
        <el-table :data="productData" border @selection-change="productSelected" show-summary
@@ -631,7 +631,8 @@
const submitForm = () => {
  proxy.$refs["formRef"].validate((valid) => {
    if (valid) {
      if (productData.value.length > 0) {
            console.log('productData.value--', productData.value)
      if (productData.value !== null && productData.value.length > 0) {
        form.value.productData = proxy.HaveJson(productData.value);
      } else {
        proxy.$modal.msgWarning("请添加产品信息");