gongchunyi
2 天以前 c94826da81b6ebed4a62ed44f6e6bc30cb65f467
fix: 已审核订单的分页组件不展示
已修改2个文件
89 ■■■■■ 文件已修改
src/assets/styles/index.scss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/styles/index.scss
@@ -123,7 +123,7 @@
//main-container全局样式
.app-container {
  padding: 20px;
  padding: 10px;
}
.search_form {
  display: flex;
src/views/salesManagement/salesLedger/index.vue
@@ -883,15 +883,7 @@
                       @click="handleBulkDelivery"
                       :disabled="isBatchButtonDisabled('delivery')">发货</el-button>
            <el-button @click="handleOut">导出</el-button>
            <el-date-picker v-model="processRouteExportDateRange"
                            type="datetimerange"
                            range-separator="至"
                            start-placeholder="开始时间"
                            end-placeholder="结束时间"
                            value-format="YYYY-MM-DD HH:mm:ss"
                            format="YYYY-MM-DD HH:mm:ss"
                            clearable
                            style="width: 340px;" />
            <el-button @click="handleExportProcessRoute"
                       :disabled="isBatchButtonDisabled('export')">导出工艺路线</el-button>
          </el-space>
@@ -988,8 +980,8 @@
                :row-class-name="tableRowClassName"
                show-summary
                style="width: 100%"
                :summary-method="summarizeMainTable"
                height="calc(100vh - 22em)">
                height="calc(100vh - 23em)"
                :summary-method="summarizeMainTable">
        <el-table-column align="center"
                         type="selection"
                         width="55"
@@ -1000,7 +992,7 @@
                         width="60" />
        <el-table-column label="订单号"
                         prop="salesContractNo"
                         width="180"
                         min-width="160"
                         show-overflow-tooltip>
          <template #default="scope">
            <el-button link
@@ -1010,27 +1002,27 @@
        </el-table-column>
        <el-table-column label="客户名称"
                         prop="customerName"
                         width="300"
                         min-width="200"
                         show-overflow-tooltip />
        <el-table-column label="业务员"
                         prop="salesman"
                         width="100"
                         min-width="80"
                         show-overflow-tooltip />
        <el-table-column label="合同金额(元)"
                         prop="contractAmount"
                         width="220"
                         min-width="120"
                         show-overflow-tooltip
                         :formatter="formattedNumber" />
        <el-table-column label="面积"
                         prop="productTotalArea"
                         width="120"
                         min-width="80"
                         show-overflow-tooltip />
        <el-table-column label="数量"
                         prop="productTotalQuantity"
                         width="120"
                         min-width="80"
                         show-overflow-tooltip />
        <el-table-column label="发货状态"
                         width="140"
                         min-width="100"
                         align="center">
          <template #default="scope">
            <el-tag v-if="Number(scope.row.deliveryStatus) === 1"
@@ -1050,19 +1042,21 @@
          </template>
        </el-table-column>
        <el-table-column label="审核状态"
                         width="120"
                         min-width="90"
                         align="center">
          <template #default="scope">
            <el-tag v-if="Number(scope.row.reviewStatus) === 0"
                    type="warning">待审核</el-tag>
            <el-tag v-else-if="Number(scope.row.reviewStatus) === 1"
                    type="success">已审核</el-tag>
            <el-tag v-else-if="Number(scope.row.reviewStatus) === 2"
                    type="danger">已反审</el-tag>
            <el-tag v-else
                    type="info">待审核</el-tag>
          </template>
        </el-table-column>
        <el-table-column label="入库状态"
                         width="120"
                         min-width="90"
                         align="center">
          <template #default="scope">
            <el-tag v-if="Number(scope.row.stockStatus) === 0"
@@ -1078,7 +1072,7 @@
          </template>
        </el-table-column>
        <el-table-column label="订单状态"
                         width="120"
                         min-width="90"
                         align="center">
          <template #default="scope">
            <el-tag v-if="Number(scope.row.orderStatus) === 1"
@@ -1088,14 +1082,14 @@
          </template>
        </el-table-column>
        <el-table-column label="标签打印"
                         width="90"
                         min-width="90"
                         align="center">
          <template #default="scope">
            <span>{{ scope.row.labelPrintCount ?? 0 }}</span>
          </template>
        </el-table-column>
        <el-table-column label="单据打印"
                         width="90"
                         min-width="90"
                         align="center">
          <template #default="scope">
            <span>{{ scope.row.documentPrintCount ?? 0 }}</span>
@@ -1103,27 +1097,27 @@
        </el-table-column>
        <el-table-column label="录入人"
                         prop="entryPersonName"
                         width="100"
                         min-width="80"
                         show-overflow-tooltip />
        <el-table-column label="录入日期"
                         prop="entryDate"
                         width="120"
                         min-width="110"
                         show-overflow-tooltip />
        <el-table-column label="交付日期"
                         prop="deliveryDate"
                         width="120"
                         min-width="110"
                         show-overflow-tooltip />
        <el-table-column label="备注"
                         prop="remarks"
                         width="200"
                         min-width="120"
                         show-overflow-tooltip />
        <el-table-column label="客户备注"
                         prop="customerRemarks"
                         width="200"
                         min-width="120"
                         show-overflow-tooltip />
        <el-table-column fixed="right"
                         label="操作"
                         width="280"
                         width="250"
                         align="center">
          <template #default="scope">
            <el-button link
@@ -1152,6 +1146,31 @@
                  @pagination="paginationChange" />
    </div>
    </div>
    <!-- 导出工艺路线 弹窗 -->
    <el-dialog title="选择导出时间范围"
               v-model="exportProcessRouteDialogVisible"
               width="450px"
               append-to-body>
      <el-form>
        <el-form-item label="完成时间:">
          <el-date-picker v-model="processRouteExportDateRange"
                          type="datetimerange"
                          range-separator="至"
                          start-placeholder="开始时间"
                          end-placeholder="结束时间"
                          value-format="YYYY-MM-DD HH:mm:ss"
                          format="YYYY-MM-DD HH:mm:ss"
                          clearable
                          style="width: 100%;" />
        </el-form-item>
      </el-form>
      <template #footer>
        <div style="text-align: right">
          <el-button @click="exportProcessRouteDialogVisible = false">取消</el-button>
          <el-button type="primary" @click="confirmExportProcessRoute">确认导出</el-button>
        </div>
      </template>
    </el-dialog>
    </template>
    <FormDialog v-if="!isFormPageMode"
                v-model="dialogFormVisible"
@@ -5380,6 +5399,8 @@
    proxy.download("/sales/ledger/exportWithProducts", params, "销售台账.xlsx");
  };
  const exportProcessRouteDialogVisible = ref(false);
  const handleExportProcessRoute = () => {
    if (selectedRows.value.length === 0) {
      proxy?.$modal?.msgWarning?.("请选择要导出的销售台账");
@@ -5392,6 +5413,13 @@
      proxy?.$modal?.msgWarning?.("请选择要导出的销售台账");
      return;
    }
    exportProcessRouteDialogVisible.value = true;
  };
  const confirmExportProcessRoute = () => {
    const salesLedgerIds = selectedRows.value
      .map(item => item.id)
      .filter(id => id !== null && id !== undefined && id !== "");
    const params = {
      salesLedgerIds: salesLedgerIds.join(","),
@@ -5409,6 +5437,7 @@
      params,
      "销售台账工艺路线导出.xlsx"
    );
    exportProcessRouteDialogVisible.value = false;
  };
  /** 判断单个产品是否已发货(根据shippingStatus判断,已发货或审核通过不可编辑和删除) */
  const isProductShipped = product => {