军泰伟业 1.部署修改

gaoluyang

2026-04-03 3145a4847f8dbd378c932e9bacb0376fd3fe1e54

 src/views/salesManagement/salesLedger/index.vue

@@ -46,6 +46,7 @@
              <el-table-column align="center" label="序号" type="index"/>
              <el-table-column label="产品大类" prop="productCategory" />
              <el-table-column label="图纸编号" prop="specificationModel" />
                     <el-table-column label="物料号" prop="material" />
              <el-table-column label="单位" prop="unit" />
                     <el-table-column label="产品状态"
                                              width="100px"
@@ -111,9 +112,7 @@
        <el-table-column fixed="right" label="操作" width="100" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="openForm('edit', 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>-->
          </template>
        </el-table-column>
      </el-table>
@@ -216,6 +215,7 @@
               <el-table-column align="center" label="序号" type="index" width="60" />
               <el-table-column label="产品大类" prop="productCategory" />
               <el-table-column label="图纸编号" prop="specificationModel" />
               <el-table-column label="物料号" prop="material" />
               <el-table-column label="单位" prop="unit" />
               <el-table-column label="数量" prop="quantity" />
               <el-table-column label="税率(%)" prop="taxRate" />
@@ -323,21 +323,30 @@
         <el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
            <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" filterable style="width: 100%" />
                  <el-form-item label="产品选择：" prop="productSelect">
                     <div style="display: flex; gap: 10px;">
                        <el-input
                           v-model="productForm.productCategory"
                           placeholder="请选择产品"
                           disabled
                           style="flex: 1;"
                        />
                        <el-button type="primary" @click="openProductSelectDialog">选择</el-button>
                     </div>
                  </el-form-item>
               </el-col>
            </el-row>
            <el-row :gutter="30">
               <el-col :span="24">
                  <el-form-item label="图纸编号：" prop="productModelId">
                     <el-select v-model="productForm.productModelId" placeholder="请选择" clearable @change="getProductModel" filterable>
                        <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
                     </el-select>
                  <el-form-item label="图纸编号：" prop="specificationModel">
                     <el-input v-model="productForm.specificationModel" placeholder="请输入图纸编号" disabled />
                  </el-form-item>
               </el-col>
            </el-row>
            <el-row :gutter="30">
               <el-col :span="24">
                  <el-form-item label="物料号：" prop="material">
                     <el-input v-model="productForm.material" placeholder="请输入物料号" clearable />
                  </el-form-item>
               </el-col>
            </el-row>
@@ -563,50 +572,16 @@
         @close="closeDeliveryDia"
      >
         <el-form :model="deliveryForm" label-width="120px" label-position="top" :rules="deliveryRules" ref="deliveryFormRef">
        <!-- 审批人选择（仿协同审批里的审批人节点选择） -->
        <el-row>
          <el-col :span="24">
            <el-form-item>
              <template #label>
                <span>审批人选择：</span>
                <el-button type="primary" @click="addApproverNode" style="margin-left: 8px;">新增节点</el-button>
              </template>
              <div style="display: flex; align-items: flex-end; flex-wrap: wrap;">
                <div
                  v-for="(node, index) in approverNodes"
                  :key="node.id"
                  style="margin-right: 20px; text-align: center; margin-bottom: 10px;"
                >
                  <div>
                    <span>审批人</span>
                    →
                  </div>
                  <el-select
                    v-model="node.userId"
                    placeholder="选择人员"
                    filterable
                    style="width: 140px; margin-bottom: 8px;"
                  >
                    <el-option
                      v-for="user in userList"
                      :key="user.userId"
                      :label="user.nickName"
                      :value="user.userId"
                    />
                  </el-select>
                  <div>
                    <el-button
                      type="danger"
                      size="small"
                      @click="removeApproverNode(index)"
                      v-if="approverNodes.length > 1"
                    >删除</el-button>
                  </div>
                </div>
              </div>
            </el-form-item>
          </el-col>
        </el-row>
            <el-row>
               <el-col :span="24">
                  <el-alert
                     title="确认后将直接发货！"
                     type="warning"
                     :closable="false"
                     show-icon
                  />
               </el-col>
            </el-row>
         </el-form>
         <template #footer>
            <div class="dialog-footer">
@@ -615,6 +590,13 @@
            </div>
         </template>
      </el-dialog>

      <!-- 产品选择对话框 -->
      <ProductSelectDialog
         v-model="productSelectVisible"
         :single="true"
         @confirm="handleProductSelect"
      />
   </div>
</template>

