Merge branch 'dev-yxk'

src/locales/en.js

@@ -277,6 +277,9 @@ export default {
     gongdanbiaoti_placeholder:'Please enter work order title',
     gongdanneirong:'Work Order Content',
     gongdanneirong_placeholder:'Please enter work order content',
+    gongdanbianhao:'Work Order Number',
+    gongdanzhuangtai:'Work Order Status',
+    gongdanhuifu:'Work Order Reply',
     zhanghaowenti:'Account Questions',
     zhifuwenti:'Payment Questions',
     kechengwenti:'Course Questions',
@@ -340,7 +343,20 @@ export default {
     companyBank:`Company's bank of account`,
     bankAccount:'account number of the bank of deposit',
     fpttxx:'Invoice header information',
-    ttlx:'Title Type'
+    ttlx:'Title Type',
+    yijiejue:'Resolved',
+    daijiejue:'To be resolved',
+    shouxufei:'Handling fee',
+    tixianfangshi:'Withdrawal method',
+    tixianzhanghao:'Withdrawal account',
+    shenqingshijian:'Application time',
+    zhifubao:'Alipay',
+    yinhangka:'Bank Card',
+    daishenhe:'Pending',
+    yitongguo:'Approved',
+    yijujue:'Rejected',
+    weitongguo:'Not passed',
+    jujueliyou:'reason for rejection',
   },
   orderConfirm:{
     personalPay:'Personal Payment',

src/locales/zh-CN.js

@@ -281,6 +281,9 @@ export default {
     gongdanbiaoti_placeholder:'请输入工单标题',
     gongdanneirong:'工单内容',
     gongdanneirong_placeholder:'请输入工单内容',
+    gongdanbianhao:'工单编号',
+    gongdanzhuangtai:'工单状态',
+    gongdanhuifu:'工单回复',
     zhanghaowenti:'账号问题',
     zhifuwenti:'支付问题',
     kechengwenti:'课程问题',
@@ -344,7 +347,20 @@ export default {
     companyBank:'公司开户行',
     bankAccount:'开户行账号',
     fpttxx: '发票抬头信息',
-    ttlx:'抬头类型'
+    ttlx:'抬头类型',
+    yijiejue:'已解决',
+    daijiejue:'待解决',
+    shouxufei:'手续费',
+    tixianfangshi:'提现方式',
+    tixianzhanghao:'提现账号',
+    shenqingshijian:'申请时间',
+    zhifubao:'支付宝',
+    yinhangka:'银行卡',
+    daishenhe:'待审核',
+    yitongguo:'已通过',
+    yijujue:'已拒绝',
+    weitongguo:'未通过',
+    jujueliyou:'拒绝理由'
   },
   orderConfirm:{
     personalPay:'个人支付',

src/pages/Personal/Wallet.vue

@@ -34,24 +34,24 @@
               <div class="flex-center-between">
                 <el-tag
                   :type="item.applyStatus == 0 ? 'primary' : item.applyStatus == 1 ? 'success' : item.applyStatus == 2 ? 'danger' : ''">{{
-                    item.applyStatus == 0 ? '待审核' : item.applyStatus == 1 ? '已通过' : '未通过' }}</el-tag>
+                    item.applyStatus == 0 ? $t('personalCenter.daishenhe') : item.applyStatus == 1 ? $t('personalCenter.yitongguo') : $t('personalCenter.weitongguo') }}</el-tag>
 
                 <div class="price">￥{{ item.applyAmount }}</div>
               </div>
 
               <div class="flex-center-between">
-                <div class="">订单号:{{ item.applyNo }}</div>
-                <div class="">手续费:{{ item.feeAmount }}</div>
+                <div class="">{{ $t('personalCenter.dingdanhao') }}:{{ item.applyNo }}</div>
+                <div class="">{{ $t('personalCenter.shouxufei') }}:{{ item.feeAmount }}</div>
               </div>
               <div class="flex-center-between">
-                <div class="">提现方式:{{ item.settleType == 'alipay' ? '支付宝' : item.settleType == 'wechat' ? '微信' : '银行卡'
+                <div class="">{{ $t('personalCenter.tixianfangshi') }}:{{ item.settleType == 'alipay' ? $t('personalCenter.zhifubao') : item.settleType == 'wechat' ? '微信' : $t('personalCenter.yinhangka')
                 }}</div>
-                <div class="">提现账号:{{ item.receiveAccount }}</div>
+                <div class="">{{ $t('personalCenter.tixianzhanghao') }}:{{ item.receiveAccount }}</div>
               </div>
               <div class="flex-center-between">
-                 <div class="">申请时间:{{ item.createTime }}</div>
+                 <div class="">{{ $t('personalCenter.shenqingshijian') }}:{{ item.createTime }}</div>
                 
-                <el-text v-if=" item.applyStatus == 2" class="mx-1" type="danger">拒绝理由:{{ item.auditRemark }}</el-text>
+                <el-text v-if=" item.applyStatus == 2" class="mx-1" type="danger">{{ $t('personalCenter.jujueliyou') }}:{{ item.auditRemark }}</el-text>
               </div>
              
             </div>

src/pages/PersonalCenter.vue

@@ -111,18 +111,19 @@
           <template v-if="activeName == 0">
             <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto">
               <el-form-item :label="`${$t('personalCenter.gongdanleixing')}`" prop="issueCategory">
-                <el-select v-model="ruleForm.issueCategory" :placeholder="`${$t('personalCenter.gongdanleixing_placeholder')}`"
-                  style="width: 100%">
+                <el-select v-model="ruleForm.issueCategory"
+                  :placeholder="`${$t('personalCenter.gongdanleixing_placeholder')}`" style="width: 100%">
                   <el-option v-for="item in workTypeList" :key="item.value" :label="`${$t(item.label)}`"
                     :value="item.value" />
                 </el-select>
               </el-form-item>
               <el-form-item :label="`${$t('personalCenter.gongdanbiaoti')}`" prop="issueTitle">
-                <el-input v-model="ruleForm.issueTitle" :placeholder="`${$t('personalCenter.gongdanbiaoti_placeholder')}`" />
+                <el-input v-model="ruleForm.issueTitle"
+                  :placeholder="`${$t('personalCenter.gongdanbiaoti_placeholder')}`" />
               </el-form-item>
               <el-form-item :label="`${$t('personalCenter.gongdanneirong')}`" prop="issueContent">
-                <el-input v-model="ruleForm.issueContent" :placeholder="`${$t('personalCenter.gongdanneirong_placeholder')}`" :rows="10"
-                  type="textarea" />
+                <el-input v-model="ruleForm.issueContent"
+                  :placeholder="`${$t('personalCenter.gongdanneirong_placeholder')}`" :rows="10" type="textarea" />
               </el-form-item>
             </el-form>
           </template>
@@ -138,8 +139,50 @@
                   </div>
                 </template>
                 <div class="work-content">
-                  <img v-if="activeName == 2" src="/src/assets/imgs/my/A@2x.png" alt="">
-                  <div class="">{{ item.issueContent || item.answer }}</div>
+                  <template v-if="activeName == 2">
+                    <img src="/src/assets/imgs/my/A@2x.png" alt="">
+                    <div class="">{{ item.issueContent || item.answer }}</div>
+                  </template>
+                  <el-descriptions style="width: 100%;" class="margin-top" :column="2" border v-else label-width="auto">
+                    <el-descriptions-item>
+                      <template #label>
+                        <div class="cell-item">{{ $t('personalCenter.gongdanbianhao') }}</div>
+                      </template>
+                      {{ item.issueNo }}
+                    </el-descriptions-item>
+                    <el-descriptions-item>
+                      <template #label>
+                        <div class="cell-item">{{ $t('personalCenter.gongdanzhuangtai') }}</div>
+                      </template>
+                      
+                      <el-tag :type="item.issueStatus == 2 ? 'success' : 'primary'">{{ item.issueStatus == 0 ? $t('personalCenter.daijiejue') : item.issueStatus == 2 ? $t('personalCenter.yijiejue') : '' }}</el-tag>
+                    </el-descriptions-item>
+                    <el-descriptions-item>
+                      <template #label>
+                        <div class="cell-item">{{ $t('personalCenter.gongdanleixing') }}</div>
+                      </template>
+                      {{ $t(getName(item.issueCategory)) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item>
+                      <template #label>
+                        <div class="cell-item">{{ $t('personalCenter.gongdanbiaoti') }}</div>
+                      </template>
+                      {{ item.issueTitle }}
+                      
+                    </el-descriptions-item>
+                    <el-descriptions-item :span="2">
+                      <template #label>
+                        <div class="cell-item">{{ $t('personalCenter.gongdanneirong') }}</div>
+                      </template>
+                      {{ item.issueContent }}
+                    </el-descriptions-item>
+                    <el-descriptions-item :span="2" v-if="item.issueStatus == 2">
+                      <template #label>
+                        <div class="cell-item">{{ $t('personalCenter.gongdanhuifu') }}</div>
+                      </template>
+                      {{ item.remark }}
+                    </el-descriptions-item>
+                  </el-descriptions>
                 </div>
               </el-collapse-item>
             </el-collapse>
@@ -213,8 +256,8 @@
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.loginEmail')">
-              <el-input v-model="userInfo.email" :placeholder="$t('workflowTradeAdd.placeholderEmail')" class="inputStyle"
-                :input-style="{
+              <el-input v-model="userInfo.email" :placeholder="$t('workflowTradeAdd.placeholderEmail')"
+                class="inputStyle" :input-style="{
                   backgroundColor: 'transparent',
                 }" :disabled="appStore?.userInfo?.email ? true : false" />
             </el-form-item>
@@ -239,11 +282,11 @@
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.n8nAccout')">
-              <el-input readonly v-model="userInfo.name" :placeholder="$t('personalCenter.createN8n')" class="inputStyle"
-                :input-style="{
+              <el-input readonly v-model="userInfo.n8nAccount" :placeholder="$t('personalCenter.createN8n')"
+                class="inputStyle" :input-style="{
                   backgroundColor: 'transparent',
                 }">
-                <template #append v-if="appStore?.userInfo?.email && !appStore?.userInfo?.name">
+                <template #append v-if="appStore?.userInfo?.email && !appStore?.userInfo?.n8nAccount">
                   <el-tooltip class="box-item" effect="dark" :content="$t('personalCenter.ceraten8n')" placement="top">
                     <el-button @click="createAi('0')" :icon="Refresh" />
                   </el-tooltip>
@@ -253,7 +296,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.n8nPassword')">
-              <el-input v-model="userInfo.userPhone" :placeholder="$t('common.placeholderInput')" class="inputStyle"
+              <el-input v-model="userInfo.n8nPassword" :placeholder="$t('personalCenter.createN8n')" class="inputStyle"
                 :input-style="{
                   backgroundColor: 'transparent',
                 }" readonly type="password" show-password />
@@ -264,11 +307,11 @@
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.cozeAccout')">
-              <el-input v-model="userInfo.name" :placeholder="$t('personalCenter.createCoze')" class="inputStyle"
-                :input-style="{
+              <el-input readonly v-model="userInfo.cozeAccount" :placeholder="$t('personalCenter.createCoze')"
+                class="inputStyle" :input-style="{
                   backgroundColor: 'transparent',
                 }">
-                <template #append>
+                <template #append v-if="appStore?.userInfo?.email && !appStore?.userInfo?.cozeAccount">
                   <el-tooltip class="box-item" effect="dark" :content="$t('personalCenter.ceratenCoze')"
                     placement="top">
                     <el-button @click="createAi('1')" :icon="Refresh" />
@@ -280,8 +323,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.cozePassword')">
-              <el-input v-model="userInfo.name" :placeholder="$t('common.placeholderInput')" class="inputStyle"
-                :input-style="{
+              <el-input v-model="userInfo.cozePassword" :placeholder="$t('personalCenter.createCoze')"
+                class="inputStyle" :input-style="{
                   backgroundColor: 'transparent',
                 }" readonly type="password" show-password />
             </el-form-item>
@@ -290,11 +333,11 @@
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.difyAccout')">
-              <el-input v-model="userInfo.name" :placeholder="$t('personalCenter.createDify')" class="inputStyle"
-                :input-style="{
+              <el-input readonly v-model="userInfo.difyAccount" :placeholder="$t('personalCenter.createDify')"
+                class="inputStyle" :input-style="{
                   backgroundColor: 'transparent',
                 }">
