最新代码提交

src/utils/axios.js

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

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"}
-                ],
-                invSubCode: [
-                    {required: true, message: "请选择目标分库", trigger: 'change'}
+                    {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.getTargetActions();
+                    // this.getTargetSubInv();
+                    // 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,6 +1,10 @@
 const UselessFile = require('useless-files-webpack-plugin');
 
 module.exports = {
+    devServer:{
+        port: 8089,
+        open: true
+    },
     lintOnSave:false,
     baseUrl: process.env.NODE_ENV === "production"|| "test" ? "./" : "/",
     outputDir: process.env.outputDir,