最新代码提交

.env.test

@@ -0,0 +1,3 @@
+VUE_APP_API_BASE=http://192.168.31.140:9998
+template=./public/index-dev.html
+outputDir=serve

package.json

@@ -14,15 +14,17 @@
     "babel-polyfill": "^6.26.0",
     "clipboard": "^2.0.8",
     "element-china-area-data": "^5.0.2",
-    "element-ui": "^2.15.7",
+    "element-ui": "^2.15.13",
     "file-saver": "^2.0.2",
+    "fuse.js": "6.4.3",
     "js-cookie": "^2.2.0",
     "mockjs": "^1.0.1-beta3",
-    "node-sass": "^6.0.1",
     "nprogress": "^0.2.0",
     "pinyin": "^2.10.2",
+    "sass": "^1.32.8",
+    "screenfull": "^5.0.2",
     "useless-files-webpack-plugin": "^1.0.1",
-    "vue": "2.5.16",
+    "vue": "2.6.12",
     "vue-clipboard2": "^0.3.3",
     "vue-router": "^3.0.1",
     "vue2-verify": "^1.1.5",
@@ -38,8 +40,8 @@
     "@vue/test-utils": "^1.0.0-beta.16",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^23.0.1",
-    "sass-loader": "^7.0.1",
+    "sass-loader": "^8.0.2",
-    "vue-template-compiler": "2.5.16"
+    "vue-template-compiler": "2.6.12"
   },
   "browserslist": [
     "> 1%",

src/config/app.js

@@ -11,16 +11,18 @@ import "../../public/config.json";
 import axios from "axios";
 import myReq from "@/utils/axios";
 
-let BASE_URL = "";
+// let BASE_URL = "";
+let BASE_URL = process.env.VUE_APP_API_BASE;
 let SERVER_IP = "";
 let ROUTER_MODE = "";
 let IMG_BASE_URL = BASE_URL;
 export {BASE_URL, ROUTER_MODE, IMG_BASE_URL, SERVER_IP};
-axios.get('./config.json').then((res) => {
+let url = process.env.VUE_APP_API_BASE;
+// axios.get('./config.json').then((res) => {
     // 基础地址
-    BASE_URL = res.data.BASE_URL;
+    // BASE_URL = res.data.BASE_URL;
-    SERVER_IP = res.data.SERVER_IP;
+    // SERVER_IP = res.data.SERVER_IP;
     myReq.defaults.baseURL = BASE_URL;
-});
+// });
 
 

src/main.js

@@ -19,7 +19,7 @@ import {addDateRange,selectDictLabel} from '@/utils/tools';
 
 import "./assets/icons/iconfont";
 import IconSvg from "./components/common/IconSvg.vue"; // svg组件
-import { BASE_URL } from "./config/app"
+// import { BASE_URL } from "./config/app"
 import axios from "axios";
 import "../public/config.json";
 import myReq from "./utils/axios"
@@ -37,18 +37,22 @@ Vue.config.silent = true;
 Vue.config.productionTip = false;
 Vue.prototype.selectDictLabel = selectDictLabel;
 let getUrl = "";
+let url = process.env.VUE_APP_API_BASE;
 let startApp = function () {
-    axios.get('./config.json').then((res) => {
+    // axios.get('./config.json').then((res) => {
         // 基础地址
-        getUrl = res.data.BASE_URL;
+        getUrl = url;
         myReq.defaults.baseURL = getUrl;
+    //     // 基础地址
+    //     getUrl = res.data.BASE_URL;
+    //     myReq.defaults.baseURL = getUrl;
 
         new Vue({
             router,
             store,
             render: h => h(App)
         }).$mount("#app");
-    });
+    // });
 };
 
 startApp();

src/utils/axios.js

@@ -53,6 +53,9 @@ service.interceptors.response.use(
                     });
                 });
             }
+            // else if(data.code!=20000){
+            //     Message.error(data.message)
+            // }
         }
         return data;
     },

src/utils/validate.js

