Browse Source

feat: 分销审核调整

Ritchie 1 năm trước cách đây
mục cha
commit
44c94644b6

+ 4 - 0
src/assets/language/en.json

@@ -1097,6 +1097,10 @@
     "contactPhoneNumber": "Contact phone number",
     "distributionApplicationApproval": "Distribution application approval",
     "equipmentName": "Equipment name",
+    "owner": "owner",
+    "platform": "platform",
+    "machineOwner": "Machine owner",
+    "platformAccount": "SUNZEE",
     "partners": "Partners",
     "proportion": "proportion",
     "fail": "Fail",

+ 4 - 0
src/assets/language/zh.json

@@ -1111,6 +1111,10 @@
     "contactPhoneNumber": "联系人手机号",
     "distributionApplicationApproval": "分销申请审批",
     "equipmentName": "设备名称",
+    "owner": "拥有者",
+    "platform": "平台",
+    "machineOwner": "机主",
+    "platformAccount": "申泽",
     "partners": "合作商",
     "proportion": "比例",
     "fail": "不通过",

+ 15 - 1
src/views/taskMessage/proportion/index.vue

@@ -27,23 +27,37 @@
           <div v-for="(item, index) in alarmHistoryList" :key="index" class="listItem">
             <div class="itemBox">
               <div class="itemRow">
-                <span class="itemTitle">{{ $t('taskMessage.equipmentName') }}:&nbsp;</span>{{ item.equipmentName != null ? item.equipmentName : item.clientId.slice(-6) }}
+                <span class="itemTitle">{{ $t('taskMessage.equipmentName') }}:&nbsp;</span>{{ item.equipmentName != null ?
+                  item.equipmentName : item.clientId.slice(-6) }}
               </div>
               <div class="itemRow">
                 <span class="itemTitle">{{ $t('taskMessage.equipmentNo') }}:&nbsp;</span>{{ item.clientId }}
               </div>
+              <!-- 机主的 -->
+              <div class="itemRow">
+                <span class="itemTitle">{{ $t('taskMessage.owner') }}:&nbsp;</span>{{ $t('taskMessage.machineOwner')
+                }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{ item.proportion }}%
+              </div>
+              <!-- 平台的 -->
+              <div class="itemRow">
+                <span class="itemTitle">{{ $t('taskMessage.platform') }}:&nbsp;</span>{{ $t('taskMessage.platformAccount')
+                }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{ item.adminProportion }}%
+              </div>
+              <!-- 分账方的 -->
               <div class="itemRow" v-if="item.type >= 1">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.agencyName
                 }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{
   item.agencyProportion
 }}%
               </div>
+              <!-- 分账方4个 -->
               <div class="itemRow" v-if="item.type >= 2">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.merchantName
                 }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{
   item.merchantProportion
 }}%
               </div>
+              <!-- 分账方5个以上 -->
               <div class="itemRow" v-if="item.type >= 3">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.personageName
                 }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{