代码备份

.env.development

@@ -1,3 +1,3 @@
-VUE_APP_API_BASE=http://192.168.31.140:9998
+UDI_SYNC_SERVER_IP= http://127.0.0.1:9995/
 template=./public/index-dev.html
 outputDir=serve

.env.production

@@ -1,3 +1,3 @@
-VUE_APP_API_BASE=http://127.0.0.1:8080/glxp_warehous/
+UDI_SYNC_SERVER_IP= http://127.0.0.1:9995/
 template=./public/index.html
 outputDir=UDI_WMS_Client

package.json

@@ -1,44 +1,44 @@
 {
-  "name": "my-project",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "stage": "vue-cli-service build --mode stage",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "test:unit": "vue-cli-service test:unit"
-  },
-  "dependencies": {
-    "axios": "^0.18.0",
-    "babel-polyfill": "^6.26.0",
-    "element-ui": "^2.8.2",
-    "file-saver": "^2.0.5",
-    "js-cookie": "^2.2.0",
-    "mockjs": "^1.0.1-beta3",
-    "node-sass": "^6.0.1",
-    "nprogress": "^0.2.0",
-    "pinyin": "^2.10.2",
-    "vue": "^2.5.16",
-    "vue-router": "^3.0.1",
-    "vuedraggable": "^2.17.0",
-    "vuex": "^3.0.1"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.0.0-beta.15",
-    "@vue/cli-plugin-eslint": "^3.0.0-beta.15",
-    "@vue/cli-plugin-unit-jest": "^3.0.0-beta.15",
-    "@vue/cli-service": "^3.0.0-beta.15",
-    "@vue/eslint-config-prettier": "^3.0.0-rc.3",
-    "@vue/test-utils": "^1.0.0-beta.16",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^23.0.1",
-    "sass-loader": "^7.0.1",
-    "vue-template-compiler": "^2.5.16"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
+    "name": "my-project",
+    "version": "0.1.0",
+    "private": true,
+    "scripts": {
+        "serve": "vue-cli-service serve",
+        "stage": "vue-cli-service build --mode stage",
+        "build": "vue-cli-service build",
+        "lint": "vue-cli-service lint",
+        "test:unit": "vue-cli-service test:unit"
+    },
+    "dependencies": {
+        "axios": "^0.23.0",
+        "babel-polyfill": "^6.26.0",
+        "element-ui": "^2.15.7",
+        "file-saver": "^2.0.5",
+        "js-cookie": "^2.2.0",
+        "mockjs": "^1.0.1-beta3",
+        "node-sass": "^6.0.1",
+        "nprogress": "^0.2.0",
+        "pinyin": "^2.10.2",
+        "vue": "2.5.16",
+        "vue-router": "^3.0.1",
+        "vuedraggable": "^2.17.0",
+        "vuex": "^3.0.1"
+    },
+    "devDependencies": {
+        "@vue/cli-plugin-babel": "^3.0.0-beta.15",
+        "@vue/cli-plugin-eslint": "^3.0.0-beta.15",
+        "@vue/cli-plugin-unit-jest": "^3.0.0-beta.15",
+        "@vue/cli-service": "^3.0.0-beta.15",
+        "@vue/eslint-config-prettier": "^3.0.0-rc.3",
+        "@vue/test-utils": "^1.0.0-beta.16",
+        "babel-core": "7.0.0-bridge.0",
+        "babel-jest": "^23.0.1",
+        "sass-loader": "^7.0.1",
+        "vue-template-compiler": "latest"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not ie <= 8"
+    ]
 }

public/config.js

