Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

2 天以前 d88003aa8f32ea8ab981988161fd6485bca2855e

Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

 src/views/collaborativeApproval/approvalManagement/index.vue

@@ -203,7 +203,6 @@
  { value: '5', label: '采购审批', icon: 'ShoppingCart', color: '#909399' },
  { value: '6', label: '报价审批', icon: 'DocumentChecked', color: '#9B59B6' },
  { value: '7', label: '发货审批', icon: 'Van', color: '#1ABC9C' },
  { value: '8', label: '危险作业审批', icon: 'Van', color: '#3b12d3' },
];

// 审批类型名称映射
@@ -215,7 +214,6 @@
  5: '采购审批',
  6: '报价审批',
  7: '发货审批',
  8: '危险作业审批',
};

// 审批类型图标映射

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

@@ -201,9 +201,9 @@
                <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="false">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
                <el-descriptions-item label="快递公司">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
                <el-descriptions-item label="快递单号"
                                      :span="2" v-if="false">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>
                                      :span="2">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>
              </el-descriptions>
              <div style="margin-top: 20px;">
                <h4>产品明细</h4>

 src/views/customerService/components/viewDia.vue

@@ -34,8 +34,8 @@
          <el-table-column prop="productCategory" label="产品大类" align="center" />
          <el-table-column prop="specificationModel" label="规格型号" align="center" />
          <el-table-column prop="unit" label="单位" align="center" />
          <el-table-column prop="expressCompany" label="快递公司" align="center" v-if="false" />
          <el-table-column prop="expressNumber" label="快递单号" align="center" v-if="false" />
          <el-table-column prop="expressCompany" label="快递公司" align="center" />
          <el-table-column prop="expressNumber" label="快递单号" align="center" />
          <el-table-column prop="shippingCarNumber" label="发货车牌" align="center" />
          <el-table-column prop="shippingDate" label="发货日期" align="center" />
          <el-table-column prop="quantity" label="售后数量" align="center" />

 src/views/customerService/feedbackRegistration/components/formDia.vue

