Merge remote-tracking branch 'origin/dev_天津_阳光印刷' into dev_天津_阳光印刷

gaoluyang

22 小时以前 6b082c28da99f64b1fa1a43e57c429d1cc90d6c5

 src/views/salesManagement/salesLedger/index.vue

@@ -51,7 +51,9 @@
                                              width="100px"
                                              align="center">
                <template #default="scope">
                           <el-tag v-if="scope.row.approveStatus === 1"
               <el-tag v-if="getShippingStatusText(scope.row) === '已发货'"
                                       type="success">已出库</el-tag>
                           <el-tag v-else-if="scope.row.hasSufficientStock"
                                       type="success">充足</el-tag>
                           <el-tag v-else
                                       type="danger">不足</el-tag>
@@ -118,10 +120,11 @@
        <el-table-column label="录入日期" prop="entryDate" width="120" show-overflow-tooltip />
        <el-table-column label="签订日期" prop="executionDate" width="120" show-overflow-tooltip />
        <el-table-column label="交付日期" prop="deliveryDate" width="120" show-overflow-tooltip />
        <el-table-column label="备注" prop="remarks" width="200" show-overflow-tooltip />
        <el-table-column fixed="right" label="操作" min-width="100" align="center">
        <el-table-column label="其它说明事项" prop="remarks" width="200" show-overflow-tooltip />
        <el-table-column fixed="right" label="操作" min-width="200" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="openForm('edit', scope.row)" :disabled="!scope.row.isEdit">编辑</el-button>
         <el-button link type="primary" size="small" @click="exportSalesContracts(scope.row)">导出销售合同</el-button>
<!--            <el-button link type="primary" size="small" @click="openForm('view', scope.row)">详情</el-button>-->
            <el-button link type="primary" size="small" @click="downLoadFile(scope.row)">附件</el-button>
<!--            <el-button link type="primary" size="small" @click="openDeliveryForm(scope.row)">发货</el-button>-->
@@ -150,7 +153,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="业务员：" prop="salesman">
              <el-select v-model="form.salesman" placeholder="请选择" clearable :disabled="operationType === 'view'">
              <el-select v-model="form.salesman" placeholder="请选择" clearable :disabled="operationType === 'view'" filterable>
                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
                  :value="item.nickName" />
              </el-select>
