修改

jwtech-admin-page/src/components/securityDeposit/index.vue

@@ -63,7 +63,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="[`system:${type}:add`]"
+          v-hasPermi="[`bzj:${type}:add`]"
           >新增</el-button
         >
       </el-col>
@@ -74,7 +74,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="[`system:${type}:edit`]"
+          v-hasPermi="[`bzj:${type}:edit`]"
           >修改</el-button
         >
       </el-col>
@@ -85,7 +85,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="[`system:${type}:remove`]"
+          v-hasPermi="[`bzj:${type}:remove`]"
           >删除</el-button
         >
       </el-col>
@@ -129,12 +129,7 @@
         min-width="180"
       >
         <template slot-scope="scope">
-          {{
+          {{ getAmount(scope.row) }}
-            scope.row.depositAmount +
-            scope.row.bankGuaranteeLetterAmount +
-            scope.row.guaranteeCompanyAmount +
-            scope.row.insuranceAmount
-          }}
         </template>
       </el-table-column>
 
@@ -151,7 +146,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="[`system:${type}:edit`]"
+            v-hasPermi="[`bzj:${type}:edit`]"
             >修改</el-button
           >
           <el-button
@@ -159,7 +154,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="[`system:${type}:remove`]"
+            v-hasPermi="[`bzj:${type}:remove`]"
             >删除</el-button
           >
         </template>
