fix：“修复分销多人时修改无法删除的问题”

src/assets/language/en.json

@@ -631,7 +631,10 @@
       "distInof": "Distribution Information",
       "platDistRange": "The distribution proportion range of the platform is0-100",
       "distPropRange": "The distribution proportion range is0-100",
-      "notDelMore": "Can't delete any more"
+      "notDelMore": "Can't delete any more",
+      "submitSuccess": "Submit successfully",
+      "submitFailed": "Submit failed",
+      "hasExamine": "Records to be reviewed already exist, Do not submit them again."
     }
   },
   "home": {

src/assets/language/zh.json

@@ -635,7 +635,10 @@
       "distInof": "分销信息",
       "platDistRange": "平台分销比例范围为0-100",
       "distPropRange": "分销比例范围为0-100",
-      "notDelMore": "不能再删除了"
+      "notDelMore": "不能再删除了",
+      "submitSuccess": "提交成功",
+      "submitFailed": "提交失败",
+      "hasExamine": "已存在待审核记录，请勿重复提交"
     }
   },
   "home": {

src/styles/device/index.less

@@ -12,7 +12,7 @@
 
     .deviceBox1 {
       .searchRow {
-        margin: 21px 15px;
+        margin: 18px 15px;
 
         .bd3 {
           width: 87px;
@@ -27,7 +27,7 @@
 
           .txt2 {
             width: 65px;
-            height: 14px;
+            height: 15px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
             font-size: 15px;

src/views/distributionSet/detail.vue

@@ -57,7 +57,7 @@
                 :rules="[{ required: true, message: $t('device.distributionProportionPlaceholder') }, { required: true, validator: distPropVali, message: $t('distributionSet.addDist.distPropRange'), trigger: ['onChange', 'onBlur', 'onSubmit'] }]" />
               <span class="o-pl-10 c-text-18 c-text-b" style="color: #434D74;">%</span>
             </div>
-            <div v-if="index !== 0" @click="toDele(index)" class="l-flex-RC" style="color: #FE5D55;">
+            <div @click="toDele(index)" class="l-flex-RC" style="color: #FE5D55;">
               <van-icon size="18" name="delete-o" />
               <span class="c-text-12">{{ $t('device.delete') }}</span>
             </div>
@@ -191,10 +191,14 @@ export default {
       }
       saveProportion(param).then(res => {
         if (res.data.code === '00000') {
-          showToast(res.data.data);
+          showToast(t('distributionSet.addDist.submitSuccess'));
           setTimeout(() => {
             router.back();
           }, 1000);
+        } else if (res.data.code === 'B0001') {
+          showToast(t('distributionSet.addDist.hasExamine'));
+        } else {
+          showToast(t('distributionSet.addDist.submitFailed'));
         }
       })
     };
@@ -207,10 +211,10 @@ export default {
     }
     // 点击删除
     const toDele = (idx) => {
-      if (distPropList.length === 1) {
-        showToast(t('distributionSet.addDist.distPropRange'));
-        return;
-      }
+      // if (distPropList.length === 1) {
+      //   showToast(t('distributionSet.addDist.distPropRange'));
+      //   return;
+      // }
       distPropList.splice(idx, 1);
     }
     // 分销比例规则

src/views/taskMessage/proportion/index.vue

@@ -26,52 +26,55 @@
           <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 }}
+                <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 }}%
+                <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 }}%
+                <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
-}}%
+                <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
-}}%
+                <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>{{
-  item.personageProportion
-}}%
+                <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>
+                {{ item.personageNam }}
+                <span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>
+                {{ item.personageProportion }}%
               </div>
               <div class="itemRow">
-                <span class="itemTitle">{{ $t('taskMessage.applicationTime') }}:&nbsp;</span>{{
-                  showDateTime(item.createDate)
-                }}
+                <span class="itemTitle">{{ $t('taskMessage.applicationTime') }}:&nbsp;</span>
+                {{ showDateTime(item.createDate) }}
               </div>
               <div class="itemRow" v-if="item.checkType !== '0'">
-                <span class="itemTitle">{{ $t('taskMessage.approvalTime') }}:&nbsp;</span>{{
-                  showDateTime(item.modifyDate)
-                }}
+                <span class="itemTitle">{{ $t('taskMessage.approvalTime') }}:&nbsp;</span>
+                {{ showDateTime(item.modifyDate) }}
               </div>
               <div class="itemRow" style="display: flex; justify-content: flex-end"
                 v-if="item.checkType === '0' && isOper">
@@ -95,7 +98,8 @@
                   {{ $t('taskMessage.adopt') }}
                 </van-button>
               </div>
-              <div class="itemRow" style="display: flex; justify-content: flex-end" v-if="item.checkType !== '0'">
+              <div class="itemRow" style="display: flex; justify-content: flex-end">
+                <span v-if="item.checkType === '0'" style="color: #FFA500"> {{ $t('taskMessage.toBeApproved') }}</span>
                 <span v-if="item.checkType === '1'" style="color: #1989fa"> {{ $t('taskMessage.adopt') }}</span>
                 <span v-if="item.checkType === '2'" style="color: #ff0000"> {{ $t('taskMessage.cancel') }}</span>
                 <span v-if="item.checkType === '3'" style="color: #ff0000"> {{ $t('taskMessage.fail') }}</span>