拉取合并

config/index.js

@@ -71,14 +71,6 @@ let proxyTable = {
       "^/api/v1": "/api/v1"
     }
   },
-  "/api/v1/join": {
-    target: "http://172.16.33.166:8066",
-    // target: "http://192.168.1.108:8066",
-    ws: true,
-    pathRewrite: {
-      "^api/v1/join": "/api/v1/join"
-    }
-  },
   "/views/api/v1": {
     target: "http://172.16.33.166:8080",
     // target: "http://172.16.33.166:8080",

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/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/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -200,7 +200,7 @@ export default {
             console.log(res.data);
              if(res.data.code == "200"){
                 this.$message.success("修改路段顺序号成功")
-                this.$router.go(-1)
+                this.$router.go(0)
             }
            
         })

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

@@ -289,7 +289,10 @@ export default {
         },{
           value:16,
           label:'出厂'
-        }
+        },{
+          value:19,
+          label:'退货'
+        },
       ],
       orderType:15,
       // 线路名称

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

@@ -20,17 +20,33 @@
       </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>
@@ -205,6 +221,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      stateSupplier:null,
       //限定first
       isHeigth:true,
       shiyHeigth:140,
@@ -351,6 +368,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,
@@ -395,7 +433,7 @@ export default {
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl =
             "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-            this.input;
+            this.input + "&supplierId=" + this.supplierId;;
         } else if (this.onDrawerNumber == 2) {
           this.secend.requestUrl =
             "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -474,12 +512,16 @@ export default {
       }
     },
     ondrawer(num) {
+      if(this.supplierId == null){
+          this.$message.warning("请先填写发货单位")
+          return
+      }
       this.drawer = true;
       this.onDrawerNumber = num;
       if (num == 1) {
         this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input;
+          this.input + "&supplierId=" + this.supplierId;;
       } else if (num == 2) {
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -504,7 +546,7 @@ export default {
           "/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() + "&con=" + "燃料";
+          "/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=" +
@@ -696,6 +738,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;

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/dischargeCargoOld.vue

@@ -1,13 +1,14 @@
 //老区采购化工产品卸货作业
 <template>
   <div class="homeworkPath">
-   <div class="top">
+    <div class="top">
       <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>
     </div>
-    <dilTable v-bind.sync="option"></dilTable>
+    <dilTable v-bind.sync="option">
+    </dilTable>
   </div>
 </template>
 
@@ -20,14 +21,14 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=6",
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=17",
       },
     };
   },
- 
+
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=6&con=" + this.input;
+     this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=17&con=" + this.input;
     },
    }
 };

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/enterFactoryOld.vue

@@ -22,51 +22,16 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=17",
       },
     };
   },
-
+ 
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=6&con=" + this.input;
-    },
-    updateClick(resultId) {
-      this.$router.push("/truckLoadResultEdit/" + resultId);
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=17&con=" + this.input;
     },
-    //新增
-    insertClick() {
-      this.$router.push("/truckLoadResultAdd/");
-    },
-    deleteClick(resultId) {
-      
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post(
-              "/api/v1/tms/deleteLoadResult/" + resultId
-            )
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
-  },
+  }
 };
 </script>
 <style lang='scss'>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/exFactoryOld.vue

@@ -1,7 +1,7 @@
 //老区采购化工产品出厂作业
 <template>
   <div class="homeworkPath">
-   <div class="top"> 
+    <div class="top">
       <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>查询
@@ -14,6 +14,7 @@
 </template>
 
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   name: "homeworkPath",
   data() {
@@ -22,15 +23,25 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6",
+        requestUrl: "",
       },
     };
   },
-
-  methods: {
+  created(){
     
+     if (getCookie("orgCode") == "chengyunshang") {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=17&carrierSsoId=" + getCookie("userId");
+      } else {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=17&carrierSsoId=" + null ;
+      }
+  },
+  methods: {
     onclick() {
-     this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=6&con=" + this.input;
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=17&carrierSsoId=" + getCookie("userId")+"&con=" + this.input;;
+      } else {
+        this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=147&orderType=17&carrierSsoId=" + null +"&con=" + this.input;
+      }
     },
    }
 };

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/qualityTestingOld.vue