@@ -496,7 +491,14 @@
 <script>
 export default {
   name: "Bzj",
-  props: ["proNo", "projectCode", "projectName", "formMethods", "type"],
+  props: [
+    "proNo",
+    "projectCode",
+    "projectName",
+    "formMethods",
+    "contractNumber",
+    "type",
+  ],
   data() {
     return {
       // 遮罩层
@@ -523,30 +525,31 @@ export default {
         pageSize: 10,
         ids: null,
         data: {
-          differentiatedDepositAmount: null,
-          amountPayable: null,
-          paidAmount: null,
           depositMethods: null,
-          depositBankSalaryDeposit: null,
-          salaryDepositBankAccount: null,
-          cashAmount: null,
           guaranteeBankName: null,
+          depositAmount: null,
+          depositAmountDate: null,
+          depositBank: null,
+          depositBankNumber: null,
+          accountBankAddress: null,
+          voucherNumber: null,
           bankGuaranteeLetterNo: null,
           bankGuaranteeLetterAmount: null,
           bankGuaranteeStartYear: null,
           bankGuaranteeEndYear: null,
-          guaranteeCompanyName: null,
-          guaranteeCompanyLetterNo: null,
-          guaranteeCompanyAmount: null,
-          guaranteeCompanyStartYear: null,
-          guaranteeCompanyEndYear: null,
           insuranceCompanyName: null,
           insuranceNo: null,
           insuranceAmount: null,
           insuranceStartTime: null,
           insuranceEndTime: null,
-          otherAmount: null,
+
-          incomeTime: null,
+          payAmountInsurance: null,
+          payAmountInsuranceTime: null,
+          guaranteeCompanyName: null,
+          guaranteeCompanyLetterNo: null,
+          guaranteeCompanyAmount: null,
+          guaranteeCompanyStartYear: null,
+          guaranteeCompanyEndYear: null,
           createUid: null,
           updateUid: null,
           projectCode: null,
@@ -596,6 +599,11 @@ export default {
         ],
 
         depositAmount: [
+          {
+            required: true,
+            message: "请输入缴存金额",
+            trigger: "blur",
+          },
           {
             pattern:
               /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
@@ -627,7 +635,11 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bankGuaranteeLetterAmount: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          {
+            required: true,
+            message: "请输入银行保函金额",
+            trigger: "blur",
+          },
           {
             pattern:
               /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
@@ -644,7 +656,11 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         insuranceAmount: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          {
+            required: true,
+            message: "请输入保险金额",
+            trigger: "blur",
+          },
           {
             pattern:
               /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
@@ -671,7 +687,11 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         guaranteeCompanyAmount: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          {
+            required: true,
+            message: "请输入担保公司担保金额",
+            trigger: "blur",
+          },
           {
             pattern:
               /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
@@ -709,6 +729,22 @@ export default {
     });
   },
   methods: {
+    getAmount(row) {
+      let res = 0;
+      if (row.depositAmount) {
+        res = res + Number(row.depositAmount);
+      }
+      if (row.bankGuaranteeLetterAmount) {
+        res = res + Number(row.bankGuaranteeLetterAmount);
+      }
+      if (row.guaranteeCompanyAmount) {
+        res = res + Number(row.guaranteeCompanyAmount);
+      }
+      if (row.insuranceAmount) {
+        res = res + Number(row.insuranceAmount);
+      }
+      return res.toFixed(2);
+    },
     /** 查询投标保证金列表 */
     getList() {
       this.loading = true;
@@ -738,40 +774,38 @@ export default {
     },
     // 表单重置
     reset() {
+      this.fileList = [];
       this.form = {
         id: null,
-        differentiatedDepositAmount: null,
-        amountPayable: null,
-        paidAmount: null,
         depositMethods: null,
-        depositBankSalaryDeposit: null,
-        salaryDepositBankAccount: null,
-        cashAmount: null,
         guaranteeBankName: null,
+        depositAmount: null,
+        depositAmountDate: null,
+        depositBank: null,
+        depositBankNumber: null,
+        accountBankAddress: null,
+        voucherNumber: null,
         bankGuaranteeLetterNo: null,
         bankGuaranteeLetterAmount: null,
         bankGuaranteeStartYear: null,
         bankGuaranteeEndYear: null,
-        guaranteeCompanyName: null,
-        guaranteeCompanyLetterNo: null,
-        guaranteeCompanyAmount: null,
-        guaranteeCompanyStartYear: null,
-        guaranteeCompanyEndYear: null,
         insuranceCompanyName: null,
         insuranceNo: null,
         insuranceAmount: null,
         insuranceStartTime: null,
         insuranceEndTime: null,
-        otherAmount: null,
+        payAmountInsurance: null,
-        incomeTime: null,
+        payAmountInsuranceTime: null,
+        guaranteeCompanyName: null,
+        guaranteeCompanyLetterNo: null,
+        guaranteeCompanyAmount: null,
+        guaranteeCompanyStartYear: null,
+        guaranteeCompanyEndYear: null,
         createUid: null,
         updateUid: null,
-        createTime: null,
-        updateTime: null,
         projectCode: null,
         proNo: null,
         owerDept: null,
-        remark: null,
       };
       this.resetForm("form");
     },
@@ -782,38 +816,35 @@ export default {
         pageSize: 10,
         data: {
           id: null,
-          differentiatedDepositAmount: null,
-          amountPayable: null,
-          paidAmount: null,
           depositMethods: null,
-          depositBankSalaryDeposit: null,
-          salaryDepositBankAccount: null,
-          cashAmount: null,
           guaranteeBankName: null,
+          depositAmount: null,
+          depositAmountDate: null,
+          depositBank: null,
+          depositBankNumber: null,
+          accountBankAddress: null,
+          voucherNumber: null,
           bankGuaranteeLetterNo: null,
           bankGuaranteeLetterAmount: null,
           bankGuaranteeStartYear: null,
           bankGuaranteeEndYear: null,
-          guaranteeCompanyName: null,
-          guaranteeCompanyLetterNo: null,
-          guaranteeCompanyAmount: null,
-          guaranteeCompanyStartYear: null,
-          guaranteeCompanyEndYear: null,
           insuranceCompanyName: null,
           insuranceNo: null,
           insuranceAmount: null,
           insuranceStartTime: null,
           insuranceEndTime: null,
-          otherAmount: null,
+          payAmountInsurance: null,
-          incomeTime: null,
+          payAmountInsuranceTime: null,
+          guaranteeCompanyName: null,
+          guaranteeCompanyLetterNo: null,
+          guaranteeCompanyAmount: null,
+          guaranteeCompanyStartYear: null,
+          guaranteeCompanyEndYear: null,
           createUid: null,
           updateUid: null,
-          createTime: null,
-          updateTime: null,
           projectCode: null,
           proNo: null,
           owerDept: null,
-          remark: null,
         },
         conditionViews: [
           {
@@ -889,8 +920,13 @@ export default {
               }
             });
           } else {
-            this.form.proNo = this.proNo;
+            if (this.type === "tbbzj" || this.type === "nmgbzj") {
-            this.form.projectCode = this.projectCode;
+              this.form.proNo = this.proNo;
+              this.form.projectCode = this.projectCode;
+            } else if (this.type === "zlbzj" || this.type === "lybzj") {
+              this.form.contractNumber = this.contractNumber;
+              console.log(777777, this.contractNumber);
+            }
             this.formMethods.add(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
@@ -911,7 +947,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning",
         })
-          .then(function () {
+          .then(() => {
             return this.formMethods.del(ids);
           })
           .then(() => {
@@ -950,9 +986,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "@/assets/css/dialog.scss";
-//::v-deep {
+::v-deep {
-//   .el-dialog {
+  .el-dialog {
-//       margin-top: 10vh !important;
+    margin-top: 10vh !important;
-//    }
+    // min-height: 800px;
-//}
+  }
+}
 </style>