fix: 不在销售台账处出库。在发货台账处导入excel，匹配客户进行出库。销售台账处的产品列表需要展示已发货/未发货数量。

spring

7 天以前 845b15a472449bc8f2632ea80f339da15c3b6356

 src/views/basicData/supplierManage/components/HomeTab.vue

@@ -3,185 +3,172 @@
    <div class="search_form">
      <div>
        <span class="search_title">供应商档案：</span>
        <el-input
            v-model="searchForm.supplierName"
        <el-input v-model="searchForm.supplierName"
            style="width: 240px"
            placeholder="输入供应商名称搜索"
            @change="handleQuery"
            clearable
            :prefix-icon="Search"
        />
        <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
        >搜索</el-button
        >
                  :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="primary"
                   @click="openForm('add')">新增供应商</el-button>
        <el-button @click="handleOut">导出</el-button>
        <el-button type="info" plain icon="Upload" @click="handleImport"
        >导入</el-button
        >
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
        <el-button type="info"
                   plain
                   icon="Upload"
                   @click="handleImport">导入</el-button>
        <el-button type="danger"
                   plain
                   @click="handleDelete">删除</el-button>
      </div>
    </div>
    <div class="table_list">
      <PIMTable
          rowKey="id"
      <PIMTable rowKey="id"
          :column="tableColumn"
          :tableData="tableData"
          :page="page"
          :isSelection="true"
          @selection-change="handleSelectionChange"
          :tableLoading="tableLoading"
          @pagination="pagination"
      ></PIMTable>
                @pagination="pagination"></PIMTable>
    </div>
    <el-dialog
        v-model="dialogFormVisible"
    <el-dialog v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增供应商信息' : '编辑供应商信息'"
        width="70%"
        @close="closeDia"
    >
      <el-form
          :model="form"
               @close="closeDia">
      <el-form :model="form"
          label-width="140px"
          label-position="top"
          :rules="rules"
          ref="formRef"
      >
               ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商名称：" prop="supplierName">
              <el-input
                  v-model="form.supplierName"
            <el-form-item label="供应商名称："
                          prop="supplierName">
              <el-input v-model="form.supplierName"
                  placeholder="请输入"
                  clearable
              />
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item
                label="纳税人识别号："
                prop="taxpayerIdentificationNum"
            >
              <el-input
                  v-model="form.taxpayerIdentificationNum"
            <el-form-item label="纳税人识别号："
                          prop="taxpayerIdentificationNum">
              <el-input v-model="form.taxpayerIdentificationNum"
                  placeholder="请输入"
                  clearable
              />
                        clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="公司地址：" prop="companyAddress">
              <el-input
                  v-model="form.companyAddress"
            <el-form-item label="公司地址："
                          prop="companyAddress">
              <el-input v-model="form.companyAddress"
                  placeholder="请输入"
                  clearable
              />
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="公司电话：" prop="companyPhone">
              <el-input
                  v-model="form.companyPhone"
            <el-form-item label="公司电话："
                          prop="companyPhone">
              <el-input v-model="form.companyPhone"
                  placeholder="请输入"
                  clearable
              />
                        clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="开户行：" prop="bankAccountName">
              <el-input
                  v-model="form.bankAccountName"
            <el-form-item label="开户行："
                          prop="bankAccountName">
              <el-input v-model="form.bankAccountName"
                  placeholder="请输入"
                  clearable
              />
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="账号：" prop="bankAccountNum">
              <el-input
                  v-model="form.bankAccountNum"
            <el-form-item label="账号："
                          prop="bankAccountNum">
              <el-input v-model="form.bankAccountNum"
                  placeholder="请输入"
                  clearable
              />
                        clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="联系人：" prop="contactUserName">
              <el-input
                  v-model="form.contactUserName"
            <el-form-item label="联系人："
                          prop="contactUserName">
              <el-input v-model="form.contactUserName"
                  placeholder="请输入"
                  clearable
              />
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="联系电话：" prop="contactUserPhone">
              <el-input
                  v-model="form.contactUserPhone"
            <el-form-item label="联系电话："
                          prop="contactUserPhone">
              <el-input v-model="form.contactUserPhone"
                  placeholder="请输入"
                  clearable
              />
                        clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="维护人：" prop="maintainUserId">
              <el-select
                  v-model="form.maintainUserId"
            <el-form-item label="维护人："
                          prop="maintainUserId">
              <el-select v-model="form.maintainUserId"
                  placeholder="请选择"
                  clearable
                  disabled
              >
                <el-option
                    v-for="item in userList"
                         disabled>
                <el-option v-for="item in userList"
                    :key="item.nickName"
                    :label="item.nickName"
                    :value="item.userId"
                />
                           :value="item.userId" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="维护时间：" prop="maintainTime">
              <el-date-picker
                  style="width: 100%"
            <el-form-item label="维护时间："
                          prop="maintainTime">
              <el-date-picker style="width: 100%"
                  v-model="form.maintainTime"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  type="date"
                  placeholder="请选择"
                  clearable
              />
                              clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商类型：" prop="supplierType">
              <el-select v-model="form.supplierType" placeholder="请选择" clearable>
                <el-option label="甲" value="甲" />
                <el-option label="乙" value="乙" />
                <el-option label="丙" value="丙" />
                <el-option label="丁" value="丁" />
            <el-form-item label="供应商类型："
                          prop="supplierType">
              <el-select v-model="form.supplierType"
                         placeholder="请选择"
                         clearable>
                <el-option label="对公"
                           :value="1" />
                <el-option label="对私"
                           :value="2" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="是否白名单：" prop="isWhite">
              <el-select v-model="form.isWhite" placeholder="请选择" clearable>
                <el-option label="是" :value="0" />
                <el-option label="否" :value="1" />
            <el-form-item label="是否白名单："
                          prop="isWhite">
              <el-select v-model="form.isWhite"
                         placeholder="请选择"
                         clearable>
                <el-option label="是"
                           :value="0" />
                <el-option label="否"
                           :value="1" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -189,21 +176,18 @@
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button type="primary"
                     @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
    </el-dialog>

    <!-- 供应商导入对话框 -->
    <el-dialog
        :title="upload.title"
    <el-dialog :title="upload.title"
        v-model="upload.open"
        width="400px"
        append-to-body
    >
      <el-upload
          ref="uploadRef"
               append-to-body>
      <el-upload ref="uploadRef"
          :limit="1"
          accept=".xlsx, .xls"
          :headers="upload.headers"
