build/utils.js

@@ -12,12 +12,21 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // 指定开发模式下需要加载的模块（可以做到只加载当前模块，提高开发效率）
 // index模块（登录）为必须，all 为所有
 //    登录     合同                       首页       内转     排队   资源   销售                       零星物资
-// ['index','appoint'，'configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
+// ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['index','systemConfig','WMS'];
-// let devModules = ['index','SporadicManage','inward','statisticalReport'];
-// let devModules = ['index','appoint','TMS'];
+
+
+ let devModules = ['all']
+// let devModules = ['index','inward']
+
+// let devModules = ['index','SporadicManage','RMS','statisticalReport']
+// let devModules = ['index','inward','statisticalReport']
+//  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
+// let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
+// let devModules = ['index','RMS'];
+
+
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -54,18 +54,29 @@ let proxyTable = {
       "^/api/v1/cd": "/api/v1/cd"
     }
   },
+  //抽奖结果的接口
+  "/icore.icp.web/game/v1": {
+    target: "http://172.16.33.166:9002",
+    ws: true,
+    pathRewrite: {
+      "^/icore.icp.web/game/v1": "/v1"
+    }
+  },
   // 所有数据的请求域名地址
   "/api/v1": {
+    // target: "http://172.16.33.166:8080",
     target: "http://172.16.33.162:8019",
-    // target: "http://172.16.33.162:8019",
     // target: "http://localhost:8080",
+    // target: "http://localhost:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.162:8019",
+    // target: "http://localhost:8080",
+     target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.115:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

nginx.conf

@@ -37,6 +37,15 @@ http {
 
     server {
         root /usr/share/nginx/html/;
+
+        location /game/v1 {
+            rewrite ^/icore.icp.web/game(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://oa-system-game-service/v1; # 转发地址
+        }
+        
         location /views/icore.icp.web/pass/v1 {
 		    rewrite ^/b/(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
 			port_in_redirect   on;

package.json

@@ -21,12 +21,12 @@
     "apollo-link": "^1.2.11",
     "apollo-link-error": "^1.1.11",
     "apollo-link-http": "^1.5.14",
-    "axios": "^0.18.0",
+    "axios": "^0.26.1",
     "babel-polyfill": "^6.26.0",
     "crypto": "^1.0.1",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",
-    "element-ui": "2.4.2",
+    "element-ui": "2.15.7",
     "file-saver": "^1.3.8",
     "graphql": "^14.1.1",
     "graphql-tag": "^2.10.1",
@@ -40,7 +40,7 @@
     "sass-node": "^4.11.2",
     "sass-resources-loader": "^2.2.4",
     "script-loader": "^0.7.2",
-    "socket.io": "2.2.0",
+    "socket.io": "^2.2.0",
     "socket.io-stream": "^0.9.1",
     "sockjs-client": "^1.3.0",
     "uuid": "^3.3.2",
@@ -53,11 +53,12 @@
     "vue-quill-editor": "^3.0.5",
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.2",
+    "vuescroll": "^4.17.3",
     "vuex": "^3.0.1",
-    "vxe-table": "^3.4.12",
+    "vxe-table": "^4.2.2-beta.1",
     "x2js": "^3.3.0",
-    "xe-utils": "^3.5.1",
-    "xlsx": "^0.11.19",
+    "xe-utils": "^3.5.4",
+    "xlsx": "^0.18.4",
     "xterm": "3.12.0"
   },
   "devDependencies": {
@@ -105,7 +106,7 @@
     "less-loader": "~4.1.0",
     "mocha": "^5.2.0",
     "mocha-webpack": "^1.1.0",
-    "moment": "^2.22.2",
+    "moment": "^2.29.1",
     "nightwatch": "^0.9.12",
     "node-notifier": "^5.1.2",
     "node-sass": "^4.7.2",
@@ -122,7 +123,7 @@
     "sass-loader": "^6.0.6",
     "selenium-server": "^3.0.1",
     "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
+    "shelljs": "^0.8.5",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
     "vue-jest": "^1.0.2",

src/assets/css/icore-theme/Cyan_theme.css

@@ -0,0 +1,187 @@
+/**************************************************************** 项目公用样式 简直覆盖Element-ui css basic-theme **************************************************************/
+
+.mainVueIndex .el-tabs__content {
+    overflow: auto !important;
+}
+
+/**************************************************************** 登录-start **************************************************************/
+.icore-lg {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    min-height: 600px;
+    min-width: 1200px;
+    max-width: 1920px;
+}
+
+.icore-lg .el-button--primary, .icore-lg .el-button--primary:hover{
+    color: rgba(8,129,153) !important;
+    background-color: rgba(0,255,170) !important;
+    border-color: rgba(0,255,170) !important;
+    border-radius: 1px;
+}
+.icore-lg .el-input__inner {
+    color: #eded !important;
+    -webkit-appearance: none;
+    background-color: rgba(1,1,1,0.1);
+    background-image: none;
+    border: 0px solid #dcdfe6;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    color: #606266;
+    display: inline-block;
+    font-size: inherit;
+    height: 50px;
+    line-height: 40px;
+    outline: 0;
+    padding: 0 15px;
+    -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    width: 100%;
+    border-radius: 1px
+}
+.icore-lg input:-webkit-autofill {
+    -webkit-text-fill-color: #eded !important;
+    -webkit-box-shadow: 0 0 0 1000px transparent inset !important;
+    background-color: transparent !important;
+    background-image: none !important;
+    -webkit-transition: background-color 50000s ease-in-out 0s !important;
+    transition: background-color 50000s ease-in-out 0s !important;
+}
+.icore-lg .frame-area {
+    position: absolute;
+    right: 295px;
+    width: 372px;
+    height: 336px;
+    top: 173px;
+    background: url(../../../assets/img/icore-shown-frame.png) no-repeat;
+}
+.icore-lg .desc-area {
+    position: absolute;
+    left: 55px;
+    width: 135px;
+    height: 31px;
+    top: 63px;
+    background: url(../../../assets/img/icore-shown-desc.png) no-repeat;
+}
+.icore-lg .login-bac {
+    height: 60px;
+    background-image: url(../../../assets/img/login.png);
+}
+
+.icore-lg .lg-form {
+    padding: .5rem 2rem;
+}
+
+.icore-lg .lg-form .el-input--prefix .el-input__inner {
+    padding-left: 60px;
+}
+
+.icore-lg .lg-form .el-input--prefix .el-input__inner {
+    padding-left: 3rem;
+    background: transparent;
+    color: #000;
+    height: 2.5rem;
+    line-height: 2.5rem;
+    border: 1px solid #fff;
+}
+
+.icore-lg .oa-login-ibg {
+    position: absolute;
+    left: 15px;
+    top: 15px;
+    height: 20px;
+    width: 20px;
+}
+
+.icore-lg .oa-login-ibg1 {
+    background: url(../../../assets/img/icore-shown-user.png) center center
+        no-repeat;
+}
+.icore-lg .oa-login-ibg2 {
+    background: url(../../../assets/img/icore-shown-psw.png) center center
+        no-repeat;
+}
+.icore-lg .oa-login-ibg3 {
+    background: url(../../../assets/img/login/login-icon3.png) center center
+        no-repeat;
+}
+
+.icore-lg .oa-login-ibg4 {
+    position: absolute;
+    right: 15px;
+    top: 20px;
+}
+
+/**************************************************************** 登录-end **************************************************************/
+
+
+/****************************************************************主题下样式 *************************************************************/
+.Cyan_theme .sl-header-ul {
+    height: 60px;
+    border-bottom: 1px solid #ccc;
+    background-color: #00ffff;
+}
+
+.Cyan_theme .oa-header-user {
+    height: 60px;
+    width: 179px;
+    left: 0px;
+    position: absolute;
+    /* top: 60px; */
+    z-index: 1024;
+    background-color: #00ffff;
+    border-right: 1px solid #e4e7ed;
+    border-bottom: 1px solid #e4e7ed;
+}
+
+/* 第一级菜单背景色 */
+.Cyan_theme .icore-menu.icore-menu-level1 {
+    background-color: #00ffff;
+}
+
+.Cyan_theme .icore-menu.icore-menu-level1>li>div.el-submenu__title {
+    color: #fff;
+}
+.Cyan_theme .icore-menu.icore-menu-level1>li>div.el-submenu__title:hover,
+.Cyan_theme .icore-menu-level1>li:hover,
+.Cyan_theme .el-submenu__title:hover,
+.Cyan_theme .el-menu-item:hover,
+.Cyan_theme .el-menu-item.is-active {
+    color: #00ffff;
+}
+
+.Cyan_theme .overFlowSet {
+    overflow-x: hidden !important;
+    overflow-y: auto !important;
+    background: #00ffff !important;
+}
+
+.Cyan_theme .el-table th {
+    padding: 1px 0;
+    background-color: #00ffff !important;
+}
+
+.Cyan_theme .el-table__body tr.current-row>td {
+    color: #00ffff !important;
+}
+/****************************************************************主题下样式END *************************************************************/
+
+/****************************************************************ioms表格条纹 *************************************************************/
+/* 斑马线颜色 */
+.dark_theme .firstTable,.threeTable .el-table--striped .el-table__body tr.el-table__row--striped td {
+    background-color: #00ffff;
+}
+.dark_theme .firstTable,.threeTable .el-table td, .el-table th {
+    height: 32px;
+}
+.dark_theme .el-table__body tr.current-row>td {
+    background-color: cyan !important;
+}
+
+.dark_theme .title-main .el-table__row--striped.current-row td{
+    background: #00ffff !important;
+}
+/****************************************************************ioms表格条纹END *************************************************************/
+
+/********************************************************************************ALL-END*************************************************************************************/

src/assets/css/icore-theme/green_theme.css

@@ -0,0 +1,187 @@
+/**************************************************************** 项目公用样式 简直覆盖Element-ui css basic-theme **************************************************************/
+
+.mainVueIndex .el-tabs__content {
+    overflow: auto !important;
+}
+
+/**************************************************************** 登录-start **************************************************************/
+.icore-lg {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    min-height: 600px;
+    min-width: 1200px;
+    max-width: 1920px;
+}
+
+.icore-lg .el-button--primary, .icore-lg .el-button--primary:hover{
+    color: rgba(8,129,153) !important;
+    background-color: rgba(0,255,170) !important;
+    border-color: rgba(0,255,170) !important;
+    border-radius: 1px;
+}
+.icore-lg .el-input__inner {
+    color: #eded !important;
+    -webkit-appearance: none;
+    background-color: rgba(1,1,1,0.1);
+    background-image: none;
+    border: 0px solid #dcdfe6;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    color: #606266;
+    display: inline-block;
+    font-size: inherit;
+    height: 50px;
+    line-height: 40px;
+    outline: 0;
+    padding: 0 15px;
+    -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    width: 100%;
+    border-radius: 1px
+}
+.icore-lg input:-webkit-autofill {
+    -webkit-text-fill-color: #eded !important;
+    -webkit-box-shadow: 0 0 0 1000px transparent inset !important;
+    background-color: transparent !important;
+    background-image: none !important;
+    -webkit-transition: background-color 50000s ease-in-out 0s !important;
+    transition: background-color 50000s ease-in-out 0s !important;
+}
+.icore-lg .frame-area {
+    position: absolute;
+    right: 295px;
+    width: 372px;
+    height: 336px;
+    top: 173px;
+    background: url(../../../assets/img/icore-shown-frame.png) no-repeat;
+}
+.icore-lg .desc-area {
+    position: absolute;
+    left: 55px;
+    width: 135px;
+    height: 31px;
+    top: 63px;
+    background: url(../../../assets/img/icore-shown-desc.png) no-repeat;
+}
+.icore-lg .login-bac {
+    height: 60px;
+    background-image: url(../../../assets/img/login.png);
+}
+
+.icore-lg .lg-form {
+    padding: .5rem 2rem;
+}
+
+.icore-lg .lg-form .el-input--prefix .el-input__inner {
+    padding-left: 60px;
+}
+
+.icore-lg .lg-form .el-input--prefix .el-input__inner {
+    padding-left: 3rem;
+    background: transparent;
+    color: #000;
+    height: 2.5rem;
+    line-height: 2.5rem;
+    border: 1px solid #fff;
+}
+
+.icore-lg .oa-login-ibg {
+    position: absolute;
+    left: 15px;
+    top: 15px;
+    height: 20px;
+    width: 20px;
+}
+
+.icore-lg .oa-login-ibg1 {
+    background: url(../../../assets/img/icore-shown-user.png) center center
+        no-repeat;
+}
+.icore-lg .oa-login-ibg2 {
+    background: url(../../../assets/img/icore-shown-psw.png) center center
+        no-repeat;
+}
+.icore-lg .oa-login-ibg3 {
+    background: url(../../../assets/img/login/login-icon3.png) center center
+        no-repeat;
+}
+
+.icore-lg .oa-login-ibg4 {
+    position: absolute;
+    right: 15px;
+    top: 20px;
+}
+
+/**************************************************************** 登录-end **************************************************************/
+
+
+/****************************************************************主题下样式 *************************************************************/
+.green_theme .sl-header-ul {
+    height: 60px;
+    border-bottom: 1px solid #ccc;
+    background-color: #008000;
+}
+
+.green_theme .oa-header-user {
+    height: 60px;
+    width: 179px;
+    left: 0px;
+    position: absolute;
+    /* top: 60px; */
+    z-index: 1024;
+    background-color: #008000;
+    border-right: 1px solid #e4e7ed;
+    border-bottom: 1px solid #e4e7ed;
+}
+
+/* 第一级菜单背景色 */
+.green_theme .icore-menu.icore-menu-level1 {
+    background-color: #008000;
+}
+
+.green_theme .icore-menu.icore-menu-level1>li>div.el-submenu__title {
+    color: #fff;
+}
+.green_theme .icore-menu.icore-menu-level1>li>div.el-submenu__title:hover,
+.green_theme .icore-menu-level1>li:hover,
+.green_theme .el-submenu__title:hover,
+.green_theme .el-menu-item:hover,
+.green_theme .el-menu-item.is-active {
+    color: #008000;
+}
+
+.green_theme .overFlowSet {
+    overflow-x: hidden !important;
+    overflow-y: auto !important;
+    background: #008000 !important;
+}
+
+.green_theme .el-table th {
+    padding: 1px 0;
+    background-color: #008000 !important;
+}
+
+.green_theme .el-table__body tr.current-row>td {
+    color: #008000 !important;
+}
+/****************************************************************主题下样式END *************************************************************/
+
+/****************************************************************ioms表格条纹 *************************************************************/
+/* 斑马线颜色 */
+.dark_theme .firstTable,.threeTable .el-table--striped .el-table__body tr.el-table__row--striped td {
+    background-color: #008000;
+}
+.dark_theme .firstTable,.threeTable .el-table td, .el-table th {
+    height: 32px;
+}
+.dark_theme .el-table__body tr.current-row>td {
+    background-color: green !important;
+}
+
+.dark_theme .title-main .el-table__row--striped.current-row td{
+    background: #008000 !important;
+}
+/****************************************************************ioms表格条纹END *************************************************************/
+
+/********************************************************************************ALL-END*************************************************************************************/

src/assets/css/icore-theme/yellow_theme.css

@@ -0,0 +1,187 @@
+/**************************************************************** 项目公用样式 简直覆盖Element-ui css basic-theme **************************************************************/
+
+.mainVueIndex .el-tabs__content {
+    overflow: auto !important;
+}
+
+/**************************************************************** 登录-start **************************************************************/
+.icore-lg {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    min-height: 600px;
+    min-width: 1200px;
+    max-width: 1920px;
+}
+
+.icore-lg .el-button--primary, .icore-lg .el-button--primary:hover{
+    color: rgba(8,129,153) !important;
+    background-color: rgba(0,255,170) !important;
+    border-color: rgba(0,255,170) !important;
+    border-radius: 1px;
+}
+.icore-lg .el-input__inner {
+    color: #eded !important;
+    -webkit-appearance: none;
+    background-color: rgba(1,1,1,0.1);
+    background-image: none;
+    border: 0px solid #dcdfe6;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    color: #606266;
+    display: inline-block;
+    font-size: inherit;
+    height: 50px;
+    line-height: 40px;
+    outline: 0;
+    padding: 0 15px;
+    -webkit-transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+    width: 100%;
+    border-radius: 1px
+}
+.icore-lg input:-webkit-autofill {
+    -webkit-text-fill-color: #eded !important;
+    -webkit-box-shadow: 0 0 0 1000px transparent inset !important;
+    background-color: transparent !important;
+    background-image: none !important;
+    -webkit-transition: background-color 50000s ease-in-out 0s !important;
+    transition: background-color 50000s ease-in-out 0s !important;
+}
+.icore-lg .frame-area {
+    position: absolute;
+    right: 295px;
+    width: 372px;
+    height: 336px;
+    top: 173px;
+    background: url(../../../assets/img/icore-shown-frame.png) no-repeat;
+}
+.icore-lg .desc-area {
+    position: absolute;
+    left: 55px;
+    width: 135px;
+    height: 31px;
+    top: 63px;
+    background: url(../../../assets/img/icore-shown-desc.png) no-repeat;
+}
+.icore-lg .login-bac {
+    height: 60px;
+    background-image: url(../../../assets/img/login.png);
+}
+
+.icore-lg .lg-form {
+    padding: .5rem 2rem;
+}
+
+.icore-lg .lg-form .el-input--prefix .el-input__inner {
+    padding-left: 60px;
+}
+
+.icore-lg .lg-form .el-input--prefix .el-input__inner {
+    padding-left: 3rem;
+    background: transparent;
+    color: #000;
+    height: 2.5rem;
+    line-height: 2.5rem;
+    border: 1px solid #fff;
+}
+
+.icore-lg .oa-login-ibg {
+    position: absolute;
+    left: 15px;
+    top: 15px;
+    height: 20px;
+    width: 20px;
+}
+
+.icore-lg .oa-login-ibg1 {
+    background: url(../../../assets/img/icore-shown-user.png) center center
+        no-repeat;
+}
+.icore-lg .oa-login-ibg2 {
+    background: url(../../../assets/img/icore-shown-psw.png) center center
+        no-repeat;
+}
+.icore-lg .oa-login-ibg3 {
+    background: url(../../../assets/img/login/login-icon3.png) center center
+        no-repeat;
+}
+
+.icore-lg .oa-login-ibg4 {
+    position: absolute;
+    right: 15px;
+    top: 20px;
+}
+
+/**************************************************************** 登录-end **************************************************************/
+
+
+/****************************************************************主题下样式 *************************************************************/
+.yellow_theme .sl-header-ul {
+    height: 60px;
+    border-bottom: 1px solid #ccc;
+    background-color: #ffff00;
+}
+
+.yellow_theme .oa-header-user {
+    height: 60px;
+    width: 179px;
+    left: 0px;
+    position: absolute;
+    /* top: 60px; */
+    z-index: 1024;
+    background-color: #ffff00;
+    border-right: 1px solid #e4e7ed;
+    border-bottom: 1px solid #e4e7ed;
+}
+
+/* 第一级菜单背景色 */
+.yellow_theme .icore-menu.icore-menu-level1 {
+    background-color: #ffff00;
+}
+
+.yellow_theme .icore-menu.icore-menu-level1>li>div.el-submenu__title {
+    color: #fff;
+}
+.yellow_theme .icore-menu.icore-menu-level1>li>div.el-submenu__title:hover,
+.yellow_theme .icore-menu-level1>li:hover,
+.yellow_theme .el-submenu__title:hover,
+.yellow_theme .el-menu-item:hover,
+.yellow_theme .el-menu-item.is-active {
+    color: #ffff00;
+}
+
+.yellow_theme .overFlowSet {
+    overflow-x: hidden !important;
+    overflow-y: auto !important;
+    background: #ffff00 !important;
+}
+
+.yellow_theme .el-table th {
+    padding: 1px 0;
+    background-color: #ffff00 !important;
+}
+
+.yellow_theme .el-table__body tr.current-row>td {
+    color: #ffff00 !important;
+}
+/****************************************************************主题下样式END *************************************************************/
+
+/****************************************************************ioms表格条纹 *************************************************************/
+/* 斑马线颜色 */
+.dark_theme .firstTable,.threeTable .el-table--striped .el-table__body tr.el-table__row--striped td {
+    background-color: #ffff00;
+}
+.dark_theme .firstTable,.threeTable .el-table td, .el-table th {
+    height: 32px;
+}
+.dark_theme .el-table__body tr.current-row>td {
+    background-color: yellow !important;
+}
+
+.dark_theme .title-main .el-table__row--striped.current-row td{
+    background: #ffff00 !important;
+}
+/****************************************************************ioms表格条纹END *************************************************************/
+
+/********************************************************************************ALL-END*************************************************************************************/

src/assets/css/index.css

@@ -4,4 +4,7 @@
 @import './icore-theme/basic_theme.css';
 @import './icore-theme/deepBlue_theme.css';
 @import './icore-theme/dark_theme.css';
-@import './icore-theme/red_theme.css';
+@import './icore-theme/red_theme.css';
+@import './icore-theme/green_theme.css';
+@import './icore-theme/Cyan_theme.css';
+@import './icore-theme/yellow_theme.css';

src/components/DilCommonUI/packages/table/src/table.js

@@ -25,6 +25,11 @@ export default {
     };
   },
   created() {
+    if(this.isHeigth){
+      window.addEventListener('resize',this.getHeight)
+      this.getHeight();
+    }
+    
     this.dataCurrentPage = this.currentPage;
     this.dataPageSize = this.pageSize;
     this.requestData();
@@ -33,9 +38,34 @@ export default {
     //行拖拽
     // this.rowDrop();
     //列拖拽
-    this.columnDrop();
+    // this.columnDrop();
   },
   methods: {
+    getHeight(){
+      this.height = window.innerHeight - this.shiyHeigth;
+      console.log(this.height);
+    },
+    //计算合计列
+    getSummaries(columns,data) {
+      const sums = [];
+      columns.forEach((column, index) => {
+       const values = data.map(item => Number(item[column.property]));
+           if (column.property =='resultNetWeight' ) {
+            sums[index] = values.reduce((prev, curr) => {
+             const value = Number(curr);
+             if (!isNaN(value)) {
+               return prev + curr;
+             } else {
+               return prev;
+             }
+            }, 0);
+            console.log(sums )
+            sums[index];
+           }
+      });
+      // console.log("净重：" + sums)
+      return sums
+      },
     // 通过请求获取数据
     requestData(options) {
       let pageNum = undefined;
@@ -70,7 +100,6 @@ export default {
         }
         //判断是否是带分页查询
         if(this.isKuang){
-          console.log(11111111111111111111111111);
           // 发送请求
           this.axios
           .post(url, data, {
@@ -90,7 +119,6 @@ export default {
             this.isShow = true;
           });
         }else{
-          console.log(2222222222222222222222222);
           // 发送请求
           this.axios
             .post(url, data, {
@@ -107,13 +135,7 @@ export default {
               //执行成功的回调
               this.$emit('func',response.data.data);
               this.refreshColumnData(d.columnData);
-
               this.isShow = true;
-              //若父组件存在要合计的值
-              if(this.$parent.totalNumber>=0){
-                //将筛选的字段传给父组件
-                this.$parent.calculationTotalNumber(this.dataRequestQuery);
-              }
             });
         }
       } else {
@@ -125,6 +147,7 @@ export default {
       // 表头只赋值一次(在查出全部数据的情况下才只赋值一次)
       // if (this.dataColumnData.length > 0) return;
       // 如果前端有写表头，则加在后端表头前面
+      
       const d = this.columnData.concat(columnData);
       // 把操作列拼接到最后一列
       this.dataColumnData = d;
@@ -167,6 +190,7 @@ export default {
     },
     // 更新请求参数
     setDataRequestQuery(value) {
+      console.log(value);
       let q = this.dataRequestQuery;
       for (const key in value) {
         q[key] = value[key];

src/components/DilCommonUI/packages/table/src/table.vue

@@ -10,12 +10,17 @@
       :row-class-name="rowClassName"
       :cell-class-name="cellClassName"
       :height="height"
-      :max-height="maxHeight"
       :highlight-current-row="highlightCurrentRow"
+      style="width:100%"
       @sort-change="sortChange"
       @selection-change="selectionChange"
       @filter-change="filterChange"
       @row-click="rowClick"
+      v-loading="loading"
+      element-loading-text="玩命加载中"
+      element-loading-spinner="el-icon-loading"
+      :isHeigth="isHeigth"
+      :shiyHeigth="shiyHeigth"
     >
       <!-- 多选列 -->
       <el-table-column
@@ -116,6 +121,12 @@ export default {
   name: "DilTable",
   extends: table,
   props: {
+    shiyHeigth:{
+      default:null,
+    },
+    isHeigth:{
+      default:false,
+    },
     drawer:{
       default:false,
     },
@@ -151,7 +162,7 @@ export default {
     },
     // 是否在数据翻页后保留之前选中的数据（需指定 row-key）
     reserveSelection: {
-      default: false,
+      default: true,
     },
     // 是否为斑马纹 table
     stripe: {
@@ -200,7 +211,9 @@ export default {
         return ({ row, rowIndex }) => "";
       },
     },
-
+    loading:{
+      default:false,
+    },
     // 是否启用分页器
     isPagination: {
       default: true,
@@ -232,18 +245,24 @@ export default {
       if(val){
         this.dataRadioId = null;
       }
-    }
+    },
+    // dataTabel: function() {
+    //   this.$nextTick(function() {
+    //     this.$refs.mainTable.setCurrentRow(this.dataTabel[0])
+    //   })
+    // }
   },
   methods: {
     // 刷新表格数据
     refreshData() {
       this.requestData();
-      //多选表格，清空用户的选择
+      // 多选表格清空用户的选择
       this.$refs.mainTable.clearSelection();
     },
     toggleRowExpansion(row, expanded) {
       this.$refs.mainTable.toggleRowExpansion(row, expanded);
     },
+
   },
 };
 </script>
@@ -253,5 +272,14 @@ export default {
   .el-pagination {
     display: none;
   }
+  
 }
+ /deep/.el-table .success-row {
+    background: #fff !important;
+    color: #f56c6c;
+    height: 44px;
+    line-height: 46px;
+    font-size: 22px;
+    font-weight: 700;
+  }
 </style>

src/components/main.vue

@@ -740,6 +740,10 @@ export default {
           label: "basic_theme",
           desc: "默认主题",
         },
+        {
+          label: "green_theme",
+          desc: "护眼主题",
+        },
         {
           label: "deepBlue_theme",
           desc: "深蓝色主题",
@@ -752,12 +756,23 @@ export default {
           label: "red_theme",
           desc: "红色主题",
         },
+        {
+          label: "Cyan_theme",
+          desc: "青色主题",
+        },
+        {
+          label: "yellow_theme",
+          desc: "黄色主题",
+        },
       ],
       theme_origin_color: {
         basic_theme: "#409EFF",
         deepBlue_theme: "#072ec5",
         dark_theme: "#000000",
         red_theme: "#F20808",
+        green_theme: "#008000",
+        Cyan_theme:"#00ffff",
+        yellow_theme:"#FFFF00"
       },
       themeSetFlag: false,
       lockErrorMsg: false,
@@ -944,7 +959,14 @@ export default {
       let that = this;
       window.top.localStorage.setItem("current_theme", n);
       that.theme_color = that.theme_origin_color[n];
+      console.log(that.theme_color)
+      console.log('这是')
       for (let i = 0; i < document.getElementsByTagName("iframe").length; i++) {
+         console.log(document
+            .getElementsByTagName("iframe")
+            [i].contentDocument.getElementsByClassName(
+              "mainVueIndex"
+            )[0].className)
         try {
           document
             .getElementsByTagName("iframe")

src/config/routerBefore.js

@@ -16,7 +16,7 @@ import {
 } from '@/config/config.js';
 
 // 免登录白名单
-const whiteList = ['/', '/login', '/download', '/page404', '/dingtalkTaskMobileEnd', '/dingtalkWorkFlowMobileEnd'];
+const whiteList = ['/', '/login', '/download', '/page404', '/dingtalkTaskMobileEnd', '/dingtalkWorkFlowMobileEnd', '/luckDraw'];
 
 /**
  * 当前路由取标题

src/views/ADMINISTRATORS/app.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta content="智慧物流平台" name="keywords">
+    <meta content="智慧物流平台" name="description">
+    <title>后台管理 - 智慧物流平台</title>
+    <link href="../static/css/common.css" rel="stylesheet"/>
+    <link href="../static/img/favicon.ico" rel="shortcut icon"/>
+    <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
+    <script src="../static/lib/jquery/jquery.PrintArea.js" type="text/javascript"></script>
+    <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>
+    <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
+    <script src="../static/js/common.js" type="text/javascript"></script>
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

src/views/ADMINISTRATORS/app.js

@@ -0,0 +1,109 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import Vue from 'vue';
+import App from '@/components/App.vue';
+// include
+import '@/config/include.js';
+
+// 通用store
+import store from '@/store/index.js';
+
+// router
+import router from './router/index.js';
+
+import VueApollo from 'vue-apollo'
+
+import apollo from '@/config/apolloConfig.js'
+
+// 关闭生产模式下给出的提示
+Vue.config.productionTip = false;
+
+Vue.use(VueApollo)
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
+import vuescroll from "vuescroll";//引入vuescroll
+import "vuescroll/dist/vuescroll.css";//引入vuescroll样式
+Vue.use(vuescroll);//使用
+
+// 导出Excel全局组件
+import tableToExcel from '@/components/exportExcel/exportExcel'
+Vue.use(tableToExcel)
+
+const apolloProvider = new VueApollo({
+    defaultClient: apollo
+})
+
+ //把时间戳改为正常可读的时间
+ export function renderTime(date) {
+  if(date !== null){
+      let dateee = new Date(date).toJSON();
+      return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
+  }
+  return null;
+}
+//把毫秒数转换分
+export function getDuration(my_time) { 
+  if(my_time !== null){
+      return Math.floor(my_time / 1000 / 60);
+  }
+  return null;
+}
+export function sjTime(orderPlanInTime) {
+  var stringTime = renderTime(orderPlanInTime);
+  var timestamp1 = stringTime.replace(/-/g, "/");
+  return new Date(timestamp1).getTime();
+}
+//验证电话号码
+export function VerifyPhoneNumber(Phone) {
+  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9]|19[0|1|2|3|5|6|7|8|9])\d{8}$/;
+  if (!myreg.test(Phone)) {
+      return false;
+  } else {
+      return true;
+  }
+}
+export function isNumber(value) {
+  //验证是否为数字
+  var patrn = /^(-)?\d+(\.\d+)?$/;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+export function isIntegerNumber(value) {
+  //验证是否为整数
+  var patrn = /^\+?[1-9][0-9]*$/g;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+//写一个方法封装date对象转换为时间字符串
+export function toDateString(value){
+    if(value==null){
+        return
+    }
+    var Year = value.getFullYear();
+    var Month = ("0" + (value.getMonth() + 1)).slice(-2)
+    var Day = ("0" + (value.getDate())).slice(-2)
+    var Hours = ("0" + (value.getHours())).slice(-2)
+    var Minutes = ("0" + (value.getMinutes())).slice(-2)
+    var Seconds = ("0" + (value.getSeconds())).slice(-2)
+    var DATE = Year + "-" + Month + "-" + Day + " " + Hours + ":" + Minutes + ":" + Seconds
+    return DATE
+}
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  provide: apolloProvider.provide(),
+  template: '<App/>'
+});

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -0,0 +1,500 @@
+// 采购内转需求
+<template>
+  <div class="admin">
+    <template>
+      <div class="admin1">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="补录计量实绩" name="first">
+            <div class="switch">
+                <el-switch
+                v-model="switchValue"
+                active-text="二次过磅"
+                inactive-text="首次过磅"
+                @change = "onchange">
+                </el-switch>
+            </div>
+          <div class="admin2">
+            <div class="carrier from">
+                <el-form
+                    :inline="true"
+                    class="demo-form-inline"
+                    label-width="80px"
+                    >
+                    <el-form-item label="车牌号:">
+                    <el-autocomplete
+                    class="inline-input"
+                    v-model="capacityName"
+                    :fetch-suggestions="querySearchCapacity"
+                    placeholder="车牌号"
+                    :trigger-on-focus="false"
+                    @select="handleSelectCapacity"
+                    >
+                    <template slot-scope="{ item }">
+                    <div class="name">{{ item.capacityNumber }}</div>
+                    </template>
+                    </el-autocomplete>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="material from">
+                <span class="text">物资:</span>
+                <el-select v-model="materialId" placeholder="请选择">
+                <el-option
+                    v-for="item in materialList"
+                    :key="item.materialId"
+                    :label="item.materialName" 
+                    :value="item.materialId"
+                >
+                </el-option>
+                </el-select>
+            </div>
+
+            <div class="poundNo from">
+                <span class="text">磅单号:</span>
+                <el-input v-model="poundNo"></el-input>
+            </div>
+            <div class="block" v-if="first">
+                <span class="text">首次称重时间:</span>
+                <el-date-picker
+                v-model="value1"
+                type="datetime"
+                placeholder="选择日期时间">
+                </el-date-picker>
+            </div>
+            <div class="firstWeight from " v-if="first">
+                <span class="text">首次称重重量(吨):</span>
+                <el-input v-model="firstWeight"></el-input>
+            </div>
+            <div class="truckCalFirst from" v-if="first">
+                <span class="text">首次汽车衡:</span>
+                <el-select v-model="truckCalFirst" placeholder="请选择" @change="onchange1">
+                <el-option
+                    v-for="item in truckCalFirstList"
+                    :key="item.value"
+                    :label="item.label" 
+                    :value="item.value"
+                >
+                </el-option>
+                </el-select>
+            </div>
+            <div class="block" v-if="second">
+                <span class="text">二次称重时间:</span>
+                <el-date-picker
+                v-model="value2"
+                type="datetime"
+                placeholder="选择日期时间">
+                </el-date-picker>
+            </div>
+            <div class="secondWeight from" v-if="second">
+                <span class="text">二次称重重量(吨):</span>
+                <el-input v-model="secondWeight"></el-input>
+            </div>
+            <div class="truckCalSecond from" v-if="second">
+                <span class="text">二次汽车衡:</span>
+                <el-select v-model="truckCalSecond" placeholder="请选择" @change="onchange2">
+                <el-option
+                    v-for="item in truckCalSecondList"
+                    :key="item.value"
+                    :label="item.label" 
+                    :value="item.value"
+                >
+                </el-option>
+                </el-select>
+            </div>
+            <div class="netWeight from" v-if="second">
+                <span class="text">净重(吨):</span>
+                <el-input v-model="netWeight"></el-input>
+            </div>
+          </div>
+          <div class="button_box">
+            <el-button @click="onClickCancel">返回</el-button>
+            <el-button type="primary" @click="onClickConfirm" :disabled = "disabled">确认</el-button>
+          </div>
+          </el-tab-pane>
+          <el-tab-pane label="修改路段顺序" name="second">
+              <div class="admin2">
+            <div class="carrier from">
+                <el-form
+                    :inline="true"
+                    class="demo-form-inline"
+                    label-width="80px"
+                    >
+                    <el-form-item label="车牌号:">
+                    <el-autocomplete
+                    class="inline-input"
+                    v-model="capacityName"
+                    :fetch-suggestions="querySearchCapacity"
+                    placeholder="车牌号"
+                    :trigger-on-focus="false"
+                    @select="handleSelectCapacity"
+                    >
+                    <template slot-scope="{ item }">
+                    <div class="name">{{ item.capacityNumber }}</div>
+                    </template>
+                    </el-autocomplete>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+            </div>
+            <div class="poundNo from">
+                <span class="text">路段顺序号:</span>
+                <el-input v-model="lineQuence" @input="oninput"></el-input>
+            </div>
+            <div class="button_box">
+            <el-button type="primary" @click="updateLineSqe" :disabled = "disabled">确认</el-button>
+          </div>
+          </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { toDateString } from "../app.js"
+export default {
+  data() {
+    return {
+        orderNumber:null,
+        first:true,
+        second:true,
+        activeName:"first",
+        capacityName:null,
+        stateCapacity:null,
+        materialList:[],
+        capacityId:null,
+        materialId:null,
+        value1:null,
+        value2:null,
+        disabled:false,
+        orderId:null,
+        firstWeight:null,
+        secondWeight:null,
+        netWeight:null,
+        poundNo:null,
+        truckCalFirstList:[],
+        truckCalSecondList:[],
+        truckCalFirst:null,
+        truckCalSecond:null,
+        switchValue:true,
+        truckCalFirstNum:null,
+        truckCalSecondNum:null,
+        lineQuence:null
+    };
+  },
+  created(){ 
+  },
+  mounted(){
+      this.information()
+  },
+  methods: {
+    updateLineSqe(){
+        let map = {
+            orderId:this.orderId,
+            orderLineSqe:this.lineQuence
+        }
+        this.axios.post("/api/v1/uc/updateLineSqe",map).then((res) =>{
+            console.log(res.data);
+             if(res.data.code == "200"){
+                this.$message.success("修改路段顺序号成功")
+                this.$router.go(0)
+            }
+           
+        })
+    },
+    oninput(){
+
+    },
+    onchange(){
+        console.log(this.switchValue)
+        console.log(typeof(this.switchValue))
+        if(this.switchValue){
+            this.first = true
+            this.second = true
+        }else{
+            this.second = false
+        }
+    },
+    onchange1(){
+        console.log(this.truckCalFirst)
+        this.truckCalFirstList.forEach(e => {
+            if(this.truckCalFirst == e.value){
+                this.truckCalFirstNum = e.label
+            }
+        });
+    },
+    onchange2(){
+        console.log(this.truckCalSecond)
+        this.truckCalSecondList.forEach(e => {
+            if(this.truckCalSecond == e.value){
+                this.truckCalSecondNum = e.label
+            }
+        });
+    },        
+    //运力弹出层
+    handleSelectCapacity(item){
+      console.log(item)
+      this.capacityId = item.capacityId
+      this.capacityName = item.capacityNumber
+      this.axios.get("/api/v1/uc/getOrderNumber?capacityId=" + this.capacityId).then((res) =>{
+          if(res.data.code == "200"){
+              console.log("----");
+              console.log(res.data)
+              console.log("----");
+              this.orderId = res.data.data.orderId
+              this.orderNumber = res.data.data.orderNumber
+              this.axios.get("/api/v1/uc/getMaterialIdByOrderId?orderId=" + this.orderId).then((res) =>{
+                  if(res.data.code == "200"){
+                      this.materialList = res.data.data
+                  }
+              })
+          }
+      })
+    },
+    //以下是运力边输边查搜索
+    querySearchCapacity(queryString, cb) {
+        if(queryString.length < 3){
+            return
+        }
+        this.axios.get('/api/v1/uc/getCapacityNumber?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          var restaurantsCarrier = res.data.data
+          console.log(restaurantsCarrier,"restaurantsCarrier");
+          var results = queryString ? restaurantsCarrier.filter(this.createFilterCarrier(queryString)) :restaurantsCarrier;
+           // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+        })     
+      },
+    createFilterCarrier(queryString) {
+        return (restaurantsCarrier)  =>  {
+          return (restaurantsCarrier.capacityNumber.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是承运商边输边查搜索
+    information(){
+        this.axios.get("/api/v1/uc/getAllCalculateMes").then((res) =>{
+            
+            this.truckCalFirstList = res.data
+            this.truckCalSecondList = res.data
+        })
+    },
+    onClickConfirm(){
+        if(this.switchValue){
+            if(this.orderNumber==null||this.truckCalFirst==null||this.truckCalSecond==null||
+            this.firstWeight==null||this.secondWeight==null||this.netWeight==null||this.value1==null
+            ||this.value2==null||this.poundNo==null||this.materialId==null){
+                this.$message.warning("请填写所有值!!!")
+                return
+            }
+        }else{
+            if(this.orderNumber==null||this.truckCalFirst==null||
+            this.firstWeight==null||this.value1==null
+            ||this.poundNo==null||this.materialId==null){
+                this.$message.warning("请填写所有值!!!")
+                return
+            }
+        }
+        let mapFirst = {
+            orderNumber:this.orderNumber,
+            resultTareCalculateNumber: this.truckCalFirstNum,
+            resultTareWeight: this.firstWeight + "",
+            resultTareWeightTime: toDateString(this.value1),
+            resultPoundNo: this.poundNo,
+            materialId: this.materialId + ""
+        }
+        let mapSecond = {
+            orderNumber:this.orderNumber,
+            resultTareCalculateNumber: this.truckCalFirstNum,
+            resultCrossCalculateNumber: this.truckCalSecondNum,
+            resultTareWeight: this.firstWeight + "",
+            resultCrossWeight: this.secondWeight + "",
+            resultNetWeight: this.netWeight + "",
+            resultTareWeightTime: toDateString(this.value1),
+            resultCrossWeightTime: toDateString(this.value2),
+            resultPoundNo: this.poundNo,
+            materialId: this.materialId + ""
+        }
+        var arr = []
+        if(this.switchValue){
+            arr.push(mapSecond)
+        }else{
+            arr.push(mapFirst)
+        }
+        this.axios.post("http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult",arr).then((res) =>{
+            if(res.data.code == "200"){
+                this.$message.success("补录计量实绩成功")
+                this.$router.go(0)
+            }
+        })
+    },
+    onClickCancel(){
+    },
+    
+  },
+};
+</script>
+<style lang="scss">
+.admin{
+  .admin1 {
+
+      margin-top: 40px;
+      margin-left: 40px;
+      .switch {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin-top: 20px;
+          color: aqua;
+      }
+      .button_box {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 100%;
+            height: 100px;
+        }
+      .admin2 {    
+        margin-top: 40px; 
+        .from {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-top: 20px;
+        margin-bottom: 20px;
+        }
+        .carrier{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .el-form-item {
+                text-align: right;
+            }
+            .el-autocomplete{
+            width: 250px;
+            }
+        }
+        .material {
+        display: flex;
+        justify-content: center;
+        margin-top: 20px;
+        margin-right: 100px;
+        .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+        }
+        .el-input {
+            width: 250px;
+        }
+        }
+        .poundNo {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+                  }
+            .el-input {
+            width: 250px;
+                    }
+        }  
+        .block {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .el-input {
+                width: 250px;
+            }
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+            }
+        }
+        .truckCalFirst {
+            display: flex;
+            justify-content: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+                display: inline-block;
+                width: 170px;
+                text-align: right;
+            }
+            .el-input {
+                width: 250px;
+            }
+        }
+        .truckCalSecond {
+            display: flex;
+            justify-content: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+                display: inline-block;
+                width: 170px;
+                text-align: right;
+            }
+            .el-input {
+                width: 250px;
+            }
+        }
+        .secondWeight {
+           display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+                  }
+            .el-input {
+            width: 250px;
+                    } 
+        }
+        .firstWeight {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+                  }
+            .el-input {
+            width: 250px;
+                    }
+        }
+        .netWeight {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            margin-right: 100px;
+            .text {
+            display: inline-block;
+            width: 170px;
+            text-align: right;
+                  }
+            .el-input {
+            width: 250px;
+                    }
+        }
+      }      
+  }
+  }
+</style>

src/views/ADMINISTRATORS/router/index.js

@@ -0,0 +1,32 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+import routerBefore from '@/config/routerBefore.js'
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+import ADMINISTRATORS1 from '../components/ADMINISTRATORS1.vue'
+
+Vue.use(Router)
+
+const constantRouterMap = [
+  {
+    path: '/',
+    name: 'main',
+    meta: {title: '首页', code: 'xtpzgl'},
+    component: main,
+    redirect: {name: 'ADMINISTRATORS1'},
+    children: [
+      {path: 'ADMINISTRATORS1', name: 'ADMINISTRATORS1', meta: {code: 'xtpzgl-jggl'}, component: ADMINISTRATORS1}
+    ]
+  }
+];
+
+const router = new Router({
+  routes: constantRouterMap
+})
+//  before
+routerBefore(router, constantRouterMap);
+
+export default router;
+//  constantRouterMap
+export const routes = constantRouterMap;

src/views/RMS/app.js

@@ -25,6 +25,10 @@ Vue.use(VueApollo)
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+// 导出Excel全局组件
+import tableToExcel from '@/components/exportExcel/exportExcel'
+Vue.use(tableToExcel)
+
 const apolloProvider = new VueApollo({
     defaultClient: apollo
 })

src/views/RMS/components/addCapacity.vue

@@ -2,35 +2,35 @@
   <!-- 添加运力信息 -->
   <div class="addCapacity">
     <PageTitle>返回</PageTitle>
-     <div class="form_box" style="margin-right: 10rem">
-        <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
-      </div>
-      <div class="elForm">
-             <el-form
-        :inline="true"
-        class="demo-form-inline"
-        label-width="80px"
-      >
+    <div class="form_box" style="margin-right: 10rem">
+      <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
+    </div>
+    <div class="elForm">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
         <el-form-item label="选择承运商">
-         <el-autocomplete
-          class="inline-input"
-          v-model="state"
-          :fetch-suggestions="querySearch"
-          placeholder="请输入承运商名称"
-          :trigger-on-focus="false"
-          @select="handleSelect"
-        >
-        <template slot-scope="{ item }">
-          <div class="name">{{ item.carrierName }}</div>
-        </template>
-        </el-autocomplete>
+          <el-autocomplete
+            class="inline-input"
+            v-model="state"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入承运商名称"
+            :trigger-on-focus="false"
+            @select="handleSelect"
+          >
+            <template slot-scope="{ item }">
+              <div class="name" v-if="item.carrierName">
+                {{ item.carrierName }}
+              </div>
+            </template>
+          </el-autocomplete>
         </el-form-item>
-    </el-form>
-      </div>
- 
+      </el-form>
+    </div>
+
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
+      <el-button type="primary" @click="makeSure" :loading="addLoading"
+        >确定</el-button
+      >
     </div>
   </div>
 </template>
@@ -42,83 +42,95 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      addLoading: false,
       form1: {},
-      form1Initialization : {
-        capacityTypeId : 1,
-        capacityNumber : '',
-        capacityCorlor : '黄',
-        capacityOwneris : '否',
-        capacityVip : '否',
-        capacityBlacklist : '否'
+      form1Initialization: {
+        capacityTypeId: 1,
+        capacityNumber: "",
+        capacityCorlor: "黄",
+        capacityOwneris: "否",
+        capacityVip: "否",
+        capacityBlacklist: "否",
       },
       value: undefined,
       carrierIds: null,
-      state:null,
-      userId:null,
+      state: null,
+      userId: null,
       restaurants: [],
-      accessToken:null,
-      userCode:null,
-      carrierUserId:null,
-      carrierId:null
+      accessToken: null,
+      userCode: null,
+      carrierUserId: null,
+      carrierId: null,
     };
   },
-  created(){
-      this.carrierUserId = getCookie("userId");
-      this.form1 = this.form1Initialization;
-      console.log(this.carrierUserId ,'carrierUserId')
-      
+  created() {
+    this.carrierUserId = getCookie("userId");
+    this.form1 = this.form1Initialization;
+    // console.log(this.carrierUserId, "carrierUserId");
   },
   mounted() {
-   this.axios.post(
-       "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+    this.axios
+      .post(
+        "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
       )
       .then((res) => {
-        if(res.data.code == "200"){
-        console.log(res.data.data)
-        this.state = res.data.data.carrierName
-        this.carrierIds = res.data.data.carrierId
-        }      
-  })},
+        if (res.data.code == "200") {
+          // console.log(res.data.data);
+          if (res.data.data) {
+            this.state = res.data.data.carrierName;
+            this.carrierIds = res.data.data.carrierId;
+          }
+        }
+      });
+  },
   methods: {
     //承运商弹出层
-    handleSelect(item){    
-      this.carrierIds = item.carrierId
-      item.carrierName = this.state
+    handleSelect(item) {
+      this.carrierIds = item.carrierId;
+      item.carrierName = this.state;
     },
     //以下是承运商边输边查搜索
     querySearch(queryString, cb) {
-        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
-        if(res.data.code == "200"){
-          console.log(res.data.data)
-          var restaurants = res.data.data
-          console.log(restaurants,"restaurants");
-          var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
-           // 调用 callback 返回建议列表的数据
-          cb(results);
-        }
-        })     
-      },
+      this.axios
+        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .then((res) => {
+          if (res.data.code == "200") {
+            // console.log(res.data.data);
+            var restaurants = res.data.data;
+            // console.log(restaurants, "restaurants");
+            var results = queryString
+              ? restaurants.filter(this.createFilter(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
     createFilter(queryString) {
-        return (restaurants)  =>  {
-          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
-        };
-      },
+      return (restaurants) => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
     //以上是承运商边输边查搜索
-    deleteUser(userId){
-        this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
-           this.$message.error("添加失败,车牌可能重复");
-           });
+    deleteUser(userId) {
+      this.axios.delete("pass/v1/sysusers/" + userId).then((res) => {
+        this.$message.error("添加失败,车牌可能重复");
+      });
     },
-    insertRole(userId,userCode){
-        this.axios
+    insertRole(userId, userCode) {
+      this.axios
         .post(
           "pass/v1/sysuserroles/addUserroles?userId=" +
             userId +
             "&userCode=" +
             userCode +
             "&roleId=" +
-            '923693668269953024'
-        ).then((res) => {
+            "923693668269953024"
+        )
+        .then((res) => {
           if (res.code === "0") {
             this.$message.success("操作成功");
             this.saveLoading = false;
@@ -126,84 +138,120 @@ export default {
           } else {
             this.$message.error(res.message);
           }
-        })
+        });
     },
     isVehicleNumber(vehicleNumber) {
-				  console.log(vehicleNumber)
-			      var result = false;
-			      if (vehicleNumber.length == 7){
-			        var express = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
-			        result = express.test(vehicleNumber);
-			      }
-			      return result;
-				  
-		},
+      // console.log(vehicleNumber);
+      var result = false;
+      if (vehicleNumber.length == 7) {
+        var express =
+          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使场领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+        result = express.test(vehicleNumber);
+      }
+      return result;
+    },
     makeSure() {
-        if(!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())){
-            this.$message.error("车牌号格式不正确")
-            return
-        }
-        if(this.carrierIds == null){
-            this.$message.error("请选择承运商")
-            return
-        }
-        let RmsCapacity = {
+      this.addLoading = true;
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
+      if (this.carrierIds == null) {
+        this.$message.error("请选择承运商");
+        this.addLoading = false;
+        return;
+      }
+      let RmsCapacity = {
         capacityTypeId: this.form1.capacityTypeId,
         capacityNumber: this.form1.capacityNumber.toUpperCase(),
         capacityCorlor: this.form1.capacityCorlor,
         capacityOwneris: this.form1.capacityOwneris,
         capacityVip: this.form1.capacityVip,
         capacityBlacklist: this.form1.capacityBlacklist,
-        remark:this.form1.remark,
-        carrierId:this.carrierIds,
-        state: this.state
+        remark: this.form1.remark,
+        carrierId: this.carrierIds,
+        state: this.state,
       };
+      console.log(RmsCapacity)
       if (
         RmsCapacity.capacityNumber == null ||
         RmsCapacity.capacityCorlor == null ||
         RmsCapacity.capacityOwneris == null ||
         RmsCapacity.capacityVip == null ||
         RmsCapacity.capacityBlacklist == null
-      )
+      ) {
         this.$message.error("存在空值！");
+        this.addLoading = false;
+      } else {
+        //新增SSO运力账号
         var formData = new FormData();
-        formData.append("userName",this.form1.capacityNumber.toUpperCase())
-        console.log(formData.get("userName"))
-        console.log(formData.set("userName",this.form1.capacityNumber.toUpperCase()))
-        console.log(formData)
-        formData.append('userCode',this.form1.capacityNumber.toUpperCase())
-        formData.append('orgCode','yunli')
-        formData.append('orgName','运力')
-        formData.append('groupId','506514577756917769')
-        formData.append('companyId','713710108567277568')
-        formData.append('orgId','924126716337721344')
-        console.log(formData.get("userCode"))
-        console.log(typeof formData)
-        this.$store.dispatch("system/usersManage/addUser", formData).then((res) => {
-        console.log(res);
-        if (res.code === "0") {
-          console.log(res.data.userId)
-          this.userId = res.data.userId
-          this.userCode = res.data.userCode
-          RmsCapacity.ssoId = res.data.userId
-          console.log(RmsCapacity)
-          this.axios.post("/api/v1/rms/insertCapacity",RmsCapacity).then((res) => {
-              console.log(res)
-              if(res.data.code == '200'){
-                this.insertRole(this.userId,this.userCode)
-                this.$message.success("添加成功");
-                this.$router.push('capacity')
-              }
-              else if(res.data.code == '201'){
-                this.deleteUser(this.userId)
-              }else{
-                this.deleteUser(this.userId)
+        formData.append("userCode", this.form1.capacityNumber.toUpperCase());
+        formData.append("orgCode", "yunli");
+        formData.append("orgName", "运力");
+        formData.append("groupId", "506514577756917769");
+        formData.append("companyId", "713710108567277568");
+        formData.append("orgId", "924126716337721344");
+        // console.log(formData.get("userCode"));
+        // console.log(typeof formData);
+        this.$store
+          .dispatch("system/usersManage/addUser", formData)
+          .then((res) => {
+            // console.log(res);
+            if (res.code === "0") {
+              // console.log(res.data.userId);
+              this.userId = res.data.userId;
+              this.userCode = res.data.userCode;
+              RmsCapacity.ssoId = res.data.userId;
+              this.axios
+                .post("/api/v1/rms/insertCapacity", RmsCapacity)
+                .then((res) => {
+                  if (res.data.data == 1) {
+                    this.insertRole(this.userId, this.userCode);
+                    this.$message.success("添加成功");
+                    this.$router.push("capacity");
+                  } else if (res.data.code == "201") {
+                    this.deleteUser(this.userId);
+                  } else {
+                    this.deleteUser(this.userId);
+                  }
+                });
+            } else {
+              // console.log(RmsCapacity, "RmsCapacity");
+              if (res.message == "账号已被注册") {
+                this.$confirm(
+                  "该账号已经被注册, 是否确定新增承运商绑定关系?",
+                  "提示",
+                  {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                  }
+                )
+                  .then(() => {
+                    this.axios
+                      .post("/api/v1/rms/insertCapacity", RmsCapacity)
+                      .then((res) => {
+                        // console.log(res, "res");
+                        if (res.data.data == 0) {
+                          this.$message.success("新增承运商绑定关系成功!");
+                          this.$router.push("capacity");
+                        } else {
+                          this.$message.error("该绑定关系已存在!");
+                        }
+                      });
+                  })
+                  .catch(() => {
+                    this.$message({
+                      type: "info",
+                      message: "已取消删除",
+                    });
+                  });
               }
-          })         
-        } else {
-          this.$message.error(res.message);
-        }
-      });
+            }
+          });
+        this.addLoading = false;
+      }
     },
     // 取消
     cancel() {
@@ -220,43 +268,44 @@ export default {
   .form_box {
     width: 100%;
     margin-top: 30px;
+    margin-left: 50px;
     display: flex;
     justify-content: center;
-    .el-form-item{
+    .el-form-item {
       display: flex;
       justify-content: center;
-      .el-form-item__label{
+      .el-form-item__label {
         display: flex;
         align-items: center;
       }
-      .el-form-item__content{
-         .el-select{
-            width: 250px;
-          }
-          .el-input{
-            width: 250px;
-          }
+      .el-form-item__content {
+        .el-select {
+          width: 250px;
+        }
+        .el-input {
+          width: 250px;
+        }
       }
     }
   }
-  .inputBox{
+  .inputBox {
     display: flex;
     justify-content: center;
     margin-bottom: 30px;
-    .text{
+    .text {
       text-align: right;
       display: flex;
       align-items: center;
       margin-right: 5px;
     }
-    .input{
+    .input {
       width: 250px;
     }
   }
-  .button_box{
+  .button_box {
     display: flex;
     justify-content: center;
-    .el-button{
+    .el-button {
       width: 80px;
       margin-right: 10px;
     }

src/views/RMS/components/addCarrier.vue

@@ -1,26 +1,33 @@
 <template>
+
+
   <!-- 添加承运商信息 -->
   <div class="addCarrier">
     <PageTitle>返回</PageTitle>
     <div class="user_code">
       <span class="text">账号</span>
-      <el-input
-        class="input"
-        placeholder="请输入账号(必填项)"
-        v-model="input"
-        clearable
-      >
-      </el-input>
+      <div class="site">
+        <el-input
+          class="input"
+          placeholder="请输入账号(必填项)"
+          v-model="input"
+          clearable
+        >
+        </el-input>
+      </div>
     </div>
     <div class="user_code">
       <span class="text">用户名</span>
-      <el-input
-        class="input"
-        placeholder="请输入用户名(必填项)"
-        v-model="user_Name"
-        clearable
-      >
-      </el-input>
+      <div class="site">
+           <el-input
+            class="input"
+            placeholder="请输入用户名(必填项)"
+            v-model="user_Name"
+            clearable
+          >
+          </el-input>
+      </div>
+     
     </div>
     <div class="form_box" style="margin-right: 10rem">
       <dil-form :formId="330" v-model="form1"></dil-form>
@@ -28,7 +35,7 @@
     <el-upload
       class="upload-demo"
       ref="upload1"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -51,7 +58,7 @@
     <el-upload
       class="upload-demo"
       ref="upload2"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier2"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -74,7 +81,7 @@
     <el-upload
       class="upload-demo"
       ref="upload3"
-      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier3"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -189,29 +196,30 @@ export default {
         if (this.num == 1) {
           this.shippingCertificate = null;
           this.imageUrl1 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         } else if (this.num == 2) {
           this.businessLicense = null;
           this.imageUrl2 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         } else if (this.num == 3) {
           this.businessLicense1 = null;
           this.imageUrl3 = null;
-          this.$message.error("上传失败");
+          // this.$message.error("上传失败");
         }
       }
     },
     handleAvatarSuccess(res, file) {
+      console.log(res,file)
       if (res.code) {
         this.upBool = false;
         if (this.num == 1) {
-          this.imageUrl1 = URL.createObjectURL(file.raw);
+          this.imageUrl1 = res.data;
           this.shippingCertificate = file.name;
         } else if (this.num == 2) {
-          this.imageUrl2 = URL.createObjectURL(file.raw);
+          this.imageUrl2 = res.data;
           this.businessLicense = file.name;
         } else if (this.num == 3) {
-          this.imageUrl3 = URL.createObjectURL(file.raw);
+          this.imageUrl3 =res.data;
           this.businessLicense1 = file.name;
         }
         this.$message.success("上传成功");
@@ -229,7 +237,10 @@ export default {
       this.form1.carrierContactNumber = parseInt(this.form1.carrierContactNumber);
       if (!this.input) {
         this.$message.error("账号不能为空");
-      } else if(!this.user_Name){
+      }else if(this.input.length<3){
+        this.$message.error("账号不能少于3位数！");
+      }
+       else if(!this.user_Name){
         this.$message.error("用户名不能为空");
       }else if (!this.form1.carrierName) {
         this.$message.error("承运商名称不能为空");
@@ -347,6 +358,9 @@ export default {
       justify-content: center;
       align-items: center;
       margin-right: 10px;
+      width: 40px;
+      position: relative;
+      left: 40px;
     }
     .input {
       width: 250px;
@@ -397,6 +411,15 @@ export default {
       width: 250px;
     }
   }
+  .site{
+    position: relative;
+    left: -50px;
+  }
+  span.text {
+    position: relative;
+    align-content: center;
+    left: -35px;
+  }
   .form-box {
     display: flex;
     justify-content: center;

src/views/RMS/components/addConsignee.vue

@@ -11,12 +11,12 @@
         class="demo-form-inline"
         label-width="80px"
         >
-        <el-form-item label="收货单位">
+        <el-form-item label="收货父级单位">
          <el-autocomplete
           class="inline-input"
           v-model="stateConsignee"
           :fetch-suggestions="querySearchConsignee"
-          placeholder="请输入收货单位名称"
+          placeholder="请输入收货父级单位名称"
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
         >

src/views/RMS/components/addOilPrice.vue

@@ -1,95 +1,179 @@
 <template>
   <!-- 添加油价信息 -->
   <div class="addWagonLoad">
-    <PageTitle>返回</PageTitle>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="357" v-model="form1" ref="from1"></dil-form>
+    <page-title>返回</page-title>
+    <div class="form_you">
+      <span class="text">油品名称 </span>
+      <el-select v-model="oilNameId" filterable placeholder="请选择">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-button type="primary" @click="dialogVisible = true">新增油品名称</el-button>
     </div>
-    <div class="button-box">
+    <div class="form_box" style="margin-right: 10rem">
+      <dil-form :formId="357" v-model="form1" ref="from1" @change="onchang"></dil-form>
+    </div>
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
+    <el-dialog
+      title="新增油品名称"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <span>注：<span style="color:red;">不能输入特殊符号('#')</span></span>
+      <el-input v-model="input" placeholder="请输入内容"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogMakeSure">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { isNumber,sjTime } from '@/utils/sharedJsFile'
 export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {},
-      value: undefined,
+      //下拉框选中的值
+      oilNameId:null,
+      //加载状态
+      loading:false,
+      //油品名称新增的值
+      input:null,
+      //是否显示添加油品名称的窗口
+      dialogVisible:false,
+      //下拉框的数据
+      options:[],
+      //表单的数据
+      form1: {
+        priceValue:'',
+        priceDate:new Date(),
+        priceStatus:false,
+      },
     };
   },
-  mounted() {},
+  created(){
+    this.initialization();
+  },
   methods: {
+    initialization(){
+      this.axios.post('/api/v1/rms/oilNameSelect').then((res)=>{
+        if(res.data.code == "200"){
+          this.options = res.data.data;
+        }
+      })
+    },
+    onchang(val){
+      if(val.priceStatus){
+        this.$message.warning('确认启用后将会停用正在执行的油品价格')
+      }
+    },
+    dialogMakeSure(){
+      this.loading = true;
+      if(this.input){
+        this.axios.post('/api/v1/rms/addOilType?oilTypeName='+this.input).then((res)=>{
+          if(res.data.code == "200"){
+            this.loading = false;
+            this.$message.success('新增成功')
+            this.dialogVisible = false;
+            this.initialization();
+          }
+        })
+      }else{
+        this.$message.warning('请输入油品名称')
+      } 
+    },
     makeSure() {
-      console.log(this.form1);
-      let RmsOilPrice = {
-        priceOilName:this.form1.priceOilName,
-        priceId:this.form1.priceId,
-        priceDate:this.form1.priceDate,
-        priceValue:this.form1.priceValue,
-      };
-      if(
-        RmsOilPrice.priceOilName ==null ||
-        RmsOilPrice.priceDate ==null ||
-         RmsOilPrice.priceValue ==null
-      )this.$message.error("存在空值！");
-      else
-      this.axios
-        .post(
-          "/api/v1/rms/insertOilPrice" , RmsOilPrice
-        )
+      this.loading = true;
+      let state = false;
+      if(!this.oilNameId){
+        this.$message.warning('请填写油品名称')
+      }else if(!this.form1.priceValue){
+        this.$message.warning('请填写油品价格')
+      }else if(!isNumber(this.form1.priceValue)){
+        this.$message.warning('油品价格必修为整数或者小数')
+      }else{
+        state = true;            
+      }
+      if(state){
+        let RmsOilPrice = {
+          oilNameId:this.oilNameId,
+          priceValue:this.form1.priceValue,
+          priceDate:sjTime(this.form1.priceDate),
+          priceStatus:this.form1.priceStatus
+        };
+        console.log(RmsOilPrice);
+        this.axios.post("/api/v1/rms/insertOilPrice" , RmsOilPrice)
         .then((res) => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
-            });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复！");
+          if (res.data.code == "200") {
+            this.loading = true;
+            this.$message.success('新增成功');
+            this.cancel();
           }
-        //  this.$refs['table'].resetField();
         });
+      }else{
+        this.loading = true;
+      }
     },
     // 取消
     cancel() {
-      this.$router.go(-1);
+      this.$router.push("/oilPrice");
     },
   },
 };
 </script>
-<style lang='scss' >
- .button-box{
-    display: flex;
-    justify-content: center;
-    .el-button{
-      width: 80px;
-      margin-right: 10px;
+<style lang='scss'>
+.addWagonLoad{
+  .form_you{
+    margin-left: 35%;
+    margin-top: 30px;
+    .text{
+      display: inline-block;
+      width: 55px;
+    }
+    .el-select{
+      width: 250px;
+      margin-right: 20px;
     }
   }
-.form-box{
-  display: flex;
-  justify-content: center;
-  .el-form-item{
+  .form_box{
+    margin-left: 35%;
+    padding-top: 10px;
+    width: 470px;
     display: flex;
-    justify-content: center;
-    .el-form-item__label{
-      display: flex;
-      align-items: center;
-    }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
-          width: 250px;
+    .el-form{
+      .el-form-item{
+        display: flex;
+        align-items: center;
+        .el-form-item__content{
+          .el-input{
+            width: 250px;
+          }
+          .el-switch{
+            margin-left: -250px;
+          }
         }
       }
     }
+    .addbtn{
+      margin-left: 30px;
+    }
+  }
+  .button_box{
+    margin-left: 40%;
+    padding-top: 30px;
+    width: 310px;
+    display: flex;
+    justify-content: center;
   }
 }
 </style>

src/views/RMS/components/addOtherCapacity.vue

@@ -0,0 +1,308 @@
+<template>
+  <!-- 添加运力信息 -->
+  <div class="addCapacity">
+    <PageTitle>返回</PageTitle>
+    <div class="form_box" style="margin-right: 10rem">
+      <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
+    </div>
+    <div class="elForm">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+        <el-form-item label="选择承运商">
+          <el-autocomplete
+            class="inline-input"
+            v-model="state"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入承运商名称"
+            :trigger-on-focus="false"
+            @select="handleSelect"
+          >
+            <template slot-scope="{ item }">
+              <div class="name" v-if="item.carrierName">
+                {{ item.carrierName }}
+              </div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure" :loading="addLoading"
+        >确定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      addLoading: false,
+      form1: {},
+      form1Initialization: {
+        capacityTypeId: 1,
+        capacityNumber: "",
+        capacityCorlor: "黄",
+        capacityOwneris: "否",
+        capacityVip: "否",
+        capacityBlacklist: "否",
+      },
+      value: undefined,
+      carrierIds: null,
+      state: null,
+      userId: null,
+      restaurants: [],
+      accessToken: null,
+      userCode: null,
+      carrierUserId: null,
+      carrierId: null,
+    };
+  },
+  created() {
+    this.carrierUserId = getCookie("userId");
+    this.form1 = this.form1Initialization;
+    // console.log(this.carrierUserId, "carrierUserId");
+  },
+  mounted() {
+    this.axios
+      .post(
+        "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+      )
+      .then((res) => {
+        if (res.data.code == "200") {
+          // console.log(res.data.data);
+          if (res.data.data) {
+            this.state = res.data.data.carrierName;
+            this.carrierIds = res.data.data.carrierId;
+          }
+        }
+      });
+  },
+  methods: {
+    //承运商弹出层
+    handleSelect(item) {
+      this.carrierIds = item.carrierId;
+      item.carrierName = this.state;
+    },
+    //以下是承运商边输边查搜索
+    querySearch(queryString, cb) {
+      this.axios
+        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .then((res) => {
+          if (res.data.code == "200") {
+            // console.log(res.data.data);
+            var restaurants = res.data.data;
+            // console.log(restaurants, "restaurants");
+            var results = queryString
+              ? restaurants.filter(this.createFilter(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilter(queryString) {
+      return (restaurants) => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //以上是承运商边输边查搜索
+    deleteUser(userId) {
+      this.axios.delete("pass/v1/sysusers/" + userId).then((res) => {
+        this.$message.error("添加失败,车牌可能重复");
+      });
+    },
+    insertRole(userId, userCode) {
+      this.axios
+        .post(
+          "pass/v1/sysuserroles/addUserroles?userId=" +
+            userId +
+            "&userCode=" +
+            userCode +
+            "&roleId=" +
+            "923693668269953024"
+        )
+        .then((res) => {
+          if (res.code === "0") {
+            this.$message.success("操作成功");
+            this.saveLoading = false;
+            this.rolesTree.loading = false;
+          } else {
+            this.$message.error(res.message);
+          }
+        });
+    },
+    makeSure() {
+      this.addLoading = true;
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
+      if(this.form1.capacityNumber.length<=2){
+        this.$message.error("车牌号必须大于三位");
+        this.addLoading = false;
+        return;
+      }
+      if (this.carrierIds == null) {
+        this.$message.error("请选择承运商");
+        this.addLoading = false;
+        return;
+      }
+      let RmsCapacity = {
+        capacityTypeId: this.form1.capacityTypeId,
+        capacityNumber: this.form1.capacityNumber.toUpperCase(),
+        capacityCorlor: this.form1.capacityCorlor,
+        capacityOwneris: this.form1.capacityOwneris,
+        capacityVip: this.form1.capacityVip,
+        capacityBlacklist: this.form1.capacityBlacklist,
+        remark: this.form1.remark,
+        carrierId: this.carrierIds,
+        state: this.state,
+      };
+      if (
+        RmsCapacity.capacityNumber == null ||
+        RmsCapacity.capacityCorlor == null ||
+        RmsCapacity.capacityOwneris == null ||
+        RmsCapacity.capacityVip == null ||
+        RmsCapacity.capacityBlacklist == null
+      ) {
+        this.$message.error("存在空值！");
+        this.addLoading = false;
+      } else {
+        //新增SSO运力账号
+        var formData = new FormData();
+        formData.append("userCode", this.form1.capacityNumber.toUpperCase());
+        formData.append("orgCode", "yunli");
+        formData.append("orgName", "运力");
+        formData.append("groupId", "506514577756917769");
+        formData.append("companyId", "713710108567277568");
+        formData.append("orgId", "924126716337721344");
+        // console.log(formData.get("userCode"));
+        // console.log(typeof formData);
+        this.$store
+          .dispatch("system/usersManage/addUser", formData)
+          .then((res) => {
+            // console.log(res);
+            if (res.code === "0") {
+              // console.log(res.data.userId);
+              this.userId = res.data.userId;
+              this.userCode = res.data.userCode;
+              RmsCapacity.ssoId = res.data.userId;
+              this.axios
+                .post("/api/v1/rms/insertCapacity", RmsCapacity)
+                .then((res) => {
+                  if (res.data.data == 1) {
+                    this.insertRole(this.userId, this.userCode);
+                    this.$message.success("添加成功");
+                    this.$router.push("capacity");
+                  } else if (res.data.code == "201") {
+                    this.deleteUser(this.userId);
+                  } else {
+                    this.deleteUser(this.userId);
+                  }
+                });
+            } else {
+              // console.log(RmsCapacity, "RmsCapacity");
+              if (res.message == "账号已被注册") {
+                this.$confirm(
+                  "该账号已经被注册, 是否确定新增承运商绑定关系?",
+                  "提示",
+                  {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                  }
+                )
+                  .then(() => {
+                    this.axios
+                      .post("/api/v1/rms/insertCapacity", RmsCapacity)
+                      .then((res) => {
+                        // console.log(res, "res");
+                        if (res.data.data == 0) {
+                          this.$message.success("新增承运商绑定关系成功!");
+                          this.$router.push("capacity");
+                        } else {
+                          this.$message.error("该绑定关系已存在!");
+                        }
+                      });
+                  })
+                  .catch(() => {
+                    this.$message({
+                      type: "info",
+                      message: "已取消删除",
+                    });
+                  });
+              }
+            }
+          });
+        this.addLoading = false;
+      }
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' >
+.addCapacity {
+  .elForm {
+    margin-left: 40%;
+  }
+  .form_box {
+    width: 100%;
+    margin-top: 30px;
+    margin-left: 50px;
+    display: flex;
+    justify-content: center;
+    .el-form-item {
+      display: flex;
+      justify-content: center;
+      .el-form-item__label {
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content {
+        .el-select {
+          width: 250px;
+        }
+        .el-input {
+          width: 250px;
+        }
+      }
+    }
+  }
+  .inputBox {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 30px;
+    .text {
+      text-align: right;
+      display: flex;
+      align-items: center;
+      margin-right: 5px;
+    }
+    .input {
+      width: 250px;
+    }
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    .el-button {
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/RMS/components/addRmsShipper.vue

@@ -6,6 +6,22 @@
        <!-- 323 -->
         <dil-form :formId="323" v-model="form1" ref="from1"></dil-form>
       </div>
+      <div class="department2">
+         <span>二级部门：</span>
+        <el-select v-model="value1" placeholder="请选择" @change="onchange1">
+          <el-option
+            v-for="(item,i) in options1"
+            :key="i"
+            :label="item.label"
+            :value="item.value"
+            >
+            </el-option>
+          </el-select>       
+      </div>
+      <div class="department2">
+        <span>三级部门：</span>
+        <el-input v-model="input" placeholder="请输入内容"></el-input>
+      </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -23,22 +39,59 @@ export default {
       form1: {},
       value: undefined,
       shipperName:"四川达钢",
-      shipperAbbreviation:"四川达钢"
+      shipperAbbreviation:"四川达钢",
+      //二级部门
+      options1:[],
+      //选中的二级部门名称
+      value1:'',
+      input:''
     };
   },
   mounted() {
     this.form1.shipperName = this.shipperName;
     this.form1.shipperAbbreviation = this.shipperAbbreviation;
+    //初始化二级机构和角色
+    this.initialization();
   },
   methods: {
+    initialization(){
+       //初始化选择二级机构
+         this.axios.get('/api/v1/rms/getSecondShipper').then((res)=>{
+             this.options1 = res.data.data;
+         })
+         //初始化角色
+        const formData = new FormData();
+        this.$store.dispatch('system/rolesManage/list',formData)
+        .then((res)=>{
+          var roleList = [];
+          roleList=res.data;
+          roleList.forEach((item,i)=>{
+              if(item.roleId!='superadmin'){
+                this.options3.push(item);
+              }
+          })
+          // this.options3 = res.data;
+        })
+     },
+    onchange1(val){
+            //  查询选中的二级机构下的三级机构
+             this.value2 = '';
+             this.axios.get('/api/v1/rms/getThirdShipper?shipperId='+val).then((res)=>{
+             this.options2 = res.data.data;    
+         })
+         //获取二级部门的机构ID和机构编码
+         this.axios.post('/api/v1/rms/getShipperMap?shipperId='+val).then((res)=>{
+             this.map1 = res.data.data;
+         })
+     },
      makeSure() {
        console.log(this.form1)
        let RmsShipper={
         shipperName: this.form1.shipperName,
         shipperAbbreviation: this.form1.shipperAbbreviation,
         shipperId:this.form1.shipperId,
-        shipperCompanyBranch:this.form1.shipperCompanyBranch,
-        shipperBranchFactory:this.form1.shipperBranchFactory
+        shipperCompanyBranch:this.value1,
+        shipperBranchFactory:this.input
       };
       if(
         RmsShipper.shipperName==null ||
@@ -102,4 +155,10 @@ export default {
     }
   }
 }
+.department2{
+  display: flex;
+  justify-content: center;
+  margin-left: 36%;
+  width: 250px;
+}
 </style>

src/views/RMS/components/capacity.vue

@@ -7,28 +7,39 @@
         v-model="textInput"
         clearable>
       </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <el-button type="primary" class="btn" @click="onclick" :loading="selectLoading">
         <i class="el-icon-search"></i>查询
       </el-button>
        <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
+      <el-button type="primary" class="btn" @click="toInsert1">
+        <i class="el-icon-plus"></i>新增特殊车牌
+      </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable
+        ref="excelDom"
+        v-bind.sync="options"
+        :loading="tableloading"
+        @func="func"
+        :isKuang="isKuang"
+      >
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               type="text"
               size="small"
               @click="updateCapacity(scope.row.capacityId)"
             >
               修改
-            </el-button>
+            </el-button> -->
             <el-button
               type="text"
               size="small"
-              @click="deleteCapacity(scope.row.capacityId)"
+              @click="deleteCapacity(scope.row)"
               v-if="show==true">
               删除
             </el-button>
@@ -43,6 +54,9 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data(){
     return{
+     selectLoading:false,
+     isKuang:false,
+     tableloading:false,
      show:false,
      name:"homeworkPath",
      textInput:"",
@@ -55,7 +69,7 @@ export default {
     }
   },
   created(){
-    if(getCookie("orgCode") == "wuliuchuyunzhongxin" || getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+    if(getCookie("orgCode") == "wuliuchuyunzhongxin" || getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "chengyunshang"){
         this.show = true
     }
     if(getCookie("orgCode") == "chengyunshang"){
@@ -67,51 +81,78 @@ export default {
      } 
   },
   methods:{
+    func(res){
+      if(this.tableloading){
+        this.tableloading = false;
+      }
+      if(this.isKuang){
+        this.isKuang = false;
+      }
+      if(this.selectLoading){
+        this.selectLoading = false;
+      }
+    },
     onclick(){
-      if(getCookie("orgCode") == "chengyunshang"){
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&con=" +this.textInput + "&i=" + new Date();
-    }else if(getCookie("orgCode") == "baohua"){
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") + this.textInput + "&i=" + new Date();
-     }else{
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ null +"&con=" +this.textInput + "&i=" + new Date();
-    }
+      this.isKuang = true;
+      this.tableloading = true;
+      this.selectLoading = true;
+      if(this.textInput){
+        if(getCookie("orgCode") == "chengyunshang"){
+          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&con=" +this.textInput + "&i=" + new Date();
+        }else if(getCookie("orgCode") == "baohua"){
+          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") + this.textInput + "&i=" + new Date();
+        }else{
+          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ null +"&con=" +this.textInput + "&i=" + new Date();
+        }
+      }else{
+        if(getCookie("orgCode") == "chengyunshang"){
+          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") + "&i=" + new Date();
+        }else if(getCookie("orgCode") == "baohua"){
+          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
+        }else{
+          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ null + "&i=" + new Date();
+        }
+      }
     },
      toInsert() {
       this.$router.push("/addCapacity");
     },
+    toInsert1() {
+      this.$router.push("/addOtherCapacity");
+    },
     updateCapacity(capacityId){
       this.$router.push("/editCapacity/" + capacityId)
     },
     deleteUser(userId){
-        this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
-           this.$message.success("删除成功！");
-           });
+      this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
+      });
     },
-    deleteCapacity(capacityId) {
-        if(getCookie("orgCode") == "wuliuchuyunzhongxin" || getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.$confirm('是否删除?', '提示', {
+    deleteCapacity(row) {
+      console.log("row",row)
+      let map = {
+        carrierSSOId : getCookie("userId"),
+        capacityId : row.capacityId
+      }
+        if(getCookie("orgCode") == "wuliuchuyunzhongxin" || getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "chengyunshang"){
+          this.$confirm('是否删除与车牌号('+row.capacityNumber+')的绑定关系?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-            this.axios
-            .post("/api/v1/rms/deleteCapacity/" + capacityId)
-            .then((res) => {
-              if (res.data.code == 200) {
-                console.log(res.data.data)
-                this.deleteUser(res.data.data)
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });     
-                this.$router.go(0);
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning",
-                });
-              }
-            });
+          this.axios
+          .post("/api/v1/rms/deleteCapacityCarrier",map)
+          .then((res) => {
+            if(res.data.code=='0'){
+              this.$message.success("删除成功!")
+              if(getCookie("orgCode") == "chengyunshang"){
+                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&i="+new Date();
+              }else if(getCookie("orgCode") == "baohua"){
+                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+              }else{
+                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + null +"&i="+new Date();
+              } 
+            }
+          });
         }).catch(() => {
           this.$message({
             type: 'info',
@@ -119,7 +160,7 @@ export default {
           });          
         });
         }else{
-          this.$message.error("!权限不足，请联系管理员")
+          this.$message.error("权限不足，请联系管理员!")
         }  
       },
     },

src/views/RMS/components/carrier.vue

@@ -18,6 +18,10 @@
             <el-button type="text" size="small" @click="updateCarrier(scope)">
               修改
             </el-button>
+            <el-button type="text" size="small" @click="showCarrier(scope)">
+              查看详情
+            </el-button>
+
             <!-- <el-button type="text" size="mini" @click="deleteCarrier(scope)">
               删除
             </el-button> -->
@@ -51,6 +55,10 @@ export default {
       console.log(scope.row.settlementId);
       this.$router.push("/editCarrier/" + scope.row.carrierId);
     },
+    showCarrier(scope) {
+      console.log(scope.row.settlementId);
+      this.$router.push("/showCarrier/" + scope.row.carrierId);
+    },
     deleteCarrier(scope) {
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",

src/views/RMS/components/editCapacity.vue

@@ -160,7 +160,7 @@ export default {
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
-          carrierId:this.carrierIds,
+         carrierId:this.carrierIds,
        };if(
          RmsCapacity.capacityNumber==null ||
          RmsCapacity.capacityCorlor==null ||

src/views/RMS/components/editConsignee.vue

@@ -21,7 +21,6 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
 export default {
   components: { PageTitle },
   data() {
@@ -68,19 +67,12 @@ console.log(this.$route.params)
          consigneeAbbreviation:this.form1.consigneeAbbreviation,
          consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
          consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
-         consigneeRegistrationTime:this.form1. consigneeRegistrationTime,
+         consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
          consigneeContactName:this.form1.consigneeContactName,
          consigneeContactTel:this.form1.consigneeContactTel,
        };
        if(
-        RmsConsignee.consigneeId == null ||
-        RmsConsignee.companyName == null ||
-        RmsConsignee.consigneeAbbreviation==null ||
-        RmsConsignee. consigneeRegisteredAddress ==null ||
-        RmsConsignee.consigneeReceiveAddress == null ||
-        RmsConsignee.consigneeRegistrationTime == null ||
-        RmsConsignee.consigneeContactName == null ||
-        RmsConsignee.consigneeContactTel == null
+        RmsConsignee.companyName == null 
        )this.$message.error("存在空值！");
         console.log( this.$route.params.consigneeId);
         this.axios

src/views/RMS/components/editSupplier.vue

@@ -12,6 +12,29 @@
       </div>
     </div>
 
+  <div class="f-box">
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="父级单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入父级单位名称(非必填)"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+     </el-form>  
+     </div>
+
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
@@ -21,12 +44,18 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
 export default {
   components: { PageTitle },
   data() {
     return {
       form1: {},
+       //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      restaurantsSupplier:null,
+      stateSupplier:null,
+      farName: "",
     };
   },
  
@@ -35,8 +64,32 @@ export default {
     this.information();
   },
   methods: {
+     //发货单位弹出层
+    handleSelectSupplier(item){
+      console.log("enter")
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是发货单位边输边查搜索
+
     information() {
-      console.log("supplierId",this.$router.params);
+      console.log("supplierIds",this.$router.params);
       //编辑
       this.axios
         .post(
@@ -44,13 +97,10 @@ export default {
             this.$route.params.supplierId
         )
         .then((res) => {
-            console.log(res)
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.supplierId);
-          });
+            this.form1 = res.data.data[0];
+            this.stateSupplier = res.data.data[0].farName;
+            this.supplierId = res.data.data[0].shipperId;
+          
         });
     },
     // 返回
@@ -61,19 +111,17 @@ export default {
     onClickConfirm() {
       console.log(this.form1)
        let RmsSupplier={
-        supplierId: this.form1.supplierId,
+        supplierOfId: this.form1.supplierId,
         supplierName: this.form1.supplierName,
         supplierAddress: this.form1.supplierAddress,
-        supplierRegisterDate: sjTime(this.form1.supplierRegisterDate),
+        supplierRegisterDate: this.form1.supplierRegisterDate,
         supplierContactsName: this.form1.supplierContactsName,
-        supplierContactNumber: this.form1.supplierContactNumber
+        supplierContactNumber: this.form1.supplierContactNumber,
+        supplierIds: this.supplierId
       };
+      console.log("RmsSupplier",RmsSupplier)
        if(
-        RmsSupplier.supplierName==null ||
-        RmsSupplier.supplierAddress==null ||
-        RmsSupplier.supplierRegisterDate==null ||
-        RmsSupplier.supplierContactsName==null ||
-        RmsSupplier.supplierContactNumber==null 
+        RmsSupplier.supplierName==null 
       )this.$message.error("存在空值！");
         this.axios
           .post(
@@ -99,4 +147,7 @@ export default {
       margin-right: 10px;
     }
   }
+  .f-box{
+    margin-left: 36%;
+  }
 </style>

src/views/RMS/components/oilPrice.vue

@@ -7,7 +7,7 @@
         v-model="textInput"
         clearable>
       </el-input>
-      <el-button type="primary" class="btn"  @click="onclick">
+      <el-button type="primary" class="btn1"  @click="onclick" :loading="selectLoading">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="toInsert">
@@ -15,15 +15,29 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable 
+        v-bind.sync="options"
+        :isKuang="isKuang"
+        @func="func"
+        :loading="tableLoading"
+      >
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
-              @click="updateOilPrice(scope)"
+              @click="onEnable(scope)"
+              v-if="scope.row.priceStatus !== '启用'"
             >
-              修改
+              启用
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="onDeactivate(scope)"
+              v-else
+            >
+              停用
             </el-button>
             <el-button
               type="text"
@@ -43,6 +57,11 @@ export default {
   name:"homeworkPath",
   data(){
     return{
+      tableLoading:false,
+      selectLoading:false,
+      isKuang:false,
+      //切换是否启用按钮和停用按钮
+      enableStatus:true,
       textInput: "" ,
       restaurants: [],
       options:{
@@ -52,64 +71,84 @@ export default {
     }
   },
   methods:{
+    func(res){
+      if(this.selectLoading){
+        this.selectLoading = false;
+      }
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
     onclick(){
-      this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&con=" +this.textInput;
+      this.isKuang = true;
+      this.selectLoading = true;
+      this.tableLoading = true;
+      if(this.textInput){
+        this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&con=" +this.textInput+"&i="+ new Date();
+      }else{
+        this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();
+      }
     },
-
+    //跳转到新增页面
     toInsert() {
       this.$router.push("/addOilPrice");
-
-    },
-    /*这里要改一改*/
-    updateOilPrice(scope){
-      console.log(scope.row.priceId)
-      this.$router.push("/editOilPrice/"+scope.row.priceId)
     },
     deleteOilPrice(scope){
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.axios
-            .post("/api/v1/rms/deleteOilPrice/" + scope.row.priceId)
-            .then((res) => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });
-                this.$router.go(0);
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning",
-                });
-              }
-            });
+     this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.tableLoading = true;
+        this.axios.post('/api/v1/rms/deleteOilPrice/'+scope.row.priceId).then((res)=>{
+          if(res.data.code == "200"){
+            this.$message.success('删除成功')
+            this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();
+          }else{
+            this.$message.error('删除失败，该油价正在启用!')
+            this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();
+          }
         })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "删除操作已取消!",
-          });
-        });
+      }).catch(() => {
+        this.$message.info('已取消删除');       
+      });
     },
+    onEnable(scope){
+      this.$confirm('将要启用该油价, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.axios.post("/api/v1/rms/updateOilPrice/"+scope.row.priceId).then((res) => {
+          if (res.data.code == "200") {
+            this.$message({ type: "success", message: "启用成功!",});
+            this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();
+          }else{
+            this.$message({ type: "error", message: "启用失败，请联系管理员!",});
+          }
+          
+        }); 
+      }).catch(() => {
+        this.$message.info('已取消启用该油价!');       
+      });
+        
+    }
   },
