7eb190f13437b2e67788e9f4bdea725fdb165f01..4d8e42ceba77e05758fce54baadc10dded3fe773
2025-06-10 gaoluyang
下单拆分为3个
4d8e42 对比 | 目录
2025-06-10 gaoluyang
Merge branch 'refs/heads/dev' into dev_ztns
3c03d4 对比 | 目录
2025-06-09 gaoluyang
检验标准未带出
b807a1 对比 | 目录
2025-06-05 gaoluyang
修改配置
de8f8e 对比 | 目录
2025-06-05 gaoluyang
修改配置
ac10df 对比 | 目录
2025-06-05 gaoluyang
修改配置
84eb45 对比 | 目录
2025-06-05 gaoluyang
修改配置
9f8361 对比 | 目录
2025-06-05 gaoluyang
修改配置
58e90e 对比 | 目录
2025-06-05 gaoluyang
修改配置
4e2059 对比 | 目录
2025-06-05 gaoluyang
修改配置
a08309 对比 | 目录
2025-06-05 gaoluyang
1.原材料下单
d41471 对比 | 目录
2025-06-05 gaoluyang
1.原材料下单
92cad9 对比 | 目录
2025-05-23 zhuo
解决提交体积太大报错问题
22a05e 对比 | 目录
2025-05-19 gaoluyang
1.检验任务传参修改
869605 对比 | 目录
2025-05-12 zhuo
Merge remote-tracking branch 'origin/dev' into dev
9a4370 对比 | 目录
2025-05-12 gaoluyang
1.成品下单-抽检的时候调接口提示
5aacfa 对比 | 目录
2025-05-08 zhuo
检验项添加抽样类型绑定
18a494 对比 | 目录
2025-05-07 gaoluyang
1.质量监督计划-完成报告可以上传pdf
21dc6e 对比 | 目录
2025-05-07 gaoluyang
1.质量监督计划-完成报告可以上传pdf
c11eac 对比 | 目录
2025-05-07 gaoluyang
1.监督管理评审-页面开发、联调
b4cc98 对比 | 目录
2025-05-06 gaoluyang
1.设备工具明细和树-过期标红
90c868 对比 | 目录
2025-05-06 zhuo
调整订单页面路由问题
6fe1ca 对比 | 目录
2025-04-29 gaoluyang
1.原材料下单路由跳转修改
8b7e44 对比 | 目录
2025-04-24 gaoluyang
1.下单模版-样式修改
e9a945 对比 | 目录
2025-04-24 zhuo
报告结果导出调整
460041 对比 | 目录
已修改5个文件
64 ■■■■■ 文件已修改
src/utils/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/inspection.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/customsInspectionOrder.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/customsInspectionView.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.js
@@ -52,7 +52,7 @@
            : config.data,
        time: new Date().getTime(),
      };
      const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
      const requestSize =  new TextEncoder().encode(JSON.stringify(requestObj)).byteLength; // 请求数据大小
      const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
      if (requestSize >= limitSize) {
        console.warn(
src/views/business/inspectionTask/inspection.vue
@@ -546,8 +546,8 @@
  delfile,
  inspectionOrderDetailsTaskSwitching
} from "@/api/business/inspectionTask.js";
import InspectionWorker from '@/workers/InspectionWorker.worker';
import DataWorker from '../../../workers/DataWorker.worker';
import InspectionWorker from '@/workers/InspectionWorker.worker.js';
import DataWorker from '@/workers/DataWorker.worker.js';
import html2canvas from "html2canvas";
import { mapGetters } from "vuex";
import viewManHourDia from "@/views/business/inspectionTask/components/viewManHourDia.vue";
src/views/business/materialOrder/customsInspectionOrder.vue
@@ -169,7 +169,7 @@
          </el-form>
        </div>
        <div style="margin-bottom: 6px;margin-top: 6px">
          <el-button v-show="active==1" :disabled="sampleList.length === 2" size="small" type="primary" @click="handleSplitCountNum">拆分</el-button>
          <el-button v-show="active==1" :disabled="sampleList.length === 3" size="small" type="primary" @click="handleSplitCountNum">拆分</el-button>
        </div>
      </div>
@@ -778,9 +778,8 @@
            if (this.orderType == 1) {
              this.$set(this.addObj, 'orderType', 'Quarterly inspection')
            }
            const str = res.data.treeName.split('-')
            this.selectTreeTem = str.join(' - ')
            this.selectTree = str.join(' - ')
            this.selectTreeTem = res.data.treeName
            this.selectTree = res.data.treeName
            this.addListInfo(this.codeLevel, res.data) // 原材料样品是固定的,就默认赋值一条数据,可拆分
            this.selectInsOrderTemplate() // 原材料模板列表查询
          } else {
@@ -1456,10 +1455,10 @@
      }).then(res => {
        this.methodLoad = false
        try {
          if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
            let arr = this.selectTree.split('-')
          if (res.data.standardMethodList.length == 0 && this.selectTree.split(' - ').length == 5) {
            let arr = this.selectTree.split(' - ')
            let arr0 = arr.slice(0, arr.length - 1)
            let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
            let selectTree = arr0.join(' - ').substring(0, arr0.join(' - ').length - 1)
            selectsStandardMethodByFLSSM({
              tree: selectTree
            }).then(ress => {
@@ -1651,7 +1650,7 @@
        })
      }
      this.productList = []
      let num = this.selectTreeTem.split('-').length;
      let num = this.selectTreeTem.split(' - ').length;
      if (num != 5) {
        this.selectTree = this.selectTreeTem + ' - ' + e
      } else {
src/views/business/materialOrder/customsInspectionView.vue
@@ -165,7 +165,7 @@
          </el-form>
        </div>
        <div style="margin-bottom: 6px;margin-top: 6px">
          <el-button v-show="active==1" :disabled="sampleList.length === 2" size="small" type="primary" @click="handleSplitCountNum">拆分</el-button>
          <el-button v-show="active==1" :disabled="sampleList.length === 3" size="small" type="primary" @click="handleSplitCountNum">拆分</el-button>
        </div>
      </div>
@@ -774,9 +774,8 @@
            if (this.orderType == 1) {
              this.$set(this.addObj, 'orderType', 'Quarterly inspection')
            }
            const str = res.data.treeName.split('-')
            this.selectTreeTem = str.join(' - ')
            this.selectTree = str.join(' - ')
            this.selectTreeTem = res.data.treeName
            this.selectTree = res.data.treeName
            this.addListInfo(this.codeLevel, res.data) // 原材料样品是固定的,就默认赋值一条数据,可拆分
            this.selectInsOrderTemplate() // 原材料模板列表查询
          } else {
@@ -1452,10 +1451,10 @@
      }).then(res => {
        this.methodLoad = false
        try {
          if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) {
            let arr = this.selectTree.split('-')
          if (res.data.standardMethodList.length == 0 && this.selectTree.split(' - ').length == 5) {
            let arr = this.selectTree.split(' - ')
            let arr0 = arr.slice(0, arr.length - 1)
            let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1)
            let selectTree = arr0.join(' - ').substring(0, arr0.join(' - ').length - 1)
            selectsStandardMethodByFLSSM({
              tree: selectTree
            }).then(ress => {
@@ -1647,7 +1646,7 @@
        })
      }
      this.productList = []
      let num = this.selectTreeTem.split('-').length;
      let num = this.selectTreeTem.split(' - ').length;
      if (num != 5) {
        this.selectTree = this.selectTreeTem + ' - ' + e
      } else {
vue.config.js
@@ -61,17 +61,33 @@
    },
    module: {
      rules: [
        // JS 主体文件处理(含 Babel、Thread Loader)
        {
          test: /\.js$/,
          use: [
            {
              loader: 'thread-loader',
              options: { workers: 4 }
            },
            'babel-loader'
          ],
          exclude: /\.worker\.js$/, // 👈 排除 worker 文件
          include: path.resolve(__dirname, 'src')
        },
        // 单独处理 Worker 文件
        {
          test: /\.worker\.js$/,
          use: {
            loader: "worker-loader",
            loader: 'worker-loader',
            options: {
              filename: "[name].[contenthash].worker.js", // 添加内容哈希到文件名
              inline: "fallback",
            },
              filename: '[name].[contenthash].worker.js',
              inline: 'fallback'
            }
          },
        },
      ],
          type: 'javascript/auto' // 👈 强制 Webpack 不要按模块解析
        }
      ]
    },
    plugins: [
      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件