From a7b4194dd1755c75242aa9775ce82af0ee9fc653 Mon Sep 17 00:00:00 2001
From: CTP <630182278@qq.com>
Date: Thu, 11 May 2023 11:51:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98=EF=BC=9F=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json |   5 ++-
 src/main.js  | 117 +++++++++++++++++++++++++++------------------------
 2 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index 805c67b0..e159f1ff 100644
--- a/package.json
+++ b/package.json
@@ -36,12 +36,12 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
-    "element-china-area-data": "^5.0.2",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
-    "core-js": "3.19.1",
+    "core-js": "^3.19.1",
     "echarts": "4.9.0",
+    "element-china-area-data": "^5.0.2",
     "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
@@ -53,6 +53,7 @@
     "pinyin": "^2.10.2",
     "qrcodejs2": "^0.0.2",
     "quill": "1.3.7",
+    "regenerator-runtime": "^0.13.11",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "vue": "2.6.12",
diff --git a/src/main.js b/src/main.js
index 1c9cf17a..2d50da53 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,73 +1,82 @@
-import Vue from 'vue'
+import "core-js/stable";
+import "regenerator-runtime/runtime";
+import Vue from "vue";
 
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
 
-import Element from 'element-ui'
-import './assets/styles/element-variables.scss'
+import Element from "element-ui";
+import "./assets/styles/element-variables.scss";
 
-import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/ruoyi.scss' // ruoyi css
-import App from './App'
-import store from './store'
-import router from './router'
-import directive from './directive' // directive
-import plugins from './plugins' // plugins
-import {download} from '@/utils/request'
+import "@/assets/styles/index.scss"; // global css
+import "@/assets/styles/ruoyi.scss"; // ruoyi css
+import App from "./App";
+import store from "./store";
+import router from "./router";
+import directive from "./directive"; // directive
+import plugins from "./plugins"; // plugins
+import { download } from "@/utils/request";
 import allTools from "./plugins/allTools";
 
-import './assets/icons' // icon
-import './permission' // permission control
-import {getDicts} from "@/api/system/dict/data";
-import {getConfigKey, updateConfigByKey} from "@/api/system/config";
-import {parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree} from "@/utils/ruoyi";
+import "./assets/icons"; // icon
+import "./permission"; // permission control
+import { getDicts } from "@/api/system/dict/data";
+import { getConfigKey, updateConfigByKey } from "@/api/system/config";
+import {
+  parseTime,
+  resetForm,
+  addDateRange,
+  selectDictLabel,
+  selectDictLabels,
+  handleTree,
+} from "@/utils/ruoyi";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
-import RightToolbar from "@/components/RightToolbar"
+import RightToolbar from "@/components/RightToolbar";
 // 富文本组件
-import Editor from "@/components/Editor"
+import Editor from "@/components/Editor";
 // 文件上传组件
-import FileUpload from "@/components/FileUpload"
+import FileUpload from "@/components/FileUpload";
 // 图片上传组件
-import ImageUpload from "@/components/ImageUpload"
+import ImageUpload from "@/components/ImageUpload";
 // 图片预览组件
-import ImagePreview from "@/components/ImagePreview"
+import ImagePreview from "@/components/ImagePreview";
 // 字典标签组件
-import DictTag from '@/components/DictTag'
+import DictTag from "@/components/DictTag";
 // 头部标签组件
-import VueMeta from 'vue-meta'
+import VueMeta from "vue-meta";
 // 字典数据组件
-import DictData from '@/components/DictData'
+import DictData from "@/components/DictData";
 
 // 去除控制台的 Vue warn 警告信息
 Vue.config.silent = true;
 
 // 全局方法挂载
