feat: 发货新增自提选择

gongchunyi

22 小时以前 de26a68bb2cf0caa9a35e8eb6dce852435143b25

feat: 发货新增自提选择

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

@@ -200,7 +200,8 @@
                <el-descriptions-item label="发货类型">{{ currentDelivery.shippingInfo.type || '--' }}</el-descriptions-item>
                <el-descriptions-item label="发货日期">{{ currentDelivery.shippingInfo.shippingDate || '--' }}</el-descriptions-item>
                <el-descriptions-item label="审核状态">{{ currentDelivery.shippingInfo.status || '--' }}</el-descriptions-item>
                <el-descriptions-item label="发货车牌号">{{ currentDelivery.shippingInfo.shippingCarNumber || '--' }}</el-descriptions-item>
                <el-descriptions-item label="发货车牌号"
                                      v-if="currentDelivery.shippingInfo.type !== '自提'">{{ currentDelivery.shippingInfo.shippingCarNumber || '--' }}</el-descriptions-item>
                <el-descriptions-item label="快递公司" v-if="false">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
                <el-descriptions-item label="快递单号"
                                      :span="2" v-if="false">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>

 src/views/salesManagement/deliveryLedger/index.vue

@@ -54,66 +54,91 @@
        style="width: 100%"
        height="calc(100vh - 21.5em)"
      >
        <el-table-column align="center" type="selection" width="55" />
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column align="center" type="selection" width="45" />
        <el-table-column align="center" label="序号" type="index" width="55" />
        <el-table-column
          label="销售订单"
          prop="salesContractNo"
          min-width="140"
          show-overflow-tooltip
        />
        <el-table-column
          label="发货订单号"
          prop="shippingNo"
          min-width="150"
          show-overflow-tooltip
        />
        <el-table-column
          label="客户名称"
          prop="customerName"
          min-width="130"
          show-overflow-tooltip
        />
        <el-table-column
          label="产品名称"
          prop="productName"
          min-width="120"
          show-overflow-tooltip
        />
        <el-table-column
          label="规格型号"
          prop="specificationModel"
          min-width="110"
          show-overflow-tooltip
        />
        <el-table-column
          label="发货时间"
          prop="shippingDate"
          width="105"
          align="center"
          show-overflow-tooltip
        />
        <el-table-column
          label="发货数量"
          prop="totalQuantity"
          width="90"
          align="center"
          show-overflow-tooltip
        />
        <el-table-column
          label="发货类型"
          prop="type"
          align="center"
          width="90"
          show-overflow-tooltip
        >
          <template #default="scope">
            <el-tag :type="getDeliveryTypeTagType(scope.row.type)" size="small">
              {{ scope.row.type || "--" }}
            </el-tag>
          </template>
        </el-table-column>
        <el-table-column
          label="发货车牌号"
          prop="shippingCarNumber"
          min-width="110"
          show-overflow-tooltip
        />
        <el-table-column
          label="快递公司"
          prop="expressCompany"
          min-width="100"
          show-overflow-tooltip
        />
        <el-table-column
          label="快递单号"
          prop="expressNumber"
          min-width="130"
          show-overflow-tooltip
        />
        <el-table-column
          label="审核状态"
          prop="status"
          align="center"
          width="100"
          width="90"
        >
          <template #default="scope">
            <el-tag :type="getApprovalStatusType(scope.row.status)">
            <el-tag :type="getApprovalStatusType(scope.row.status)" size="small">
              {{ getApprovalStatusText(scope.row.status) }}
            </el-tag>
          </template>
@@ -122,9 +147,9 @@
          label="出库单号"
          prop="outboundBatches"
          show-overflow-tooltip
          width="130"
          min-width="120"
        />
        <el-table-column fixed="right" label="操作" width="220" align="center">
        <el-table-column fixed="right" label="操作" width="130" align="center">
          <template #default="scope">
            <!--            <el-button-->
            <!--                link-->
@@ -182,6 +207,7 @@
              >
                <el-option label="货车" value="货车" />
                <el-option label="快递" value="快递" />
                <el-option label="自提" value="自提" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -222,7 +248,7 @@
          </el-col>
        </el-row>
        <el-row :gutter="30" >
          <el-col :span="24">
          <el-col :span="24" v-if="form.type !== '自提'">
            <el-form-item label="快递单号：" prop="expressNumber">
              <el-input
                v-model="form.expressNumber"
@@ -281,13 +307,13 @@
          <el-descriptions-item label="审核状态">{{
            getApprovalStatusText(detailRow.status)
          }}</el-descriptions-item>
          <el-descriptions-item label="发货车牌号">{{
          <el-descriptions-item label="发货车牌号" v-if="detailRow.type !== '自提'">{{
            detailRow.shippingCarNumber || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="快递公司" >{{
          <el-descriptions-item label="快递公司" v-if="detailRow.type !== '自提'">{{
            detailRow.expressCompany || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="快递单号" :span="2" >{{
          <el-descriptions-item label="快递单号" :span="2" v-if="detailRow.type !== '自提'">{{
            detailRow.expressNumber || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="出库单号" :span="2">{{
@@ -770,11 +796,25 @@
  if (val === "货车") {
    form.value.expressCompany = "";
    form.value.expressNumber = "";
  } else if (val === "自提") {
    form.value.shippingCarNumber = "";
    form.value.expressCompany = "";
    form.value.expressNumber = "";
  } else {
    form.value.shippingCarNumber = "";
  }
};

// 发货类型标签颜色
const getDeliveryTypeTagType = (type) => {
  const typeMap = {
    快递: "primary",
    货车: "warning",
    自提: "success",
  };
  return typeMap[String(type || "").trim()] || "info";
};

// 获取审核状态文本
const getApprovalStatusText = (status) => {
  if (status === null || status === undefined || status === "") {

 src/views/salesManagement/salesLedger/index.vue

@@ -952,6 +952,8 @@
                           value="快递" />
                <el-option label="货车"
                           value="货车" />
                <el-option label="自提"
                           value="自提" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -984,7 +986,8 @@
        </el-row>
        <el-row :gutter="30"
                >
          <el-col :span="24">
          <el-col :span="24"
                  v-if="deliveryForm.type !== '自提'">
            <el-form-item label="快递单号："
                          prop="expressNumber">
              <el-input v-model="deliveryForm.expressNumber"
@@ -2603,6 +2606,10 @@
    if (val === "货车") {
      deliveryForm.value.expressCompany = "";
      deliveryForm.value.expressNumber = "";
    } else if (val === "自提") {
      deliveryForm.value.shippingCarNumber = "";
      deliveryForm.value.expressCompany = "";
      deliveryForm.value.expressNumber = "";
    } else {
      deliveryForm.value.shippingCarNumber = "";
    }