-
 }
-
 </script>
 
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    padding: 1.25rem 0.375rem;
+    width: 100%;height: 100px;
+    display: flex;
+    align-items: center;
     .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
+      width: 250px;
+      margin-left: 50px;
+      margin-right: 30px;
+    }
+    .btn1{
+      margin-right: 30px;
     }
   }
   }

src/views/RMS/components/rmsShipper.vue

@@ -46,13 +46,13 @@ export default {
       inputText:"",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getShipperList?apiId=344",
+        requestUrl: "/api/v1/rms/getShipperList?apiId=451",
       },
     }
   },
   methods:{
     onclick(){
-      this.options.requestUrl="/api/v1/rms/getShipperList?apiId=344&con=" + this.inputText;
+      this.options.requestUrl="/api/v1/rms/getShipperList?apiId=451&con=" + this.inputText;
       console.log(this.textInput)
     },
     toInsert() {

src/views/RMS/components/showCarrier.vue

@@ -0,0 +1,231 @@
+<template>
+  <!-- 修改承运商信息 -->
+  <div id="contractDetails">
+    <page-title>查看详情</page-title>
+    <div class="main">
+    </div>
+    <div class="contractimage">
+      <el-image 
+            style=" height:150px;text-align:center"
+            :src="src" 
+            :preview-src-list="srcList">
+          </el-image>
+          <el-image 
+            style=" height:150px;text-align:center"
+            :src="src1" 
+            :preview-src-list="srcList1">
+          </el-image>
+          <el-image 
+            style=" height:150px;text-align:center"
+            :src="src2" 
+            :preview-src-list="srcList2">
+          </el-image>
+    </div>
+    <div class="contractTitle">
+      <div class="form_box">
+          <dil-form :disabled=true :formId="330" v-model="form1">
+          </dil-form>
+         
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      direction2:"",
+      formInline:{},
+      isShow:false,
+      src:"",
+      srcList:[],
+      src1:"",
+      srcList1:[],
+      src2:"",
+      srcList2:[],
+      inputText:"",
+      form1: {},
+      registerDate:"",
+      mapValue:"",
+      drawer: false,
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
+        selectionType: "radio",
+         mapList:[],
+         registerDate:"",
+         mapValue:""
+      },
+    };
+  },
+ 
+  mounted() {
+      console.log(this.$route)
+    this.information();
+  },
+
+  methods: {
+
+    
+    handleClose(){
+
+    },
+
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" +this.inputText;
+    },
+    currentRadioChange(selection){
+      this.mapList=selection, 
+      console.log(this.mapList) 
+      this.bidArea=this.mapList.bidArea
+     
+    },
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getCarrierById/" +
+            this.$route.params.carrierId
+        )
+        .then((res) => {
+            
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            this.srcList=[];
+            this.srcList1=[];
+            this.srcList2=[];
+            this.isShow=true;
+            this.src=e.carrierBusinessAblelicense;
+            this.srcList.push(e.carrierBusinessAblelicense);
+            this.src1=e.carrierBusinessLicense;
+            this.srcList1.push(e.carrierBusinessLicense);
+            this.src2=e.carrierTransportCertificate;
+            this.srcList2.push(e.carrierTransportCertificate);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {  
+       let RmsCarrier={
+        carrierId:this.$route.params.carrierId,
+        carrierName:this.form1.carrierName,
+        carrierTransportCertificate:this.form1.carrierTransportCertificate,
+        carrierBusinessLicense:this.form1.carrierBusinessLicense,
+        carrierBusinessAblelicense:this.form1.carrierBusinessAblelicense,
+        carrierAbbreviation:this.form1.carrierAbbreviation,
+        carrierAddress:this.form1.carrierAddress,
+        registerNo:this.form1.registerNo,
+        carrierBidAreaId:this.mapList.bidAreaId,
+        carrierLegalRepresentative:this.form1.carrierLegalRepresentative,
+        registerCapital:this.form1.registerCapital,
+        businessScope:this.form1.businessScope,
+        annualDate:this.form1.annualDate,
+        companyStatusDesc:this.form1.companyStatusDesc,
+        companyTypeDesc:this.form1.companyTypeDesc,
+        operationPeriod:this.form1.operationPeriod,
+        registerOrganization:this.form1.registerOrganization,
+        registerAptitudes:this.form1.registerAptitudes,
+        contactsName:this.form1.contactsName,
+        carrierContactNumber:this.form1.carrierContactNumber,
+        carrierType:this.form1.carrierType,
+        carrierTransportType:this.form1.carrierTransportType
+      };
+       let registerDate={
+        registerDate: this.form1.registerDate,
+      };
+      let mapValue={
+        RmsCarrier:RmsCarrier,
+        registerDate:registerDate
+      };
+       if(
+        RmsCarrier.carrierName ==null ||
+       // RmsCarrier.carrierTransportCertificate ==null ||
+       // RmsCarrier.carrierBusinessLicense ==null ||
+       // RmsCarrier.carrierBusinessAblelicense ==null ||
+        RmsCarrier.carrierAbbreviation ==null ||
+        RmsCarrier.carrierAddress ==null ||
+        RmsCarrier.registerNo ==null ||
+        RmsCarrier.carrierBidAreaId ==null || 
+        RmsCarrier.carrierLegalRepresentative ==null ||
+        RmsCarrier.registerCapital ==null ||
+        RmsCarrier.businessScope ==null ||
+        RmsCarrier.annualDate ==null ||
+        RmsCarrier.companyStatusDesc ==null ||
+        RmsCarrier.companyTypeDesc ==null ||
+        RmsCarrier.operationPeriod ==null ||
+        registerDate.registerDate ==null ||
+        RmsCarrier.registerOrganization ==null ||
+        RmsCarrier.registerAptitudes ==null ||
+        RmsCarrier.contactsName ==null ||
+        RmsCarrier.carrierContactNumber ==null ||
+        RmsCarrier.carrierType ==null ||
+        RmsCarrier.carrierTransportType ==null 
+      )this.$message.error("存在空值！");
+        this.axios
+          .post(
+            "/api/v1/rms/updateCarrier",
+            mapValue
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang='scss'>
+
+  .contractimage{
+    text-align: center;
+    position: relative;
+    left: 85px;
+  }
+  .form_box {
+    display: flex;
+    justify-content: center;
+    margin-left: 170px;
+    margin-top: 15px;
+    .el-form-item {
+      display: flex;
+      justify-content: center;
+      .el-form-item__label {
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content {
+        width: 250px;
+        .el-radio-group {
+          width: 500px;
+        }
+        .el-date-editor {
+          width: 250px;
+        }
+        .el-input__inner {
+          width: 250px;
+        }
+      }
+    }
+  }
+.center{
+   display: flex;
+    justify-content: center;
+}
+.button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+</style>

src/views/RMS/components/supplier.vue

@@ -71,6 +71,7 @@ export default {
         center: true,
       })
         .then(() => {
+          console.log("scope.row.supplierId",scope.row.supplierId)
           this.axios
             .post("/api/v1/rms/deleteSupplier/" + scope.row.supplierId)
             .then((res) => {

src/views/RMS/components/transitRoute.vue

@@ -13,14 +13,20 @@
       </el-button>
     </div>
     <div class="tab">
-      <dilTable v-bind.sync="option">
+      <dilTable v-bind.sync="option" ref="table">
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               type="text"
               size="mini"
               @click="transitRouteUpdata(scope.row.lineId)"
               >修改</el-button
+            > -->
+            <el-button
+              size="mini"
+              type="text"
+              @click="transitRouteDetail(scope.row)"
+              >路线详情</el-button
             >
             <el-button
               size="mini"
@@ -30,6 +36,26 @@
             >
           </template>
         </el-table-column>
+
+        <!-- 线路详情抽屉 -->
+        <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
       </dilTable>
     </div>
   </div>
@@ -46,6 +72,33 @@ export default {
         requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249",
       },
       countNumber: 0,
+      //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount: 1,
+      tableHead: [
+        {
+          prop: "enfactoryGatepostName",
+          label: "进门门岗",
+          width: 150,
+        },
+        {
+          prop: "outfactoryGatepostName",
+          label: "出门门岗",
+          width: 150,
+        },
+        {
+          prop: "grossNumber",
+          label: "计毛汽车衡",
+          width: 150,
+        },
+        {
+          prop: "tareNumber",
+          label: "计皮汽车衡",
+          width: 150,
+        },
+      ],
+      tableData: [],
     };
   },
   methods: {
@@ -57,7 +110,7 @@ export default {
             if (res.data.data > 0) {
               this.$message({
                 showClose: true,
-                message: "此路线已经和运输订单关联，不能进行修改！",
+                message: "此路线已经和运输订单关联,不能进行修改!",
                 type: "warning",
               });
             } else {
@@ -106,6 +159,43 @@ export default {
         path: "/transitRouteAdd/0",
       });
     },
+    // -------查看线路详情
+    transitRouteDetail(row) {
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.getMaterial(row.lineId);
+    },
+    // 根据线路id查询物资信息
+    getMaterial(lineId) {
+      this.axios
+        .post("/api/v1/rms/getGateCalculateMes?lineId="+lineId)
+        .then((res) => {
+          var lineInfo = [];
+          if(res.data.data!=null){
+            lineInfo.push(res.data.data);
+          }
+          this.tableData = lineInfo;
+        });
+    },
     //跳转修改界面
     transitRouteUpdata(lineId) {
       this.initialization(lineId, 1);

src/views/RMS/router/index.js

@@ -24,6 +24,7 @@ import addTruckCalculate from '../components/addTruckCalculate.vue'
 import capacity from '../components/capacity.vue'
 import carDriver from '../components/carDriver.vue'
 import carrier from '../components/carrier.vue'
+import addOtherCapacity from '../components/addOtherCapacity'
 
 import editCapacity from '../components/editCapacity.vue'
 import editCarDriver from '../components/editCarDriver.vue'
@@ -52,6 +53,7 @@ import rawWarehouse from '../components/rawWarehouse.vue'
 import rmsShipper from '../components/rmsShipper.vue'
 import supplier from '../components/supplier.vue'
 import transitRoute from '../components/transitRoute.vue'
+import showCarrier from '../components/showCarrier.vue'
 import transitRouteAdd from '../components/transitRouteAdd.vue'
 import truckCalculate from '../components/truckCalculate.vue'
 import consignee from '../components/consignee.vue'
@@ -80,12 +82,14 @@ const constantRouterMap = [
 		{path: 'addRmsShipper', name: 'addRmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: addRmsShipper},
 		{path: 'addSupplier', name: 'addSupplier', meta: {code: 'xtpzgl-yhgl'}, component: addSupplier},
 		{path: 'addTruckCalculate', name: 'addTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: addTruckCalculate},
+		{path: 'addOtherCapacity', name: 'addOtherCapacity', meta: {code: 'xtpzgl-yhgl'}, component: addOtherCapacity},
 		{path: 'capacity', name: 'capacity', meta: {code: 'xtpzgl-yhgl'}, component: capacity},
 		{path: 'carDriver', name: 'carDriver', meta: {code: 'xtpzgl-yhgl'}, component: carDriver},
 		{path: 'carrier', name: 'carrier', meta: {code: 'xtpzgl-yhgl'}, component: carrier},
 		{path: 'editCapacity/:capacityId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
 		{path: 'editCarDriver/:driverId', name: 'editCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: editCarDriver},
 		{path: 'editCarrier/:carrierId', name: 'editCarrier', meta: {code: 'xtpzgl-yhgl'}, component: editCarrier},
+		{path: 'showCarrier/:carrierId', name: 'showCarrier', meta: {code: 'xtpzgl-yhgl'}, component: showCarrier},
 		{path: 'editConsignee/:consigneeId',name: 'editConsignee',meta:{code: 'xtpzgl-yhgl'},component: editConsignee},
 		{path: 'editGatepost/:gatepostId', name: 'editGatepost', meta: {code: 'xtpzgl-yhgl'}, component: editGatepost},
 		{path: 'editMaterial/:materialId', name: 'editMaterial', meta: {code: 'xtpzgl-yhgl'}, component: editMaterial},

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue

@@ -3,7 +3,12 @@
   <!-- 零星物资进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: null,
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,12 +43,23 @@ export default {
   },
   methods: {
     onclick() {
-      if(this.input != null){
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
           if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&con=" + this.input
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           }else{
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
-               }
+            this.startTime = null;
+            this.endTime = null;
+            this.$message.warning("开始时间要比结束时间早");
+          }
       }else{
           this.$message.warning("未输入查询条件")
           if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
@@ -48,10 +67,11 @@ export default {
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode")
           }
-      }  
-    },
-  },
-};
+      }
+      }
+    }
+  }
+}
 </script>
 <style lang='scss' scoped>
 .homeworkPath {

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue

@@ -3,10 +3,15 @@
   <!-- 零星物资出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">      
     </dilTable>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: null,
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,19 +43,25 @@ export default {
   },
   methods: {
     onclick() {
-      if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&con=" + this.input
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
           }else{
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
-               }
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
       }else{
-          this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15"
-          }else{
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&userId=" + getCookie("orgCode")
-          }
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+      
       }  
     },
   },

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue

@@ -3,7 +3,12 @@
   <!-- 零星物资出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: null,
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,12 +43,23 @@ export default {
   },
   methods: {
     onclick() {
-      if(this.input != null){
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
           if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&con=" + this.input
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           }else{
-          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
-               }
+          this.startTime = null;
+            this.endTime = null;
+            this.$message.warning("开始时间要比结束时间早");
+          }
       }else{
           this.$message.warning("未输入查询条件")
           if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
@@ -48,7 +67,8 @@ export default {
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode")
           }
-      }  
+        }  
+      }
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue

@@ -3,10 +3,15 @@
   <!-- 零星物资出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+       <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">      
     </dilTable>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: null,
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,19 +43,25 @@ export default {
   },
   methods: {
     onclick() {
-      if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&con=" + this.input
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
           }else{
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
-               }
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
       }else{
-          this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16"
-          }else{
-          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&userId=" + getCookie("orgCode")
-          }
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
       }  
     },
   },

