Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

云

7 天以前 d600df688493d1d1719a59e4a22bc074da096af2

Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

 src/views/index.vue

@@ -113,11 +113,11 @@
          <div class="panel-title-row">
            <div class="panel-title">生产订单进度</div>
            <el-radio-group v-model="orderFilter" size="small">
              <el-radio-button label="all">全部({{ orderProgressMeta.total }})</el-radio-button>
              <el-radio-button label="waiting">待开始({{ orderProgressMeta.waitingCount }})</el-radio-button>
              <el-radio-button label="inProgress">进行中({{ orderProgressMeta.inProgressCount }})</el-radio-button>
              <el-radio-button label="completed">已完成({{ orderProgressMeta.completedCount }})</el-radio-button>
              <el-radio-button label="paused">已暂停({{ orderProgressMeta.pausedCount }})</el-radio-button>
              <el-radio-button :value="'all'">全部({{ orderProgressMeta.total }})</el-radio-button>
              <el-radio-button :value="'waiting'">待开始({{ orderProgressMeta.waitingCount }})</el-radio-button>
              <el-radio-button :value="'inProgress'">进行中({{ orderProgressMeta.inProgressCount }})</el-radio-button>
              <el-radio-button :value="'completed'">已完成({{ orderProgressMeta.completedCount }})</el-radio-button>
              <el-radio-button :value="'paused'">已暂停({{ orderProgressMeta.pausedCount }})</el-radio-button>
            </el-radio-group>
          </div>
          <el-table :data="filteredOrders" stripe>
@@ -320,7 +320,7 @@
      <div class="process-selection-wrapper">
        <el-checkbox-group v-model="tempProcessIds">
          <div class="process-grid">
            <el-checkbox v-for="item in processOptions" :key="item.id" :label="item.id" border>
            <el-checkbox v-for="item in processOptions" :key="item.id" :value="item.id" border>
              {{ item.name }}
            </el-checkbox>
          </div>
@@ -1319,15 +1319,16 @@
  barSeries1.value[0].data = [];
  barSeries1.value[1].data = [];
  barSeries1.value[2].data = [];
  (res.data.item || []).forEach((item) => {
  const data = res.data || {};
  (data.item || []).forEach((item) => {
    xAxis1.value[0].data.push(item.date);
    barSeries1.value[0].data.push(item.supplierNum);
    barSeries1.value[1].data.push(item.processNum);
    barSeries1.value[2].data.push(item.factoryNum);
  });
  qualityStatisticsObject.value.supplierNum = res.data.supplierNum;
  qualityStatisticsObject.value.processNum = res.data.processNum;
  qualityStatisticsObject.value.factoryNum = res.data.factoryNum;
  qualityStatisticsObject.value.supplierNum = data.supplierNum || 0;
  qualityStatisticsObject.value.processNum = data.processNum || 0;
  qualityStatisticsObject.value.factoryNum = data.factoryNum || 0;
};

const getAmountHalfYearNum = async () => {

 src/views/procurementManagement/thePaymentLedger/index.vue

@@ -33,7 +33,7 @@
<script setup>
import { ref } from "vue";
import { Search } from "@element-plus/icons-vue";
import { registrationList } from "@/api/procurementManagement/paymentLedger.js";
// import { registrationList } from "@/api/procurementManagement/paymentLedger.js";
const tableColumn = ref([
  {
    label: "付款日期",
@@ -89,11 +89,11 @@
};
const getList = () => {
  tableLoading.value = true;
  registrationList({ ...searchForm.value, ...page }).then((res) => {
    tableLoading.value = false;
    tableData.value = res.rows;
    total.value = res.total;
  });
  // registrationList({ ...searchForm.value, ...page }).then((res) => {
  //   tableLoading.value = false;
  //   tableData.value = res.rows;
  //   total.value = res.total;
  // });
};
getList();
</script>