@@ -213,26 +197,23 @@
          :on-success="handleFileSuccess"
          :on-error="handleFileError"
          :auto-upload="false"
          drag
      >
                 drag>
        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
        <template #tip>
          <div class="el-upload__tip text-center">
            <span>仅允许导入xls、xlsx格式文件。</span>
            <el-link
                type="primary"
            <el-link type="primary"
                :underline="false"
                style="font-size: 12px; vertical-align: baseline"
                @click="importTemplate"
            >下载模板</el-link
            >
                     @click="importTemplate">下载模板</el-link>
          </div>
        </template>
      </el-upload>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitFileForm">确 定</el-button>
          <el-button type="primary"
                     @click="submitFileForm">确 定</el-button>
          <el-button @click="upload.open = false">取 消</el-button>
        </div>
      </template>
@@ -269,6 +250,9 @@
    label: "供应商类型",
    prop: "supplierType",
    width: 120,
      formatData: params => {
        return params == 1 ? "对公" : "对私";
      },
  },
  {
    label: "纳税人识别号",
@@ -283,7 +267,7 @@
  {
    label: "联系方式",
    prop: "companyPhone",
    width:150
      width: 150,
  },
  {
    label: "开户行",
@@ -312,19 +296,19 @@
  {
    label: "维护时间",
    prop: "maintainTime",
    width:100
      width: 100,
  },
  {
    dataType: "action",
    label: "操作",
    align: "center",
    fixed: 'right',
      fixed: "right",
    width: 150,
    operation: [
      {
        name: "编辑",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          openForm("edit", row);
        },
      },
@@ -332,10 +316,10 @@
        //资质附件
        name: "资质文件",
        type: "text",
        clickFun: (row) => {
          openFilesFormDia(row)
        }
      }
          clickFun: row => {
            openFilesFormDia(row);
          },
        },
    ],
  },
]);
@@ -348,7 +332,7 @@
  size: 100,
  total: 0,
});
const filesDia = ref()
  const filesDia = ref();
