Your Name 3 years ago
parent
commit
68c7915836
45 changed files with 119 additions and 504 deletions
  1. 2 0
      .gitignore
  2. 0 3
      README.md
  3. 10 111
      config/index.js
  4. 1 1
      src/components/main.vue
  5. 0 81
      src/styles/appoint/contract/ContractInsert.scss
  6. 0 106
      src/styles/appoint/contract/add.scss
  7. 0 135
      src/styles/variables.scss
  8. 0 0
      src/utils/QueueStartList.js
  9. 0 0
      src/utils/sharedJsFile.js
  10. 4 4
      src/views/RMS/components/editTruckCalculate.vue
  11. 2 2
      src/views/RMS/components/oilPrice.vue
  12. 3 3
      src/views/RMS/components/truckCalculate.vue
  13. 1 1
      src/views/RMS/router/index.js
  14. 1 1
      src/views/TMS/components/importedEmergency/addWagonLoad.vue
  15. 1 1
      src/views/TMS/components/importedEmergency/addWagonUnLoad.vue
  16. 1 1
      src/views/TMS/components/importedEmergency/editWagonLoad.vue
  17. 1 1
      src/views/TMS/components/importedEmergency/editWagonUnLoad.vue
  18. 1 1
      src/views/TMS/components/importedFuel/transportReserveFuAdd.vue
  19. 41 27
      src/views/TMS/components/importedFuel/transportReserveRanAdd.vue
  20. 1 1
      src/views/TMS/components/importedIngredients/transportReserveFuAdd.vue
  21. 1 1
      src/views/WMS/components/steel/inboundDetails.vue
  22. 1 1
      src/views/appoint/components/purchase/updateBreach.vue
  23. 1 1
      src/views/inward/components/inwardFactory/addTruckLoad.vue
  24. 1 1
      src/views/inward/components/inwardImport/daZhou/addTruckLoad.vue
  25. 1 1
      src/views/inward/components/inwardImport/daZhou/updateTrainUnload.vue
  26. 1 1
      src/views/inward/components/inwardImport/daZhou/updateTruckLoad.vue
  27. 1 1
      src/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue
  28. 1 1
      src/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue
  29. 1 1
      src/views/inward/components/offsetSteel/truckTrain/addWagonLoad.vue
  30. 1 1
      src/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue
  31. 1 1
      src/views/inward/components/offsetSteel/truckTrain/addWagonUnLoad.vue
  32. 1 1
      src/views/inward/components/offsetSteel/truckTrain/editWagonLoad.vue
  33. 1 1
      src/views/inward/components/offsetSteel/truckTrain/editWagonPlease.vue
  34. 1 1
      src/views/inward/components/offsetSteel/truckTrain/editWagonUnLoad.vue
  35. 1 1
      src/views/inward/components/truckAppoint/addPlan.vue
  36. 1 1
      src/views/inward/components/truckAppoint/addRequirement.vue
  37. 1 1
      src/views/inward/components/truckAppoint/addRequirement2.vue
  38. 1 1
      src/views/inward/components/truckAppoint/updatePlan.vue
  39. 1 1
      src/views/inward/components/truckAppoint/updateRequirement.vue
  40. 1 1
      src/views/inward/components/truckOrder/decomposeRailPlan.vue
  41. 1 1
      src/views/sale/components/saleSelfMachine/saleSelfMachine.vue
  42. 1 1
      src/views/sale/components/transport_excute/tms-offsite/arrivalPhoto.vue
  43. 1 1
      src/views/sale/components/transport_excute/tms-offsite/receiptChildPhoto.vue
  44. 1 1
      src/views/sale/components/transport_excute/tms-offsite/receiptPhoto.vue
  45. 25 0
      文件目录.md

+ 2 - 0
.gitignore

@@ -2,3 +2,5 @@
 /node_modules
 /dist
 /.vscode
+
+*.txt

+ 0 - 3
README.md

@@ -1,3 +0,0 @@
-# icore-pass
-
-icore-icp

+ 10 - 111
config/index.js

@@ -46,6 +46,7 @@ let proxyTable = {
       '^/icore.icp.web/pass/act': '/'
     }
   },