-                <template #append>
+                <template #append v-if="appStore?.userInfo?.email && !appStore?.userInfo?.difyAccount">
                   <el-tooltip class="box-item" effect="dark" :content="$t('personalCenter.ceratenDify')"
                     placement="top">
                     <el-button @click="createAi('2')" :icon="Refresh" />
@@ -305,8 +348,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.difyPassword')">
-              <el-input v-model="userInfo.name" :placeholder="$t('common.placeholderInput')" class="inputStyle"
-                :input-style="{
+              <el-input v-model="userInfo.difyPassword" :placeholder="$t('personalCenter.createDify')"
+                class="inputStyle" :input-style="{
                   backgroundColor: 'transparent',
                 }" readonly type="password" show-password />
             </el-form-item>
@@ -316,11 +359,11 @@
 
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.fastGptAccout')">
-              <el-input v-model="userInfo.name" :placeholder="$t('personalCenter.createFastGpt')" class="inputStyle"
-                :input-style="{
+              <el-input readonly v-model="userInfo.fastGptAccount" :placeholder="$t('personalCenter.createFastGpt')"
+                class="inputStyle" :input-style="{
                   backgroundColor: 'transparent',
                 }">
-                <template #append>
+                <template #append v-if="appStore?.userInfo?.email && !appStore?.userInfo?.fastGptAccount">
                   <el-tooltip class="box-item" effect="dark" :content="$t('personalCenter.ceratenFastGpt')"
                     placement="top">
                     <el-button @click="createAi('3')" :icon="Refresh" />