@@ -1 +1,53 @@
-//老区采购化工产品质检作业
+//老区采购化工产品质检作业
+<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">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" width="50">
+        <template slot-scope="scope">
+          <el-button @click="updateClick(scope.row.resultId)" type="text" size="small">
+            修改
+          </el-button>
+        </template>
+      </el-table-column>
+    </dilTable>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name: "wagonPlease",
+  data() {
+    return {
+      input: "",
+      option: {       
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getQualityResult?apiId=150&orderType=17",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=17&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/receivingOld.vue

@@ -20,13 +20,13 @@ export default {
       input: "",
       option: {       
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getReceiveResult?apiId=150&orderType=17",
+        requestUrl: "/api/v1/tms/getReceiveResult?apiId=149&orderType=17",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=150&orderType=17&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=17&con=" + this.input;
     },
   },
 };

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/skinCountingOld.vue

@@ -1 +1,46 @@
-//老区采购化工产品计皮作业
+//老区采购化工产品计皮作业
+<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">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=17",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=17&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/woolCountingOld.vue

@@ -1 +1,47 @@
 //老区采购化工产品计毛作业
+<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">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=17",
+      },
+    };
+  },
+
+  methods: {
+    onclick() {
+     this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=17&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+   .top {
+    padding: 40px;
+    .input{
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/transportationReservation.vue

@@ -21,7 +21,7 @@
         @click="issue"
         v-if="activeName == 'first'"
       >
-        <i class="el-icon-plus"></i>下发
+        <i class="el-icon-download"></i>下发
       </el-button>
     </div>
     <el-tabs v-model="activeName">

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -19,17 +19,33 @@
       </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>
@@ -61,14 +77,6 @@
         >
       </div>
     </div>
-    <div class="lineId from">
-      <span class="text">该批车辆是否一车多趟：</span>
-      <el-switch
-        v-model="isMoreTrips"
-        active-text="是"
-        inactive-text="否">
-      </el-switch>
-    </div>
     <div class="truckListTable">
       <el-table
         :data="selectionList"
@@ -242,6 +250,7 @@ export default {
           label: "新厂区",
         },
       ],
+      stateSupplier:null,
       // 线路名称
       lineName: "",
       //线路id
@@ -382,11 +391,32 @@ export default {
         });
       }
     },
+        //发货单位弹出层
+    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);
+        };
+      },
     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;
+          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) {
@@ -425,10 +455,14 @@ export default {
       }
     },
     ondrawer(num) {
+       if(this.supplierId == null){
+          this.$message.warning("请先填写发货单位")
+          return
+      }
       this.drawer = true;
       this.onDrawerNumber = num;
       if(num == 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 (num == 2) {
         this.secend.requestUrl = "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" + this.materialId;
       } else if (num == 3) {
@@ -723,6 +757,15 @@ export default {
     }
   }
 }
+.supplieUnit {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
+  .el-input {
+    width: 250px;
+  }
+}
 .drawer_top{
   margin-top: -50px;
   width: 100%;height: 60px;

src/views/TMS/router/index.js

@@ -1,8 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-
 import routerBefore from '@/config/routerBefore.js'
-
 // 主要
 import main from '@/components/main.vue'
 // 系统配置管理
@@ -192,6 +190,13 @@ import receivingNew from '../components/purchaseChemicalMaterials/purchaseChemic
 import skinCountingNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/skinCountingNew.vue'
 import woolCountingNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNEW/woolCountingNew.vue'
 
+import dischargeCargoOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/dischargeCargoOld.vue'
+import enterFactoryOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/enterFactoryOld.vue'
+import exFactoryOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/exFactoryOld.vue'
+import qualityTestingOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/qualityTestingOld.vue'
+import receivingOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/receivingOld.vue'
+import skinCountingOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/skinCountingOld.vue'
+import woolCountingOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/woolCountingOld.vue'
 
 
 Vue.use(Router)
@@ -376,6 +381,13 @@ const constantRouterMap = [
       {path: 'transportationReservationAdd', name: 'transportationReservationAdd', meta: {code: 'xtpzgl-yhgl'}, component: transportationReservationAdd},
       {path: 'transportationReservationEDIT/:orderId', name: 'transportationReservationEDIT', meta: {code: 'xtpzgl-yhgl'}, component: transportationReservationEDIT},
      
+      {path: 'dischargeCargoOld', name: 'dischargeCargoOld', meta: {code: 'xtpzgl-jggl'}, component: dischargeCargoOld},
+      {path: 'enterFactoryOld', name: 'enterFactoryOld', meta: {code: 'xtpzgl-jggl'}, component: enterFactoryOld},
+      {path: 'exFactoryOld', name: 'exFactoryOld', meta: {code: 'xtpzgl-jggl'}, component: exFactoryOld},
+      {path: 'qualityTestingOld', name: 'qualityTestingOld', meta: {code: 'xtpzgl-jggl'}, component: qualityTestingOld},
+      {path: 'receivingOld', name: 'receivingOld', meta: {code: 'xtpzgl-jggl'}, component: receivingOld},
+      {path: 'skinCountingOld', name: 'skinCountingOld', meta: {code: 'xtpzgl-jggl'}, component: skinCountingOld},
+      {path: 'woolCountingOld', name: 'woolCountingOld', meta: {code: 'xtpzgl-jggl'}, component: woolCountingOld},
     ]
   }
 ];