+  // 表格表单请求的域名地址
   "/api/v1/cd": {
     target: "http://172.16.33.166:8083",
     ws: true,
@@ -53,21 +54,21 @@ let proxyTable = {
       "^/api/v1/cd": "/api/v1/cd"
     }
   },
-  // "/api/v1": {
-  //   target: "http://172.16.33.166:8080",
-  //   ws: true,
-  //   pathRewrite: {
-  //     "^/api/v1": "/api/v1"
-  //   }
-  // },
-  
+  // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://192.168.1.115:8080",
+    target: "http://172.16.33.166:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
+  // "/api/v1": {
+  //   target: "http://192.168.1.108:8080",
+  //   ws: true,
+  //   pathRewrite: {
+  //     "^/api/v1": "/api/v1"
+  //   }
+  // },
   "/views/api/v1": {
     target: "http://192.168.1.115:8080",
     ws: true,
@@ -82,108 +83,6 @@ let proxyTable = {
       '^/icore.icp.web/pass/logout': '/'
     }
   },
-  /**
-  
-  '/icore.icp.web/pass/configCenter': {
-    target: 'http://paas-config/configCenter',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/pass/configCenter': '/'
-    }
-  },
-  '/icore.icp.web/restPassword': {
-    target: 'http://sso-dev.steerinfo.com',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/restPassword': '/'
-    }
-  },
-  '/icore.icp.web/pass/serviceCenter': {
-    target: 'http://dev-govern.steerinfo.com',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/pass/serviceCenter': '/'
-    }
-  },
-  '/icore.icp.web/pass/act': {
-    target: 'http://dev-act.steerinfo.com',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/pass/act': '/'
-    }
-  },
-  '/icore.icp.web/pass/job': {
-    target: 'http://dev-job.steerinfo.com',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/pass/job': '/'
-    }
-  },
-  '/icore.icp.web/pass/dd': {
-    target: 'http://dd.steerinfo.com',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/pass/dd': '/'
-    }
-  },
-  '/icore.icp.web/pass/apiauth': {
-    target: 'http://auth.steerinfo.com',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/pass/apiauth': '/'
-    }
-  },
-  '/icore.icp.web/pass/websocket': {
-    target: 'http://websocket.steerinfo.com/',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/pass/websocket': '/'
-    }
-  },
-  '/icore-api': {
-    target: 'http://sso-dev.steerinfo.com',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore-api': '/'
-    }
-  },
-  '/pass/devops': {
-    target: 'http://10.10.50.51:9080',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/pass/devops': '/'
-    }
-  },
-  '/graphql': {
-    // target: 'http://192.168.10.128:8080',
-    target: 'http://10.10.50.28:8080',
-    changeOrigin: true
-  },
-  '/devopsApi': {
-    target: 'https://devops-api.steerinfo.com',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/devopsApi': '/'
-    }
-  },
-  '/devops-images': {
-    target: 'https://devops.steerinfo.com',
-    changeOrigin: true
-  },
-  '/authManage': {
-    target: 'http://10.10.50.62:20000',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/authManage': '/'
-    }
-  },
-  '/icore.icp.web/edgeDevice': {
-    target: 'http://10.10.50.62:10000',
-    changeOrigin: true,
-    pathRewrite: {
-      '^/icore.icp.web/edgeDevice': '/'
-    }
-  }*/
 }
 
 let dist = '../dist';

+ 1 - 1
src/components/main.vue

@@ -270,7 +270,7 @@
             <span
               class="ifCompany el-dropdown-link"
               v-if="companys.length === 1"
-              >{{ companyName }}</span
+              >{{ companyName }}1</span
             >
             <el-dropdown trigger="click" @command="selectComPany" v-else>
               <span class="el-dropdown-link">

+ 0 - 81
src/styles/appoint/contract/ContractInsert.scss

@@ -1,81 +0,0 @@
-#pageTitle {
-    border-bottom: 0.125rem solid $borderColorPageTitlte;
-    background-color: $backgroundColorPageTitle;
-    padding-left: 3.125rem;
-    margin-bottom: 1.875rem;
-    span {
-      font-size: 1.5rem;
-      line-height: 4.375rem;
-      color: $fontColorPageTitle;
-    }
-    i {
-      cursor: pointer;
-      border: 0.0625rem solid $fontColorPageTitle;
-      color: $fontColorPageTitle;
-      border-radius: 100%;
-      margin-right: 1.25rem;
-      // 图标放大
-      transform: scale(1.6, 1.6);
-    }
-  }
-  #query_condition{
-    margin-left: 3rem;
-  }
-  .button-box {
-    display: flex;
-    justify-content: center;
-    .el-button + .el-button {
-      margin-left: 3rem;
-    }
-  }
-  
-  .form-box {
-    display: flex;
-    margin-top: 1.25rem;
-    justify-content: center;
-    .el-form {
-      flex-direction: column;
-    }
-    
-  }
-
-  .body{
-    display: -webkit-flex;
-    display: flex;
-  }
-  .main {
-    display: flex;
-    margin-top: 1.5625rem;
-    margin-left: 1.875rem;
-    margin-bottom: 3.125rem;
-    .text {
-      margin-right: 0.625rem;
-      font-weight: 700;
-      font-size: 0.9375rem;
-    }
-    .el_text1 {
-      width: 56.875rem;
-    }
-    .a {
-      margin-top: 0.4375rem;
-      width: 80%;
-      height: 0.0625rem;
-      border-top: $gainsboro 0.0625rem solid;
-    }
-  }
-  .contractTitle{
-    margin: 0 auto;
-    text-align: center;
-  }
-  .contractId{
-    font-size: 1.25rem;
-  }
-  .form-one{
-    margin-right: 0.625rem;
-  }
-  .button-ins {
-    display: flex;
-    margin-left: 60rem;
-    margin-bottom: 1rem;
-  }
-  

+ 0 - 106
src/styles/appoint/contract/add.scss

@@ -1,106 +0,0 @@
-#pageTitle {
-    border-bottom: 0.125rem solid $borderColorPageTitlte;
-    background-color: $backgroundColorPageTitle;
-    padding-left: 3.125rem;
-    margin-bottom: 1.875rem;
-    span {
-      font-size: 1.5rem;
-      line-height: 4.375rem;
-      color: $fontColorPageTitle;
-    }
-    i {
-      cursor: pointer;
-      border: 0.0625rem solid $fontColorPageTitle;
-      color: $fontColorPageTitle;
-      border-radius: 100%;
-      margin-right: 1.25rem;
-      // 图标放大
-      transform: scale(1.6, 1.6);
-    }
-  }
-  #query_condition{
-    margin-left: 3rem;
-  }
-  .button-box {
-    display: flex;
-    justify-content: center;
-    margin-top: 30px;
-    .el-button + .el-button {
-      margin-left: 3rem;
-    }
-  }
-  
-  .form-box {
-    display: flex;
-    margin-top: 1.25rem;
-    justify-content: center;
-    .el-form {
-      flex-direction: column;
-    }
-  }
-  .table_form{
-    margin-bottom: 1.875rem;
-    .materialId{
-      width:66.875rem ;
-      display: flex;
-      justify-content: center;
-      .text{
-        width: 3.125rem;
-        display: inline-block;
-        display: flex;
-        align-items: center;
-      }
-      .btn{
-        width: 13.125rem;
-      }
-    }
-  }
-  .selectionTable{
-    width: 100%;height: 39.125rem;
-    overflow:auto;
-  }
-  .tablecls{
-    margin-top: 1.25rem;
-    width: 100%;height: 37.6875rem;
-    overflow:auto;
-  }
-  .body{
-    display: -webkit-flex;
-    display: flex;
-  }
-  .main {
-    display: flex;
-    margin-top: 1.5625rem;
-    margin-left: 1.875rem;
-    margin-bottom: 3.125rem;
-    .text {
-      margin-right: 0.625rem;
-      font-weight: 700;
-      font-size: 0.9375rem;
-    }
-    .el_text1 {
-      width: 56.875rem;
-    }
-    .a {
-      margin-top: 0.4375rem;
-      width: 80%;
-      height: 0.0625rem;
-      border-top: $gainsboro 0.0625rem solid;
-    }
-  }
-  .contractTitle{
-    margin: 0 auto;
-    text-align: center;
-  }
-  .contractId{
-    font-size: 1.25rem;
-  }
-  .form-one{
-    margin-right: 0.625rem;
-  }
-  .button-ins {
-    display: flex;
-    margin-left: 60rem;
-    margin-bottom: 1rem;
-  }
-  

+ 0 - 135
src/styles/variables.scss

@@ -1,135 +0,0 @@
-// 基础色 (开始)
-$black: #000000; // 纯黑
-$dmiBlack: #333333; // 淡黑
-
-$blue: #0000ff; // 纯蓝
-$doderBlue: #1e90ff; // 宝蓝
-$deepSkyBlue: #00bfff; // 	深天蓝
-$lightBlue: #add8e6; // 淡蓝
-$lucency:#ffffff00;
-$red: #ff0000; // 纯红
-$pink: #ffc0cb; // 	粉红
-
-$green: #008000; // 纯绿
-
-$yellow: #ffff00; // 纯黄
-
-$white: #ffffff; // 纯白
-$whiteSmoke: #f5f5f5; // 烟白
-$gainsboro: #dcdcdc; // 	亮灰色
-$darkGray: #a9a9a9; // 深灰色
-$dimGray: #696969; // 暗淡的灰色
-$gray: #808080; // 灰色
-// 基础色 (结束)
-
-// 状态色
-$colorPrimary: #1890ff;
-$colorSuccess: #13ce66;
-$colorWarning: #ffba00;
-$colorDanger: #ff4949;
-$colorInfo: #1e1e1e;
-// 状态色
-
-// 字体色 (开始)
-$fontColor: $black; // 全局默认
-// 字体激活色
-$fontColorActive: #1890ff; // 字体激活时的颜色
-// 按钮
-$fontColorButton: $white; // 默认
-// 输入框
-$fontColorInput: $white; // 输入文本
-$fontColorInputPlaceholder: $darkGray; // 占位文本
-// 登录页
-$fontColorLogin: $white; // 登录页字体颜色
-$fontColorTitleLogin: $fontColorLogin; // 登录页标题颜色
-$fontColorInputLogin: $fontColorLogin; // 登录页输入文本颜色
-// 主页
-$fontColorHome: $fontColorLogin; // 主页字体颜色
-// 导航菜单
-$fontColorNavMenu: #bfcbd9; // 默认
-$fontColorNavMenuActive: $white; // 激活
-$fontColorNavMenuLogo: $white; // 导航栏logo字体颜色
-// 内页
-$fontColorPageTitle: #0c2278; // 内页头部颜色
-// 面包屑
-$fontColorBreadcrumb: #303133; // 正常
-$fontColorBreadcrumbDisabled: #97a8be; // 禁用
-// 标签
-$fontColorTag: #7b7b7ccb; // 未选中
-$fontColorTagActive: $fontColorActive; // 选中
-$fontColorTagMenu: $dmiBlack; // 标签页右键菜单字体颜色
-$fontColorTagItemCloseHover: $white; // 标签页单标签关闭按钮悬浮时颜色
-// 表格
-$fontColorTableHead: $dmiBlack; // 表头默认
-$fontColorTableBody: #606266; // 表格默认
-// 分页
-$fontColorPagination: #606266; // 默认
-$fontColorPaginationActive: $fontColorActive; // 激活
-// LED 显示大屏
-$fontColorLSD: $white; //LED大屏显示字体颜色
-// 字体色 (结束)
-
-// 背景色 (开始)
-$backgroundColor: $white; // 背景默认颜色
-$backgroundColorActive: $fontColorActive; // 激活背景色
-// 背景遮罩
-$backgroundColorMaskBg: #00000049; // 默认遮罩颜色
-// 按钮
-$backgroundColorButton: $backgroundColorActive; // 默认
-// 输入框
-$backgroundColorInput: $white; // 默认
-// 登录页
-$backgroundColorLogin: #2d3a4b; // 默认背景色
-$backgroundColorInputLogin: #293444; // 输入框背景色
-// 主页
-$backgroundColorHome: $backgroundColorLogin; // 主页背景颜色
-$backgroundColorButtonHome: #deecff; // 按钮背景色
-// 菜单
-$backgroundColorNavMenu: #0c2278; // 菜单背景色
-$backgroundColorNavMenuHover: #2751c4; // 菜单悬浮背景色
-$backgroundColorNavMenuActive: $backgroundColorActive; // 菜单激活颜色
-$backgroundColorNavMenuLogo: #0a1e67; // 菜单logo的背景色
-$backgroundColorNavBarHover: #00000009; // 悬浮时的背景色
-// 标签
-$backgroundColorTag: $backgroundColor; // 标签页的背景颜色
-$backgroundColorTagItem: $backgroundColorTag; // 标签页的单标签背景色
-$backgroundColorTagItemAcitve: $backgroundColorTagItem; // 标签页单标签激活时的背景色
-$backgroundColorTagItemCloseHover: #b4bccc; // 标签页单单标签关闭按钮悬浮背景色
-$backgroundColorTagMenu: $backgroundColorTag; // 标签页右键菜单背景颜色
-$backgroundColorTagMenuItemHover: $whiteSmoke; // 标签页悬浮背景色
-// 内页
-$backgroundColorPageTitle: $whiteSmoke; // 内页头部背景颜色
-// 表格
-$backgroundColorTableHead: #f0f7ff; // 表格头的背景颜色
-$backgroundColorTableRowStriped: #f0f7ff; //表格斑马纹颜色
-$backgroundColorTableHover: #f5f7fa; // 表格悬浮颜色
-// LED 显示大屏
-$backgroundColorLSD: #0885ff; //默认背景颜色
-$backgroundColorLSDHead: #08cbff; //大屏表头颜色
-// 背景色 (结束)
-
-// 边框色 (开始)
-$borderColor: #d9d9d9; //默认边框颜色
-// 输入框
-$borderColorInput: #ffffff19; // 默认边框颜色
-// 表格
-$borderColorTable: #dcdfe7; // 表格边框默认颜色
-$borderColorTableTop: $blue; // 表格顶部边框颜色
-// 登录页
-$borderColorInputLogin: $borderColorInput; // 输入框边框颜色
-// 标签页
-$borderColorTag: #d8dce5; // 底部边框色
-$borderColorTagShadowStart: #00000019; // 阴影颜色起点颜色
-$borderColorTagShadowEnd: #00000009; // 阴影颜色终点颜色
-$borderColorTagMenuShadow: #00000049; // 标签页菜单阴影色
-// 内页
-$borderColorPageTitlte: #0079fe; // 内页边框头部颜色
-// LED 显示大屏
-$borderColorLSD: $white; //边框颜色
-// 边框色 (结束)
-
-// 大小
-$sizeFont: 1rem; // 字体默认大小
-    // 菜单
-$sizeNavMenuWidth: 15.625rem; // 左侧导航栏宽度
-// 大小

+ 0 - 0
src/js/QueueStartList.js → src/utils/QueueStartList.js


+ 0 - 0
src/js/sharedJsFile.js → src/utils/sharedJsFile.js


+ 4 - 4
src/views/RMS/components/editTruckCalculate.vue

@@ -71,7 +71,7 @@ export default {
       inputText:"",
       option1:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getCalculateOfMaterialList?apiId=379&truckCalculateId="+this.$route.params.truckCalulateId,
+        requestUrl: "/api/v1/rms/getCalculateOfMaterialList?apiId=379&truckCalculateId="+this.$route.params.truckCalculateId,
         
       },
       option2:{
@@ -96,12 +96,12 @@ export default {
     // },
     information() {
       //编辑 
-   console.log(this.$route.params)            
-   console.log("truckCalculateId",this.$route.params.truckCalulateId);  
+   console.log("information")          
+   console.log("truckCalculateId",this.$route.params.truckCalculateId);  
       this.axios
         .post(
           "/api/v1/rms/getTruckCalculateById/" +
-            this.$route.params.truckCalulateId
+            this.$route.params.truckCalculateId
         )
 
         .then((res) => {

+ 2 - 2
src/views/RMS/components/oilPrice.vue

@@ -47,13 +47,13 @@ export default {
       restaurants: [],
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getOilPriceList?apiId=380",
+        requestUrl: "/api/v1/rms/getOilPriceResultList?apiId=380",
       },
     }
   },
   methods:{
     onclick(){
-      this.options.requestUrl = "/api/v1/rms/getOilPriceList?apiId=380&con=" +this.textInput;
+      this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&con=" +this.textInput;
     },
 
     toInsert() {

+ 3 - 3
src/views/RMS/components/truckCalculate.vue

@@ -21,7 +21,7 @@
                <el-button
                type="text"
                size="small"
-               @click="updateTruckCalculate(scope.row.truckCalculateId)"
+               @click="updateTruckCalculate(scope)"
              >
                详细
              </el-button> 
@@ -57,8 +57,8 @@ export default {
       this.$router.push("/addTruckCalculate");
 
     },
-   updateTruckCalculate(truckCalculateId){
-      this.$router.push("/editTruckCalculate/" + truckCalculateId)
+   updateTruckCalculate(scope){
+      this.$router.push("/editTruckCalculate/" + scope.row.truckCalculateId)
     },
    deleteTruckCalculate(scope){
       this.$confirm("是否删除", "提示", {

+ 1 - 1
src/views/RMS/router/index.js

@@ -93,7 +93,7 @@ const constantRouterMap = [
 		{path: 'editRawWarehouse/:warehouseId', name: 'editRawWarehouse', meta: {code: 'xtpzgl-yhgl'}, component: editRawWarehouse},
 		{path: 'editRmsShipper/:shipperId', name: 'editRmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: editRmsShipper},
 		{path: 'editSupplier/:supplierId', name: 'editSupplier', meta: {code: 'xtpzgl-yhgl'}, component: editSupplier},
-		{path: 'editTruckCalculate', name: 'editTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: editTruckCalculate},
+		{path: 'editTruckCalculate/:truckCalculateId', name: 'editTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: editTruckCalculate},
 		{path: 'gatepost', name: 'gatepost', meta: {code: 'xtpzgl-yhgl'}, component: gatepost},
 		{path: 'material', name: 'material', meta: {code: 'xtpzgl-yhgl'}, component: material},
 		{path: 'oilPrice', name: 'oilPrice', meta: {code: 'xtpzgl-yhgl'}, component: oilPrice},

+ 1 - 1
src/views/TMS/components/importedEmergency/addWagonLoad.vue

@@ -92,7 +92,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-// import { sjTime } from "@/js/sharedJsFile";
+// import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/TMS/components/importedEmergency/addWagonUnLoad.vue

@@ -30,7 +30,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-// import { sjTime } from "@/js/sharedJsFile";
+// import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/TMS/components/importedEmergency/editWagonLoad.vue

@@ -23,7 +23,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-// import { sjTime } from "@/js/sharedJsFile";
+// import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){

+ 1 - 1
src/views/TMS/components/importedEmergency/editWagonUnLoad.vue

@@ -23,7 +23,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-// import { sjTime } from "@/js/sharedJsFile";
+// import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){

+ 1 - 1
src/views/TMS/components/importedFuel/transportReserveFuAdd.vue

@@ -324,7 +324,7 @@ export default {
 };
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 .contractDetails {
   width: 100%;
 }

+ 41 - 27
src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -31,7 +31,7 @@
     </div>
     <div class="orderType from">
       <span class="text">订单类别:</span>
-      <el-select v-model="orderType" placeholder="请选择" disabled>
+      <el-select class="select" v-model="orderType" placeholder="请选择" disabled>
         <el-option
           v-for="item in orderTypeList"
           :key="item.value"
@@ -102,14 +102,14 @@
       <el-input
         placeholder="请输入内容"
         v-model="input"
-        style="margin-top: 0.625rem; margin-left: 1.25rem;width:10rem"
+        style="margin-top: 10px; margin-left: 20px;width:160px"
         clearable
       ></el-input>
       <el-button
         type="primary"
         class="btn"
         @click="onclick(a)"
-        style="margin-bottom: 0.9375rem"
+        style="margin-bottom: 15px"
       >
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -152,7 +152,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime,isNumber,isIntegerNumber } from '@/js/sharedJsFile'
+import { sjTime,isNumber,isIntegerNumber } from '@/utils/sharedJsFile'
 export default {
   components: { PageTitle },
   data() {
@@ -461,24 +461,20 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
+  margin-top: 5px;
+  margin-bottom: 20px;
 }
 .remark {
   display: flex;
   justify-content: center;
   .text {
     display: inline-block;
-    width: 6.875rem;
+    width: 100px;
     text-align: right;
   }
   .input{
-    width: 11.25rem;
-    margin-right: 1.25rem;
-  }
-  .span{
-    display: inline-block;
-    width: 3.125rem;height: 0.0625rem;
+    width: 250px;
+    margin-right: 20px;
   }
 }
 .lineId {
@@ -486,12 +482,12 @@ export default {
   justify-content: center;
   .text {
     display: inline-block;
-    width: 6.875rem;
+    width: 170px;
     text-align: right;
   }
   .input{
-    width: 12.5rem;
-    margin-right: 1.25rem;
+    width: 250px;
+    margin-right: 20px;
   }
 }
 .material {
@@ -499,12 +495,12 @@ export default {
   justify-content: center;
   .text {
     display: inline-block;
-    width: 6.875rem;
+    width: 170px;
     text-align: right;
   }
   .input{
-    width: 12.5rem;
-    margin-right: 1.25rem;
+    width: 250px;
+    margin-right: 20px;
   }
 }
 .orderType{
@@ -512,12 +508,30 @@ export default {
   justify-content: center;
   .text {
     display: inline-block;
-    width: 5rem;
+    width: 110px;
     text-align: right;
   }
+  .select{
+    width: 250px;
+  }
   .span{
     display: inline-block;
-    width: 4.375rem;height: 0.625rem;
+    width: 30px;height: 10px;
+  }
+}
+.contractTitle{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-input{
+      width: 250px;
+    }
   }
 }
 .forwardingUnit {
@@ -525,12 +539,12 @@ export default {
   justify-content: center;
   .text {
     display: inline-block;
-    width: 6.875rem;
+    width: 170px;
     text-align: right;
   }
   .input{
-    width: 12.5rem;
-    margin-right: 1.25rem;
+    width: 250px;
+    margin-right: 20px;
   }
 }
 .truckList1 {
@@ -539,11 +553,11 @@ export default {
     width: 96%;
     .text {
       display: inline-block;
-      width: 9.375rem;
+      width: 120px;
       text-align: right;
     }
     .truckBtn {
-      width: 200px;
+      width: 250px;
     }
   }
 }
@@ -552,6 +566,6 @@ export default {
   justify-content: center;
   align-items: center;
   width: 100%;
-  height: 6.25rem;
+  height: 100px;
 }
 </style>

+ 1 - 1
src/views/TMS/components/importedIngredients/transportReserveFuAdd.vue

@@ -171,7 +171,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
-// import { sjTime, isNumber, isIntegerNumber } from "@/js/sharedJsFile";
+// import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/WMS/components/steel/inboundDetails.vue

@@ -13,7 +13,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-// import { sjTime } from "@/js/sharedJsFile";
+// import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: {
     PageTitle,

+ 1 - 1
src/views/appoint/components/purchase/updateBreach.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+//import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/inwardFactory/addTruckLoad.vue

@@ -19,7 +19,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/inwardImport/daZhou/addTruckLoad.vue

@@ -29,7 +29,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/inwardImport/daZhou/updateTrainUnload.vue

@@ -21,7 +21,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/inwardImport/daZhou/updateTruckLoad.vue

@@ -21,7 +21,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue

@@ -29,7 +29,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue

@@ -38,7 +38,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/offsetSteel/truckTrain/addWagonLoad.vue

@@ -21,7 +21,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/offsetSteel/truckTrain/addWagonUnLoad.vue

@@ -21,7 +21,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/offsetSteel/truckTrain/editWagonLoad.vue

@@ -23,7 +23,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){

+ 1 - 1
src/views/inward/components/offsetSteel/truckTrain/editWagonPlease.vue

@@ -23,7 +23,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/offsetSteel/truckTrain/editWagonUnLoad.vue

@@ -23,7 +23,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){

+ 1 - 1
src/views/inward/components/truckAppoint/addPlan.vue

@@ -26,7 +26,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/truckAppoint/addRequirement.vue

@@ -120,7 +120,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -94,7 +94,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/truckAppoint/updatePlan.vue

@@ -26,7 +26,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/truckAppoint/updateRequirement.vue

@@ -71,7 +71,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/inward/components/truckOrder/decomposeRailPlan.vue

@@ -113,7 +113,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/js/sharedJsFile";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: {
     PageTitle,

+ 1 - 1
src/views/sale/components/saleSelfMachine/saleSelfMachine.vue

@@ -14,7 +14,7 @@
     </div>
 </template>
 <script>
-// import {renderTime} from '@/js/sharedJsFile'
+// import {renderTime} from '@/utils/sharedJsFile'
 export default {
     data(){
         return{

+ 1 - 1
src/views/sale/components/transport_excute/tms-offsite/arrivalPhoto.vue

@@ -12,7 +12,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 
-// import { loadingPoint } from "@/js/QueueStartList";
+// import { loadingPoint } from "@/utils/QueueStartList";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/sale/components/transport_excute/tms-offsite/receiptChildPhoto.vue

@@ -18,7 +18,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 
-// import { loadingPoint } from "@/js/QueueStartList";
+// import { loadingPoint } from "@/utils/QueueStartList";
 export default {
   components: { PageTitle },
   data() {

+ 1 - 1
src/views/sale/components/transport_excute/tms-offsite/receiptPhoto.vue

@@ -12,7 +12,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 
-// import { loadingPoint } from "@/js/QueueStartList";
+// import { loadingPoint } from "@/utils/QueueStartList";
 export default {
   components: { PageTitle },
   data() {

+ 25 - 0
文件目录.md

@@ -0,0 +1,25 @@
+# 项目结构
+* `build` 打包配置文件夹,项目构建(webpack)相关代码。
+* `config` 配置目录,包括端口号等。
+  * `index.js`  请求前域名的配置。
+* `node_modules` 用于存放我们项目的各种依赖,比如axios等,没有moudles文件,项目就没法运行,可以使用 npm install进行项目依赖的安装。
+* `public` 是一个模板文件,作用是生成项目的入口文件,webpack打包的js,css也会自动注入到该页面中。我们浏览器访问项目的时候就会默认打开生成好的index.html。
+* `src` 我们存放各种vue文件的地方。
+  * `assets` 存放静态资源地,放置一些图片,如logo等。
+  * `components` 全局的公用组件存放位置。
+  * `config` 配置请求拦截器,同一处理报错方式。
+  * `lib` 全局的公用组件存放位置。
+  * `store` 是一个全局的共享数据库存储区域,就相当于是一个数据仓库。
+  * `tool` 自己编写的全局js工具文件夹。
+  * ``
+* `static` 静态html页面的css/js/img存放地,请勿轻易进行更改。
+* `test` 初始测试目录,本地测试类文件。
+* `.editorconfig` 定义和维护一致的编码样式。
+* `.eslintignore` 当 ESLint 运行时,在确定哪些文件要检测之前,它会在当前工作目录中查找一个 .eslintignore 文件。如果发现了这个文件,当遍历目录时,将会应用这些偏好设置。一次只有一个 .eslintignore 文件会被使用,所以,不是当前工作目录下的 .eslintignore 文件将不会被用到(eslint通过.eslintignore 文件或者在 package.json 文件中查找 eslintIgnore 键,来检查要忽略的文件)。
+* `.eslintrc.js` js语法检测配置。
+* `.gitignore` git上传需要忽略的文件格式。
+* `index.html` 是一个模板文件,作用是生成项目的入口文件,webpack打包的js,css也会自动注入到该页面中。我们浏览器访问项目的时候就会默认打开生成好的index.html。
+* `nginx.conf` 反向代理配置文件。
+* `package-lock.json` 在 npm install时候生成一份文件,用以记录当前状态下实际安装的各个npm package的具体来源和版本号(package.json文件只能锁定大版本,也就是版本号的第一位,并不能锁定后面的小版本,你每次npm install都是拉取的该大版本下的最新的版本,为了稳定性考虑我们几乎是不敢随意升级依赖包的,这将导致多出来很多工作量,测试/适配等,所以package-lock.json文件出来了,当你每次安装一个依赖的时候就锁定在你安装的这个版本。)。
+* `package.json` 定义了这个项目所需要的各种模块,以及项目的配置信息(比如名称、版本、许可证等元数据)。npm install 命令根据这个配置文件,自动下载所需的模块,也就是配置项目所需的运行和开发环境。
+* `vue.config.js` 是一个可选的配置文件,如果项目的 (和 package.json 同级的) 根目录中存在这个文件,那么它会被 @vue/cli-service 自动加载。你也可以使用 package.json 中的 vue 字段,但是注意这种写法需要你严格遵照 JSON 的格式来写。