浏览代码

前端gjy

gjy 3 年之前
父节点
当前提交
467ec44443
共有 4 个文件被更改,包括 44 次插入32 次删除
  1. 1 1
      .env.production
  2. 7 0
      src/api/organization/orgAddMan.js
  3. 35 31
      src/views/organizationNew/shoreMemberAdd.vue
  4. 1 0
      vue.config.js

+ 1 - 1
.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 ENV = 'production'
 NODE_ENV = 'production'
 NODE_ENV = 'production'
 # base api
 # base api
-VUE_APP_BASE_API = 'http://api.eliangeyun.com'
+VUE_APP_BASE_API = 'http://api1.eliangeyun.com'
 # 同步工具服务端url
 # 同步工具服务端url
 VUE_APP_TB_SERV_API = 'http://121.42.157.114:86'
 VUE_APP_TB_SERV_API = 'http://121.42.157.114:86'
 # VUE_APP_BASE_API = 'http://106.15.236.176/eb/'
 # VUE_APP_BASE_API = 'http://106.15.236.176/eb/'

+ 7 - 0
src/api/organization/orgAddMan.js

@@ -7,6 +7,13 @@ export function addadmin(data) {
     data
     data
   });
   });
 }
 }
+export function checkApp(data) {
+  return request({
+    url: "/commonUser/api/checkApp", // 创建用户
+    method: "post",
+    data
+  });
+}
 export function shipList() {
 export function shipList() {
   return request({
   return request({
     url: "/baseVessel/query/companyVessels", // 获取关联船舶左侧列表
     url: "/baseVessel/query/companyVessels", // 获取关联船舶左侧列表

+ 35 - 31
src/views/organizationNew/shoreMemberAdd.vue

@@ -391,7 +391,7 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import { addadmin } from "../../api/organization/orgAddMan";
+import { addadmin,checkApp } from "../../api/organization/orgAddMan";
 import {
 import {
   getOssInterimCredentials,
   getOssInterimCredentials,
   GotOssAccessConfig,
   GotOssAccessConfig,
@@ -1284,38 +1284,42 @@ export default {
       addadmin(this.ruleForm)
       addadmin(this.ruleForm)
         .then(() => {
         .then(() => {
           // this.cancel();
           // this.cancel();
+          debugger
+          var commonUser={};
+          commonUser.phone = this.ruleForm.staffMobilePhone
+          checkApp(commonUser).then(()=>{
+          })
           this.$message({
           this.$message({
-            message: "保存成功",
-            type: "success",
-            showClose: true
-          });
-
-          if (flag) {
-            this.$router.go(-1);
-          } else {
-            this.clearZhiwu();
-            this.checklist = [
-              {
-                value: ""
-              }
-            ];
-            this.checklist1 = [
-              {
-                value: ""
-              }
-            ];
-            this.seleteShipList = [];
-            this.ruleForm.staffName = "";
-            this.ruleForm.deptId = "";
-            this.url =
-              "http://winsea-saas-test.oss-cn-shanghai.aliyuncs.com/default-logo.png";
-
-            this.$nextTick(() => {
-              this.$refs.ruleForm.clearValidate();
-              this.$refs.ruleForm.resetFields();
+              message: "保存成功",
+              type: "success",
+              showClose: true
             });
             });
-          }
-          this.loading = false;
+            if (flag) {
+              this.$router.go(-1);
+            } else {
+              this.clearZhiwu();
+              this.checklist = [
+                {
+                  value: ""
+                }
+              ];
+              this.checklist1 = [
+                {
+                  value: ""
+                }
+              ];
+              this.seleteShipList = [];
+              this.ruleForm.staffName = "";
+              this.ruleForm.deptId = "";
+              this.url =
+                "http://winsea-saas-test.oss-cn-shanghai.aliyuncs.com/default-logo.png";
+
+              this.$nextTick(() => {
+                this.$refs.ruleForm.clearValidate();
+                this.$refs.ruleForm.resetFields();
+              });
+            }
+            this.loading = false;
         })
         })
         .catch(code => {
         .catch(code => {
           this.loading = false;
           this.loading = false;

+ 1 - 0
vue.config.js

@@ -41,6 +41,7 @@ module.exports = {
       },
       },
       '/pb': {
       '/pb': {
         target: 'http://192.168.1.120:8090/',
         target: 'http://192.168.1.120:8090/',
+        // target: 'http://192.168.1.109:9100/',
         // target: 'https://standard-dev.winsea.com/',
         // target: 'https://standard-dev.winsea.com/',
         changeOrigin: true, //开启代理:在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
         changeOrigin: true, //开启代理:在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
         pathRewrite: {
         pathRewrite: {