yinxiangke 3 тижнів тому
батько
коміт
3691e26051

+ 2 - 2
.env.development

@@ -1,6 +1,6 @@
 # 乔功
-VITE_API_BASE_URL=http://192.168.100.134:8080/api
-# VITE_API_BASE_URL=http://47.104.167.40/prod-api/api
+# VITE_API_BASE_URL=http://192.168.100.134:8080/api
+VITE_API_BASE_URL=http://47.104.167.40/prod-api/api
 # VITE_API_BASE_URL=http://192.168.100.134:8080/api
 # VITE_API_BASE_URL=http://192.168.101.12:8080/api
 # 高运甲

+ 6 - 2
src/locales/en.js

@@ -78,7 +78,7 @@ export default {
     dictType: 'Type',
     dictTypeSecond: 'Second Type',
     go: 'Go ',
-    platform: 'Platform',
+    platform: ' Platform',
     demandStatus: 'Demand Status',
     publishTime: 'Publish Time',
     startUsing: 'Start Using',
@@ -119,6 +119,7 @@ export default {
     remainingTime:"Remaining Time",
     readAndAgree:"I have read and agree ",
     notFoundPage:"Sorry, the page you visited cannot be found!",
+    addTags: 'New Tag',
   },
   login: {
     smsLogin: 'Captcha Login',
@@ -133,7 +134,7 @@ export default {
     placeholderNewPassword: 'Please input new password',
     placeholderConfirmPassword: 'Please confirm new password',
     forgetPassword: 'Forget Password',
-    addTags: 'New Tag',
+    
     passwordMinLength:"Password length must be at least 6 characters",
     placeholderPhone:"Please input phone number",
     passwordNotSame:"Passwords do not match",
@@ -357,6 +358,9 @@ export default {
     yijujue:'Rejected',
     weitongguo:'Not passed',
     jujueliyou:'reason for rejection',
+    sfscggzl:'Whether to delete the workflow?',
+    sfqxbm:'Whether to cancel the sign up?',
+    zdfp:'Automatically allocate MiBi to the employee every month',
   },
   orderConfirm:{
     personalPay:'Personal Payment',

+ 4 - 1
src/locales/zh-CN.js

@@ -360,7 +360,10 @@ export default {
     yitongguo:'已通过',
     yijujue:'已拒绝',
     weitongguo:'未通过',
-    jujueliyou:'拒绝理由'
+    jujueliyou:'拒绝理由',
+    sfscggzl:'是否删除该工作流?',
+    sfqxbm:'是否取消报名?',
+    zdfp:'每个月自动向该员工分配米币数量',
   },
   orderConfirm:{
     personalPay:'个人支付',

+ 24 - 0
src/pages/Personal/BusinessManagement.vue

@@ -109,6 +109,25 @@
           </el-row>
         </template>
         <template v-else-if="title == 'personalCenter.fenpeimibi'">
+          <el-row :gutter="0">
+            <el-col :span="24">
+              <el-form-item :label="$t('personalCenter.bumen')" prop="deptId">
+                <el-tree-select disabled v-model="formInline.deptId" :data="dataSource" :props="defaultProps"
+                  :placeholder="$t('common.qingxuanze')" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="0">
+            <el-col :span="24">
+              <el-form-item :label="$t('personalCenter.yuangong')" prop="userPhone">
+                <el-select disabled v-model="formInline.userPhone" filterable remote reserve-keyword
+                  :placeholder="$t('common.placeholderInput')" :remote-method="remoteMethod">
+                  <el-option v-for="item in options" :key="item.userPhone" :label="item.nickName"
+                    :value="item.userPhone" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="0">
             <el-col :span="24">
               <el-form-item :label="$t('personalCenter.kfpmb')">
@@ -124,6 +143,8 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-text class="mx-1" type="danger">*{{ $t('personalCenter.zdfp') }}</el-text>
+          
         </template>
         <el-row :gutter="0" v-else>
           <el-col :span="24">
@@ -212,6 +233,9 @@ const changeDialogVisible = async (txt) => {
 const changeEmployee = async (item, index, type) => {
   if (type == 1) {
     formInline.value.userId = item.userId;
+    formInline.value.points = item.points;
+    formInline.value.deptId = item.deptId;
+    formInline.value.userPhone = item.userPhone;
     changeDialogVisible('personalCenter.fenpeimibi');
   } else if (type == 2) {
     let res = await deleteSubAccount(item.userId)

+ 5 - 5
src/pages/Personal/Demand.vue

@@ -230,7 +230,7 @@ const changeItem = async (item, index, type) => {
       t('personalCenter.jieshuxuqiu') + '?',
       t('common.warning'),
       {
-        confirmButtonText: 'OK',
+         confirmButtonText: t('common.confirm'),
         cancelButtonText: t('common.cancel'),
         type: 'warning',
       }
@@ -252,7 +252,7 @@ const changeItem = async (item, index, type) => {
       t('personalCenter.shifoushanchu'),
       t('common.warning'),
       {
-        confirmButtonText: 'OK',
+         confirmButtonText: t('common.confirm'),
         cancelButtonText: t('common.cancel'),
         type: 'warning',
       }
@@ -270,10 +270,10 @@ const changeItem = async (item, index, type) => {
       })
   } else if (type == 4) {
     ElMessageBox.confirm(
-      'proxy will permanently delete the file. Continue?',
-      'Warning',
+      t('personalCenter.sfqxbm'),
+      t('common.warning'),
       {
-        confirmButtonText: 'OK',
+         confirmButtonText: t('common.confirm'),
         cancelButtonText: t('common.cancel'),
         type: 'warning',
       }

+ 4 - 4
src/pages/Personal/Workflow.vue

@@ -106,11 +106,11 @@ const changeItem = async (item: any, index: any, type: any) => {
     })
   } else if (type == 1) {
     ElMessageBox.confirm(
-      'proxy will permanently delete the file. Continue?',
-      'Warning',
+      t('personalCenter.sfscggzl'),
+      t('common.warning'),
       {
-        confirmButtonText: 'OK',
-        cancelButtonText: 'Cancel',
+        confirmButtonText: t('common.confirm'),
+        cancelButtonText: t('common.cancel'),
         type: 'warning',
       }
     )

+ 9 - 5
src/pages/PersonalCenter.vue

@@ -239,12 +239,14 @@
           </el-col>
           <el-col :span="12" v-if="!appStore?.userInfo?.userPhone">
             <el-form-item :label="$t('personalCenter.phoneCode')" prop="verifyCode">
-              <el-input v-model="userInfo.verifyCode" :placeholder="$t('login.placeholderCaptcha')" class="inputStyle"
+              <el-input v-model="userInfo.verifyCode" 
+              maxlength="6"
+              :placeholder="$t('login.placeholderCaptcha')" class="inputStyle"
                 :input-style="{
                   backgroundColor: 'transparent',
                 }">
                 <template #append>
-                  <el-button :disabled="smsCountdown > 0" @click="sendSmsCode" style="width:120px" maxlength="6"
+                  <el-button :disabled="smsCountdown > 0" @click="sendSmsCode" style="width:120px" 
                     :class="{ 'countdown-btn': smsCountdown > 0 }" size="small">
                     {{ smsCountdown > 0 ? `${smsCountdown}s` : $t('login.sendCaptcha') }}
                   </el-button>
@@ -265,12 +267,14 @@
           </el-col>
           <el-col :span="12" v-if="!appStore?.userInfo?.email">
             <el-form-item :label="$t('personalCenter.emailCode')" prop="verifyCode">
-              <el-input v-model="userInfo.verifyCode" :placeholder="$t('login.placeholderCaptcha')" class="inputStyle"
+              <el-input v-model="userInfo.verifyCode" 
+              maxlength="6"
+              :placeholder="$t('login.placeholderCaptcha')" class="inputStyle"
                 :input-style="{
                   backgroundColor: 'transparent',
                 }">
                 <template #append>
-                  <el-button :disabled="smsCountdown > 0" @click="sendSmsCode" style="width:120px" maxlength="6"
+                  <el-button :disabled="smsCountdown > 0" @click="sendSmsCode" style="width:120px"
                     :class="{ 'countdown-btn': smsCountdown > 0 }" size="small">
                     {{ smsCountdown > 0 ? `${smsCountdown}s` : $t('login.sendCaptcha') }}
                   </el-button>
@@ -396,7 +400,7 @@
                     <el-button :icon="Plus" />
                   </template></el-input>
                 <el-button v-else class="button-new-tag" size="small" @click="showInput">
-                  + {{ $t('login.addTags') }}
+                  + {{ $t('common.addTags') }}
                 </el-button>
               </div>
             </el-form-item>