@@ -160,10 +163,10 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="客户名称：" prop="customerId">
              <el-select v-model="form.customerId" placeholder="请选择" clearable :disabled="operationType === 'view'">
              <el-select v-model="form.customerId" placeholder="请选择" clearable :disabled="operationType === 'view'" filterable>
                <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id">
                  {{
                    item.customerName + "——" + item.taxpayerIdentificationNumber
               {{
                    item.customerName
                  }}
                </el-option>
              </el-select>
@@ -213,6 +216,11 @@
                              type="date" placeholder="请选择" clearable />
            </el-form-item>
          </el-col>
        <el-col :span="12">
            <el-form-item label="签订地点：" prop="placeOfSinging">
            <el-input v-model="form.placeOfSinging" placeholder="请输入" clearable :disabled="operationType === 'view'" />
            </el-form-item>
          </el-col>
        </el-row>
            <el-row>
               <el-form-item label="产品信息：" prop="entryDate">
@@ -243,7 +251,7 @@
            </el-table>
            <el-row :gutter="30">
               <el-col :span="24">
                  <el-form-item label="备注：" prop="remarks">
                  <el-form-item label="其它说明事项：" prop="remarks">
                     <el-input v-model="form.remarks" placeholder="请输入" clearable type="textarea" :rows="2" :disabled="operationType === 'view'" />
                  </el-form-item>
               </el-col>
@@ -344,11 +352,8 @@
            <el-row :gutter="30">
               <el-col :span="24">
                  <el-form-item label="产品大类：" prop="productCategory">
                     <!-- <el-select v-model="productForm.productCategory" placeholder="请选择" clearable>
                        <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
                     </el-select> -->
                     <el-tree-select v-model="productForm.productCategory" placeholder="请选择" clearable check-strictly
                                             @change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
                     <el-tree-select v-model="productForm.productCategory" placeholder="请选择" clearable filterable check-strictly
                                     @change="getModels" :data="productOptions" :render-after-expand="false" style="width: 100%" />
                  </el-form-item>
               </el-col>
            </el-row>
@@ -481,7 +486,7 @@
               <div v-for="(item, index) in printData" :key="index" class="print-page">
                  <div class="delivery-note">
                     <div class="header">
                        <div class="company-name">鼎诚瑞实业有限责任公司</div>
                        <div class="company-name">阳光印刷有限责任公司</div>
                        <div class="document-title">零售发货单</div>
                     </div>
                     
@@ -499,7 +504,7 @@
                        <div class="info-row">
                           <div>
                              <span class="label">客户名称：</span>
                              <span class="value">{{ item.customerName || '张爱有' }}</span>
                              <span class="value">{{ item.customerName }}</span>
                           </div>
                           <span class="label">单号：</span>
                           <span class="value">{{ item.salesContractNo }}</span>
@@ -675,11 +680,13 @@
   addOrUpdateSalesLedgerProduct,
   delProduct,
   delLedgerFile, getProductInventory,
   exportSalesContract
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import useFormData from "@/hooks/useFormData.js";
import dayjs from "dayjs";
import { getCurrentDate } from "@/utils/index.js";
import {listCustomerPrivatePool} from "@/api/basicData/customerFile.js";

const userStore = useUserStore();
const { proxy } = getCurrentInstance();
@@ -728,6 +735,7 @@
      entryDate: [{ required: true, message: "请选择", trigger: "change" }],
    deliveryDate: [{ required: true, message: "请选择", trigger: "change" }],
      executionDate: [{ required: true, message: "请选择", trigger: "change" }],
      placeOfSinging: [{ required: true, message: "请输入", trigger: "blur" }],
   },
});
const { form, rules } = toRefs(data);
@@ -1052,14 +1060,18 @@
};
// 打开弹框
const openForm = async (type, row) => {
   if (type === "edit" && row && !canEditLedger(row)) {
      proxy.$modal.msgWarning("当前系统登录人不是维护人，不能编辑数据");
      return;
   }
   operationType.value = type;
   form.value = {};
   productData.value = [];
   selectedQuotation.value = null;
   let userLists = await userListNoPage();
   userList.value = userLists.data;
   customerList().then((res) => {
      customerOption.value = res;
   listCustomerPrivatePool({current: -1,size:-1}).then((res) => {
      customerOption.value = res.data.records;
   });
   form.value.entryPerson = userStore.id;
   if (type === "add") {
@@ -1095,8 +1107,9 @@
   // 先确保客户列表已加载，便于后续回填 customerId
   if (!customerOption.value || customerOption.value.length === 0) {
      try {
         const res = await customerList();
         customerOption.value = res;
         listCustomerPrivatePool({current: -1,size:-1}).then((res) => {
            customerOption.value = res.data.records;
         });
      } catch (e) {
         // ignore，允许用户后续手动选择客户
      }
@@ -1240,6 +1253,7 @@
         addOrUpdateSalesLedger(form.value).then((res) => {
            proxy.$modal.msgSuccess("提交成功");
            closeDia();
            expandedRowKeys.value = [];
            getList();
         });
      }
@@ -1411,6 +1425,7 @@
/** 判断单个产品是否已发货（根据shippingStatus判断，已发货或审核通过不可编辑和删除） */
const isProductShipped = (product) => {
   if (!product) return false;
	
   const status = String(product.shippingStatus || "").trim();
   // 如果发货状态是"已发货"或"审核通过"，则不可编辑和删除
   return status === "已发货" || status === "审核通过";
@@ -1432,6 +1447,11 @@
const handleDelete = async () => {
   if (selectedRows.value.length === 0) {
      proxy.$modal.msgWarning("请选择数据");
      return;
   }
   const unauthorizedRows = selectedRows.value.filter((row) => !canDeleteLedger(row));
   if (unauthorizedRows.length > 0) {
      proxy.$modal.msgWarning("当前登录用户不是录入人，不能删除该数据");
      return;
   }
   const ids = selectedRows.value.map((item) => item.id);
@@ -1670,7 +1690,7 @@
      <div class="print-page">
        <div class="delivery-note">
          <div class="header">
            <div class="company-name">鼎诚瑞实业有限责任公司</div>
            <div class="company-name">阳光彩印有限责任公司</div>
            <div class="document-title">零售发货单</div>
          </div>
          
@@ -2073,8 +2093,8 @@
 * @param row 行数据
 */
const canShip = (row) => {
   // 产品状态必须是充足（approveStatus === 1）
   if (row.approveStatus !== 1) {
   // 产品状态必须是充足（基于 hasSufficientStock 判断）
   if (!row || !row.hasSufficientStock) {
      return false;
   }
   
@@ -2090,6 +2110,34 @@
   const statusStr = shippingStatus ? String(shippingStatus).trim() : '';
   return statusStr === '待发货' || statusStr === '审核拒绝';
};

/**
 * 导出销售合同
 *
 * @param row 导出销售合同的相关信息对象
 */
const exportSalesContracts = (row) => {
   exportSalesContract({ id: row.id }).then((res) => {
      if (res) {
         const downloadUrl = window.URL.createObjectURL(res);
      const link = document.createElement('a');
      link.href = downloadUrl;
     console.log(row.executionDate)
      link.download = row.projectName+row.executionDate + "销售合同.docx"; // 设置下载文件名
      link.style.display = 'none'; // 隐藏a标签
      document.body.appendChild(link);
      link.click(); // 触发点击下载
      // 4. 清理资源（避免内存泄漏）
      document.body.removeChild(link);
      window.URL.revokeObjectURL(downloadUrl);

      // 5. 提示导出成功
      proxy.$modal.msgSuccess("导出销售合同成功");
      } else {
         proxy.$modal.msgError(res.msg || "导出销售合同失败");
      }
   });
}

/**
 * 下载文件
@@ -2196,19 +2244,19 @@
   margin-left: 10px;
}

::v-deep .yellow {
:deep(.yellow) {
  background-color: #FAF0DE;
}

::v-deep .pink {
:deep(.pink) {
  background-color: #FAE1DE;
}

::v-deep .red {
:deep(.red) {
  background-color: #FAE1DE;
}

::v-deep .purple{
:deep(.purple){
  background-color: #F4DEFA;
}