@@ -235,8 +235,8 @@
      dataType: "slot",
      slot: "shippingStatus",
    },
    // { label: "快递公司", prop: "expressCompany", width: 140 },
    // { label: "快递单号", prop: "expressNumber", width: 160 },
    { label: "快递公司", prop: "expressCompany", width: 140 },
    { label: "快递单号", prop: "expressNumber", width: 160 },
    {
      label: "发货车牌",
      prop: "shippingCarNumber",

 src/views/productionManagement/productionTraceability/index.vue

@@ -235,11 +235,12 @@
                             border>
              <el-descriptions-item label="检测日期">{{ parseTime(record.createTime, '{y}-{m}-{d}') || '-' }}</el-descriptions-item>
              <el-descriptions-item label="报工单号">{{ record.reportNo || '-' }}</el-descriptions-item>
              <el-descriptions-item label="检验员">{{ record.userName || '-' }}</el-descriptions-item>
              <el-descriptions-item label="报工人员">{{ record.userName || '-' }}</el-descriptions-item>
              <el-descriptions-item label="产品名称">{{ record.productName || '-' }}</el-descriptions-item>
              <el-descriptions-item label="规格型号">{{ record.model || '-' }}</el-descriptions-item>
              <el-descriptions-item label="数量">{{ record.quantity || 0 }} {{ record.unit || '-' }}</el-descriptions-item>
              <el-descriptions-item label="检测单位">{{ record.checkCompany || '-' }}</el-descriptions-item>
              <el-descriptions-item label="检验员">{{ record.checkName || '-' }}</el-descriptions-item>
              <el-descriptions-item label="合格率">
                <el-tag :type="getPassRateTagType(record)">
                  {{ getPassRateDisplay(record) }}

 src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue

@@ -5,7 +5,7 @@
    @change="handleChange"
  >
    <el-radio-button :label="1">原材料</el-radio-button>
    <el-radio-button :label="3">半成品</el-radio-button>
    <!-- <el-radio-button :label="3">半成品</el-radio-button> -->
    <el-radio-button :label="2">成品</el-radio-button>
  </el-radio-group>
</template>

 src/views/reportAnalysis/productionAnalysis/components/left-top.vue

@@ -33,7 +33,7 @@
const pieWrapperRef = ref(null)
const pieBackgroundRef = ref(null)

const dateType = ref(1) // 1=周 2=月 3=季度
const dateType = ref(3) // 1=周 2=月 3=季度

function array2obj(array, key) {
  const resObj = {}

 src/views/salesManagement/deliveryLedger/index.vue

@@ -22,7 +22,7 @@
            @change="handleQuery"
          />
        </el-form-item>
        <el-form-item label="快递单号：" >
        <el-form-item label="快递单号：">
          <el-input
            v-model="searchForm.expressNumber"
            placeholder="请输入"
@@ -95,7 +95,6 @@
          label="发货车牌号"
          prop="shippingCarNumber"
          show-overflow-tooltip
          v-if="false"
        />
        <el-table-column
          label="快递公司"
@@ -181,8 +180,8 @@
                style="width: 100%"
                @change="handleShippingTypeChange"
              >
                <el-option label="货车" value="货车" />
                <el-option label="快递" value="快递" />
                <el-option label="货车" value="货车" v-if="false"/>
              </el-select>
            </el-form-item>
          </el-col>
@@ -204,7 +203,7 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="24" v-if="form.type === '货车'">
            <el-form-item label="发货车牌号：" prop="shippingCarNumber" v-if="false">
            <el-form-item label="发货车牌号：" prop="shippingCarNumber">
              <el-input
                v-model="form.shippingCarNumber"
                placeholder="请输入发货车牌号"
@@ -212,7 +211,7 @@
              />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-else-if="false">
          <el-col :span="24" v-else>
            <el-form-item label="快递公司：" prop="expressCompany">
              <el-input
                v-model="form.expressCompany"
@@ -222,7 +221,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30" >
        <el-row :gutter="30" v-if="form.type === '快递'">
          <el-col :span="24">
            <el-form-item label="快递单号：" prop="expressNumber">
              <el-input
@@ -282,13 +281,13 @@
          <el-descriptions-item label="审核状态">{{
            getApprovalStatusText(detailRow.status)
          }}</el-descriptions-item>
          <el-descriptions-item label="发货车牌号" v-if="false">{{
          <el-descriptions-item label="发货车牌号">{{
            detailRow.shippingCarNumber || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="快递公司" >{{
          <el-descriptions-item label="快递公司">{{
            detailRow.expressCompany || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="快递单号" :span="2" >{{
          <el-descriptions-item label="快递单号" :span="2">{{
            detailRow.expressNumber || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="出库单号" :span="2">
@@ -386,7 +385,7 @@
    customerName: "",
    specificationModel: "",
    productName: "",
    type: "快递", // 货车, 快递
    type: "货车", // 货车, 快递
    shippingDate: "",
    shippingCarNumber: "",
    expressCompany: "",
@@ -477,7 +476,7 @@
      id: row.id ?? null,
      salesContractNo: row.salesContractNo ?? "",
      customerName: row.customerName ?? "",
      type: row.type || "快递",
      type: row.type || "货车",
      shippingDate: row.shippingDate || getCurrentDate(),
      shippingCarNumber: row.shippingCarNumber ?? "",
      expressCompany: row.expressCompany ?? "",

 src/views/salesManagement/paymentShipping/index.vue

@@ -239,8 +239,8 @@
          <el-select v-model="logisticsCompany" placeholder="请选择物流公司" style="width: 100%">
            <el-option label="顺丰速运" value="顺丰速运"></el-option>
            <el-option label="圆通速递" value="圆通速递"></el-option>
            <el-option label="中通快递" value="中通快递" v-if="false"></el-option>
            <el-option label="申通快递" value="申通快递" v-if="false"></el-option>
            <el-option label="中通快递" value="中通快递"></el-option>
            <el-option label="申通快递" value="申通快递"></el-option>
            <el-option label="韵达速递" value="韵达速递"></el-option>
          </el-select>
        </el-form-item>

 src/views/salesManagement/salesLedger/index.vue

@@ -129,8 +129,7 @@
                               show-overflow-tooltip />
              <el-table-column label="发货车牌"
                               minWidth="100px"
                               align="center"
                               v-if="false">
                               align="center">
                <template #default="scope">
                  <div>
                    <el-tag type="success"
@@ -714,12 +713,12 @@
            <el-form-item label="是否生产："
                          prop="isProduction">
              <div style="display: flex; align-items: center; width: 100%;">
                <el-radio-group v-model="productForm.isProduction">
                  <el-radio label="是"
                            :value="true" />
                  <el-radio label="否"
                            :value="false" />
                </el-radio-group>
              <el-radio-group v-model="productForm.isProduction">
                <el-radio label="是"
                          :value="true" />
                <el-radio label="否"
                          :value="false" />
              </el-radio-group>
                <div 
                  v-if="currentStock !== null" 
                  :style="{
@@ -823,7 +822,7 @@
                    <span class="label">发货日期：</span>
                    <span class="value">{{ formatDate(item.createTime) }}</span>
                  </div>
                  <div v-if="false">
                  <div>
                    <span class="label">发货车牌号：</span>
                    <span class="value">{{ item.shippingCarNumber }}</span>
                  </div>
@@ -926,11 +925,10 @@
                         placeholder="请选择发货类型"
                         style="width: 100%"
                         @change="handleDeliveryTypeChange">
                <el-option label="货车"
                           value="货车" />
                <el-option label="快递"
                           value="快递" />
                <el-option v-if="false"
                           label="货车"
                           value="货车" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -952,7 +950,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="24"
                  v-else-if="false">
                  v-else>
            <el-form-item label="快递公司："
                          prop="expressCompany">
              <el-input v-model="deliveryForm.expressCompany"
@@ -962,7 +960,7 @@
          </el-col>
        </el-row>
        <el-row :gutter="30"
                >
                v-if="deliveryForm.type === '快递'">
          <el-col :span="24">
            <el-form-item label="快递单号："
                          prop="expressNumber">
@@ -1322,7 +1320,7 @@
      shippingCarNumber: "",
      expressCompany: "",
      expressNumber: "",
      type: "快递", // 货车, 快递
      type: "货车", // 货车, 快递
    },
    deliveryRules: {
      shippingCarNumber: [
@@ -1621,9 +1619,9 @@
      param,
      ["contractAmount", "taxInclusiveTotalPrice", "taxExclusiveTotalPrice"],
      buildAmountSummaryFormat([
        "contractAmount",
        "taxInclusiveTotalPrice",
        "taxExclusiveTotalPrice",
      "contractAmount",
      "taxInclusiveTotalPrice",
      "taxExclusiveTotalPrice",
      ])
    );
  };
@@ -1650,9 +1648,9 @@
    return proxy.summarizeTable(
      param,
      [
        "taxInclusiveUnitPrice",
        "taxInclusiveTotalPrice",
        "taxExclusiveTotalPrice",
      "taxInclusiveUnitPrice",
      "taxInclusiveTotalPrice",
      "taxExclusiveTotalPrice",
      ],
      buildAmountSummaryFormat([
        "taxInclusiveUnitPrice",
@@ -2103,7 +2101,7 @@
        const data = res.data || res;
        companyName = data.companyName || companyName;
        orders.push(data.ledger);
      }
        }
      printSalesMulti(companyName, orders);
    } catch (e) {
      console.error('打印失败:', e);
@@ -2483,7 +2481,7 @@
      shippingCarNumber: "",
      expressCompany: "",
      expressNumber: "",
      type: "快递",
      type: "货车",
      batchNo: [],
      batchNoList,
    };