Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

spring

12 小时以前 fd1ab35c60963b4619be680fb7671c85c6ed0dad

 src/views/salesManagement/salesLedger/index.vue

@@ -6,10 +6,6 @@
          <el-input v-model="searchForm.customerName" placeholder="请输入" clearable prefix-icon="Search"
            @change="handleQuery" />
        </el-form-item>
        <el-form-item label="客户合同号：">
          <el-input v-model="searchForm.customerContractNo" placeholder="请输入" clearable prefix-icon="Search"
            @change="handleQuery" />
        </el-form-item>
        <el-form-item label="销售合同号：">
          <el-input v-model="searchForm.salesContractNo" placeholder="请输入" clearable prefix-icon="Search"
            @change="handleQuery" />
@@ -34,6 +30,7 @@
          <el-button type="primary" @click="openForm('add')">
            新增台账
          </el-button>
          <el-button type="primary" plain @click="handleImport">导入</el-button>
          <el-button @click="handleOut">导出</el-button>
          <el-button type="danger" plain @click="handleDelete">删除</el-button>
          <el-button type="primary" plain @click="handlePrint">打印</el-button>
@@ -53,35 +50,41 @@
                     <el-table-column label="产品状态"
                                              width="100px"
                                              align="center">
                        <template #default="scope">
                <template #default="scope">
                           <el-tag v-if="scope.row.approveStatus === 1"
                                       type="success">充足</el-tag>
                           <el-tag v-else
                                       type="danger">不足</el-tag>
                </template>
              </el-table-column>
                     <el-table-column label="发货状态" width="140" align="center">
                        <template #default="scope">
                           <el-tag :type="getShippingStatusType(scope.row)" size="small">
                              {{ getShippingStatusText(scope.row) }}
                           </el-tag>
                        </template>
                     </el-table-column>
                     <el-table-column label="发货状态" prop="shippingStatus" width="140" align="center" show-overflow-tooltip />
                     <el-table-column label="快递公司" prop="expressCompany" show-overflow-tooltip />
                     <el-table-column label="快递单号" prop="expressNumber" show-overflow-tooltip />
              <el-table-column label="发货车牌" minWidth="100px" align="center">
                <template #default="scope">
                  <div>
                    <el-tag type="success" v-if="scope.row.shippingCarNumber">{{ scope.row.shippingCarNumber }}</el-tag>
                    <el-tag v-else type="info">未发货</el-tag>
                    <el-tag v-else type="info">-</el-tag>
                  </div>
                </template>
              </el-table-column>
                     <el-table-column label="发货日期"
                                              minWidth="100px"
                                              align="center">
                        <template #default="scope">
                           <div>
                              <div v-if="scope.row.shippingDate">{{ scope.row.shippingDate }}</div>
                <template #default="scope">
                  <div>
                    <div v-if="scope.row.shippingDate">{{ scope.row.shippingDate }}</div>
                              <el-tag v-else
                                          type="info">-</el-tag>
                           </div>
                        </template>
                     </el-table-column>
                  </div>
                </template>
              </el-table-column>
              <el-table-column label="数量" prop="quantity" />
              <el-table-column label="税率(%)" prop="taxRate" />
              <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
@@ -93,8 +96,8 @@
                  <el-button 
                    link 
                    type="primary" 
                    size="small" 
                    :disabled="scope.row.approveStatus !== 1 || !!scope.row.shippingDate || !!scope.row.shippingCarNumber"
                    size="small"
                    :disabled="!canShip(scope.row)"
                    @click="openDeliveryForm(scope.row)">
                    发货
                  </el-button>
@@ -105,7 +108,6 @@
        </el-table-column>
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column label="销售合同号" prop="salesContractNo" width="180" show-overflow-tooltip />
        <el-table-column label="客户合同号" prop="customerContractNo" width="180" show-overflow-tooltip />
        <el-table-column label="客户名称" prop="customerName" width="300" show-overflow-tooltip />
        <el-table-column label="业务员" prop="salesman" width="100" show-overflow-tooltip />
        <el-table-column label="项目名称" prop="projectName" width="180" show-overflow-tooltip />
@@ -147,11 +149,6 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="客户合同号：" prop="customerContractNo">
              <el-input v-model="form.customerContractNo" placeholder="请输入" clearable :disabled="operationType === 'view'"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="客户名称：" prop="customerId">
              <el-select v-model="form.customerId" placeholder="请选择" clearable :disabled="operationType === 'view'">
                <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id">
@@ -162,17 +159,22 @@
              </el-select>
            </el-form-item>
          </el-col>
               <el-col :span="12">
                  <el-form-item label="项目名称：" prop="projectName">
                     <el-input v-model="form.projectName" placeholder="请输入" clearable :disabled="operationType === 'view'" />
                  </el-form-item>
               </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input v-model="form.projectName" placeholder="请输入" clearable :disabled="operationType === 'view'" />
            </el-form-item>
          </el-col>
               <el-col :span="12">
                  <el-form-item label="签订日期：" prop="executionDate">
                     <el-date-picker style="width: 100%" v-model="form.executionDate" value-format="YYYY-MM-DD"
                                             format="YYYY-MM-DD" type="date" placeholder="请选择" clearable :disabled="operationType === 'view'" />
                  </el-form-item>
               </el-col>
               <el-col :span="12">
                  <el-form-item label="付款方式">
                     <el-input v-model="form.paymentMethod" placeholder="请输入" clearable :disabled="operationType === 'view'" />
                  </el-form-item>
               </el-col>
            </el-row>
