Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

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.13.2",
+    "element-ui": "2.4.2",
     "file-saver": "^1.3.8",
     "graphql": "^14.1.1",
     "graphql-tag": "^2.10.1",
@@ -47,9 +44,7 @@
     "socket.io-stream": "^0.9.1",
     "sockjs-client": "^1.3.0",
     "uuid": "^3.3.2",
-    "view-design": "^4.7.0",
     "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",
@@ -58,14 +53,13 @@
     "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": {
@@ -130,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/bmsport/addHandlingFee.vue

@@ -1,18 +1,14 @@
 <template>
   <!-- 船只信息页面 -->
-  <div class="homeworkPath">
+  <div class="handingFee">
     <page-title>港口装卸费</page-title>
-    <div class="main">
-      <span class="text">港口装卸费新增</span>
-      <span class="a"></span>
-    </div>
     <div>
-      <div class="form-box" style="margin-left: 5rem">
-        <el-form ><dil-form :formId="222" v-model="form"></dil-form></el-form>
+      <div class="form-box">
+        <dil-form :formId="222" v-model="form"></dil-form>
       </div>
     </div>
-    <div class="button-ins">
-      <el-button type="primary" @click="makeSure">新增港口装卸费</el-button>
+    <div class="button-box">
+      <el-button type="primary" @click="makeSure">新增</el-button>
     </div>
     <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
     </dilTable>
@@ -87,4 +83,25 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
+    .handingFee {
+      .form-box {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        .el-form-item {
+          display: flex;
+          .el-form-item__label {
+            width: 170px !important;
+          }
+          .el-input {
+            width: 210px !important;
+          }
+    }
+      }
+      .button-box {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
 </style>

src/views/TMS/components/bmsport/handlingFee.vue

@@ -3,9 +3,6 @@
   <div class="homeworkPath">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
       <el-button type="primary" class="btn" @click="addclick">
         新增
       </el-button>
@@ -91,7 +88,12 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    .el-input {
+      margin-left: 2.5rem;
+      margin-top: 2.5rem;
+      margin-bottom: 2.5rem;
+      width: 250px;
+    }
   }
 }
 </style>

src/views/TMS/components/bmsport/updateHandlingFee.vue

@@ -2,18 +2,13 @@
   <!-- 修改港口装卸费 -->
   <div id="contractDetails">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">港口装卸费</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
       <div class="form-box">
-        <div class="form-one">
+        <div class="form-box">
           <dil-form :formId="223" v-model="form1"></dil-form>
         </div>
       </div>
     </div>
-
     <div class="button-box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>

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/appoint/components/purchase/addOtherPrice.vue

@@ -2,20 +2,13 @@
   <!-- 添加其他价格 -->
   <div class="addShipPrice">
     <page-title>新增</page-title>
-    <el-divider content-position="left">添加其他价格</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
+     <div class="form-box">
         <dil-form :formId="221" v-model="form1" ref="from1"></dil-form>
       </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-    <!-- <div class="primarybtn">
-      <el-button class="btn" @click="goback">取消</el-button>
-      <el-button type="primary" class="btn" @click="submitclick"
-        >确定</el-button
-      >
-    </div> -->
   </div>
 </template>
 
@@ -62,5 +55,23 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+  .form-box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .el-form-item {
+      display: flex;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 </style>

src/views/appoint/components/purchase/otherPrice.vue

@@ -2,15 +2,13 @@
   <!-- 其他单价页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input v-model="input" placeholder="请输入内容"></el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-input></el-input>
       <el-button type="primary" @click="btnclick()">
         新增
       </el-button>
     </div>
-    <dilTable v-bind.sync="option">
+    <div>
+      <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" align="center" width="150">
         <template slot-scope="scope">
           <el-button @click="click(scope.row.priceId)" type="text" size="small"
@@ -25,6 +23,7 @@
         </template>
       </el-table-column>
     </dilTable>
+    </div> 
   </div>
 </template>
 
@@ -45,9 +44,6 @@ export default {
     
   },
   methods: {
-    handleSelect(item) {
-      console.log(item);
-    },
     onclick() {
       console.log(1);
     },
@@ -103,6 +99,9 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
+    .el-input {
+      width: 250px;
+    }
     padding: 1.25rem 1.875rem;
   }
 }

src/views/appoint/components/purchase/updateOtherPrice.vue

@@ -2,10 +2,6 @@
   <!-- 修改其他价格信息 -->
   <div id="contractDetails">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">修改其他价格信息</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
       <div class="form-box">
         <div class="form-one">
@@ -13,7 +9,6 @@
         </div>
       </div>
     </div>
-
     <div class="button-box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -81,5 +76,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+    .form-box {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .el-form-item {
+      display: flex;
+      .el-form-item__label {
+        width: 170px !important;
+      }
+      .el-input {
+        width: 210px !important;
+      }
+    }
+  }
+  .button-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 </style>

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

@@ -75,7 +75,15 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已接收" name="second">
-            <dilTable v-bind.sync="second"> </dilTable>
+            <dilTable v-bind.sync="second"> 
+              <el-table-column fixed="right" label="操作" width="80">
+                <template slot-scope="scope">
+                  <el-button type="text" size="mini" @click="deleteClick(scope)">
+                    关闭
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
           </el-tab-pane>
         </el-tabs>
       </div>

src/views/sale/app.js

@@ -25,34 +25,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",