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

src/views/ADMINISTRATORS/components/saleLog.vue

@@ -0,0 +1,56 @@
+<template>
+  <!-- 操作日志页面 -->
+  <div class="shipTransport">
+    <div class="top">
+       <el-form>
+          <el-form-item label="请输入查询：">
+            <el-input
+              v-model="optionSaleLog.requestQuery.con"
+              style="width:300px"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <dil-table v-bind.sync="optionSaleLog"></dil-table>
+    </div>
+    <dilTable v-bind.sync="option">
+    </dilTable>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+     optionSaleLog: {
+        maxHeight: 400,
+        requestUrl: '/api/v1/ams/selectAllLog?apiId=522',
+        requestQuery: {
+          con: null
+        }
+      },
+    };
+  },
+  mounted() {},
+  methods: {
+    
+  },
+};
+</script>
+<style lang="scss" scoped>
+.shipTransport {
+  .top {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
+  }
+}
+</style>

src/views/ADMINISTRATORS/router/index.js

@@ -6,6 +6,7 @@ import main from "@/components/main.vue";
 // 系统配置管理
 import ADMINISTRATORS1 from "../components/ADMINISTRATORS1.vue";
 import tmstruckCommisson from "../components/tmstruckCommisson.vue";
+import saleLog from "../components/saleLog.vue";
 
 Vue.use(Router);
 
@@ -30,6 +31,13 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-jggl" },
         component: () =>
           import("@/views/ADMINISTRATORS/components/tmstruckCommisson")
+      },
+      {
+        path: "saleLog",
+        name: "saleLog",
+        meta: { code: "xtpzgl-jggl" },
+        component: () =>
+          import("@/views/ADMINISTRATORS/components/saleLog")
       }
     ]
   }

src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -518,6 +518,12 @@ export default {
           message: "请输入运输距离!",});
         return;
       }
+      if (!this.form1.priceValue){
+        this.$message({
+          type: "warning",
+          message: "请输入运价!",});
+        return;
+      }
       for (let i = 0; i < this.selectionList.length; i++) {
         this.carrierIdArray.push(this.selectionList[i].carrierId)
       }

src/views/statisticalReport/components/salesLogisticsStatistics/mapTest.vue

@@ -543,7 +543,7 @@ export default {
               that.startTime +
               ' 至 ' +
               that.endTime;
-          if(getCookie('orgCode')!='wuliuyunshubu'){
+          if(getCookie('orgCode')!='wuliuyunshubu' && getCookie('orgCode')!='shichangxinxibu' && getCookie('orgCode')!='caiwubu'){
             content = that.statusCode +'：' +
               that.currentPointName +
               '<br/>' +