军泰伟业 1.军泰伟业-库存管理增加库位 2.军泰伟业-生产入库要审核，加个入库审核菜单，入库数量，库位，通过不通过

gaoluyang

2026-04-01 01a0dbc37d2df7557f6bab27a8f3f78970b8251e

 src/views/salesManagement/salesLedger/index.vue

@@ -45,7 +45,7 @@
            <el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
              <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="specificationModel" />
              <el-table-column label="单位" prop="unit" />
                     <el-table-column label="产品状态"
                                              width="100px"
@@ -215,7 +215,7 @@
                  :selectable="(row) => !isProductShipped(row)" />
               <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="specificationModel" />
               <el-table-column label="单位" prop="unit" />
               <el-table-column label="数量" prop="quantity" />
               <el-table-column label="税率(%)" prop="taxRate" />
@@ -323,21 +323,23 @@
         <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>
@@ -461,7 +463,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>
                     
@@ -491,7 +493,7 @@
                           <thead>
                           <tr>
                              <th>产品名称</th>
                              <th>规格型号</th>
                              <th>图纸编号</th>
                              <th>单位</th>
                              <th>单价</th>
                              <th>零售数量</th>
@@ -615,6 +617,13 @@
            </div>
         </template>
      </el-dialog>

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

@@ -622,6 +631,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,6 +711,7 @@
const productFormVisible = ref(false);
const productOperationType = ref("");
const currentId = ref("");
const productSelectVisible = ref(false);
const productFormData = reactive({
   productForm: {
      productCategory: "",
@@ -1317,6 +1328,22 @@
   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.specificationModel = product.model;
      productForm.value.unit = product.unit;
   }
};

// 导入
const handleImport = () => {
   importUpload.title = "导入销售台账";
@@ -1613,7 +1640,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>
          
@@ -1639,7 +1666,7 @@
              <thead>
                <tr>
                  <th>产品名称</th>
                  <th>规格型号</th>
                  <th>图纸编号</th>
                  <th>单位</th>
                  <th>单价</th>
                  <th>零售数量</th>
@@ -1964,26 +1991,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 +2026,6 @@
   // 状态是字符串
   const statusStr = String(status).trim();
   
   // 如果状态是"已撤销"，显示橙色
   if (statusStr === '已撤销') {
      return 'warning';
   }
	
   // 如果已发货（有发货日期或车牌号），显示绿色
   if (row.shippingDate || row.shippingCarNumber) {
      return 'success';
   }
	
   const typeTextMap = {
      '待发货': 'info',
      '待审核': 'info',
@@ -2019,9 +2033,16 @@
      '审核拒绝': 'danger',
      '已撤销': 'warning',
      '审核通过': 'success',
      '已发货': 'success'
      '已发货': 'success',
      '发货中': 'warning'
   };
   return typeTextMap[statusStr] || 'info';
	
   // 如果状态在映射表中，直接返回对应类型
   if (typeTextMap[statusStr]) {
      return typeTextMap[statusStr];
   }
	
   return 'info';
};

/**
@@ -2194,19 +2215,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;
}