src/views/WMS/components/steel/addCheckWarehouse.vue

@@ -67,6 +67,7 @@ export default {
       materialNumber:null,
       //物资id
       materialId: null,
+      warehouseId:"",
       //是否需要打开模态窗口
       drawer: false,
       a: 1,
@@ -97,7 +98,9 @@ export default {
     onclick(a) {
       if (a == 1) {
         this.first.requestUrl =
-         "/api/v1/wms/getSteelMaterialModelList?apiId=448&warehouseId="+3+"&con="+this.input;   
+         "/api/v1/wms/getSteelMaterialModelList?apiId=448&warehouseId="+this.warehouseId+"&con="+this.input;   
+      }else{
+        this.second.requestUrl = "/api/v1/wms/getSteelWarehouseList?apiId=449&con="+this.input;
       }
     },
     ondrawer(num) {
@@ -105,9 +108,9 @@ export default {
       this.a = num;
       console.log("jlll");
       if(num==1){
-          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=448&warehouseId="+3
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=448&warehouseId="+this.warehouseId
       }else{
-          this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
+          this.second.requestUrl = "/api/v1/wms/getSteelWarehouseList?apiId=449"
       }
     },
     // 返回

src/views/WMS/components/steel/bar1_steel/bar1_steel_inboundReal.vue

@@ -57,6 +57,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
       let startTime = null;
       let endTime = null;
@@ -115,8 +133,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)

src/views/WMS/components/steel/bar1_steel/bar1_steel_inboundStatistics.vue

@@ -94,6 +94,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
 
       let startTime = null;
@@ -152,8 +170,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)

src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundReal.vue

@@ -57,6 +57,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
       let startTime = null;
       let endTime = null;
@@ -115,8 +133,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)

src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundStatistics.vue

@@ -94,6 +94,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
 
       let startTime = null;
@@ -152,8 +170,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)

src/views/WMS/components/steel/steel_check.vue

