Your Name il y a 3 ans
Parent
commit
39ffc33fe1

+ 2 - 2
build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['index','WMS']
-let devModules = ['all']
+// let devModules = ['all']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
-// let devModules = ['index','appoint','WMS'];
+let devModules = ['index','WMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

+ 2 - 2
config/index.js

@@ -64,8 +64,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
-    // target: "http://localhost:8019",
+    // target: "http://172.16.33.166:8080",
+    target: "http://localhost:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

+ 3 - 54
src/views/WMS/app.js

@@ -8,10 +8,6 @@ import '@/config/include.js';
 // 通用store
 import store from '@/store/index.js';
 
-// 导出Excel全局组件
-import tableToExcel from '@/components/exportExcel/exportExcel'
-Vue.use(tableToExcel)
-
 // router
 import router from './router/index.js';
 
@@ -19,66 +15,19 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 
-Vue.use(VueApollo)
-
 // 注册表格的全局组件
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+Vue.use(VueApollo)
+
 const apolloProvider = new VueApollo({
     defaultClient: apollo
 })
-
- //把时间戳改为正常可读的时间
- export function renderTime(date) {
-  if(date !== null){
-      let dateee = new Date(date).toJSON();
-      return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
-  }
-  return null;
-}
-//把毫秒数转换分
-export function getDuration(my_time) {
-  if(my_time !== null){
-      return Math.floor(my_time / 1000 / 60);
-  }
-  return null;
-}
-export function sjTime(orderPlanInTime) {
-  var stringTime = renderTime(orderPlanInTime);
-  var timestamp1 = stringTime.replace(/-/g, "/");
-  return new Date(timestamp1).getTime();
-}
-//验证电话号码
-export function VerifyPhoneNumber(Phone) {
-  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
-  if (!myreg.test(Phone)) {
-      return false;
-  } else {
-      return true;
-  }
-}
-export function isNumber(value) {
-  //验证是否为数字
-  var patrn = /^(-)?\d+(\.\d+)?$/;
-  if (patrn.exec(value) == null || value == "") {
-    return false;
-  } else {
-    return true;
-  }
-}
-export function isIntegerNumber(value) {
-  //验证是否为整数
-  var patrn = /^\+?[1-9][0-9]*$/g;
-  if (patrn.exec(value) == null || value == "") {
-    return false;
-  } else {
-    return true;
-  }
-}
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

+ 1 - 0
src/views/WMS/components/steel/steel_inbound.vue

@@ -52,6 +52,7 @@ export default {
       },
     }
   },
+  
   methods:{
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)

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

@@ -37,7 +37,7 @@ export default {
       endTime: null,
       option:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+3+"&startTime=null&endTime=null&i=" +new Date()+"&con="+this.textInput,
+        requestUrl: "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+3+"&startTime=null&endTime=null&i=" +new Date(),
       },
     }
   },

+ 0 - 3
src/views/inward/components/truckAppoint/purInwardRequirement.vue

@@ -96,9 +96,6 @@ export default {
   },
   methods: {
     func(res){
-        console.log("-----");
-        console.log(res.list)
-        console.log("-----");
         res.list.forEach(e => {
             if(e.enable == "未启用"){
                this.startStop = "停用"