移网管理相关，翻译

backendApi/config/menu.php

@@ -109,8 +109,8 @@ return [
             //['name'=>'体系导出', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'system-export', 'routePath'=>'user/system-export', 'show'=>0,],
             //['name'=>'团队领导人列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'group', 'routePath'=>'user/group', 'show'=>1,],
             //['name'=>'团队领导人列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'group-export', 'routePath'=>'user/group-export', 'show'=>0,],
-            ['name'=>'Move network management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move', 'routePath'=>'user/move', 'show'=>1,],//移网管理
-            ['name'=>'申请移网', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-add', 'routePath'=>'user/move-add', 'show'=>0,],
+            ['name'=>'Move network management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move', 'routePath'=>'user/move', 'show'=>1,], // 移网管理
+            ['name'=>'Apply for moving network', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-add', 'routePath'=>'user/move-add', 'show'=>0,], // 申请移网
             ['name'=>'移网修改并审核', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-pass', 'routePath'=>'user/move-pass', 'show'=>0,],
             ['name'=>'移网审核', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-audit', 'routePath'=>'user/move-audit', 'show'=>0,],
             ['name'=>'移网导出', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-export', 'routePath'=>'user/move-export', 'show'=>0,],

backendEle/src/router/index.js

@@ -345,7 +345,7 @@ export const constantRouterMap = [
         component: _import('user/move-add'),
         name: 'user_move-add',
         meta: {
-          title: '申请移网',
+          title: 'Apply for moving network', // 申请移网
           highLight: '/user/move',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},

backendEle/src/views/user/move-add.vue

@@ -3,16 +3,16 @@
     <div class="white-box">
       <el-form ref="form" :model="form" label-width="250px" class="form-page">
 
-        <el-form-item label="移网类型">
-          <el-select v-model="form.type" placeholder="请选择移网类型" @change="chkAlert">
+        <el-form-item label="Moving network type"> <!-- 移网类型 -->
+          <el-select v-model="form.type" placeholder="Please select moving network type" @change="chkAlert"> <!-- 请选择移网类型 -->
             <el-option v-for="(item,key) in netType" :label="item.name" :value="item.id" :key="key"></el-option>
           </el-select>
         </el-form-item>
         <div v-if="form.type==='network'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Move Member Code"> <!-- 移动会员编号 -->
             <el-input v-model="form.moveUserName" @blur="handleChkUser"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名" v-if="moveUser">
+          <el-form-item label="Move Member Name" v-if="moveUser"> <!-- 移动会员姓名 -->
             <el-input v-model="moveUser.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
 <!--          <el-form-item label="原上级编号" v-if="moveUser">-->
@@ -21,20 +21,20 @@
 <!--          <el-form-item label="原上级姓名" v-if="moveUser">-->
 <!--            <el-input v-model="moveUser.CON_REAL_NAME" :disabled="true"></el-input>-->
 <!--          </el-form-item>-->
-          <el-form-item label="移动到节点会员编号">
+          <el-form-item label="Move to node member code"> <!-- 移动到节点会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
             <el-tag v-if="showToName==''?false:true">{{showToName}}</el-tag>
             <el-alert :title="toAlertTile" :type="toAlertType" :closable="false" v-show="toAlertShow"></el-alert>
           </el-form-item>
-          <el-form-item label="移动到节点会员姓名">
+          <el-form-item label="Move to node member code"> <!-- 移动到节点会员编号 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
         <div v-if="form.type==='relation'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Move Member Code"> <!-- 移动会员编号 -->
             <el-input v-model="form.moveUserName" @blur="handleChkUser"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名" v-if="moveUser">
+          <el-form-item label="Move Member Name" v-if="moveUser"> <!-- 移动会员姓名 -->
             <el-input v-model="moveUser.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
 <!--          <el-form-item label="原开拓人编号" v-if="moveUser">-->
@@ -43,25 +43,25 @@
 <!--          <el-form-item label="原开拓人姓名" v-if="moveUser">-->
 <!--            <el-input v-model="moveUser.REC_REAL_NAME" :disabled="true"></el-input>-->
 <!--          </el-form-item>-->
-          <el-form-item label="移动到开拓会员编号">
+          <el-form-item label="Move to development member code"> <!-- 移动到开拓会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
             <el-tag v-if="showToName==''?false:true">{{showToName}}</el-tag>
             <el-alert :title="toAlertTile" :type="toAlertType" :closable="false" v-show="toAlertShow"></el-alert>
           </el-form-item>
-          <el-form-item label="移动到开拓会员姓名">
+          <el-form-item label="Move to development member code"> <!-- 移动到开拓会员编号 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
 
-        <el-form-item v-if="form.type==='network'" label="移动到区位">
-          <el-select v-model="form.location" placeholder="移动到区位">
-            <el-option label="一市场" :value="1" key="location_1"></el-option>
-            <el-option label="二市场" :value="2" key="location_2"></el-option>
-            <el-option label="三市场" :value="3" key="location_3"></el-option>
+        <el-form-item v-if="form.type==='network'" label="Move to location"> <!-- 移动到区位 -->
+          <el-select v-model="form.location" placeholder="Move to location"> <!-- 移动到区位 -->
+            <el-option label="I. Market" value="1" key="location_1"></el-option><!-- 一市场 -->
+            <el-option label="II. Market" value="2" key="location_2"></el-option><!-- 二市场 -->
+            <el-option label="III. Market" value="3" key="location_3"></el-option><!-- 三市场 -->
           </el-select>
         </el-form-item>
 
-        <el-form-item label="备注" v-if="form.type">
+        <el-form-item label="Note" v-if="form.type"> <!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
 
@@ -74,121 +74,121 @@
 </template>
 
 <script>
-  import Vue from 'vue'
-  import store from '@/utils/vuexStore'
-  import network from '@/utils/network'
-  import tool from '@/utils/tool'
+import Vue from 'vue'
+import store from '@/utils/vuexStore'
+import network from '@/utils/network'
+import tool from '@/utils/tool'
 
-  export default {
-    name: 'user_move-add',
-    created() {
+export default {
+  name: 'user_move-add',
+  created () {
 
+  },
+  mounted () {
+    network.getData('user/move-net-type').then(response => {
+      this.netType = response.netType
+      this.loading = false
+    })
+  },
+  data () {
+    return {
+      form: {
+        moveUserName: null,
+        toConUserName: null,
+        toConRealName: null,
+        type: null,
+        location: null,
+        remark: null,
+      },
+      moveUser: {},
+      netType: null,
+      loading: true,
+      submitButtonStat: false,
+      openBanks: null,
+      toAlertShow: false,
+      toAlertTile: '',
+      toAlertType: 'success',
+      isRelation: false,
+      showToName: '',
+    }
+  },
+  methods: {
+    chkAlert () {
+      // if(this.form.type==='network'){
+      //   this.chkRelation()
+      // }else{
+      //   this.toAlertShow=false
+      // }
+
+      this.toAlertShow = false
     },
-    mounted() {
-      network.getData('user/move-net-type').then(response => {
-        this.netType = response.netType
-        this.loading = false
-      })
-    },
-    data() {
-      return {
-        form: {
-          moveUserName: null,
-          toConUserName: null,
-          toConRealName: null,
-          type: null,
-          location: 1,
-          remark: null,
-        },
-        moveUser: {},
-        netType: null,
-        loading: true,
-        submitButtonStat: false,
-        openBanks: null,
-        toAlertShow:false,
-        toAlertTile:'',
-        toAlertType:'success',
-        isRelation:false,
-        showToName:'',
+    handleChkUser () {
+      if (this.form.moveUserName) {
+        this.loading = true
+        network.getData('user/full-info', {userName: this.form.moveUserName}).then(response => {
+          this.moveUser = response
+          this.loading = false
+        }).catch(response => {
+          this.loading = false
+        })
       }
     },
-    methods: {
-      chkAlert(){
-        // if(this.form.type==='network'){
-        //   this.chkRelation()
-        // }else{
-        //   this.toAlertShow=false
-        // }
-
-        this.toAlertShow=false
-      },
-      handleChkUser() {
-        if (this.form.moveUserName) {
-          this.loading = true
-          network.getData('user/full-info', {userName: this.form.moveUserName}).then(response => {
-            this.moveUser = response
-            this.loading = false
-          }).catch(response => {
-            this.loading = false
-          })
-        }
-      },
-      chkRelation(){
-        if (this.form.toConUserName&&this.form.moveUserName) {
-          this.loading = true
-          this.toAlertShow=false
-          network.getData('user/chk-relation', {userName: this.form.moveUserName,toUserName:this.form.toConUserName}).then(response => {
-            if(response.is===1){
-              this.isRelation=true
-              this.toAlertTile='在同一推荐网络内'
-              this.toAlertType='success'
-            }else{
-              this.isRelation=false
-              this.toAlertTile='不同一推荐网络内'
-              this.toAlertType='warning'
-            }
-            this.showToName=response.real_name
-            this.toAlertShow=true
-            this.loading = false
-          }).catch(response => {
-            this.loading = false
-          })
-        }
-      },
-      onSubmit() {
-        let thisObj=this
-        // if(thisObj.form.type==='network' && this.isRelation===false){
-        //   thisObj.$confirm('不在同一推荐网络内是否确认处理', 'Hint', {
-        //     confirmButtonText: 'confirm', // 确定
-        //     cancelButtonText: 'cancel', // 取消
-        //     type: 'warning'
-        //   }).then(() => {
-        //     thisObj._handleSubmit()
-        //   }).catch(() => {
-        //
-        //   })
-        // }else{
-        //   thisObj._handleSubmit()
-        // }
-
-        thisObj._handleSubmit()
-      },
-      _handleSubmit(){
-        this.submitButtonStat = true
-        let path = 'user/move-add'
-        network.postData(path, this.form).then(response => {
-          this.$message({
-            message: response,
-            type: 'success'
-          })
-          this.submitButtonStat = false
-          this.$router.go(-1)
+    chkRelation () {
+      if (this.form.toConUserName && this.form.moveUserName) {
+        this.loading = true
+        this.toAlertShow = false
+        network.getData('user/chk-relation', {userName: this.form.moveUserName, toUserName: this.form.toConUserName}).then(response => {
+          if (response.is === 1) {
+            this.isRelation = true
+            this.toAlertTile = '在同一推荐网络内'
+            this.toAlertType = 'success'
+          } else {
+            this.isRelation = false
+            this.toAlertTile = '不同一推荐网络内'
+            this.toAlertType = 'warning'
+          }
+          this.showToName = response.real_name
+          this.toAlertShow = true
+          this.loading = false
         }).catch(response => {
-          this.submitButtonStat = false
+          this.loading = false
         })
       }
+    },
+    onSubmit () {
+      let thisObj = this
+      // if(thisObj.form.type==='network' && this.isRelation===false){
+      //   thisObj.$confirm('不在同一推荐网络内是否确认处理', 'Hint', {
+      //     confirmButtonText: 'confirm', // 确定
+      //     cancelButtonText: 'cancel', // 取消
+      //     type: 'warning'
+      //   }).then(() => {
+      //     thisObj._handleSubmit()
+      //   }).catch(() => {
+      //
+      //   })
+      // }else{
+      //   thisObj._handleSubmit()
+      // }
+
+      thisObj._handleSubmit()
+    },
+    _handleSubmit () {
+      this.submitButtonStat = true
+      let path = 'user/move-add'
+      network.postData(path, this.form).then(response => {
+        this.$message({
+          message: response,
+          type: 'success'
+        })
+        this.submitButtonStat = false
+        this.$router.go(-1)
+      }).catch(response => {
+        this.submitButtonStat = false
+      })
     }
   }
+}
 </script>
 
 <style scoped>

common/models/UserMove.php

@@ -39,8 +39,8 @@ class UserMove extends \common\components\ActiveRecord
     const TYPE_RELATION = NetPoint::NET_TYPE_RELATION;
 
     const TYPE_NAME = [
-        self::TYPE_NETWORK => ['id' => self::TYPE_NETWORK, 'name' => '安置网络',],
-        self::TYPE_RELATION => ['id' => self::TYPE_RELATION, 'name' => '开拓网络',],
+        self::TYPE_NETWORK => ['id' => self::TYPE_NETWORK, 'name' => 'Placement network',], // 安置网络
+        self::TYPE_RELATION => ['id' => self::TYPE_RELATION, 'name' => 'Sponor network',], // 开拓网络
     ];
 
     const STATUS_APPLIED = 0;       // 已申请

common/models/forms/NetMoveForm.php

@@ -293,7 +293,7 @@ class NetMoveForm extends Model {
         }
 
         $this->adminOperateLogger->afterInsert($model)->clean()->save([
-            'optType' => '申请移网',
+            'optType' => 'Apply for moving network', // 申请移网
             'userId' => $model->USER_ID,
             'userName' => Info::getUserNameByUserId($model->USER_ID),
             'remark' => $this->remark