@@ -34,7 +34,7 @@ export default {
   },
   methods:{
      toInsert() {
-      this.$router.push("/insertCheckInventory");
+      this.$router.push("/addCheckWarehouse");
 
     },
     onclick(){

src/views/WMS/components/steel/steel_inboundReal.vue

@@ -47,6 +47,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
       let startTime = null;
       let endTime = null;
@@ -105,8 +123,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)
@@ -144,8 +169,6 @@ export default {
           this.endTime = null;
           this.$message.warning("开始时间要比结束时间早");
         }
-      } else {
-        // this.getRequestUrl()
       }
     },
     selectionChange(selection) {

src/views/WMS/components/steel/steel_inboundStatistics.vue

@@ -94,6 +94,24 @@ export default {
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
+    // 获取当前月份的最后一天
+    getdaysinmonth(year,month){
+      month = parseInt(month,10)+1;
+      let days = 0;
+      month = month -1;
+      console.log("othermonth"+month)
+      console.log("otheryear"+year);
+      // 根据月份获取对应的天数
+      if(month == 2){
+        days = year % 4 == 0?29:28;
+      }else if(month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){
+        days = 31;
+      }else{
+        days = 30;
+      }
+      console.log("otherdays"+days)
+      return days;
+    },
     onclick(){
 
       let startTime = null;
@@ -152,8 +170,15 @@ export default {
           this.endTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }else if(this.region == 3){
           this.endTime = year+"-"+month+"-"+day+" "+"07:30:00";
-          // 将开始时间减一
-          day =parseInt(day)-1;
+          // 判断开始日期和结束日期是否跨月份了
+          if(month!=month2){
+            month = parseInt(month)-1
+            // 获取前一个月份的最后一天
+            day = this.$options.methods.getdaysinmonth(year,month)
+          }else{
+            // 将开始时间减一
+            day =parseInt(day)-1;
+          }
           this.startTime = year+"-"+month+"-"+day+" "+"23:30:00";
         }
         this.startTime = new Date(this.startTime)
@@ -187,8 +212,6 @@ export default {
           this.endTime = null;
           this.$message.warning("开始时间要比结束时间早");
         }
-      } else {
-        this.getRequestUrl()
       }
     },
     selectionChange(selection) {

src/views/index/components/login.vue

@@ -223,7 +223,9 @@ export default {
                 });
               }
               this.loginBtnLoading = false;
-              this.$router.go(0)
+              setTimeout(() => {
+                this.$router.go(0)
+              }, 2000);
             })
             .catch(() => {
               this.loginBtnLoading = false;

src/views/inward/components/inwardFactory/countResult.vue

@@ -24,11 +24,15 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/selectCountList?apiId=364",
+                requestUrl: "",
             },
         }
     },
+    created(){
+        this.option.requestUrl = "/api/v1/tms/selectCountList?apiId=364"
+    },
     methods:{
+
         onclick(){
             this.option.requestUrl = "/api/v1/tms/selectCountList?apiId=364&con="+this.inputText;
         }

src/views/inward/components/inwardFactory/monthResult.vue

@@ -24,10 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getTmstruckMonthResult?apiId=365",
+                requestUrl: "",
             },
         }
     },
+    created(){
+        this.option.requestUrl = "/api/v1/tms/getTmstruckMonthResult?apiId=365"
+    },
     methods:{
         onclick(){
             this.option.requestUrl = "/api/v1/tms/getTmstruckMonthResult?apiId=365&con="+this.inputText;

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -24,10 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getAllTimeTaskResult?apiId=363",
+                requestUrl: "",
             },
         }
     },
