Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-m...

spring

2026-03-19 783ea9ce91f352267d7c9f3c0cedf511ab9ad994

Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG

 src/views/consumablesLogistics/dispatchLog/Record.vue

@@ -12,16 +12,16 @@
                    clearable
                    @change="handleQuery"
                />
        <span class="search_title ml10">来源：</span>
        <el-select v-model="searchForm.recordType"
                   style="width: 240px"
                   placeholder="请选择"
                   clearable>
          <el-option v-for="item in stockRecordTypeOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"/>
        </el-select>
<!--        <span class="search_title ml10">来源：</span>-->
<!--        <el-select v-model="searchForm.recordType"-->
<!--                   style="width: 240px"-->
<!--                   placeholder="请选择"-->
<!--                   clearable>-->
<!--          <el-option v-for="item in stockRecordTypeOptions"-->
<!--                     :key="item.value"-->
<!--                     :label="item.label"-->
<!--                     :value="item.value"/>-->
<!--        </el-select>-->
                <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
                >搜索</el-button
                >
@@ -86,13 +86,13 @@
                    prop="createBy"
                    show-overflow-tooltip
                />
        <el-table-column label="来源"
        <!-- <el-table-column label="来源"
                         prop="recordType"
                         show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column
            label="车牌"
            prop="licensePlateNo"

 src/views/consumablesLogistics/dispatchLog/index.vue

@@ -22,11 +22,6 @@
      label: '合格出库',
      name: 'qualified',
      type: '0'
    },
    {
      label: '不合格出库',
      name: 'unqualified',
      type: '1'
    }
  ]
})

 src/views/consumablesLogistics/receiptManagement/Record.vue

@@ -15,16 +15,16 @@
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
        <span class="search_title ml10">来源：</span>
        <el-select v-model="searchForm.recordType"
                  style="width: 240px"
                  placeholder="请选择"
                  clearable>
          <el-option v-for="item in stockRecordTypeOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"/>
        </el-select>
<!--        <span class="search_title ml10">来源：</span>-->
<!--        <el-select v-model="searchForm.recordType"-->
<!--                  style="width: 240px"-->
<!--                  placeholder="请选择"-->
<!--                  clearable>-->
<!--          <el-option v-for="item in stockRecordTypeOptions"-->
<!--                     :key="item.value"-->
<!--                     :label="item.label"-->
<!--                     :value="item.value"/>-->
<!--        </el-select>-->
        <el-button type="primary"
                   @click="handleQuery"
                   style="margin-left: 10px">搜索
@@ -92,13 +92,13 @@
        <el-table-column label="入库人"
                         prop="createBy"
                         show-overflow-tooltip/>
        <el-table-column label="来源"
        <!-- <el-table-column label="来源"
                         prop="recordType"
                         show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column label="过磅日期"
                         prop="weighingDate"
                         v-if="type === '0'"

 src/views/consumablesLogistics/receiptManagement/index.vue

@@ -21,11 +21,6 @@
    label: '合格入库',
    name: 'qualified',
    type: '0'
  },
  {
    label: '不合格入库',
    name: 'unqualified',
    type: '1'
  }
])


 src/views/consumablesLogistics/stockManagement/index.vue

@@ -20,10 +20,6 @@
  {
    label: '合格库存',
    name: 'qualified'
  },
  {
    label: '不合格库存',
    name: 'unqualified'
  }
])


 src/views/inventoryManagement/dispatchLog/index.vue

@@ -22,11 +22,6 @@
      label: '合格出库',
      name: 'qualified',
      type: '0'
    },
    {
      label: '不合格出库',
      name: 'unqualified',
      type: '1'
    }
  ]
})

 src/views/inventoryManagement/receiptManagement/index.vue

@@ -21,11 +21,6 @@
    label: '合格入库',
    name: 'qualified',
    type: '0'
  },
  {
    label: '不合格入库',
    name: 'unqualified',
    type: '1'
  }
])


 src/views/inventoryManagement/stockManagement/index.vue

@@ -20,10 +20,6 @@
  {
    label: '合格库存',
    name: 'qualified'
  },
  {
    label: '不合格库存',
    name: 'unqualified'
  }
])


 src/views/qualityManagement/nonconformingManagement/index.vue

