dhjks

build/utils.js

@@ -16,8 +16,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
- let devModules = ['all']
-//  let devModules = ['index','TMS']
+//  let devModules = ['all']
+ let devModules = ['index','TMS','inward']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','appoint','WMS'];
 

config/index.js

@@ -64,7 +64,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.161:8080",
+    target: "http://172.16.33.166:8080",
     // target: "http://localhost:8019",
     // target: "http://localhost:8082",
     ws: true,

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

@@ -742,7 +742,7 @@ export default {
         },
         {
           label: "green_theme",
-          desc: "原谅主题",
+          desc: "护眼主题",
         },
         {
           label: "deepBlue_theme",
@@ -756,13 +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: "#F20808",
+        green_theme: "#008000",
+        Cyan_theme:"#00ffff",
+        yellow_theme:"#FFFF00"
       },
       themeSetFlag: false,
       lockErrorMsg: false,

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

@@ -512,6 +512,10 @@ export default {
       }
     },
     ondrawer(num) {
+      if(this.supplierId == null){
+          this.$message.warning("请先填写发货单位")
+          return
+      }
       this.drawer = true;
       this.onDrawerNumber = num;
       if (num == 1) {

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

@@ -77,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"
@@ -463,6 +455,10 @@ export default {
       }
     },
     ondrawer(num) {
+       if(this.supplierId == null){
+          this.$message.warning("请先填写发货单位")
+          return
+      }
       this.drawer = true;
       this.onDrawerNumber = num;
       if(num == 1){

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 {