在推一次

src/views/contract_manage/components/allocationDetail.vue

@@ -78,6 +78,8 @@ export default {
   methods: {
     // 关闭弹框
     handleClose() {
+      this.datalist = [];
+      this.widthDlg = 600;
       this.$emit("update:allocationDetailForm", {});
       this.$emit("update:allocationDetailVisible", false);
     },

src/views/contract_manage/components/allocationNumber.vue

@@ -68,7 +68,7 @@ export default {
       listArr: [],
       allNum: 0,
       TotalPointsContent: "",
-      widthDlg: 580,
+      widthDlg: 500,
     };
   },
   computed: {},
@@ -85,12 +85,14 @@ export default {
   methods: {
     // 取消弹框
     handleClose() {
+      this.listArr = [];
+      this.widthDlg = 500;
       this.$emit("update:allocationForm", {});
       this.$emit("update:allocationVisible", false);
     },
     // 提交弹框
     async addAllocationHandler() {
-      this.listArr.forEach((item) => {
+      +this.listArr.forEach((item) => {
         item.Money = Number(item.Money) || 0;
         item.List.forEach((_) => {
           _.Money = Number(_.Money) || 0;
@@ -131,8 +133,8 @@ export default {
         CompanyContractId: this.allocationForm.CompanyContractId,
       });
       if (res.Ret === 200) {
-        if (res.Data.List.length > 3) {
-          let isWidth = (res.Data.List.length - 3) * 220;
+        if (res.Data.List.length > 2) {
+          let isWidth = (res.Data.List.length - 2) * 260;
           this.widthDlg = this.widthDlg + isWidth;
         }
         this.allNum = res.Data.Money;
@@ -143,27 +145,25 @@ export default {
     // 平均分配
     averageaAllocation() {
       let isName = this.listArr.some((item) => item.ChartPermissionName == "买方研选");
-      if (isName) {
-        let num = 100 / (this.listArr.length - 1);
-        this.listArr.forEach((item) => {
-          if (item.ChartPermissionName != "买方研选") {
-            item.Proportion = num;
+      let num = 100 / (isName ? this.listArr.length - 1 : this.listArr.length);
+      this.listArr.forEach((item) => {
+        if (item.ChartPermissionName != "买方研选") {
+          item.Proportion = num;
+        }
+        let childrenNum = num / item.List.length;
+        item.List.forEach((key) => {
+          if (key.RealName != "买方研选") {
+            key.Proportion = childrenNum;
           }
-          let childrenNum = num / item.List.length;
-          item.List.forEach((key) => {
-            if (key.ChartPermissionName != "买方研选") {
-              key.Proportion = childrenNum;
-            }
-          });
         });
-      }
+      });
     },
   },
 };
 </script>
 <style lang="scss">
 .container-allocation-number-rai {
-  
+  overflow: hidden;
   .content-box {
     display: flex;
     .industry-ul {

src/views/contract_manage/researcherStatistics.vue

@@ -49,7 +49,15 @@
               </tr>
             </tbody>
 
-            <tfoot></tfoot>
+            <tfoot>
+              <tr>
+                <td colspan="2">部门合计</td>
+                <td>{{ TotalContract }}</td>
+                <td>{{ TotalMoney }}</td>
+                <td>--</td>
+                <td>100%</td>
+              </tr>
+            </tfoot>
           </table>
         </div>
       </div>
@@ -92,6 +100,8 @@ export default {
       datalist: [],
       isShowDlg: false,
       listDlg: {},
+      TotalMoney: "",
+      TotalContract: "",
     };
   },
   computed: {
@@ -144,6 +154,8 @@ export default {
       });
       if (res.Ret === 200) {
         this.datalist = res.Data.List;
+        this.TotalContract = res.Data.TotalContract;
+        this.TotalMoney = res.Data.TotalMoney;
       }
     },
     // 查看关联合同数