+    created(){
+        this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=363"
+    },
     methods:{
         onclick(){
             this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=363&con="+this.inputText;

src/views/inward/components/truckAppoint/addPlan.vue

@@ -12,7 +12,6 @@
       placeholder="请输入承运商名称"
       :trigger-on-focus="false"
       @select="handleSelect"
-      @input="oninput"
     >
   <template slot-scope="{ item }">
     <div class="name">{{ item.value }}</div>
@@ -165,24 +164,21 @@ export default {
     },
     handleSelect(item){
       this.carrierId = item.carrierId
-      item.carrierName = this.state2
+      this.state2 = item.carrierName 
     },
-    oninput(){
-      this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
+        //搜索
+    querySearch(queryString, cb) {
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
         if(res.data.code == "200"){
           console.log(res)
-          this.restaurants = res.data.data
+          var restaurants = res.data.data
+           var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
+          // 调用 callback 返回建议列表的数据
+          console.log(results,"results");
+          cb(results);
         }
       })
-    },
-        //搜索
-    querySearch(queryString, cb) {
-        var restaurants = this.restaurants;
-        console.log(this.restaurants,"this.restaurants");
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
-        // 调用 callback 返回建议列表的数据
-        console.log(results,"results");
-        cb(results);
+       
       },
       createFilter(queryString) {
         return (restaurants) => {

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -65,9 +65,8 @@
         </el-form-item>
         </el-form>
       </div>
-      
       <!-- 物资和装卸点以及装卸货次序 -->
-          <div class="swtichTop">
+    <div class="swtichTop">
     <span class="titile">点击浏览选择物资之前请选择物资单位！</span>
     <div class="switch" v-if="tableData.length > 0">
       <el-tooltip placement="top">
@@ -204,7 +203,7 @@
         <el-input
           placeholder="请输入内容"
           v-model="input"
-          style="margin-top: 10px; margin-left: 10px; width: 250px"
+          style="margin-top: 5px; margin-left: 10px; width: 250px"
           clearable
         >
         </el-input>
@@ -315,7 +314,7 @@ export default {
         mapList1: []
       },
       second1: {
-        requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
         mapList2: []
       }
@@ -402,6 +401,14 @@ export default {
     handleClose(done) {
       done();
     },
+    onclickMaterial(){
+      if(this.inputMaterial == null){
+        this.materialTable.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+      }else{
+        this.materialTable.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.inputMaterial
+        this.inputMaterial = null
+      }
+    },
     //删除行
     deleteRow(index, rows) {
       // console.log(index)
@@ -452,7 +459,7 @@ export default {
           this.input = null
         } else {
         this.second1.requestUrl =
-          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
           this.input = null
       }
       }else{
@@ -470,25 +477,24 @@ export default {
       this.materialId = selection.materialId;
     },
     currentRadioChange2(selection) {
+      console.log(selection);
       if (this.a == 2) {
-        this.truckPoint = selection.wareHouseName;
-        this.requiremntUnitId = selection.wareHouseId;
+        this.truckPoint = selection.warehouseName;
+        this.requiremntUnitId = selection.warehouseId;
       } else if (this.a == 3) {
         // console.log(this.tableData[this.index])
-        this.tableData[this.index].requirementUnloadUnitId = selection.wareHouseId;
-        this.tableData[this.index].truckPoint1 = selection.wareHouseName
+        this.tableData[this.index].requirementUnloadUnitId = selection.warehouseId;
+        this.tableData[this.index].truckPoint1 = selection.warehouseName
         this.refreshTable()
       } else if (this.a == 4) {
         // console.log(this.tableData[this.index])
-        this.tableData[this.index].requirementPlatformId = selection.wareHouseId;
-        this.tableData[this.index].requirementPlatformName = selection.wareHouseName;
+        this.tableData[this.index].requirementPlatformId = selection.warehouseId;
+        this.tableData[this.index].requirementPlatformName = selection.warehouseName;
         this.refreshTable()
       }
     },
     // 新增
     makeSure() {
-      // console.log(this.tableData)
-      // console.log(typeof(this.form.requirementEstimatedDuration))
       if(this.shipperId == null){
         this.$message.error("请选择用车单位")
         return

src/views/inward/components/truckAppoint/plan.vue

@@ -1,6 +1,6 @@
 // 制定计划
 <template>
-  <div class="steel_inbound">
+  <div class="inwardPlan">
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
@@ -449,7 +449,9 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound{
+.inwardPlan{
+  margin-top: 20px;
+  margin-left: 20px;
   .sache{
     padding: 1.25rem 0.375rem;
     .el-input {

src/views/inward/components/truckAppoint/requirement.vue

@@ -1,6 +1,6 @@
 // 提出需求
 <template>
-  <div class="steel_inbound">
+  <div class="inwardRequirement">
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
@@ -335,14 +335,16 @@ export default {
   },
 };
 </script>
-<style lang="scss">
-.steel_inbound{
-  .sache{
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
-  }
+<style lang="scss" scoped>
+  .inwardRequirement{
+      margin-top: 20px;
+      margin-left: 20px;
+      .sache{
+          margin-top: 30px;
+          padding-bottom: 10px;
+          .el-input {
+            width: 20%;
+            }
+          }
   }
 </style>

src/views/inward/components/truckAppoint/updatePlan.vue

@@ -2,7 +2,6 @@
 <template>
   <div id="endMaintenance">
     <page-title>修改计划</page-title>
-
     <div class="form-box">
 <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
   <el-form-item label="承运商">
@@ -13,7 +12,6 @@
       placeholder="请输入承运商名称"
       :trigger-on-focus="false"
       @select="handleSelect"
-      @input="oninput"
     >
   <template slot-scope="{ item }">
     <div class="name">{{ item.value }}</div>
@@ -66,28 +64,23 @@ export default {
   methods: {
     handleSelect(item){
       this.carrierId = item.carrierId
-      item.carrierName = this.state2
-    },
-    oninput(){
-      this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
-        if(res.data.code == "200"){
-          console.log(res)
-          this.restaurants = res.data.data
-        }
-      })
+      this.state2 = item.carrierName
     },
     //搜索
     querySearch(queryString, cb) {
-        var restaurants = this.restaurants;
-        console.log(this.restaurants,"this.restaurants");
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
-        // 调用 callback 返回建议列表的数据
-        console.log(results,"results");
-        cb(results);
+        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
+        if(res.data.code == "200"){
+          var restaurants =  res.data.data
+          var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
+          // 调用 callback 返回建议列表的数据
+          console.log(results,"results");
+          cb(results);
+        }
+      }) 
       },
       createFilter(queryString) {
         return (restaurants) => {
-          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
         };
       },
     // 修改

src/views/inward/components/truckOrder/decomposePlan.vue

@@ -30,50 +30,9 @@
           </template>
           </el-table-column> 
 		    </dilTable>
-    <div class="form-box">
-        <el-form :inline="true" class="demo-form-inline" :label-position="left"  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="drawerLine()">浏览</el-button>
-          </el-form-item>
-        </el-form>
-    </div>
-     <div class="box-form">
-        <dil-form :formId="318" v-model="form"></dil-form>
-    </div>
     <div class="capacityButton">
       <el-button type="primary" class="truckBtn" @click="drawerCapacity()">浏览车牌号</el-button>
     </div>
-     <el-drawer
-      :visible.sync="linedrawer"
-      :direction="direction"
-      :before-close="handleClose"
-      size="40%"
-    >
-      <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()"  style="margin-bottom:15px">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-   <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1" ></dilTable>    
-    </el-drawer>
-    <!-- <el-drawer
-      :visible.sync="drawer"
-      :direction="direction"
-      :before-close="handleClose"
-      size="30%"
-    >
-      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-right: 10px;width:150px;" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick()"  style="margin-bottom:15px">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" class="btn" @click="onConfirm()"  style="margin-bottom:15px">
-        <i class="el-icon-plus"></i>确认
-      </el-button>
-   <dilTable v-bind.sync="second" @selection-change="currentRadioChange" ></dilTable>    
-    </el-drawer> -->
-
     <el-drawer 
       :visible.sync="drawer" 
       :with-header="false"
@@ -134,27 +93,6 @@
       <vxe-input v-model="row.requirementNo" type="text" disabled></vxe-input>
       </template>
 			</vxe-table-column>
-			<!-- <vxe-table-column field="materialName" title="物资名称"
-			
-			>
-      <template #edit="{ row }">
-      <vxe-input v-model="row.materialName" type="text" disabled></vxe-input>
-      </template>
-			</vxe-table-column>
-			<vxe-table-column field="materialWeight" title="物资重量" width="100"
-				:edit-render="{}"
-				>
-       <template #edit="{ row }">
-      <vxe-input v-model="row.materialWeight" type="text"></vxe-input>
-      </template>  
-			</vxe-table-column>
-      <vxe-table-column field="materialNumber" title="物资数量" width="100"
-				:edit-render="{}"
-				>
-       <template #edit="{ row }">
-      <vxe-input v-model="row.materialNumber" type="text" ></vxe-input>
-      </template>       
-			</vxe-table-column> -->
        <vxe-table-column field="capacityNumber" title="车牌号"
 				:edit-render="{}"
 				>
@@ -184,6 +122,7 @@ export default {
   },
   data() {
     return {
+      truckText:null,
       shiyHeigth:140,
       isHeigth:true,
       isKuang:false,
@@ -195,7 +134,7 @@ export default {
       linedrawer:false,
       tableData:[],
       direction: "rtl",
-      input:'',
+      input:null,
       selectRow:null, 
       drawer:false,
       planNo:"",
@@ -210,11 +149,6 @@ export default {
         selectionType: "select",
         mapList1:[]
       },
-      zero:{
-        requestUrl:"/api/v1/rms/getAllLineDesk?apiId=249",
-        selectionType: "radio",
-        mapList0:[]
-      },
       oldRow: "",
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未下发)
       oldRowCount: 1,
@@ -310,10 +244,11 @@ export default {
       this.linedrawer = true
     },
     onclick(){
-      if(this.input != ''){
-        this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId="+this.input +"&carrierId=" + getCookie('userId');
+      console.log(this.truckText,"truckText")
+      if(this.truckText != null){
+        this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId="+this.input +"&carrierId=" + getCookie('userId') + "&index=" + this.truckText;
       }else{
-        this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + this.userCarrierId
+        this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + this.userCarrierId + "&i=" + new Date()
       }     
     },
     currentRadioChange(selection){
@@ -374,10 +309,6 @@ export default {
             },
     // 修改
     makeSure() {
-      if(typeof(this.form.orderType) == 'undefined'){
-        this.$alert('没有选择订单类型，请选择')
-        return
-      }
       for(var i=0;i<this.$refs.xTable.getInsertRecords().length;i++){
         if(this.$refs.xTable.getInsertRecords()[i].capacityNumber == null){
           this.$alert('未选择车牌，请选择车牌')
@@ -385,14 +316,11 @@ export default {
         }     
       }
       let BmsTrainFreight = {
-          planId:this.$route.params.planId,
-          lineId:this.lineId,
-          orderType:this.form.orderType,
+          planId:Number(this.$route.params.planId),
+          orderType:11,
           carrierId:this.carrierId,
           mapList:this.$refs.xTable.getInsertRecords()
       };
-      console.log(BmsTrainFreight)
-      debugger
       this.axios
         .post("/api/v1/oms/addInwardOrder", BmsTrainFreight)
         .then((res) => {
@@ -410,7 +338,7 @@ export default {
     },
     // 返回
     cancel() {
-      console.log(this.sumNum(this.$refs.xTable.getInsertRecords(), 'materialWeight'))
+      this.$router.go(-1);
     },
   },
 };
@@ -438,11 +366,10 @@ export default {
   }
 }
 .capacityButton {
-  // width: 800px;
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-left: 150px;
+  margin-top: 20px;
   .truckBtn {
     width: 300px;
   }

src/views/inward/components/truckOrder/dispatchPlan.vue

@@ -1,6 +1,6 @@
 // 分派计划
 <template>
-  <div class="steel_inbound">
+  <div class="inwardOrder">
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
@@ -8,6 +8,25 @@
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
+     <!-- 车辆信息 -->
+    <el-dialog
+        title="车辆信息"
+        :visible.sync="dialogTableVisible"
+        :before-close="handleClose"
+    >
+      <el-input v-model="truckInput" style="width:250px"></el-input>
+      <el-button type="primary" @click="clickTruck">查询</el-button>
+      <dilTable
+        v-bind.sync="truck"
+        @radio-change="currentRadioChange1"
+        >
+      </dilTable>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="cancelUpdate()">取 消</el-button>
+      <el-button type="primary" @click="updateTruckCapacity()"
+      >确 定</el-button>
+      </span>
+    </el-dialog>
     <template>
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -22,28 +41,14 @@
                   >
                     物资详情
                   </el-button>
-                  <!-- <el-button type="text" size="mini" @click="updatePlan(scope)">
+                  <el-button type="text" size="mini" @click="updatePlan(scope)">
                     修改
-                  </el-button> -->
+                  </el-button>
+                  <el-button type="text" size="mini" @click="deleteClick(scope)">
+                    删除
+                  </el-button>
                 </template>
               </el-table-column>
-              <!-- 车辆信息 -->
-              <el-dialog
-                title="车辆信息"
-                :visible.sync="dialogTableVisible"
-                :before-close="handleClose"
-              >
-                <dilTable
-                  v-bind.sync="truck"
-                  @radio-change="currentRadioChange1"
-                ></dilTable>
-                <span slot="footer" class="dialog-footer">
-                  <el-button @click="cancelUpdate()">取 消</el-button>
-                  <el-button type="primary" @click="updateTruckCapacity()"
-                    >确 定</el-button
-                  >
-                </span>
-              </el-dialog>
               <!-- 物资详情抽屉 -->
               <el-table-column type="expand" width="1">
                 <template slot-scope="props">
@@ -83,6 +88,7 @@ export default {
   data() {
     return {
       inputText: "",
+      truckInput:null,
       userCarrierId: "",
       //是否弹出对话框
       dialogTableVisible: false,
@@ -164,48 +170,73 @@ export default {
       if (getCookie("orgCode") == "chengyunshang") {
         this.first.requestUrl =
           "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" +
-          getCookie("userId") +
+          getCookie("userId") + "&i=" +
           new Date();
         this.second.requestUrl =
           "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=" +
-          getCookie("userId") +
+          getCookie("userId") + "&i=" +
           new Date();
       } else {
         this.first.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4";
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4" + "&i=" +
+          new Date();
         this.second.requestUrl =
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5";
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5" + "&i=" +
+          new Date();
       }
     },
-
-    // //修改运力
-    // updatePlan() {
-    //   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("修改运力失败");
-    //       }
-    //     });
-    // },
-
-    // cancelUpdate() {
-    //   this.dialogTableVisible = false;
-    //   this.$message.info("取消修改运力");
-    // },
     handleClick() {
       this.getRequirementMaterial();
+      this.getRequest()
+    },
+    handleClose(done){
+      done()
+      this.$message.info("取消修改运力")
+    },
+    currentRadioChange1(row){
+      console.log(row)
+      this.capacityId = row.capacityId
+    },
+    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();
+      }
+    },
+    //修改运输订单
+    updatePlan(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.dialogTableVisible = false
+            this.getRequest()
+            
+          }else{
+            this.$message.error("修改运力失败")
+            this.dialogTableVisible = false
+            this.getRequest()
+          }
+        })
+    },
+    clickTruck(){
+      this.truck.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index=" + this.truckInput
     },
     getRequirementMaterial(row) {
       // 记录重复点击次数
@@ -240,24 +271,22 @@ export default {
           console.log(res.data.data);
         });
     },
-    deletePlan(scope) {
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.axios
-            .post(
-              "/api/v1/bms/deleteTrainSettlement/" + scope.row.requirementId
-            )
+      //删除运输订单
+    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.getRequest()
               } else {
                 this.$message({
                   message: "删除失败",
@@ -265,19 +294,20 @@ export default {
                 });
               }
             });
-        })
-        .catch(() => {
+        }).catch(() => {
           this.$message({
-            type: "info",
-            message: "删除操作已取消!",
-          });
+            type: 'info',
+            message: '已取消删除'
+          });          
         });
     },
   },
 };
 </script>
 <style lang="scss">
-.steel_inbound {
+.inwardOrder {
+  margin-top: 20px;
+  margin-left: 20px;
   .sache {
     padding: 1.25rem 0.375rem;
     .el-input {

src/views/inward/components/truckOrder/plan.vue

@@ -1,6 +1,6 @@
 // 分解计划
 <template>
-  <div class="steel_inbound">
+  <div class="inwardDisPlan">
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
@@ -358,7 +358,9 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound{
+.inwardDisPlan{
+  margin-top: 20px;
+  margin-left: 20px;
   .sache{
     padding: 1.25rem 0.375rem;
     .el-input {