@@ -0,0 +1,83 @@
+/**
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isExternal(path) {
+  return /^(https?:|mailto:|tel:)/.test(path)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUsername(str) {
+  const valid_map = ['admin', 'editor']
+  return valid_map.indexOf(str.trim()) >= 0
+}
+
+/**
+ * @param {string} url
+ * @returns {Boolean}
+ */
+export function validURL(url) {
+  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+  return reg.test(url)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validLowerCase(str) {
+  const reg = /^[a-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUpperCase(str) {
+  const reg = /^[A-Z]+$/
+  return reg.test(str)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validAlphabets(str) {
+  const reg = /^[A-Za-z]+$/
+  return reg.test(str)
+}
+
+/**
+ * @param {string} email
+ * @returns {Boolean}
+ */
+export function validEmail(email) {
+  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return reg.test(email)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function isString(str) {
+  if (typeof str === 'string' || str instanceof String) {
+    return true
+  }
+  return false
+}
+
+/**
+ * @param {Array} arg
+ * @returns {Boolean}
+ */
+export function isArray(arg) {
+  if (typeof Array.isArray === 'undefined') {
+    return Object.prototype.toString.call(arg) === '[object Array]'
+  }
+  return Array.isArray(arg)
+}

src/views/basic/BussinessType.vue

@@ -388,11 +388,12 @@ export default {
                 });
         },
         init() {
-            axios.get("./config.json").then(res => {
+            // axios.get("./config.json").then(res => {
-                // 基础地址
+            //     // 基础地址
-                let response = res.data.BASE_URL;
+            //     let response = res.data.BASE_URL;
-                this.uploadFileUrl = response + "/udiwms/busstiness/file/upload";
+            //     this.uploadFileUrl = response + "/udiwms/busstiness/file/upload";
-            });
+            // });
+            this.uploadFileUrl = process.env.VUE_APP_API_BASE +"/udiwms/busstiness/file/upload";
             this.headers = {
                 ADMIN_ID: store.getters.adminId,
                 ADMIN_TOKEN: store.getters.token,

src/views/basic/invWarehouse.vue

@@ -840,11 +840,12 @@ export default {
             }
         },
         init() {
-            axios.get("./config.json").then(res => {
+            // axios.get("./config.json").then(res => {
-                // 基础地址
+            //     // 基础地址
-                let response = res.data.BASE_URL;
+            //     let response = res.data.BASE_URL;
-                this.uploadFileUrl = response + "/spms/inv/warehouse/uploadJson";
+            //     this.uploadFileUrl = response + "/spms/inv/warehouse/uploadJson";
-            });
+            // });
+            this.uploadFileUrl = process.env.VUE_APP_API_BASE +"/spms/inv/warehouse/uploadJson";
             this.headers = {
                 ADMIN_ID: store.getters.adminId,
                 ADMIN_TOKEN: store.getters.token

src/views/components/Tags.vue

@@ -162,7 +162,7 @@ export default {
 
 .tags-li.active {
     color: #ffffff;
-    background: #6495ed;
+    background: #409EFF;
 }
 
 .tags-li-title {

src/views/home/index.vue

@@ -132,6 +132,7 @@
                     </div>
                 </el-dialog>
             </el-header>
+            <vTags/>
 
             <!--遮板-->
             <div

src/views/login/index.vue

@@ -133,7 +133,7 @@ export default {
                     center: true,
                     type: "warning"
                 });
-                return;
+                return false;
             }
             this.$refs["ruleForm"].validate((valid) => {
                 if (valid) {

src/views/sys/bindPlatform.vue

@@ -182,7 +182,8 @@
                                 <el-select v-model="editLogin.invCode"
                                            style="width: 35%;"
                                            :disabled="targetPlatformEdit"
-                                           placeholder="目标仓库信息" @change="locInvChange"
+                                           placeholder="目标仓库信息"
+                                           @change="locInvChange"
                                            clearable>
                                     <el-option
                                         v-for="item in targetInvs"
@@ -197,7 +198,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex">
+                <!-- <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="20" class="el-col" type="flex">
                         <div class="text item">
                             <el-form-item label="目标分库" prop="invSubCode">
@@ -217,7 +218,7 @@
                             </el-form-item>
                         </div>
                     </el-col>
-                </el-row>
+                </el-row> -->
 
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="15" class="el-col" type="flex">
@@ -329,11 +330,11 @@ export default {
                     {required: true, message: "请选择自助平台", trigger: "change"}
                 ],
                 invCode: [
-                    {required: true, message: "请选择目标分库", trigger: "change"}
+                    {required: true, message: "请选择目标仓库", trigger: "change"}
-                ],
-                invSubCode: [
-                    {required: true, message: "请选择目标分库", trigger: 'change'}
                 ],
+                // invSubCode: [
+                //     {required: true, message: "请选择目标分库", trigger: 'change'}
+                // ],
                 platformUsername: [
                     {required: true, message: "请输入账号", trigger: "change"}
                 ],
@@ -422,8 +423,8 @@ export default {
                     this.curPlatformId = row.platformId;
                     this.getTargetInv();
 
-                    this.getTargetSubInv();
+                    // this.getTargetSubInv();
-                    this.getTargetActions();
+                    // this.getTargetActions();
                 }).catch(() => {
                 });
             } else {
@@ -484,6 +485,9 @@ export default {
                 this.loading = false;
                 this.platformList = [];
             });
+        },
+        change(){
+
         },
         unitChange(value) {
           this.editLogin.unitId = value;
@@ -493,7 +497,7 @@ export default {
             this.curPlatformId = value;
             this.targetPlatformEdit = true;
             //拉取对应平台的单据类型
-            this.getTargetInv(value);
+            // this.getTargetInv(value);
         },
 
         getTargetActions() {
@@ -638,7 +642,13 @@ export default {
             this.getList();
         },
         locInvChange() {
-            this.getTargetSubInv();
+            this.targetAction = null
+            let index = this.targetInvs.findIndex(i=>i.code==this.editLogin.invCode);
+            if(index!=-1){
+               this.targetActions = this.targetInvs[index].bussinessTypeList||[] 
+               this.editLogin.invSubCode = this.targetInvs[index].deptCode||''
+            }
+            // this.getTargetSubInv();
         },
 
         locSubInvChange() {
@@ -647,15 +657,15 @@ export default {
         testUserInfo() {
             if (isBlank(this.editLogin.platformId)) {
                 this.$message.error("请选择自助平台");
-                return;
+                return false;
             }
             if (isBlank(this.editLogin.platformUsername)) {
                 this.$message.error("请输入用户名");
-                return;
+                return false;
             }
             if (isBlank(this.editLogin.platformPassword)) {
                 this.$message.error("请输入密码");
-                return;
+                return false;
             }
             let data = {
                 platformId: this.editLogin.platformId,
@@ -665,6 +675,18 @@ export default {
             testUserInfo(data).then((res) => {
                 if (res.code === 20000) {
                     this.targetPlatformEdit = false;
+                    
+                this.targetInvs = res.data?res.data.invList || []:[];
+                if(this.editLogin.invCode){
+                    let index = this.targetInvs.findIndex(i=>i.code==this.editLogin.invCode);
+                    if(index!=-1){
+                        this.targetActions = this.targetInvs[index].bussinessTypeList||[] 
+                        this.editLogin.invSubCode = this.targetInvs[index].deptCode||''
+                    }
+                }
+                this.editLogin.appid = res.data.license.appid
+                this.editLogin.appKey = res.data.license.appKey
+                this.editLogin.sceretKey = res.data.license.sceretKey
                     this.$message.success("验证成功");
                 } else {
                     this.$message.error(res.message);

vue.config.js

@@ -1,10 +1,15 @@
 const UselessFile = require('useless-files-webpack-plugin');
 
 module.exports = {
-    baseUrl: process.env.NODE_ENV === "production" ? "./" : "/",
+    devServer:{
+        port: 8089,
+        open: true
+    },
+    lintOnSave:false,
+    baseUrl: process.env.NODE_ENV === "production"|| "test" ? "./" : "/",
     outputDir: process.env.outputDir,
     configureWebpack: config => {
-        if (process.env.NODE_ENV === "production") {
+        if (process.env.NODE_ENV === "production" || process.env.NODE_ENV === "test" ) {
             // 为生产环境修改配置...
             config.externals = {
                 vue: "Vue",