From 8450619de11b6629caa39a19661aafc0be56d1bf Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 8 May 2023 14:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceCkeck.vue              |   2 +-
 src/views/inout/InvoiceRegistration.vue       |   2 +-
 .../inout/InvoiceRegistrationDetermine.vue    |   2 +-
 src/views/inout/IoArrivalSearchOrder.vue      |   2 +-
 src/views/inout/IoAuditedOrder.vue            |   2 +-
 src/views/inout/IoCheckErrorOrder.vue         |   2 +-
 src/views/inout/IoCheckSuccessOrder.vue       |   2 +-
 src/views/inout/IoCreateBusOrder.vue          |   2 +-
 src/views/inout/IoCreateErrorOrder.vue        |   2 +-
 src/views/inout/IoCreateOrder.vue             |   2 +-
 src/views/inout/IoCreateScanOrder.vue         |   2 +-
 src/views/inout/IoDealOrder.vue               |   2 +-
 src/views/inout/IoDeliveryAuditOrder.vue      |   4 +-
 src/views/inout/IoDeliverySearchOrder.vue     |   4 +-
 src/views/inout/IoEditOrder.vue               |   2 +-
 src/views/inout/IoInoutSearchOrder.vue        |   2 +-
 src/views/inout/IoReturnedSearchOrder.vue     |   2 +-
 src/views/inout/IoSupAduitOrder.vue           |   2 +-
 src/views/inout/IoSupSearchOrder.vue          |   2 +-
 src/views/inout/IoSupSecAuditOrder.vue        |  37 +++---
 src/views/inout/IoWaitAllocateOrder.vue       |   2 +-
 src/views/inout/uploadManage/uploadOrder.vue  |   2 +-
 src/views/inventory/InvPreInSerach.vue        |   2 +-
 src/views/inventory/InvSupPreInSerach.vue     |   2 +-
 .../inventory/trace/invUdiTraceOrder.vue      |   2 +-
 .../inventory/trace/sickerUdiTraceOrder.vue   |   2 +-
 src/views/monitor/logininfor/index.vue        |  12 +-
 src/views/monitor/operlog/index.vue           |  51 +++++----
 .../supplier/products/supDiProductsCheck.vue  | 107 +++++++++---------
 src/views/sync/SysUdimsConfig.vue             |  59 +++++++++-
 src/views/sync/SysUdimsData.vue               |   8 +-
 31 files changed, 197 insertions(+), 131 deletions(-)

diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index aef041a..beb3fcb 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -384,7 +384,7 @@ export default {
         4: "pda未校验",
         5: "pc端扫码精灵",
         6: "流转自动补单",
-        7: "UDI供应商平台",
+        7: "UDI管理系统",
         8: "平衡补录单据",
         10: "手动补单",
         11: "仓库盘点",
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 3702053..900b96b 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -614,7 +614,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/InvoiceRegistrationDetermine.vue b/src/views/inout/InvoiceRegistrationDetermine.vue
index 1d9ea06..1fc32ff 100644
--- a/src/views/inout/InvoiceRegistrationDetermine.vue
+++ b/src/views/inout/InvoiceRegistrationDetermine.vue
@@ -314,7 +314,7 @@ export default {
         '4': 'pda未校验',
         '5': 'pc端扫码精灵',
         '6': '流转自动补单',
-        '7': 'UDI供应商平台',
+        '7': 'UDI管理系统',
         '8': '平衡补录单据',
         '10': '手动补单',
         '11': '仓库盘点',
diff --git a/src/views/inout/IoArrivalSearchOrder.vue b/src/views/inout/IoArrivalSearchOrder.vue
index 3be2872..aa3db48 100644
--- a/src/views/inout/IoArrivalSearchOrder.vue
+++ b/src/views/inout/IoArrivalSearchOrder.vue
@@ -532,7 +532,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 0c0cc50..e616e80 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -390,7 +390,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index ec609ef..605dcd8 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -496,7 +496,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index eed9508..015e353 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -506,7 +506,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 4794d89..9792cfc 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -288,7 +288,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index 9fb0555..c1c1f3b 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -259,7 +259,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 03cf125..f326ea1 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -276,7 +276,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 103ab4f..a39b6ee 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -249,7 +249,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index c1e7be4..c5a57ff 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -386,7 +386,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index 8de7c7b..69c809f 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -613,7 +613,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
@@ -1046,7 +1046,7 @@ export default {
 
     //单据撤回
     rollback(row) {
-      this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
+      this.$confirm('此操作将撤回单据至待核对, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 19469ff..8f3d3b0 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -608,7 +608,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
@@ -1012,7 +1012,7 @@ export default {
 
     //单据撤回
     rollback(row) {
-      this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
+      this.$confirm('此操作将撤回单据至待审核, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index a55d391..517500d 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -437,7 +437,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoInoutSearchOrder.vue b/src/views/inout/IoInoutSearchOrder.vue
index 42199f4..ca8c143 100644
--- a/src/views/inout/IoInoutSearchOrder.vue
+++ b/src/views/inout/IoInoutSearchOrder.vue
@@ -534,7 +534,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index ee987ea..894685e 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -569,7 +569,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 849acb4..c685e2d 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -483,7 +483,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 268436e..003f6ff 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -481,7 +481,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index 60b046c..7d8c2e1 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -292,7 +292,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <div style="color: #1890ff;"  @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
+              <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
             </template>
           </el-table-column>
 
@@ -452,11 +452,10 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import DialogCheck from "@/views/inout/DialogCheck";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
-import { previewImage } from '@/api/purchase/supCompany'
+import {previewImage} from '@/api/purchase/supCompany'
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 
 
-
 const formJson = {
   site_id: "",
   site_name: "",
@@ -469,8 +468,8 @@ export default {
   data() {
     return {
       BASE_URL: process.env.VUE_APP_BASE_API,
-      imgList:[],
-      imgViewerVisible:false,
+      imgList: [],
+      imgViewerVisible: false,
       showSearch: true,
       Upinvoice: false,
       currentManufacturer: {},
@@ -518,7 +517,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
@@ -600,7 +599,7 @@ export default {
       acceptOrderVisible: false,
     };
   },
-  components: {AcceptOrder, DialogCheck,ElImageViewer},
+  components: {AcceptOrder, DialogCheck, ElImageViewer},
   methods: {
     onReset() {
       this.$router.push({
@@ -644,25 +643,29 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    showImgViewer(row){
+    showImgViewer(row) {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      console.log(this.certFileUrl+"========");
-      this.imgList=[];
-      previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
+      console.log(this.certFileUrl + "========");
+      this.imgList = [];
+      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
         if (response.code === 20000) {
-          this.imgList=response.data;
+          this.imgList = response.data;
         }
         console.log(this.imgList)
         this.imgViewerVisible = true;
       });
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'hidden';
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
-    closeImgViewer(){
+    closeImgViewer() {
       this.imgViewerVisible = false;
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },
@@ -944,7 +947,7 @@ export default {
     },
     //单据撤回
     rollback(row) {
-      this.$confirm('此操作将撤回单据至已校验未审核状态, 是否继续?', '提示', {
+      this.$confirm('此操作将撤回单据至待核对, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -968,7 +971,7 @@ export default {
       this.acceptQuery = row;
       this.acceptOrderVisible = true;
     },
-    freshen(){
+    freshen() {
       this.Upinvoice = false;
       this.getOrderDetails();
     },
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
index 4e9b6f7..9463d4a 100644
--- a/src/views/inout/IoWaitAllocateOrder.vue
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -359,7 +359,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inout/uploadManage/uploadOrder.vue b/src/views/inout/uploadManage/uploadOrder.vue
index 8b31eeb..0922ff4 100644
--- a/src/views/inout/uploadManage/uploadOrder.vue
+++ b/src/views/inout/uploadManage/uploadOrder.vue
@@ -422,7 +422,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inventory/InvPreInSerach.vue b/src/views/inventory/InvPreInSerach.vue
index fbf9b71..47b649e 100644
--- a/src/views/inventory/InvPreInSerach.vue
+++ b/src/views/inventory/InvPreInSerach.vue
@@ -233,7 +233,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inventory/InvSupPreInSerach.vue b/src/views/inventory/InvSupPreInSerach.vue
index 303f1c5..9d41e5a 100644
--- a/src/views/inventory/InvSupPreInSerach.vue
+++ b/src/views/inventory/InvSupPreInSerach.vue
@@ -293,7 +293,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "11": "仓库盘点",
diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue
index d720a50..88fe949 100644
--- a/src/views/inventory/trace/invUdiTraceOrder.vue
+++ b/src/views/inventory/trace/invUdiTraceOrder.vue
@@ -268,7 +268,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单",
         "12": "采购计划",
diff --git a/src/views/inventory/trace/sickerUdiTraceOrder.vue b/src/views/inventory/trace/sickerUdiTraceOrder.vue
index d88b57b..7fce19b 100644
--- a/src/views/inventory/trace/sickerUdiTraceOrder.vue
+++ b/src/views/inventory/trace/sickerUdiTraceOrder.vue
@@ -192,7 +192,7 @@ export default {
         "4": "pda未校验",
         "5": "pc端扫码精灵",
         "6": "流转自动补单",
-        "7": "UDI供应商平台",
+        "7": "UDI管理系统",
         "8": "平衡补录单据",
         "10": "手动补单"
       },
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index acf6086..aed72da 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -46,14 +46,16 @@
             icon="el-icon-refresh"
             size="mini"
             @click="resetQuery"
-            >重置</el-button
+          >重置
+          </el-button
           >
           <el-button
             type="primary"
             icon="el-icon-search"
             size="mini"
             @click="handleQuery"
-            >搜索</el-button
+          >搜索
+          </el-button
           >
         </el-button-group>
       </el-form-item>
@@ -132,7 +134,6 @@
         align="center"
         prop="userName"
         :show-overflow-tooltip="true"
-        :sort-orders="['descending', 'ascending']"
       />
       <el-table-column
         label="登录地址"
@@ -164,7 +165,7 @@
       <!--    <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>-->
       <!--  </template>-->
       <!--</el-table-column>-->
-      <el-table-column label="操作信息" align="center" prop="msg" />
+      <el-table-column label="操作信息" align="center" prop="msg"/>
       <el-table-column
         label="登录日期"
         align="center"
@@ -191,7 +192,7 @@
 </template>
 
 <script>
-import { list } from "@/api/monitor/logininfor";
+import {list} from "@/api/monitor/logininfor";
 
 export default {
   name: "Logininfor",
@@ -217,7 +218,6 @@ export default {
       // 日期范围
       dateRange: [],
       // 默认排序
-      defaultSort: { prop: "loginTime", order: "descending" },
       // 查询参数
       queryParams: {
         page: 1,
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index fe79f78..58c474b 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -44,8 +44,8 @@
           placeholder="操作状态"
           clearable
         >
-          <el-option label="正常" value="0" />
-          <el-option label="失败" value="1" />
+          <el-option label="正常" value="0"/>
+          <el-option label="失败" value="1"/>
         </el-select>
       </el-form-item>
 
@@ -55,14 +55,16 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-          >搜索</el-button
+        >搜索
+        </el-button
         >
         <el-button
           type="primary"
           icon="el-icon-refresh"
           size="mini"
           @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
 
@@ -87,20 +89,19 @@
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" type="index"></el-table-column>
-      <el-table-column label="系统模块" align="center" prop="title" />
+      <el-table-column label="系统模块" align="center" prop="title"/>
       <!--<el-table-column label="操作类型" align="center" prop="businessType">-->
       <!--  <template slot-scope="scope">-->
       <!--    <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>-->
       <!--  </template>-->
       <!--</el-table-column>-->
-      <el-table-column label="请求方式" align="center" prop="requestMethod" />
+      <el-table-column label="请求方式" align="center" prop="requestMethod"/>
       <el-table-column
         label="操作人员"
         align="center"
         prop="operUserName"
         width="100"
         :show-overflow-tooltip="true"
-        :sort-orders="['descending', 'ascending']"
       />
       <el-table-column
         label="操作地址"
@@ -124,15 +125,15 @@
         </template> -->
         <template slot-scope="scope">
           <el-tag :type="scope.row.status === 0 ? 'success' : 'warning'">{{
-            scope.row.status === 0 ? "正常" : "失败"
-          }}</el-tag>
+              scope.row.status === 0 ? "正常" : "失败"
+            }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column
         label="操作日期"
         align="center"
         prop="operTime"
-        :sort-orders="['descending', 'ascending']"
         width="180"
       >
         <template slot-scope="scope">
@@ -149,7 +150,7 @@
             type="text"
             @click="handleView(scope.row, scope.index)"
             v-hasPermi="['monitor:operlog:query']"
-            >详情
+          >详情
           </el-button>
         </template>
       </el-table-column>
@@ -173,17 +174,19 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="操作模块："
-              >{{ form.title }} / {{ typeFormat(form) }}</el-form-item
+            >{{ form.title }} / {{ typeFormat(form) }}
+            </el-form-item
             >
             <el-form-item label="登录信息："
-              >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}
+            >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
             <el-form-item label="请求方式：">{{
-              form.requestMethod
-            }}</el-form-item>
+                form.requestMethod
+              }}
+            </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="操作方法：">{{ form.method }}</el-form-item>
@@ -193,8 +196,9 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="返回参数：">{{
-              form.jsonResult
-            }}</el-form-item>
+                form.jsonResult
+              }}
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="操作状态：">
@@ -204,13 +208,15 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="操作时间：">{{
-              parseTime(form.operTime)
-            }}</el-form-item>
+                parseTime(form.operTime)
+              }}
+            </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="异常信息：" v-if="form.status === 1">{{
-              form.errorMsg
-            }}</el-form-item>
+                form.errorMsg
+              }}
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -222,7 +228,7 @@
 </template>
 
 <script>
-import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
+import {list, delOperlog, cleanOperlog} from "@/api/monitor/operlog";
 
 export default {
   name: "Operlog",
@@ -246,7 +252,6 @@ export default {
       // 日期范围
       dateRange: [],
       // 默认排序
-      defaultSort: { prop: "operTime", order: "descending" },
       // 表单参数
       form: {},
       // 查询参数
diff --git a/src/views/supplier/products/supDiProductsCheck.vue b/src/views/supplier/products/supDiProductsCheck.vue
index 42011ae..7d75c94 100644
--- a/src/views/supplier/products/supDiProductsCheck.vue
+++ b/src/views/supplier/products/supDiProductsCheck.vue
@@ -6,7 +6,7 @@
           <el-col :span="6">
             <el-form-item label="物资编码:">
               <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" clearable
-                   style="width: 90%"     @keyup.enter.native="keyupErp_submit($event)"
+                        style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -31,40 +31,40 @@
             </el-form-item>
           </el-col>
         </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="供应商:">
-                <el-select
-                  v-model="filterQuery.customerId"
-                  filterable
-                  remote
-                  clearable="true"
-                  reserve-keyword
-                  style="width: 90%"
-                  placeholder="请选择供应商"
-                  :remote-method="findCompany"
-                  :loading="loading"
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="供应商:">
+              <el-select
+                v-model="filterQuery.customerId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                style="width: 90%"
+                placeholder="请选择供应商"
+                :remote-method="findCompany"
+                :loading="loading"
+              >
+                <el-option
+                  v-for="item in companyNames"
+                  :key="item.companyName"
+                  :label="item.companyName"
+                  :value="item.customerId"
                 >
-                  <el-option
-                    v-for="item in companyNames"
-                    :key="item.companyName"
-                    :label="item.companyName"
-                    :value="item.customerId"
-                  >
-                    <span style="float: left">{{ item.companyName }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
+                  <span style="float: left">{{ item.companyName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-        <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-        <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-      </el-button-group>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+        </el-button-group>
       </div>
 
       <el-divider style="margin: 15px"></el-divider>
@@ -83,11 +83,14 @@
           </template>
         </el-table-column>
         <el-table-column label="审核意见" prop="remark" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" >
+        <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row,1)">详情</el-button>
-            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" :disabled="scope.row.status==2">删除</el-button>
-            <el-button type="text" size="small" :disabled="scope.row.status==2" @click="detailDialog(scope.row,2)">审核</el-button>
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+                       :disabled="scope.row.status==2">删除
+            </el-button>
+            <el-button type="text" size="small" :disabled="scope.row.status==2" @click="detailDialog(scope.row,2)">审核
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -162,7 +165,7 @@ import {
 } from '@/api/supplier/supProductsAddDi'
 import selectDiDetail from '@/views/supplier/products/selectDIDetailDialog'
 import ThrProductsAdd from '@/views/supplier/products/supProductsAdd'
-import { filterCustomers } from '@/api/auth/customer'
+import {filterCustomers} from '@/api/auth/customer'
 import thrProductsDetail from '@/views/supplier/products/supProductsDetail'
 
 export default {
@@ -182,9 +185,9 @@ export default {
       },
       total: 0,
       list: [],
-      title:null,
-      editDate:null,
-      thisDetail:null,
+      title: null,
+      editDate: null,
+      thisDetail: null,
       uploadFileUrl: null,
       fileList: [],
       checkVisible: false,
@@ -229,16 +232,16 @@ export default {
       this.remark = ''
       this.curRow = row
     },
-    close(){
-      this.thrProductsDiDetailVisible=false;
-      this.thrProductsDetailVisible=false;
+    close() {
+      this.thrProductsDiDetailVisible = false;
+      this.thrProductsDetailVisible = false;
       this.getList();
     },
     search() {
       this.filterQuery.page = 1
       this.getList()
     },
-    acts(){
+    acts() {
       gupdateDiProductDetail().then((res) => {
         if (res.code === 20000) {
 
@@ -292,28 +295,28 @@ export default {
         .catch(() => {
         })
     },
-    detailDialog(row,type) {
-      if(type==1){
-        this.title="产品信息详情"
-      }else{
-        this.title="物资入院审核"
+    detailDialog(row, type) {
+      if (type == 1) {
+        this.title = "产品信息详情"
+      } else {
+        this.title = "物资入院审核"
       }
 
-      if(row.type==1){
-        let query = { uuid: row.uuid }
+      if (row.type == 1) {
+        let query = {uuid: row.uuid}
         getDiProductDetail(query).then((res) => {
           if (res.code === 20000) {
             this.thisData = res.data
-            this.editDate=row
-            this.thisData.isAudit=type
+            this.editDate = row
+            this.thisData.isAudit = type
             this.thrProductsDiDetailVisible = true
           } else {
             this.$message.error('参数错误')
           }
         })
-      }else{
+      } else {
         this.thisDetail = row;
-        this.thisDetail.isAudit=type
+        this.thisDetail.isAudit = type
         this.thrProductsDetailVisible = true;
       }
     },
@@ -358,7 +361,7 @@ export default {
     }
   },
   components: {
-    ThrProductsAdd, selectDiDetail,thrProductsDetail
+    ThrProductsAdd, selectDiDetail, thrProductsDetail
   },
   mounted() {
   },
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index fd20827..f3f2892 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -119,7 +119,7 @@
                   splaceholder="请输入内容"
                 ></el-input>
               </el-form-item>
-<!--              <el-form-item label="延时上传(单位:分钟):">-->
+              <!--              <el-form-item label="延时上传(单位:分钟):">-->
               <!--                <el-input-->
               <!--                  style="width: 100px"-->
               <!--                  size="small" disabled-->
@@ -444,9 +444,10 @@
                 prop="action"
                 show-overflow-tooltip
               ></el-table-column>
-              <el-table-column width="250" label="单据状态">
+              <el-table-column width="180" label="单据状态">
                 <template slot-scope="scope">
                   <el-select
+                    style="width: 80%"
                     v-model="scope.row.orderStatus"
                     placeholder="请选择单据状态"
                   >
@@ -457,6 +458,28 @@
                   </el-select>
                 </template>
               </el-table-column>
+
+              <el-table-column width="180" label="目标单据状态">
+                <template slot-scope="scope">
+                  <el-select style="width: 90%"
+                             v-model="scope.row.syncStatus"
+                  >
+                    <el-option label="草稿" :value="1">草稿</el-option>
+                    <el-option label="待审核" :value="3">待审核</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+
+              <el-table-column width="180" label="是否自动补单">
+                <template slot-scope="scope">
+                  <el-select style="width: 90%"
+                             v-model="scope.row.syncChange"
+                  >
+                    <el-option label="是" :value="true">是</el-option>
+                    <el-option label="否" :value="false">否</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                   <el-button
@@ -497,7 +520,7 @@
                     splaceholder="请输入内容"
                   ></el-input>
 
-<!--                  <span style="margin-left: 30px"-->
+                  <!--                  <span style="margin-left: 30px"-->
                   <!--                  >单据下载时间间隔(单位:分钟):&nbsp;</span-->
                   <!--                  >-->
                   <!--                  <el-input-->
@@ -538,9 +561,10 @@
                 prop="action"
                 show-overflow-tooltip
               ></el-table-column>
-              <el-table-column width="250" label="单据状态">
+              <el-table-column width="180" label="单据状态">
                 <template slot-scope="scope">
                   <el-select
+                    style="width: 80%"
                     v-model="scope.row.orderStatus"
                     placeholder="请选择单据状态"
                   >
@@ -551,6 +575,29 @@
                   </el-select>
                 </template>
               </el-table-column>
+
+              <el-table-column width="180" label="目标单据状态">
+                <template slot-scope="scope">
+                  <el-select style="width: 90%"
+                             v-model="scope.row.syncStatus"
+                  >
+                    <el-option label="草稿" :value="1">草稿</el-option>
+                    <el-option label="待审核" :value="3">待审核</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+
+              <el-table-column width="180" label="是否自动补单">
+                <template slot-scope="scope">
+                  <el-select style="width: 90%"
+                             v-model="scope.row.syncChange"
+                  >
+                    <el-option label="是" :value="true">是</el-option>
+                    <el-option label="否" :value="false">否</el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+
               <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                   <el-button
@@ -948,6 +995,8 @@ export default {
         obj.outChange = false;
         obj.orderStatus = 7;
         obj.direct = 2;
+        obj.syncStatus = 3;
+        obj.syncChange = false;
         let isPut = true;
         for (let i = 0; i < this.checkedToInBusTypes.length; i++) {
           if (this.checkedToInBusTypes[i].action == obj.action) {
@@ -965,6 +1014,8 @@ export default {
         obj.outChange = false;
         obj.direct = 1;
         obj.orderStatus = 7;
+        obj.syncStatus = 3;
+        obj.syncChange = false;
         let isPut = true;
         for (let i = 0; i < this.checkedBusTypes.length; i++) {
           if (this.checkedBusTypes[i].action == obj.action) {
diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue
index 163a828..24ab1f3 100644
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@@ -72,7 +72,7 @@
 
         </el-table-column>
         <el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip sortable="custom"
-                         :sort-orders="['desc', 'asc']"></el-table-column>
+                         :sort-orders="['ascending', 'descending']"></el-table-column>
         <el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
 
         <el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
@@ -230,8 +230,12 @@ export default {
 
 
     handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
       this.filterQuery.orderBy = column.prop;
-      this.filterQuery.sort = column.order;
       this.getList();
     },