Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
已修改2个文件
94 ■■■■ 文件已修改
src/views/procurementManagement/procurementLedger/index.vue 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue
@@ -33,6 +33,20 @@
                      prefix-icon="Search"
                      @change="handleQuery" />
          </el-form-item>
          <el-form-item label="入库状态:">
            <el-select v-model="searchForm.stockStatus"
                       placeholder="请选择"
                       clearable
                       style="width: 140px"
                       @change="handleQuery">
              <el-option label="未入库"
                         :value="0" />
              <el-option label="部分入库"
                         :value="1" />
              <el-option label="已入库"
                         :value="2" />
            </el-select>
          </el-form-item>
          <el-form-item label="录入日期:">
            <el-date-picker v-model="searchForm.entryDate"
                            value-format="YYYY-MM-DD"
@@ -96,6 +110,16 @@
                               prop="availableQuality" />
              <el-table-column label="退货数量"
                               prop="returnQuality" />
              <el-table-column label="入库状态"
                               width="100px"
                               align="center">
                <template #default="scope">
                  <el-tag :type="getProductStockStatusType(scope.row.productStockStatus)"
                          size="small">
                    {{ stockStatusText[scope.row.productStockStatus] || '未入库' }}
                  </el-tag>
                </template>
              </el-table-column>
              <el-table-column label="税率(%)"
                               prop="taxRate" />
              <el-table-column label="含税单价(元)"
@@ -154,6 +178,16 @@
                         width="200"
                         show-overflow-tooltip
                         :formatter="formattedNumber" />
        <el-table-column label="入库状态"
                         width="120"
                         align="center">
          <template #default="scope">
            <el-tag :type="getStockStatusType(scope.row.stockStatus)"
                    size="small">
              {{ stockStatusText[scope.row.stockStatus] || '未入库' }}
            </el-tag>
          </template>
        </el-table-column>
        <el-table-column label="录入人"
                         prop="recorderName"
                         width="120"
@@ -808,6 +842,33 @@
    return typeMap[status] || "";
  };
  // 入库状态显示文本
  const stockStatusText = {
    0: "未入库",
    1: "部分入库",
    2: "已入库",
  };
  // 获取主表入库状态标签类型
  const getStockStatusType = status => {
    const typeMap = {
      0: "info",
      1: "success",
      2: "success",
    };
    return typeMap[status] || "info";
  };
  // 获取产品入库状态标签类型
  const getProductStockStatusType = status => {
    const typeMap = {
      0: "info",
      1: "warning",
      2: "success",
    };
    return typeMap[status] || "info";
  };
  const templateName = ref("");
  const filterInputValue = ref("");
  const templateList = ref([]);
@@ -919,6 +980,7 @@
      purchaseContractNumber: "", // 采购合同编号
      salesContractNo: "", // 销售合同编号
      projectName: "", // 项目名称
      stockStatus: undefined, // 入库状态
      entryDate: null, // 录入日期
      entryDateStart: undefined,
      entryDateEnd: undefined,
src/views/salesManagement/salesLedger/index.vue
@@ -225,9 +225,9 @@
                  <el-tag v-else-if="scope.row.productStockStatus == 2"
                          type="success">已入库</el-tag>
                  <el-tag v-else-if="scope.row.productStockStatus == 0"
                          type="info">未出库</el-tag>
                          type="info">未入库</el-tag>
                  <el-tag v-else
                          type="danger">不足</el-tag>
                          type="danger">未入库</el-tag>
                </template>
              </el-table-column>
              <!-- <el-table-column label="发货状态" width="140" align="center">
@@ -666,12 +666,12 @@
                               v-model="scope.row.settlePieceArea"
                               :min="0"
                               :step="1"
                               :precision="10"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable
                               @change="() => handleInlineSettleAreaChange(scope.row)" />
              <span v-else>{{ scope.row.settlePieceArea ?? "" }}</span>
              <span v-else>{{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}</span>
            </template>
          </el-table-column>
          <el-table-column label="数量"
@@ -701,10 +701,10 @@
                               v-model="scope.row.actualTotalArea"
                               :min="0"
                               :step="1"
                               :precision="10"
                               :precision="4"
                               style="width: 100%"
                               placeholder="自动计算" />
              <span v-else>{{ scope.row.actualTotalArea ?? "" }}</span>
              <span v-else>{{ scope.row.actualTotalArea ? Number(scope.row.actualTotalArea).toFixed(4) : "" }}</span>
            </template>
          </el-table-column>
          <el-table-column label="含税单价(元)"
@@ -1341,8 +1341,8 @@
                          prop="actualPieceArea">
              <el-input-number v-model="productForm.actualPieceArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable
@@ -1354,8 +1354,8 @@
                          prop="actualTotalArea">
              <el-input-number v-model="productForm.actualTotalArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable />
@@ -1366,8 +1366,8 @@
                          prop="settlePieceArea">
              <el-input-number v-model="productForm.settlePieceArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable
@@ -1379,8 +1379,8 @@
                          prop="settleTotalArea">
              <el-input-number v-model="productForm.settleTotalArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable />
@@ -1391,8 +1391,8 @@
                          prop="settleTotalArea">
              <el-input-number v-model="productForm.settleTotalArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable />