adhkj

build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
 // let devModules = ['all']
-let devModules = ['index','inward','SporadicManage','sale','RMS']
+let devModules = ['index','TMS']
 // let devModules = ['index','inward']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']

package.json

@@ -15,21 +15,18 @@
     "testc": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js test/**/*.spec.js"
   },
   "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
     "@antv/g6": "1.2.8",
-    "@vue/reactivity": "^3.2.31",
-    "amap-js": "^2.4.0",
     "apollo-cache-inmemory": "^1.5.1",
     "apollo-client": "^2.5.1",
     "apollo-link": "^1.2.11",
     "apollo-link-error": "^1.1.11",
     "apollo-link-http": "^1.5.14",
-    "axios": "^0.26.1",
+    "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "crypto": "^1.0.1",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",
-    "element-ui": "2.15.7",
+    "element-ui": "2.4.2",
     "file-saver": "^1.3.8",
     "graphql": "^14.1.1",
     "graphql-tag": "^2.10.1",
@@ -48,22 +45,21 @@
     "sockjs-client": "^1.3.0",
     "uuid": "^3.3.2",
     "vue": "^2.5.2",
-    "vue-amap": "^0.5.10",
     "vue-apollo": "^3.0.0-beta.28",
     "vue-baidu-map": "^0.21.19",
     "vue-clipboard2": "^0.2.1",
     "vue-element-bigdata-table": "^1.3.1",
+    "vue-print-nb": "^1.7.5",
     "vue-property-decorator": "^8.2.1",
     "vue-quill-editor": "^3.0.5",
     "vue-router": "^3.0.1",
-    "vue-social-share": "0.0.3",
     "vue-splitpane": "^1.0.2",
     "vuescroll": "^4.17.3",
     "vuex": "^3.0.1",
     "vxe-table": "^3.4.12",
     "x2js": "^3.3.0",
-    "xe-utils": "^3.5.4",
-    "xlsx": "^0.18.4",
+    "xe-utils": "^3.5.1",
+    "xlsx": "^0.11.19",
     "xterm": "3.12.0"
   },
   "devDependencies": {
@@ -128,7 +124,7 @@
     "sass-loader": "^6.0.6",
     "selenium-server": "^3.0.1",
     "semver": "^5.3.0",
-    "shelljs": "^0.8.5",
+    "shelljs": "^0.7.6",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
     "vue-jest": "^1.0.2",

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

@@ -59,11 +59,11 @@ export default {
     activeName(val){
       if (getCookie("orgCode") == "chengyunshang") {
         if(val == "option"){
-          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=4&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
         }else if(val == "first"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
         }else if(val == "second"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
         }
       }else{
         if(val == "option"){

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

@@ -59,11 +59,11 @@ export default {
     activeName(val){
       if (getCookie("orgCode") == "chengyunshang") {
         if(val == "option"){
-          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
         }else if(val == "first"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
         }else if(val == "second"){
-          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=5&orderStatus=6&i="+new Date()+"&carrierSSOId=" + getCookie("userId");
         }
       }else{
         if(val == "option"){

src/views/sale/app.js

@@ -23,34 +23,34 @@ Vue.use(VXETable)
 Vue.prototype.$XModal = VXETable.modal
 
 
-import AMap from 'vue-amap';
-
-Vue.use(AMap);
-  AMap.initAMapApiLoader({
-    key: 'eed46ea40bbcadbf8a9cdd5dc1a94642',
-    plugin: [
-      "AMap.Autocomplete", // 输入提示插件
-      "AMap.PlaceSearch", // POI搜索插件
-      "AMap.Scale", // 右下角缩略图插件 比例尺
-      "AMap.OverView", // 地图鹰眼插件
-      "AMap.ToolBar", // 地图工具条
-      "AMap.MapType", // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-      "AMap.PolyEditor", // 编辑 折线多，边形
-      "AMap.CircleEditor", // 圆形编辑器插件
-      "AMap.Geolocation", // 定位控件，用来获取和展示用户主机所在的经纬度位置
-      "AMap.ControlBar"   // 缩放、尺寸控制器
-    ],
-    // 默认高德 sdk 版本为 1.4.4
-    v: '1.4.15',
-    uiVersion: '1.1.1'
-});
-
-import Share from 'vue-social-share'
-Vue.use(Share);
-
-import 'view-design/dist/styles/iview.css';
-import ViewUI from 'view-design';
-Vue.use(ViewUI);
+// import AMap from 'vue-amap';
+
+// Vue.use(AMap);
+//   AMap.initAMapApiLoader({
+//     key: 'eed46ea40bbcadbf8a9cdd5dc1a94642',
+//     plugin: [
+//       "AMap.Autocomplete", // 输入提示插件
+//       "AMap.PlaceSearch", // POI搜索插件
+//       "AMap.Scale", // 右下角缩略图插件 比例尺
+//       "AMap.OverView", // 地图鹰眼插件
+//       "AMap.ToolBar", // 地图工具条
+//       "AMap.MapType", // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+//       "AMap.PolyEditor", // 编辑 折线多，边形
+//       "AMap.CircleEditor", // 圆形编辑器插件
+//       "AMap.Geolocation", // 定位控件，用来获取和展示用户主机所在的经纬度位置
+//       "AMap.ControlBar"   // 缩放、尺寸控制器
+//     ],
+//     // 默认高德 sdk 版本为 1.4.4
+//     v: '1.4.15',
+//     uiVersion: '1.1.1'
+// });
+
+// import Share from 'vue-social-share'
+// Vue.use(Share);
+
+// import 'view-design/dist/styles/iview.css';
+// import ViewUI from 'view-design';
+// Vue.use(ViewUI);
 // import VueAMap from 'vue-amap'
  
 // Vue.use(VueAMap)

src/views/sale/components/offSiteTransportation/inTransit.vue

@@ -163,7 +163,7 @@ import { sjTime } from "@/utils/sharedJsFile";
 
 //PathView组件注册
 // import PageTitle from "@/offSiteTransportation/mapTest.vue";
-import PathView from "./mapTest.vue"
+// import PathView from "./mapTest.vue"
 // import InTransitOrderMileage from "@/views/TMS/tms-offsite/inTransitOrderMileage.vue"
 // import inTransitAlarm from "@/views/TMS/tms-offsite/inTransitAlarm.vue"
 export default {

src/views/sale/components/offSiteTransportation/mapTest.vue

@@ -44,13 +44,13 @@
 </template>
 
 <script>
-import AMapLoader from '@amap/amap-jsapi-loader';
-import { shallowRef } from '@vue/reactivity'
-import { Loading } from 'element-ui';
-import { lazyAMapApiLoaderInstance } from 'vue-amap';
-import Slider from './slider.vue'
+// import AMapLoader from '@amap/amap-jsapi-loader';
+// // import { shallowRef } from '@vue/reactivity'
+// import { Loading } from 'element-ui';
+// // import { lazyAMapApiLoaderInstance } from 'vue-amap';
+// import Slider from './slider.vue'
 Vue.use(Slider)
-import AMapJS from "amap-js";
+// import AMapJS from "amap-js";
 import Vue from 'vue';
 export default {
     name: "PathView",