src/views/SporadicManage/components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue

@@ -228,7 +228,7 @@
       <el-button type="primary" @click="makeSure1">确定</el-button>
       <div class="tablecls">
         <!-- 查询所有的物资 -->
-        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange">
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange" :drawer="aaadrawer">
         </dilTable>
       </div>
     </el-drawer>
@@ -270,6 +270,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      aaadrawer:false,
       disabled:false,
       materialTimes:null,
       options: [],
@@ -288,7 +289,10 @@ export default {
         },{
           value:16,
           label:'出厂'
-        }
+        },{
+          value:19,
+          label:'退货'
+        },
       ],
       orderType:15,
       // 线路名称
@@ -312,7 +316,7 @@ export default {
           width: "140",
         },
         {
-          prop: "Specification",
+          prop: "materialSpecification",
           label: "规格型号",
           width: "140",
         },
@@ -382,14 +386,22 @@ export default {
         });
       }
     },
+    table(val){
+      if(val){
+        this.aaadrawer = false;
+      }else{
+        this.aaadrawer = true;
+      }
+    }
   },
   methods: {
     onclickMaterial(){
         if(this.inputMaterial != null){
           this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"+ "&index=" + this.inputMaterial
+          this.inputMaterial = null
         }
         else{
-          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" + "&i=" + new Date() 
         }
     },
     onInputTimes(){
@@ -490,11 +502,16 @@ export default {
     },
     // 返回主界面
     makeSure1() {
+      if(this.tableData.length != 0){
+        this.$message.error("物资已选择，请删除后重试")
+        return
+      }
+      if(JSON.stringify(this.selectionList1).length != 2){
         this.selectionList1.materialPriority = 1
         this.tableData.push(this.selectionList1);    
         this.selectionList1 = [];
         this.table = false;
-        console.log(this.selectionList1)
+      }
     },
     //取消模态框多选
     open() {
@@ -545,7 +562,7 @@ export default {
     // 确认
     makeSure() {
         this.disabled = true
-        if(this.supplierId==null||this.lineId==null||this.consigneeId==null){
+        if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null||this.materialTimes==null){
           this.disabled = false
           this.$message.warning("存在值未填写")
           return

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue

@@ -257,6 +257,12 @@ export default {
 
 <style lang='scss'>
 .addSaleOrderSend {
+  .el-drawer__body {
+    overflow: auto;
+}
+  .el-drawer__container ::-webkit-scrollbar{
+    display: none;
+}
   .from {
     margin-top: 20px;
     .line {

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/transportOrder.vue

@@ -56,6 +56,11 @@
           </el-table-column>      
           </dilTable>
         </el-tab-pane>
+         <!-- 已完成 -->
+        <el-tab-pane label="已完成" name="completed">
+          <dilTable v-bind.sync="completed">
+          </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div> 
   </div>
@@ -79,6 +84,9 @@ export default {
       first: {
         requestUrl:"",
       },
+      completed:{
+        requestUrl:"",
+      },
       //车辆信息的表格
       truck: {
         requestUrl: "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
@@ -136,13 +144,16 @@ export default {
       }
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + getCookie("userId") ,
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId")
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId"),
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" + getCookie("userId")
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5"
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2"
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" + getCookie("orgCode")
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" + getCookie("orgCode")
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" + getCookie("orgCode")
       }    
   },
   
@@ -159,12 +170,16 @@ export default {
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date(),
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
+      
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&test=" + new Date()
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.completed.requestUrl =  "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()     
       }
     },
     //删除运输订单

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue

@@ -0,0 +1,120 @@
+//出厂
+<template>
+  <!-- 零星物资出厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+       <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      startTime: null,
+      endTime: null,
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+        let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
+      }  
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/Load.vue

@@ -0,0 +1,93 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=100&status=0"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=100&status=0&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&status=0" + "&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&status=0&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+          this.$message.info("功能暂时关闭")
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue

@@ -0,0 +1,126 @@
+//进厂
+<template>
+  <!-- 零星物资进厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      startTime: null,
+      endTime: null,
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=100&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue

@@ -0,0 +1,93 @@
+//计毛
+<template>
+  <!-- 零星物资计毛作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=" + this.flow
+      }else{
+      }
+    },
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue

@@ -0,0 +1,94 @@
+//计皮
+<template>
+  <!-- 零星物资计皮作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/unload.vue

@@ -0,0 +1,93 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <span class="text">流向：</span>
+      <el-select
+        class="select"
+        v-model="flow"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in flowList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+      flow:null,
+      flowList:[{
+          value: 12,
+          label: "进厂",
+        },
+        {
+          value: 13,
+          label: "出厂",
+        },
+        {
+          value: 14,
+          label: "中转",
+        },
+        {
+          value: 19,
+          label: "退货",
+        },
+        ]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onchange(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baowei"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=" + this.flow
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=100&userId=" + getCookie("orgCode") + "&orderType=" + this.flow
+      }
+    },
+    onclick() {
+          this.$message.info("功能暂时关闭")
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue

@@ -0,0 +1,726 @@
+//新增运输需求
+<template>
+  <!-- 新增运输作业页面 -->
+  <div class="addSporadic">
+    <page-title>运输预约</page-title>
+    <div class="form-box">
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="发货单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入发货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="收货单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateConsignee"
+          :fetch-suggestions="querySearchConsignee"
+          placeholder="请输入收货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectConsignee"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.consigneeCompanyName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="流向">
+        <el-select v-model="orderType" placeholder="请选择" @change="flowChange">
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label" 
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择路线">
+          <el-input v-model="lineName" placeholder="必填" disabled>
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+        </el-form-item>
+        </el-form>
+         <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择承运商">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateCarrier"
+          :fetch-suggestions="querySearchCarrier"
+          placeholder="请输入承运商名称"
+          :trigger-on-focus="false"
+          @select="handleSelectCarrier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.carrierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="趟次">
+         <el-input
+          class="inline-input"
+          v-model="materialTimes"
+          placeholder="趟次-非必填"
+          :trigger-on-focus="false"
+          @input="onInputTimes()"
+          @blur="onblur()"
+        >
+        </el-input>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择物资">      
+        </el-form-item>
+        <el-form-item > 
+          <el-button type="primary" @click="drawTable" class="truckBtn"
+          >浏览</el-button>
+        </el-form-item>
+        </el-form>
+    </div>
+    <div class="lineId from">
+      <span class="text">该批车辆是否一车多趟：</span>
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
+      </el-switch>
+    </div>
+    <div class="swtichTop">
+    <span class="titile">点击浏览选择物资之前请选择物资单位！</span>
+    <div class="switch" v-if="tableData.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据，不能进行更改！！！</div>
+        <el-switch
+          v-model="value"
+          active-text="件数"
+          inactive-text="重量"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
+        <el-switch v-model="value" active-text="件数" inactive-text="重量">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    </div>
+    <!-- 物资表格 -->
+    <div class="truckListTable">
+    <div class="selectionTable">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.label !== '件数'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+                <!-- 装卸货优先级 -->
+               <template v-if="item.prop == 'materialPriority'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.materialPriority"
+                  @input="onInputPriority(scope.row.materialPriority)"
+                ></el-input>
+              </template>
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
+                ></el-input>
+              </template>
+              <!-- 物资重量 -->
+               <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  v-model.number="scope.row.orderMaterialWeight"
+                  @input="onInputWeight(scope.row.orderMaterialWeight)"
+                ></el-input>
+              </template>           
+            </template>
+            <template v-else>
+              <span>{{ scope.row[item.prop] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click.native.prevent="deleteRow(scope.$index, tableData)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    </div>
+    <!-- 物资模态框 -->
+    <div class="drawSty">
+      <el-drawer
+      title="选择物资信息"
+      :visible.sync="table"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+    >
+      <el-input placeholder="请输入内容" v-model="inputMaterial" clearable > </el-input
+      ><el-button type="primary" class="btn" @click="onclickMaterial">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <!-- <el-button @click="open">取消</el-button> -->
+      <el-button type="primary" @click="makeSure1">确定</el-button>
+      <div class="tablecls">
+        <!-- 查询所有的物资 -->
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @selection-change="selectionChange" :drawer="aaadrawer">
+        </dilTable>
+      </div>
+    </el-drawer>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%" :before-close="handleClose">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 20px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    </div>  
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="makeSure" :disabled = "disabled">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      inputLine:null,
+      aaadrawer:false,
+      disabled:false,
+      materialTimes:null,
+      options: [],
+      value: '',
+      receiveName:'',
+      stateCarrier:null,
+      stateSupplier:null,
+      stateConsignee:null,
+      restaurantsConsignee:null,
+      restaurantsSupplier:null,
+      orderTypeList:[
+        {
+          value:12,
+          label:'进厂'
+        },{
+          value:13,
+          label:'出厂'
+        },
+        {
+          value:14,
+          label:'中转'
+        },
+        {
+          value:19,
+          label:'退货'
+        }
+      ],
+      orderType:null,
+      restaurantsCarrier:null,
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //物资模态框开关
+      table: false,
+      //一车多趟开关
+      isMoreTrips: false,
+      //物资表格表头
+      tableTop: [
+        {
+          prop: "materialCode",
+          label: "物资编码",
+          width: "160",
+        },
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: "140",
+        },
+        {
+          prop: "materialSpecification",
+          label: "规格型号",
+          width: "140",
+        },
+        {
+          prop: "materialPriority",
+          label: "装卸货优先级",
+          slot: true,
+        },
+        {
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        },
+      ],
+      // 收货单位ID
+      receiveId:null,
+      //承运商ID
+      carrierId:null,
+      //物资表格数据
+      tableData: [],
+      selectionList1: [],
+      newsArr:[],
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //承运商id
+      carrierId:null,
+      //是否需要打开模态窗口
+      drawer: false,
+      a: 1,
+      direction: "rtl",
+      inputMaterial:null,
+      input:null,
+      //物资模态框
+      materialOptions:{
+          requestUrl:"",
+          selectionType: "select",
+      },
+      line: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      row: {},
+    };
+  },
+  watch: {
+    value() {
+      if (this.value) {
+        console.log(this.value)
+        console.log(this.tableTop.length)
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      }
+    },
+  },
+  methods: {
+    //关闭运输线路
+    handleClose(done){
+        done()
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3"
+    },
+    onclickMaterial(){
+        if(this.inputMaterial != null){
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&index=" + this.inputMaterial
+        }
+        else{
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"
+        }
+    },
+    onInputTimes(){
+      if(!isNumber(this.materialTimes)){
+        this.$message.warning('趟次请输入数字')
+      }
+    },
+    onblur(){
+      this.isMoreTrips = false
+      if(this.materaialTimes <= 0){
+        this.$message.warning('趟次必须大于0')
+        this.materialTimes = null
+      }
+      if(this.materialTimes > 1 ){
+        this.isMoreTrips = true
+      }
+    },
+    onInputPriority(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('装卸货次序请输入数字')
+      }
+    },
+    onInputWeight(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('重量请输入数字')
+      }
+    },
+    onInputNumber(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('件数请输入数字')
+      }
+    },
+    //流向选择框变动后
+    flowChange(){
+      if(this.orderType == 12){
+        this.inputLine = "零星进厂"
+      }
+      if(this.orderType == 13){
+        this.inputLine = "零星出厂"
+      }
+      if(this.orderType == 14){
+        this.inputLine = "零星中转"
+      }
+      if(this.orderType == 19){
+        this.inputLine = "退货"
+      }
+    },
+    drawTable(){
+      this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" +"&test=" + new Date()
+      this.selectionList1 = []
+      this.table = true
+    },
+    //收货单位弹出层
+    handleSelectConsignee(item){   
+      this.consigneeId = item.consigneeId
+      item.consigneeCompanyName = this.consigneeCompanyName
+  
+    },
+    //以下是发货单位边输边查搜索
+    querySearchConsignee(queryString, cb) {
+      this.axios.post('/api/v1/uc/getConsigneeByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res)
+          var restaurantsConsignee = res.data.data
+          var results = queryString ? restaurantsConsignee.filter(this.createFilterConsignee(queryString)) :restaurantsConsignee;
+            // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })    
+      },
+    createFilterConsignee(queryString) {
+        return (restaurantsConsignee) => {
+          return (restaurantsConsignee.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+      //以上是返回单位边输边查搜索
+     //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //承运商弹出层
+    handleSelectCarrier(item){    
+      this.carrierId = item.carrierId
+      item.carrierName = this.stateCarrier
+    },
+    //以下是承运商边输边查搜索
+    querySearchCarrier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
+        if(res.data.code == "200"){
+          var restaurantsCarrier = res.data.data
+          console.log(restaurantsCarrier,"restaurantsCarrier");
+          var results = queryString ? restaurantsCarrier.filter(this.createFilterCarrier(queryString)) :restaurantsCarrier;
+           // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+        })     
+      },
+    createFilterCarrier(queryString) {
+        return (restaurantsCarrier)  =>  {
+          return (restaurantsCarrier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    //以上是承运商边输边查搜索
+    //删除行
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    // 返回主界面
+    makeSure1() {
+        var arr = []
+        for (let i = 0; i < this.newsArr.length; i++) {
+        if(arr.indexOf(this.newsArr[i]) === -1){
+            arr.push(this.newsArr[i]);
+        }
+        }
+        arr.forEach( (e) => {
+          let addmap = {
+            materialSpecification:e.materialSpecification,
+            materialName:e.materialName,
+            materialCode:e.materialCode,
+            materialId:e.materialId,
+            materialPriority:1
+          }
+          this.tableData.push(addmap)
+        })
+        this.newsArr = []
+        this.table = false
+    },
+      // 返回选中的物资信息
+    selectionChange(selection) {
+      console.log(selection)
+      this.selectionList1 = []
+      this.selectionList1 = selection
+      this.newsArr = []
+      for (let i = 0; i < this.selectionList1.length; i++) {
+        if(this.newsArr.indexOf(this.selectionList1[i]) === -1){
+        this.newsArr.push(this.selectionList1[i]);
+        }
+        }
+    },
+    onclick(a) {
+      if (a == 5) {
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+      }
+    },
+    ondrawer(num) {
+      this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&t=" + new Date() + "&con=" + this.inputLine;
+      this.drawer = true;
+      this.a = num;
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/oldSporadicAppoint");
+    },
+    currentRadioChange5(selection) {
+      if(selection.lineName == null &&selection.lineDesk == null){
+          this.lineName = ''
+      }else{
+          this.lineName = selection.lineName+'  '+selection.lineDesk 
+          this.lineId = selection.lineId;
+      }    
+    },
+    // 确认
+    makeSure() {
+        if(this.isMoreTrips == false){
+          this.materialTimes = 1
+        }
+        if(Number(this.materialTimes) != 0){
+          this.isMoreTrips = true
+        }
+        this.disabled = true
+        if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null){
+          this.disabled = false
+          this.$message.warning("存在值未填写")
+          return
+        }else if(this.tableData.length == 0){
+          this.disabled = false
+          this.$message.warning("请点击浏览勾选物资")
+          return
+        }
+        var i = 0;
+        var j = 0;
+        this.tableData.forEach((e) => {
+          if(e.materialPriority == null){
+            i++
+          }else if(e.orderMaterialWeight == null){            
+            j++
+          }            
+        })
+        if(i != 0){
+           this.$message.warning("装卸货优先级未填写")
+           this.disabled = false
+           return
+        }else if(j != 0){
+           this.$message.warning("物资重量未填写")
+           this.disabled = false
+           return
+        }
+        let amsOrder = {
+          supplierId:this.supplierId,
+          lineId:this.lineId,
+          carrierId: this.carrierId,
+          orderType:this.orderType,
+          receiveId: this.consigneeId,
+          userId:getCookie("orgCode"),
+          orderTime:this.materialTimes,
+          mapList: this.tableData,
+          isMoreTrips:Number(this.isMoreTrips)
+          
+        };
+        console.log(amsOrder)
+        debugger
+        this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
+          if (res.data.code == "200") {
+            this.onClickCancel()
+            this.disabled = false
+          }else{
+            this.disabled = false
+          }
+        });
+      }
+    },
+};
+</script>
+<style lang="scss" scoped>
+.addSporadic{
+  .contractDetails {
+  width: 100%;
+}
+.drawSty{
+  .el-input{
+    width: 240px;
+  }
+}
+.lineId {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 190px;
+    text-align: right;
+    font-size: 16px;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .span {
+    display: inline-block;
+    width: 70px;
+    height: 1px;
+  }
+}
+.swtichTop{
+  display: flex;
+  height: 40px;
+  align-content: center;
+  justify-content: center;
+  padding-right:20px ;
+  .titile{
+    color: red;
+    font-size: 14px;
+  }
+  .switch{
+    margin-right: -60px
+  }
+}
+.form-box {
+  display: inline-block !important;
+  margin-left: 488px;
+  .el-input {
+    width: 320px;
+  }
+  .el-select{
+    width: 320px;
+  }
+  .el-autocomplete{
+    width: 320px;
+  }
+  .el-form {
+    padding: 10px;
+  }
+  .truckBtn{
+    width: 320px;
+  }
+}
+.button-box {
+  margin-left: 45% ;
+}
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/transportAppoint/editTransportAppoint.vue

@@ -0,0 +1 @@
+//编辑运输预约

src/views/SporadicManage/components/oldAreaSporadic/transportAppoint/transportAppoint.vue

@@ -0,0 +1,455 @@
+//运输预约展现
+<template>
+  <!-- 零星物资运输预约 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="insertClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        @click="sendClick()"
+        v-if="this.activeName == 'first'"
+      >
+        <i class="el-icon-bottom"></i>下发
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <!-- 未下发 -->
+      <el-tab-pane label="未下发" name="first">
+        <dilTable
+          v-bind.sync="option1"
+          ref="table"
+          @selection-change="selectionChange"
+        >
+          <el-table-column
+            fixed="right"
+            label="操作"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <el-button @click="deleteClick(scope)" type="text" size="small">
+                删除
+              </el-button>
+              <el-button @click="getMatrialDetails1(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2" ref="table1">
+          <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="getMatrialDetails2(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+              <el-button @click="stopSpoOrder(scope)" type="text" size="small">
+                停止
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+       <!-- 已接单 -->
+      <el-tab-pane label="已接单" name="third">
+        <dilTable v-bind.sync="option3" ref="table2">
+           <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="getMatrialDetails3(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: null,
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:
+          "",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "",
+      },
+      option3: {
+        // 表格请求数据的地址
+        requestUrl:
+          "",
+      },
+      selection: [],
+      maplist:[],
+       //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount: 1,
+      //记录旧的row对象
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount1: 1,
+      oldRow2: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount2: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+      tableData1:[],
+      tableData2:[]
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0",
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1",
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1"       
+      }else{
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&userId=" + getCookie("orgCode"),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&userId=" + getCookie("orgCode"),
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode")
+      } 
+  },
+  methods: {
+    getRequestUrl(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&test=" + new Date(),
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&test=" + new Date()
+      }else{
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode") + "&test=" + new Date()
+     }
+    },
+    stopSpoOrder(scope){
+      this.$confirm("是否停止", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/ams/closeSporadicOrder" ,{
+              sporadicOrderId : scope.row.sporadicOrderId
+            })
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "成功停止!",
+                });
+              this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "停止失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "停止操作已取消!",
+          });
+        });
+    },
+    //获取选中的订单
+    selectionChange(selection) {
+      this.maplist = selection;
+    },
+    onclick() {
+      if(this.input != null){
+        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu")
+        {
+          if(this.activeName == "first"){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&con=" + this.input
+          }else if(this.activeName == "second"){
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&con=" + this.input
+          }else{
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&con=" + this.input
+          }                
+        }else
+        {
+          if(this.activeName == "first"){
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&con=" + this.input
+          }else if(this.activeName == "second"){
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&con=" + this.input
+          }else{
+            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&userId=" + getCookie("orgCode") + "&con=" + this.input
+          }       
+        }
+        }else{
+        this.$message.warning("未输入查询条件")
+        }
+    },
+    handleClick(tab, event) {
+      this.getRequestUrl()
+    },
+    // 下发
+    sendClick() {
+      if(this.maplist.length == 0){
+        this.$message.warning('未选择零星订单')
+        return
+      }
+      this.axios
+        .post("/api/v1/ams/issueSporadicOrders", this.maplist)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.getRequestUrl()
+            // this.$router.go(0)
+            this.$message({
+              type: "success",
+              message: "下发成功!",
+            });
+            this.maplist = []
+          }
+        });
+    },
+    // 删除
+    deleteClick(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+          .post(
+          "/api/v1/ams/deleteSporadicOrders?sporadicOrderId=" +
+            scope.row.sporadicOrderId
+            )
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "成功删除!",
+                });
+              this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("addOldSporadicAppoint");
+    },
+    //获取物资详情--未下发
+    getMatrialDetails1(row){
+      console.log("wuzixq")
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData = res.data.data
+      })
+    },
+    //获取物资详情--已下发
+
+    getMatrialDetails2(row){
+      console.log("wuzixq")
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData1 = res.data.data
+      })
+    },
+    getMatrialDetails3(row){
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData1 = res.data.data
+      })
+    }
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .el-input {
+      width: 250px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/transportOrder/addTransportOrder.vue

@@ -0,0 +1,401 @@
+//新增运输派单
+//新增运输订单
+<template>
+  <div class="addSaleOrderSend">
+    <page-title>新增运输订单派车</page-title>
+    <!-- 零星订单表的数据 -->
+    <div class="saleOrder">
+      <dilTable
+        v-bind.sync="option"
+        @radio-change="currentRadioChange"
+        ref="table"
+      >
+        <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="getMatrialDetails1(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+    <!-- 表单选择车辆-->
+    <div class="from">
+      <div class="vehicle">
+        <span class="text">车辆</span>
+        <el-button type="primary" @click="onClick(2)">浏览</el-button>
+        <span class="span"></span>
+      </div>
+    </div>
+    <!-- 派车表格 -->
+    <div class="selectionTable from">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" label="序号" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          align="center"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click="deleteRow(scope.$index)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 车辆模态框 -->
+    <el-drawer 
+      :visible.sync="truckDrawer" 
+      :with-header="false"
+      :destroy-on-close="false"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      :wrapperClosable="false"
+      modal
+      close-on-press-escape
+    
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="truckText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="selectTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="AddTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的车辆 -->
+        <dilTable
+          v-bind.sync="truck"
+          @selection-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure" :disabled = "disabled" >确定</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      disabled:false,
+      //零星订单ID
+      sporadicOrderId:null,
+      //运输订单ID
+      orderId:null,
+      //线路名称
+      lineName:null,
+      //已经选择车辆物资信息
+      selectionList:[],
+      //销售订单物资信息
+      option: {
+        // 表格请求数据的地址
+        requestUrl:"",
+        // 控制显示当选列
+        selectionType: "radio",
+        isPagination: false,
+      },
+      //当前选中的物资id
+      materialId: null,
+      //当前选中的物资名称
+      materialName: null,   
+      //是否打开选择车辆的模态框
+      truckDrawer:false,
+      //车辆的表格
+      truck: {
+        requestUrl: "",
+        selectionType: "select",
+      },
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+        }
+      ],
+      truckText:null,
+      //当前多选选中的车辆
+      selectTruck:[],
+       //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+    };
+  },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId");
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&dispatchStatus=0&sporadicStatus=0&carrierSsoId=" + getCookie("userId");
+    } else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&dispatchStatus=0&sporadicStatus=0";
+    }else{
+        this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&dispatchStatus=0&sporadicStatus=0&userId=" + getCookie("orgCode");
+    }
+  },
+  methods: {
+    //点击确定按钮的事件
+    makeSure(){
+       console.log(this.selectionList)
+        this.disabled = true
+        console.log(this.orderId)
+        if(this.orderId == null){
+          this.$message.error("未勾选零星订单")
+          this.disabled = false
+          return 
+        }else if(this.selectionList.length == 0){
+          this.$message.error("未选择车辆")
+          this.disabled = false
+          return
+        }
+        this.axios.post('/api/v1/ams/addSporadicOrderTimes',{
+          orderId:this.orderId,
+          sporadicOrderId:this.sporadicOrderId,
+          mapList:this.selectionList,
+        }).then((res)=>{
+          if(res.data.code == '200'){
+            this.$message.success('派车成功')
+            this.disabled = false
+            this.cancel();
+          }
+        })
+    },
+    //点击取消按钮的事件
+    cancel(){
+      this.$router.push('/oldSporadicOrder')
+    },
+    //点击删除按钮删除当前点击的对象
+    deleteRow(index){
+      this.selectionList.splice(index,1)
+    },
+    //车辆模态框的确定事件
+    AddTruckClick(){
+      this.selectTruck.forEach(e => {
+        this.selectionList.push({
+          capacityId:e.capacityId,
+          capacityNumber:e.capacityNumber,
+        })
+      });
+      this.truckDrawer = false;
+    },
+    //车辆模态框框计算
+    selectTruckClick(){
+      if(this.truckText != null){
+        if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&index="+this.truckText;
+      }else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index="+this.truckText;
+      }
+        this.truckText = null
+      }else{
+         if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&i=" + new Date()
+      }else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date()
+      }
+      }
+    
+    },
+    //车辆表格
+    currentRadioChange1(select){
+      this.selectTruck = [];
+      this.selectTruck = select;
+    },
+    //主界面表格单选
+    currentRadioChange(row) {
+      console.log(row)
+      this.sporadicOrderId = row.sporadicOrderId
+      this.orderId = row.orderId
+    },
+    //获取物资详情--未下发
+    getMatrialDetails1(row){
+      console.log("wuzixq")
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData = res.data.data
+      })
+    },
+    onClick() {
+      if(getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId") + "&t=" + new Date();
+    }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤" + "&t=" + new Date();
+    }
+     else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null  + "&t=" + new Date();
+    } 
+      this.truckDrawer = true
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.addSaleOrderSend {
+  .el-drawer__body {
+   overflow: auto;
+  }
+  .el-drawer__container ::-webkit-scrollbar{
+    display: none;
+  }
+  .from {
+    margin-top: 20px;
+    .line {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .el-input {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+    }
+    .vehicle {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 20px;
+      .el-button {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+      .span {
+        width: 70px;
+      }
+    }
+  }
+  .tablecls{
+    margin-top: 20px;
+  }
+  .button_box{
+    display: flex;
+    justify-content: center;
+    margin: 20px;
+    .el-button{
+      width: 100px;
+      margin-left: 20px;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/oldAreaSporadic/transportOrder/transportOrder.vue

@@ -0,0 +1,524 @@
+//运输派单
+<template>
+  <div class="transportOrder">
+    <div class="transportOrder_top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="Insert" v-if="activeName == 'first'">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <el-dialog title="车辆信息" :visible.sync="dialogTableVisible" :before-close="handleClose">
+    <el-input style="width:250px" v-model="truckText"></el-input>
+    <el-button type="primary" @click="getCapacity" >查询</el-button>
+    <dilTable
+          v-bind.sync="truck"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+    <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogTableVisible = false">取 消</el-button>
+    <el-button type="primary" @click="updateTruckCapacity()">确 定</el-button>
+    </span>
+    </el-dialog>
+    <div class="transportOrder_bottom">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="未接收" name="first">
+          <dilTable v-bind.sync="first" ref="table">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="150"
+          >
+            <template slot-scope="scope">
+               <el-button @click="updateClick(scope)" type="text" size="small">
+                修改
+              </el-button>
+             <el-button @click="deleteClick(scope)" type="text" size="small">
+                删除
+              </el-button>
+              <el-button @click="getMatrialDetails1(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+        <!-- 已接收 -->
+        <el-tab-pane label="已接收" name="Received">
+          <dilTable v-bind.sync="Received" ref="table1">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="deleteClick(scope)" type="text" size="small">
+                关闭
+              </el-button>
+              <el-button @click="getMatrialDetails2(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+         <!-- 已完成 -->
+        <el-tab-pane label="已完成" name="completed">
+          <dilTable v-bind.sync="completed" ref="table2">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="getMatrialDetails3(scope.row)" type="text" size="small">
+                物资详情
+              </el-button>
+            </template>
+          </el-table-column>
+          //物资详情抽屉
+          <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData2" border >
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+         <!-- 已拒绝 -->
+        <el-tab-pane label="已拒绝" name="refused">
+          <dilTable v-bind.sync="refused">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="ctrlZClick(scope)" type="text" size="small">
+                撤销
+              </el-button>
+            </template>
+          </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div> 
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      carrierUserId:'',
+      //模态窗的框计算
+      inputText: null,
+      //车辆输入框
+      truckText:null,
+      //是否弹出对话框
+      dialogTableVisible: false,
+      //输入框的值
+      input: "",
+      //选项卡的当前选中的值
+      activeName: "first",
+      //已下发的表格
+      first: {
+        requestUrl:"",
+      },
+      //车辆信息的表格
+      truck: {
+        requestUrl: "" ,
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      Received:{
+        requestUrl: "",
+      },
+      completed:{
+        requestUrl:"",
+      },
+      refused:{
+        requestUrl:"",
+      },
+       //车辆的表格
+      truck: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      //记录旧的row对象
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount: 1,
+      //记录旧的row对象
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount1: 1,
+      oldRow2: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
+      oldRowCount2: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+      tableData1:[],
+      tableData2:[],
+      //当前选中的订单id
+      selectOrderId: null,
+      //选中的车辆号
+      capacityNumber: "",
+      //选中的运力id
+      capacityId: null,
+      //是否关闭模态框
+      drawer: false,
+      //模态框从左往右打开
+      direction: "rtl",
+
+      orderId:null,
+      //多选的选中的订单id
+      selectionList: [],
+      //区别点击的是添加运力，还是修改
+      index: null,
+    };
+  },
+  created(){
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId");
+      } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+      }
+      if(getCookie('orgCode') == "chengyunshang"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") ,
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId"),
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId"),
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId")
+      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2"
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6"
+      }else{
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode")
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode")
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode")
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    //撤销已拒绝的运输订单
+    ctrlZClick(scope){
+        console.log(scope.row.orderId)
+        this.axios.post("/api/v1/oms/refuseCtrlZ",{
+          orderId:scope.row.orderId
+        }).then((res) => {
+          if(res.data.code == '200'){
+             this.$message.success("撤单成功")
+             this.getRequestUrl()
+          }
+        })
+    },
+    handleClose(done){
+      done()
+      this.$message.info("取消修改运力")
+    },
+    getRequestUrl(){
+        if(getCookie('orgCode') == "chengyunshang"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date() ,
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId") + "&test=" + new Date()
+      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" + "&test=" + new Date()
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6" + "&test=" + new Date()
+      }else{
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode") + "&test=" + new Date()
+      }
+    },
+    getTruckRequestUrl(){
+        if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId") + "&test=" + new Date();
+      } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+      }
+    },
+    currentRadioChange1(row){
+      console.log(row)
+      this.capacityId = row.capacityId
+    },
+     //删除运输订单
+    deleteClick(scope){
+      this.$confirm('是否删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+            this.axios
+            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+    },
+    //修改运输订单
+    updateClick(scope){
+      this.getTruckRequestUrl()
+      this.orderId = scope.row.orderId
+      this.dialogTableVisible = true
+      console.log(scope.row.orderId)
+    },
+    updateTruckCapacity(){
+        if(this.capacityId == null){
+            this.$message.error("未选中运力")
+            return
+        }
+        this.axios.post("/api/v1/oms/updateCapacityId",{
+          capacityId:this.capacityId,
+          orderId :this.orderId
+        }).then((res) =>{
+          if(res.data.code == "200"){
+            this.$message.success("修改运力成功")
+            this.getRequestUrl()
+            this.dialogTableVisible = false
+          }else{
+            this.$message.error("修改运力失败")
+          }
+        })
+    },
+    handleClick(tab, event) {
+      this.getRequestUrl()
+    },
+    Insert(){
+      this.$router.push("addOldSporadicOrder")
+    },
+    getCapacity(){
+      if(this.truckText != null){
+        if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&index="+this.truckText;
+      }else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index="+this.truckText;
+      }
+        this.truckText = null
+      }else{
+         if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&i=" + new Date()
+      }else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date()
+      }
+      }
+    },
+    //获取物资详情--未接收
+    getMatrialDetails1(row){
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData = res.data.data
+      })
+    },
+     //获取物资详情--已接收
+    getMatrialDetails2(row){
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        console.log(res.data.data)
+        this.tableData1 = res.data.data
+      })
+    },
+    //获取物资详情--已完成
+    getMatrialDetails3(row){
+      console.log(row)
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
+        this.tableData2 = res.data.data
+      })
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+
+.transportOrder {
+  .transportOrder_top {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-input{
+  width: 20%;
+}
+  }
+  .drawer_top {
+    width: 100%;
+    height: 50px;
+    padding-left: 20px;
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/LeaveFactory.vue

@@ -0,0 +1,79 @@
+//出厂
+<template>
+  <!-- 零星物资出厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+       <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      startTime: null,
+      endTime: null,
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+        let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=20&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
+      }  
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/Load.vue

@@ -0,0 +1,52 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=20&status=0"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllLoadResult?apiId=430&orderType=20&status=0&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+          this.$message.info("功能暂时关闭")
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/enFactory.vue

@@ -0,0 +1,86 @@
+//进厂
+<template>
+  <!-- 零星物资进厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      startTime: null,
+      endTime: null,
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+    console.log("enter!")
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/grossWeight.vue

@@ -0,0 +1,52 @@
+//计毛
+<template>
+  <!-- 零星物资计毛作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/tareWeight.vue

@@ -0,0 +1,52 @@
+//计皮
+<template>
+  <!-- 零星物资计皮作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+      this.$message.info("功能暂时关闭")
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/inwardSporadicFactory/unload.vue

@@ -0,0 +1,52 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created(){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=20"
+      }else{
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=20&userId=" + getCookie("orgCode")
+      }
+  },
+  methods: {
+    onclick() {
+          this.$message.info("功能暂时关闭")
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input{
+      width: 20%;
+    }
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/enFactory.vue

@@ -3,7 +3,12 @@
   <!-- 零星物资进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,12 +19,15 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,7 +43,32 @@ export default {
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/outFactory.vue

@@ -3,10 +3,15 @@
   <!-- 零星物资出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+     <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">      
     </dilTable>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,7 +43,25 @@ export default {
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+      }
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/enFactory.vue

@@ -3,7 +3,12 @@
   <!-- 零星物资进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -14,12 +19,15 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -35,7 +43,32 @@ export default {
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/outFactory.vue

@@ -3,10 +3,15 @@
   <!-- 零星物资出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+       <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">      
     </dilTable>
@@ -15,11 +20,14 @@
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "",
@@ -27,7 +35,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13"
       }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&userId=" + getCookie("orgCode")
@@ -35,7 +43,25 @@ export default {
   },
   methods: {
     onclick() {
-      this.$message.info("功能暂时关闭")
+           let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+      }
     },
   },
 };

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -94,7 +94,7 @@
         </el-autocomplete>
         </el-form-item>
         </el-form>
-        <el-form
+        <!-- <el-form
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
@@ -109,7 +109,7 @@
         >
         </el-input>
         </el-form-item>
-        </el-form>
+        </el-form> -->
         <el-form
         :inline="true"
         class="demo-form-inline"
@@ -228,7 +228,7 @@
       <el-button type="primary" @click="makeSure1">确定</el-button>
       <div class="tablecls">
         <!-- 查询所有的物资 -->
-        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange">
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange" :drawer="aaadrawer">
         </dilTable>
       </div>
     </el-drawer>
@@ -270,6 +270,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      aaadrawer:false,
       disabled:false,
       materialTimes:null,
       options: [],
@@ -312,7 +313,7 @@ export default {
           width: "140",
         },
         {
-          prop: "Specification",
+          prop: "materialSpecification",
           label: "规格型号",
           width: "140",
         },
@@ -382,6 +383,13 @@ export default {
         });
       }
     },