@@ -332,8 +375,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('personalCenter.fastGptPassword')">
-              <el-input v-model="userInfo.name" :placeholder="$t('common.placeholderInput')" class="inputStyle"
-                :input-style="{
+              <el-input v-model="userInfo.fastGptPassword" :placeholder="$t('personalCenter.createFastGpt')"
+                class="inputStyle" :input-style="{
                   backgroundColor: 'transparent',
                 }" readonly type="password" show-password />
             </el-form-item>
@@ -527,6 +570,16 @@ const workTypeList = ref([
     label: 'personalCenter.qitawenti'
   }
 ])
+// 获取工单分类
+const getName = (value) =>{
+  let txt = ''
+  workTypeList.value.forEach(item=>{
+    if (item.value == value) {
+      txt = item.label
+    }
+  })
+  return txt
+}
 
 const ruleForm = ref<RuleForm>({
   issueCategory: '',
@@ -543,10 +596,10 @@ const rules = ref<FormRules<RuleForm>>({
     },
   ],
   issueTitle: [
-    { required: true, message:  t('personalCenter.gongdanbiaoti_placeholder'), trigger: 'blur' },
+    { required: true, message: t('personalCenter.gongdanbiaoti_placeholder'), trigger: 'blur' },
   ],
   issueContent: [
-    { required: true, message:  t('personalCenter.gongdanneirong_placeholder'), trigger: 'blur' },
+    { required: true, message: t('personalCenter.gongdanneirong_placeholder'), trigger: 'blur' },
   ],
   nickName: [
     {
@@ -622,13 +675,13 @@ const createAi = async (creatFlag) => {
 const sendSmsCode = async () => {
   let account = appStore?.userInfo?.userPhone ? userInfo.value.email : userInfo.value.userPhone
   if (!account) {
-    DGTMessage.warning( appStore?.userInfo?.userPhone ? t('workflowTradeAdd.placeholderEmail') : t('workflowTradeAdd.placeholderPhoneNumber'))
+    DGTMessage.warning(appStore?.userInfo?.userPhone ? t('workflowTradeAdd.placeholderEmail') : t('workflowTradeAdd.placeholderPhoneNumber'))
     return
   }
 
   // 验证手机号格式 
   if (!PHONE_REGEX.test(account) && !EMAIL_REGEX.test(account)) {
-     DGTMessage.warning( appStore?.userInfo?.userPhone ? t('common.pleaseInputRightEmail') : t('common.pleaseInputRightPhoneNumber'))
+    DGTMessage.warning(appStore?.userInfo?.userPhone ? t('common.pleaseInputRightEmail') : t('common.pleaseInputRightPhoneNumber'))
     return
   }
 
@@ -648,7 +701,7 @@ const sendSmsCode = async () => {
   }
 
   // 模拟发送验证码
- ElMessage.success(t('login.captchaSendSuccess'))
+  DGTMessage.success(t('login.captchaSendSuccess'))
 
   // 开始倒计时
   smsCountdown.value = 60