@@ -194,7 +196,6 @@
                  </el-form-item>
               </el-col>
            </el-row>
				
            <el-row>
               <el-form-item label="产品信息：" prop="entryDate">
                  <el-button v-if="operationType !== 'view'" type="primary" @click="openProductForm('add')">添加</el-button>
@@ -385,6 +386,41 @@
               </el-col>
            </el-row>
         </el-form>
      </FormDialog>
      <!-- 导入弹窗 -->
      <FormDialog
         v-model="importUpload.open"
         :title="importUpload.title"
         :width="'600px'"
         @close="importUpload.open = false"
         @confirm="submitImportFile"
         @cancel="importUpload.open = false"
      >
         <el-upload
            ref="importUploadRef"
            :limit="1"
            accept=".xlsx,.xls"
            :action="importUpload.url"
            :headers="importUpload.headers"
            :before-upload="importUpload.beforeUpload"
            :on-success="importUpload.onSuccess"
            :on-error="importUpload.onError"
            :on-progress="importUpload.onProgress"
            :on-change="importUpload.onChange"
            :auto-upload="false"
            drag
         >
            <i class="el-icon-upload"></i>
            <div class="el-upload__text">
               将文件拖到此处，或<em>点击上传</em>
            </div>
            <template #tip>
               <div class="el-upload__tip">
                  仅支持 xls/xlsx，大小不超过 10MB。
                  <el-button link type="primary" @click="downloadTemplate">下载导入模板</el-button>
               </div>
            </template>
         </el-upload>
      </FormDialog>
      <!-- 附件列表弹窗 -->
      <FileListDialog
@@ -1175,6 +1211,8 @@
         // 加载失败时保持可编辑，不中断弹窗
         console.error("加载产品规格型号失败", e);
      }
   } else {
      getProductOptions()
   }
   productFormVisible.value = true;
};
@@ -1844,6 +1882,92 @@
   isCalculating.value = false;
};
/**
 * 获取发货状态文本
 * @param row 行数据
 */
const getShippingStatusText = (row) => {
   // 如果已发货（有发货日期或车牌号），显示"已发货"
   if (row.shippingDate || row.shippingCarNumber) {
      return '已发货';
   }
	
   // 获取发货状态字段
   const status = row.shippingStatus;
	
   // 如果状态为空或未定义，默认为"待发货"
   if (status === null || status === undefined || status === '') {
      return '待发货';
   }
	
   // 状态是字符串
   const statusStr = String(status).trim();
   const statusTextMap = {
      '待发货': '待发货',
      '待审核': '待审核',
      '审核中': '审核中',
      '审核拒绝': '审核拒绝',
      '审核通过': '审核通过',
      '已发货': '已发货'
   };
   return statusTextMap[statusStr] || '待发货';
};

/**
 * 获取发货状态标签类型（颜色）
 * @param row 行数据
 */
const getShippingStatusType = (row) => {
   // 如果已发货（有发货日期或车牌号），显示绿色
   if (row.shippingDate || row.shippingCarNumber) {
      return 'success';
   }
	
   // 获取发货状态字段
   const status = row.shippingStatus;
	
   // 如果状态为空或未定义，默认为灰色（待发货）
   if (status === null || status === undefined || status === '') {
      return 'info';
   }
	
   // 状态是字符串
   const statusStr = String(status).trim();
   const typeTextMap = {
      '待发货': 'info',
      '待审核': 'info',
      '审核中': 'warning',
      '审核拒绝': 'danger',
      '审核通过': 'success',
      '已发货': 'success'
   };
   return typeTextMap[statusStr] || 'info';
};

/**
 * 判断是否可以发货
 * 只有在产品状态是充足，发货状态是待发货和审核拒绝的时候才可以发货
 * @param row 行数据
 */
const canShip = (row) => {
   // 产品状态必须是充足（approveStatus === 1）
   if (row.approveStatus !== 1) {
      return false;
   }
	
   // 获取发货状态
   const shippingStatus = row.shippingStatus;
	
   // 如果已发货（有发货日期或车牌号），不能再次发货
   if (row.shippingDate || row.shippingCarNumber) {
      return false;
   }
	
   // 发货状态必须是"待发货"或"审核拒绝"
   const statusStr = shippingStatus ? String(shippingStatus).trim() : '';
   return statusStr === '待发货' || statusStr === '审核拒绝';
};

/**
 * 下载文件
 *
 * @param row 下载文件的相关信息对象
@@ -1860,15 +1984,12 @@

// 打开发货弹框
const openDeliveryForm = (row) => {
   // 校验：只有产品状态为充足且未发货时才能发货
   if (row.approveStatus !== 1) {
      proxy.$modal.msgWarning("产品状态不足，无法发货");
   // 检查是否可以发货
   if (!canShip(row)) {
      proxy.$modal.msgWarning("只有在产品状态是充足，发货状态是待发货或审核拒绝的时候才可以发货");
      return;
   }
   if (row.shippingDate || row.shippingCarNumber) {
      proxy.$modal.msgWarning("该产品已发货，无法重复发货");
      return;
   }
	
   currentDeliveryRow.value = row;
  deliveryForm.value = {
    type: "货车",