huk 3 vuotta sitten
vanhempi
commit
11eb30075d

+ 1 - 1
build/check-versions.js

@@ -40,7 +40,7 @@ module.exports = function () {
 
   if (warnings.length) {
     console.log('')
-    console.log(chalk.yellow('To use this template, you must update following to modules:'))
+    console.log(chalk.yellow('若要使用此模板,必须更新以下模块:'))
     console.log()
 
     for (let i = 0; i < warnings.length; i++) {

+ 2 - 2
build/utils.js

@@ -15,9 +15,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
 //    物流         进程     成本   报表          基础配置        系统配置
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
-// let devModules = ['index','RMS','systemConfig','TMS']
+// let devModules = ['index','RMS','systemConfig']
 let devModules = ['all'];
-// let devModules = ['index','appoint','sale','RMS']
+// let devModules = ['index','RMS']
 
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

+ 1 - 3
config/index.js

@@ -56,7 +56,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://192.168.1.107:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
@@ -77,9 +77,7 @@ let proxyTable = {
     }
   },
 }
-
 let dist = '../dist';
-
 if (pathSrc.indexOf('node_modules') > -1) {
     dist = '../../../dist';
     let proxyTableGet = require('../../../cors.js').proxyTable;

BIN
dist.zip


+ 5 - 4
src/components/main.vue

@@ -1235,10 +1235,11 @@ export default {
      *打开主页
      */
     backMain() {
-      window.open(
-        window.location.protocol + "//portal.steerinfo.com",
-        "_blank"
-      );
+      this.$message.success('跳转主页');
+      // window.open(
+      //   window.location.protocol + "//portal.steerinfo.com",
+      //   "_blank"
+      // );
     },
     /**
      * 主题

+ 4 - 2
src/views/RMS/components/addCarrier.vue

@@ -235,13 +235,15 @@ export default {
         this.$message.error("承运商名称不能为空");
       } else if (!this.form1.carrierType) {
         this.$message.error("承运商类型不能为空");
-      }else if (!this.imageUrl1) {
+      }
+      else if (!this.imageUrl1) {
         this.$message.error("请上传运输证");
       } else if (!this.imageUrl2) {
         this.$message.error("请上传经营许可证");
       } else if (!this.imageUrl3) {
         this.$message.error("请上传营业执照");
-      }else {
+      }
+      else {
         status = true;
       }
       if (this.form1.registerDate) {

+ 54 - 0
src/views/statisticalReport/components/salesLogisticsStatistics/transportationPerformance.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询1
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "",
+      },
+      input: "",
+    };
+  },
+  created(){
+      if(getCookie('orgCode') == 'chengyunshang'){
+          this.option.requestUrl = '/api/v1/tms/getAllSaleReport?apiId=423'
+      }else{
+          this.option.requestUrl = '/api/v1/tms/getAllSaleReport?apiId=423'
+      }
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllSaleReport?api=423&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .input{
+      width: 250px;
+    }
+  }
+}
+</style>

+ 2 - 0
src/views/statisticalReport/router/index.js

@@ -10,6 +10,7 @@ import ShipDynamicTable from '../components/Ship_dynamic_table.vue'
 import purchaseAccessoriesMonitor from '../components/purchaseAccessoriesMonitor.vue'
 import purchasFuelOldMonitor from '../components/purchasFuelMonitor/purchasFuelOldMonitor.vue'
 import purchasFuelNewMonitor from '../components/purchasFuelMonitor/purchasFuelNewMonitor.vue'
+import transportationPerformance from '../components/salesLogisticsStatistics/transportationPerformance.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -24,6 +25,7 @@ const constantRouterMap = [
       {path: 'purchaseAccessoriesMonitor', name: 'purchaseAccessoriesMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchaseAccessoriesMonitor},
       {path: 'purchasFuelOldMonitor', name: 'purchasFuelOldMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelOldMonitor},
       {path: 'purchasFuelNewMonitor', name: 'purchasFuelNewMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelNewMonitor},
+      {path: 'transportationPerformance', name: 'transportationPerformance', meta: {code: 'xtpzgl-yhgl'}, component: transportationPerformance},
     ]
   }
 ];