Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inven...

zhangwencui

2026-04-17 8f858825a5001ce2f4d0a6fb1e4a089e6748a8e4

 src/views/salesManagement/salesLedger/index.vue

@@ -461,9 +461,7 @@
                           :key="item.id"
                           :label="item.customerName"
                           :value="item.id">
                  {{
                    item.customerName + "——" + item.taxpayerIdentificationNumber
                  }}
{{ item.customerName + (item.taxpayerIdentificationNumber ? "——" + item.taxpayerIdentificationNumber : "") }}
                </el-option>
              </el-select>
            </el-form-item>
@@ -585,7 +583,7 @@
          </el-table-column>
          <el-table-column label="规格型号"
                           prop="specificationModel"
                           min-width="160">
                           min-width="200">
            <template #default="scope">
              <el-select v-if="scope.row.__editing"
                         v-model="scope.row.productModelId"
@@ -607,10 +605,11 @@
                           min-width="160">
            <template #default="scope">
              <el-input-number v-if="scope.row.__editing"
                               controls-position="right"
                               v-model="scope.row.thickness"
                               :min="0"
                               :step="0.000000000000001"
                               :precision="15"
                               :step="1"
                               :precision="2"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable />
@@ -622,6 +621,7 @@
                           min-width="160">
            <template #default="scope">
              <el-input-number v-if="scope.row.__editing"
                               controls-position="right"
                               v-model="scope.row.width"
                               :min="0"
                               :step="1"
@@ -639,6 +639,7 @@
                           min-width="160">
            <template #default="scope">
              <el-input-number v-if="scope.row.__editing"
                               controls-position="right"
                               v-model="scope.row.height"
                               :min="0"
                               :step="1"
@@ -653,13 +654,14 @@
          </el-table-column>
          <el-table-column label="结算单片面积(㎡)"
                           prop="settlePieceArea"
                           min-width="160">
                           min-width="200">
            <template #default="scope">
              <el-input-number v-if="scope.row.__editing"
                               controls-position="right"
                               v-model="scope.row.settlePieceArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="1"
                               :precision="10"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable
@@ -672,10 +674,11 @@
                           min-width="150">
            <template #default="scope">
              <el-input-number v-if="scope.row.__editing"
                               controls-position="right"
                               v-model="scope.row.quantity"
                               :step="0.1"
                               :step="1"
                               :min="0"
                               :precision="2"
                               :precision="0"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable
@@ -686,13 +689,14 @@
          </el-table-column>
          <el-table-column label="面积(m²)"
                           prop="actualTotalArea"
                           min-width="160">
                           min-width="200">
            <template #default="scope">
              <el-input-number v-if="scope.row.__editing"
                               controls-position="right"
                               v-model="scope.row.actualTotalArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="1"
                               :precision="10"
                               style="width: 100%"
                               placeholder="自动计算" />
              <span v-else>{{ scope.row.actualTotalArea ?? "" }}</span>
@@ -700,7 +704,7 @@
          </el-table-column>
          <el-table-column label="含税单价(元)"
                           prop="taxInclusiveUnitPrice"
                           min-width="140">
                           min-width="160">
            <template #default="scope">
              <el-input-number v-if="scope.row.__editing"
                               :step="0.01"
@@ -792,7 +796,7 @@
          </el-table-column>
          <el-table-column label="楼层编号"
                           prop="floorCode"
                           min-width="140"
                           min-width="250"
                           show-overflow-tooltip>
            <template #default="scope">
              <el-input v-if="scope.row.__editing"
@@ -1525,9 +1529,9 @@
    <FormDialog v-model="importUpload.open"
                :title="importUpload.title"
                :width="'600px'"
                @close="importUpload.open = false"
                @close="onClose"
                @confirm="submitImportFile"
                @cancel="importUpload.open = false">
                @cancel="onClose">
      <el-upload ref="importUploadRef"
                 :limit="1"
                 accept=".xlsx,.xls"
@@ -3459,6 +3463,12 @@
  const downloadTemplate = () => {
    proxy.download("/sales/ledger/exportTemplate", {}, "销售台账导入模板.xlsx");
  };
  const onClose = () => {
    importUpload.open = false;
    if (importUploadRef.value) {
      importUploadRef.value.clearFiles();
    }
  };

  // 提交导入文件
  const submitImportFile = () => {
@@ -4052,7 +4062,7 @@
    const isTrue = true;
    selectedRows.value.forEach(row => {
      if (row.deliveryStatus != 1 && row.deliveryStatus != 3) {
        proxy.$modal.msgWarning("仅未发货或审批失败的台账可以合并发货");
        proxy.$modal.msgWarning("仅未发货或审批失败的台账可以发货");
        isTrue = false;
        return;
      }