// 用户信息表单弹框数据
const operationType = ref("");
const dialogFormVisible = ref(false);
@@ -372,18 +356,20 @@
  },
  rules: {
    supplierName: [{ required: true, message: "请输入", trigger: "blur" }],
    taxpayerIdentificationNum: [
      { required: true, message: "请输入", trigger: "blur" },
    ],
    companyAddress: [{ required: true, message: "请输入", trigger: "blur" }],
    companyPhone: [{ required: true, message: "请输入", trigger: "blur" }],
    bankAccountName: [{ required: true, message: "请输入", trigger: "blur" }],
    bankAccountNum: [{ required: true, message: "请输入", trigger: "blur" }],
      // taxpayerIdentificationNum: [
      //   { required: true, message: "请输入", trigger: "blur" },
      // ],
      // companyAddress: [{ required: true, message: "请输入", trigger: "blur" }],
      // companyPhone: [{ required: true, message: "请输入", trigger: "blur" }],
      // bankAccountName: [{ required: true, message: "请输入", trigger: "blur" }],
      // bankAccountNum: [{ required: true, message: "请输入", trigger: "blur" }],
    contactUserName: [{ required: false, message: "请输入", trigger: "blur" }],
    contactUserPhone: [{ required: false, message: "请输入", trigger: "blur" }],
    maintainUserId: [{ required: false, message: "请选择", trigger: "change" }],
    maintainTime: [{ required: false, message: "请选择", trigger: "change" }],
    supplierType: [{ required: true, message: "请选择供应商类型", trigger: "change" }],
      supplierType: [
        { required: true, message: "请选择供应商类型", trigger: "change" },
      ],
  },
});
const { searchForm, form, rules } = toRefs(data);
@@ -394,7 +380,7 @@
  page.current = 1;
  getList();
};
const pagination = (obj) => {
  const pagination = obj => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
@@ -406,7 +392,7 @@
}
const getList = () => {
  tableLoading.value = true;
  listSupplier({ ...searchForm.value, ...page, isWhite: 0 }).then((res) => {
    listSupplier({ ...searchForm.value, ...page, isWhite: 0 }).then(res => {
    tableLoading.value = false;
    tableData.value = res.data.records;
    page.total = res.data.total;
@@ -433,7 +419,11 @@
}
/** 下载模板 */
function importTemplate() {
  proxy.download("/system/supplier/downloadTemplate", {}, "供应商导入模板.xlsx");
    proxy.download(
      "/system/supplier/downloadTemplate",
      {},
      "供应商导入模板.xlsx"
    );
}

/**文件上传中处理 */
@@ -462,7 +452,7 @@
  proxy.$modal.msgError("文件上传失败");
};
// 表格选择数据
const handleSelectionChange = (selection) => {
  const handleSelectionChange = selection => {
  selectedRows.value = selection;
};
// 打开弹框
@@ -471,11 +461,11 @@
  form.value = {};
  form.value.maintainUserId = userStore.id;
  form.value.maintainTime = getCurrentDate();
  userListNoPage().then((res) => {
    userListNoPage().then(res => {
    userList.value = res.data;
  });
  if (type === "edit") {
    getSupplier(row.id).then((res) => {
      getSupplier(row.id).then(res => {
      form.value = { ...res.data };
    });
  }
@@ -483,7 +473,7 @@
};
// 提交表单
const submitForm = () => {
  proxy.$refs["formRef"].validate((valid) => {
    proxy.$refs["formRef"].validate(valid => {
    if (valid) {
      if (operationType.value === "edit") {
        submitEdit();
@@ -495,7 +485,7 @@
};
// 提交新增
const submitAdd = () => {
  addSupplier(form.value).then((res) => {
    addSupplier(form.value).then(res => {
    proxy.$modal.msgSuccess("提交成功");
    closeDia();
    getList();
@@ -503,7 +493,7 @@
};
// 提交修改
const submitEdit = () => {
  updateSupplier(form.value).then((res) => {
    updateSupplier(form.value).then(res => {
    proxy.$modal.msgSuccess("提交成功");
    closeDia();
    getList();
@@ -522,7 +512,11 @@
    type: "warning",
  })
      .then(() => {
        proxy.download("/system/supplier/export", { isWhite: 0 }, "供应商档案.xlsx");
        proxy.download(
          "/system/supplier/export",
          { isWhite: 0 },
          "供应商档案.xlsx"
        );
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
@@ -533,12 +527,14 @@
  let ids = [];
  if (selectedRows.value.length > 0) {
    // 检查是否有他人维护的数据
    const unauthorizedData = selectedRows.value.filter(item => item.maintainUserName !== userStore.nickName);
      const unauthorizedData = selectedRows.value.filter(
        item => item.maintainUserName !== userStore.nickName
      );
    if (unauthorizedData.length > 0) {
      proxy.$modal.msgWarning("不可删除他人维护的数据");
      return;
    }
    ids = selectedRows.value.map((item) => item.id);
      ids = selectedRows.value.map(item => item.id);
  } else {
    proxy.$modal.msgWarning("请选择数据");
    return;
@@ -551,7 +547,7 @@
      .then(() => {
        tableLoading.value = true;
        delSupplier(ids)
            .then((res) => {
          .then(res => {
              proxy.$modal.msgSuccess("删除成功");
              getList();
            })
@@ -573,10 +569,10 @@
  return `${year}-${month}-${day}`;
}
// 打开附件弹框
const openFilesFormDia = (row) => {
  const openFilesFormDia = row => {
  nextTick(() => {
    filesDia.value?.openDialog(row)
  })
      filesDia.value?.openDialog(row);
    });
};

onMounted(() => {