+    table(val){
+      if(val){
+        this.aaadrawer = false;
+      }else{
+        this.aaadrawer = true;
+      }
+    }
   },
   methods: {
     //关闭运输线路
@@ -392,7 +400,7 @@ export default {
     },
     onclickMaterial(){
         if(this.inputMaterial != null){
-          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"+ "&index=" + this.inputMaterial
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&index=" + this.inputMaterial
         }
         else{
           this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"
@@ -419,7 +427,7 @@ export default {
       }
     },
     drawTable(){
-      this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&test=" + new Date()
+      this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" +"&test=" + new Date()
       this.selectionList1 = []
       this.table = true
     },
@@ -497,14 +505,20 @@ export default {
     },
     // 返回主界面
     makeSure1() {
-      console.log(this.selectionList1)
-        this.selectionList1.materialPriority = 1
-        this.tableData.push(this.selectionList1);  
-        console.log(this.tableData)
-        console.log(this.tableData)  
-        this.selectionList1 = [];
-        this.table = false;
-        console.log(this.selectionList1)
+        if(this.tableData.length != 0){
+          this.$message.error("物资已选择，请删除后重试")
+          return
+        }
+        console.log(JSON.stringify(this.selectionList1).length)
+        if(JSON.stringify(this.selectionList1).length != 2){
+            this.selectionList1.materialPriority = 1
+            console.log(JSON.stringify(this.selectionList1))
+            this.tableData.push(this.selectionList1);  
+            this.selectionList1 = [];
+            this.table = false;
+        }else{
+          this.$message.error("请选择物资！")
+        }     
     },
     //取消模态框多选
     open() {
@@ -536,8 +550,13 @@ export default {
       }
     },
     ondrawer(num) {
-      this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&test=1";
+      if(getCookie("orgCode") == "biemeierchejian"){
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + "二厂-总厂：采购内转燃料路线" 
+      }else{
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&t=" + new Date();
+      }
       this.drawer = true;
       this.a = num;
     },
@@ -556,7 +575,7 @@ export default {
     // 确认
     makeSure() {
         this.disabled = true
-        if(this.supplierId==null||this.lineId==null||this.consigneeId==null){
+        if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null){
           this.disabled = false
           this.$message.warning("存在值未填写")
           return
@@ -589,7 +608,7 @@ export default {
           orderType:this.orderType,
           carrierId: this.carrierId,
           receiveId: this.consigneeId,
-          orderTime:this.materialTimes,
+          // orderTime:this.materialTimes,
           userId:getCookie("orgCode"),
           mapList: this.tableData,
         };

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue

@@ -96,24 +96,24 @@ export default {
   },
   created(){
       if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0",
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12",
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0",
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12",
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1"       
       }else{
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode"),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode"),
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode"),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode"),
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode")
-      }
+      } 
   },
   methods: {
     getRequestUrl(){
       if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&test=" + new Date(),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&test=" + new Date(),
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&test=" + new Date(),
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&test=" + new Date()
       }else{
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&test=" + new Date(),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&test=" + new Date(),
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&test=" + new Date(),
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode") + "&test=" + new Date()
      }
     },
@@ -160,18 +160,18 @@ export default {
         if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu")
         {
           if(this.activeName == "first"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&con=" + this.input
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&con=" + this.input
           }else if(this.activeName == "second"){
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&con=" + this.input
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&con=" + this.input
           }else{
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&con=" + this.input
           }                
         }else
         {
           if(this.activeName == "first"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&con=" + this.input
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&con=" + this.input
           }else if(this.activeName == "second"){
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=428&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&con=" + this.input
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&con=" + this.input
           }else{
             this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&userId=" + getCookie("orgCode") + "&con=" + this.input
           }       

src/views/SporadicManage/components/sporadicMaterial/transportOrder/addTransportOrder.vue

@@ -153,23 +153,23 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&carrierSsoId=" + getCookie("userId");
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&carrierSsoId=" + getCookie("userId");
     } else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0";
-    } else{
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0";
+    }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤"; 
+      this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0&userId=" + getCookie("orgCode");
+    }
+    else{
         this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode");
+        this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0&userId=" + getCookie("orgCode");
     }
   },
   methods: {
-    onInput(val){
-      if(!isNumber(val)){
-        this.$message.warning('重量请输入数字')
-      }
-    },
     //点击确定按钮的事件
     makeSure(){
        console.log(this.selectionList)
@@ -216,14 +216,36 @@ export default {
     },
     //车辆模态框框计算
     selectTruckClick(){
-      if (getCookie("orgCode") == "chengyunshang") {
+      if(this.truckText != null){
+        if (getCookie("orgCode") == "chengyunshang") {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
           getCookie("userId") + "&index="+this.truckText;
-      } else {
+      }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤" + "&index="+this.truckText;; 
+      
+    } 
+      else {
         this.truck.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&index="+this.truckText;
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index="+this.truckText;
       }
+        this.truckText = null
+      }else{
+         if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") + "&i=" + new Date()
+      }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤" + + "&i=" + new Date(); 
+    } 
+      else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date()
+      }
+      }
+    
     },
     //车辆表格
     currentRadioChange1(select){
@@ -241,18 +263,27 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId") + "&t=" + new Date();
-    } else {
+    }else if(getCookie("orgCode") == "biemeierchejian") {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + + "&t=" + new Date();;
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤" + "&t=" + new Date();
+    }
+     else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null  + "&t=" + new Date();
     } 
       this.truckDrawer = true
     },
   },
 };
 </script>
