From 55a0a0af0f21cdfb39c304a67d8b9c6f7d5d06ae Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 14 Mar 2025 15:23:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/components/EditContract.vue      | 12 +++--
 .../components/examineRegistration.vue        | 46 ++++++++++---------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/views/contract/components/EditContract.vue b/src/views/contract/components/EditContract.vue
index 575eab7..4953fe7 100644
--- a/src/views/contract/components/EditContract.vue
+++ b/src/views/contract/components/EditContract.vue
@@ -192,10 +192,10 @@
                   @input="e => form.plan_price = e"
                 ></InputNumber>
               </el-form-item>
-
-              <el-form-item label="流程状态" v-if="$store.state.user.adminId === 1" :class="device === 'desktop' ? 'span2' : ''">
+<!--  -->
+              <el-form-item label="流程状态" v-if="$store.state.user.adminId === 1"  :class="device === 'desktop' ? 'span2' : ''">
                 <div>
-                  <el-button size="small" type="primary" icon="el-icon-plus" @click="form.contract_flow_links.push({flow_id: '',flow_status: '',custom_model_id: '',flow_title: ''})">新增记录</el-button>
+                  <el-button size="small" type="primary" icon="el-icon-plus" @click="form.contract_flow_links.push({flow_id: '',flow_status: '',custom_model_id: '',flow_title: '',is_hand:1})">新增记录</el-button>
 
                   <xy-table :list="form.contract_flow_links"
                             style="width: 100%;margin-top: 10px;"
@@ -937,6 +937,12 @@ export default {
           }
         }
         this.title = res.name
+        let _arr = []
+        res.contract_flow_links.map(flow=>{
+          flow.is_hand = 1
+          _arr.push(flow)
+        })
+        this.form.contract_flow_links = _arr
         this.form.contract_plan_links = res.plan_link.map(link => {
           let myPlan = res.plans.find(j => j.id === link.plan_id)
           if (myPlan) {
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 73bed30..5465f68 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -80,7 +80,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:deductionMoney>
+     <!-- <template v-slot:deductionMoney>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>本期扣款金额
@@ -90,7 +90,7 @@
               style="width: 300px;" />
           </div>
         </div>
-      </template>
+      </template> -->
       <template v-slot:type>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -152,7 +152,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:moneyWay>
+      <!-- <template v-slot:moneyWay>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>资金列支渠道
@@ -173,14 +173,16 @@
               size="small"
               style="width: 300px"
               @change="moneyWayChange"
-            />
+            /> -->
+
 <!--            <el-select multiple style="width: 300px;" v-model="paymentRegistrationForm.moneyWay" placeholder="请选择资金列支渠道"-->
 <!--              @change="moneyWayChange">-->
 <!--              <el-option v-for="item in planTypes" :value="item.id" :label="item.value"></el-option>-->
 <!--            </el-select>-->
-          </div>
+
+         <!-- </div>
         </div>
-      </template>
+      </template> -->
       <template #files v-if="paymentRegistrationForm.type === '结算款'">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -352,15 +354,15 @@ import {listdeptNoAuth} from "@/api/system/department";
               message: '必须为数字'
             }
           ],
-          deductionMoney: [{
-              required: true,
-              message: "必填"
-            },
-            {
-              pattern: /^\d+(\.\d+)?$/,
-              message: '必须为数字'
-            }
-          ],
+          // deductionMoney: [{
+          //     required: true,
+          //     message: "必填"
+          //   },
+          //   {
+          //     pattern: /^\d+(\.\d+)?$/,
+          //     message: '必须为数字'
+          //   }
+          // ],
           type: [{
             required: true,
             message: "必选"
@@ -374,10 +376,10 @@ import {listdeptNoAuth} from "@/api/system/department";
               message: '必须为数字'
             }
           ],
-          moneyWay: [{
-            required: true,
-            message: "必填"
-          }]
+          // moneyWay: [{
+          //   required: true,
+          //   message: "必填"
+          // }]
         },
         plansSelect: {
           page: 1,
@@ -611,7 +613,7 @@ import {listdeptNoAuth} from "@/api/system/department";
           contract_id: this.contract.id,
           act_money: this.paymentRegistrationForm.actMoney,
           status: 1,
-          money_way_id: this.paymentRegistrationForm.moneyWay.toString(),
+          // money_way_id: this.paymentRegistrationForm.moneyWay.toString(),
           contract_plan_act_links: this.paymentRegistrationForm.plan
         })
         editorFundLog({
@@ -620,8 +622,8 @@ import {listdeptNoAuth} from "@/api/system/department";
           act_money: this.paymentRegistrationForm.actMoney,
           status: 1,
           apply_money: this.paymentRegistrationForm.applyMoney,
-          discount_money: this.paymentRegistrationForm.deductionMoney,
-          money_way_id: this.paymentRegistrationForm.moneyWay.toString(),
+          // discount_money: this.paymentRegistrationForm.deductionMoney,
+          // money_way_id: this.paymentRegistrationForm.moneyWay.toString(),
           contract_plan_act_links: this.paymentRegistrationForm.plan,
           property: this.paymentRegistrationForm.property,
           property_type_id: this.paymentRegistrationForm.property_type_id,