-Vue.prototype.getDicts = getDicts
-Vue.prototype.getConfigKey = getConfigKey
-Vue.prototype.updateConfigByKey = updateConfigByKey
-Vue.prototype.parseTime = parseTime
-Vue.prototype.resetForm = resetForm
-Vue.prototype.addDateRange = addDateRange
-Vue.prototype.selectDictLabel = selectDictLabel
-Vue.prototype.selectDictLabels = selectDictLabels
-Vue.prototype.download = download
-Vue.prototype.handleTree = handleTree
+Vue.prototype.getDicts = getDicts;
+Vue.prototype.getConfigKey = getConfigKey;
+Vue.prototype.updateConfigByKey = updateConfigByKey;
+Vue.prototype.parseTime = parseTime;
+Vue.prototype.resetForm = resetForm;
+Vue.prototype.addDateRange = addDateRange;
+Vue.prototype.selectDictLabel = selectDictLabel;
+Vue.prototype.selectDictLabels = selectDictLabels;
+Vue.prototype.download = download;
+Vue.prototype.handleTree = handleTree;
 
 // 全局组件挂载
-Vue.component('DictTag', DictTag)
-Vue.component('Pagination', Pagination)
-Vue.component('RightToolbar', RightToolbar)
-Vue.component('Editor', Editor)
-Vue.component('FileUpload', FileUpload)
-Vue.component('ImageUpload', ImageUpload)
-Vue.component('ImagePreview', ImagePreview)
+Vue.component("DictTag", DictTag);
+Vue.component("Pagination", Pagination);
+Vue.component("RightToolbar", RightToolbar);
+Vue.component("Editor", Editor);
+Vue.component("FileUpload", FileUpload);
+Vue.component("ImageUpload", ImageUpload);
+Vue.component("ImagePreview", ImagePreview);
 
-Vue.use(directive)
-Vue.use(plugins)
-Vue.use(VueMeta)
-Vue.use(allTools)
-DictData.install()
+Vue.use(directive);
+Vue.use(plugins);
+Vue.use(VueMeta);
+Vue.use(allTools);
+DictData.install();
 
 /**
  * If you don't want to use mock-server
@@ -79,17 +88,17 @@ DictData.install()
  */
 
 // 修改 el-dialog 默认点击遮照为不关闭
-Element.Dialog.props.closeOnClickModal.default = false
+Element.Dialog.props.closeOnClickModal.default = false;
 
 Vue.use(Element, {
-  size: Cookies.get('size') || 'mini' // set element-ui default size
-})
+  size: Cookies.get("size") || "mini", // set element-ui default size
+});
 
-Vue.config.productionTip = false
+Vue.config.productionTip = false;
 
 new Vue({
-  el: '#app',
+  el: "#app",
   router,
   store,
-  render: h => h(App)
-})
+  render: (h) => h(App),
+});

From dac293fd9ef5a4081e2730bfa2bc75dc0cd22580 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 11 May 2023 14:12:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=A4=9A?=
 =?UTF-8?q?=E7=82=B9=E5=87=A0=E4=B8=8B=E5=87=BA=E7=8E=B0=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/invRelUsers.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
index d9fe1321..5a77c4a9 100644
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@@ -218,7 +218,7 @@ export default {
         this.userTotal = res.data.total;
 
       }).catch((error) => {
-        this.$message.error("用户数据加载失败")
+        this.$message.error("数据正在处理，请勿重复提交")
       });
     },
 

From 5c60c71d46b8786c1eedeee5f1acfc228facdc98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 11 May 2023 14:34:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoAuditedOrder.vue    | 4 ++--
 src/views/inout/IoCheckAuditOrder.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 1de2da75..de77d3f9 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -736,7 +736,7 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 1,
+        status: row.status,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
@@ -745,7 +745,7 @@ export default {
             templateId: response.data,
             orderIdFk: row.billNo,
             action: row.action,
-            moduleId: 1,
+            status: row.status,
           }
           orderPDFFromTemplateFile(tQuery).then((response) => {
             //将pdf文件转换为url。
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index d1d4aa8f..0c6c9ddb 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -730,13 +730,14 @@ export default {
     printOrder(row) {
       let tQuery = {
         action: row.action,
-        moduleId: 2,
+        status: row.status,
       }
       this.loading = true;
       inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
         if (response.code === 20000) {
           tQuery = {
             templateId: response.data,
+            status: row.status,
             orderIdFk: row.billNo,
             action: row.action,
             moduleId: 2,