-
 <style lang='scss'>
 .addSaleOrderSend {
+  .el-drawer__body {
+   overflow: auto;
+  }
+  .el-drawer__container ::-webkit-scrollbar{
+    display: none;
+  }
   .from {
     margin-top: 20px;
     .line {

src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue

@@ -62,6 +62,22 @@
           <dilTable v-bind.sync="completed">
           </dilTable>
         </el-tab-pane>
+         <!-- 已拒绝 -->
+        <el-tab-pane label="已拒绝" name="refused">
+          <dilTable v-bind.sync="refused">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="ctrlZClick(scope)" type="text" size="small">
+                撤销
+              </el-button>
+            </template>
+          </el-table-column>
+          </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div> 
   </div>
@@ -96,6 +112,9 @@ export default {
       },
       completed:{
         requestUrl:"",
+      },
+      refused:{
+        requestUrl:"",
       },
        //车辆的表格
       truck: {
@@ -152,18 +171,33 @@ export default {
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") ,
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId"),
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId")
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId"),
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId")
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2"
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6"
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode")
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode")
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode")
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode")
       }
   },
   methods: {
+    //撤销已拒绝的运输订单
+    ctrlZClick(scope){
+        console.log(scope.row.orderId)
+        this.axios.post("/api/v1/oms/refuseCtrlZ",{
+          orderId:scope.row.orderId
+        }).then((res) => {
+          if(res.data.code == '200'){
+             this.$message.success("撤单成功")
+             this.getRequestUrl()
+          }
+        })
+    },
     handleClose(done){
       done()
       this.$message.info("取消修改运力")
@@ -173,14 +207,17 @@ export default {
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date() ,
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId") + "&test=" + new Date()
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" + "&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" + "&test=" + new Date()
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6" + "&test=" + new Date()
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode") + "&test=" + new Date()
       }
     },
     getTruckRequestUrl(){

src/views/SporadicManage/components/steelReturn/transportExcute/outFactory.vue

@@ -3,10 +3,15 @@
   <!-- 钢材退货出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">
       
@@ -15,12 +20,15 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5",
@@ -45,7 +53,26 @@ export default {
     },
     
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=5&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
+      }  
     },
    }
 };

src/views/SporadicManage/router/index.js

@@ -30,6 +30,22 @@ import sporadicOUToutFactory from '../components/sporadicMaterial/sporadicOutfac
 import sporadicOUTtareWeight from '../components/sporadicMaterial/sporadicOutfactory/tareWeight.vue'
 import sporadicOUTload from '../components/sporadicMaterial/sporadicOutfactory/load.vue'
 
+//老区零星进出厂
+//老厂零星物资运输预约
+import oldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/transportAppoint.vue'
+import addOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue'
+import editOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/editTransportAppoint.vue'
+//老厂零星物资运输派单
+import oldSporadicOrder from '../components/oldAreaSporadic/transportOrder/transportOrder.vue'
+import addOldSporadicOrder from '../components/oldAreaSporadic/transportOrder/addTransportOrder.vue'
+
+//老厂零星物资中转
+import oldSporadicInwardTenfactory from '../components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue'
+import oldSporadicInwardGrossWeight from '../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue'
+import oldSporadicInwardoutFactory from '../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue'
+import oldSporadicInwardtareWeight from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
+import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/Load.vue'
+import oldSporadicInwardUnload from '../components/oldAreaSporadic/inwardSporadicFactory/unload.vue'
 
 //钢材退货运输预约
 import steelReturnTransportAppoint from '../components/steelReturn/transportAppoint/transportAppoint.vue'
@@ -65,8 +81,13 @@ import mornThanOUToutFactory from '../components/moreThanMaterialTruck/sporadicO
 import mornThanOUTtareWeight from '../components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue'
 import mornThanOUTload from '../components/moreThanMaterialTruck/sporadicOutfactory/load.vue'
 
-
-
+// 内转零星内转进厂展示界面
+import sporadicEnfactoryInward from '../components/sporadicMaterial/inwardSporadicFactory/enFactory.vue'
+import sporadicgrossWeightInward from '../components/sporadicMaterial/inwardSporadicFactory/grossWeight.vue'
+import sporadicLeavefactoryInward from '../components/sporadicMaterial/inwardSporadicFactory/LeaveFactory.vue'
+import sporadicLoadInward from '../components/sporadicMaterial/inwardSporadicFactory/Load.vue'
+import sporadicTareWeightInward from '../components/sporadicMaterial/inwardSporadicFactory/tareWeight.vue'
+import sporadicUnloadInward from '../components/sporadicMaterial/inwardSporadicFactory/unload.vue'
 
 Vue.use(Router)
 const constantRouterMap = [
@@ -134,6 +155,29 @@ const constantRouterMap = [
        {path:'mornThanOUToutFactory',name:'sporadicOUToutFactory',meta:{code:'xtpzgl-yhgl'},component:mornThanOUToutFactory},
        {path:'mornThanOUTtareWeight',name:'sporadicOUTtareWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTtareWeight},
        {path:'mornThanOUTload',name:'mornThanOUTload',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTload},
+
+       //内转零星内转
+       {path:'sporadicEnfactoryInward',name:'sporadicEnfactoryInward',meta:{code:'xtpzgl-yhgl'},component:sporadicEnfactoryInward},
+       {path:'sporadicgrossWeightInward',name:'sporadicgrossWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicgrossWeightInward},
+       {path:'sporadicLeavefactoryInward',name:'sporadicLeavefactoryInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLeavefactoryInward},
+       {path:'sporadicLoadInward',name:'sporadicLoadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLoadInward},
+       {path:'sporadicTareWeightInward',name:'sporadicTareWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicTareWeightInward},
+       {path:'sporadicUnloadInward',name:'sporadicUnloadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicUnloadInward},
+
+      //老厂零星物资运输预约
+      {path:'addOldSporadicAppoint',name:'addOldSporadicAppoint',meta:{code:'xtpzgl-jggl'},component:addOldSporadicAppoint},
+      {path:'oldSporadicAppoint',name:'oldSporadicAppoint',meta:{code:'xtpzgl-yhgl'},component:oldSporadicAppoint},
+      {path: 'editSporadicTransportAppoint', name: 'editSporadicTransportAppoint', meta: {code: 'xtpzgl-yhgl'}, component: editSporadicTransportAppoint},
+      //零星物资运输订单
+      {path:'addOldSporadicOrder',name:'addOldSporadicOrder',meta:{code:'xtpzgl-jggl'},component:addOldSporadicOrder},
+      {path:'oldSporadicOrder',name:'oldSporadicOrder',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOrder},
+      //零星物资运输执行
+      {path:'oldSporadicInwardTenfactory',name:'oldSporadicInwardTenfactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardTenfactory},
+      {path:'oldSporadicInwardGrossWeight',name:'oldSporadicInwardGrossWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardGrossWeight},
+      {path:'oldSporadicInwardoutFactory',name:'oldSporadicInwardoutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardoutFactory},
+      {path:'oldSporadicInwardtareWeight',name:'oldSporadicInwardtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardtareWeight},
+      {path:'oldSporadicInwardUnload',name:'oldSporadicInwardUnload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardUnload},
+      {path:'oldSporadicInwardload',name:'oldSporadicInwardload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardload},
     ]    
   }
 ];

src/views/TMS/components/domesticMine/approveWagonPlease.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 批车作业页面 -->
-  <div class="homeworkPath">
+  <div class="trainTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -54,9 +54,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.trainTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue

@@ -1,13 +1,7 @@
 <template>
   <!-- 新增批车作业页面 -->
   <div id="contractDetails">
-    <page-title>批车作业</page-title>
-
-    <div class="main">
-      <span class="text">选择已下发请车作业</span>
-      <span class="a"></span>
-    </div>
- 
+    <page-title>返回</page-title>
   <div>
       <dilTable
         v-bind.sync="option"
@@ -16,16 +10,11 @@
         ref="table"
         @radio-change="currentRadioChange"
       >
-    
       </dilTable>
     </div>
-    <div class="main">
-      <span class="text">新增批车作业</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="105" v-model="form1"></dil-form>
         </div>
       </div>
@@ -33,11 +22,9 @@
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
 export default {
@@ -112,6 +99,45 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 // @import "@/styles/appoint/contract/ContractInsert.scss";
+#contractDetails{
+  .form {
+    display: flex;
+    .form_box {
+      width: 240px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 22px;
+      .el-form {
+        .preview-group {
+     }
+    }
+  }          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;    
+              padding-right: 200px;
+              margin-bottom: 0px;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 230px;
+              }
+              .el-input {
+                width: 160px;
+                margin-left: -300px;
+                padding-bottom: 0%;
+               
+              }
+            }
+          }
+        }
+ 
+  .button-box{
+    margin-top: 50px;
+    margin-left: 550px;
+    
+  }
+}
 </style>

src/views/TMS/components/domesticMine/entrustMine.vue

@@ -2,12 +2,12 @@
   <!-- 计量委托 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="btnclick(0)">
-        <i class="el-icon-s-promotion"></i>发送
+      <el-button type="primary" class="btn1" @click="btnclick(0)">
+        <i class="el-icon-success"></i>发送
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
@@ -71,7 +71,19 @@ export default {
 <style lang='scss'>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
+     .btn1{
+       width: 7%;
+       margin-left: 00.375rem;
+     }
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -26,7 +26,8 @@
       <el-switch
         v-model="matching"
         active-color="#27d452"
-        inactive-color="#e1e3e6">
+        inactive-color="#e1e3e6"
+      >
       </el-switch>
       <span class="span"></span>
     </div>
@@ -43,12 +44,22 @@
     </div>
     <div class="remark from" v-if="matching">
       <span class="text">船名/备注：</span>
-      <el-input v-model="remark" @blur="onBlur" placeholder="可输入船名\备注重新匹配采购订单"> </el-input>
+      <el-input
+        v-model="remark"
+        @blur="onBlur"
+        placeholder="可输入船名\备注重新匹配采购订单"
+      >
+      </el-input>
       <span class="span"></span>
     </div>
     <div class="purchaseOrder from" v-if="matching">
       <span class="text">采购订单号：</span>
-      <el-input v-model="purchaseOrderNo" placeholder="请选择物资和发货单位" disabled> </el-input>
+      <el-input
+        v-model="purchaseOrderNo"
+        placeholder="请选择物资和发货单位"
+        disabled
+      >
+      </el-input>
       <span class="span"></span>
     </div>
 
@@ -66,7 +77,7 @@
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        style="margin-top: 0rem; margin-right: 0.1rem; width: 230px"
         clearable
       ></el-input>
       <el-button
@@ -142,12 +153,12 @@ export default {
       },
     };
   },
-  watch:{
-    matching(val){
-      if(val){
+  watch: {
+    matching(val) {
+      if (val) {
         this.getPurchaseOrderNo();
       }
-    }
+    },
   },
   created() {
     this.form1 = {
@@ -159,14 +170,14 @@ export default {
       this.input = null;
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
-      if(this.matching){
+      if (this.matching) {
         this.getPurchaseOrderNo();
       }
     },
     currentRadioChange2(selection) {
       this.supplierName = selection.supplierName;
       this.supplierId = selection.supplierId;
-      if(this.matching){
+      if (this.matching) {
         this.getPurchaseOrderNo();
       }
     },
@@ -180,12 +191,12 @@ export default {
       }
     },
     onBlur() {
-      if(this.matching){
+      if (this.matching) {
         this.getPurchaseOrderNo();
       }
     },
     getPurchaseOrderNo() {
-      console.log(this.matching)
+      console.log(this.matching);
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
@@ -264,12 +275,12 @@ export default {
         if (this.input.length == 7) {
           this.list.push(this.input);
           this.input = "";
-        } else if (this.input.length < 7){
+        } else if (this.input.length < 7) {
           this.$message({
             type: "warning",
             message: "车皮号长度不足7位数，请重新输入！",
           });
-        } else if (this.input.length > 7){
+        } else if (this.input.length > 7) {
           this.$message({
             type: "warning",
             message: "车皮号长度超过7位数，请重新输入！",
@@ -297,41 +308,41 @@ export default {
             message: "请输入车皮号！",
           });
         } else {
-            if (this.form1.sendStationId) {
-              if (this.form1.arrivalStationId) {
-                if (this.form1.resultLoadingDate) {
-                  if(this.supplierId){
-                    if(this.materialId){
-                    }else{
-                      this.$message({
-                        type: "warning",
-                        message: "请选择物资",
-                      });
-                    }
-                  }else{
+          if (this.form1.sendStationId) {
+            if (this.form1.arrivalStationId) {
+              if (this.form1.resultLoadingDate) {
+                if (this.supplierId) {
+                  if (this.materialId) {
+                  } else {
                     this.$message({
                       type: "warning",
-                      message: "请选择发货单位",
+                      message: "请选择物资",
                     });
                   }
                 } else {
                   this.$message({
                     type: "warning",
-                    message: "请选择装车时间！",
+                    message: "请选择发货单位",
                   });
                 }
               } else {
                 this.$message({
                   type: "warning",
-                  message: "请选择到站！",
+                  message: "请选择装车时间！",
                 });
               }
             } else {
               this.$message({
                 type: "warning",
-                message: "请选择发站！",
+                message: "请选择到站！",
               });
             }
+          } else {
+            this.$message({
+              type: "warning",
+              message: "请选择发站！",
+            });
+          }
         }
       }
       if (state == 1) {
@@ -342,21 +353,21 @@ export default {
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
           resultType: 3,
-          sendUnitId:this.supplierId,
-          materialId:this.materialId,
+          sendUnitId: this.supplierId,
+          materialId: this.materialId,
         };
-        if(this.matching){
-          map = { 
+        if (this.matching) {
+          map = {
             wagonNoList: this.list,
             sendStationId: this.form1.sendStationId,
             arrivalStationId: this.form1.arrivalStationId,
             resultLoadingDate: sjTime(this.form1.resultLoadingDate),
             resultRemarks: this.form1.resultRemarks,
             resultType: 3,
-            sendUnitId:this.supplierId,
-            materialId:this.materialId,
+            sendUnitId: this.supplierId,
+            materialId: this.materialId,
             purchaseOrderRailPlanId: this.purchaseOrderId,
-          }
+          };
         }
         this.axios
           .post("/api/v1/tms/addDomesticLoadResult", map)
@@ -381,19 +392,20 @@ export default {
 <style lang='scss'>
 .addWagonLoad {
   color: #606266;
-  font-size: 0.875rem;
-  font-weight: 600;
+  font-size: 0.675rem;
+  font-weight: 500;
   .cp {
-    width: 100%;
+    width: 49%;
     display: flex;
     justify-content: center;
     align-items: center;
     padding-top: 0.625rem;
     padding-bottom: 0.625rem;
+    margin-left: 364px;
     .cp_title {
       .cp_top {
         width: 3.125rem;
-        padding-right: 1.25rem;
+        padding-right: 1.55rem;
       }
     }
   }
@@ -427,16 +439,16 @@ export default {
       }
     }
   }
-  .matching{
+  .matching {
     width: 100%;
     height: 3.125rem;
     display: flex;
     justify-content: center;
     align-items: center;
-    .text{
+    .text {
       width: 8.75rem;
     }
-    .span{
+    .span {
       display: inline-block;
       width: 310px;
       height: 0.0625rem;
@@ -447,6 +459,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -457,6 +471,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -471,18 +487,20 @@ export default {
       text-align: right;
       width: 5.625rem;
     }
-    .span{
+    .span {
       display: inline-block;
-      width: 1.875rem;height: 1.25rem;
+      width: 1.875rem;
+      height: 1.25rem;
     }
   }
-  .purchaseOrder{
+  .purchaseOrder {
     display: flex;
     justify-content: center;
     align-items: center;
-    .span{
+    .span {
       display: inline-block;
-      width: 1.875rem;height: 0.0625rem;
+      width: 1.875rem;
+      height: 0.0625rem;
     }
   }
   .form {
@@ -494,6 +512,7 @@ export default {
   .button-box {
     display: flex;
     justify-content: center;
+    padding-top: 30px;
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonLoadMine.vue

@@ -2,7 +2,7 @@
   <!-- 装车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -94,7 +94,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -1,25 +1,18 @@
 <template>
   <!-- 新增请作业页面 -->
   <div id="contractDetails">
-    <page-title>请车作业</page-title>
-    <div class="main">
-      <span class="text">新增请车作业</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="122" v-model="form1" ></dil-form>
-        </div>
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="122" v-model="form1"></dil-form>
       </div>
     </div>
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" >确认</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
 
@@ -38,12 +31,12 @@ export default {
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
-    
+
     // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+    // 确认
     onClickConfirm() {
       let tmstrainPleaseApproveResult = {
         resultPlanDate: sjTime(this.form1.resultPlanDate),
@@ -52,7 +45,7 @@ export default {
         sendStationId: this.form1.sendStationId,
         toTheStationId: this.form1.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber,
-        resultType: 3
+        resultType: 3,
       };
       function isNumber() {
         var value = tmstrainPleaseApproveResult.resultPleaseNumber;
@@ -66,29 +59,67 @@ export default {
       }
       var val = this.value;
       if (
-        tmstrainPleaseApproveResult.resultPlanDate==null||
-        tmstrainPleaseApproveResult.resultCategory==null||
-        tmstrainPleaseApproveResult.shipperId==null||
-        tmstrainPleaseApproveResult.sendStationId==null||
-        tmstrainPleaseApproveResult.toTheStationId==null||
-        tmstrainPleaseApproveResult.resultPleaseNumber==null
-      ) this.$message.error("存在空值！");
+        tmstrainPleaseApproveResult.resultPlanDate == null ||
+        tmstrainPleaseApproveResult.resultCategory == null ||
+        tmstrainPleaseApproveResult.shipperId == null ||
+        tmstrainPleaseApproveResult.sendStationId == null ||
+        tmstrainPleaseApproveResult.toTheStationId == null ||
+        tmstrainPleaseApproveResult.resultPleaseNumber == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("请车数量必须是数字！");
       else
-      if (!isNumber(val)) this.$message.error("请车数量必须是数字！");
-      else
-      this.axios
-        .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "新增成功!",
+        this.axios
+          .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+#contractDetails{
+  .form {
+    display: flex;
+    .form_box {
+      width: 240px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 22px;
+      .el-form {
+        .preview-group {
+     }
+    }
+  }          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;    
+              padding-right: 200px;
+              margin-bottom: 0px;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 230px;
+              }
+              .el-input {
+                width: 160px;
+                margin-left: -300px;
+                padding-bottom: 0%;
+               
+              }
+            }
+          }
+        }
+ 
+  .button-box{
+    margin-top: 50px;
+    margin-left: 550px;
+    
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonPleaseMine.vue

@@ -2,12 +2,12 @@
   <!-- 请车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="insertClick">
-        <i class="el-icon-plus"></i>新增
+      <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <el-tabs v-model="activeName">
@@ -145,7 +145,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonUnLoadAdd.vue

@@ -1,9 +1,9 @@
 <template>
   <!-- 添加车皮卸车实绩 -->
   <div class="addWagonLoad">
-    <page-title>新增</page-title>
+    <page-title>返回</page-title>
     <div class="main">
-      <el-divider content-position="left">选择已装车实绩</el-divider>
+      <el-divider content-position="left"></el-divider>
     </div>
     <div>
       <dilTable
@@ -13,9 +13,11 @@
       >
       </dilTable>
     </div>
-    <el-divider content-position="left">车皮卸车实绩</el-divider>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="255" v-model="form1" ref="from1"></dil-form>
+    <!-- <el-divider content-position="left">车皮卸车实绩</el-divider> -->
+    <div class="form">
+      <div class="form_box" style="margin-right: 10rem">
+        <dil-form :formId="255" v-model="form1" ref="from1"></dil-form>
+      </div>
     </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
@@ -25,7 +27,6 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
-
 export default {
   components: { PageTitle },
   data() {
@@ -56,7 +57,7 @@ export default {
     },
     // 确定
     makeSure() {
-      console.log(this.list)
+      console.log(this.list);
       let tmstrainWagonUnloadResult = {
         wagonNoList: this.list,
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
@@ -97,5 +98,50 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.addWagonLoad {
+  .form {
+    display: flex;
+    .form_box {
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 22px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 220px;
+              }
+            .el-textarea{
+                .el-textarea__inner {
+                  display: block;
+                  resize: vertical;
+                  padding: 5px 13px;
+                  line-height: 1.5;
+                  width: 70%;
+                  border-radius: 4px;
+                  margin-left: 56px;
+                  margin-top: -25px;
+    
+                }
+             }  
+            }
+          }
+        }
+      }
+    }
+  }
+  .button-box{
+    margin-top: 50px;
+    margin-left: 600px;
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonUnLoadMine.vue

@@ -2,7 +2,7 @@
   <!-- 卸车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+       <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -86,7 +86,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -44,7 +44,7 @@
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
     <div class="form">
-      <div class="form-box" style="margin-right: 10rem">
+      <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="254" v-model="form1" ref="from1"></dil-form>
       </div>
     </div>
@@ -377,17 +377,21 @@ export default {
 </script>
 <style lang='scss'>
 .addWagonLoad {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
   .cp {
-    width: 100%;
+    width: 49%;
     display: flex;
     justify-content: center;
     align-items: center;
     padding-top: 0.625rem;
     padding-bottom: 0.625rem;
+    margin-left: 364px;
     .cp_title {
       .cp_top {
         width: 3.125rem;
-        padding-right: 1.25rem;
+        padding-right: 1.55rem;
       }
     }
   }
@@ -421,11 +425,28 @@ export default {
       }
     }
   }
+  .matching {
+    width: 100%;
+    height: 3.125rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .text {
+      width: 8.75rem;
+    }
+    .span {
+      display: inline-block;
+      width: 310px;
+      height: 0.0625rem;
+    }
+  }
   .material {
     display: flex;
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -436,6 +457,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -448,18 +471,66 @@ export default {
     height: 3.75rem;
     .text {
       text-align: right;
-      width: 60px;
+      width: 5.625rem;
+    }
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 1.25rem;
+    }
+    .el-input{
+      width: 13.5rem;
+      margin-right: 2.375rem;
     }
   }
-  .form {
-    margin-top: 1.25rem;
+  .purchaseOrder {
     display: flex;
     justify-content: center;
-    padding-left: 9.375rem;
+    align-items: center;
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 0.0625rem;
+    }
+  }
+  .form {
+   display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%;
+     
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+              .el-textarea{
+                .el-textarea__inner{
+                  width: 220px;
+                  margin-left: 65px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .button-box {
     display: flex;
     justify-content: center;
+    padding-top: 30px;
   }
 }
 </style>

src/views/TMS/components/importedEmergency/addWagonUnLoadEmergency.vue

@@ -1,11 +1,7 @@
 <template>
   <!-- 添加车皮卸车实绩 -->
   <div class="addWagonLoad">
-    <page-title>新增</page-title>
-
-    <div class="main">
-      <el-divider content-position="left">选择已装车实绩</el-divider>
-    </div>
+    <page-title>返回</page-title>
 
     <div>
       <dilTable
@@ -16,15 +12,15 @@
       </dilTable>
     </div>
 
-    <el-divider content-position="left">车皮卸车实绩</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-        <dil-form :formId="255" v-model="form1" ref="from1"></dil-form>
+  <div class="form">
+      <div class="form_box">
+         <dil-form :formId="255" v-model="form1" ></dil-form>
       </div>
-    <div class="button-box">
+    </div>
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-    
   </div>
 </template>
 
@@ -36,10 +32,9 @@ export default {
   data() {
     return {
       form1: {},
-       option: {
+      option: {
         // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/tms/getWagonNo/2?apiId=213",
+        requestUrl: "/api/v1/tms/getWagonNo/2?apiId=213",
         // 控制显示当选列
         selectionType: "select",
       },
@@ -49,14 +44,13 @@ export default {
   },
   mounted() {},
   methods: {
-    selectionChange(selection){
+    selectionChange(selection) {
       this.list = [];
-      selection.forEach(e => {
-        this.list.push(
-          {
-            resultWagonNo:e.resultWagonNo,
-            resultId:e.resultId
-          })
+      selection.forEach((e) => {
+        this.list.push({
+          resultWagonNo: e.resultWagonNo,
+          resultId: e.resultId,
+        });
       });
     },
     // 确定
@@ -69,37 +63,87 @@ export default {
         resultBigTicketWeight: this.form1.resultBigTicketWeight,
         resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
         resultRemark: this.form1.resultRemark,
-        resultType: 2
+        resultType: 2,
       };
       console.log(tmstrainWagonUnloadResult);
-      if (tmstrainWagonUnloadResult.wagonNoList==null
-      ||tmstrainWagonUnloadResult.resultArrivalDate==null||
-      tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null||
-      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
-      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
-      ) this.$message.error("存在空值！");
+      if (
+        tmstrainWagonUnloadResult.wagonNoList == null ||
+        tmstrainWagonUnloadResult.resultArrivalDate == null ||
+        tmstrainWagonUnloadResult.resultUnloadTime == null ||
+        tmstrainWagonUnloadResult.unloadingPointId == null ||
+        tmstrainWagonUnloadResult.resultBigTicketWeight == null ||
+        tmstrainWagonUnloadResult.resultRailHorizontalWeight == null
+      )
+        this.$message.error("存在空值！");
       else
-      this.axios
-        .post(
-          "/api/v1/tms/insertTmstrainWagonUnLoadResult",
-          tmstrainWagonUnloadResult
-        )
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "新增成功!",
+        this.axios
+          .post(
+            "/api/v1/tms/insertTmstrainWagonUnLoadResult",
+            tmstrainWagonUnloadResult
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+            }
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
     // 取消
-    cancel() {
+    cancel(){
       this.$router.go(-1);
     },
   },
 };
 </script>
-<style lang='scss' scoped>
-
+<style lang='scss'>
+.addWagonLoad {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+            .el-textarea {
+                .el-textarea__inner {
+                  width: 230px;
+                  margin-left: 65px;
+                  margin-top: 0.03rem;
+                }
+              }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther {
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+  }
+}
 </style>

src/views/TMS/components/importedEmergency/entrustEmergency.vue

@@ -2,7 +2,7 @@
   <!-- 计量委托 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -57,7 +57,19 @@ export default {
 <style lang='scss'>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
+     .btn1{
+       width: 7%;
+       margin-left: 00.375rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -2,7 +2,7 @@
   <!-- 装车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick(0)">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -83,7 +83,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue

@@ -2,7 +2,7 @@
   <!-- 卸车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="btnclick(0)">
         <i class="el-icon-search"></i>查询
       </el-button>

src/views/TMS/components/importedFuel/transportReserveFuAdd.vue

@@ -307,7 +307,7 @@ export default {
           driverCapacityIdList: this.selectionList,
           orderType: 5
         };
-        console.log(map);
+        // console.log("map",map);
         this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
           if (res.data.code == "200") {
             this.$message({

src/views/TMS/components/importedFuel/transportReserveRan.vue

@@ -114,6 +114,24 @@ export default {
     }
   },
   methods: {
+    getRequestUrl(){
+         //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();;
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
+        null + "&i=" + new Date();;
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
+        null + "&i=" + new Date();;
+    }
+    },
     onclick() {
       if (this.activeName == "first") {
         //判断是否是承运商
@@ -159,9 +177,7 @@ export default {
           type: "success",
           message: "下发成功!",
         });
-        this.option1.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&i=" +
-          new Date();
+        this.getRequestUrl()
       });
     },
     // 下发
@@ -181,9 +197,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.option1.requestUrl =
-              "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&i=" +
-              new Date();
+            this.getRequestUrl()
           });
         })
         .catch(() => {
@@ -212,7 +226,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -2,21 +2,60 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-
+    <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>燃料预约界面</span>
+    </div>
+    <div style="text-align: center; font-size:15px; margin-top:15px; color:red">
+      <span>温馨提示：卸货到达钢请选择一厂，达兴二焦化请选择二厂<br>如选错厂区将会影响车辆上秤计量！！！</span>
+    </div>
+    <div class="orderType from" style="margin-top:15px">
+      <span class="text">卸货厂区：</span>
+      <el-select
+        class="select"
+        v-model="orderType"
+        placeholder="请选择"
+        @change="onchange()"
+      >
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
+    <div class="supplieUnit">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="发货单位:">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入发货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+     </el-form>
+    </div>
     <div class="material from">
       <span class="text">物资：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-
-    <div class="forwardingUnit from">
-      <span class="text">发货单位：</span>
-      <el-input class="input" v-model="supplierName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
-    </div>
     <div class="remark from">
       <span class="text">船名：</span>
-      <el-input class="input" v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
@@ -32,26 +71,7 @@
     <div class="lineId from">
       <span class="text">采购订单号：</span>
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(6)" v-if="materialId && supplierId">浏览</el-button>
-      <span v-else class="span"></span>
-    </div>
-    <div class="orderType from">
-      <span class="text">订单类别：</span>
-      <el-select
-        class="select"
-        v-model="orderType"
-        placeholder="请选择"
-        disabled
-      >
-        <el-option
-          v-for="item in orderTypeList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-      <span class="span"></span>
+      <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
     <div class="contractTitle from">
       <dil-form :formId="219" v-model="form1"></dil-form>
@@ -66,10 +86,7 @@
     </div>
     <div class="lineId from">
       <span class="text">该批车辆是否一车多趟：</span>
-      <el-switch
-        v-model="isMoreTrips"
-        active-text="是"
-        inactive-text="否">
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
       </el-switch>
     </div>
     <div class="truckListTable">
@@ -107,7 +124,6 @@
             </template>
           </template>
         </el-table-column>
-
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="onClick(scope.$index)"
@@ -119,7 +135,7 @@
     </div>
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
-      <div style="margin-bottom: 10px">
+      <div class="drawer_top">
         <el-input
           placeholder="请输入内容"
           v-model="input"
@@ -130,57 +146,69 @@
           <i class="el-icon-search"></i>查询
         </el-button>
       </div>
-      <div v-if="onDrawerNumber == 1">
+      <div class="drawer_table1" v-show="onDrawerNumber == 1">
         <dilTable
           v-bind.sync="frist"
           @radio-change="currentRadioChange1"
           :isKuang="isKuang"
           @func="func"
+          :isHeigth="isHeigth"
+          :shiyHeigth="shiyHeigth"
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 2">
+      <div v-show="onDrawerNumber == 2">
         <dilTable
           v-bind.sync="secend"
           @radio-change="currentRadioChange2"
           :isKuang="isKuang"
           @func="func"
+          :isHeigth="isHeigth1"
+          :shiyHeigth="shiyHeigth1"
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 3">
+      <div v-show="onDrawerNumber == 3">
         <dilTable
           v-bind.sync="third"
           @selection-change="currentRadioChange3"
           :isKuang="isKuang"
           @func="func"
+          :isHeigth="isHeigth2"
+          :shiyHeigth="shiyHeigth2"
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 4">
+      <div v-show="onDrawerNumber == 4">
         <dilTable
           v-bind.sync="unloadPoint"
           @radio-change="currentRadioChange4"
           :isKuang="isKuang"
           @func="func"
+          :isHeigth="isHeigth3"
+          :shiyHeigth="shiyHeigth3"
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 5">
+      <div v-show="onDrawerNumber == 5">
         <dilTable
           v-bind.sync="line"
           @radio-change="currentRadioChange5"
           :isKuang="isKuang"
           @func="func"
+          :isHeigth="isHeigth4"
+          :shiyHeigth="shiyHeigth4"
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 6">
+      <div v-show="onDrawerNumber == 6">
         <dilTable
           v-bind.sync="purchaseOrder"
           @radio-change="currentRadioChange6"
           :isKuang="isKuang"
           @func="func"
+          :isHeigth="isHeigth5"
+          :shiyHeigth="shiyHeigth5"
           :drawer="drawer"
         ></dilTable>
       </div>
@@ -199,19 +227,39 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      isKuang:false,
+      stateSupplier:null,
+      //限定first
+      isHeigth:true,
+      shiyHeigth:140,
+      //限定second
+      isHeigth1:true,
+      shiyHeigth1:140,
+      //限定third
+      isHeigth2:true,
+      shiyHeigth2:140,
+      //限定unloadPoint
+      isHeigth3:true,
+      shiyHeigth3:140,
+      //限定line
+      isHeigth4:true,
+      shiyHeigth4:140,
+      //限定purchaseOrder
+      isHeigth5:true,
+      shiyHeigth5:140,
+      isKuang: false,
       //采购订单号
-      purchaseOrderNo:'',
-      isMoreTrips:false,
+      purchaseOrderNo: "",
+      isMoreTrips: false,
+      purchaseOrgId:null,
       //订单类别
       orderTypeList: [
         {
           value: 6,
-          label: "老厂区",
+          label: "一厂",
         },
         {
           value: 7,
-          label: "新厂区",
+          label: "二厂",
         },
       ],
       // 线路名称
@@ -271,8 +319,7 @@ export default {
         mapList1: [],
       },
       secend: {
-        requestUrl:
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        requestUrl: "",
         selectionType: "radio",
         mapList2: [],
       },
@@ -282,17 +329,17 @@ export default {
         mapList3: [],
       },
       unloadPoint: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        requestUrl: "",
         selectionType: "radio",
       },
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "",
         selectionType: "radio",
       },
-      purchaseOrder:{
-        requestUrl: "/api/v1/ams/getPurchaseOrderList?apiId=81",
+      purchaseOrder: {
+        requestUrl: "",
         selectionType: "radio",
-      }
+      },
     };
   },
   watch: {
@@ -316,19 +363,49 @@ export default {
     onClick(index) {
       this.selectionList.splice(index, 1);
     },
+    onchange(){
+      if(this.orderType == 6){
+        this.purchaseOrgId = 1
+      }else{
+        this.purchaseOrgId = 2
+      }
+      this.getPurchaseOrderNo()
+    },
     onBlur() {
       this.getPurchaseOrderNo();
     },
+    //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      this.supplierName = item.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
     getPurchaseOrderNo() {
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
+        purchaseOrgId: this.purchaseOrgId
       };
       if (this.remark) {
         map.remark = this.remark;
       }
       console.log(this.map);
-      if (this.materialId && this.supplierId) {
+      if (this.materialId && this.supplierId && this.purchaseOrgId) {
         this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
           console.log(res);
           if (res.data.code == "200") {
@@ -337,17 +414,14 @@ export default {
                 message: "没有匹配的采购订单号!",
                 type: "warning",
               });
+              this.purchaseOrderNo = null
+              this.purchaseOrderId = null
+              this.remark = null
               this.form1 = [];
             } else {
-              console.log();
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
-              this.purchaseOrderNo=res.data.data.purchaseOrderNo;
-              if (res.data.data.receiveUnitId == 1) {
-                this.orderType = 6;
-              } else {
-                this.orderType = 7;
-              }
+              this.purchaseOrderNo = res.data.data.purchaseOrderNo;
             }
           } else {
             this.$message.error("请求失败");
@@ -355,80 +429,132 @@ export default {
         });
       }
     },
-    func(res){
-      this.isKuang = false;
-    },
     onclick() {
-      if(this.input){
+      if (this.input) {
         this.isKuang = true;
         if (this.onDrawerNumber == 1) {
-          this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" + this.input;
+          this.frist.requestUrl =
+            "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+            this.input + "&supplierId=" + this.supplierId;;
         } else if (this.onDrawerNumber == 2) {
-          this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId + "&index=" + this.input;
+          this.secend.requestUrl =
+            "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+            this.materialId +
+            "&index=" +
+            this.input;
         } else if (this.onDrawerNumber == 3) {
           //判断是否是承运商查询车辆
           if (getCookie("orgCode") == "chengyunshang") {
-            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + getCookie("userId") + "&index=" + this.input;
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              getCookie("userId") +
+              "&index=" +
+              this.input;
           } else {
-            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null + "&index=" + this.input;
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              null +
+              "&index=" +
+              this.input;
           }
         } else if (this.onDrawerNumber == 4) {
-          this.unloadPoint.requestUrl =  "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
+          this.unloadPoint.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
         } else if (this.onDrawerNumber == 5) {
-          this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
-        }else if (this.onDrawerNumber == 6) {
-          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&con=" + this.input+"&i="+new Date();
+          this.line.requestUrl =
+            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+        } else if (this.onDrawerNumber == 6) {
+          this.purchaseOrder.requestUrl =
+            "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+            this.supplierId +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
         }
-      }else{
+      } else {
         if (this.onDrawerNumber == 1) {
-          this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050"
+          this.frist.requestUrl =
+            "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i=" +
+            new Date();
         } else if (this.onDrawerNumber == 2) {
-          this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId;
+          this.secend.requestUrl =
+            "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+            this.materialId +
+            "&i=" +
+            new Date();
         } else if (this.onDrawerNumber == 3) {
           //判断是否是承运商查询车辆
           if (getCookie("orgCode") == "chengyunshang") {
-            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + getCookie("userId");
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              getCookie("userId") +
+              "&i=" +
+              new Date();
           } else {
-            this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              null +
+              "&i=" +
+              new Date();
           }
         } else if (this.onDrawerNumber == 4) {
-          this.unloadPoint.requestUrl =  "/api/v1/uc/getUnloadingMesByLike?apiId=374";
+          this.unloadPoint.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
         } else if (this.onDrawerNumber == 5) {
-          this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
-        }else if (this.onDrawerNumber == 6) {
-          this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81";
+          this.line.requestUrl =
+            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        } else if (this.onDrawerNumber == 6) {
+          this.purchaseOrder.requestUrl =
+            "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+            this.supplierId +
+            "&i=" +
+            new Date();
         }
-<<<<<<< HEAD
-=======
-      } else if (a == 4) {
-        this.unloadPoint.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
-      } else if (a == 5) {
-        this.option.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
->>>>>>> 9c1ccc273de01f5cc5dcdbff3c1f3ab12835836d
       }
     },
     ondrawer(num) {
-      this.onDrawerNumber = num;
+      if(this.supplierId == null){
+          this.$message.warning("请先填写发货单位")
+          return
+      }
       this.drawer = true;
-      if(num == 1){
-        this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050"
-      }else if (num == 2) {
-        this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId;
+      this.onDrawerNumber = num;
+      if (num == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input + "&supplierId=" + this.supplierId;
+      } else if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
       } else if (num == 3) {
         //判断是否是承运商查询车辆
         if (getCookie("orgCode") == "chengyunshang") {
-          this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + getCookie("userId") + "&i=" + new Date();
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
-          this.third.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null  + "&i=" + new Date();
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
       } else if (num == 4) {
-        this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
-        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
-      }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date() + "&con=" + "采购燃料";
+      } else if (num == 6) {
+        this.purchaseOrder.requestUrl =
+          "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+          this.supplierId +
+          "&i=" +
+          new Date();
       }
     },
     // 返回
@@ -438,6 +564,7 @@ export default {
     currentRadioChange1(selection) {
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
+      this.remark = null
       this.getPurchaseOrderNo();
     },
     currentRadioChange2(selection) {
@@ -454,6 +581,16 @@ export default {
       this.lineId = selection.lineId;
     },
     currentRadioChange6(selection) {
+      console.log(selection);
+      if (selection.orgId == 1) {
+        this.orderType = 6;
+      } else {
+        this.orderType = 7;
+      }
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.supplierId = selection.supplierId;
+      this.supplierName = selection.supplierName;
       this.purchaseOrderNo = selection.purchaseOrderNo;
       this.purchaseOrderId = selection.purchaseOrderId;
     },
@@ -461,6 +598,10 @@ export default {
       this.selectionList = [];
       this.selectionList = selection;
     },
+    func(res) {
+      console.log(res);
+      this.isKuang = false;
+    },
     // 确认
     onClickConfirm() {
       var state = 0;
@@ -479,31 +620,43 @@ export default {
             message: "请选择物资!",
             type: "warning",
           });
+          return;
+        } else if (!this.orderType) {
+          this.$message({
+            message: "请选择订单类别!",
+            type: "warning",
+          });
+          return;
         } else if (!this.supplierId) {
           this.$message({
             message: "请选择发货单位!",
             type: "warning",
           });
+          return;
         } else if (!this.purchaseOrderId) {
           this.$message({
             message: "没有匹配的采购订单号!",
             type: "warning",
           });
+          return;
         } else if (!this.unloadPointId) {
           this.$message({
             message: "请选择卸货地点!",
             type: "warning",
           });
+          return;
         } else if (!this.lineId) {
           this.$message({
             message: "请选择运输路线!",
             type: "warning",
           });
+          return;
         } else if (!sjTime(this.form1.orderEntryTime)) {
           this.$message({
             message: "请选择预估进厂时间!",
             type: "warning",
           });
+          return;
         }
       }
       if (this.selectionList.length == 0) {
@@ -511,7 +664,7 @@ export default {
           message: "请选择车辆!",
           type: "warning",
         });
-        state = 0;
+        return;
       } else {
         this.selectionList.forEach((e) => {
           if (e.orderMaterialWeight) {
@@ -523,44 +676,39 @@ export default {
                   message: "重量只能是整数!",
                   type: "warning",
                 });
-                state = 0;
+                return;
               }
             } else {
               this.$message({
                 message: "重量只能是数字!",
                 type: "warning",
               });
-              state = 0;
+              return;
             }
-          } else {
-            state = 1;
           }
         });
       }
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+        purchaseOrderId: this.purchaseOrderId,
+        unloadPointId: this.unloadPointId,
+        orderEntryTime: sjTime(this.form1.orderEntryTime),
+        driverCapacityIdList: this.selectionList,
+        orderType: this.orderType,
+        lineId: this.lineId,
+        isMoreTrips: this.isMoreTrips,
+      };
 
-      if (state == 1) {
-        let map = {
-          materialId: this.materialId,
-          supplierId: this.supplierId,
-          purchaseOrderId: this.purchaseOrderId,
-          unloadPointId: this.unloadPointId,
-          orderEntryTime: sjTime(this.form1.orderEntryTime),
-          driverCapacityIdList: this.selectionList,
-          orderType: this.orderType,
-          lineId: this.lineId,
-          isMoreTrips:this.isMoreTrips,
-        };
-        console.log(map, map);
-        this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
-          if (res.data.code == "200") {
-            this.$message({
-              message: "添加成功!",
-              type: "success",
-            });
-            this.$router.push("/transportReserveRan");
-          }
-        });
-      }
+      this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+        if (res.data.code == "200") {
+          this.$message({
+            message: "添加成功!",
+            type: "success",
+          });
+          this.$router.push("/transportReserveRan");
+        }
+      });
     },
   },
 };
@@ -569,6 +717,10 @@ export default {
 .contractDetails {
   width: 100%;
 }
+
+.el-drawer__container ::-webkit-scrollbar {
+  display: none;
+}
 .from {
   display: flex;
   align-items: center;
@@ -589,6 +741,15 @@ export default {
     margin-right: 20px;
   }
 }
+.supplieUnit {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
+  .el-input {
+    width: 250px;
+  }
+}
 .lineId {
   display: flex;
   justify-content: center;
@@ -601,7 +762,7 @@ export default {
     width: 250px;
     margin-right: 20px;
   }
-  .span{
+  .span {
     display: inline-block;
     width: 70px;
     height: 1px;
@@ -680,6 +841,15 @@ export default {
     }
   }
 }
+.drawer_top{
+  margin-top: -50px;
+  width: 100%;height: 60px;
+  display: flex;
+  align-items: center;
+}
+.drawer_table1{
+  width: 100%;height: 500px;
+}
 .button_box {
   display: flex;
   justify-content: center;

src/views/TMS/components/importedFuel/truckDriverReceiveRan.vue

@@ -90,6 +90,17 @@ export default {
     }
   },
   methods: {
+    getRequestUrl(){
+      if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&carrierSSOId=" + null +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" + null +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&carrierSSOId=" + null +"&i="+new Date();
+    }
+    },
     onclick() {
     if (getCookie("orgCode") == "chengyunshang") {
        if(this.activeName == "option"){
@@ -118,7 +129,7 @@ export default {
         this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
           if(res.data.code == "200"){
             this.$message.success('关闭成功')
-            this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&con=" + this.input +"&i="+new Date();
+            this.getRequestUrl()
           }
         })
       }

src/views/TMS/components/importedFuel/truckEnfactoryRanLaoResult.vue

@@ -1,8 +1,12 @@
 <template>
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>      <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -13,11 +17,14 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -28,7 +35,32 @@ export default {
 
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6&con=" + this.input;
+let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
     updateClick(resultId) {
       this.$router.push("/truckLoadResultEdit/" + resultId);

src/views/TMS/components/importedFuel/truckEnfactoryRanXingResult.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -13,11 +18,14 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -28,7 +36,32 @@ export default {
  
   methods: {
     onclick() {
-            this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=7&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
     updateClick(resultId) {
       this.$router.push("/truckLoadResultEdit/" + resultId);

src/views/TMS/components/importedFuel/truckLeaveFactoryRanLaoResult.vue

@@ -2,8 +2,13 @@
   <!-- 辅料出厂作业页面 -->
   <div class="homeworkPath">
    <div class="top"> 
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -14,12 +19,15 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6",
@@ -30,7 +38,26 @@ export default {
   methods: {
     
     onclick() {
-     this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6&con=" + this.input;
+       let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
+      }  
     },
    }
 };

src/views/TMS/components/importedFuel/truckLeaveFactoryRanXingResult.vue

@@ -2,8 +2,13 @@
   <!-- 燃料出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+     <span class="text">出厂时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text1">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
@@ -14,12 +19,15 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
       input: "",
+      startTime: null,
+      endTime: null,
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=7",
@@ -29,7 +37,26 @@ export default {
 
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=7&con=" + this.input;
+        let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=7&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+          }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=7&startTime="+startTime+"&endTime="+endTime+"&i=" +new Date();
+        
+      }  
     },
    }
 };

src/views/TMS/components/importedIngredients/transportReserveFu.vue

@@ -1,31 +1,65 @@
 <template>
-  <!-- 采购辅料运输预约 -->
+  <!-- 辅料运输预约 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" @click="insertClick" >
+      <el-input
+        class="input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="insertClick">
         <i class="el-icon-plus"></i>新增
       </el-button>
-       <el-button type="primary" @click="sendClick(0)" >
-        <i class="el-icon-bottom"></i>下发
+      <el-button
+        type="primary"
+        class="btn"
+        @click="issue"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-plus"></i>下发
       </el-button>
     </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-         <!-- 未下发 -->
+    <el-tabs v-model="activeName" tab-click="handleClick">
+      <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
-        <dilTable v-bind.sync="option1" ref="table" @selection-change="selectionChange">
-          <el-table-column fixed="right" align="center" label="操作" width="120">
+        <dilTable
+          v-bind.sync="option1"
+          ref="table"
+          @selection-change="selectionChange"
+        >
+          <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="120"
+          >
             <template slot-scope="scope">
-              <el-button @click="sendClick(1,scope.row.orderId)"  type="text" size="small">
+              <el-button
+                @click="sendClick(scope.row.orderId)"
+                type="text"
+                size="small"
+              >
                 下发
               </el-button>
-              <el-button @click="updateClick(scope.row.orderId)" type="text" size="small">
+              <el-button
+                @click="updateClick(scope.row.orderId)"
+                type="text"
+                size="small"
+              >
                 修改
               </el-button>
-              <el-button @click="deleteClick(scope.row.orderId, scope.row.capacityNumber)" type="text" size="small">
+              <el-button
+                @click="
+                  deleteClick(scope.row.orderId, scope.row.capacityNumber)
+                "
+                type="text"
+                size="small"
+              >
                 删除
               </el-button>
             </template>
@@ -34,21 +68,14 @@
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2">
-           <el-table-column fixed="right" align="center" label="操作" width="120">
-            <template slot-scope="scope">
-              <el-button @click="CloseClick(scope.row.orderId)"  type="text" size="small">
-               关闭
-              </el-button>
-            </template>
-          </el-table-column>
-        </dilTable>
+        <dilTable v-bind.sync="option2"> </dilTable>
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "inplantTMS",
   data() {
@@ -58,72 +85,111 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5",
-        // 控制显示多选列
+        requestUrl: "",
         selectionType: "select",
+        mapList: [],
       },
-       option2: {
+      option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&orderType=5",
+        requestUrl: "",
       },
-      selection:[],
     };
   },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+        getCookie("userId");
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+        getCookie("userId");
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+        null;
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+        null;
+    }
+  },
   methods: {
-    //获取选中的订单
-    selectionChange(selection){
-      this.selection = [];
-      selection.forEach(e => {
-       this.selection.push({orderId:e.orderId});
-      });
+    handleClick(){
+      this.getRequestUrl()
+    },
+    getRequestUrl(){
+        //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+        null + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+        null + "&i=" + new Date();
+    }
     },
     onclick() {
-      if(this.activeName == "first"){
-        this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&con=" + this.input;
-      }else{
-        this.option2.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&orderType=5&con=" + this.input;
-      }
+      if (this.activeName == "first") {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      } else {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      }
     },
-    handleClick(tab, event) {
-      console.log(tab, event);
+    selectionChange(selection) {
+      this.mapList = selection;
     },
-     // 下发
-    CloseClick(orderId) {
-      this.$confirm("是否关闭", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-         this.axios
-            .post(
-              "/api/v1/oms/CloseOrder",{
-                orderId: orderId
-              }
-            )
-            .then(() => {
-              this.$router.go(0);
-            })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "关闭成功!",
-          });
-          // console.log(this.arr[0].text_prop);
-   
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消关闭!",
-          });
+    issue() {
+      let mapvalue = {
+        mapList: this.mapList,
+      };
+      this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
+        this.$message({
+          type: "success",
+          message: "下发成功!",
         });
+        this.option1.requestUrl =
+          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=" +
+          new Date();
+      });
     },
-
-
-    //关闭
-
-    sendClick(index,orderId) {
+    // 下发
+    sendClick(orderId) {
+      let mapvalue = {
+        mapList: [{ orderId: orderId }],
+      };
       this.$confirm("是否下发", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -131,32 +197,13 @@ export default {
         center: true,
       })
         .then(() => {
-          let orderList = [];
-          if(index == 0){
-            if(this.selection.length > 0){
-              orderList=this.selection;
-            }else{
-            this.$message({
-              type: "warning",
-              message: "请选择要下发的订单!",
-            });
-            }
-          }else if(index == 1){
-            orderList.push({orderId:orderId})
-          }
-          this.axios
-            .post(
-              "/api/v1/oms/dispatchOrder",{
-                mapList:orderList
-              }
-            )
-            .then(() => {
-              this.option1.requestUrl = "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=0"
-            });
+          this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
             this.$message({
               type: "success",
               message: "下发成功!",
             });
+            this.getRequestUrl()
+          });
         })
         .catch(() => {
           this.$message({
@@ -179,14 +226,12 @@ export default {
             message: "删除成功!",
           });
           this.axios
-            .post(
-               "/api/v1/oms/deleteOrder",{
-                 orderId: orderId,
-                 capacityNumber: capacityNumber
-              }
-            )
+            .post("/api/v1/oms/deleteOrder", {
+              orderId: orderId,
+              capacityNumber: capacityNumber,
+            })
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {
@@ -204,14 +249,20 @@ export default {
     updateClick(orderId) {
       this.$router.push("/transportReserveFuEdit/" + orderId);
     },
-
   },
 };
 </script>
 <style lang='scss' scoped>
 .homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
+  .top {
+    padding: 40px;
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
+    .btn {
+      margin-right: 10px;
+    }
   }
 }
 </style>

src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -2,37 +2,56 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-
-    <div class="main">
-      <el-divider content-position="left">新增运输预约</el-divider>
+     <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>辅料预约界面</span>
+    </div>
+    <div class="supplieUnit">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="发货单位:">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入发货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+     </el-form>
     </div>
-
     <div class="material from">
       <span class="text">物资：</span>
-      <el-input v-model="materialName" disabled> </el-input>
+      <el-input class="input" v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-
-    <div class="forwardingUnit from">
-      <span class="text">发货单位：</span>
-      <el-input v-model="supplierName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
-    </div>
     <div class="remark from">
       <span class="text">船名：</span>
-      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
       <span class="text">卸货点：</span>
-      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-input class="input" v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
     <div class="lineId from">
       <span class="text">选择路线：</span>
-      <el-input v-model="lineName" disabled> </el-input>
+      <el-input class="input" v-model="lineName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
     </div>
+    <div class="lineId from">
+      <span class="text">采购订单号：</span>
+      <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
+    </div>
     <div class="contractTitle from">
       <dil-form :formId="219" v-model="form1"></dil-form>
     </div>
@@ -44,14 +63,21 @@
         >
       </div>
     </div>
-    <!-- 车辆表格 -->
+    <div class="lineId from">
+      <span class="text">该批车辆是否一车多趟：</span>
+      <el-switch v-model="isMoreTrips" active-text="是" inactive-text="否">
+      </el-switch>
+    </div>
+      <!-- 物资和装卸点以及装卸货次序 -->
+    <div class="swtichTop">
+    <span class="titile">选择车辆前请选择物资单位！</span>
     <div class="switch" v-if="selectionList.length > 0">
       <el-tooltip placement="top">
         <div slot="content">下面表格已有数据，不能进行更改！！！</div>
         <el-switch
           v-model="value"
-          active-text="重量"
-          inactive-text="件数"
+          active-text="件数"
+          inactive-text="重量"
           disabled
         >
         </el-switch>
@@ -60,10 +86,11 @@
     <div class="switch" v-else>
       <el-tooltip placement="top">
         <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
-        <el-switch v-model="value" active-text="重量" inactive-text="件数">
+        <el-switch v-model="value" active-text="件数" inactive-text="重量">
         </el-switch>
       </el-tooltip>
     </div>
+    </div>
     <div class="truckListTable">
       <el-table
         :data="selectionList"
@@ -81,23 +108,24 @@
           align="center"
           show-overflow-tooltip
         >
-          <template slot="scope" v-if="item.th_name !== '件数'">
-            <span>{{ item.label }}</span>
-          </template>
           <template slot="scope" v-if="item.th_name !== '重量'">
             <span>{{ item.label }}</span>
           </template>
           <!-- 插入输入框 -->
           <template slot-scope="scope">
             <template v-if="item.slot">
-              <template v-if="item.prop == 'orderMaterialNumber'">
+              <template v-if="item.prop == 'orderMaterialWeight'">
                 <el-input
-                  v-model.number="scope.row.orderMaterialNumber"
+                  style="width: 250px"
+                  v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
               </template>
-              <template v-if="item.prop == 'orderMaterialWeight'">
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
                 <el-input
-                  v-model.number="scope.row.orderMaterialWeight"
+                  class="textinput"
+                  v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
                 ></el-input>
               </template>
             </template>
@@ -117,49 +145,79 @@
       </el-table>
     </div>
     <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
-      <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
-        clearable
-      ></el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="onclick(a)"
-        style="margin-bottom: 0.9375rem"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div v-show="a == 1">
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+      <div class="drawer_top">
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-right: 10px; width: 250px"
+          clearable
+        ></el-input>
+        <el-button type="primary" class="btn" @click="onclick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div class="drawer_table1" v-show="onDrawerNumber == 1">
         <dilTable
           v-bind.sync="frist"
           @radio-change="currentRadioChange1"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth"
+          :shiyHeigth="shiyHeigth"
+          :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-show="a == 2">
+      <div v-show="onDrawerNumber == 2">
         <dilTable
           v-bind.sync="secend"
           @radio-change="currentRadioChange2"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth1"
+          :shiyHeigth="shiyHeigth1"
+          :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-show="a == 3">
+      <div v-show="onDrawerNumber == 3">
         <dilTable
           v-bind.sync="third"
           @selection-change="currentRadioChange3"
+          :isHeigth="isHeigth2"
+          :shiyHeigth="shiyHeigth2"
         ></dilTable>
       </div>
-      <div v-show="a == 4">
+      <div v-show="onDrawerNumber == 4">
         <dilTable
           v-bind.sync="unloadPoint"
           @radio-change="currentRadioChange4"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth3"
+          :shiyHeigth="shiyHeigth3"
+          :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-show="a == 5">
+      <div v-show="onDrawerNumber == 5">
         <dilTable
           v-bind.sync="line"
           @radio-change="currentRadioChange5"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth4"
+          :shiyHeigth="shiyHeigth4"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 6">
+        <dilTable
+          v-bind.sync="purchaseOrder"
+          @radio-change="currentRadioChange6"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth5"
+          :shiyHeigth="shiyHeigth5"
+          :drawer="drawer"
         ></dilTable>
       </div>
     </el-drawer>
@@ -171,11 +229,34 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
     return {
+      //限定first
+      isHeigth:true,
+      shiyHeigth:140,
+      //限定second
+      isHeigth1:true,
+      shiyHeigth1:140,
+      //限定third
+      isHeigth2:true,
+      shiyHeigth2:140,
+      //限定unloadPoint
+      isHeigth3:true,
+      shiyHeigth3:140,
+      //限定line
+      isHeigth4:true,
+      shiyHeigth4:140,
+      //限定purchaseOrder
+      isHeigth5:true,
+      shiyHeigth5:140,
+      isKuang: false,
+      //采购订单号
+      purchaseOrderNo: "",
+      isMoreTrips: false,
       // 线路名称
       lineName: "",
       //线路id
@@ -197,11 +278,15 @@ export default {
           width: "140",
         },
         {
-          prop: "orderMaterialNumber",
-          label: "件数",
+          prop: "orderMaterialWeight",
+          label: "重量",
           slot: true,
         },
       ],
+      //发货单位名称
+      supplierName: "",
+      stateSupplier:null,
+      restaurantsSupplier:null,
       //车辆表格数据
       selectionList: [],
       // 表单
@@ -222,54 +307,75 @@ export default {
       unloadPointId: "",
       //卸货点名称
       unloadPointName: "",
-      a: 1,
+      //订单类别
+      orderType: 5,
+      onDrawerNumber: 1,
       direction: "rtl",
       input: "",
       frist: {
-        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
+        requestUrl: "",
         selectionType: "radio",
         mapList1: [],
       },
       secend: {
-        requestUrl:
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+        requestUrl: "",
         selectionType: "radio",
         mapList2: [],
       },
       third: {
-        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        requestUrl: "",
         selectionType: "select",
         mapList3: [],
       },
       unloadPoint: {
-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        requestUrl: "",
         selectionType: "radio",
       },
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "",
         selectionType: "radio",
       },
+      purchaseOrder: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      truckList:[]
     };
   },
   watch: {
+    drawer(val) {
+      if (val) {
+        this.input = null;
+      }   
+    },
     value() {
       if (this.value) {
         this.tableTop.splice(this.tableTop.length - 1, 1);
         this.tableTop.push({
-          prop: "orderMaterialWeight",
-          label: "重量",
+          prop: "orderMaterialNumber",
+          label: "件数",
           slot: true,
         });
       } else {
         this.tableTop.splice(this.tableTop.length - 1, 1);
         this.tableTop.push({
-          prop: "orderMaterialNumber",
-          label: "件数",
+          prop: "orderMaterialWeight",
+          label: "重量",
           slot: true,
         });
       }
     },
   },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+    }
+  },
   methods: {
     onClick(index) {
       this.selectionList.splice(index, 1);
@@ -277,6 +383,27 @@ export default {
     onBlur() {
       this.getPurchaseOrderNo();
     },
+      //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      this.supplierName = item.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
     getPurchaseOrderNo() {
       let map = {
         materialId: this.materialId,
@@ -296,10 +423,14 @@ export default {
                 type: "warning",
               });
               this.form1 = [];
+              this.purchaseOrderId = null
+              this.purchaseOrderNo = null
+              this.remark = null
             } else {
+              console.log();
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
-              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
+              this.purchaseOrderNo = res.data.data.purchaseOrderNo;
             }
           } else {
             this.$message.error("请求失败");
@@ -307,53 +438,152 @@ export default {
         });
       }
     },
-    onclick(a) {
-      if (a == 1) {
-        this.frist.requestUrl =
-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input;
-      } else if (a == 2) {
-        this.secend.requestUrl =
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
-          this.materialId +
-          "&index=" +
-          this.input;
-      } else if (a == 3) {
-        this.third.requestUrl =
-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
-          this.input;
-      } else if (a == 4) {
-        this.third.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
-      } else if (a == 5) {
-        this.option.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+    onclick() {
+      if (this.input) {
+        this.isKuang = true;
+        if (this.onDrawerNumber == 1) {
+          this.frist.requestUrl =
+            "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+            this.input + "&supplierId=" + this.supplierId;
+        } else if (this.onDrawerNumber == 2) {
+          this.secend.requestUrl =
+            "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+            this.materialId +
+            "&index=" +
+            this.input;
+        } else if (this.onDrawerNumber == 3) {
+          //判断是否是承运商查询车辆
+          if (getCookie("orgCode") == "chengyunshang") {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              getCookie("userId") +
+              "&index=" +
+              this.input;
+          } else {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              null +
+              "&index=" +
+              this.input;
+          }
+        } else if (this.onDrawerNumber == 4) {
+          this.unloadPoint.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
+        } else if (this.onDrawerNumber == 5) {
+          this.line.requestUrl =
+            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+        } else if (this.onDrawerNumber == 6) {
+          this.purchaseOrder.requestUrl =
+            "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+            this.supplierId +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
+        }
+      } else {
+        if (this.onDrawerNumber == 1) {
+          this.frist.requestUrl =
+            "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i=" +
+            new Date() + "&supplierId=" + this.supplierId;
+        } else if (this.onDrawerNumber == 2) {
+          this.secend.requestUrl =
+            "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+            this.materialId +
+            "&i=" +
+            new Date();
+        } else if (this.onDrawerNumber == 3) {
+          //判断是否是承运商查询车辆
+          if (getCookie("orgCode") == "chengyunshang") {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              getCookie("userId") +
+              "&i=" +
+              new Date();
+          } else {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              null +
+              "&i=" +
+              new Date();
+          }
+        } else if (this.onDrawerNumber == 4) {
+          this.unloadPoint.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
+        } else if (this.onDrawerNumber == 5) {
+          this.line.requestUrl =
+            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        } else if (this.onDrawerNumber == 6) {
+          this.purchaseOrder.requestUrl =
+            "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+            this.supplierId +
+            "&i=" +
+            new Date();
+        }
       }
     },
+    func(res) {
+      console.log(res);
+      this.isKuang = false;
+    },
     ondrawer(num) {
+      if(this.supplierId == null){
+          this.$message.warning("请先选择发货单位")
+          return
+      }
+      if(num != 1 && this.materialId == null){
+          this.$message.warning("请先选择物资")
+          return
+      }
       this.drawer = true;
-      this.a = num;
-      if (num == 2) {
+      this.onDrawerNumber = num;
+      if (num == 1) {
+          this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input + "&supplierId=" + this.supplierId;   
+      } else if (num == 2) {
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
           this.materialId;
+      } else if (num == 3) {
+        //判断是否是承运商查询车辆
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
+        }
+      } else if (num == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
+      } else if (num == 5) {
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=辅料&i=" + new Date();
+      } else if (num == 6) {
+        this.purchaseOrder.requestUrl =
+          "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+          this.supplierId +
+          "&i=" +
+          new Date();
       }
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/transportReserveFu");
+      this.$router.push("/transportReserveRan");
     },
     currentRadioChange1(selection) {
-      this.input = null;
+      this.remark = null ;
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.getPurchaseOrderNo();
     },
-    currentRadioChange2(selection) {
-      this.supplierName = selection.supplierName;
-      this.supplierId = selection.supplierId;
-      this.getPurchaseOrderNo();
-    },
     currentRadioChange4(selection) {
       this.unloadPointId = selection.warehouseId;
       this.unloadPointName = selection.warehouseName;
@@ -362,6 +592,15 @@ export default {
       this.lineName = selection.lineName;
       this.lineId = selection.lineId;
     },
+    currentRadioChange6(selection) {
+      console.log(selection.orgId);
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.supplierId = selection.supplierId;
+      this.supplierName = selection.supplierName;
+      this.purchaseOrderNo = selection.purchaseOrderNo;
+      this.purchaseOrderId = selection.purchaseOrderId;
+    },
     currentRadioChange3(selection) {
       this.selectionList = [];
       this.selectionList = selection;
@@ -384,31 +623,38 @@ export default {
             message: "请选择物资!",
             type: "warning",
           });
-        } else if (!this.supplierId) {
+          return;
+        } 
+         else if (!this.supplierId) {
           this.$message({
             message: "请选择发货单位!",
             type: "warning",
           });
+          return;
         } else if (!this.purchaseOrderId) {
           this.$message({
             message: "没有匹配的采购订单号!",
             type: "warning",
           });
+          return;
         } else if (!this.unloadPointId) {
           this.$message({
             message: "请选择卸货地点!",
             type: "warning",
           });
+          return;
         } else if (!this.lineId) {
           this.$message({
             message: "请选择运输路线!",
             type: "warning",
           });
+          return;
         } else if (!sjTime(this.form1.orderEntryTime)) {
           this.$message({
             message: "请选择预估进厂时间!",
             type: "warning",
           });
+          return;
         }
       }
       if (this.selectionList.length == 0) {
@@ -416,116 +662,182 @@ export default {
           message: "请选择车辆!",
           type: "warning",
         });
-        state = 0;
+        return;
       } else {
         this.selectionList.forEach((e) => {
-          if (e.orderMaterialNumber || e.orderMaterialWeight) {
-            if (
-              isNumber(e.orderMaterialNumber) ||
-              isNumber(e.orderMaterialWeight)
-            ) {
-              if (
-                isIntegerNumber(e.orderMaterialNumber) ||
-                isIntegerNumber(e.orderMaterialWeight)
-              ) {
+          if (e.orderMaterialWeight) {
+            if (isNumber(e.orderMaterialWeight)) {
+              if (isIntegerNumber(e.orderMaterialWeight)) {
                 state = 1;
               } else {
                 this.$message({
-                  message: "件数(重量)只能是整数!",
+                  message: "重量只能是整数!",
                   type: "warning",
                 });
-                state = 0;
+                return;
               }
             } else {
               this.$message({
-                message: "件数(重量)只能是数字!",
+                message: "重量只能是数字!",
                 type: "warning",
               });
-              state = 0;
+              return;
             }
-          } else {
-            this.$message({
-              message: "件数(重量)不能为空!",
-              type: "warning",
-            });
-            state = 0;
           }
         });
       }
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+        purchaseOrderId: this.purchaseOrderId,
+        unloadPointId: this.unloadPointId,
+        orderEntryTime: sjTime(this.form1.orderEntryTime),
+        driverCapacityIdList: this.selectionList,
+        orderType: this.orderType,
+        lineId: this.lineId,
+        isMoreTrips: this.isMoreTrips,
+      };
 
-      if (state == 1) {
-        let map = {
-          materialId: this.materialId,
-          supplierId: this.supplierId,
-          purchaseOrderId: this.purchaseOrderId,
-          unloadPointId: this.unloadPointId,
-          orderEntryTime: sjTime(this.form1.orderEntryTime),
-          driverCapacityIdList: this.selectionList,
-          orderType: 5,
-          lineId: this.lineId,
-        };
-        console.log(map, map);
-        this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
-          if (res.data.code == "200") {
-            this.$message({
-              message: "添加成功!",
-              type: "success",
-            });
-            this.$router.push("/transportReserveFu");
-          }
-        });
-      }
+      this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+        if (res.data.code == "200") {
+          this.$message({
+            message: "添加成功!",
+            type: "success",
+          });
+          this.$router.push("/transportReserveFu");
+        }
+      });
     },
   },
 };
 </script>
-
-<style lang="scss" >
+<style lang="scss">
 .contractDetails {
   width: 100%;
 }
+
+.el-drawer__container ::-webkit-scrollbar {
+  display: none;
+}
 .from {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
+  margin-top: 5px;
+  margin-bottom: 20px;
 }
 .remark {
+  display: flex;
+  justify-content: center;
   .text {
     display: inline-block;
-    width: 5.625rem;
+    width: 100px;
     text-align: right;
   }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
 }
 .lineId {
+  display: flex;
+  justify-content: center;
   .text {
     display: inline-block;
-    width: 10rem;
+    width: 170px;
     text-align: right;
   }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .span {
+    display: inline-block;
+    width: 70px;
+    height: 1px;
+  }
+}
+.swtichTop{
+  display: flex;
+  height: 40px;
+  align-content: center;
+  justify-content: center;
+  padding-right:20px ;
+  .titile{
+    color: red;
+    font-size: 14px;
+  }
+  .switch{
+    margin-right: -30px
+  }
+}
+.supplieUnit {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
+  .el-input {
+    width: 250px;
+  }
 }
 .material {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
   .text {
     display: inline-block;
-    width: 10rem;
+    width: 170px;
     text-align: right;
   }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
 }
-.switch {
-  width: 100%;
-  height: 2.5rem;
+.orderType {
   display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  padding-right: 6.875rem;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 110px;
+    text-align: right;
+  }
+  .select {
+    width: 250px;
+  }
+  .span {
+    display: inline-block;
+    width: 30px;
+    height: 10px;
+  }
+}
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
 }
 .forwardingUnit {
+  display: flex;
+  justify-content: center;
   .text {
     display: inline-block;
-    width: 10rem;
+    width: 170px;
     text-align: right;
   }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
 }
 .truckList1 {
   width: 100%;
@@ -533,19 +845,28 @@ export default {
     width: 96%;
     .text {
       display: inline-block;
-      width: 9.375rem;
+      width: 120px;
       text-align: right;
     }
     .truckBtn {
-      width: 17.5rem;
+      width: 250px;
     }
   }
 }
+.drawer_top{
+  margin-top: -50px;
+  width: 100%;height: 60px;
+  display: flex;
+  align-items: center;
+}
+.drawer_table1{
+  width: 100%;height: 500px;
+}
 .button_box {
   display: flex;
   justify-content: center;
   align-items: center;
   width: 100%;
-  height: 6.25rem;
+  height: 100px;
 }
 </style>

src/views/TMS/components/importedIngredients/transportReserveFuEdit.vue

@@ -2,63 +2,152 @@
   <!-- 修改运输预约页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="main">
-      <span class="text">修改运输预约</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="258" v-model="form1"></dil-form>
-          <div>
-            <div v-if="form1.orderMaterialNumber">
-              <span>物资件数：</span>
-              <el-input placeholder="请输入内容" v-model="orderMaterialNumber" clearable>
-              </el-input>
-            </div>
-             <div v-if="form1.orderMaterialWeight">
-              <span>物资重量：</span>
-              <el-input placeholder="请输入内容" v-model="orderMaterialWeight" clearable>
-              </el-input>
-            </div>
-          </div>
+      <div class="form-one">
+        <dil-form :formId="220" v-model="form1"> </dil-form>
+      </div>
+      <div class="btn">
+        <div class="btn1">
+          <el-button type="primary" @click="selectTruck">浏览</el-button>
+        </div>
+        <div class="btn1">
+          <el-button type="primary" @click="selectUnloadingPoint"
+            >浏览</el-button
+          >
         </div>
       </div>
     </div>
-    <div class="button-box">
+
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
+
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      size="40%"
+      :wrapperClosable="true"
+      :close-on-press-escape="false"
+      :destroy-on-close="false"
+      :show-close="false"
+      :withHeader="true"
+      modal
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem; width: 200px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="third"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
     return {
       form1: {},
-      orderMaterialNumber:'',
-      orderMaterialWeight:'',
+      drawer: false,
+      direction: "rtl",
+      a: null,
+      third: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+      capacityId: null,
+      warehouseId: null,
+      input: null,
+      orderType: null,
     };
   },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+    }
+  },
   mounted() {
     this.information();
   },
   methods: {
+    onclick(a) {
+      if (a == 1) {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      } else if (a == 2) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&con=" + this.input;
+      }
+    },
+    selectTruck() {
+      this.a = 1;
+      this.drawer = true;
+    },
+    selectUnloadingPoint() {
+      this.a = 2;
+      this.drawer = true;
+    },
+    currentRadioChange(row) {
+      this.form1.capacityNumber = row.capacityNumber;
+      this.capacityId = row.capacityId;
+    },
+    currentRadioChange2(row) {
+      this.form1.warehouseName = row.warehouseName;
+      this.warehouseId = row.warehouseId;
+    },
     information() {
       this.axios
         .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
-            if(e.orderMaterialNumber){
-              this.orderMaterialNumber = e.orderMaterialNumber;
-            }else if(e.orderMaterialWeight){
-              this.orderMaterialWeight = e.orderMaterialWeight;
-            }
           });
         });
     },
@@ -70,31 +159,56 @@ export default {
     onClickConfirm() {
       let obj = {
         orderId: this.$route.params.orderId,
-        orderMaterialNumber: this.form1.orderMaterialNumber,
+        capacityId: parseInt(this.capacityId),
+        unloadPointId: this.warehouseId,
         orderEntryTime: sjTime(this.form1.orderEntryTime),
-        unloadPointId: this.form1.unloadPointId,
-        orderType: 5,
+        orderType: parseInt(this.form1.orderType),
       };
-
-      if (
-        obj.orderId == null ||
-        obj.orderMaterialNumber == null ||
-        obj.orderEntryTime == null ||
-        obj.unloadPointId == null
-      )
-        this.$message.error("存在空值！");
-      else
-        this.axios.post("/api/v1/oms/updateOrder", obj).then(() => {
+      this.axios.post("/api/v1/oms/updateOrder", obj).then((res) => {
+        if (res.data.code == "200") {
           this.$message({
             type: "success",
             message: "修改成功!",
           });
-          this.$router.go(-1);
-        });
+          this.$router.push("/transportReserveFu");
+        }
+      });
     },
   },
 };
 </script>
-<style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
-</style>  
+<style lang="scss">
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  margin: 20px;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+      font-size: 14px;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
+  .btn {
+    margin-left: 20px;
+    padding-top: 105px;
+    .btn1 {
+      margin-bottom: 15px;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-button {
+    width: 80px;
+    margin: 10px;
+  }
+}
+</style>

src/views/TMS/components/importedIngredients/truckDriverReceiveFu.vue

@@ -1,113 +1,158 @@
 <template>
-  <!-- 运输派单 -->
+  <!-- 辅料运输派单 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="clickClose" v-if="activeName == 'option'">
+        <i class="el-icon-close"></i>关闭
+      </el-button>
     </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <!-- 未接收 -->
-      	<el-tab-pane label="未接收" name="third">
-						<dilTable v-bind.sync="option0">
-              <el-table-column fixed="right" label="操作" width="50">
-        <template slot-scope="scope">
-          <el-button @click="closeOrder(scope.row.orderId)" type="text" size="small">
-            关闭
-          </el-button>
-        </template>
-      </el-table-column>
-						</dilTable>
-					</el-tab-pane>
-      <!-- 未下发 -->
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="未接收" name="option">
+        <dilTable v-bind.sync="option" @selection-change="selectionChange"> </dilTable>
+      </el-tab-pane>
       <el-tab-pane label="已接收" name="first">
-        <dilTable v-bind.sync="option1" ref="table">
-        </dilTable>
+        <dilTable v-bind.sync="option1"> </dilTable>
       </el-tab-pane>
-      <!-- 已下发 -->
       <el-tab-pane label="已拒绝" name="second">
-        <dilTable v-bind.sync="option2">
-        </dilTable>
+        <dilTable v-bind.sync="option2"> </dilTable>
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "inplantTMS",
   data() {
     return {
       input: "",
       Time: "",
-      activeName: "first",
-       option0: {
+      activeName: "option",
+      option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4"
+        requestUrl:"",
+        selectionType: "select",
       },
       option1: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5"
+        requestUrl:"",
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=6"
-      }
+        requestUrl:"",
+      },
+      list:[],
     };
   },
+  watch:{
+    activeName(val){
+      if (getCookie("orgCode") == "chengyunshang") {
+        if(val == "option"){
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "first"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "second"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+        }
+      }else{
+        if(val == "option"){
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "first"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "second"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+        }
+      }
+      
+    }
+  },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + getCookie("userId");
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + getCookie("userId");
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + getCookie("userId");
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + null;
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + null;
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + null;
+    }
+  },
   methods: {
-    closeOrder(orderId) {
-      this.$confirm("是否关闭", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-           this.axios
-            .post(
-              "/api/v1/oms/closeOmstruckOrde?orderId="+orderId
-            )
-            .then((res) => {
-           if(res.data.code == '200')
-              // if(res.data.code)
-              this.$router.go(0);
-            });
-          this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
-          // console.log(this.arr[0].text_prop);
-         
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消关闭!",
-          });
-        });
+    getRequestUrl(){
+      //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&carrierSSOId=" + null +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&carrierSSOId=" + null +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&carrierSSOId=" + null +"&i="+new Date();
+    }
     },
     onclick() {
-       if(this.activeName == "first"){
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&con=" + this.input;
-      }else if(this.activeName == "second"){
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=6&con=" + this.input;
-      }else
-      {
-        this.option0.requestUrl="/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con="+this.input;
+    if (getCookie("orgCode") == "chengyunshang") {
+       if(this.activeName == "option"){
+        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      }else if (this.activeName == "first") {
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      }
+    }else{
+      if(this.activeName == "option"){
+        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      }else if (this.activeName == "first") {
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
       }
+    }
+      
     },
-    handleClick(tab, event) {
-      console.log(tab, event);
+    clickClose(){
+      console.log(this.list)
+      if(this.list.length == 0){
+        this.$message.warning('请选择订单之后在关闭')
+      }else{
+        this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
+          if(res.data.code == "200"){
+            this.$message.success('关闭成功')
+            this.getRequestUrl()
+          }
+        })
+      }
+
     },
+    selectionChange(selection){
+      this.list = [],
+      selection.forEach(e => {
+        this.list.push(e.orderId)
+      });
+    }
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
+  .top {
+    padding: 40px;
+    .input {
+      width: 250px;
+      margin-right: 10px;
+    }
   }
 }
 </style>

src/views/TMS/components/importedIngredients/truckEnfactoryFuResult.vue

@@ -1,11 +1,15 @@
 <template>
-  <!-- 辅料进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <span class="text">进门时间：</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">
       
@@ -14,11 +18,14 @@
 </template>
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {
     return {
       restaurants: [],
+      startTime: null,
+      endTime: null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -26,24 +33,35 @@ export default {
       },
     };
   },
+
   methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+
+          // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
+          // this.options.requestUrl = "/api/v1/wms/getWmsInboundResult?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }else{
+          // this.options.requestUrl = '/api/v1/wms/getWmsInboundResult?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          // }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl()
+      }
     },
     updateClick(resultId) {
       this.$router.push("/truckLoadResultEdit/" + resultId);
@@ -52,18 +70,6 @@ export default {
     insertClick() {
       this.$router.push("/truckLoadResultAdd/");
     },
-    // deleteclick(scope) {
-    //   let pathId = scope;
-    //   this.axios
-    //     .post("/api/v1/tms/operationPath/operationPathDelete?pathId=" + pathId)
-    //     .then((res) => {
-    //       this.$message({
-    //         message: "删除成功",
-    //         type: "success",
-    //       });
-    //       this.$router.go(0);
-    //     });
-    // },
     deleteClick(resultId) {
       
       this.$confirm("是否删除", "提示", {
@@ -95,10 +101,14 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
   }
 }
 </style>

src/views/TMS/components/importedIngredients/truckJiMaoFuResult.vue

@@ -2,85 +2,14 @@
   <!-- 辅料计毛实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-           
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
-                <i class="el-icon-search"></i>查询      
+        <i class="el-icon-search"></i>查询
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
-      <el-table-column fixed="right" align="center" label="操作" width="120">
-        <template slot-scope="scope">
-          <el-button
-            @click="sendClick(scope.row.orderId)"
-            type="text"
-            size="small"
-            v-if="scope.row.orderStatus == 5"
-          >
-            退货
-          </el-button>
-          <el-button  
-            type="text"
-            size="small"
-            disabled
-            v-else
-          >
-            退货
-          </el-button>
-        </template>
-      </el-table-column>
-    </dilTable>
-
-    <el-dialog
-      title="提示"
-      :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose"
-      :modal="true"
-      :close-on-click-modal="false"
-    >
-      <div class="text">
-        <span>请选择退货路线</span>
-      </div>
-      <el-input placeholder="请输入内容" v-model="lineName" disabled>
-      </el-input>
-      <el-button type="primary" @click="onLine">浏览</el-button>
-      <div class="returnResult">
-        <span>退货原因：</span>
-      </div>
-      <el-input placeholder="请输入内容" v-model="returnResult">
-      </el-input>
       
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" @click="outOrder">确 定</el-button>
-      </span>
-    </el-dialog>
-
-    <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" size="50%">
-      <el-input
-        placeholder="请输入内容"
-        v-model="calculationText"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
-        clearable
-      ></el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="calculation"
-        style="margin-bottom: 0.9375rem"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div>
-        <!-- 模态框——表格 -->
-        <dilTable
-          v-bind.sync="line"
-          @radio-change="currentRadioChange"
-        ></dilTable>
-      </div>
-    </el-drawer>
+    </dilTable>
   </div>
 </template>
 
@@ -89,99 +18,30 @@ export default {
   name: "homeworkPath",
   data() {
     return {
-      returnResult:'',
-      //路线名称
-      lineName: "",
-      //路线id
-      lineId: null,
-      //模态框框计算文本
-      calculationText: "",
-      //是否需要打开模态窗口
-      drawer: false,
-      //是否打开弹窗
-      dialogVisible: false,
-      //订单id
-      orderId: null,
       restaurants: [],
       input: "",
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5",
       },
-      //模态框表格数据
-      line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=4",
-        selectionType: "radio",
-      },
     };
   },
+
   methods: {
-    //模态框单选触发事件
-    currentRadioChange(selection) {
-      this.lineName = selection.lineName;
-      this.lineId = selection.lineId;
-    },
-    //模态框框计算
-    calculation() {
-      this.option.requestUrl =
-        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=4&con=" +
-        this.calculationText;
-    },
-    //弹窗浏览按钮
-    onLine() {
-      this.drawer = true;
-    },
-    //弹窗的确定按钮
-    outOrder() {
-      if(this.lineId && this.returnResult){
-        let map = {
-        returnResult:this.returnResult,
-        orderId: this.orderId,
-        lineId: this.lineId,
-      };
-      this.axios.post("/api/v1/oms/returnOrderCloseOrder", map).then((res) => {
-        console.log(res);
-        this.dialogVisible = false;
-          this.option.requestUrl ="/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&i=0";
-      });
-      }else{
-          this.$message({
-          message: '请选择运输路线和退货原因，在确定！',
-          type: 'warning'
-        });
-      }
-    },
-    //弹窗关闭事件
-    handleClose() {
-      this.lineName = null;
-      this.lineId = null;
-      this.orderId = null;
-      this.dialogVisible = false;
-    },
-    //操作列退货按钮
-    sendClick(orderId) {
-      console.log(orderId);
-      this.orderId = orderId;
-      this.dialogVisible = true;
-    },
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&con=" + this.input;
+     this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&con=" + this.input;
     },
-  },
+   }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-  .text {
-    margin-bottom: 0.625rem;
-  }
-  .returnResult {
-    margin-top: 0.625rem;
-    margin-bottom: 0.625rem;
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
   }
 }
 </style>

src/views/TMS/components/importedIngredients/truckJiPiFuResult.vue

@@ -2,10 +2,9 @@
   <!-- 辅料计皮实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-           
+      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
-                <i class="el-icon-search"></i>查询      
+        <i class="el-icon-search"></i>查询
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -19,27 +18,31 @@ export default {
   name: "homeworkPath",
   data() {
     return {
-      //一览表格框计算文本
+      restaurants: [],
       input: "",
-      //一览表格数据
       option: {
+        // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5",
       },
     };
   },
+
   methods: {
-    //一览表格框计算
+
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5&con=" + this.input;
+     this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5&con=" + this.input;
     },
-  },
+   }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
   }
 }
 </style>