@@ -622,6 +604,7 @@
import { getToken } from "@/utils/auth";
import pagination from "@/components/PIMTable/Pagination.vue";
import {onMounted, ref, getCurrentInstance} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import { addShippingInfo } from "@/api/salesManagement/deliveryLedger.js";
import { ElMessageBox, ElMessage } from "element-plus";
import { UploadFilled, Download } from "@element-plus/icons-vue";
@@ -701,9 +684,11 @@
const productFormVisible = ref(false);
const productOperationType = ref("");
const currentId = ref("");
const productSelectVisible = ref(false);
const productFormData = reactive({
   productForm: {
      productCategory: "",
      material: "",
      specificationModel: "",
      unit: "",
      quantity: "",
@@ -765,16 +750,6 @@
  deliveryRules: {},
});
const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);

// 发货审批人节点（仿协同审批 infoFormDia.vue）
const approverNodes = ref([{ id: 1, userId: null }]);
let nextApproverId = 2;
const addApproverNode = () => {
  approverNodes.value.push({ id: nextApproverId++, userId: null });
};
const removeApproverNode = (index) => {
  approverNodes.value.splice(index, 1);
};

// 导入相关
const importUploadRef = ref(null);
@@ -1111,6 +1086,7 @@
      return {
         // 台账字段
         productCategory: p.product || p.productName || "",
         material: p.material || "",
         specificationModel: p.specification || "",
         unit: p.unit || "",
         quantity: quantity,
@@ -1317,6 +1293,23 @@
   proxy.resetForm("productFormRef");
   productFormVisible.value = false;
};

// 打开产品选择对话框
const openProductSelectDialog = () => {
   productSelectVisible.value = true;
};

// 处理产品选择
const handleProductSelect = (selectedProducts) => {
   if (selectedProducts && selectedProducts.length > 0) {
      const product = selectedProducts[0];
      productForm.value.productCategory = product.productName;
      productForm.value.material = product.material || "";
      productForm.value.specificationModel = product.model;
      productForm.value.unit = product.unit;
   }
};

// 导入
const handleImport = () => {
   importUpload.title = "导入销售台账";
@@ -1964,26 +1957,23 @@
   // 状态是字符串
   const statusStr = String(status).trim();
   
   // 如果状态是"已撤销"，直接返回
   if (statusStr === '已撤销') {
      return '已撤销';
   }
	
   // 如果已发货（有发货日期或车牌号），显示"已发货"
   if (row.shippingDate || row.shippingCarNumber) {
      return '已发货';
   }
	
   const statusTextMap = {
      '待发货': '待发货',
      '待审核': '待审核',
      '审核中': '审核中',
      '发货中': '发货中',
      '审核拒绝': '审核拒绝',
      '审核通过': '审核通过',
      '已发货': '已发货',
      '已撤销': '已撤销'
   };
   return statusTextMap[statusStr] || '待发货';
	
   // 如果状态在映射表中，直接返回对应文本
   if (statusTextMap[statusStr]) {
      return statusTextMap[statusStr];
   }
	
   return '待发货';
};

/**
@@ -2002,16 +1992,6 @@
   // 状态是字符串
   const statusStr = String(status).trim();
   
   // 如果状态是"已撤销"，显示橙色
   if (statusStr === '已撤销') {
      return 'warning';
   }
	
   // 如果已发货（有发货日期或车牌号），显示绿色
   if (row.shippingDate || row.shippingCarNumber) {
      return 'success';
   }
	
   const typeTextMap = {
      '待发货': 'info',
      '待审核': 'info',
@@ -2019,9 +1999,16 @@
      '审核拒绝': 'danger',
      '已撤销': 'warning',
      '审核通过': 'success',
      '已发货': 'success'
      '已发货': 'success',
      '发货中': 'warning'
   };
   return typeTextMap[statusStr] || 'info';
	
   // 如果状态在映射表中，直接返回对应类型
   if (typeTextMap[statusStr]) {
      return typeTextMap[statusStr];
   }
	
   return 'info';
};

/**
@@ -2117,9 +2104,6 @@
  deliveryForm.value = {
    type: "货车",
  };
  // 重置审批人节点（默认一个空节点）
  approverNodes.value = [{ id: 1, userId: null }];
  nextApproverId = 2;
   deliveryFormVisible.value = true;
};

@@ -2127,20 +2111,12 @@
const submitDelivery = () => {
  proxy.$refs["deliveryFormRef"].validate((valid) => {
    if (valid) {
      // 审批人必填校验（所有节点都要选人）
      const hasEmptyApprover = approverNodes.value.some(node => !node.userId);
      if (hasEmptyApprover) {
        proxy.$modal.msgError("请为所有审批节点选择审批人！");
        return;
      }
      const approveUserIds = approverNodes.value.map(node => node.userId).join(",");
      const currentExpandedKeys = [...expandedRowKeys.value];
      const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
      addShippingInfo({
        salesLedgerId: salesLedgerId,
        salesLedgerProductId: currentDeliveryRow.value.id,
        shippingTotal: currentDeliveryRow.value.quantity,
        approveUserIds,
      })
        .then(() => {
          proxy.$modal.msgSuccess("发货成功");