@@ -1,18 +1,30 @@
 window.global_config = {
-       "BASE_URL":"http://139.159.187.130:8080/UDI_WMS_MC",
+    "BASE_URL": "http://139.159.187.130:8080/UDI_WMS_MC",
     //  "BASE_URL":"http://127.0.0.1:9991",
     /**
      *
-     "BASE_URL":"http://127.0.0.1:9991",
-     "SERVER_IP": "http://127.0.0.1:9991/",
-     "BASE_URL2": "ws://127.0.0.1:9991/api/websocket/"
+     "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
+     "BASE_URL":"http://192.168.0.109:9991/",
+     "SERVER_IP": "http://192.168.0.109:9991/",
+     "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
 
 
 
 
+     "UDI_SYNC_SERVER_IP": "https://www.udims.com/UDI_DL_Server/",
      "BASE_URL":"http://139.159.187.130/UDI_WMS_MC",
      "SERVER_IP": "http://139.159.187.130/",
-     "WEBSOCKET_URL": "ws://139.159.187.130/UDI_WMS_MC/api/websocket/"
+     "WEBSOCKET_URL": "ws://139.159.187.130/UDI_WMS_MC/api/websocket/",
+     "BASE_URL2": "ws://192.168.0.9:9991/api/websocket/"
+
+
+
+
+     "UDI_SYNC_SERVER_IP": "http://192.168.0.201:8080/UDI_DL_Server/",
+     "BASE_URL":"http://192.168.0.201:8080/UDI_WMS_MC",
+     "SERVER_IP": "http://192.168.0.201:8080/",
+     "WEBSOCKET_URL": "ws://192.168.0.201:8080/UDI_WMS_MC/api/websocket/",
+     "BASE_URL2":"ws://192.168.0.201:8080/UDI_WMS_MC/api/websocket/"
 
 
      */

public/config.json

@@ -1,6 +1,6 @@
 {
-    "BASE_URL":"http://127.0.0.1:9991",
-    "SERVER_IP": "http://127.0.0.1:9991/",
-    "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/",
-    "BASE_URL2": "ws://127.0.0.1:9991/api/websocket/"
+    "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
+    "BASE_URL":"http://192.168.0.109:9991/",
+    "SERVER_IP": "http://192.168.0.109:9991/",
+    "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
 }

src/api/basic/busChangeType.js

@@ -0,0 +1,36 @@
+import axios from "../../utils/axios";
+
+export function getChangeBusType(query) {
+    return axios({
+        url: "/spms/bussinessChangeType/filter",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function addChangeBusType(query) {
+    return axios({
+        url: "/spms/bussinessChangeType/insert",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function deleteChangeBusType(query) {
+    return axios({
+        url: "/spms/bussinessChangeType/delete",
+        method: "post",
+        data: query
+    });
+}
+
+export function updateChangeBusType(query) {
+    return axios({
+        url: "/spms/bussinessChangeType/update",
+        method: "post",
+        data: query
+    });
+}
+

src/api/basic/busOriginType.js

@@ -7,3 +7,18 @@ export function getOriginBusType(query) {
         params: query
     });
 }
+export function updateBussinessType(query) {
+    return axios({
+        url: "/udiwms/originBusType/update",
+        method: "post",
+        data: query
+    });
+}
+
+export function insertBussinessType(query) {
+    return axios({
+        url: "/udiwms/originBusType/insert",
+        method: "post",
+        data: query
+    });
+}

src/api/basic/bussinessType.js

@@ -38,3 +38,14 @@ export function insertBussinessType(query) {
         data: query
     });
 }
+
+
+export function exportFile(query){
+    return axios({
+        url: "/udiwms/busstiness/file/export",
+        method: "post",
+        data: query,
+        headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+        responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+    });
+}

src/api/basic/udiRelevance.js

@@ -18,7 +18,6 @@ export function deletetUdiInfos(query) {
 }
 
 
-
 export function updatetUdiInfos(query) {
     return axios({
         url: "/udi/udirel/update",
@@ -34,6 +33,7 @@ export function combineUdi(query) {
         data: query
     });
 }
+
 export function combineAllUdi(query) {
     return axios({
         url: "/udi/udirel/combineAll",
@@ -43,7 +43,6 @@ export function combineAllUdi(query) {
 }
 
 
-
 export function modifyRel(query) {
     return axios({
         url: "/udi/udirel/modifyRel",
@@ -51,6 +50,7 @@ export function modifyRel(query) {
         data: query
     });
 }
+
 export function addErp(query) {
     return axios({
         url: "/udi/udirel/addErp",
@@ -58,6 +58,7 @@ export function addErp(query) {
         data: query
     });
 }
+
 export function addAllErp(query) {
     return axios({
         url: "/udi/udirel/addAllErp",
@@ -67,8 +68,6 @@ export function addAllErp(query) {
 }
 
 
-
-
 export function updateErpProduct(query) {
     return axios({
         url: "/udi/udirel/updateErp",
@@ -84,6 +83,7 @@ export function uploadSmp(query) {
         data: query
     });
 }
+
 export function thirdSysDetail(query) {
     return axios({
         url: "/udiwms/udirel/thirdSys/detail",
@@ -91,6 +91,7 @@ export function thirdSysDetail(query) {
         params: query
     });
 }
+
 export function removeRl(query) {
     return axios({
         url: "/udiwms/udirl/thirdSys/remove",
@@ -98,6 +99,7 @@ export function removeRl(query) {
         params: query
     });
 }
+
 export function sysFilter(query) {
     return axios({
         url: "/udiwms/udirel/thirdSys/filter",
@@ -114,5 +116,11 @@ export function removeDiRl(query) {
     });
 }
 
-
+export function getAllUdiInfos(query) {
+    return axios({
+        url: "/udi/udirel/bind/select",
+        method: "get",
+        params: query
+    });
+}
 

src/api/basic/udidb.js

@@ -0,0 +1,18 @@
+import axios from "../../utils/axios2";
+
+export function filterLogs(query) {
+    return axios({
+        url: "/udisync/udi/importLog/filter",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function deleteLog(query) {
+    return axios({
+        url: "/udisync/udi/importLog/deleteLog",
+        method: "post",
+        data: query
+    });
+}

src/api/inout/erpOrder.js

@@ -18,6 +18,14 @@ export function getCloudErp(query) {
 }
 
 
+export function getThirdSysOrder(query) {
+    return axios({
+        url: "/udiwms/thirdOrder/filter",
+        method: "get",
+        params: query
+    });
+}
+
 export function getErpMainOrderStatus(query) {
     return axios({
         url: "/warehouse/getErpMainOrderStatus",
@@ -42,6 +50,7 @@ export function importErpOrder(query) {
         data: query
     });
 }
+
 export function combineErpOrder(query) {
     return axios({
         url: "/warehouse/combineErpOrder",
@@ -66,6 +75,7 @@ export function selectErpOrder(query) {
         data: query
     });
 }
+
 export function importErpStock(query) {
     return axios({
         url: "/warehouse/stockPrint/importErpStock",
@@ -90,3 +100,10 @@ export function dlErpStock(query) {
     });
 }
 
+export function addStockOrder(query) {
+    return axios({
+        url: "/udiwms/erpOrder/addStockOrder",
+        method: "get",
+        params: query
+    });
+}

src/api/inout/order.js

@@ -254,5 +254,13 @@ export function moveStock(query) {
         }
     )
 }
-
+export function updateBind(query) {
+    return axios(
+        {
+            url: "/udiwms/erpOrder/updateBind",
+            method: "post",
+            data: query
+        }
+    )
+}
 

src/api/inventory/invCodeTrace.js

@@ -0,0 +1,19 @@
+import axios from "../../utils/axios";
+
+
+export function filterTrace(query) {
+    return axios({
+        url: "/spms/inv/products/trace",
+        method: "get",
+        params: query
+    });
+}
+
+export function filterOrderTrace(query) {
+    return axios({
+        url: "/spms/inv/products/order/trace",
+        method: "get",
+        params: query
+    });
+}
+

src/api/param/getBasrUrl.js

@@ -3,7 +3,7 @@ import axios from "axios";
 export function getBaseUrl() {
     axios.get("./config.json").then(res => {
         // 基础地址
-        console.log(res.data.BASE_URL + "\n" + res.data.BASE_URL2)
+        console.log(res.data.BASE_URL + "\n")
         return res.data.BASE_URL;
     });
 }

src/api/param/systemPDFTemplate.js

@@ -60,3 +60,21 @@ export function systemPDFTemplateDeleteById(query) {
         params: query
     });
 }
+
+export function moduleDetail(query) {
+    return axios({
+        url: "/system/pdf/module/detail",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function updateDetailRel(query) {
+    return axios({
+        url: "/system/pdf/module/updateRl",
+        method: "post",
+        data: query
+    });
+}
+

src/config/app.js

@@ -10,11 +10,13 @@ import "../../public/config";
 import "../../public/config.json";
 import axios from "axios";
 import myReq from "@/utils/axios";
+
 let BASE_URL = window.global_config.BASE_URL;
 let SERVER_IP = "";
 let ROUTER_MODE = "";
 let IMG_BASE_URL = BASE_URL;
-export { BASE_URL, ROUTER_MODE, IMG_BASE_URL,SERVER_IP };
+let UDI_SYNC_SERVER_IP = null;
+export {BASE_URL, ROUTER_MODE, IMG_BASE_URL, SERVER_IP, UDI_SYNC_SERVER_IP};
 
 
 axios.get('./config.json').then((res) => {
@@ -22,5 +24,6 @@ axios.get('./config.json').then((res) => {
     BASE_URL = res.data.BASE_URL;
     SERVER_IP = res.data.SERVER_IP;
     myReq.defaults.baseURL = BASE_URL;
+    UDI_SYNC_SERVER_IP = res.data.UDI_SYNC_SERVER_IP;
 
 });

src/main.js

@@ -14,6 +14,7 @@ import IconSvg from "./components/common/IconSvg.vue"; // svg组件
 import axios from "axios";
 import "../public/config.json";
 import myReq from "./utils/axios";
+import myReq2 from "./utils/axios2";
 // 注册全局组件（register global）
 Vue.component("icon-svg", IconSvg);
 Vue.use(allTools);
@@ -24,14 +25,14 @@ Object.keys(filters).forEach(key => {
 
 Vue.config.productionTip = false;
 let getUrl = "";
-let startApp = function() {
+let startApp = function () {
     console.log(window.global_config.BASE_URL);
     axios.get("./config.json").then(res => {
         // 基础地址
         getUrl = res.data.BASE_URL;
         myReq.defaults.baseURL = getUrl;
-        // mySock.ws_url =  res.data.BASE_URL2;
-        console.log( res.data.BASE_URL+"\n"+ res.data.BASE_URL2)
+        myReq2.defaults.baseURL = res.data.UDI_SYNC_SERVER_IP;
+        console.log(res.data.BASE_URL + "\n")
         new Vue({
             router,
             store,

src/router/index.js

@@ -24,6 +24,7 @@ import showText from "../views/other/showText";
 //基础数据维护
 import BussinessType from "../views/basic/BussinessType.vue";
 import BussinessTypeLocl from "../views/basic/BussinessTypeLocl.vue";
+import bussinessTypeThird from "../views/basic/BussinessTypeThird.vue";
 import basicUnitMaintain from "../views/basic/CorpMaintain.vue";
 import corpImport from "../views/basic/CorpImport.vue";
 import corpExport from "../views/basic/CorpExport.vue";
@@ -33,6 +34,8 @@ import UdiInfoManage from "../views/basic/UdiInfoManage.vue";
 import udiinfoExport from "../views/basic/UdiinfoExport.vue";
 import UdiInfoImport from "../views/basic/UdiInfoImport.vue";
 import udiInfoDb from "../views/basic/UdiInfoDb.vue";
+import UdidbImportLog from "../views/basic/UdidbImportLog.vue";
+
 import UdiInfoSmpUpload from "../views/smp/UdiInfoSmpUpload.vue";
 // import ErpOrderSmpUpload from "../views/smp/ErpOrderSmpUpload.vue";
 
@@ -40,7 +43,8 @@ import UdiInfoSmpUpload from "../views/smp/UdiInfoSmpUpload.vue";
 import inout from "../views/inout/IOFinishOrder.vue";
 import checkError from "../views/inout/IOCheckErrorOrder.vue";
 import checkWait from "../views/inout/IOCheckWaitOrder.vue";
-import udiTrace from "../views/inout/UdiCodeTrace.vue";
+import additionalOrder from "@/views/inout/IOAdditionalOrder";
+
 import code from "../views/inout/IOFinishCode.vue";
 import errorCode from "../views/inout/IONewCode.vue";
 import errorOrder from "../views/inout/IONewOrder.vue";
@@ -61,8 +65,12 @@ import inCodeLog from "../views/inventory/InCodeLog.vue";
 import stockPrint from "../views/inventory/IncodeSearch.vue";
 import inCodePrint from "../views/inventory/IncodePrint.vue";
 import stockCode from "../views/inventory/stockCode.vue";
+import stockOrderDelSearch from "../views/business/stockOrderDelSearch";
+
 //库存
 import invProducts from "../views/inventory/InvProducts.vue";
+import udiTrace from "../views/inventory/UdiCodeTrace.vue";
+import invUdiTraceOrder from "@/views/inventory/invUdiTraceOrder";
 
 //第三方数据管理
 import thrProducts from "../views/thrsys/ThrProducts.vue";
@@ -209,7 +217,7 @@ export const asyncRouterMap = [
                         name: "运行参数",
                         icon: "",
                         meta: {
-                            authRule: ["admin/systemParamConfig"]
+                            authRule: ["system/systemParamConfig"]
                         },
                     },
                     {
@@ -217,7 +225,7 @@ export const asyncRouterMap = [
                         name: "扫码单据类型",
                         component: BussinessType,
                         meta: {
-                            authRule: ["product/bussinessType"]
+                            authRule: ["system/bussinessType"]
                         }
                     },
 
@@ -226,7 +234,15 @@ export const asyncRouterMap = [
                         name: "业务单据类型",
                         component: BussinessTypeLocl,
                         meta: {
-                            authRule: ["product/BussinessTypeLocl"]
+                            authRule: ["system/BussinessTypeLocl"]
+                        }
+                    },
+                    {
+                        path: "bussinessTypeThird",
+                        name: "第三方单据类型",
+                        component: bussinessTypeThird,
+                        meta: {
+                            authRule: ["system/bussinessTypeThird"]
                         }
                     },
                     {
@@ -234,7 +250,7 @@ export const asyncRouterMap = [
                         name: "第三方系统",
                         component: thirdSys,
                         meta: {
-                            authRule: ["thrsys/thirdSys"]
+                            authRule: ["system/thirdSys"]
                         }
                     },
                 ]
@@ -320,7 +336,7 @@ export const asyncRouterMap = [
                         component: errorOrder,
                         name: "新增单据管理",
                         meta: {
-                            authRule: ["inout/errorOrder"]
+                            authRule: ["inout/newOrder"]
                         }
                     },
                     {
@@ -333,7 +349,7 @@ export const asyncRouterMap = [
                     },
                     {
                         path: "main",
-                        name: "已完成单据",
+                        name: "扫码单据查询",
                         component: inout,
                         meta: {
                             authRule: ["inout/main"]
@@ -426,6 +442,22 @@ export const asyncRouterMap = [
                     },
                 ]
             },
+            {
+                path: "stockOrderSearch",
+                component: stockOrderSearch,
+                name: "未核对单据",
+                meta: {
+                    authRule: ["stock/unCheck"]
+                }
+            },
+            {
+                path: "stockOrderDelSearch",
+                component: stockOrderDelSearch,
+                name: "已核对单据",
+                meta: {
+                    authRule: ["stock/Checked"]
+                }
+            },
 
 
         ]
@@ -475,7 +507,7 @@ export const asyncRouterMap = [
         hidden: false,
         noDropdown: false,
         meta: {
-            authRule: ["product"]
+            authRule: ["basic"]
         },
         children: [
             {
@@ -492,7 +524,7 @@ export const asyncRouterMap = [
                         name: "医疗器械信息维护",
                         component: UdiInfoManage,
                         meta: {
-                            authRule: ["product/productinfo"]
+                            authRule: ["basic/products/modify"]
                         }
                     },
                     {
@@ -500,7 +532,7 @@ export const asyncRouterMap = [
                         name: "医疗器械信息导入",
                         component: UdiInfoImport,
                         meta: {
-                            authRule: ["product/udiImport"]
+                            authRule: ["basic/products/import"]
                         }
                     },
                     {
@@ -508,7 +540,7 @@ export const asyncRouterMap = [
                         name: "医疗器械信息导出",
                         component: udiinfoExport,
                         meta: {
-                            authRule: ["product/udiinfoExport"]
+                            authRule: ["basic/products/export"]
                         }
                     },]
             },
@@ -526,7 +558,7 @@ export const asyncRouterMap = [
                         name: "往来单位信息维护",
                         component: basicUnitMaintain,
                         meta: {
-                            authRule: ["basic/basicUnitMaintain"]
+                            authRule: ["basic/unit/maintain"]
                         }
                     },
                     {
@@ -534,7 +566,7 @@ export const asyncRouterMap = [
                         name: "往来单位信息导入",
                         component: corpImport,
                         meta: {
-                            authRule: ["basic/corpImport"]
+                            authRule: ["basic/corp/Import"]
                         }
                     },
 
@@ -543,7 +575,7 @@ export const asyncRouterMap = [
                         name: "往来单位信息导出",
                         component: corpExport,
                         meta: {
-                            authRule: ["basic/corpExport"]
+                            authRule: ["basic/corp/Export"]
                         }
                     },]
             },
@@ -556,14 +588,35 @@ export const asyncRouterMap = [
                     authRule: ["product/company"]
                 }
             },
+
             {
-                path: "udiInfoDb",
-                name: "UDI数据库",
-                component: udiInfoDb,
+                path: "/udidb",
+                redirect: "/udidb/udidbSearch",
+                name: "本地UDI库",
+                component: Empty,
                 meta: {
-                    authRule: ["product/udiInfoDb"]
-                }
-            }
+                    authRule: ["basic/udidb"]
+                },
+                children: [
+                    {
+                        path: "udidbSearch",
+                        name: "DI信息查询",
+                        component: udiInfoDb,
+                        meta: {
+                            authRule: ["basic/udidb/search"]
+                        }
+                    },
+                    {
+                        path: "UdidbImportLog",
+                        name: "DI导入记录",
+                        component: UdidbImportLog,
+                        meta: {
+                            authRule: ["basic/udidb/importLog"]
+                        }
+                    }
+                ]
+            },
+
         ]
     },
     {
@@ -764,7 +817,6 @@ export const asyncRouterMap = [
                 path: "corpExportSmp",
                 name: "往来单位上传",
                 component: corpExportSmp,
-
                 meta: {
                     authRule: ["thrsys/corpExportSmp"]
                 }
@@ -773,7 +825,6 @@ export const asyncRouterMap = [
                 path: "thrProductsExportSmp",
                 name: "第三方产品信息上传",
                 component: thrProductsExportSmp,
-
                 meta: {
                     authRule: ["thrsys/thrProductsExportSmp"]
                 }
@@ -782,7 +833,6 @@ export const asyncRouterMap = [
                 path: "thrOrderExportSmp",
                 name: "第三方业务单据上传",
                 component: thrOrderExportSmp,
-
                 meta: {
                     authRule: ["thrsys/thrOrderExportSmp"]
                 }
@@ -851,6 +901,14 @@ export const asyncRouterMap = [
             authRule: ["inv/manage"]
         },
         children: [
+            {
+                path: "additionalOrder",
+                component: additionalOrder,
+                name: "补录单据管理",
+                meta: {
+                    authRule: ["stock/additionalOrder"]
+                }
+            },
             {
                 path: "invProducts",
                 component: invProducts,
@@ -866,15 +924,15 @@ export const asyncRouterMap = [
                 name: "盘点单据",
                 component: stockCheck,
                 meta: {
-                    authRule: ["warehouse/stockCheck"]
+                    authRule: ["inv/stockCheck"]
                 }
             },
             {
                 path: "udiTrace",
                 name: "UDI码追溯查询",
-                component: udiTrace,
+                component: invUdiTraceOrder,
                 meta: {
-                    authRule: ["inout/udiTrace"]
+                    authRule: ["inv/udiTrace"]
                 }
             },
         ]

src/utils/axios2.js

@@ -1,41 +1,20 @@
 import axios from "axios";
-import { Message } from "element-ui";
-import store from "../store/index";
-import { BASE_URL } from "../config/app";
-import router from "../router/index";
 import "../../public/config";
-// axios.defaults.baseURL = '/api'
+import store from "@/store";
+import {Message} from "element-ui";
+import router from "@/router";
+import {UDI_SYNC_SERVER_IP} from "../config/app";
+
 axios.defaults.withCredentials = true;
+
 // 创建axios实例
 const service = axios.create({
-    baseURL: "https://www.udims.com/UDI_DL_Server", // api的base_url
+
+    baseURL: UDI_SYNC_SERVER_IP, // api的base_url
     timeout: 15000 // 请求超时时间
 });
 
 // request拦截器
-service.interceptors.request.use(
-    config => {
-        // Do something before request is sent
-        if (store.getters.adminId && store.getters.token) {
-            // config.params = {
-            //     ADMIN_ID: store.getters.adminId,
-            //     ADMIN_TOKEN: store.getters.token,
-            //     ...config.params
-            // };
-            config.headers = {
-                ADMIN_ID: store.getters.adminId,
-                ADMIN_TOKEN: store.getters.token
-            };
-        }
-        return config;
-    },
-    error => {
-        // Do something with request error
-        Promise.reject(error);
-    }
-);
-
-// respone拦截器
 service.interceptors.response.use(
     response => {
         const data = response.data;
@@ -45,7 +24,7 @@ service.interceptors.response.use(
                     Message.error("验证失败,请重新登录");
                     router.push({
                         path: "/login",
-                        query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来
+                        query: {redirect: router.currentRoute.fullPath} // 从哪个页面跳转过来
                     });
                 });
             }
@@ -61,5 +40,4 @@ service.interceptors.response.use(
         return Promise.reject(error);
     }
 );
-
 export default service;

src/views/basic/BasicThirdSys.vue

@@ -170,7 +170,7 @@
                 filterQuery: {
                     thirdId: "",
                     thirdName: "",
-                    enabled: null,
+                    enabled: "1",
                     page: 1,
                     limit: 20,
                 },

src/views/basic/BussinessType.vue

@@ -16,30 +16,48 @@
                 </el-select>
             </el-form-item>
             <el-form-item>
-                <el-button-group>
+                <el-button-group style="margin-left: 10px;display:flex;">
                     <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                     <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                    <el-button type="primary" icon="search" @click="handleAddClick">新增</el-button>
+                    <el-button type="primary" icon="search" @click="exportJsonFile">导出单据类型</el-button>
+                    <!--                    <el-upload-->
+                    <!--                        :action="uploadFileUrl"-->
+                    <!--                        multiple-->
+                    <!--                        :limit="3"-->
+                    <!--                        :show-file-list="false"-->
+                    <!--                        :on-success="handleChange"-->
+                    <!--                        :file-list="fileList"-->
+                    <!--                    >-->
+                    <!--                        <el-button size="mini" type="primary">导入单据类型</el-button>-->
+                    <!--                    </el-upload>-->
                 </el-button-group>
-                <!-- <el-button type="primary" icon="search" @click="handleAddClick"
-                  >新增</el-button
-                > -->
+
             </el-form-item>
         </el-form>
 
         <el-table v-loading="loading" :data="list" style="width: 100%">
-            <el-table-column label="序号" type="index" width="120" fixed></el-table-column>
-
-            <el-table-column label="扫码单据名称" prop="name" fixed></el-table-column>
-            <el-table-column label="出入库类型代码" prop="mainAction" fixed></el-table-column>
+            <el-table-column label="序号" type="index" width="55" fixed></el-table-column>
             <el-table-column label="扫码单据类型代码" prop="action" fixed></el-table-column>
+            <el-table-column label="扫码单据名称" prop="name" fixed></el-table-column>
+            <el-table-column label="出入库类型代码" prop="mainAction" fixed>
+                <template slot-scope="scope">
+                    <span>{{ formMap[scope.row.mainAction] }}</span>
+                </template>
+            </el-table-column>
+
+            <el-table-column label="业务单据类型" prop="localAction" fixed>
+
+                <template slot-scope="scope">
+                    <span>{{ getActionName(scope.row.localAction) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="第三方单据类型" prop="thirdAction" fixed></el-table-column>
             <el-table-column label="是否启用" prop="enable" fixed>
                 <template slot-scope="scope">
                     <span>{{ enableMap[scope.row.enable] }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="业务单据类型" prop="localAction" fixed></el-table-column>
-            <el-table-column label="第三方系统" prop="thirdName" fixed></el-table-column>
-
             <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                     <el-button
@@ -49,12 +67,19 @@
                     >编辑
                     </el-button
                     >
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="deleteDialog(scope.row)"
+                    >删除
+                    </el-button
+                    >
                 </template>
             </el-table-column>
         </el-table>
 
         <el-dialog
-            title="新增业务类型关联"
+            title="新增扫码单据类型关联"
             :visible.sync="addDialogVisible"
             width="70%"
             :close-on-click-modal="false"
@@ -75,7 +100,7 @@
         </el-dialog>
 
         <el-dialog
-            title="编辑业务类型关联"
+            title="编辑扫码单据类型关联"
             :visible.sync="modifyDialogVisible"
             width="70%"
             :close-on-click-modal="false"
@@ -108,9 +133,12 @@ import {
     deleteBussinessType,
     updateBussinessType,
     insertBussinessType,
+    exportFile
 } from "../../api/basic/bussinessType";
 
 import modifyDialog from "./BussinessTypeModify";
+import axios from "axios";
+import {getLocalJoinBusType} from "@/api/basic/busLocalType";
 
 export default {
     data() {
@@ -134,14 +162,38 @@ export default {
                 thirdSysFk: "",
                 id: "",
                 localAction: null,
+                checkEnable: false,
+                genUnit: false,
+                innerOrder: false,
+                spUse: null,
+                secCheckEnable: null,
+                checkUdims: null,
+                checkPdaEd: null,
+                checkPdaUn: null,
+                checkPc: null,
+                checkWebNew: null,
+                checkChange: null,
+                secCheckUdims: null,
+                secCheckPdaEd: null,
+                secCheckPdaUn: null,
+                secCheckPc: null,
+                secCheckWebNew: null,
+                secCheckChange: null,
+                thirdAction: null,
             },
             enableMap: {
                 true: "是",
                 false: "否",
             },
 
+            formMap: {
+                WareHouseIn: "入库",
+                WareHouseOut: "出库",
+            },
+
             total: 0,
             multipleSelection: [],
+            uploadFileUrl: null,
         };
     },
 
@@ -208,9 +260,36 @@ export default {
                     this.cancelDialog();
                 });
         },
+        exportJsonFile() {
+            exportFile().then((response) => {
+                const binaryData = [];
+                binaryData.push(response);
+                let url = window.URL.createObjectURL(
+                    new Blob(binaryData, {type: "application/json"})
+                );
+                this.loading = false;
+                const eleLink = document.createElement('a');
+                // var timestamp = "yyyy-MM-dd_hh:mm";
+                eleLink.download = "扫码单据类型导出" + ".json";
+                eleLink.style.display = 'none';
+                eleLink.href = url;
+                document.body.appendChild(eleLink)
+                eleLink.click()
+                document.body.removeChild(eleLink)
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+
+
+        handleAddClick() {
+            this.inputQuery = {};
+            this.addDialogVisible = true;
+        },
 
         handleModifyClick(row) {
             this.modifyDialogVisible = true;
+            this.inputQuery = null;
             this.inputQuery = {
                 id: row.id,
                 remark: row.remark,
@@ -220,6 +299,24 @@ export default {
                 mainAction: row.mainAction,
                 localAction: row.localAction,
                 thirdSysFk: row.thirdSysFk,
+                checkEnable: row.checkEnable,
+                genUnit: row.genUnit,
+                innerOrder: row.innerOrder,
+                spUse: row.spUse,
+                secCheckEnable: row.secCheckEnable,
+                checkUdims: row.checkUdims,
+                checkPdaEd: row.checkPdaEd,
+                checkPdaUn: row.checkPdaUn,
+                checkPc: row.checkPc,
+                checkWebNew: row.checkWebNew,
+                checkChange: row.checkChange,
+                secCheckUdims: row.secCheckUdims,
+                secCheckPdaEd: row.secCheckPdaEd,
+                secCheckPdaUn: row.secCheckPdaUn,
+                secCheckPc: row.secCheckPc,
+                secCheckWebNew: row.secCheckWebNew,
+                secCheckChange: row.secCheckChange,
+                thirdAction: row.thirdAction,
             };
         },
 
@@ -236,6 +333,26 @@ export default {
                 });
         },
 
+
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].localAction === action) {
+                    return this.busTypes[i].localName;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinBusType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
+
         deleteOrders(data) {
             this.loading = true;
             let tquery = {
@@ -245,14 +362,36 @@ export default {
             deleteBussinessType(tquery)
                 .then((response) => {
                     this.getList();
-                    this.$message({
-                        type: "success",
-                        message: "删除成功！",
-                    });
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else {
+                        this.$message.error(response.message);
+                    }
+
                 })
                 .catch(() => {
                 });
         },
+        init() {
+            axios.get("./config.json").then(res => {
+                // 基础地址
+                let response = res.data.BASE_URL;
+                this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
+            });
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success(response.data);
+                this.getList();
+            }
+        },
     },
     components: {
         modifyDialog,
@@ -260,7 +399,10 @@ export default {
     mounted() {
     },
     created() {
+        this.getBusType();
+        this.init();
         this.getList();
+
     },
 };
 </script>

src/views/basic/BussinessTypeLocl.vue

@@ -24,10 +24,10 @@
 
         <el-table v-loading="loading" :data="list" style="width: 100%">
             <el-table-column label="序号" type="index" width="120" fixed></el-table-column>
-
-            <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
             <el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
-            <el-table-column label="原单据类型" prop="originAction" fixed></el-table-column>
+            <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
+
+            <el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>
             <el-table-column label="是否启用" prop="enable" fixed>
                 <template slot-scope="scope">
                     <span>{{ enableMap[scope.row.enable] }}</span>
@@ -43,6 +43,13 @@
                     >编辑
                     </el-button
                     >
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="deleteDialog(scope.row)"
+                    >删除
+                    </el-button
+                    >
                 </template>
             </el-table-column>
         </el-table>
@@ -92,7 +99,7 @@
 </template>
 <script>
 
-import {getLocalBusType, addLocalBusType, updateLocalBusType} from "@/api/basic/busLocalType";
+import {getLocalBusType, addLocalBusType, updateLocalBusType,deleteLocalBusType} from "@/api/basic/busLocalType";
 import modifyDialog from "./BussinessTypeLoclModify";
 
 export default {
@@ -115,8 +122,9 @@ export default {
                 mainAction: "",
                 thirdSysFk: "",
                 id: "",
-                originAction:null,
+                originAction: null,
                 localAction: null,
+                changeEnable: null,
             },
             enableMap: {
                 true: "是",
@@ -166,8 +174,13 @@ export default {
             addLocalBusType(this.inputQuery)
                 .then((response) => {
                     this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
+                    if (response.code == 20000) {
+                        this.cancelDialog();
+                        this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+
                 })
                 .catch(() => {
                     this.loading = false;
@@ -199,7 +212,8 @@ export default {
                 mainAction: row.mainAction,
                 localAction: row.localAction,
                 thirdSysFk: row.thirdSysFk,
-                originAction:row.originAction,
+                originAction: row.originAction,
+                changeEnable: row.changeEnable,
             };
         },
 
@@ -214,6 +228,7 @@ export default {
                 thirdSysFk: "",
                 id: "",
                 localAction: null,
+                changeEnable: null,
             };
         },
 
@@ -236,7 +251,7 @@ export default {
                 id: data.id + "",
             };
 
-            deleteBussinessType(tquery)
+            deleteLocalBusType(tquery)
                 .then((response) => {
                     this.getList();
                     this.$message({

src/views/basic/BussinessTypeLoclModify.vue

@@ -22,6 +22,7 @@
                     <el-input
                         style="width: 200px"
                         size="small"
+                        disabled
                         splaceholder="请输入内容"
                         v-model="inputQuery.action"
                     ></el-input>
@@ -32,16 +33,28 @@
             <el-col :span="10" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
-                        <span>原单据类型:&nbsp;</span>
+                        <span>第三方单据类型:&nbsp;</span>
                     </div>
-                    <el-select v-model="inputQuery.originAction" placeholder="请选择业务类型" clearable="true">
+                    <!--                    <el-select v-model="inputQuery.originAction" placeholder="请选择业务类型" clearable="true">-->
+                    <!--                        <el-option-->
+                    <!--                            v-for="item in originTypes"-->
+                    <!--                            :key="item.name"-->
+                    <!--                            :label="item.name"-->
+                    <!--                            :value="item.action">-->
+                    <!--                            <span style="float: left">{{ item.name }}</span>-->
+                    <!--                            &lt;!&ndash;<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>&ndash;&gt;-->
+                    <!--                        </el-option>-->
+                    <!--                    </el-select>-->
+                    <el-select v-model="inputQuery.originAction" placeholder="请选择第三方单据类型" clearable="true">
                         <el-option
                             v-for="item in originTypes"
                             :key="item.name"
                             :label="item.name"
                             :value="item.action">
-                            <span style="float: left">{{ item.name }}</span>
-                            <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
+                            <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                                    item.thirdSysName
+                                }}</span>
                         </el-option>
                     </el-select>
                 </div>
@@ -66,20 +79,125 @@
 
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="10" class="el-col">
+            <el-col :span="5" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.enable">启用单据</el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="5" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.enable">是否启用</el-checkbox>
+                    <el-checkbox v-model="inputQuery.changeEnable"
+                                 @change="isChangeOrder">自动补单
+                    </el-checkbox>
                 </div>
             </el-col>
         </el-row>
 
+        <div v-if="inputQuery.changeEnable">
+            <el-table border style="margin-bottom: 20px;margin-top: 10px" :data="changeList">
+                <el-table-column label="序号" prop="index" width="55"></el-table-column>
+                <el-table-column label="补单说明" prop="intro"></el-table-column>
+                <!--                <el-table-column label="补单单据类型代码" prop="action"></el-table-column>-->
+                <el-table-column label="补单扫码单据类型" prop="name"></el-table-column>
+                <el-table-column label="推前时长（小时）" prop="beforeTime"></el-table-column>
+                <el-table-column label="备注" prop="remark"></el-table-column>
+                <el-table-column label="操作" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="handleModifyClick(scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+
+        </div>
+        <el-dialog
+            :title="formMap[changeEdit]"
+            :visible.sync="editChangeTypeVisible"
+            width="55%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            v-if="editChangeTypeVisible">
+
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>生成扫码单据类型:&nbsp;</span>
+                        </div>
+                        <el-select v-model="editQuery.scAction" placeholder="请选择扫码单据类型" clearable="true">
+                            <el-option
+                                v-for="item in codeTypes"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.action">
+                                <span style="float: left">{{ item.name }}</span>
+                                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
+                            </el-option>
+                        </el-select>
+                    </div>
 
+                </el-col>
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>往前推移时间(小时):&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 200px"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.beforeTime"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>转换顺序号:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 200px"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.index"
+                            disabled="false"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="hideForm" size="small">取消</el-button>
+                <el-button
+                    type="primary"
+                    size="small"
+                    @click.native="formSubmit()"
+                    :loading="formLoading"
+                >提交
+                </el-button
+                >
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
 
 import {getOriginBusType} from "../../api/basic/busOriginType";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {
+    getChangeBusType,
+    addChangeBusType,
+    deleteChangeBusType,
+    updateChangeBusType
+} from "../../api/basic/busChangeType";
 
 export default {
     name: "inputQuery",
@@ -92,6 +210,10 @@ export default {
 
     data() {
         return {
+            query: {
+                action: null,
+                type: null,
+            },
             filterQuery: {
                 enabled: true,
                 isBuType: true,
@@ -99,28 +221,26 @@ export default {
             thirdSys: [],
             localTypes: [],
             originTypes: [],
+            codeTypes: [],
             value: "",
+            changeEdit: 0,
+            editChangeTypeVisible: false,
+            formMap: {
+                0: "新增",
+                1: "编辑",
+            },
+            changeList: [],
         }
     },
     methods: {
         getList() {
-            // getBasicThirdSys(this.filterQuery)
-            //     .then((response) => {
-            //         this.thirdSys = response.data.list || [];
-            //     })
-            //     .catch(() => {
-            //         this.loading = false;
-            //         this.list = [];
-            //     });
-            // getLocalBusType(this.filterQuery)
-            //     .then((response) => {
-            //         this.localTypes = response.data.list || [];
-            //     })
-            //     .catch(() => {
-            //         this.loading = false;
-            //         this.localTypes = [];
-            //     });
-
+            this.query.action = this.inputQuery.action;
+            getChangeBusType(this.query)
+                .then((response) => {
+                    this.changeList = response.data || [];
+                })
+                .catch(() => {
+                });
         },
         getTypes() {
             getOriginBusType()
@@ -129,11 +249,57 @@ export default {
                 })
                 .catch(() => {
                 });
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.codeTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
+        isChangeOrder() {
+            console.log("this.inputQuery.changeEnable = " + this.inputQuery.changeEnable);
+            if (this.inputQuery.changeEnable) {
+                this.query.type = "changeEnable";
+                this.getList()
+            }
+        },
+        handleModifyClick(row) {
+            this.changeEdit = 1;
+            this.editQuery = row;
+            this.editChangeTypeVisible = true;
+        },
+        hideForm() {
+            this.editChangeTypeVisible = false;
+        },
+        formSubmit() {
+            if (this.changeEdit == 0) {
+                this.editQuery.action = this.inputQuery.action;
+                addChangeBusType(this.editQuery)
+                    .then((response) => {
+                        this.editChangeTypeVisible = false;
+                        this.getList();
+                    })
+                    .catch(() => {
+                    });
+            } else {
+                updateChangeBusType(this.editQuery)
+                    .then((response) => {
+                        this.editChangeTypeVisible = false;
+                        this.getList();
+                    })
+                    .catch(() => {
+                    });
+            }
         }
+        ,
     },
 
     created() {
         this.getTypes();
+        this.getList();
     },
 };
 </script>

src/views/basic/BussinessTypeModify.vue

@@ -10,7 +10,6 @@
                         style="width: 200px"
                         size="small"
                         splaceholder="请输入内容"
-                        :disabled="true"
                         v-model="inputQuery.name"
                     ></el-input>
                 </div>
@@ -35,30 +34,58 @@
             <el-col :span="10" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
-                        <span>主业务类型代码:&nbsp;</span>
+                        <span>出入库类型:&nbsp;</span>
                     </div>
-                    <el-input
-                        style="width: 200px"
-                        :disabled="true"
-                        size="small"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.mainAction"
-                    ></el-input>
+                    <!--                    <el-input-->
+                    <!--                        style="width: 200px"-->
+                    <!--                        :disabled="true"-->
+                    <!--                        size="small"-->
+                    <!--                        splaceholder="请输入内容"-->
+                    <!--                        v-model="inputQuery.mainAction"-->
+                    <!--                    ></el-input>-->
+
+
+                    <el-select v-model="inputQuery.mainAction" placeholder="出入库类型">
+                        <el-option label="入库" value="WareHouseIn"></el-option>
+                        <el-option label="出库" value="WareHouseOut"></el-option>
+                    </el-select>
                 </div>
             </el-col>
+            <!--            <el-col :span="10" class="el-col">-->
+            <!--                <div class="text item">-->
+            <!--                    <div class="itemTag">-->
+            <!--                        <span>第三方系统:&nbsp;</span>-->
+            <!--                    </div>-->
+            <!--                    <el-select v-model="inputQuery.thirdSysFk" placeholder="请选择" clearable="true">-->
+            <!--                        <el-option-->
+            <!--                            v-for="item in thirdSys"-->
+            <!--                            :key="item.value"-->
+            <!--                            :label="item.thirdName"-->
+            <!--                            :value="item.thirdId">-->
+            <!--                            <span style="float: left">{{ item.thirdName }}</span>-->
+            <!--                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
+            <!--                        </el-option>-->
+            <!--                    </el-select>-->
+            <!--                </div>-->
+            <!--            </el-col>-->
             <el-col :span="10" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
-                        <span>第三方系统:&nbsp;</span>
+                        <span>第三方单据类型:&nbsp;</span>
                     </div>
-                    <el-select v-model="inputQuery.thirdSysFk" placeholder="请选择" clearable="true">
+                    <el-select v-model="inputQuery.thirdAction" placeholder="请选择业务类型" clearable="true">
                         <el-option
-                            v-for="item in thirdSys"
-                            :key="item.value"
-                            :label="item.thirdName"
-                            :value="item.thirdId">
-                            <span style="float: left">{{ item.thirdName }}</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                            v-for="item in originTypes"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.action">
+
+
+                            <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                                    item.thirdSysName
+                                }}</span>
+                            <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
                         </el-option>
                     </el-select>
                 </div>
@@ -69,17 +96,18 @@
             <el-col :span="10" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
-                        <span>本地单据:&nbsp;</span>
+                        <span>业务单据类型:&nbsp;</span>
                     </div>
-                    <el-select v-model="inputQuery.localAction" placeholder="请选择"  clearable="true">
+                    <el-select v-model="inputQuery.localAction" placeholder="请选择" clearable="true">
                         <el-option
                             v-for="item in localTypes"
                             :key="item.action"
                             :label="item.name"
                             :value="item.action">
                             <span style="float: left">{{ item.name }}</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>
+
                         </el-option>
+                        <!--                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
                     </el-select>
                 </div>
             </el-col>
@@ -100,101 +128,230 @@
             </el-col>
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="10" class="el-col">
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.innerOrder">标记为内部单据</el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.genUnit"
+                                 :disabled="inputQuery.mainAction == 'WareHouseIn'">允许手动输入客户信息
+                    </el-checkbox>
+                </div>
+            </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkEnable">需要选择业务单据校验的来源类型(一次复核)</el-checkbox>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
+            <el-col :span=" 4
+        " class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkWebNew" :disabled="!inputQuery.checkEnable">web端新增单据
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkPdaEd" :disabled="!inputQuery.checkEnable">手持终端未校验单据
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkPdaUn" :disabled="!inputQuery.checkEnable">手持终端已校验单据
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkUdims" :disabled="!inputQuery.checkEnable">UDIMS平台
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkPc" :disabled="!inputQuery.checkEnable">UDI扫码通</el-checkbox>
+                </div>
+            </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkSp" :disabled="!inputQuery.checkEnable">UDI自助平台</el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.enable">是否启用</el-checkbox>
+                    <el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable">自动补录单据
+                    </el-checkbox>
                 </div>
             </el-col>
         </el-row>
 
+        <el-divider></el-divider>
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckEnable">需要单据复核的来源类型(二次复核)</el-checkbox>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckUdims" :disabled="!inputQuery.secCheckEnable">web端新增单据
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckPdaEd" :disabled="!inputQuery.secCheckEnable">手持终端未校验单据
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckPdaUn" :disabled="!inputQuery.secCheckEnable">手持终端已校验单据
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckPc" :disabled="!inputQuery.secCheckEnable">UDIMS平台
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckWebNew" :disabled="!inputQuery.secCheckEnable">UDI扫码通
+                    </el-checkbox>
+                </div>
+            </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckSp" :disabled="!inputQuery.secCheckEnable">UDI自助平台
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable">自动补录单据
+                    </el-checkbox>
+                </div>
+            </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
 
     </div>
 </template>
 
 <script>
 
-    import {
-        getBasicThirdSys,
-    } from "../../api/basic/basicThirdSys";
-
-    import {
-        getLocalBusType,
-    } from "../../api/basic/busLocalType";
+import {
+    getBasicThirdSys,
+} from "../../api/basic/basicThirdSys";
+import {getOriginBusType} from "../../api/basic/busOriginType";
+import {
+    getLocalBusType,
+} from "../../api/basic/busLocalType";
 
-    export default {
-        name: "inputQuery",
-        props: {
-            inputQuery: {
-                type: Object,
-                required: true,
-            },
+export default {
+    name: "inputQuery",
+    props: {
+        inputQuery: {
+            type: Object,
+            required: true,
         },
+    },
 
-        data() {
-            return {
-                filterQuery: {
-                    enabled: true,
-                    isBuType:true,
-                },
-                thirdSys: [],
-                localTypes:[],
-
-                value: "",
-            }
-        },
-        methods: {
-            getList() {
-                getBasicThirdSys(this.filterQuery)
-                    .then((response) => {
-                        this.thirdSys = response.data.list || [];
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-                getLocalBusType(this.filterQuery)
-                    .then((response) => {
-                        this.localTypes = response.data.list || [];
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.localTypes = [];
-                    });
+    data() {
+        return {
+            filterQuery: {
+                enabled: true,
+                isBuType: true,
             },
+            thirdSys: [],
+            localTypes: [],
+            originTypes: [],
+            value: "",
+        }
+    },
+    methods: {
+        getList() {
+            getOriginBusType()
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+            getBasicThirdSys(this.filterQuery)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            getLocalBusType(this.filterQuery)
+                .then((response) => {
+                    this.localTypes = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.localTypes = [];
+                });
+        },
 
-            getLoca(){
+        getLoca() {
 
-            },
         },
+    },
 
-        created() {
-            this.getList();
-            this.getLoca();
-        },
-    };
+    created() {
+        this.getList();
+        this.getLoca();
+    },
+};
 </script>
 
 <style scoped>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 100px;
-    }
-
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
-
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
-        margin-bottom: 20px;
-    }
-
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 20px;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
 </style>

src/views/basic/BussinessTypeThird.vue

@@ -0,0 +1,293 @@
+<template>
+    <div>
+        <el-card>
+
+
+            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+                <el-form-item class="query-form-item">
+                    <el-input
+                        v-model="filterQuery.name"
+                        placeholder="业务类型"
+                        style="width: 400px"
+                    ></el-input>
+                </el-form-item>
+                <!--            <el-form-item class="query-form-item">-->
+                <!--                <el-select v-model="filterQuery.enable" placeholder="启用状态" clearable>-->
+                <!--                    <el-option label="全部" value=""></el-option>-->
+                <!--                    <el-option label="已启用" value="1"></el-option>-->
+                <!--                    <el-option label="未启用" value="0"></el-option>-->
+                <!--                </el-select>-->
+                <!--            </el-form-item>-->
+                <el-form-item>
+                    <el-button-group style="margin-left: 10px;display:flex;">
+                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        <!--                    <el-upload-->
+                        <!--                        :action="uploadFileUrl"-->
+                        <!--                        multiple-->
+                        <!--                        :limit="3"-->
+                        <!--                        :show-file-list="false"-->
+                        <!--                        :on-success="handleChange"-->
+                        <!--                        :file-list="fileList"-->
+                        <!--                    >-->
+                        <!--                        <el-button size="mini" type="primary">导入单据类型</el-button>-->
+                        <!--                    </el-upload>-->
+                    </el-button-group>
+                    <!-- <el-button type="primary" icon="search" @click="handleAddClick"
+                      >新增</el-button
+                    > -->
+                </el-form-item>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index" width="55" ></el-table-column>
+
+                <el-table-column label="单据名称" prop="name" ></el-table-column>
+                <el-table-column label="单据类型代码" prop="action" ></el-table-column>
+                <!--            <el-table-column label="是否启用" prop="enable" fixed>-->
+                <!--                <template slot-scope="scope">-->
+                <!--                    <span>{{ enableMap[scope.row.enable] }}</span>-->
+                <!--                </template>-->
+                <!--            </el-table-column>-->
+                <el-table-column label="第三方系统" prop="thirdSysName" ></el-table-column>
+                <el-table-column label="备注" prop="remark" ></el-table-column>
+                <el-table-column label="操作" width="100" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="handleModifyClick(scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-dialog
+                title="新增扫码单据类型关联"
+                :visible.sync="addDialogVisible"
+                width="70%"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                v-if="addDialogVisible"
+            >
+                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+                <div style="text-align: center">
+                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
+                    >提交
+                    </el-button
+                    >
+                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+                    >取消
+                    </el-button
+                    >
+                </div>
+            </el-dialog>
+
+            <el-dialog
+                title="编辑扫码单据类型关联"
+                :visible.sync="modifyDialogVisible"
+                width="70%"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                v-if="modifyDialogVisible"
+            >
+                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+                <div style="text-align: center">
+                    <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
+                    >提交
+                    </el-button
+                    >
+                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+                    >取消
+                    </el-button
+                    >
+                </div>
+            </el-dialog>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
+    </div>
+</template>
+<script>
+import {
+    getOriginBusType,
+    updateBussinessType,
+    insertBussinessType,
+} from "../../api/basic/busOriginType";
+
+import modifyDialog from "./BussinessTypeThirdModify";
+import axios from "axios";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                name: "",
+                page: 1,
+                limit: 20,
+            },
+            addDialogVisible: false,
+            modifyDialogVisible: false,
+            list: [],
+            inputQuery: {
+                action: "",
+                name: "",
+                enable: "",
+                remark: "",
+                thirdSys: null,
+                thirdSysName: null,
+
+            },
+            enableMap: {
+                true: "是",
+                false: "否",
+            },
+
+            total: 0,
+            multipleSelection: [],
+            uploadFileUrl: null,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                name: null,
+                enable: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        cancelDialog() {
+            this.modifyDialogVisible = false;
+            this.addDialogVisible = false;
+        },
+
+        getList() {
+            this.loading = true;
+            getOriginBusType(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+
+        onAddSubmit() {
+            insertBussinessType(this.inputQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.cancelDialog();
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
+        },
+
+        onModifySubmit() {
+            updateBussinessType(this.inputQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.cancelDialog();
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
+        },
+
+        handleModifyClick(row) {
+            this.modifyDialogVisible = true;
+            this.inputQuery = {
+                id: row.id,
+                remark: row.remark,
+                action: row.action,
+                name: row.name,
+                enable: row.enable,
+                thirdSys: row.thirdSys,
+                thirdSysName: row.thirdSysName
+            };
+        },
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
+
+        deleteOrders(data) {
+            this.loading = true;
+            let tquery = {
+                id: data.id + "",
+            };
+
+            // deleteBussinessType(tquery)
+            //     .then((response) => {
+            //         this.getList();
+            //         this.$message({
+            //             type: "success",
+            //             message: "删除成功！",
+            //         });
+            //     })
+            //     .catch(() => {
+            //     });
+        },
+        init() {
+            axios.get("./config.json").then(res => {
+                // 基础地址
+                let response = res.data.BASE_URL;
+                this.uploadFileUrl = response + "udiwms/busstiness/file/upload";
+            });
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success(response.data);
+                this.getList();
+            }
+        },
+    },
+    components: {
+        modifyDialog,
+    },
+    mounted() {
+    },
+    created() {
+        this.init();
+        this.getList();
+
+    },
+};
+</script>

src/views/basic/BussinessTypeThirdModify.vue

@@ -0,0 +1,153 @@
+<template>
+    <div>
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>单据类型名称:&nbsp;</span>
+                    </div>
+                    <el-input
+                        style="width: 200px"
+                        size="small"
+                        splaceholder="请输入内容"
+                        :disabled="true"
+                        v-model="inputQuery.name"
+                    ></el-input>
+                </div>
+            </el-col>
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>单据类型代码:&nbsp;</span>
+                    </div>
+                    <el-input
+                        style="width: 200px"
+                        :disabled="true"
+                        size="small"
+                        splaceholder="请输入内容"
+                        v-model="inputQuery.action"
+                    ></el-input>
+                </div>
+            </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>第三方系统:&nbsp;</span>
+                    </div>
+                    <el-select v-model="inputQuery.thirdSys" placeholder="请选择" clearable="true">
+                        <el-option
+                            v-for="item in thirdSys"
+                            :key="item.value"
+                            :label="item.thirdName"
+                            :value="item.thirdId">
+                            <span style="float: left">{{ item.thirdName }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                        </el-option>
+                    </el-select>
+                </div>
+            </el-col>
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>备注:&nbsp;</span>
+                    </div>
+                    <el-input
+                        style="width: 200px"
+                        size="small"
+                        splaceholder="请输入内容"
+                        v-model="inputQuery.remark"
+                    ></el-input>
+                </div>
+            </el-col>
+        </el-row>
+
+        <el-divider></el-divider>
+    </div>
+</template>
+
+<script>
+
+import {
+    getBasicThirdSys,
+} from "../../api/basic/basicThirdSys";
+
+import {
+    getLocalBusType,
+} from "../../api/basic/busLocalType";
+
+export default {
+    name: "inputQuery",
+    props: {
+        inputQuery: {
+            type: Object,
+            required: true,
+        },
+    },
+
+    data() {
+        return {
+            filterQuery: {
+                enabled: true,
+                isBuType: true,
+            },
+            thirdSys: [],
+            localTypes: [],
+
+            value: "",
+        }
+    },
+    methods: {
+        getList() {
+            getBasicThirdSys(this.filterQuery)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            getLocalBusType(this.filterQuery)
+                .then((response) => {
+                    this.localTypes = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.localTypes = [];
+                });
+        },
+
+    },
+
+    created() {
+        this.getList();
+    },
+};
+</script>
+
+<style scoped>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 20px;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
+</style>

src/views/basic/UdiInfoDb.vue

@@ -375,6 +375,7 @@ export default {
     methods: {
 
         searchList() {
+
             this.unionQuery.page = 1;
             this.getList();
         },

src/views/basic/UdidbImportLog.vue

@@ -0,0 +1,293 @@
+<template>
+    <div>
+        <el-form :inline="true" :model="query" class="query-form" size="mini">
+            <el-row>
+                <el-form-item class="query-form-item">
+                    <el-input v-model="filterQuery.genKey" placeholder="记录ID"></el-input>
+                </el-form-item>
+
+                <el-form-item class="query-form-item">
+                    <el-select v-model="filterQuery.status" placeholder="处理状态">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option label="处理中" value="0"></el-option>
+                        <el-option label="已处理" value="1"></el-option>
+                        <el-option label="异常" value="2"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button-group style="display:flex;">
+                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        <el-upload
+                            :action="uploadFileUrl"
+                            multiple
+                            :limit="1"
+                            :data="uploadData"
+                            :show-file-list="false"
+                            :on-success="handleChange"
+                            :on-exceed="handleExceed"
+                            :before-upload="handleBefore"
+                        >
+                            <el-button size="mini" type="primary">导入器械信息</el-button>
+                        </el-upload>
+
+
+                    </el-button-group>
+                </el-form-item>
+            </el-row>
+        </el-form>
+
+        <el-table
+            v-loading="loading"
+            :data="list"
+            style="width: 100%"
+        >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column
+                label="记录ID"
+                prop="genKey"
+                show-overflow-tooltip
+            ></el-table-column>
+
+            <el-table-column
+                label="来源"
+                prop="fromType"
+                show-overflow-tooltip
+            >
+            </el-table-column>
+            <el-table-column
+                label="更新日期"
+                prop="updateTime"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="文件名称"
+                prop="fileName"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="状态"
+                prop="status"
+                show-overflow-tooltip
+            >
+                <template slot-scope="scope">
+                    <el-tag
+                        :type="statusFilterType(scope.row.status)"
+                    >{{ status[scope.row.status] }}
+                    </el-tag
+                    >
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="160">
+                <template slot-scope="scope">
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="deleteDialog(scope.row.id)"
+                    >删除
+                    </el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+    </div>
+</template>
+
+<script>
+
+import {filterLogs, deleteLog} from "../../api/basic/udidb";
+
+
+import udiInfoImportDetail from "./UdiInfoImportDetail";
+import axios from "axios";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                genKey: null,
+                status: null,
+                fromType: null,
+                page: 1,
+                limit: 20,
+            },
+            udiImportDetailVisible: false,
+            checked: false,
+            list: [],
+            detailList: [],
+            thirdSys: [],
+            thirdSysDetail: null,
+            total: 0,
+            currentRow: null,
+            editQuery: null,
+            fromStatus: {
+                0: "产品信息",
+                1: "库存信息",
+                2: "异常第三方上传"
+            },
+            status: {
+                0: "等待处理",
+                1: "正在处理",
+                2: "处理异常",
+                3: "处理完成"
+            },
+            uploadFileUrl: null,
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+            templateDlUrl: null,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                fromType: null,
+                genKey: null,
+                status: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
+            };
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            filterLogs(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    console.log(response.data.code + "---------------" +  response.data.total);
+                    console.log(response.data.list + "---------------");
+                    this.list = response.data.list || [];
+                    console.log(this.list + "---------------");
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+        genInCode() {
+            this.selectBasicUdiVisible = true;
+        },
+        handleDetailClick(row) {
+            this.currentRow = row;
+            console.log(this.currentRow.genKey)
+            this.udiImportDetailVisible = true;
+
+        },
+        cancelDialog() {
+            this.udiImportDetailVisible = false;
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        deleteDialog(rowId) {
+            this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let dQuery = {
+                        id: rowId,
+                    };
+                    deleteLog(dQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                            this.getList();
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+                })
+                .catch(() => {
+                });
+        },
+
+        init() {
+            axios.get("./config.json").then(res => {
+                let response = res.data.UDI_SYNC_SERVER_IP + "";
+                this.uploadFileUrl = response + "udisync/udiInfo/zipUpload";
+            });
+        },
+
+        handleExceed() {
+            this.$message.error("上传数量超出！");
+        },
+        handleBefore() {
+            this.loading = true;
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.loading = false;
+                this.$message.error(response.message);
+            } else {
+                this.loading = false;
+                this.$message.success(response.data);
+            }
+        },
+
+        statusFilterType(status) {
+            const statusMap = {
+                0: "warning",
+                1: "warning",
+                2: "danger",
+                3: "success",
+            };
+            return statusMap[status];
+        },
+    },
+    mounted() {
+    },
+    components: {udiInfoImportDetail},
+    created() {
+        this.getList();
+        this.init();
+    },
+};
+</script>
+<style>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
+</style>

src/views/business/stockOrderDelSearch.vue

@@ -0,0 +1,714 @@
+<template>
+    <div>
+        <el-card class="el-card">
+            <el-form
+                :inline="true"
+                :model="query"
+                class="query-form"
+                size="mini"
+
+            >
+                <el-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.billNo" placeholder="单据号"></el-input>
+                    </el-form-item>
+                    <!--                    <el-form-item class="query-form-item">-->
+                    <!--                        <el-select v-model="query.status" placeholder="单据状态">-->
+                    <!--                            <el-option label="全部" value=""></el-option>-->
+                    <!--                            <el-option label="草稿" value="1"></el-option>-->
+                    <!--                            <el-option label="未配货" value="2"></el-option>-->
+                    <!--                            <el-option label="待校验" value="3"></el-option>-->
+                    <!--                            <el-option label="已校验" value="4"></el-option>-->
+                    <!--                        </el-select>-->
+                    <!--                    </el-form-item>-->
+                    <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                        <el-date-picker
+                            :picker-options="pickerOptions"
+                            v-model="actDateRange"
+                            type="daterange"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                        </el-button-group>
+                    </el-form-item>
+
+                </el-row>
+            </el-form>
+            <el-table v-loading="loading"
+                      :data="list"
+                      style="width: 100%; " highlight-current-row
+                      @row-click="getStockOrderDetailList" ref="multipleTable">
+<!--                <el-table-column-->
+                <!--                    type="selection"-->
+                <!--                    width="55">-->
+                <!--                </el-table-column>-->
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="供应商名称" prop="corpName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单据来源" prop="sourceType" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ sourceMap[scope.row.sourceType] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                <el-table-column label="单据状态">
+                    <template slot-scope="scope">
+                        {{ scope.row.status | statusFilterName }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="业务类型" prop="billType">
+                    <template slot-scope="scope">
+                        <span>{{ getActionName(scope.row.billType) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200">
+                    <template slot-scope="scope">
+                        <!--                        <el-button-->
+                        <!--                            type="text"-->
+                        <!--                            size="small"-->
+                        <!--                            @click.native="qrcodeDetail(scope.row)"-->
+                        <!--                        >码详情-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
+                        <!--                        <el-button-->
+                        <!--                            type="text"-->
+                        <!--                            size="small"-->
+                        <!--                            @click.native="printOrder(scope.row)"-->
+                        <!--                            v-if="haveDistributionVisible"-->
+                        <!--                        >打印订单-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-pagination
+                :page-size="query.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            >
+            </el-pagination>
+        </el-card>
+
+        <el-card class="el-card">
+            <el-table v-loading="detailLoading"
+                      :data="detailList"
+                      style="width: 100%">
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column label="产品通用名" prop="productName"></el-table-column>
+                <el-table-column label="包装规格" prop="spec"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <el-table-column label="单据数量" prop="count"></el-table-column>
+                <el-table-column label="实际数量" prop="reCount"></el-table-column>
+                <el-table-column label="价格" prop="price"></el-table-column>
+            </el-table>
+
+            <el-pagination
+                :page-size="detailQuery.limit"
+                @current-change="detailHandleCurrentChange"
+                layout="prev, pager, next"
+                :total="detailTotal"
+            >
+            </el-pagination>
+        </el-card>
+
+
+        <el-dialog
+            title="配货"
+            :visible.sync="distributionVisible"
+            width="60%"
+            v-if="distributionVisible"
+            @close='closeDialog'
+        >
+            <stockOrderDistribution
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+            ></stockOrderDistribution>
+        </el-dialog>
+
+        <el-dialog
+            title="编辑"
+            :visible.sync="detailFormVisible"
+            :before-close="hideDetailForm"
+            width="85%"
+            top="5vh"
+        >
+            <el-form :model="detailFormData" :rules="detailFormRules" ref="dataForm">
+
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>产品通用名：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="productName">
+                            <el-input v-model="detailFormData.productName" auto-complete="off"
+                                      :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>包装规格：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="spec">
+                            <el-input v-model="detailFormData.spec" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>单据数量：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="count">
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>实际数量：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="reCount">
+                            <el-input v-model="detailFormData.reCount" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>生产日期：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="productDate">
+                            <el-input v-model="detailFormData.productDate" auto-complete="off"
+                                      :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>失效日期：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="expireDate">
+                            <el-input v-model="detailFormData.expireDate" auto-complete="off"
+                                      :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>批次号：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="batchNo">
+                            <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>扫码数量：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="sweepCount">
+                            <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"
+                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="hideDetailForm">取消</el-button>
+                <el-button
+                    type="primary"
+                    @click.native="submitUploadDetail()"
+                    :loading="detailFormLoading"
+                >提交
+                </el-button
+                >
+            </div>
+        </el-dialog>
+
+        <el-dialog
+            title="码详情"
+            :visible.sync="qrcodeDetailVisible"
+            width="70%"
+            v-if="qrcodeDetailVisible"
+            @close='closeQRCodeDetailDialog'
+        >
+            <stockOrderQRCodeDetail
+                :closeDialog="closeQRCodeDetailDialog"
+                :idQuery="idQuery"
+            ></stockOrderQRCodeDetail>
+        </el-dialog>
+
+        <el-dialog
+            title="码管理"
+            :visible.sync="qrcodeExportVisible"
+            width="60%"
+            v-if="qrcodeExportVisible"
+            @close='closeQRCodeExportDialog'
+        >
+            <stockQRCodeExport
+                :closeDialog="closeQRCodeExportDialog"
+                :idQuery="idQuery"
+            ></stockQRCodeExport>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    stockOrderList, stockOrderDetail,
+    deleteStockOrderById, deleteStockOrderDetailById,
+    copyStockOrderDetail, submitStockOrder,
+    uploadStockOrderDetail, uploadStockOrderDetailCount,
+    generateStockOrderQRCodeText
+} from "../../api/inout/stockOrder";
+import stockOrderDistribution from "./stockOrderDistribution";
+import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
+import stockQRCodeExport from "./stockQRCodeExport";
+import draggable from "vuedraggable";
+import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
+import store from "../../store";
+import {getLocalJoinBusType} from "../../api/basic/busLocalType";
+
+export default {
+    name: "stockOrderDelSearch",
+    data() {
+        return {
+            query: {
+                startTime: "",
+                endTime: "",
+                billNo: "",
+                status: 5,
+                page: 1,
+                limit: 10
+            },
+            detailQuery: {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
+            },
+            busTypes: [],
+            list: [],
+            detailList: [],
+            total: 0,
+            detailTotal: 0,
+            loading: false,
+            detailLoading: false,
+            idQuery: {
+                id: "",
+            },
+            distributionVisible: false,
+            detailFormRules: {
+                batchNo: [
+                    {required: true, message: "请输入批次号", trigger: "blur"}
+                ],
+                productDate: [
+                    {required: true, message: "请输入生产日期", trigger: "blur"}
+                ],
+                expireDate: [
+                    {required: true, message: "请输入失效日期", trigger: "blur"}
+                ],
+                sweepCount: [
+                    {required: true, message: "请输入扫码数量", trigger: "blur"}
+                ]
+            },
+            sourceMap: {
+                "1": "网页新增",
+                "2": "第三方系统",
+                "3": "扫码单据",
+            },
+            detailFormVisible: false,
+            detailFormData: {},
+            detailFormLoading: false,
+            haveDistributionVisible: true,
+            qrcodeDetailVisible: false,
+            qrcodeExportVisible: false,
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+        }
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: ""
+            });
+            this.query = {
+                billNo: "",
+                status: 5,
+                startTime: "",
+                endTime: "",
+                page: 1,
+                limit: 10
+            };
+            this.getList();
+            this.haveDistributionVisible = true;
+            this.actDateRange = [];
+        },
+        onSubmit() {
+            if (this.actDateRange !== null) {
+                this.query.startTime = this.actDateRange[0];
+                this.query.endTime = this.actDateRange[1];
+            } else {
+                this.query.startTime = null;
+                this.query.endTime = null;
+            }
+            this.getList();
+            if (this.query.status === "202" || this.query.status === "502") {
+                this.haveDistributionVisible = true;
+            } else {
+                this.haveDistributionVisible = false;
+            }
+        },
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getList();
+        },
+        detailHandleCurrentChange(val) {
+            this.query.page = val;
+            this.getStockOrderDetailList();
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
+        getList() {
+            this.loading = true;
+            this.query.corpId = store.getters.customerId;
+            stockOrderList(this.query)
+                .then(response => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.detailList = [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                    this.detailList = [];
+                });
+        },
+        distributionForm(index, row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.distributionVisible = true;
+            }
+        },
+        closeDialog(type) {
+            this.distributionVisible = false;
+            this.getList();
+            if (this.$isNotBlank(type)) {
+                this.detailList = [];
+            }
+        },
+        printQRCodeText(row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.qrcodeExportVisible = true;
+            }
+        },
+        printOrder(row) {
+            let tQuery = {queryId: row.id,}
+            this.loading = true;
+            inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                if (response.code === 20000) {
+                    tQuery = {
+                        id: row.id,
+                    }
+                    stockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                        //将pdf文件转换为url。
+                        const binaryData = [];
+                        binaryData.push(response);
+                        //获取blob链接。
+                        let url = window.URL.createObjectURL(
+                            new Blob(binaryData, {type: "application/pdf"})
+                        );
+                        this.loading = false;
+                        window.open(url);//打开新标签页，预览pdf。
+                    }).catch(() => {
+                        this.loading = false;
+                    });
+                } else {
+                    this.loading = false;
+                    this.$message.error(response.message);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        closeQRCodeExportDialog() {
+            this.qrcodeExportVisible = false;
+            this.getList();
+        },
+        qrcodeDetail(row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.qrcodeDetailVisible = true;
+            }
+        },
+        closeQRCodeDetailDialog() {
+            this.qrcodeDetailVisible = false;
+            this.getList();
+        },
+        getStockOrderDetailList(row) {
+            if (this.$isNotBlank(row)) {
+                this.detailQuery.orderIdFk = row.id;
+            }
+            this.detailLoading = true;
+            stockOrderDetail(this.detailQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.detailLoading = false;
+                    this.detailList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.detailLoading = false;
+                    this.detailList = [];
+                });
+        },
+        deleteStockOrder(row) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.loading = true;
+                deleteStockOrderById({id: row.id})
+                    .then(response => {
+                        this.loading = false;
+                        if (response.code === 20000) {
+                            this.$message.success(response.data);
+                            this.getList();
+                            this.detailList = [];
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    })
+            }).catch(() => {
+
+            });
+        },
+        copyDetail(row) {
+            this.$confirm("是否复制该记录?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                let tQuery = {
+                    id: row.id
+                }
+                this.detailLoading = true;
+                copyStockOrderDetail(tQuery)
+                    .then((response) => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success("复制成功");
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    });
+            }).catch(() => {
+            });
+        },
+        deleteStockOrderDetail(row) {
+            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.detailLoading = true;
+                deleteStockOrderDetailById({id: row.id})
+                    .then(response => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success(response.data);
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.detailLoading = false;
+                    })
+            }).catch(() => {
+
+            });
+        },
+        // 显示表单
+        handleDetailForm(index, row) {
+            this.detailFormVisible = true;
+            this.detailFormData = {};
+            if (row !== null) {
+                this.detailFormData = Object.assign({}, row);
+            }
+        },
+        hideDetailForm() {
+            // 更改值
+            this.detailFormVisible = !this.detailFormVisible;
+            return true;
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].localAction === action) {
+                    return this.busTypes[i].localName;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinBusType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        submitUploadDetail() {
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    this.detailLoading = true;
+                    let tQuery = this.detailFormData;
+                    uploadStockOrderDetail(tQuery).then((response) => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success("修改完成");
+                            this.hideDetailForm();
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$alert(response.message, '提示', {
+                                confirmButtonText: '确定',
+                                type: 'warning',
+                                closeOnClickModal: true,
+                                callback: action => {
+                                    this.$refs.inputRef.focus();
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    },
+    components: {
+        draggable,
+        stockOrderDistribution,
+        stockOrderQRCodeDetail,
+        stockQRCodeExport,
+    },
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                0: "gray",
+                1: "success"
+            };
+            return statusMap[status];
+        },
+        statusFilterName(status) {
+            const statusMap = {
+                "1": "草稿",
+                "2": "未配货",
+                "3": "待校验",
+                "4": "已校验",
+                "5": "已核对",
+            };
+            return statusMap[status];
+        },
+        typeFilterName(type) {
+            const typeMap = {
+                1: "预入库",
+                2: "普通采购",
+            };
+            return typeMap[type];
+        }
+    },
+    created() {
+        this.getBusType();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+        this.getList();
+    }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/business/stockOrderEditor.vue

@@ -30,9 +30,9 @@
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-<!--                            <el-button type="primary" icon="search" @click="selectThrOrderFunction()"-->
-<!--                                       :loading="loading">选入订单-->
-<!--                            </el-button>-->
+                            <el-button type="primary" icon="search" @click="selectThrOrderFunction()"
+                                       :loading="loading">选入订单
+                            </el-button>
                         </el-button-group>
                     </el-form-item>
                 </el-row>

src/views/business/stockOrderNewDistribution.vue

@@ -250,26 +250,6 @@
                                      prop="spec"
                                      show-overflow-tooltip
                     ></el-table-column>
-                    <!--                    <el-table-column-->
-                    <!--                        label="批次号"-->
-                    <!--                        prop="batchNo"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="生产日期"-->
-                    <!--                        prop="productDate"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="失效日期"-->
-                    <!--                        prop="expireDate"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="数量"-->
-                    <!--                        prop="count"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
                     <el-table-column width="150" label="批次号">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.batchNo"
@@ -292,7 +272,7 @@
                                       placeholder="请输入失效日期" style="width: 80%"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column width="150" label="单据数量">
+                    <el-table-column width="150" label="产品数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
                                       placeholder="请输入数量" style="width: 80%"
@@ -301,11 +281,15 @@
                                       oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </template>
                     </el-table-column>
-                    <!--<el-table-column width="150"-->
-                                     <!--label="单据数量"-->
-                                     <!--prop="count"-->
-                                     <!--show-overflow-tooltip-->
-                    <!--&gt;</el-table-column>-->
+
+                    <el-table-column width="150" label="产品价格">
+                        <template slot-scope="scope">
+                            <el-input size="small" v-model="scope.row.price"
+                                      placeholder="请输入价格" style="width: 80%"
+                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+                        </template>
+                    </el-table-column>
+
                     <el-table-column width="150"
                                      label="批准文号"
                                      prop="zczbhhzbapzbh"

src/views/business/stockOrderWaitCheck.vue

@@ -70,13 +70,13 @@
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native="qrcodeDetail(scope.row)"
-                        >码详情
-                        </el-button
-                        >
+<!--                        <el-button-->
+<!--                            type="text"-->
+<!--                            size="small"-->
+<!--                            @click.native="qrcodeDetail(scope.row)"-->
+<!--                        >码详情-->
+<!--                        </el-button-->
+<!--                        >-->
 <!--                        <el-button-->
 <!--                            type="text"-->
 <!--                            size="small"-->

src/views/inout/DialogSelectErpOrder.vue

@@ -109,7 +109,7 @@
                     show-overflow-tooltip
                     prop="billdate"
                 ></el-table-column>
-                <el-table-column label="原单据类型" prop="originType">
+                <el-table-column label="第三方单据类型" prop="originType">
                 </el-table-column>
 
                 <!-- <el-table-column label="下载状态" prop="isDownload"></el-table-column> -->
@@ -291,7 +291,7 @@
 
             importErps() {
                 var selectData = this.multipleSelection;
-
+                this.postQuery.purchaseinResponses =[];
                 selectData.forEach((obj, index) => {
                     this.postQuery.purchaseinResponses.push(obj);
                 });

src/views/inout/DialogSelectRl.vue

@@ -0,0 +1,885 @@
+<template>
+    <div>
+        <el-table
+            v-loading="loading"
+            :data="list"
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column
+                label="最小销售产品标识"
+                prop="nameCode"
+                width="140"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="产品编码"
+                prop="thirdId"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="生产企业"
+                prop="ylqxzcrbarmc"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="产品通用名"
+                prop="cpmctymc"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="规格型号"
+                prop="ggxh"
+                show-overflow-tooltip
+            ></el-table-column>
+
+            <el-table-column
+                label="注册/备案凭证"
+                prop="zczbhhzbapzbh"
+                show-overflow-tooltip
+            ></el-table-column>
+
+
+            <el-table-column
+                label="器械类别"
+                prop="qxlb"
+                show-overflow-tooltip
+            ></el-table-column>
+
+            <el-table-column width="200" label="操作" fixed="right">
+                <template slot-scope="scope">
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="handleModifyClick(scope.row)"
+                    >详情
+                    </el-button>
+
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="bindId(scope.row)"
+                    >选入绑定
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-dialog
+            title="产品信息编辑"
+            :visible.sync="editDialogVisible"
+            :close-on-click-modal="false"
+            append-to-body
+            :close-on-press-escape="false"
+            width="70%"
+            v-if="editDialogVisible"
+        >
+
+            <el-table :data="sysList" style="width: 100%" border>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column
+                    label="系统名称"
+                    prop="sysName"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="产品编码"
+                    prop="thirdId"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="产品名称"
+                    prop="thirdName"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+            </el-table>
+            <el-table
+                v-loading="loading"
+                :data="detailList"
+                style="width: 100%; margin-top: 20px"
+                border
+                @current-change="handleDetail"
+            >
+                <el-table-column
+                    label="产品标识"
+                    prop="nameCode"
+                    show-overflow-tooltip
+                ></el-table-column>
+
+                <el-table-column
+                    label="产品通用名"
+                    prop="cpmctymc"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="包装级别"
+                    prop="packLevel"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="包装层级"
+                    prop="bzcj"
+                    show-overflow-tooltip
+                ></el-table-column>
+            </el-table>
+
+            <el-form
+                :model="editQuery"
+                :rules="rules"
+                ref="editQuery"
+                label-width="100px"
+                style="margin-top: 20px"
+            >
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品名称:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.cpmctymc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品标识:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.nameCode"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+
+                </el-row>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>规格型号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ggxh"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>器械类别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.qxlb"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>产品类别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.cplb"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>分类编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.flbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>商品条码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.sptm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>医保编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%" :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ybbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>医疗器械注册人:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="ylqxzcrbarmc"
+                                v-model="editQuery.ylqxzcrbarmc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>注册人英文名称:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.ylqxzcrbarywmc"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>统一社会信用号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.tyshxydm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>注册证/备案号:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.zczbhhzbapzbh"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>上级产品编码:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="true"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.sjcpbm"
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包装级别:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.packLevel"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>计量单位/包装级别:&nbsp;</span>
+                            </div>
+
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bzcj"
+                                :disabled="true"
+
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含下级包装数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                splaceholder="请输入内容"
+                                :disabled="true"
+                                v-model="editQuery.bhxjsl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含下级产品编码:&nbsp;</span>
+                            </div>
+
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bhxjcpbm"
+
+                            ></el-input>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>包含最小销售包装数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                size="small"
+                                :disabled="true"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.bhzxxsbzsl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>最小包装单元内包含使用单元数量:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                                v-model="editQuery.zxxsbzbhsydysl"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>生产厂家:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                    </el-col>
+                    <el-col :span="4" class="el-col">
+                        <el-form-item prop="name">
+                            <el-checkbox v-model="checked" class="text item itemTag"
+                                         :disabled="!isUseDyCheck"
+                            >以使用单元数量入库
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3" class="el-col">
+                        <el-form-item prop="name">
+                            <el-checkbox v-model="editQuery.isLock" class="text item itemTag" :disabled="true"
+                            >是否锁定
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3" class="el-col">
+                        <el-form-item prop="name">
+                            <el-checkbox v-model="editQuery.isDisable" class="text item itemTag" :disabled="true"
+                            >是否禁用
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+            </el-form>
+
+            <div style="text-align: center">
+                <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
+                >提交
+                </el-button>
+                <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+                >取消
+                </el-button>
+            </div>
+        </el-dialog>
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+
+
+    </div>
+</template>
+
+<script>
+import {
+    getUdiInfos, getAllUdiInfos,
+    deletetUdiInfos,
+    thirdSysDetail,
+    removeRl, sysFilter
+} from "../../api/basic/udiRelevance";
+import {selectSysParamByKey} from "../../api/param/systemParamConfig";
+import {filterByUuid} from "../../api/basic/udiInfo";
+import {updateBind} from "../../api/inout/order"
+
+import selectUdi from "../basic/UdiInfoRelevance.vue";
+import selectErp from "../basic/UdiInfoselectErpUdi";
+import selectLocalUdi from "../basic/UdiInfoSelectLocalUdi";
+
+export default {
+    name: "DialogSelectRl",
+    props: {
+        curRow: {
+            type: Object,
+            required: true,
+        },
+        closeBindDialog: {
+            type: Function,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            filterQuery: {
+                nameCode: null,
+                page: 1,
+                limit: 20,
+            },
+            loading: false,
+            editQuery: null,
+            relevanceEdit: {
+                id: null,
+                thirdId: "",
+                isDisable: null,
+                isUseDy: false,
+                isLock: null,
+            },
+            defaultSys: null,
+            isImport: false,
+            isImportUdi: false,
+            isUploadSmp: false,
+            isImportFile: false,
+            uploadFileUrl: null,
+            checked: false,
+            list: [],
+            detailList: [],
+            sysList: [],
+            filterList: [],
+            total: 0,
+            thirdNo: "",
+            uuid: "111",
+            thirdId: null,
+            relId: "",
+            thisData: {
+                nameCode: null,
+                cpmctymc: null,
+                ggxh: null
+            },
+            multipleSelection: [],
+            editDialogVisible: false,       //详情
+            selectUdiDialogVisible: false,  //关联选入
+            selectErpDialogVisible: false,  //选入ERP产品
+            selectLocalVisible: false,      //关联UDI
+            isUseDyCheck: false,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                nameCode: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.filterQuery.nameCode = this.curRow.nameCode;
+            getAllUdiInfos(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+
+        keyup_submit(event) {
+            this.filterQuery.page = 1;
+            this.getList();
+            event.target.select();
+        },
+        getDetailList(detailQuery) {
+            this.loading = true;
+            filterByUuid(detailQuery)
+                .then((response) => {
+                    this.isUseDyCheck = false;
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                    this.detailList.forEach((item, index, array) => {
+                        if (item.zxxsbzbhsydysl > 1) {
+                            this.isUseDyCheck = true;
+                        }
+                    });
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+
+        handleDetail(row) {
+            this.editQuery = row;
+            console.log(row);
+        },
+        deleteOrders(data) {
+            this.loading = true;
+            let tquery = {
+                id: data.id + "",
+            };
+
+            deletetUdiInfos(tquery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
+
+        intentDetail() {
+            this.isImportUdi = false;
+            this.selectUdiDialogVisible = true;
+        },
+        addSelectErp(row) {
+            this.defaultSys = row.sysId;
+            this.isImport = false;
+            this.selectErpDialogVisible = true;
+        },
+
+        removeErp(row) {
+            this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let query = {
+                        relId: this.editQuery.relId,
+                        thirdSys: row.sysId
+                    };
+                    removeRl(query)
+                        .then((response) => {
+                            if (response.code == 20000) {
+                                this.getThirdSysDetail()();
+                                this.$message({
+                                    type: "success",
+                                    message: "删除成功！",
+                                });
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                        });
+                })
+                .catch(() => {
+                });
+        },
+        bindId(val) {
+            let query = {
+                id: this.curRow.id,
+                bindRlFk: val.id
+            };
+            updateBind(query).then((response) => {
+                if (response.code == 20000) {
+                    this.$message.success("绑定成功");
+                    this.closeBindDialog(this.curRow.id);
+                } else {
+                    this.$message.error("绑定失败");
+                }
+            }).catch(() => {
+
+            });
+
+        },
+
+        handleSelectionChange(val) {
+            console.log("----" + val);
+        },
+
+        cancelDialog() {
+            this.editDialogVisible = false;
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleModifyClick(row) {
+            this.uuid = row.uuid;
+            this.relId = row.relId;
+            this.isImport = false;
+            this.thisData = row;
+            this.editDialogVisible = true;
+            this.editQuery = row;
+            this.relevanceEdit = {
+                id: row.id,
+                // thirdId: row.thirdId,
+                isUseDy: row.isUseDy,
+                isDisable: row.isDisable,
+                isLock: row.isLock,
+            };
+            this.checked = row.isUseDy == 1;
+
+            let ttquery = {
+                uuid: row.uuid,
+                page: 1,
+                limit: 10,
+            };
+            console.log("this.editQuery.isUseDy = " + this.editQuery.isUseDy);
+
+            this.getDetailList(ttquery);
+            this.getThirdSysDetail();
+        },
+        closeUdi(val) {
+            this.selectUdiDialogVisible = false;
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+            this.getThirdSysDetail();
+            if (val) {
+                this.getList();
+            }
+        },
+        getThirdSysDetail() {
+            let query = {
+                id: this.relevanceEdit.id,
+            };
+
+            thirdSysDetail(query)
+                .then((response) => {
+                    this.loading = false;
+                    this.sysList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.sysList = [];
+                });
+        },
+        getSysFilter() {
+            sysFilter()
+                .then((response) => {
+                    this.loading = false;
+                    this.filterList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.filterList = [];
+                });
+
+        },
+
+
+        closeDialog() {
+            this.selectErpDialogVisible = false;
+            this.selectLocalVisible = false;
+        },
+
+        selectSysParam() {
+            let query = {
+                paramKey: "smp_isUploadProuct",
+            };
+            selectSysParamByKey(query).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isUploadSmp = true;
+                    }
+                }
+            });
+            let query1 = {
+                paramKey: "upload_pi_file_enabled",
+            };
+            selectSysParamByKey(query1).then((response) => {
+                if (response.code == 20000) {
+                    if (response.data.paramValue == "1") {
+                        this.isImportFile = true;
+                    }
+                }
+            });
+            let query2 = {
+                paramKey: "upload_pi_file_url",
+            };
+            selectSysParamByKey(query2).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.paramValue;
+                }
+            });
+        },
+    }
+    ,
+    mounted() {
+    }
+    ,
+    components: {
+        selectUdi,
+        selectErp,
+        selectLocalUdi,
+    }
+    ,
+    created() {
+        this.getList();
+    }
+    ,
+}
+;
+</script>
+<style scoped>
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
+</style>

src/views/inout/IOAdditionalOrder.vue

@@ -0,0 +1,530 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.id" placeholder="单号"></el-input>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.mainAction" placeholder="出入库类型">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="入库" value="WareHouseIn"></el-option>
+                            <el-option label="出库" value="WareHouseOut"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.action" placeholder="请选择业务类型">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.action">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="扫码单据类型" prop="action">
+                    <template slot-scope="scope">
+                        <span>{{ getActionName(scope.row.action) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="订单号" prop="id"></el-table-column>
+                <!--                <el-table-column label="来源订单号" prop="corpOrderId"></el-table-column>-->
+                <el-table-column label="来源" prop="fromType">
+                    <template slot-scope="scope">
+                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                    </template>
+
+                </el-table-column>
+                <el-table-column label="往来单位" prop="fromCorp" width="220">
+                    <template slot-scope="scope">
+                        <!--                    {{ scope.row.fromCorp }}-->
+
+                        <p v-if="scope.row.fromCorp == null">
+                            <el-button
+                                type="primary"
+                                size="mini"
+                                @click.native.stop="handleUnitClick(scope.row)"
+                            >选择往来单位
+                            </el-button
+                            >
+                        </p>
+                        <p v-if="scope.row.fromCorp !== null">
+                            <el-button
+                                type="primary"
+                                size="mini"
+                                @click.native.stop="handleUnitClick(scope.row)"
+                            >{{ scope.row.fromCorp }}
+                            </el-button
+                            >
+                        </p>
+
+                    </template>
+
+                </el-table-column>
+                <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <i class="el-icon-time"></i>
+                        <span>{{ scope.row.actDate }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="单据状态" prop="status" width="100">
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.status == 3) | statusFilterType">{{
+                                checkStatus[scope.row.status]
+                            }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="300" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="addOrders(scope.row)"
+                        >编辑
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            v-if="scope.row.status !== -1"
+                            @click.native.stop="intentDetail(scope.row)"
+                        >详情
+                        </el-button
+                        >
+
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            v-if="scope.row.status !== -1"
+                            @click.native.stop="onUpload(scope.row.id)"
+                        >提交
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+        <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%" :append-to-body='true'>
+            <span>{{ errorDetail }}</span>
+            <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+        >关 闭</el-button
+        >
+      </span>
+        </el-dialog>
+        <el-dialog
+            title="选择往来单位"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="dialogTableVisible"
+            append-to-body
+            width="70%"
+        >
+            <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
+                <el-form-item class="query-form-item">
+                    <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="search"
+                        @click.native.stop="getUnitList()"
+                    >查询
+                    </el-button
+                    >
+                </el-form-item>
+            </el-form>
+
+            <el-table
+                v-loading="loading"
+                :data="unitlist"
+                style="width: 100%"
+                @row-click="selectUnit"
+            >
+                <el-table-column
+                    label="往来单位ID"
+                    prop="erpId"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="往来单位名称"
+                    prop="name"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="往来单位简写"
+                    prop="spell"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="地址"
+                    prop="addr"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column label="状态" prop="status"></el-table-column>
+                <el-table-column label="类型" prop="type"></el-table-column>
+            </el-table>
+        </el-dialog>
+
+        <el-dialog
+            title="单号详情"
+            :visible.sync="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="80%"
+            v-if="codeDetailVisible"
+        >
+            <codeDetail
+                :idQuery="idQuery"
+                v-on:closeDetailDialog="closeDetailDialog"
+            ></codeDetail>
+        </el-dialog>
+        <el-pagination
+            :page-size="filterQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+
+        <el-dialog
+            title="新增订单"
+            :visible.sync="addOrderVisible"
+            width="75%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="addOrderVisible"
+            @close='closeDialog'
+        >
+            <addOrder
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :addType="addType"
+            ></addOrder>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    orderListByStatus,
+    deleteByOrderId,
+    updateUnit,
+} from "../../api/inout/order";
+
+import draggable from "vuedraggable";
+import codeDetail from "./IONewCode";
+import addOrder from "./IOAddOrder";
+import store from "../../store";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+
+const formJson = {
+    site_id: "",
+    site_name: "",
+    describe: "",
+    ads: [],
+};
+
+export default {
+    name: "AdditionalOrder",
+    data() {
+        return {
+            filterQuery: {
+                id: "",
+                mainAction: null,
+                action: null,
+                page: 1,
+                limit: 20,
+            },
+            checkStatus: {
+                '-1': "等待提交",
+                // 1: "等待处理",
+                1: "等待处理",
+                2: "等待校验",
+                3: "校验异常",
+                4: "校验成功",
+                5: "等待处理",
+            },
+            curIndex: "",
+            unitquery: {key: "", page: 1, limit: 20},
+            unitlist: [],
+            unitUpdateQuery: {
+                id: "",
+                fromCorpId: "",
+                fromCorp: "",
+            },
+            idQuery: {
+                id: "",
+            },
+            addOrderVisible: false,
+            fromTypeMap: {
+                "1": "UDIMS平台",
+                "2": "网页新增",
+                "3": "pda即时校验",
+                "4": "pda未校验",
+                "5": "pc端扫码精灵",
+                "6": "补录单据",
+                "7": "UDI供应商平台"
+            },
+            list: [],
+            adId: [],
+            adSelectList: [],
+            adList: {},
+            adListNoDataText: "无数据",
+            queryAdIdAsyncLoading: false,
+            codeDetailVisible: false,
+            total: 0,
+            loading: true,
+            index: null,
+            formName: null,
+            errorDetail: "1111111111111",
+            formMap: {
+                add: "新增",
+                edit: "编辑",
+            },
+            addType: "edit",
+            deleteData: {
+                id: "",
+            },
+            dialogTableVisible: false,
+            formLoading: false,
+            dialogVisible: false,
+            formData: formJson,
+            deleteLoading: false,
+            busTypes: [],
+        };
+    },
+    components: {
+        draggable,
+        codeDetail,
+        addOrder,
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.loading = true;
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            this.dialogTableVisible = true;
+        },
+        closeDetailDialog(val) {
+            this.codeDetailVisible = false;
+        },
+
+        closeDialog() {
+            this.addOrderVisible = false;
+            this.getList();
+        },
+        getUnitList() {
+            this.loading = true;
+            getBasicUnitMaintains(this.unitquery)
+                .then((response) => {
+                    this.loading = false;
+                    this.unitlist = response.data.page.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
+
+        selectUnit(row) {
+            console.log(row.id);
+            this.unitUpdateQuery.id = this.curIndex;
+            this.unitUpdateQuery.fromCorp = row.name;
+            this.unitUpdateQuery.fromCorpId = row.erpId;
+            updateUnit(this.unitUpdateQuery)
+                .then((response) => {
+                    this.dialogTableVisible = false;
+                    this.getList();
+                })
+                .catch(() => {
+                    this.dialogTableVisible = false;
+                });
+        },
+        //获取订单列表
+        getList() {
+            this.loading = true;
+            this.filterQuery.status = 5;
+            orderListByStatus(this.filterQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+        deleteOrders(data) {
+            this.loading = true;
+            this.deleteData.id = data;
+            deleteByOrderId(this.deleteData)
+                .then((response) => {
+                    this.getList();
+                    this.$message({
+                        type: "success",
+                        message: "删除成功！",
+                    });
+                })
+                .catch(() => {
+                });
+        },
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
+
+        onUpload(data) {
+            this.loading = true;
+            var idQuery = {
+                orderId: "",
+            };
+            idQuery.orderId = data;
+            addCommitOrder(idQuery)
+                .then((response) => {
+                    if (response.code === 20000) {
+                        this.$message.success(response.data);
+                        this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        handleErrorDetail(poistion) {
+            var mOrder = this.list[poistion];
+            var corpOrderId = mOrder.remark;
+
+            this.errorDetail = mOrder.remark;
+            console.log(corpOrderId + "  " + mOrder + "  " + mOrder.remark);
+            this.dialogVisible = true;
+        },
+
+        intentDetail(row) {
+            this.codeDetailVisible = true;
+            this.idQuery.id = row.id;
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
+        addOrders(row) {
+            console.log(row)
+            this.idQuery.id = '';
+            this.idQuery.actDate = '';
+            this.idQuery.corpOrderId = '';
+            this.idQuery.billType = row.action;
+            if (row.id !== null && row.id !== undefined && row.id !== '') {
+                this.idQuery.id = row.id;
+                this.idQuery.actDate = row.actDate;
+                this.idQuery.corpOrderId = row.corpOrderId;
+            }
+            this.addOrderVisible = true;
+        },
+    },
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "success",
+                true: "danger",
+            };
+            return statusMap[status];
+        },
+    },
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+        this.getBusType();
+        let query = this.$route.query;
+        this.filterQuery = Object.assign(this.filterQuery, query);
+        this.filterQuery.limit = parseInt(this.filterQuery.limit);
+        // 加载表格数据
+        this.getList();
+    },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>

src/views/inout/IOCheckErrorOrder.vue

@@ -13,7 +13,6 @@
                     </el-form-item>
 
 
-
                     <el-form-item class="query-form-item">
                         <el-select
                             v-model="filterQuery.mainAction"
@@ -96,7 +95,12 @@
                   prop="corpOrderId"
                   :show-overflow-tooltip="true"
                 ></el-table-column> -->
-                <el-table-column label="来源" prop="fromType"></el-table-column>
+                <el-table-column label="来源" prop="fromType">
+                    <template slot-scope="scope">
+                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                    </template>
+
+                </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="220">
                     <template slot-scope="scope">
                         <p v-if="scope.row.fromCorp == null">
@@ -260,6 +264,19 @@
                     prop="authCode"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
+
+                <el-table-column label="操作" fixed="right" width="120">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            :disabled="scope.row.bindStatus === 0 "
+                            @click.native.stop="bindRl(scope.row)"
+                        >绑定
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
             </el-table>
         </el-card>
         <el-dialog
@@ -316,6 +333,7 @@
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             width="80%"
+            append-to-body
             v-if="addDialogVisible"
         >
             <selectErpOrder
@@ -328,6 +346,7 @@
             title="单号详情"
             :visible.sync="codeDetailVisible"
             width="80%"
+            append-to-body
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             v-if="codeDetailVisible"
@@ -337,7 +356,17 @@
                 v-on:closeDetailDialog="closeDetailDialog"
             ></codeDetail>
         </el-dialog>
-
+        <el-dialog
+            title="绑定产品ID"
+            :visible.sync="selectRlVisible"
+            width="80%"
+            v-if="selectRlVisible"
+        >
+            <selectRlDialog
+                :curRow="curRow"
+                :closeBindDialog="closeBindDialog"
+            ></selectRlDialog>
+        </el-dialog>
         <el-dialog
             title="校验信息"
             :visible.sync="errDialogVisible"
@@ -347,8 +376,8 @@
         >
             <span>{{ errorDetail }}</span>
             <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="errDialogVisible = false">关 闭</el-button>
-      </span>
+                    <el-button type="primary" @click="errDialogVisible = false">关 闭</el-button>
+            </span>
         </el-dialog>
     </div>
 </template>
@@ -371,6 +400,7 @@ import draggable from "vuedraggable";
 import {saveAs} from "file-saver";
 import codeDetail from "./IOFinishCode";
 import selectErpOrder from "./DialogSelectErpOrder";
+import selectRlDialog from "./DialogSelectRl";
 
 const formJson = {
     site_id: "",
@@ -431,7 +461,17 @@ export default {
             idQuery: {
                 id: "",
             },
+            fromTypeMap: {
+                "1": "UDIMS平台",
+                "2": "网页新增",
+                "3": "pda已校验",
+                "4": "pda未校验",
+                "5": "pc端扫码精灵",
+                "6": "补录单据",
+                "7": "UDI供应商平台"
+            },
             curIndex: "",
+            curRow: null,
             adListNoDataText: "无数据",
             queryAdIdAsyncLoading: false,
             codeDetailVisible: false,
@@ -448,7 +488,7 @@ export default {
                 orderId: "",
                 exportStatus: "",
             },
-
+            selectRlVisible: false,
             uploadQuery: {
                 orderId: "",
             },
@@ -498,6 +538,7 @@ export default {
         draggable,
         codeDetail,
         selectErpOrder,
+        selectRlDialog
     },
     methods: {
         onReset() {
@@ -929,6 +970,19 @@ export default {
             this.orderId = row.id;
             this.addDialogVisible = true;
         },
+        bindRl(val) {
+            this.curRow = val;
+            console.log(this.curRow.nameCode);
+            this.selectRlVisible = true;
+        },
+
+        closeBindDialog(id) {
+            this.selectRlVisible = false;
+            this.detailQuery = {
+                orderId: id,
+            };
+            this.refresgOrderDetail();
+        },
     },
     filters: {
         statusFilterType(status) {

src/views/inout/IOCheckWaitOrder.vue

@@ -107,7 +107,12 @@
                   prop="corpOrderId"
                   :show-overflow-tooltip="true"
                 ></el-table-column> -->
-                <el-table-column label="来源" prop="fromType"></el-table-column>
+                <el-table-column label="来源" prop="fromType">
+                    <template slot-scope="scope">
+                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                    </template>
+
+                </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="220">
                     <template slot-scope="scope">
                         <p v-if="scope.row.fromCorp == null">
@@ -409,6 +414,15 @@ export default {
                 0: "未校验",
                 2: "正常",
             },
+            fromTypeMap: {
+                "1": "UDIMS平台",
+                "2": "网页新增",
+                "3": "pda已校验",
+                "4": "pda未校验",
+                "5": "pc端扫码精灵",
+                "6": "补录单据",
+                "7": "UDI供应商平台"
+            },
             //往来单位
             unitquery: {key: "", page: 1, limit: 20},
             unitlist: [],

src/views/inout/IOErrorOrder.vue

@@ -52,7 +52,12 @@
             </el-table-column>
             <el-table-column label="订单号" prop="id"></el-table-column>
             <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip="true"></el-table-column>
-            <el-table-column label="来源" prop="fromType"></el-table-column>
+            <el-table-column label="来源" prop="fromType">
+                <template slot-scope="scope">
+                    <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                </template>
+
+            </el-table-column>
             <el-table-column label="往来单位" prop="fromCorp" width="220">
                 <template slot-scope="scope">
                     <p v-if="scope.row.fromCorp == null">
@@ -84,7 +89,7 @@
             <el-table-column label="状态" prop="status" width="100">
                 <template slot-scope="scope">
                     <el-tag :type="(scope.row.status == 3) | statusFilterType">{{
-                        checkStatus[scope.row.status]
+                            checkStatus[scope.row.status]
                         }}
                     </el-tag>
                 </template>
@@ -126,6 +131,7 @@
 
         <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%"
                    :close-on-click-modal="false"
+                   append-to-body
                    :close-on-press-escape="false">
             <span>{{ errorDetail }}</span>
             <span slot="footer" class="dialog-footer">
@@ -192,6 +198,7 @@
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             width="80%"
+            append-to-body
             v-if="codeDetailVisible"
         >
             <codeDetail
@@ -209,267 +216,276 @@
 </template>
 
 <script>
-    import {
-        orderListByStatus,
-        deleteByOrderId,
-        commitOrder,
-        updateUnit,
-    } from "../../api/inout/order";
-    import {getBussinessType} from "../../api/basic/bussinessType";
-    import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
-    import draggable from "vuedraggable";
-    import codeDetail from "./IONewCode";
+import {
+    orderListByStatus,
+    deleteByOrderId,
+    commitOrder,
+    updateUnit,
+} from "../../api/inout/order";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import draggable from "vuedraggable";
+import codeDetail from "./IONewCode";
 
-    const formJson = {
-        site_id: "",
-        site_name: "",
-        describe: "",
-        ads: [],
-    };
+const formJson = {
+    site_id: "",
+    site_name: "",
+    describe: "",
+    ads: [],
+};
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    id: "",
-                    mainAction: null,
-                    action: null,
-                    status: 3,
-                    page: 1,
-                    limit: 20,
-                },
-                checkStatus: {
-                    1: "等待处理",
-                    2: "等待校验",
-                    3: "处理异常",
-                    4: "已完成"
-                },
-                curIndex: "",
-                unitquery: {key: "", page: 1, limit: 20},
-                unitlist: [],
-                unitUpdateQuery: {
-                    id: "",
-                    fromCorpId: "",
-                    fromCorp: "",
-                },
-                idQuery: {
-                    id: "",
-                },
-                list: [],
-                adId: [],
-                adSelectList: [],
-                busTypes: [],
-                adList: {},
-                adListNoDataText: "无数据",
-                queryAdIdAsyncLoading: false,
-                codeDetailVisible: false,
-                total: 0,
-                loading: true,
-                index: null,
-                formName: null,
-                errorDetail: "1111111111111",
-                formMap: {
-                    add: "新增",
-                    edit: "编辑",
-                },
-                deleteData: {
-                    id: "",
-                },
-                dialogTableVisible: false,
-                formLoading: false,
-                dialogVisible: false,
-                formData: formJson,
-                deleteLoading: false,
-            };
-        },
-        components: {
-            draggable,
-            codeDetail,
-        },
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    mainAction: null,
-                    action: null,
-                    page: 1,
-                    limit: 20,
-                    status: 3
-                };
-                this.getList();
+export default {
+    data() {
+        return {
+            filterQuery: {
+                id: "",
+                mainAction: null,
+                action: null,
+                status: 3,
+                page: 1,
+                limit: 20,
             },
-            onSubmit() {
-                this.loading = true;
-                this.getList();
+            checkStatus: {
+                1: "等待处理",
+                2: "等待校验",
+                3: "处理异常",
+                4: "已完成"
             },
-            handleSizeChange(val) {
-                this.filterQuery.limit = val;
-                this.getList();
+            curIndex: "",
+            unitquery: {key: "", page: 1, limit: 20},
+            unitlist: [],
+            unitUpdateQuery: {
+                id: "",
+                fromCorpId: "",
+                fromCorp: "",
             },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
-                this.getList();
+            idQuery: {
+                id: "",
             },
-            handleUnitClick(row) {
-                this.curIndex = row.id;
-                this.dialogTableVisible = true;
+            list: [],
+            adId: [],
+            adSelectList: [],
+            busTypes: [],
+            adList: {},
+            adListNoDataText: "无数据",
+            queryAdIdAsyncLoading: false,
+            codeDetailVisible: false,
+            total: 0,
+            loading: true,
+            index: null,
+            formName: null,
+            errorDetail: "1111111111111",
+            formMap: {
+                add: "新增",
+                edit: "编辑",
             },
-            closeDetailDialog() {
-                this.codeDetailVisible = false;
+            fromTypeMap: {
+                "1": "UDIMS平台",
+                "2": "网页新增",
+                "3": "pda已校验",
+                "4": "pda未校验",
+                "5": "pc端扫码精灵",
+                "6": "补录单据",
+                "7": "UDI供应商平台"
             },
-            getUnitList() {
-                this.loading = true;
-                getBasicUnitMaintains(this.unitquery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.unitlist = response.data.page.list || [];
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                    });
+            deleteData: {
+                id: "",
             },
+            dialogTableVisible: false,
+            formLoading: false,
+            dialogVisible: false,
+            formData: formJson,
+            deleteLoading: false,
+        };
+    },
+    components: {
+        draggable,
+        codeDetail,
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                mainAction: null,
+                action: null,
+                page: 1,
+                limit: 20,
+                status: 3
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.loading = true;
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            this.dialogTableVisible = true;
+        },
+        closeDetailDialog() {
+            this.codeDetailVisible = false;
+        },
+        getUnitList() {
+            this.loading = true;
+            getBasicUnitMaintains(this.unitquery)
+                .then((response) => {
+                    this.loading = false;
+                    this.unitlist = response.data.page.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
 
-            selectUnit(row) {
-                console.log(row.id);
-                this.unitUpdateQuery.id = this.curIndex;
-                this.unitUpdateQuery.fromCorp = row.name;
-                this.unitUpdateQuery.fromCorpId = row.unitid;
-                updateUnit(this.unitUpdateQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.dialogTableVisible = false;
-                            this.getList();
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
+        selectUnit(row) {
+            console.log(row.id);
+            this.unitUpdateQuery.id = this.curIndex;
+            this.unitUpdateQuery.fromCorp = row.name;
+            this.unitUpdateQuery.fromCorpId = row.unitid;
+            updateUnit(this.unitUpdateQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
                         this.dialogTableVisible = false;
-                    });
-            },
-            //获取订单列表
-            getList() {
-                this.loading = true;
-                orderListByStatus(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
-
-            deleteOrders(data) {
-                this.loading = true;
-                this.deleteData.id = data;
-                deleteByOrderId(this.deleteData)
-                    .then((response) => {
                         this.getList();
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    })
-                    .catch(() => {
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.dialogTableVisible = false;
+                });
+        },
+        //获取订单列表
+        getList() {
+            this.loading = true;
+            orderListByStatus(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+        deleteOrders(data) {
+            this.loading = true;
+            this.deleteData.id = data;
+            deleteByOrderId(this.deleteData)
+                .then((response) => {
+                    this.getList();
+                    this.$message({
+                        type: "success",
+                        message: "删除成功！",
                     });
-            },
+                })
+                .catch(() => {
+                });
+        },
 
-            deleteDialog(rowId) {
-                this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
                 })
-                    .then(() => {
-                        this.deleteOrders(rowId);
-                    })
-                    .catch(() => {
-                    });
-            },
+                .catch(() => {
+                });
+        },
 
-            onUpload(data) {
-                this.loading = true;
-                var idQuery = {
-                    orderId: "",
-                };
-                idQuery.orderId = data;
-                commitOrder(idQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.$message.success(response.data);
-                            this.getList();
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    })
-                    .catch(() => {
-                    });
-            },
-            getBusType() {
-                let query = {
-                    enabled: true,
-                };
-                getBussinessType(query)
-                    .then((response) => {
-                        this.busTypes = response.data.list || [];
-                        this.filterQuery.billAction = this.busTypes[0].action;
-                        // this.getList();
-                    })
-                    .catch(() => {
-                    });
-            },
-            geActionName(action) {
-                for (let i = 0; i < this.busTypes.length; i++) {
-                    if (this.busTypes[i].action === action) {
-                        return this.busTypes[i].name;
+        onUpload(data) {
+            this.loading = true;
+            var idQuery = {
+                orderId: "",
+            };
+            idQuery.orderId = data;
+            commitOrder(idQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message.success(response.data);
+                        this.getList();
+                    } else {
+                        this.$message.error(response.message);
                     }
+                })
+                .catch(() => {
+                });
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        geActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
                 }
-            },
-            handleErrorDetail(poistion) {
-                var mOrder = this.list[poistion];
-                var corpOrderId = mOrder.remark;
-
-                this.errorDetail = mOrder.remark;
-                console.log(corpOrderId + "  " + mOrder + "  " + mOrder.remark);
-                this.dialogVisible = true;
-            },
+            }
+        },
+        handleErrorDetail(poistion) {
+            var mOrder = this.list[poistion];
+            var corpOrderId = mOrder.remark;
 
-            intentDetail(row) {
-                this.codeDetailVisible = true;
-                this.idQuery.id = row.id;
-            },
+            this.errorDetail = mOrder.remark;
+            console.log(corpOrderId + "  " + mOrder + "  " + mOrder.remark);
+            this.dialogVisible = true;
         },
-        filters: {
-            statusFilterType(status) {
-                const statusMap = {
-                    false: "success",
-                    true: "danger",
-                };
-                return statusMap[status];
-            },
+
+        intentDetail(row) {
+            this.codeDetailVisible = true;
+            this.idQuery.id = row.id;
         },
-        mounted() {
-            document.body.ondrop = function (event) {
-                event.preventDefault();
-                event.stopPropagation();
+    },
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "success",
+                true: "danger",
             };
+            return statusMap[status];
         },
-        created() {
-            // 将参数拷贝进查询对象
-            let query = this.$route.query;
-            this.filterQuery = Object.assign(this.filterQuery, query);
-            this.filterQuery.limit = parseInt(this.filterQuery.limit);
-            // 加载表格数据
-            this.getList();
-            this.getBusType();
-        },
-    };
+    },
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+        // 将参数拷贝进查询对象
+        let query = this.$route.query;
+        this.filterQuery = Object.assign(this.filterQuery, query);
+        this.filterQuery.limit = parseInt(this.filterQuery.limit);
+        // 加载表格数据
+        this.getList();
+        this.getBusType();
+    },
+};
 </script>
 
 <style type="text/scss" lang="scss">

src/views/inout/IOFinishOrder.vue

@@ -11,9 +11,6 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.id" placeholder="单号"></el-input>
                     </el-form-item>
-
-
-
                     <el-form-item class="query-form-item">
                         <el-select
                             v-model="filterQuery.mainAction"
@@ -63,10 +60,10 @@
                             </el-button
                             >
 
-                            <el-button type="primary" icon="search" @click="mergesOrders"
-                            >合并单号
-                            </el-button
-                            >
+<!--                            <el-button type="primary" icon="search" @click="mergesOrders"-->
+<!--                            >合并单号-->
+<!--                            </el-button-->
+<!--                            >-->
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -79,7 +76,6 @@
                 highlight-current-row
                 @selection-change="handleSelectionChange"
             >
-                <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column label="业务类型" prop="action">
                     <template slot-scope="scope">
@@ -96,7 +92,12 @@
                   prop="corpOrderId"
                   :show-overflow-tooltip="true"
                 ></el-table-column> -->
-                <el-table-column label="来源" prop="fromType"></el-table-column>
+                <el-table-column label="来源" prop="fromType">
+                    <template slot-scope="scope">
+                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                    </template>
+
+                </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="220">
                     <template slot-scope="scope">
                         <p v-if="scope.row.fromCorp == null">
@@ -397,6 +398,15 @@
                     0: "未校验",
                     2: "正常",
                 },
+                fromTypeMap: {
+                    "1": "UDIMS平台",
+                    "2": "网页新增",
+                    "3": "pda已校验",
+                    "4": "pda未校验",
+                    "5": "pc端扫码精灵",
+                    "6": "补录单据",
+                    "7": "UDI供应商平台"
+                },
                 //往来单位
                 unitquery: {key: "", page: 1, limit: 20},
                 unitlist: [],

src/views/inout/IONewCode.vue

@@ -160,7 +160,7 @@ export default {
 
     getCodeList() {
       this.loading = true;
-      this.query.corpOrderId = this.idQuery.id;
+      this.query.orderId = this.idQuery.id;
       errorCodeList(this.query) //查找该单号下的所有条码
         .then((response) => {
           this.loading = false;

src/views/inout/IONewOrder.vue

@@ -1,241 +1,271 @@
 <template>
     <div>
-        <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.id" placeholder="单号"></el-input>
-                </el-form-item>
-
-                <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.mainAction" placeholder="出入库类型">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="入库" value="WareHouseIn"></el-option>
-                        <el-option label="出库" value="WareHouseOut"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.action" placeholder="请选择业务类型">
-                        <el-option
-                            v-for="item in busTypes"
-                            :key="item.name"
-                            :label="item.name"
-                            :value="item.action">
-                            <span style="float: left">{{ item.name }}</span>
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-<!--                <el-form-item class="query-form-item">-->
-<!--                    <el-select v-model="filterQuery.status" placeholder="单据状态">-->
-<!--                        <el-option label="全部单据状态" value="10"></el-option>-->
-<!--                        <el-option label="等待处理" value="1"></el-option>-->
-<!--                        <el-option label="未提交" value="-1"></el-option>-->
-<!--                    </el-select>-->
-<!--                </el-form-item>-->
-                <el-form-item>
-                    <el-button-group>
+        <el-card>
+
+
+            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.id" placeholder="单号"></el-input>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.mainAction" placeholder="出入库类型">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option label="入库" value="WareHouseIn"></el-option>
+                            <el-option label="出库" value="WareHouseOut"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.action" placeholder="请选择业务类型">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.action">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!--                <el-form-item class="query-form-item">-->
+                    <!--                    <el-select v-model="filterQuery.status" placeholder="单据状态">-->
+                    <!--                        <el-option label="全部单据状态" value="10"></el-option>-->
+                    <!--                        <el-option label="等待处理" value="1"></el-option>-->
+                    <!--                        <el-option label="未提交" value="-1"></el-option>-->
+                    <!--                    </el-select>-->
+                    <!--                </el-form-item>-->
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+
+
+                        </el-button-group>
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button-group style="margin-left: 10px;display:flex;">
+                            <el-button type="primary" icon="search" @click="mergesOrders">合并单据</el-button>
+                            <el-button type="primary" icon="search" @click="addOrders">新增订单</el-button>
+                            <el-button type="primary" icon="search" @click="errOrders">异常单据</el-button>
+                            <el-upload
+                                :action="uploadFileUrl"
+                                multiple
+                                :limit="3"
+                                :data="uploadData"
+                                :show-file-list="false"
+                                :on-success="handleChange"
+                                :file-list="fileList"
+                            >
+                                <el-button size="mini" type="primary">导入单据</el-button>
+                            </el-upload>
+
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="业务类型" prop="action">
+                    <template slot-scope="scope">
+                        <span>{{ geActionName(scope.row.action) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="订单号" prop="id"></el-table-column>
+                <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
+                <el-table-column label="来源" prop="fromType">
+                    <template slot-scope="scope">
+                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                    </template>
+
+                </el-table-column>
+                <el-table-column label="往来单位" prop="fromCorp" width="220">
+                    <template slot-scope="scope">
+                        <p v-if="scope.row.fromCorp == null">
+                            <el-button
+                                type="primary"
+                                size="mini"
+                                @click.native.stop="handleUnitClick(scope.row)"
+                            >选择往来单位
+                            </el-button
+                            >
+                        </p>
+                        <p v-if="scope.row.fromCorp != null">
+                            <el-button
+                                type="primary"
+                                size="mini"
+                                @click.native.stop="handleUnitClick(scope.row)"
+                            >{{ scope.row.fromCorp }}
+                            </el-button
+                            >
+                        </p>
+                    </template>
+                </el-table-column>
+                <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <i class="el-icon-time"></i>
+                        <span>{{ scope.row.actDate }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="状态" prop="status" width="100">
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.status == 3) | statusFilterType">{{
+                                checkStatus[scope.row.status]
+                            }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="300" fixed="right">
+                    <template slot-scope="scope">
                         <el-button
-                            type="primary"
-                            icon="el-icon-refresh"
-                            @click="onReset"
-                        ></el-button>
-                        <el-button type="primary" icon="search" @click="onSubmit"
-                        >查询
+                            type="text"
+                            size="small"
+                            v-if="scope.row.status === -1"
+                            @click.native.stop="addOrders(scope.row)"
+                        >编辑
                         </el-button
                         >
-                        <el-button type="primary" icon="search" @click="addOrders">新增订单</el-button>
-                        <el-button type="primary" icon="search" @click="errOrders">异常单据</el-button>
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
-
-        <el-table v-loading="loading" :data="list" style="width: 100%">
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="业务类型" prop="action">
-                <template slot-scope="scope">
-                    <span>{{ geActionName(scope.row.action) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="订单号" prop="id"></el-table-column>
-            <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
-            <el-table-column label="来源" prop="fromType"></el-table-column>
-            <el-table-column label="往来单位" prop="fromCorp" width="220">
-                <template slot-scope="scope">
-                    <p v-if="scope.row.fromCorp == null">
                         <el-button
-                            type="primary"
-                            size="mini"
-                            @click.native.stop="handleUnitClick(scope.row)"
-                        >选择往来单位
+                            type="text"
+                            size="small"
+                            @click.native.stop="intentDetail(scope.row)"
+                        >详情
                         </el-button
                         >
-                    </p>
-                    <p v-if="scope.row.fromCorp != null">
                         <el-button
-                            type="primary"
-                            size="mini"
-                            @click.native.stop="handleUnitClick(scope.row)"
-                        >{{ scope.row.fromCorp }}
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
                         </el-button
                         >
-                    </p>
-                </template>
-            </el-table-column>
-            <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
-                <template slot-scope="scope">
-                    <i class="el-icon-time"></i>
-                    <span>{{ scope.row.actDate }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="状态" prop="status" width="100">
-                <template slot-scope="scope">
-                    <el-tag :type="(scope.row.status == 3) | statusFilterType">{{
-                            checkStatus[scope.row.status]
-                        }}
-                    </el-tag>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" width="300" fixed="right">
-                <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        v-if="scope.row.status === -1"
-                        @click.native.stop="addOrders(scope.row)"
-                    >编辑
-                    </el-button
-                    >
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="intentDetail(scope.row)"
-                    >详情
-                    </el-button
-                    >
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="deleteDialog(scope.row.id)"
-                    >删除
-                    </el-button
-                    >
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="onUpload(scope.row.id)"
-                    >立即验证
-                    </el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%"
-                   :close-on-click-modal="false"
-                   :close-on-press-escape="false">
-            <span>{{ errorDetail }}</span>
-            <span slot="footer" class="dialog-footer">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="onUpload(scope.row.id)"
+                        >立即验证
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-dialog title="错误信息" :visible.sync="dialogVisible" width="30%"
+                       :close-on-click-modal="false"
+                       :close-on-press-escape="false">
+                <span>{{ errorDetail }}</span>
+                <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible = false"
         >关 闭</el-button
         >
       </span>
-        </el-dialog>
-        <el-dialog
-            title="选择往来单位"
-            :visible.sync="dialogTableVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="70%"
-        >
-            <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
-                <el-form-item class="query-form-item">
-                    <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button
-                        type="primary"
-                        icon="search"
-                        @click.native.stop="getUnitList()"
-                    >查询
-                    </el-button
-                    >
-                </el-form-item>
-            </el-form>
-
-            <el-table
-                v-loading="loading"
-                :data="unitlist"
-                style="width: 100%"
-                @row-click="selectUnit"
+            </el-dialog>
+            <el-dialog
+                title="选择往来单位"
+                :visible.sync="dialogTableVisible"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                width="70%"
             >
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                    label="往来单位ID"
-                    prop="erpId"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="往来单位名称"
-                    prop="name"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="往来单位简写"
-                    prop="spell"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="地址"
-                    prop="addr"
-                    show-overflow-tooltip
-                ></el-table-column>
+                <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button
+                            type="primary"
+                            icon="search"
+                            @click.native.stop="getUnitList()"
+                        >查询
+                        </el-button
+                        >
+                    </el-form-item>
+                </el-form>
 
-            </el-table>
-        </el-dialog>
-
-        <el-dialog
-            title="新增订单"
-            :visible.sync="addOrderVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="80%"
-            v-if="addOrderVisible"
-            @close='closeDialog'
-        >
-            <addOrder
-                :closeDialog="closeDialog"
-                :idQuery="idQuery"
-            ></addOrder>
-        </el-dialog>
-        <el-dialog
-            title="异常订单"
-            :visible.sync="errOrderVisible"
-            width="80%"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-        >
-            <ioErrorOrder
-            ></ioErrorOrder>
-        </el-dialog>
-        <el-dialog
-            title="单号详情"
-            :visible.sync="codeDetailVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="80%"
-            v-if="codeDetailVisible"
-        >
-            <codeDetail
-                :idQuery="idQuery"
-                v-on:closeDetailDialog="closeDetailDialog"
-            ></codeDetail>
-        </el-dialog>
-        <el-pagination
-            :page-size="filterQuery.limit"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next"
-            :total="total"
-        ></el-pagination>
+                <el-table
+                    v-loading="loading"
+                    :data="unitlist"
+                    style="width: 100%"
+                    @row-click="selectUnit"
+                >
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column
+                        label="往来单位ID"
+                        prop="erpId"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="往来单位名称"
+                        prop="name"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="往来单位简写"
+                        prop="spell"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="地址"
+                        prop="addr"
+                        show-overflow-tooltip
+                    ></el-table-column>
+
+                </el-table>
+            </el-dialog>
+
+            <el-dialog
+                title="新增订单"
+                :visible.sync="addOrderVisible"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                width="80%"
+                v-if="addOrderVisible"
+                @close='closeDialog'
+            >
+                <addOrder
+                    :closeDialog="closeDialog"
+                    :idQuery="idQuery"
+                ></addOrder>
+            </el-dialog>
+            <el-dialog
+                title="异常订单"
+                :visible.sync="errOrderVisible"
+                width="80%"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+            >
+                <ioErrorOrder
+                ></ioErrorOrder>
+            </el-dialog>
+            <el-dialog
+                title="单号详情"
+                :visible.sync="codeDetailVisible"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                width="80%"
+                v-if="codeDetailVisible"
+            >
+                <codeDetail
+                    :idQuery="idQuery"
+                    v-on:closeDetailDialog="closeDetailDialog"
+                ></codeDetail>
+            </el-dialog>
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
     </div>
 </template>
 
@@ -252,6 +282,7 @@ import draggable from "vuedraggable";
 import codeDetail from "./IONewCode";
 import addOrder from "./IOAddOrder";
 import ioErrorOrder from "./IOErrorOrder";
+import axios from "axios";
 
 const formJson = {
     site_id: "",
@@ -280,6 +311,15 @@ export default {
                 "-1": "未提交"
 
             },
+            fromTypeMap: {
+                "1": "UDIMS平台",
+                "2": "网页新增",
+                "3": "pda已校验",
+                "4": "pda未校验",
+                "5": "pc端扫码精灵",
+                "6": "补录单据",
+                "7": "UDI供应商平台"
+            },
             curIndex: "",
             unitquery: {key: "", page: 1, limit: 20},
             unitlist: [],
@@ -291,10 +331,12 @@ export default {
             idQuery: {
                 id: "",
             },
+            uploadData: {},
             list: [],
             adId: [],
             busTypes: [],
             adSelectList: [],
+            multipleSelection: [],
             adList: {},
             adListNoDataText: "无数据",
             queryAdIdAsyncLoading: false,
@@ -318,6 +360,7 @@ export default {
             formData: formJson,
             deleteLoading: false,
             errOrderVisible: false,
+            uploadFileUrl: null,
         };
     },
     components: {
@@ -352,6 +395,20 @@ export default {
             this.filterQuery.page = val;
             this.getList();
         },
+        handleSelectionChange(val) {
+            console.log(val);
+            this.multipleSelection = val;
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success(response.data);
+                this.getList();
+            }
+        },
         handleUnitClick(row) {
             this.curIndex = row.id;
             this.dialogTableVisible = true;
@@ -473,6 +530,59 @@ export default {
         errOrders() {
             this.errOrderVisible = true;
         },
+
+
+        mergesOrders() {
+            let repeatData = this.multipleSelection;
+            if (repeatData.length <= 1) {
+                this.$message.warning("未选择单据！");
+                return;
+            }
+            let orderid = repeatData[0].id;
+            let unit = repeatData[0].fromCorp;
+            let action = repeatData[0].action;
+            let orderList = [];
+            repeatData.forEach((obj, index) => {
+                if (unit !== obj.fromCorp) {
+                    this.$message.warning("往来单位不一致！");
+                    return;
+                }
+                if (action !== obj.action) {
+                    this.$message.warning("业务类型不一致！");
+                    return;
+                }
+                orderList.push(obj.id);
+            });
+            let tquery = {
+                orderList: orderList,
+            };
+
+            this.$confirm(
+                "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+                "提示",
+                {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }
+            )
+                .then(() => {
+                    mergeOrder(tquery).then((response) => {
+                        if (response.code === 20000) {
+                            this.getList();
+                            this.$message({
+                                type: "success",
+                                message: "合并成功",
+                            });
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    });
+                })
+                .catch(() => {
+                });
+        },
+
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             var corpOrderId = mOrder.remark;
@@ -506,6 +616,13 @@ export default {
                 }
             }
         },
+        init() {
+            axios.get("./config.json").then(res => {
+                // 基础地址
+                let response = res.data.BASE_URL;
+                this.uploadFileUrl = response + "udiwms/orders/file/upload";
+            });
+        },
     },
     filters: {
         statusFilterType(status) {
@@ -524,6 +641,7 @@ export default {
     },
     created() {
         // 将参数拷贝进查询对象
+        this.init();
         this.getBusType();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);

src/views/inventory/InvProducts.vue

@@ -1,69 +1,101 @@
 <template>
     <div>
-        <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-            <el-row>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
-                </el-form-item>
-                <el-form-item class="query-form-item">
-                    <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button-group>
-                        <el-button
-                            type="primary"
-                            icon="el-icon-refresh"
-                            @click="onReset"
-                        ></el-button>
-                        <el-button type="primary" icon="search" @click="onSubmit"
-                        >查询
-                        </el-button
+        <el-card>
+            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+                <el-row>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-select
+                            v-model="filterQuery.unitFk"
+                            filterable
+                            remote
+                            clearable="true"
+                            reserve-keyword
+                            placeholder="请输入供应商名称"
+                            :remote-method="findMethod"
+                            size="mini"
+                            style="width: 100%"
+                            :loading="loading"
                         >
-                    </el-button-group>
-                </el-form-item>
-            </el-row>
-        </el-form>
+                            <el-option
+                                v-for="item in fromOptions"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.erpId"
+                            >
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
 
-        <el-table v-loading="loading" :data="list" style="width: 100%">
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="产品名称" prop="cpmctymc">
-            </el-table-column>
-            <el-table-column label="产品标识" prop="nameCode"></el-table-column>
-            <el-table-column label="规格型号" prop="ggxh"></el-table-column>
-            <el-table-column label="批次号" prop="batchNo"></el-table-column>
-            <el-table-column label="生产日期" prop="productionDate"></el-table-column>
-            <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-            <el-table-column label="入库数量" prop="inCount"></el-table-column>
-            <el-table-column label="出库数量" prop="outCount"></el-table-column>
-            <el-table-column label="操作" width="300" fixed="right">
-                <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="intentDetail(scope.row)"
-                    >详情
-                    </el-button
-                    >
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
 
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="deleteDialog(scope.row.id)"
-                    >删除
-                    </el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="产品标识" prop="nameCode"></el-table-column>
+                <el-table-column label="产品名称" prop="cpmctymc">
+                </el-table-column>
+                <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" prop="productionDate"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+                <el-table-column label="入库数量" prop="inCount"></el-table-column>
+                <el-table-column label="出库数量" prop="outCount"></el-table-column>
+                <el-table-column label="结余数量" prop="reCount">
+                    <template slot-scope="scope">
+                        {{ (scope.row.inCount - scope.row.outCount) }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip></el-table-column>
+                <el-table-column label="操作" width="120" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="intentDetail(scope.row)"
+                        >详情
+                        </el-button
+                        >
 
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
 
         <el-dialog
             title="库存详情"
             :visible.sync="codeDetailVisible"
-            width="65%"
+            width="85%"
             v-if="codeDetailVisible"
         >
             <codeDetail
@@ -81,194 +113,216 @@
 </template>
 
 <script>
-    import {
-        filterProducts,
-        filterDetailProducts,
-        deleteProducts,
-    } from "../../api/inventory/InvProducts";
-    import draggable from "vuedraggable";
-    import codeDetail from "./InvProductsDetail";
-    import store from "../../store";
-    import {getBussinessType} from "../../api/basic/bussinessType";
+import {
+    filterProducts,
+    filterDetailProducts,
+    deleteProducts,
+} from "../../api/inventory/InvProducts";
+import draggable from "vuedraggable";
+import codeDetail from "./InvProductsDetail";
+import store from "../../store";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    cpmctymc: null,
-                    nameCode: null,
-                    relIdFk: null,
-                    batchNo: null,
-                    page: 1,
-                    limit: 20,
-                    customerId: null,
-                },
-                detailQuery: {
-                    code: null,
-                    productIdFk: null,
-                    page: 1,
-                    limit: 20,
-                },
-                list: [],
-                codeDetailVisible: false,
-                total: 0,
-                loading: true,
-                index: null,
-                dialogTableVisible: false,
-                formLoading: false,
-                dialogVisible: false,
-                deleteLoading: false,
-                busTypes: [],
-                idQuery:null,
+export default {
+    data() {
+        return {
+            filterQuery: {
+                cpmctymc: null,
+                nameCode: null,
+                relIdFk: null,
+                batchNo: null,
+                page: 1,
+                limit: 20,
+                customerId: null,
+                unitFk: null,
+            },
+            detailQuery: {
+                code: null,
+                productIdFk: null,
+                page: 1,
+                limit: 20,
+            },
+            list: [],
+            codeDetailVisible: false,
+            total: 0,
+            loading: true,
+            index: null,
+            dialogTableVisible: false,
+            formLoading: false,
+            dialogVisible: false,
+            deleteLoading: false,
+            busTypes: [],
+            idQuery: null,
+            showSup: false,
+            fromOptions: [],
+        };
+    },
+    components: {
+        draggable,
+        codeDetail,
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                cpmctymc: null,
+                nameCode: null,
+                relIdFk: null,
+                batchNo: null,
+                customerId: null,
+                unitFk: null,
+                page: 1,
+                limit: 20,
             };
+            this.getList();
         },
-        components: {
-            draggable,
-            codeDetail,
+        onSubmit() {
+            this.loading = true;
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            this.dialogTableVisible = true;
+        },
+        closeDetailDialog(val) {
+            this.codeDetailVisible = false;
         },
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    cpmctymc: null,
-                    nameCode: null,
-                    relIdFk: null,
-                    batchNo: null,
-                    customerId: null,
-                    page: 1,
-                    limit: 20,
-                };
-                this.getList();
-            },
-            onSubmit() {
-                this.loading = true;
-                this.getList();
-            },
-            handleSizeChange(val) {
-                this.filterQuery.limit = val;
-                this.getList();
-            },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
-                this.getList();
-            },
-            handleUnitClick(row) {
-                this.curIndex = row.id;
-                this.dialogTableVisible = true;
-            },
-            closeDetailDialog(val) {
-                this.codeDetailVisible = false;
-            },
-
-            closeDialog() {
-                this.getList();
-            },
-            getList() {
-                this.loading = true;
-                this.filterQuery.customerId = store.getters.customerId;
-                filterProducts(this.filterQuery)
-                    .then((response) => {
-                        console.log(response)
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
 
-            deleteOrders(data) {
-                this.loading = true;
-                let query = {
-                    id: data,
-                }
-                deleteProducts(query)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.getList();
-                            this.$message({
-                                type: "success",
-                                message: "删除成功！",
-                            });
-                        } else {
-                            this.$message.error(response.message);
-                        }
+        closeDialog() {
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+            filterProducts(this.filterQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.showSup = response.data.showSup;
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
 
-                    })
-                    .catch(() => {
-                    });
-            },
+        deleteOrders(data) {
+            this.loading = true;
+            let query = {
+                id: data,
+            }
+            deleteProducts(query)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else {
+                        this.$message.error(response.message);
+                    }
 
-            deleteDialog(rowId) {
-                this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
                 })
-                    .then(() => {
-                        this.deleteOrders(rowId);
-                    })
-                    .catch(() => {
-                    });
-            },
+                .catch(() => {
+                });
+        },
 
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
+        findMethod(query) {
+            console.log(query);
+            this.fromOptions = [];
+            let cQuery = {
+                key: query,
+            };
+            getBasicUnitMaintains(cQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.fromOptions = response.data.page.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
 
+        intentDetail(row) {
 
-            intentDetail(row) {
-                this.codeDetailVisible = true;
-                this.idQuery= row;
-            },
-            getBusType() {
-                let query = {
-                    enabled: true,
-                };
-                getBussinessType(query)
-                    .then((response) => {
-                        this.busTypes = response.data.list || [];
-                        this.filterQuery.billAction = this.busTypes[0].action;
-                        // this.getList();
-                    })
-                    .catch(() => {
-                    });
-            },
-            getActionName(action) {
-                for (let i = 0; i < this.busTypes.length; i++) {
-                    if (this.busTypes[i].action === action) {
-                        return this.busTypes[i].name;
-                    }
-                }
-            },
+            this.idQuery = row;
+            // this.idQuery.supId = null;
+            this.idQuery.customerId = null;
+            this.codeDetailVisible = true;
         },
-        filters: {
-            statusFilterType(status) {
-                const statusMap = {
-                    false: "success",
-                    true: "danger",
-                };
-                return statusMap[status];
-            },
-        },
-        mounted() {
-            document.body.ondrop = function (event) {
-                event.preventDefault();
-                event.stopPropagation();
+        getBusType() {
+            let query = {
+                enabled: true,
             };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
         },
-        created() {
-            this.getBusType();
-            let query = this.$route.query;
-            this.filterQuery = Object.assign(this.filterQuery, query);
-            this.filterQuery.limit = parseInt(this.filterQuery.limit);
-            // 加载表格数据
-            this.getList();
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
+    },
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "success",
+                true: "danger",
+            };
+            return statusMap[status];
         },
-    };
+    },
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+        this.getBusType();
+        let query = this.$route.query;
+        this.filterQuery = Object.assign(this.filterQuery, query);
+        this.filterQuery.limit = parseInt(this.filterQuery.limit);
+        // 加载表格数据
+        this.getList();
+    },
+};
 </script>
 
 <style type="text/scss" lang="scss">

src/views/inventory/InvProductsDetail.vue

@@ -1,5 +1,80 @@
 <template>
     <div>
+
+        <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
+            <el-descriptions-item>
+                <template slot="label">
+                    产品名称
+                </template>
+                {{ idQuery.cpmctymc }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    产品标识
+                </template>
+                {{ idQuery.nameCode }}
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+                <template slot="label">
+                    批次号
+                </template>
+                {{ idQuery.batchNo }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    规格型号
+                </template>
+                {{ idQuery.ggxh }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    生产日期
+                </template>
+                {{ idQuery.productionDate }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    失效日期
+                </template>
+                {{ idQuery.expireDate }}
+            </el-descriptions-item>
+        </el-descriptions>
+
+<!--        <el-descriptions style="margin-top: 15px" class="margin-top" title="库存统计" :column="3" :size="size" border>-->
+
+<!--            <el-descriptions-item>-->
+<!--                <template slot="label">-->
+<!--                    入库数量-->
+<!--                </template>-->
+<!--                {{ statData.inCount }}-->
+<!--            </el-descriptions-item>-->
+<!--            <el-descriptions-item>-->
+<!--                <template slot="label">-->
+<!--                    出库数量-->
+<!--                </template>-->
+<!--                {{ statData.outCount }}-->
+<!--            </el-descriptions-item>-->
+<!--            <el-descriptions-item>-->
+<!--                <template slot="label">-->
+<!--                    结余数量-->
+<!--                </template>-->
+<!--                {{ (statData.inCount - statData.outCount) }}-->
+<!--            </el-descriptions-item>-->
+<!--            <el-descriptions-item>-->
+<!--                <template slot="label">-->
+<!--                    普通采购数量-->
+<!--                </template>-->
+<!--                {{ statData.commonCount }}-->
+<!--            </el-descriptions-item>-->
+<!--            <el-descriptions-item>-->
+<!--                <template slot="label">-->
+<!--                    预入库数量-->
+<!--                </template>-->
+<!--                {{ statData.advanceCount }}-->
+<!--            </el-descriptions-item>-->
+<!--        </el-descriptions>-->
+
         <el-form :inline="true" :model="query" class="query-form" size="mini">
             <el-form-item class="query-form-item">
                 <el-input v-model="query.code" placeholder="条码查询"></el-input>
@@ -18,25 +93,48 @@
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column
                 label="条码"
-                prop="code"
+                prop="originCode"
+                width="300"
                 show-overflow-tooltip
             ></el-table-column>
-            <el-table-column label="出入库类型" prop="action" width="150">
+            <el-table-column label="单据类型" prop="action" width="150">
                 <template slot-scope="scope">
                     <span>{{ getActionName(scope.row.action) }}</span>
                 </template>
             </el-table-column>
             <el-table-column
-                label="数量"
-                prop="count"
-                width="150"
+                label="出入库类型"
+                prop="mainActionStr"
+                width="120"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="入库数量"
+                prop="inCount"
+                width="120"
                 show-overflow-tooltip
             ></el-table-column>
 
             <el-table-column
-                label="所属订单"
+                label="出库数量"
+                prop="outCount"
+                width="120"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="订单日期"
+                prop="updateTime"
+                width="150"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="所属扫码单据"
                 prop="orderIdFk"
-                width="200"
+                show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+                label="所属业务单据"
+                prop="stockIdFk"
                 show-overflow-tooltip
             ></el-table-column>
         </el-table>
@@ -52,125 +150,145 @@
 </template>
 
 <script>
-    import {
-        filterDetailProducts,
-    } from "../../api/inventory/InvProducts";
-    import store from "../../store";
-    import draggable from "vuedraggable";
-    import {getBussinessType} from "../../api/basic/bussinessType";
-
-    export default {
-        name: "idQuery",
-        props: {
-            idQuery: {
-                type: Object,
-                required: true,
-            },
+import {
+    filterDetailProducts, statDetailProducts
+} from "../../api/inventory/InvProducts";
+import store from "../../store";
+import draggable from "vuedraggable";
+import {getBussinessType} from "../../api/basic/bussinessType";
+
+export default {
+    name: "idQuery",
+    props: {
+        idQuery: {
+            type: Object,
+            required: true,
         },
-        data() {
-            return {
-                query: {
-                    productIdFk:null,
-                    customerId:null,
-                    page: 1,
-                    limit: 20,
-                },
-                codeArry: [],
-                total: 0,
-                loading: true,
-                index: null,
-                formLoading: false,
-                formVisible: false,
-                deleteLoading: false,
-                orderNo: null,
-                busTypes: [],
+    },
+    data() {
+        return {
+            query: {
+                batchNo: null,
+                productIdFk: null,
+                customerId: null,
+                page: 1,
+                limit: 20,
+            },
+            codeArry: [],
+            total: 0,
+            loading: true,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+            busTypes: [],
+            statData: {},
+        };
+    },
+    components: {
+        draggable,
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.query = {
+                productIdFk: null,
+                customerId: null,
+                page: 1,
+                limit: 20,
             };
+            this.getCodeList();
         },
-        components: {
-            draggable,
+        onSubmit() {
+            this.$router.push({
+                path: "",
+                query: this.query,
+            });
+            this.getCodeList();
         },
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
+        handleSizeChange(val) {
+            this.query.limit = val;
+            this.getCodeList();
+        },
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getCodeList();
+        },
+
+        getCodeList() {
+            this.loading = true;
+            this.query.productIdFk = this.idQuery.relIdFk;
+            this.query.batchNo = this.idQuery.batchNo;
+            this.query.supId = this.idQuery.supId;
+            filterDetailProducts(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.loading = false;
+                    this.codeArry = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
                 });
-                this.query = {
-                    productIdFk:null,
-                    customerId:null,
-                    page: 1,
-                    limit: 20,
-                };
-                this.getCodeList();
-            },
-            onSubmit() {
-                this.$router.push({
-                    path: "",
-                    query: this.query,
+        },
+
+        getStat() {
+            this.query.productIdFk = this.idQuery.relIdFk;
+            this.query.batchNo = this.idQuery.batchNo;
+            this.query.customerId = store.getters.customerId;
+            statDetailProducts(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.loading = false;
+                    this.statData = response.data;
+                })
+                .catch(() => {
+                    this.loading = false;
                 });
-                this.getCodeList();
-            },
-            handleSizeChange(val) {
-                this.query.limit = val;
-                this.getCodeList();
-            },
-            handleCurrentChange(val) {
-                this.query.page = val;
-                this.getCodeList();
-            },
 
-            getCodeList() {
-                this.loading = true;
-                this.query.productIdFk = this.idQuery.id;
-                this.query.customerId = store.getters.customerId;
-                filterDetailProducts(this.query) //查找该单号下的所有条码
-                    .then((response) => {
-                        this.loading = false;
-                        this.codeArry = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
-            intentBack() {
-                //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
-                this.$router.go(-1);
-            },
-            getActionName(action) {
-                for (let i = 0; i < this.busTypes.length; i++) {
-                    if (this.busTypes[i].action === action) {
-                        return this.busTypes[i].name;
-                    }
+        },
+
+        intentBack() {
+            //  this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}});
+            this.$router.go(-1);
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
                 }
-            },
-            getBusType() {
-                let query = {
-                    enabled: true,
-                };
-                getBussinessType(query)
-                    .then((response) => {
-                        this.busTypes = response.data.list || [];
-                        this.filterQuery.billAction = this.busTypes[0].action;
-                        // this.getList();
-                    })
-                    .catch(() => {
-                    });
-            },
+            }
         },
-        filters: {},
-        mounted() {
-            document.body.ondrop = function (event) {
-                event.preventDefault();
-                event.stopPropagation();
+        getBusType() {
+            let query = {
+                enabled: true,
             };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
         },
-        created() {
-            this.getBusType();
-            this.getCodeList();
-        },
-    };
+    },
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+        this.getBusType();
+        this.getCodeList();
+        this.getStat();
+    },
+};
 </script>
 
 

src/views/inventory/invUdiTraceOrder.vue

@@ -0,0 +1,863 @@
+<template>
+    <div>
+        <el-card class="el-card">
+
+            <el-form
+                :inline="true"
+                :model="filterQuery"
+                style="display: flex"
+                label-width="480px"
+                size="mini"
+            >
+                <el-form-item class="query-form-item" label-width="100px">
+                    <el-input
+                        v-model="filterQuery.code"
+                        placeholder="UDI码"
+                        style="width: 500px"
+                        @keyup.enter.native="keyup_submit($event)"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-select
+                        v-model="filterQuery.supId"
+                        filterable
+                        remote
+                        clearable="true"
+                        reserve-keyword
+                        placeholder="请输入供应商名称"
+                        :remote-method="findMethod"
+                        size="mini"
+                        style="width: 100%"
+                        :loading="loading"
+                    >
+                        <el-option
+                            v-for="item in fromOptions"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.erpId"
+                        >
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item style="display: flex">
+                    <el-button type="primary" icon="search" @click="getList"
+                    >查询
+                    </el-button
+                    >
+                </el-form-item>
+            </el-form>
+
+            <el-table
+                v-loading="loading"
+                :data="list"
+                style="width: 100%"
+                @row-click="getOrderDetail"
+                highlight-current-row
+                @selection-change="handleSelectionChange"
+            >
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="扫码单据类型" prop="action">
+                    <template slot-scope="scope">
+                        <span>{{ getActionName(scope.row.action) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="订单号"
+                    prop="id"
+                    show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column label="来源" prop="fromType">
+
+                    <template slot-scope="scope">
+                        <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+                    </template>
+
+
+                </el-table-column>
+                <el-table-column label="往来单位" prop="fromCorp" width="250">
+                    <template slot-scope="scope">
+                        {{ scope.row.fromCorp }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    label="创建时间"
+                    prop="actDate"
+                    width="150"
+                    show-overflow-tooltip="true"
+                >
+                    <template slot-scope="scope">
+                        <i class="el-icon-time"></i>
+                        <span>{{ scope.row.actDate }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="校验状态" prop="contrastStatus" width="120">
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
+                            {{ erpCheckStatus[scope.row.contrastStatus] }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="120">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="intentDetail(scope.row)"
+                        >详情
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-pagination
+                :page-size="filterQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+        </el-card>
+
+        <el-card class="el-card" v-if="true" id="printJS-form">
+            <el-table
+                v-loading="loading"
+                :row-class-name="tableRowClassName"
+                :data="detailList"
+                style="width: 100%"
+            >
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column
+                    label="产品通用名"
+                    prop="coName"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="包装规格"
+                    prop="packSpec"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="批次号"
+                    prop="batchNo"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="生产日期"
+                    prop="productDate"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="失效日期"
+                    prop="expireDate"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="单据数量"
+                    prop="erpCount"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="实际数量"
+                    prop="reCount"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+
+                <el-table-column label="扫码数量" prop="count"></el-table-column>
+                <el-table-column
+                    label="生产企业"
+                    prop="productCompany"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="注册/备案凭证号"
+                    prop="authCode"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+            </el-table>
+        </el-card>
+        <el-dialog
+            title="选择往来单位"
+            :visible.sync="dialogTableVisible"
+            width="70%"
+        >
+            <el-form :inline="true" :model="query" class="query-form" size="mini">
+                <el-form-item class="query-form-item">
+                    <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        icon="search"
+                        @click.native.stop="getUnitList()"
+                    >查询
+                    </el-button
+                    >
+                </el-form-item>
+            </el-form>
+
+            <el-table
+                v-loading="loading"
+                :data="unitlist"
+                style="width: 100%"
+                @row-click="selectUnit"
+            >
+                <el-table-column label="往来单位ID" prop="unitId"></el-table-column>
+                <el-table-column
+                    label="往来单位名称"
+                    prop="name"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="往来单位简写"
+                    prop="spell"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="地址"
+                    prop="addr"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column label="状态" prop="status"></el-table-column>
+                <el-table-column label="类型" prop="type"></el-table-column>
+            </el-table>
+        </el-dialog>
+
+        <el-dialog
+            title="单号详情"
+            :visible.sync="codeDetailVisible"
+            width="80%"
+            v-if="codeDetailVisible"
+        >
+            <codeDetail
+                :idQuery="idQuery"
+                v-on:closeDetailDialog="closeDetailDialog"
+            ></codeDetail>
+        </el-dialog>
+
+        <el-dialog title="校验信息" :visible.sync="errDialogVisible" width="30%">
+            <span>{{ errorDetail }}</span>
+            <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="errDialogVisible = false"
+        >关 闭</el-button
+        >
+      </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    orderList,
+    codeList,
+    findAllByOrderId,
+    updateUnit,
+    filterOrder,
+    deleteByOrderId,
+    updateExportStatus,
+    uploadOrder,
+    mergeOrder,
+    orderDetail,
+} from "../../api/inout/order";
+import {
+    orderDetailPDFFromTemplateCode,
+    orderDetailPDFFromTemplateFile,
+    inspectionOrderDetailPDFFromTemplateCode,
+    inspectionOrderDetailPDFFromTemplateFile
+} from "../../api/itextpdf/itextpdf";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import draggable from "vuedraggable";
+import {saveAs} from "file-saver";
+import codeDetail from "../inout/IOFinishCode";
+import store from "../../store";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {filterOrderTrace} from "@/api/inventory/invCodeTrace";
+
+const formJson = {
+    site_id: "",
+    site_name: "",
+    describe: "",
+    ads: [],
+};
+export default {
+    name: "invUdiTraceOrder",
+    props: {
+        isSelect: {
+            type: Boolean,
+            default: false,
+        },
+    },
+
+    data() {
+        return {
+            query: {
+                code: null,
+                batchNo: null,
+                productIdFk: null,
+                customerId: null,
+                page: 1,
+                limit: 20,
+                supId: null,
+            },
+            checkStatus: {
+                1: "校验异常",
+                0: "未校验",
+                2: "正常",
+            },
+            erpCheckStatus: {
+                // error: "校验异常",
+                // null: "未校验",
+                // success: "正常",
+                1: "校验异常",
+                0: "未校验",
+                2: "校验成功",
+            },
+            fromTypeMap: {
+                "1": "UDIMS平台",
+                "2": "网页新增",
+                "3": "pda即时校验",
+                "4": "pda未校验",
+                "5": "pc端扫码精灵",
+                "6": "补录单据",
+                "7": "UDI供应商平台"
+            },
+            //往来单位
+            unitquery: {key: "", page: 1, limit: 20},
+            unitlist: [],
+            list: [],
+            detailList: [],
+            unitUpdateQuery: {
+                id: "",
+                fromCorpId: "",
+                fromCorp: "",
+            },
+            actDateRange: [],
+            filterQuery: {
+                code: null,
+                batchNo: null,
+                productIdFk: null,
+                customerId: null,
+                page: 1,
+                limit: 20,
+                supId: null,
+            },
+            detailQuery: {
+                orderId: "",
+            },
+            deleteData: {
+                id: "",
+            },
+            idQuery: {
+                id: "",
+            },
+            curIndex: "",
+            adListNoDataText: "无数据",
+            queryAdIdAsyncLoading: false,
+            codeDetailVisible: false,
+            total: 0,
+            loading: true,
+            index: null,
+            formName: null,
+            orderId: "",
+            formMap: {
+                add: "新增",
+                edit: "编辑",
+            },
+            exportQuery: {
+                orderId: "",
+                exportStatus: "",
+            },
+
+            uploadQuery: {
+                orderId: "",
+            },
+            busTypes: [],
+            multipleSelection: [],
+            dialogTableVisible: false,
+            formLoading: false,
+            formVisible: false,
+            formData: formJson,
+            deleteLoading: false,
+            addDialogVisible: false,
+            errDialogVisible: false,
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+        };
+    },
+    components: {
+        draggable,
+        codeDetail,
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                code: null,
+                batchNo: null,
+                productIdFk: null,
+                customerId: null,
+                page: 1,
+                limit: 20,
+                supId: null,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+        onSubmit() {
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleSelectionChange(val) {
+            console.log(val);
+            this.multipleSelection = val;
+        },
+
+        handleErrorDetail(poistion) {
+            var mOrder = this.list[poistion];
+            this.errorDetail = mOrder.remark;
+            this.errDialogVisible = true;
+        },
+
+        mergesOrders() {
+            var repeatData = this.multipleSelection;
+            if (repeatData.length <= 1) {
+                this.$message.warning("选择的订单需大于1");
+                return;
+            }
+            var orderid = repeatData[0].id;
+            var unit = repeatData[0].fromCorp;
+            var action = repeatData[0].action;
+            var orderList = [];
+            repeatData.forEach((obj, index) => {
+                if (unit !== obj.fromCorp) {
+                    this.$message.warning("往来单位不一致！");
+                    return;
+                }
+                if (action !== obj.action) {
+                    this.$message.warning("业务类型不一致！");
+                    return;
+                }
+                orderList.push(obj.id);
+            });
+            var tquery = {
+                orderList: orderList,
+            };
+
+            this.$confirm(
+                "所选择的订单将会合并到订单号为" + orderid + "的订单下",
+                "提示",
+                {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }
+            )
+                .then(() => {
+                    mergeOrder(tquery).then((response) => {
+                        if (response.code === 20000) {
+                            this.getList();
+                            this.$message({
+                                type: "success",
+                                message: "合并成功",
+                            });
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    });
+                })
+                .catch(() => {
+                });
+        },
+        //获取订单列表
+        getList() {
+            this.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+            filterOrderTrace(this.filterQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.detailList = [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        //业务明细表
+        getOrderDetail(row) {
+            this.loading = true;
+            this.detailQuery = {
+                orderId: row.id,
+            };
+            this.refresgOrderDetail();
+        },
+        refresgOrderDetail() {
+            orderDetail(this.detailQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.loading = false;
+                    this.detailList = response.data || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            // this.dialogTableVisible = true;
+        },
+        getUnitList() {
+            this.loading = true;
+            getBasicUnitMaintains(this.unitquery)
+                .then((response) => {
+                    this.loading = false;
+                    this.unitlist = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
+        intentDetail(row) {
+            // this.$router.push({
+            //   path: "../inout/detail",
+            //   query: { id: row.id },
+            // });
+
+            this.codeDetailVisible = true;
+            this.idQuery.id = row.id;
+        },
+
+        selectUnit(row) {
+            console.log(row.id);
+            this.unitUpdateQuery.id = this.curIndex;
+            this.unitUpdateQuery.fromCorp = row.name;
+            this.unitUpdateQuery.fromCorpId = row.unitid;
+            updateUnit(this.unitUpdateQuery)
+                .then((response) => {
+                    this.dialogTableVisible = false;
+                    this.getList();
+                })
+                .catch(() => {
+                    this.dialogTableVisible = false;
+                });
+        },
+        deleteOrders(data) {
+            this.loading = true;
+            this.deleteData.id = data;
+            deleteByOrderId(this.deleteData)
+                .then((response) => {
+                    this.getList();
+                    this.refresgOrderDetail();
+                    this.$message({
+                        type: "success",
+                        message: "删除成功！",
+                    });
+                })
+                .catch(() => {
+                });
+        },
+        tableRowClassName({row, rowIndex}) {
+            if (row.reCount === row.count) {
+                return "success-row";
+            } else {
+                return "warning-row";
+            }
+        },
+
+        exportDialog(value) {
+            var mOrder = value;
+            if (mOrder.exportStatus === "已上传") {
+                this.$confirm("该订单已修改, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.uploadOrderDialog(mOrder);
+                    })
+                    .catch(() => {
+                    });
+            } else if (mOrder.contrastStatus === 0) {
+                this.$confirm("该订单校验异常, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.uploadOrderDialog(mOrder);
+                    })
+                    .catch(() => {
+                    });
+            } else if (mOrder.contrastStatus === null) {
+                this.$confirm("该订单未校验, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.uploadOrderDialog(mOrder);
+                    })
+                    .catch(() => {
+                    });
+            } else {
+                this.$confirm("是否确定修改ERP订单?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.uploadOrderDialog(mOrder);
+                    })
+                    .catch(() => {
+                    });
+            }
+        },
+
+        exportXml(poistion) {
+            this.loading = true;
+            var mOrder = this.list[poistion];
+            var corpOrderId = mOrder.id;
+            var codeArry;
+            this.query = {
+                corpOrderId: corpOrderId,
+                page: 1,
+                limit: 20,
+            };
+            findAllByOrderId(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.loading = false;
+                    codeArry = response.data.list || [];
+                    var document =
+                        '<?xml version="1.0" encoding="utf-8"?>\n' +
+                        '<Document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="终端接口XML Schema-2.0.xsd" SN="" Version="3.0" License="123456">\n' +
+                        "<Events>\n" +
+                        '<Event Name="' +
+                        mOrder.action +
+                        '" MainAction="' +
+                        mOrder.mainAction +
+                        '">' +
+                        "<ActionMaping>\n" +
+                        '<Action Name="' +
+                        mOrder.mainAction +
+                        '">\n' +
+                        "<ActionData>Code</ActionData>\n" +
+                        "<ActionData>CorpOrderID</ActionData>\n" +
+                        "<ActionData>Actor</ActionData>\n" +
+                        "<ActionData>ActDate</ActionData>\n" +
+                        "<ActionData>ToCorpID</ActionData>\n" +
+                        "</Action>\n" +
+                        " </ActionMaping>\n" +
+                        "<DataMaping>\n" +
+                        '<MetaData Name="Code" Type="string" />\n' +
+                        '<MetaData Name="CorpOrderID" Type="string" />\n' +
+                        '<MetaData Name="Actor" Type="string" />\n' +
+                        '<MetaData Name="ActDate" Type="Date" />\n' +
+                        '<MetaData Name="ToCorpID" Type="string" />\n' +
+                        "</DataMaping>\n" +
+                        "<DataField>\n";
+                    for (var value of codeArry) {
+                        if (value.fromCorpId === null) {
+                            value.fromCorpId = "";
+                        }
+                        var tempdata =
+                            ' <Data Code="' +
+                            value.code +
+                            '" CorpOrderID="' +
+                            value.corpOrderId +
+                            '" Actor="' +
+                            value.actor +
+                            '" ActDate="' +
+                            value.actDate +
+                            '" ToCorpID="' +
+                            value.fromCorpId +
+                            '" />\n';
+
+                        document = document + tempdata;
+                    }
+                    document =
+                        document +
+                        "</DataField>\n" +
+                        "</Event>\n" +
+                        "</Events>\n" +
+                        "</Document>\n";
+
+                    var blob = new Blob([document], {
+                        type: "text/plain;charset=utf-8",
+                    });
+                    saveAs(blob, mOrder.action + mOrder.corpOrderId + ".xml");
+
+                    this.exportQuery.orderId = corpOrderId;
+                    this.exportQuery.exportStatus = "已上传";
+                    updateExportStatus(this.exportQuery).then((response) => {
+                        this.getList();
+                    });
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+
+        uploadOrderDialog(value) {
+            console.log(value.id + "---" + value.orderid);
+            this.uploadQuery = {
+                orderId: value.id,
+            };
+            uploadOrder(this.uploadQuery)
+                .then((response) => {
+                    if (response.code === 20000) {
+                        this.$message.success(response.data);
+                        this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
+        closeDetailDialog(val) {
+            this.codeDetailVisible = false;
+        },
+        closeManuDialog(val) {
+            this.addDialogVisible = false;
+            if (val) {
+                this.$message.success("选入成功");
+                this.refresgOrderDetail();
+                this.getList();
+            } else {
+                this.$message.error("选入失败");
+            }
+        },
+        cancelDialog() {
+            this.addDialogVisible = false;
+        },
+        importOrder(row) {
+            this.orderId = row.id;
+            this.addDialogVisible = true;
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
+    },
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "success",
+                true: "danger",
+            };
+            return statusMap[status];
+        },
+    },
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+
+    created() {
+        this.getBusType();
+        let query = this.$route.query;
+        this.query = Object.assign(this.query, query);
+        this.query.limit = parseInt(this.query.limit);
+        // 加载表格数据
+        this.getList();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+    },
+};
+</script>
+
+
+<style>
+.el-table .warning-row {
+    background: #ffb5b5;
+}
+
+.el-table .success-row {
+    background: #ffffff;
+}
+</style>

src/views/login/index.vue

@@ -68,8 +68,8 @@ export default {
         };
         return {
             ruleForm: {
-                userName: "admin",
-                pwd: "admin",
+                userName: "",
+                pwd: "",
                 checked: true
             },
             rules: {

src/views/thrsys/ThrCorpsImportDetail.vue

@@ -32,7 +32,7 @@
                 style="width: 100%"
             >
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="往来单位ID" prop="id" width="100" show-overflow-tooltip></el-table-column>
+                <el-table-column label="往来单位ID" prop="unitId" width="100" show-overflow-tooltip></el-table-column>
                 <el-table-column label="往来单位" prop="name" show-overflow-tooltip></el-table-column>
                 <el-table-column label="拼音简写" prop="spell" width="100" show-overflow-tooltip></el-table-column>
                 <el-table-column label="地址" prop="addr" show-overflow-tooltip></el-table-column>

src/views/thrsys/ThrOrder.vue

@@ -22,15 +22,39 @@
                         ></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
-                            <el-option
-                                v-for="item in busTypes"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.action">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
+                        <!--                        <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">-->
+                        <!--                            <el-option-->
+                        <!--                                v-for="item in busTypes"-->
+                        <!--                                :key="item.name"-->
+                        <!--                                :label="item.name"-->
+                        <!--                                :value="item.action">-->
+                        <!--                                <span style="float: left">{{ item.name }}</span>-->
+                        <!--                            </el-option>-->
+                        <!--                        </el-select>-->
+
+<!--                        <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型" clearable="true">-->
+<!--                            <el-option-->
+<!--                                v-for="item in originTypes"-->
+<!--                                :key="item.name"-->
+<!--                                :label="item.name"-->
+<!--                                :value="item.action">-->
+<!--                                <span style="float: left">{{ item.name }}</span>-->
+<!--                                &lt;!&ndash;<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>&ndash;&gt;-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+
+                      <el-select v-model="filterQuery.billAction" placeholder="请选择第三方单据类型" clearable="true">
+                        <el-option
+                            v-for="item in originTypes"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.action">
+                          <span style="float: left;font-size: 13px">{{ item.name }}</span>
+                          <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+                              item.thirdSysName
+                            }}</span>
+                        </el-option>
+                      </el-select>
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
@@ -47,20 +71,18 @@
                         </el-date-picker>
                     </el-form-item>
                     <!--<el-form-item class="query-form-item">-->
-                        <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
-                            <!--<el-option-->
-                                <!--v-for="item in thirdSys"-->
-
+                    <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
+                    <!--<el-option-->
+                    <!--v-for="item in thirdSys"-->
 
 
-
-                                <!--:key="item.value"-->
-                                <!--:label="item.thirdName"-->
-                                <!--:value="item.thirdId">-->
-                                <!--<span style="float: left">{{ item.thirdName }}</span>-->
-                                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
-                            <!--</el-option>-->
-                        <!--</el-select>-->
+                    <!--:key="item.value"-->
+                    <!--:label="item.thirdName"-->
+                    <!--:value="item.thirdId">-->
+                    <!--<span style="float: left">{{ item.thirdName }}</span>-->
+                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
+                    <!--</el-option>-->
+                    <!--</el-select>-->
                     <!--</el-form-item>-->
                     <el-form-item>
                         <el-button-group style="display:flex;">
@@ -91,10 +113,10 @@
                       @current-change="handleDetail">
                 <el-table-column label="序号" type="index" width="60"></el-table-column>
                 <el-table-column label="单据号" prop="billNo"></el-table-column>
-                <el-table-column label="往来单位ID" prop="corpId" ></el-table-column>
+                <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
                 <el-table-column label="往来单位" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="原单据类型" prop="originType"></el-table-column>
+                <el-table-column label="第三方单据类型" prop="originType"></el-table-column>
                 <el-table-column label="扫码单据类型" prop="billType">
 
                     <template slot-scope="scope">
@@ -103,7 +125,7 @@
 
                 </el-table-column>
 
-                <el-table-column label="单据状态" prop="billFlag" ></el-table-column>
+                <el-table-column label="单据状态" prop="billFlag"></el-table-column>
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
 
 
@@ -138,332 +160,341 @@
     </div>
 </template>
 <script>
-    import {
-        delThrOrders, delAll, downloadAll
-    } from "../../api/thrsys/thrOrder";
-    import {getBussinessType} from "../../api/basic/bussinessType";
-    import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
-    import {selectIp} from "../../api/param/systemParamConfig";
-    import {
-        getCloudErp,
-    } from "../../api/inout/erpOrder";
+import {
+    delThrOrders, delAll, downloadAll
+} from "../../api/thrsys/thrOrder";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
+import {selectIp} from "../../api/param/systemParamConfig";
+import {
+    getCloudErp, getThirdSysOrder
+} from "../../api/inout/erpOrder";
+import {getOriginBusType} from "@/api/basic/busOriginType";
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    billAction: null,
-                    billNo: "",
-                    thirdSysFk: "",
-                    page: 1,
-                    limit: 10,
-                    corpName:null,
-                },
-                total: 0,
-                thirdSys: [],
-                thirdSysDetail: null,
-                busTypes: [],
-                list: [],
-                detailList: [],
-                uploadFileUrl: null,
-                fileList: [],
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-                loading: false,
-                actDateRange: [],
-                pickerOptions: {
-                    shortcuts: [
-                        {
-                            text: "最近一周",
-                            onClick(picker) {
-                                const end = new Date();
-                                const start = new Date();
-                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                                picker.$emit("pick", [start, end]);
-                            },
+export default {
+    data() {
+        return {
+            filterQuery: {
+                billAction: null,
+                billNo: "",
+                thirdSysFk: "",
+                page: 1,
+                limit: 10,
+                corpName: null,
+            },
+            total: 0,
+            thirdSys: [],
+            thirdSysDetail: null,
+            busTypes: [],
+            list: [],
+            detailList: [],
+            uploadFileUrl: null,
+            fileList: [],
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+            loading: false,
+            actDateRange: [],
+            originTypes: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
                         },
-                        {
-                            text: "最近一个月",
-                            onClick(picker) {
-                                const end = new Date();
-                                const start = new Date();
-                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                                picker.$emit("pick", [start, end]);
-                            },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
                         },
-                        {
-                            text: "最近三个月",
-                            onClick(picker) {
-                                const end = new Date();
-                                const start = new Date();
-                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                                picker.$emit("pick", [start, end]);
-                            },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
                         },
-                    ],
-                },
+                    },
+                ],
+            },
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                corpName: null,
             };
+            this.actDateRange = [];
+            this.getList();
         },
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
+        getList() {
+            if (this.filterQuery.thirdSysFk == null) {
+                this.$message.warning("请先选择第三方系统！")
+                return;
+            }
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
+            } else {
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
+            }
+            this.loading = true;
+            getThirdSysOrder(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
                 });
-                this.filterQuery = {
-                    billNo: "",
-                    thirdSysFk: "",
-                    billFlag: null,
-                    billAction: null,
-                    startDate: null,
-                    endDate: null,
-                    page: 1,
-                    limit: 10,
-                    corpName:null,
-                };
-                this.actDateRange = [];
-                this.getList();
-            },
+        },
+        handleDetail(row) {
 
-            getList() {
-                if (this.filterQuery.thirdSysFk == null) {
-                    this.$message.warning("请先选择第三方系统！")
-                    return;
-                }
-                if (this.actDateRange != null) {
-                    this.filterQuery.startDate = this.actDateRange[0];
-                    this.filterQuery.endDate = this.actDateRange[1];
-                } else {
-                    this.filterQuery.startDate = null;
-                    this.filterQuery.endDate = null;
-                }
-                this.loading = true;
-                getCloudErp(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.list = response.data.list || [];
-                            this.total = response.data.total || 0;
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                        this.loading = false;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
-            handleDetail(row) {
+            this.detailList = row.subErpOrders;
+            // console.log(row.billNo);
+            // let query = {
+            //     orderIdFk: row.id
+            // };
+            // this.loading = true;
+            // getThrOrderDetails(query)
+            //     .then((response) => {
+            //         this.loading = false;
+            //         this.detailList = response.data.list || [];
+            //         this.total = response.data.total || 0;
+            //     })
+            //     .catch(() => {
+            //         this.loading = false;
+            //         this.list = [];
+            //         this.total = 0;
+            //     });
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let dQuery = {
+                        id: row.id,
+                    };
+                    delThrOrders(dQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
 
-                this.detailList = row.subErpOrders;
-                // console.log(row.billNo);
-                // let query = {
-                //     orderIdFk: row.id
-                // };
-                // this.loading = true;
-                // getThrOrderDetails(query)
-                //     .then((response) => {
-                //         this.loading = false;
-                //         this.detailList = response.data.list || [];
-                //         this.total = response.data.total || 0;
-                //     })
-                //     .catch(() => {
-                //         this.loading = false;
-                //         this.list = [];
-                //         this.total = 0;
-                //     });
-            },
-            deleteDialog(row) {
-                this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
                 })
-                    .then(() => {
-                        let dQuery = {
-                            id: row.id,
-                        };
-                        delThrOrders(dQuery)
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                    this.getList();
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
+                .catch(() => {
+                });
+        },
+        clearAll() {
+            this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    delAll()
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.success(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
 
-                    })
-                    .catch(() => {
-                    });
-            },
-            clearAll() {
-                this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
                 })
-                    .then(() => {
-                        delAll()
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                    this.getList();
-                                } else {
-                                    this.$message.success(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
-
-                    })
-                    .catch(() => {
-                    });
-            },
-            getBasicThirdSys() {
-                let query = {
-                    enabled: true,
-                };
-                getBasicThirdSys(query)
-                    .then((response) => {
-                        this.thirdSys = response.data.list || [];
-                        this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-                        this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                        this.selectSysParam();
-                        this.getThirdSysDetail();
-                        this.getBusType();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-            },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
-                this.getList();
-            },
-            handleChange(response, files, fileList) {
-                console.log(response);
-                if (response.code != 20000) {
-                    this.$message.error(response.message);
-                } else {
-                    console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                    this.$message.success("文件上传成功,请稍后刷新查看！");
-                }
-            },
-            selectSysParam() {
-                let query = {
-                    key: "thirdIpUrl",
-                    thirdSysFk: this.filterQuery.thirdSysFk
-                };
-                selectIp(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
-                    }
+                .catch(() => {
                 });
-            },
-            thirdSysChange() {
-                this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                this.getThirdSysDetail();
-            },
-            getThirdSysDetail() {
-                let query = {
-                    thirdSysFk: this.filterQuery.thirdSysFk,
-                    key: "orderQueryUrl",
-                };
-                filterDetailByKey(query)
-                    .then((response) => {
-                        this.thirdSysDetail = response.data;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
+        },
 
-            },
-            downloadDatas() {
-                let query = {
-                    billAction: this.filterQuery.billAction
-                };
-                downloadAll(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success(response.data);
-                    } else {
-                        this.$message.error(response.message);
-                    }
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+                    this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+                    this.selectSysParam();
+                    this.getThirdSysDetail();
+                    this.getBusType();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            getOriginBusType()
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success("文件上传成功,请稍后刷新查看！");
+            }
+        },
+        selectSysParam() {
+            let query = {
+                key: "thirdIpUrl",
+                thirdSysFk: this.filterQuery.thirdSysFk
+            };
+            selectIp(query).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
+                }
+            });
+        },
+        thirdSysChange() {
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            this.getThirdSysDetail();
+        },
+        getThirdSysDetail() {
+            let query = {
+                thirdSysFk: this.filterQuery.thirdSysFk,
+                key: "orderQueryUrl",
+            };
+            filterDetailByKey(query)
+                .then((response) => {
+                    this.thirdSysDetail = response.data;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
                 });
 
-            },
-            getBusType() {
-                let query = {
-                    enabled: true,
-                };
-                getBussinessType(query)
-                    .then((response) => {
-                        this.busTypes = response.data.list || [];
-                        this.filterQuery.billAction = this.busTypes[0].action;
-                        // this.getList();
-                    })
-                    .catch(() => {
-                    });
-            },
-
-            geActionName(action){
-                for (let i = 0; i < this.busTypes.length; i++) {
-                    if (this.busTypes[i].action === action) {
-                        return this.busTypes[i].name;
-                    }
+        },
+        downloadDatas() {
+            let query = {
+                billAction: this.filterQuery.billAction
+            };
+            downloadAll(query).then((response) => {
+                if (response.code == 20000) {
+                    this.$message.success(response.data);
+                } else {
+                    this.$message.error(response.message);
                 }
-            },
+            });
 
         },
-        components: {},
-        mounted() {
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    // this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
         },
-        created() {
-            this.getBasicThirdSys();
-            let end = new Date();
-            let start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            this.actDateRange = [start, end];
+
+        geActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
         },
-    };
+
+    },
+    components: {},
+    mounted() {
+    },
+    created() {
+        this.getBasicThirdSys();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+    },
+};
 </script>
 <style scoped>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 25%;
-    }
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
+}
 
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
 
-    .query-form-item {
-        display: block !important;
-        margin-right: 10px;
-        margin-bottom: 5px;
-    }
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
 
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
-    }
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+}
 
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
 </style>
 

src/views/thrsys/ThrOrderImport.vue

@@ -16,7 +16,7 @@
                 </el-form-item>
 
                 <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统"  @change="sysChange">
+                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.value"
@@ -154,306 +154,306 @@
 </template>
 
 <script>
-    import axios from "axios";
-    import {filterLog, deleteLog} from "../../api/thrsys/thrOrderImport";
-    import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
-    import {downloadAll} from "../../api/thrsys/thrOrder";
-    import {getBussinessType} from "../../api/basic/bussinessType";
-    import thrOrderImportDetail from "./ThrOrderImportDetail";
-    import thrOrderSelect from "./ThrOrderSelect";
-    import {selectIp} from "../../api/param/systemParamConfig";
+import axios from "axios";
+import {filterLog, deleteLog} from "../../api/thrsys/thrOrderImport";
+import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
+import {downloadAll} from "../../api/thrsys/thrOrder";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import thrOrderImportDetail from "./ThrOrderImportDetail";
+import thrOrderSelect from "./ThrOrderSelect";
+import {selectIp} from "../../api/param/systemParamConfig";
 
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    genKey: null,
-                    status: null,
-                    fromType: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                },
-                udiImportDetailVisible: false,
-                checked: false,
-                list: [],
-                detailList: [],
-                thirdSys: [],
-                thirdSysDetail: null,
-                total: 0,
-                currentRow: null,
-                editQuery: null,
-                fromStatus: {
-                    0: "产品信息",
-                    1: "库存信息",
-                    2: "异常第三方上传"
-                },
-                status: {
-                    0: "等待处理",
-                    1: "正在处理",
-                    2: "处理异常",
-                    3: "处理完成"
-                },
-                uploadFileUrl: null,
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-                templateDlUrl: null,
-                busTypes: [],
-                thrOrderSelectVisible: false,
+export default {
+    data() {
+        return {
+            filterQuery: {
+                genKey: null,
+                status: null,
+                fromType: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
+            },
+            udiImportDetailVisible: false,
+            checked: false,
+            list: [],
+            detailList: [],
+            thirdSys: [],
+            thirdSysDetail: null,
+            total: 0,
+            currentRow: null,
+            editQuery: null,
+            fromStatus: {
+                0: "产品信息",
+                1: "库存信息",
+                2: "异常第三方上传"
+            },
+            status: {
+                0: "等待处理",
+                1: "正在处理",
+                2: "处理异常",
+                3: "处理完成"
+            },
+            uploadFileUrl: null,
+            uploadData: {
+                thirdSys: "thirdId",
+            },
+            templateDlUrl: null,
+            busTypes: [],
+            thrOrderSelectVisible: false,
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                fromType: null,
+                genKey: null,
+                status: null,
+                page: 1,
+                limit: 20,
+                thirdSysFk: null,
             };
+            this.getList();
         },
-
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
+        getList() {
+            this.loading = true;
+            filterLog(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
                 });
-                this.filterQuery = {
-                    fromType: null,
-                    genKey: null,
-                    status: null,
-                    page: 1,
-                    limit: 20,
-                    thirdSysFk: null,
-                };
-                this.getList();
-            },
-            getList() {
-                this.loading = true;
-                filterLog(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.list = response.data.list || [];
-                            this.total = response.data.total || 0;
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                        this.loading = false;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
+        },
 
-            handleDetailClick(row) {
-                this.currentRow = row;
-                console.log(this.currentRow.genKey)
-                this.udiImportDetailVisible = true;
-            },
+        handleDetailClick(row) {
+            this.currentRow = row;
+            console.log(this.currentRow.genKey)
+            this.udiImportDetailVisible = true;
+        },
 
-            sysChange() {
-                this.getThirdSysDetail();
-                // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
-            },
+        sysChange() {
+            this.getThirdSysDetail();
+            // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
+        },
 
-            cancelDialog(val) {
-                this.udiImportDetailVisible = false;
-                this.thrOrderSelectVisible = false;
+        cancelDialog(val) {
+            this.udiImportDetailVisible = false;
+            this.thrOrderSelectVisible = false;
 
-                if (val) {
+            if (val) {
+                this.getList();
+            }
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        jumpDl() {
+            window.open(this.templateDlUrl, '_blank');
+        },
+        deleteDialog(rowId) {
+            this.$confirm("此操作将删除该业务单据信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let dQuery = {
+                        id: rowId,
+                    };
+                    deleteLog(dQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                            this.getList();
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+                })
+                .catch(() => {
+                });
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+                    this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
                     this.getList();
+                    this.getThirdSysDetail();
+                    this.selectSysParam();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            axios.get("./config.json").then(res => {
+                // 基础地址
+                let response = res.data.BASE_URL;
+                // this.uploadFileUrl = response + "/udiwms/thrOrder/importLog/upload";
+                let response2 = res.data.SERVER_IP;
+                this.templateDlUrl = response2 + "/第三方业务单据导入模板.xlsx";
+                console.log(res.data.BASE_URL + "\n");
+            });
+        },
+
+        selectSysParam() {
+            let query = {
+                key: "thirdIpUrl",
+                thirdSysFk: this.filterQuery.thirdSysFk
+            };
+            selectIp(query).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/order/upload";
                 }
-            },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
+            });
+        },
+
+        formatterThirdSys(key) {
+            let data = null;
+            this.thirdSys.forEach((item, index) => {
+                if (key.thirdSysFk == item.thirdId) {
+                    data = item.thirdName;
+                }
+            });
+            return data;
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success("文件上传成功,请稍后刷新查看！");
                 this.getList();
-            },
-            jumpDl() {
-                window.open(this.templateDlUrl, '_blank');
-            },
-            deleteDialog(rowId) {
-                this.$confirm("此操作将删除该业务单据信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
+            }
+        },
+        statusFilterType(status) {
+            const statusMap = {
+                0: "warning",
+                1: "warning",
+                2: "danger",
+                3: "success",
+            };
+            return statusMap[status];
+        },
+        getThirdSysDetail() {
+            let query = {
+                thirdSysFk: this.filterQuery.thirdSysFk,
+                key: "orderQueryUrl",
+            };
+            filterDetailByKey(query)
+                .then((response) => {
+                    this.thirdSysDetail = response.data;
                 })
-                    .then(() => {
-                        let dQuery = {
-                            id: rowId,
-                        };
-                        deleteLog(dQuery)
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                                this.getList();
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
-                    })
-                    .catch(() => {
-                    });
-            },
-            getBasicThirdSys() {
-                let query = {
-                    enabled: true,
-                };
-                getBasicThirdSys(query)
-                    .then((response) => {
-                        this.thirdSys = response.data.list || [];
-                        this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-                        this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                        this.getList();
-                        this.getThirdSysDetail();
-                        this.selectSysParam();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-                axios.get("./config.json").then(res => {
-                    // 基础地址
-                    let response = res.data.BASE_URL;
-                    // this.uploadFileUrl = response + "/udiwms/thrOrder/importLog/upload";
-                    let response2 = res.data.SERVER_IP;
-                    this.templateDlUrl = response2 + "/第三方业务单据导入模板.xlsx";
-                    console.log(res.data.BASE_URL + "\n" + res.data.BASE_URL2);
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
                 });
-            },
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+
+        },
+        downloadOrderss() {
+            this.selectType = 3;
+            this.thrOrderSelectVisible = true;
+        },
 
-            selectSysParam() {
+        downloadDatas() {
+            this.$confirm("此操作从第三方系统下载全部业务单据信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
                 let query = {
-                    key: "thirdIpUrl",
+                    billAction: this.filterQuery.billAction,
                     thirdSysFk: this.filterQuery.thirdSysFk
                 };
-                selectIp(query).then((response) => {
+                downloadAll(query).then((response) => {
                     if (response.code == 20000) {
-                        this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/order/upload";
+                        this.$message.success(response.data);
+                    } else {
+                        this.$message.error(response.message);
                     }
                 });
-            },
+            });
 
-            formatterThirdSys(key) {
-                let data = null;
-                this.thirdSys.forEach((item, index) => {
-                    if (key.thirdSysFk == item.thirdId) {
-                        data = item.thirdName;
-                    }
-                });
-                return data;
-            },
-            handleChange(response, files, fileList) {
-                console.log(response);
-                if (response.code != 20000) {
-                    this.$message.error(response.message);
-                } else {
-                    // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                    this.$message.success("文件上传成功,请稍后刷新查看！");
-                    this.getList();
-                }
-            },
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "warning",
-                    1: "warning",
-                    2: "danger",
-                    3: "success",
-                };
-                return statusMap[status];
-            },
-            getThirdSysDetail() {
-                let query = {
-                    thirdSysFk: this.filterQuery.thirdSysFk,
-                    key: "orderQueryUrl",
-                };
-                filterDetailByKey(query)
-                    .then((response) => {
-                        this.thirdSysDetail = response.data;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-                this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
 
-            },
-            downloadOrderss() {
-                this.selectType = 3;
-                this.thrOrderSelectVisible = true;
-            },
-
-            downloadDatas() {
-                this.$confirm("此操作从第三方系统下载全部业务单据信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                }).then(() => {
-                    let query = {
-                        billAction: this.filterQuery.billAction,
-                        thirdSysFk: this.filterQuery.thirdSysFk
-                    };
-                    downloadAll(query).then((response) => {
-                        if (response.code == 20000) {
-                            this.$message.success(response.data);
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                })
+                .catch(() => {
                 });
-
-
-            },
-            getBusType() {
-                let query = {
-                    enabled: true,
-                };
-                getBussinessType(query)
-                    .then((response) => {
-                        this.busTypes = response.data.list || [];
-                        this.filterQuery.billAction = this.busTypes[0].action;
-                    })
-                    .catch(() => {
-                    });
-            },
-            formatter(row, index) {
-                if (row.isE == true) {
-                    row.Registrationstate = "已注册"
-                }
-                if (row.Registrationstate == false) {
-                    row.Registrationstate = "未注册"
-                }
-                return row.Registrationstate
-            }
         },
+        formatter(row, index) {
+            if (row.isE == true) {
+                row.Registrationstate = "已注册"
+            }
+            if (row.Registrationstate == false) {
+                row.Registrationstate = "未注册"
+            }
+            return row.Registrationstate
+        }
+    },
 
-        mounted() {
-        },
-        components: {thrOrderImportDetail,thrOrderSelect},
-        created() {
-            this.getBasicThirdSys();
-            this.getBusType();
-            this.getList();
-        },
-    };
+    mounted() {
+    },
+    components: {thrOrderImportDetail, thrOrderSelect},
+    created() {
+        this.getBasicThirdSys();
+        this.getBusType();
+        this.getList();
+    },
+};
 </script>
 <style>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 100px;
-    }
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+}
 
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
 
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
 
-    }
+}
 
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
 </style>

src/views/thrsys/ThrOrderSelect.vue

@@ -21,7 +21,7 @@
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
                             <el-option
-                                v-for="item in busTypes"
+                                v-for="item in originTypes"
                                 :key="item.name"
                                 :label="item.name"
                                 :value="item.action">
@@ -45,16 +45,16 @@
                         </el-date-picker>
                     </el-form-item>
                     <!--<el-form-item class="query-form-item">-->
-                        <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
-                            <!--<el-option-->
-                                <!--v-for="item in thirdSys"-->
-                                <!--:key="item.value"-->
-                                <!--:label="item.thirdName"-->
-                                <!--:value="item.thirdId">-->
-                                <!--<span style="float: left">{{ item.thirdName }}</span>-->
-                                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
-                            <!--</el-option>-->
-                        <!--</el-select>-->
+                    <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
+                    <!--<el-option-->
+                    <!--v-for="item in thirdSys"-->
+                    <!--:key="item.value"-->
+                    <!--:label="item.thirdName"-->
+                    <!--:value="item.thirdId">-->
+                    <!--<span style="float: left">{{ item.thirdName }}</span>-->
+                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
+                    <!--</el-option>-->
+                    <!--</el-select>-->
                     <!--</el-form-item>-->
                     <el-form-item>
                         <el-button-group style="display:flex;">
@@ -94,7 +94,7 @@
                 <el-table-column label="往来单位ID" prop="corpId" width="100"></el-table-column>
                 <el-table-column label="往来单位" prop="corpName" width="300"
                                  show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="原单据类型" prop="originType"></el-table-column>
+                <el-table-column label="第三方单据类型" prop="originType"></el-table-column>
                 <el-table-column label="扫码单据类型" prop="billType">
 
                     <template slot-scope="scope">
@@ -106,7 +106,7 @@
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
 
                 <el-table-column label="操作" fixed="right" v-if="thirdSysDetail.fromType!=0">
-                    <template slot-scope="scope" >
+                    <template slot-scope="scope">
                         <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
                         >删除
                         </el-button>
@@ -136,422 +136,432 @@
     </div>
 </template>
 <script>
-    import {
-        delThrOrders, delAll, downloadAll, orderDownload
-    } from "../../api/thrsys/thrOrder";
-    import {getBussinessType} from "../../api/basic/bussinessType";
-    import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
-    import {selectIp} from "../../api/param/systemParamConfig";
-    import {getCloudErp} from "../../api/inout/erpOrder";
-    import {exportExcel} from "../../api/thrsys/thrOrderExport"
-    import {orderUpload} from "../../api/thrsys/smp"
+import {
+    delThrOrders, delAll, downloadAll, orderDownload
+} from "../../api/thrsys/thrOrder";
+import {getBussinessType} from "../../api/basic/bussinessType";
+import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
+import {selectIp} from "../../api/param/systemParamConfig";
+import {getCloudErp, getThirdSysOrder} from "../../api/inout/erpOrder";
+import {exportExcel} from "../../api/thrsys/thrOrderExport"
+import {orderUpload} from "../../api/thrsys/smp"
+import {getOriginBusType} from "@/api/basic/busOriginType";
+
+export default {
+    name: "ThrOrderSelect",
+    props: {
+        selectType: {
+            type: Object,
+            required: true,
+        },
+        isDownThrSys: {
+            type: Object,
+            required: true,
+        },
 
-    export default {
-        name: "ThrOrderSelect",
-        props: {
-            selectType: {
-                type: Object,
-                required: true,
+    },
+    data() {
+        return {
+            filterQuery: {
+                erpOrderResponses: [],
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                isDownThrSys: null,
             },
-            isDownThrSys: {
-                type: Object,
-                required: true,
+            total: 0,
+            thirdSys: [],
+            thirdSysDetail: null,
+            busTypes: [],
+            originTypes: [],
+            list: [],
+            detailList: [],
+            uploadFileUrl: null,
+            fileList: [],
+            uploadData: {
+                thirdSys: "thirdId",
             },
-
-        },
-        data() {
-            return {
-                filterQuery: {
-                    erpOrderResponses: [],
-                    billNo: "",
-                    thirdSysFk: "",
-                    billFlag: null,
-                    billAction: "PurchaseWareHouseIn",
-                    startDate: null,
-                    endDate: null,
-                    page: 1,
-                    limit: 10,
-                    isDownThrSys: null,
-                },
-                total: 0,
-                thirdSys: [],
-                thirdSysDetail: null,
-                busTypes: [],
-                list: [],
-                detailList: [],
-                uploadFileUrl: null,
-                fileList: [],
-                uploadData: {
-                    thirdSys: "thirdId",
-                },
-                loading: false,
-                multipleSelection: [],
-                actDateRange: [],
-                pickerOptions: {
-                    shortcuts: [
-                        {
-                            text: "最近一周",
-                            onClick(picker) {
-                                const end = new Date();
-                                const start = new Date();
-                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                                picker.$emit("pick", [start, end]);
-                            },
+            loading: false,
+            multipleSelection: [],
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
                         },
-                        {
-                            text: "最近一个月",
-                            onClick(picker) {
-                                const end = new Date();
-                                const start = new Date();
-                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                                picker.$emit("pick", [start, end]);
-                            },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
                         },
-                        {
-                            text: "最近三个月",
-                            onClick(picker) {
-                                const end = new Date();
-                                const start = new Date();
-                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                                picker.$emit("pick", [start, end]);
-                            },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
                         },
-                    ],
-                },
+                    },
+                ],
+            },
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                erpOrderResponses: [],
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                isDownThrSys: null,
             };
+            this.actDateRange = [];
+            this.getList();
         },
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    erpOrderResponses: [],
-                    billNo: "",
-                    thirdSysFk: "",
-                    billFlag: null,
-                    billAction: "PurchaseWareHouseIn",
-                    startDate: null,
-                    endDate: null,
-                    page: 1,
-                    limit: 10,
-                    isDownThrSys: null,
-                };
-                this.actDateRange = [];
-                this.getList();
-            },
+        getList() {
+            if (this.filterQuery.thirdSysFk == null) {
+                this.$message.warning("请先选择第三方系统！")
+                return;
+            }
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
+            } else {
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
+            }
 
-            getList() {
-                if (this.filterQuery.thirdSysFk == null) {
-                    this.$message.warning("请先选择第三方系统！")
-                    return;
-                }
-                if (this.actDateRange != null) {
-                    this.filterQuery.startDate = this.actDateRange[0];
-                    this.filterQuery.endDate = this.actDateRange[1];
-                } else {
-                    this.filterQuery.startDate = null;
-                    this.filterQuery.endDate = null;
-                }
-
-                this.loading = true;
-                this.filterQuery.isDownThrSys = this.isDownThrSys;
-                getCloudErp(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.list = response.data.list || [];
-                            this.total = response.data.total || 0;
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                        this.loading = false;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
-            handleDetail(row) {
-                this.detailList = row.subErpOrders;
-            },
-            handleSelectionChange(val) {
-                this.multipleSelection = val;
-            },
-            selectExport() {
-                var selectData = this.multipleSelection;
-                selectData.forEach((obj) => {
-                    this.filterQuery.erpOrderResponses.push(obj);
+            this.loading = true;
+            this.filterQuery.isDownThrSys = this.isDownThrSys;
+            getThirdSysOrder(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
                 });
-                this.allExport();
-            },
-            allExport() {
-                exportExcel(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.$message({
-                                type: "success",
-                                message: "导出成功，后台正在生成Excel文件，请稍后刷新查看！",
-                            });
-                        } else {
-                            this.$message({
-                                type: "error",
-                                message: response.message,
-                            });
-                        }
-                        this.$emit("cancelDialog", true);
-                    })
-                    .catch(() => {
+        },
+        handleDetail(row) {
+            this.detailList = row.subErpOrders;
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+        selectExport() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.erpOrderResponses.push(obj);
+            });
+            this.allExport();
+        },
+        allExport() {
+            exportExcel(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message({
+                            type: "success",
+                            message: "导出成功，后台正在生成Excel文件，请稍后刷新查看！",
+                        });
+                    } else {
                         this.$message({
                             type: "error",
-                            message: "上传失败",
+                            message: response.message,
                         });
+                    }
+                    this.$emit("cancelDialog", true);
+                })
+                .catch(() => {
+                    this.$message({
+                        type: "error",
+                        message: "上传失败",
                     });
-            },
-
-            uploadSMP() {
-                var selectData = this.multipleSelection;
-                selectData.forEach((obj) => {
-                    this.filterQuery.erpOrderResponses.push(obj);
                 });
-                this.allUploadSMP();
-            },
-
-            allUploadSMP() {
-                orderUpload(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.$message.success("提交成功，后台正在上传！")
-                        } else {
-                            this.$message.error(response.message)
-                        }
-                        this.$emit("cancelDialog", true);
-                    })
-                    .catch(() => {
-                        this.$message.error("上传失败！");
-                    });
-            },
+        },
 
+        uploadSMP() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.erpOrderResponses.push(obj);
+            });
+            this.allUploadSMP();
+        },
 
-            downloadErp() {
-                var selectData = this.multipleSelection;
-                selectData.forEach((obj) => {
-                    this.filterQuery.erpOrderResponses.push(obj);
+        allUploadSMP() {
+            orderUpload(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message.success("提交成功，后台正在上传！")
+                    } else {
+                        this.$message.error(response.message)
+                    }
+                    this.$emit("cancelDialog", true);
+                })
+                .catch(() => {
+                    this.$message.error("上传失败！");
                 });
-                this.downloadAllErp();
-            },
+        },
 
-            downloadAllErp() {
-                orderDownload(this.filterQuery)
-                    .then((response) => {
-                        if (response.code == 20000) {
-                            this.$message.success("提交成功，后台正在下载！")
 
-                        } else {
-                            this.$message.error(response.message)
-                        }
-                        this.$emit("cancelDialog", true);
-                    })
-                    .catch(() => {
-                        this.$message.error("下载失败！");
-                    });
-            },
+        downloadErp() {
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.filterQuery.erpOrderResponses.push(obj);
+            });
+            this.downloadAllErp();
+        },
 
-            deleteDialog(row) {
-                this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                })
-                    .then(() => {
-                        let dQuery = {
-                            id: row.id,
-                        };
-                        delThrOrders(dQuery)
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                    this.getList();
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
+        downloadAllErp() {
+            orderDownload(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.$message.success("提交成功，后台正在下载！")
 
-                    })
-                    .catch(() => {
-                    });
-            },
-            clearAll() {
-                this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
+                    } else {
+                        this.$message.error(response.message)
+                    }
+                    this.$emit("cancelDialog", true);
                 })
-                    .then(() => {
-                        delAll()
-                            .then((response) => {
-                                this.loading = false;
-                                if (response.code == 20000) {
-                                    this.$message.success("删除成功");
-                                    this.getList();
-                                } else {
-                                    this.$message.success(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.loading = false;
-                            });
+                .catch(() => {
+                    this.$message.error("下载失败！");
+                });
+        },
 
-                    })
-                    .catch(() => {
-                    });
-            },
-            getBasicThirdSys() {
-                let query = {
-                    enabled: true,
-                };
-                getBasicThirdSys(query)
-                    .then((response) => {
-                        this.thirdSys = response.data.list || [];
-                        this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
-                        this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                        this.selectSysParam();
-                        this.getThirdSysDetail();
-                        this.getBusType();
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let dQuery = {
+                        id: row.id,
+                    };
+                    delThrOrders(dQuery)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
 
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
-            },
-            handleCurrentChange(val) {
-                this.filterQuery.page = val;
-                this.getList();
-            },
-            handleChange(response, files, fileList) {
-                console.log(response);
-                if (response.code != 20000) {
-                    this.$message.error(response.message);
-                } else {
-                    console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
-                    this.$message.success("文件上传成功,请稍后刷新查看！");
-                }
-            },
-            selectSysParam() {
-                let query = {
-                    key: "thirdIpUrl",
-                    thirdSysFk: this.filterQuery.thirdSysFk
-                };
-                selectIp(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
-                    }
+                })
+                .catch(() => {
                 });
-            },
-            thirdSysChange() {
-                this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
-                this.getThirdSysDetail();
-            },
-            getThirdSysDetail() {
-                let query = {
-                    thirdSysFk: this.filterQuery.thirdSysFk,
-                    key: "orderQueryUrl",
-                };
-                filterDetailByKey(query)
-                    .then((response) => {
-                        this.thirdSysDetail = response.data;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                    });
+        },
+        clearAll() {
+            this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    delAll()
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.success(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
 
-            },
-            downloadDatas() {
-                let query = {
-                    billAction: this.filterQuery.billAction
-                };
-                downloadAll(query).then((response) => {
-                    if (response.code == 20000) {
-                        this.$message.success(response.data);
-                    } else {
-                        this.$message.error(response.message);
-                    }
+                })
+                .catch(() => {
                 });
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
+                    this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+                    this.selectSysParam();
+                    this.getThirdSysDetail();
+                    this.getBusType();
 
-            },
-            getBusType() {
-                let query = {
-                    enabled: true,
-                };
-                getBussinessType(query)
-                    .then((response) => {
-                        this.busTypes = response.data.list || [];
-                        this.filterQuery.billAction = this.busTypes[0].action;
-                        this.getList();
-                    })
-                    .catch(() => {
-                    });
-            },
-            geActionName(action){
-                for (let i = 0; i < this.busTypes.length; i++) {
-                    if (this.busTypes[i].action === action) {
-                        return this.busTypes[i].name;
-                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+            getOriginBusType()
+                .then((response) => {
+                    this.originTypes = response.data.list || [];
+                })
+                .catch(() => {
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleChange(response, files, fileList) {
+            console.log(response);
+            if (response.code != 20000) {
+                this.$message.error(response.message);
+            } else {
+                console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
+                this.$message.success("文件上传成功,请稍后刷新查看！");
+            }
+        },
+        selectSysParam() {
+            let query = {
+                key: "thirdIpUrl",
+                thirdSysFk: this.filterQuery.thirdSysFk
+            };
+            selectIp(query).then((response) => {
+                if (response.code == 20000) {
+                    this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
                 }
-                return action;
-            },
-
+            });
         },
-        components: {},
-        mounted() {
+        thirdSysChange() {
+            this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
+            this.getThirdSysDetail();
         },
-        created() {
-            let end = new Date();
-            let start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            this.actDateRange = [start, end];
-            this.getBasicThirdSys();
+        getThirdSysDetail() {
+            let query = {
+                thirdSysFk: this.filterQuery.thirdSysFk,
+                key: "orderQueryUrl",
+            };
+            filterDetailByKey(query)
+                .then((response) => {
+                    this.thirdSysDetail = response.data;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
 
+        },
+        downloadDatas() {
+            let query = {
+                billAction: this.filterQuery.billAction
+            };
+            downloadAll(query).then((response) => {
+                if (response.code == 20000) {
+                    this.$message.success(response.data);
+                } else {
+                    this.$message.error(response.message);
+                }
+            });
 
         },
-    };
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    // this.filterQuery.billAction = this.busTypes[0].action;
+                    this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        geActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+            return action;
+        },
+
+    },
+    components: {},
+    mounted() {
+    },
+    created() {
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+        this.getBasicThirdSys();
+
+
+    },
+};
 </script>
 <style scoped>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 25%;
-    }
+.itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 25%;
+}
+
+.text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+}
+
+.query-form {
+    margin-top: 10px;
+    display: flex;
+}
 
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
-    .query-form {
-        margin-top: 10px;
-        display: flex;
-    }
-    .query-form-item {
-        display: block !important;
-        margin-right: 10px;
-        margin-bottom: 5px;
-    }
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
 
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
-    }
+.el-row {
+    display: flex;
+    flex-wrap: wrap;
+}
 
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+}
 </style>

src/views/userManage/admin/authRole.vue

@@ -29,7 +29,7 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="list" style="width: 100%">
-      <el-table-column type="index" label="序号" width="50">序号</el-table-column>
+      <el-table-column type="index" label="序号" width="50"></el-table-column>
       <el-table-column label="角色名称" prop="name"> </el-table-column>
       <el-table-column label="状态">
         <template slot-scope="scope">

src/views/userManage/param/systemPDFModule.vue

@@ -26,7 +26,7 @@
                       @row-click="moduleClick" highlight-current-row
             >
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="模板类型" width="150" prop="templateType" >
+                <el-table-column label="模板类型" width="150" prop="templateType">
                     <template slot-scope="scope">
                         {{ moduleTypeMap[scope.row.templateType] }}
                     </template>
@@ -91,6 +91,66 @@
             >
             </el-pagination>
         </el-card>
+
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="业务类型" prop="localActionName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="模板名称">
+                    <template slot-scope="scope">
+                        <p v-if="scope.row.templateName === null">
+                            <el-button
+                                type="primary"
+                                size="mini"
+                                @click.native.stop="busSelectTemplate(scope.row)"
+                            >选择模板
+                            </el-button
+                            >
+                        </p>
+                        <p v-if="scope.row.templateName !== null">
+                            <el-button
+                                type="primary"
+                                size="mini"
+                                @click.native.stop="busSelectTemplate(scope.row)"
+                            >{{ scope.row.templateName }}
+                            </el-button
+                            >
+                        </p>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-dialog
+                title="接口参数设置"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                :visible.sync="modifyDetailDialogVisible"
+                width="70%"
+                v-if="modifyDetailDialogVisible"
+            >
+                <modifyDetailDialog :inputDetailQuery="inputDetailQuery"></modifyDetailDialog>
+                <div style="text-align: center">
+                    <el-button type="primary" size="small" icon="search" @click="onDetailModifySubmit"
+                    >提交
+                    </el-button
+                    >
+                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+                    >取消
+                    </el-button
+                    >
+                </div>
+            </el-dialog>
+            <el-pagination
+                :page-size="moduleQuery.limit"
+                @current-change="handlePageChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
+
+
+            <div style="margin-top: 18px ;  color: #F71616;">
+                <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
+            </div>
+        </el-card>
         <!--表单-->
         <el-dialog
             :title="formMap[formName]"
@@ -236,7 +296,7 @@
             :close-on-press-escape="false"
             :visible.sync="moduleFormVisible"
             :before-close="moduleHideForm"
-            width="45%"
+            width="70%"
             top="5vh"
         >
             <el-form ref="singleTable">
@@ -272,7 +332,7 @@
         <el-dialog
             title="字段说明"
             :visible.sync="centerDialogVisible"
-            width="80%"
+            width="40%"
             center>
             <span style="white-space: pre-wrap;">{{ currentRow }}</span>
             <span slot="footer" class="dialog-footer">
@@ -288,11 +348,12 @@ import {
     systemPDFTemplateSave,
     systemPDFTemplateDeleteById,
     systemPDFModuleList,
-    systemPDFModuleSave,
-    getSystemPDFModules
+    systemPDFModuleSave, updateDetailRel,
+    getSystemPDFModules, moduleDetail
 } from "../../../api/param/systemPDFTemplate";
 import {saveAs} from 'file-saver';
 import {BASE_URL, SERVER_IP} from "../../../config/app";
+import {authRoleAuthList} from "../../../api/auth/authRole";
 
 const formJson = {
     id: "",
@@ -313,6 +374,8 @@ export default {
     data() {
         return {
             query: {
+                templateType: null,
+                moduleId: null,
                 name: "",
                 page: 1,
                 limit: 20
@@ -329,6 +392,7 @@ export default {
             moduleNameList: [],
             moduleTotal: 0,
             selectTemplateQuery: {
+                busRlId: null,
                 name: "",
                 module: null,
                 page: 1,
@@ -345,7 +409,7 @@ export default {
             },
             moduleSelectList: [],
             moduleSelectTotal: 0,
-            loading: true,
+            loading: false,
             index: null,
             formName: null,
             moduleFormName: null,
@@ -381,6 +445,8 @@ export default {
                 path: ""
             });
             this.query = {
+                templateType: null,
+                moduleId: null,
                 name: "",
                 page: 1,
                 limit: 20
@@ -399,23 +465,22 @@ export default {
             this.getModuleList();
         },
         getList() {
-            this.loading = true;
-            systemPDFTemplateList(this.query)
+            // this.loading = true;
+            moduleDetail(this.query)
                 .then(response => {
                     this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
+                    this.list = response.data || [];
                 })
                 .catch(() => {
                     this.loading = false;
                     this.list = [];
-                    this.total = 0;
                 });
         },
 
         moduleClick(row) {
             this.query = {
-                module: row.id,
+                templateType: row.templateType,
+                moduleId: row.id,
                 page: 1,
                 limit: 20
             };
@@ -445,15 +510,8 @@ export default {
         jumpDl(row) {
             console.log(BASE_URL);
             console.log(row.templateDlUrl + "----" + SERVER_IP);
-            this.handleDownload(BASE_URL + "/udiwms/donwload/file?fileName=" + row.templateDlUrl, row.name+".jrxml");
+            this.handleDownload(BASE_URL + "/udiwms/donwload/file?fileName=" + row.templateDlUrl, row.name + ".jrxml");
         },
-
-
-        // jumpDl(row) {
-        //     console.log(BASE_URL);
-        //     console.log(row.templateDlUrl + "----");
-        //     window.open(SERVER_IP + row.templateDlUrl, '_blank');
-        // },
         getModuleList() {
             this.moduleLoading = true;
             systemPDFModuleList(this.moduleQuery)
@@ -496,13 +554,34 @@ export default {
             };
             this.moduleFormVisible = true;
             this.selectTemplateQuery = {
+                module: row.templateType,
+                name: "",
+                page: 1,
+                limit: 20
+            };
+            this.selectTemplateGetList();
+        },
+
+        busSelectTemplate(row) {
+            this.moduleFormData = {
+                id: row.id,
+                templateId: row.templateId,
+            };
+            this.moduleFormVisible = true;
+            this.selectTemplateQuery = {
+                module: row.templateType,
+                busRlId: row.id,
+                type: 1,
                 name: "",
                 page: 1,
-                limit: 20,
-                module:row.templateType,
+                limit: 20
             };
+            console.log("this.selectTemplateQuery.busRlId =" + this.selectTemplateQuery.busRlId);
+
             this.selectTemplateGetList();
         },
+
+
         selectTemplateGetList() {
             console.log(this.selectTemplateQuery)
             this.selectTemplateLoading = true;
@@ -695,29 +774,50 @@ export default {
             this.moduleFormLoading = true;
             let data = Object.assign({}, this.moduleFormData);
             this.moduleFormName = 'update';
-            systemPDFModuleSave(data, this.moduleFormName)
-                .then(response => {
-                    this.moduleFormLoading = false;
-                    if (response.code !== 20000) {
-                        this.$message.error(response.message);
-                        return false;
-                    }
-                    this.$message.success("操作成功");
-                    this.moduleFormVisible = false;
-                    if (this.moduleFormName === "add") {
-                        // 向头部添加数据
-                        if (response.data && response.data.id) {
-                            data.id = response.data.id;
-                            this.moduleList.unshift(data);
+            if (this.selectTemplateQuery.type == 1) {
+
+
+                console.log("this.selectTemplateQuery.busRlId =" + this.selectTemplateQuery.busRlId);
+                let query = {
+                    id: this.selectTemplateQuery.busRlId,
+                    templateId: data.templateId,
+                }
+                updateDetailRel(query)
+                    .then(response => {
+                        this.moduleFormVisible = false;
+                        this.moduleFormLoading = false;
+                        if (response.code !== 20000) {
+                            this.$message.error(response.message);
+                            return false;
                         }
-                    } else {
-                        this.moduleList.splice(this.index, 1, data);
-                    }
-                    this.getModuleList();
-                })
-                .catch(() => {
+                        this.getList();
+                    }).catch(() => {
                     this.moduleFormLoading = false;
                 });
+            } else
+                systemPDFModuleSave(data, this.moduleFormName)
+                    .then(response => {
+                        this.moduleFormLoading = false;
+                        if (response.code !== 20000) {
+                            this.$message.error(response.message);
+                            return false;
+                        }
+                        this.$message.success("操作成功");
+                        this.moduleFormVisible = false;
+                        if (this.moduleFormName === "add") {
+                            // 向头部添加数据
+                            if (response.data && response.data.id) {
+                                data.id = response.data.id;
+                                this.moduleList.unshift(data);
+                            }
+                        } else {
+                            this.moduleList.splice(this.index, 1, data);
+                        }
+                        this.getModuleList();
+                    })
+                    .catch(() => {
+                        this.moduleFormLoading = false;
+                    });
         },
         getPDFModuleNameList() {
             getSystemPDFModules()

src/views/userManage/param/systemPDFTemplate.vue

@@ -30,16 +30,17 @@
             </el-form>
             <el-table :data="list" style="width: 100%">
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="模板名称" prop="name" width="200"></el-table-column>
+                <el-table-column label="模板名称" prop="name" width="260"></el-table-column>
                 <el-table-column label="模板类型" width="150">
                     <template slot-scope="scope">
                         {{ moduleNameMap[scope.row.module] }}
                     </template>
                 </el-table-column>
+                <el-table-column label="更新时间" prop="update_time" width="180"></el-table-column>
                 <!--                <el-table-column label="表格行数" prop="rowCount" width="100"></el-table-column>-->
                 <!--                <el-table-column label="二维码数量" prop="qrcodeCount" width="125"></el-table-column>-->
                 <el-table-column label="备注" prop="remark"></el-table-column>
-                <el-table-column label="操作" fixed="right" width="250">
+                <el-table-column label="操作" fixed="right" width="260">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
@@ -55,6 +56,13 @@
                         >删除
                         </el-button
                         >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click="jumpDl(scope.row)"
+                        >模板下载
+                        </el-button
+                        >
                     </template>
                 </el-table-column>
             </el-table>
@@ -76,7 +84,7 @@
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             :before-close="hideForm"
-            width="85%"
+            width="75%"
             top="5vh"
         >
             <el-form :model="formData" :rules="formRules" ref="dataForm">
@@ -112,12 +120,55 @@
                 <!--                    </el-col>-->
                 <!--                </el-row>-->
 
-                <el-form-item label="模板名称" prop="name">
-                    <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
-                </el-form-item>
+
+                <el-row :gutter="20">
+                    <el-col :span="2">
+                        <div class="ao-text">
+                            <span>模板名称：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item prop="name">
+                            <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="2">
+                        <div class="ao-text">
+                            <span>备注：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item prop="module">
+                            <!--                            <el-select v-model="formData.module" placeholder="所属模块">-->
+                            <!--                                <el-option-->
+                            <!--                                    v-for="item in moduleNameList"-->
+                            <!--                                    :key="item.idStr"-->
+                            <!--                                    :label="item.name"-->
+                            <!--                                    :value="item.idStr"-->
+                            <!--                                ></el-option>-->
+                            <!--                            </el-select>-->
+                            <el-select v-model="formData.module" placeholder="模板类型">
+                                <el-option label="标签" value="0"></el-option>
+                                <el-option label="报表" value="1"></el-option>
+                                <el-option label="单据" value="2"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="2">
+                        <div class="ao-text">
+                            <span>备注：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="20">
+                        <el-form-item>
+                            <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
                 <!--                <el-form-item label="所属模块" prop="type">-->
                 <!--                    <el-select v-model="formData.type" placeholder="所属模块">-->
                 <!--                        <el-option label="订单详情" value="1"></el-option>-->
@@ -148,27 +199,25 @@
                 <!--                </el-row>-->
 
                 <el-row :gutter="20">
-                    <el-col :span="4">
+                    <el-col :span="3">
                         <div class="ao-text">
                             <span>选择jasper模板：</span>
                         </div>
                     </el-col>
-                    <el-col :span="8">
+                    <el-col :span="5">
                         <el-form-item label="">
                             <el-upload
                                 class="upload-demo"
-                                ref="upload"
+                                ref="uploadJasper"
                                 :action="this.uploadUrl"
-                                :on-preview="uploadHandlePreview"
-                                :on-remove="uploadHandleRemove"
                                 :limit="1"
                                 :on-exceed="uploadHandleExceed"
                                 accept=".jasper"
                                 :on-change="uploadOnchange"
                                 :on-success="uploadHandleSuccess"
-                                :on-error="uploadHandleError"
+                                :auto-upload="true"
                                 :file-list="fileList"
-                                :auto-upload="false">
+                            >
                                 <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
                                 </el-button>
                                 <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
@@ -176,28 +225,34 @@
                             </el-upload>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="2">
+
+                    <el-col :span="3">
                         <div class="ao-text">
-                            <span>模板类型：</span>
+                            <span>选择jrxml模板：</span>
                         </div>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item prop="module">
-                            <!--                            <el-select v-model="formData.module" placeholder="所属模块">-->
-                            <!--                                <el-option-->
-                            <!--                                    v-for="item in moduleNameList"-->
-                            <!--                                    :key="item.idStr"-->
-                            <!--                                    :label="item.name"-->
-                            <!--                                    :value="item.idStr"-->
-                            <!--                                ></el-option>-->
-                            <!--                            </el-select>-->
-                            <el-select v-model="formData.module" placeholder="模板类型">
-                                <el-option label="标签" value="0"></el-option>
-                                <el-option label="报表" value="1"></el-option>
-                                <el-option label="单据" value="2"></el-option>
-                            </el-select>
+                    <el-col :span="5">
+                        <el-form-item label="">
+                            <el-upload
+                                class="upload-demo"
+                                ref="uploadJrxml"
+                                :action="this.uploadJrxmlUrl"
+                                :limit="1"
+                                :on-exceed="uploadJrxmlHandleExceed"
+                                accept=".jrxml"
+                                :on-change="uploadJrxmlOnchange"
+                                :on-success="uploadJrxmlHandleSuccess"
+                                :file-list="jrxmlFileList"
+                                :auto-upload="true">
+                                <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
+                                </el-button>
+                                <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
+                                <div slot="tip" class="el-upload__tip">只能上传 jrxml 文件，且不超过 2 MB</div>
+                            </el-upload>
                         </el-form-item>
                     </el-col>
+
+
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -276,6 +331,8 @@ import {
 } from "../../../api/param/systemPDFTemplate";
 
 import {BASE_URL, SERVER_IP} from "../../../config/app";
+import {authRoleAuthList} from "../../../api/auth/authRole";
+import {saveAs} from 'file-saver';
 
 const formJson = {
     id: "",
@@ -284,6 +341,7 @@ const formJson = {
     module: null,
     param: "",
     path: "",
+    jrxmlPath: null,
     rowCount: 10,
     qrcodeCount: 1,
     remark: "",
@@ -353,7 +411,9 @@ export default {
             },
             deleteLoading: false,
             uploadUrl: "",
+            uploadJrxmlUrl: "",
             fileList: [],
+            jrxmlFileList: [],
             uploadDisabled: false,
             moduleLoading: false,
             moduleNameMap: {0: "标签", 1: "报表", 2: "单据"},
@@ -408,8 +468,30 @@ export default {
         jumpDl(row) {
             console.log(BASE_URL);
             console.log(row.templateDlUrl + "----");
-            window.open(SERVER_IP + row.templateDlUrl, '_blank');
+
+            this.handleDownload(BASE_URL + "/udiwms/donwload/file?fileName=" + row.jrxmlPath, row.name + ".jrxml");
         },
+
+        handleDownload(url, name) {
+            this.getBlob(url).then(blob => {
+                saveAs(blob, name);
+            })
+            return false;
+        },
+        getBlob(url) {
+            return new Promise(resolve => {
+                const xhr = new XMLHttpRequest();
+                xhr.open('GET', url, true);
+                xhr.responseType = 'blob';
+                xhr.onload = () => {
+                    if (xhr.status === 200) {
+                        resolve(xhr.response);
+                    }
+                };
+                xhr.send();
+            })
+        },
+
         getModuleList() {
             this.moduleLoading = true;
             systemPDFModuleList(this.moduleQuery)
@@ -431,6 +513,8 @@ export default {
                 this.$refs["dataForm"].clearValidate();
                 // 刷新表单
                 this.$refs["dataForm"].resetFields();
+                this.fileList = null;
+                this.jrxmlFileList = null;
                 this.getList();
             }
         },
@@ -515,27 +599,27 @@ export default {
 
         },
         submitUpload() {
-            if (this.$refs.upload.uploadFiles.length < 1 && !this.uploadDisabled) {
+            if (this.$refs.uploadJasper.uploadFiles.length < 1 && !this.uploadDisabled) {
+                this.$message.warning(`请选择jasper文件`);
+            }
+            if (this.$refs.uploadJrxml.uploadFiles.length < 1 && !this.uploadDisabled) {
                 this.$message.warning(`请选择jasper文件`);
             }
             console.log(this.formName)
             this.$refs["dataForm"].validate(valid => {
                 if (valid) {
-                    if (!this.uploadDisabled) {
-                        this.$refs.upload.submit();
-                    } else {
-                        this.submitTemplate();
-                    }
+
+                    this.submitTemplate();
+
+                    // if (!this.uploadDisabled) {
+                    //     this.$refs.uploadJasper.submit();
+                    //     this.$refs.uploadJrxml.submit();
+                    // } else {
+                    //     this.submitTemplate();
+                    // }
                 }
             });
         },
-        uploadHandleRemove(file, fileList) {
-            console.log(file, fileList);
-        },
-        uploadHandlePreview(file) {
-            console.log(file);
-            console.log(this.fileList);
-        },
         uploadHandleExceed(files, fileList) {
             this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
         },
@@ -569,14 +653,52 @@ export default {
             console.log(response)
             if (response.code === 20000) {
                 this.formData.path = response.data.path;
-                this.submitTemplate();
+                // this.submitTemplate();
             } else {
                 this.$message.error("上传失败：" + response.message);
             }
         },
-        uploadHandleError() {
 
+        uploadJrxmlHandleExceed(files, fileList) {
+            this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
         },
+        uploadJrxmlOnchange(file, fileList) {
+            let fileName = file.name;
+            let uid = file.uid
+            let pos = fileName.lastIndexOf(".");
+            let lastName = fileName.substring(pos, fileName.length);
+            if (lastName.toLowerCase() !== ".jrxml") {
+                this.$message.error("上传文件只能是 jrxml 格式");
+                for (let i = 0; i < fileList.length; i++) {//从list删除
+                    if (fileList[i].uid === uid) {
+                        fileList.splice(i, 1)
+                    }
+                }
+                return;
+            }
+            // 限制上传文件的大小
+            const isLt = file.size / 1024 / 1024 / 2 <= 1;
+            if (!isLt) {
+                this.$message.error("上传文件大小不能超过 2MB");
+                for (let i = 0; i < fileList.length; i++) {
+                    if (fileList[i].uid === uid) {
+                        fileList.splice(i, 1)
+                    }
+                }
+            }
+            return isLt;
+        },
+        uploadJrxmlHandleSuccess(response, file, fileList) {
+            console.log(response)
+            if (response.code === 20000) {
+                this.formData.jrxmlPath = response.data.path;
+                // this.submitTemplate();
+            } else {
+                this.$message.error("上传失败：" + response.message);
+            }
+        },
+
+
         submitTemplate() {
             console.log(this.formData)
             this.$refs["dataForm"].validate(valid => {
@@ -712,7 +834,8 @@ export default {
         this.getList();
         this.getPDFModuleNameList();
         this.getModuleList();
-        this.uploadUrl = BASE_URL + "/udiwms/upload/pdf/template";
+        this.uploadUrl = BASE_URL + "/udiwms/upload/pdf/template/jasper";
+        this.uploadJrxmlUrl = BASE_URL + "/udiwms/upload/pdf/template/jrxml";
     }
 };
 </script>

src/views/userManage/param/systemParamConfig.vue

@@ -20,10 +20,10 @@
         </el-form>
 
         <el-table v-loading="loading" :data="list" style="width: 100%">
-            <el-table-column type="index" label="序号" width="50">序号</el-table-column>
-            <el-table-column label="参数名" prop="paramName" width="200"></el-table-column>
+            <el-table-column type="index" label="序号" width="50"></el-table-column>
+            <el-table-column label="参数名" prop="paramName" ></el-table-column>
             <el-table-column label="参数键" prop="paramKey" width="200"></el-table-column>
-            <el-table-column label="参数值" prop="paramValue" width="300"></el-table-column>
+            <el-table-column label="参数值" prop="paramValue" width="100"></el-table-column>
             <!--<el-table-column label="参数状态">-->
             <!--<template slot-scope="scope">-->
             <!--<el-tag :type="scope.row.paramStatus | paramStatusFilterType">{{-->
@@ -37,7 +37,7 @@
                     <span>{{ scope.row.paramExplain }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" fixed="right" width="200">
+            <el-table-column label="操作" fixed="right" width="100">
                 <template slot-scope="scope">
                     <el-button
                         type="text"