@@ -90,21 +90,21 @@
    width: 120
  },
  {
    label: "类别",
    label: "检测类型",
    prop: "checkType",
    dataType: "tag",
    width: 120,
    formatData: (params) => {
      if (params == 0) {
      if (params === 0) {
        return "入厂检";
      } else if (params == 1) {
      } else if (params === 1) {
        return "车间检";
      } else {
        return '出厂检';
      }
    },
    formatType: (params) => {
      if (params == '不合格') {
      if (params === '不合格') {
        return "info";
      } else if (params == '合格') {
        return "success";

 src/views/reportAnalysis/reportManagement/index.vue

@@ -17,7 +17,7 @@
                <div class="typeNum-left">
                  <img src="~@/assets/images/chartCard.svg" alt="图表"
                    style="width: 40px; height: 40px; object-fit: contain;">
                  <div class="typeNum-left-text">原材料</div>
                  <div class="typeNum-left-text">入厂检</div>
                </div>
                <div class="typeNum-center">
                  <div class="typeNum-leftLine">-</div>
@@ -41,7 +41,7 @@
                <div class="typeNum-left">
                  <img src="~@/assets/images/chartCard2.svg" alt="图表"
                    style="width: 40px; height: 40px; object-fit: contain;">
                  <div class="typeNum-left-text" style="color: #5EB334;">半成品</div>
                  <div class="typeNum-left-text" style="color: #5EB334;">车间检</div>
                </div>
                <div class="typeNum-center">
                  <div class="typeNum-leftLine2">-</div>
@@ -65,7 +65,7 @@
                <div class="typeNum-left">
                  <img src="~@/assets/images/chartCard3.svg" alt="图表"
                    style="width: 40px; height: 40px; object-fit: contain;">
                  <div class="typeNum-left-text" style="color: #8000FF;">成品</div>
                  <div class="typeNum-left-text" style="color: #8000FF;">出厂检</div>
                </div>
                <div class="typeNum-center">
                  <div class="typeNum-leftLine3">-</div>
@@ -100,9 +100,9 @@
            <div class="top-container flex-center">
              <div class="quality-card blue-card">
                <div class="quality-card-title">
                  <img src="~@/assets/images/chartCard.svg" alt="原材料"
                  <img src="~@/assets/images/chartCard.svg" alt="入厂检"
                    style="width: 24px; height: 24px; margin-right: 8px;">
                  原材料合格率
                  入厂检合格率
                </div>
                <div class="quality-card-content">
                  <div class="quality-item">
@@ -125,9 +125,9 @@
              </div>
              <div class="quality-card green-card">
                <div class="quality-card-title">
                  <img src="~@/assets/images/chartCard2.svg" alt="半成品"
                  <img src="~@/assets/images/chartCard2.svg" alt="车间检"
                    style="width: 24px; height: 24px; margin-right: 8px;">
                  半成品合格率
                  车间检合格率
                </div>
                <div class="quality-card-content">
                  <div class="quality-item">
@@ -150,9 +150,9 @@
              </div>
              <div class="quality-card purple-card">
                <div class="quality-card-title">
                  <img src="~@/assets/images/chartCard3.svg" alt="成品"
                  <img src="~@/assets/images/chartCard3.svg" alt="出厂检"
                    style="width: 24px; height: 24px; margin-right: 8px;">
                  成品合格率
                  出厂检合格率
                </div>
                <div class="quality-card-content">
                  <div class="quality-item">
@@ -199,15 +199,15 @@
                </div>
                <div class="container-line-right-bottom">
                  <div class="inspection-chart-box">
                    <div class="chart-box-title">原材料总数</div>
                    <div class="chart-box-title">入厂检总数</div>
                    <div class="chart-box-num">{{ getYearlyStatValue(0, 'totalCount') }}</div>
                  </div>
                  <div class="inspection-chart-box">
                    <div class="chart-box-title">半成品总数</div>
                    <div class="chart-box-title">车间检总数</div>
                    <div class="chart-box-num">{{ getYearlyStatValue(1, 'totalCount') }}</div>
                  </div>
                  <div class="inspection-chart-box">
                    <div class="chart-box-title">成品总数</div>
                    <div class="chart-box-title">出厂检总数</div>
                    <div class="chart-box-num">{{ getYearlyStatValue(2, 'totalCount') }}</div>
                  </div>
                </div>
@@ -265,9 +265,9 @@
            </div>
            <!-- Tab 选择器 -->
            <div class="tab-selector">
              <div class="tab-item" :class="{ active: activeTab === 'raw' }" @click="activeTab = 'raw'">原材料</div>
              <div class="tab-item" :class="{ active: activeTab === 'semi' }" @click="activeTab = 'semi'">半成品</div>
              <div class="tab-item" :class="{ active: activeTab === 'final' }" @click="activeTab = 'final'">成品</div>
              <div class="tab-item" :class="{ active: activeTab === 'raw' }" @click="activeTab = 'raw'">入厂检</div>
              <div class="tab-item" :class="{ active: activeTab === 'semi' }" @click="activeTab = 'semi'">车间检</div>
              <div class="tab-item" :class="{ active: activeTab === 'final' }" @click="activeTab = 'final'">出厂检</div>
            </div>
          </el-card>
        </el-col>
@@ -526,7 +526,7 @@
        containLabel: true,
      },
      legend: {
        data: ["原材料", "半成品", "成品"], // 图例数据
        data: ["入厂检", "车间检", "出厂检"], // 图例数据
        icon: ["circle", "circle", "circle"],
        itemWidth: 10, // 设置图标宽度
        itemHeight: 10,
@@ -556,7 +556,7 @@
      },
      series: [
        {
          name: "原材料",
          name: "入厂检",
          type: "bar",
          barWidth: "15%",
          data: monthlyCompletionDetailsData.value.map(item => item.rawMaterialCount),
@@ -565,7 +565,7 @@
          },
        },
        {
          name: "半成品",
          name: "车间检",
          type: "bar",
          barWidth: "15%",

@@ -575,7 +575,7 @@
          },
        },
        {
          name: "成品",
          name: "出厂检",
          type: "bar",
          barWidth: "15%",

@@ -606,9 +606,9 @@
          type: "pie",
          radius: "70%",
          data: [
            { value: getYearlyStatValue(0, 'totalCount'), name: "原材料", itemStyle: { color: "#1890FF" } },
            { value: getYearlyStatValue(1, 'totalCount'), name: "半成品", itemStyle: { color: "#F7BA1E" } },
            { value: getYearlyStatValue(2, 'totalCount'), name: "成品", itemStyle: { color: "#14C9C9" } },
            { value: getYearlyStatValue(0, 'totalCount'), name: "入厂检", itemStyle: { color: "#1890FF" } },
            { value: getYearlyStatValue(1, 'totalCount'), name: "车间检", itemStyle: { color: "#F7BA1E" } },
            { value: getYearlyStatValue(2, 'totalCount'), name: "出厂检", itemStyle: { color: "#14C9C9" } },
          ],
          label: {
            show: true,
@@ -655,7 +655,7 @@
      },
      // 图例配置
      legend: {
        data: ["原材料", "半成品", "成品"], // 图例数据
        data: ["入厂检", "车间检", "出厂检"], // 图例数据
        icon: ["circle", "circle", "circle"],
        itemWidth: 10, // 设置图标宽度
        itemHeight: 10,
@@ -688,7 +688,7 @@
      // 系列数据
      series: [
        {
          name: "原材料", // 系列名称
          name: "入厂检", // 系列名称
          type: "line", // 图表类型为折线图
          // stack: "Total", // 堆叠名称
          symbol: "circle",
@@ -698,7 +698,7 @@
          data: monthlyPassRateData.value.map(item => item.rawMaterial.passRate),
        },
        {
          name: "半成品", // 系列名称
          name: "车间检", // 系列名称
          type: "line", // 图表类型为折线图
          // stack: "Total", // 堆叠名称
          symbol: "circle",
@@ -708,7 +708,7 @@
          data: monthlyPassRateData.value.map(item => item.process.passRate),
        },
        {
          name: "成品", // 系列名称
          name: "出厂检", // 系列名称
          type: "line", // 图表类型为折线图
          // stack: "Total", // 堆叠名称
          symbol: "circle",