款项结算

jy-ui/src/views/business/contract/info/order-detail.vue

@@ -1,48 +1,50 @@
 <template>
-  <div style="max-height: calc(100vh - 200px); overflow: hidden auto">
-    <el-form-item label="订单" :label-position="'top'">
-      <el-table :data="formData.data.order" style="width: 100%">
-        <el-table-column label="订单号">
-          <template v-slot="scope">
-            <div>
-              <a style="color: #409eff; cursor: pointer; word-break: break-all" @click="clickDetail(scope.row)">
-                {{ scope.row.orderNo }}
-              </a>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="订单金额" prop="paymentPrice" />
-        <el-table-column label="三梵成本" prop="costAmount" />
-        <el-table-column label="预计总利润" prop="expectedProfit" />
-      </el-table>
-    </el-form-item>
-    <el-form-item label="请款" :label-position="'top'">
-      <el-table :data="formData.data.payment" style="width: 100%">
-        <el-table-column label="请款类型">
-          <template v-slot="scope">
-            <div>
-              {{ dictKeyValue(scope.row.type, expenseType) }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" prop="amount" />
-        <el-table-column label="请款时间" prop="requestsTime" />
-        <el-table-column label="打款时间" prop="remitTime" />
-      </el-table>
-    </el-form-item>
-    <el-form-item label="客户付款" :label-position="'top'">
-      <el-table :data="formData.data.fundReceived" style="width: 100%">
-        <el-table-column label="客户付款金额" prop="receivedAmount" />
-        <el-table-column label="付款时间" prop="receivedTime" />
-        <el-table-column label="是否认领" prop="hasReceived">
-          <template v-slot="scope">
-            <div>
-              {{ scope.row.hasReceived ? '是' : '否' }}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-form-item>
+  <div>
+    <div style="max-height: calc(100vh - 280px); overflow: hidden auto">
+      <el-form-item label="订单" :label-position="'top'">
+        <el-table :data="formData.data.order" style="width: 100%">
+          <el-table-column label="订单号">
+            <template v-slot="scope">
+              <div>
+                <a style="color: #409eff; cursor: pointer; word-break: break-all" @click="clickDetail(scope.row)">
+                  {{ scope.row.orderNo }}
+                </a>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单金额" prop="paymentPrice" />
+          <el-table-column label="三梵成本" prop="costAmount" />
+          <el-table-column label="预计总利润" prop="expectedProfit" />
+        </el-table>
+      </el-form-item>
+      <el-form-item label="请款" :label-position="'top'">
+        <el-table :data="formData.data.payment" style="width: 100%">
+          <el-table-column label="请款类型">
+            <template v-slot="scope">
+              <div>
+                {{ dictKeyValue(scope.row.type, expenseType) }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="请款金额" prop="amount" />
+          <el-table-column label="请款时间" prop="requestsTime" />
+          <el-table-column label="打款时间" prop="remitTime" />
+        </el-table>
+      </el-form-item>
+      <el-form-item label="客户付款" :label-position="'top'">
+        <el-table :data="formData.data.fundReceived" style="width: 100%">
+          <el-table-column label="客户付款金额" prop="receivedAmount" />
+          <el-table-column label="付款时间" prop="receivedTime" />
+          <el-table-column label="是否认领" prop="hasReceived">
+            <template v-slot="scope">
+              <div>
+                {{ scope.row.hasReceived ? '是' : '否' }}
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+    </div>
     <el-form-item label="总利润" :label-position="'top'">
       <div style="display: flex; justify-content: space-between; width: 100%">
         <span>{{ calculateTotalProfit() }}</span>
@@ -274,6 +276,12 @@ const dictKeyValue = (value, arr) => {
 }
 const emit = defineEmits(['clickCancel'])
 const clickSettlement = () => {
+  if (formData.data.payment && formData.data.payment.length > 0) {
+    let list = formData.data.payment.filter((item) => !item.remitTime)
+    if (list && list.length > 0) {
+      return ElMessage.error('暂有款项未打款')
+    }
+  }
   ElMessageBox.confirm('你是否确认结算利润', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',