no message

src/views/business/collect/count/index.vue

@@ -70,7 +70,7 @@
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="applierName">
                 <template #default="scope">
-                    <el-link type="primary" @click="openDetail(scope.row)"> {{scope.row.applierName}}</el-link>
+                    <el-link type="primary" @click="openDetail(scope.row)" style="font-size: 12px;">  {{scope.row.applierName}}</el-link>
                 </template>
             </el-table-column>
             <el-table-column label="合同类型" align="center" prop="contractType">
@@ -81,14 +81,14 @@
             </el-table-column>
             <el-table-column label="实收" align="center" prop="reallyDetailAmount">
                 <template #default="scope">
-                    <el-link type="primary" @click="openDetail()"> {{scope.row.reallyDetailAmount}}</el-link>
+                    <el-link type="primary" @click="openDetailIn(scope.row)" style="font-size: 12px;"> {{scope.row.reallyDetailAmount}}</el-link>
                 </template>
             </el-table-column>
             <el-table-column label="待收" align="center" prop="waitDetailAmount">
             </el-table-column>
             <el-table-column label="支出" align="center" prop="outAmount">
                 <template #default="scope">
-                    <el-link type="primary" @click="openDetail()"> {{scope.row.outAmount}}</el-link>
+                    <el-link type="primary" @click="openDetailOut(scope.row)" style="font-size: 12px;"> {{scope.row.outAmount}}</el-link>
                 </template>
             </el-table-column>
             <el-table-column label="审核时间" align="center" prop="examineTime">
@@ -99,10 +99,51 @@
         <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
             v-model:limit="queryParams.pageSize" @pagination="getList" />
 
-        <!-- <el-dialog title="提收款详情" v-model="open" width="1000px" append-to-body>
-            <el-form :model="form" label-width="100px">
-            </el-form>
-        </el-dialog> -->
+        <el-dialog title="提收款详情" v-model="open" width="auto" append-to-body>
+            <div v-if="inData.length > 0">
+                <div>
+                    <span>收款情况</span>
+                </div>
+                <el-table v-loading="loading" :data="inData" size="small" border height="100%">
+                    <el-table-column label="序号" align="center" type="index" />
+                    <el-table-column label="公司名称" width="230" align="center" prop="companyName" />
+                    <el-table-column label="产品名称" width="180" align="center" prop="typeName" />
+                    <el-table-column label="合同编号" width="180" align="center" prop="contractNo" />
+                    <el-table-column label="到账日期" align="center" prop="receiptDate" />
+                    <el-table-column label="提收款金额" align="center" prop="withdrawalAmount" />
+                    <el-table-column label="申请人" width="100" align="center" prop="applierName" />
+                    <el-table-column label="合同类型" align="center" prop="contractType" />
+                    <el-table-column label="是否是项目" align="center" prop="isProject" />
+                    <el-table-column label="服务金额" align="center" prop="detailAllAmount" />
+                    <el-table-column label="实收" align="center" prop="reallyDetailAmount" />
+                    <el-table-column label="审核时间" align="center" prop="examineTime" />
+                </el-table>
+            </div>
+            <div v-if="outData.length > 0">
+                <div style="margin-top: 20px;">
+                    <span>支付情况</span>
+                </div>
+                <el-table v-loading="loading" :data="outData" size="small" border height="100%">
+                    <el-table-column label="序号" align="center" type="index" />
+                    <el-table-column label="公司名称" width="230" align="center" prop="companyName" />
+                    <el-table-column label="产品名称" width="180" align="center" prop="typeName" />
+                    <el-table-column label="合同编号" width="180" align="center" prop="contractNo" />
+                    <el-table-column label="付款金额" align="center" prop="withdrawalAmount" />
+                    <el-table-column label="申请人" width="100" align="center" prop="applierName" />
+                    <el-table-column label="合同类型" align="center" prop="contractType" />
+                    <el-table-column label="是否是项目" align="center" prop="isProject" />
+                    <el-table-column label="服务金额" align="center" prop="detailAllAmount" />
+                    <el-table-column label="实收" align="center" prop="reallyDetailAmount" />
+                    <el-table-column label="审核时间" align="center" prop="examineTime" />
+                </el-table>
+            </div>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" icon="Finished" size="small" @click="open = false">确 定</el-button>
+                    <el-button icon="close" size="small" @click="open = false">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
@@ -119,6 +160,8 @@
     /** 查询 对象 */
 
     const accountList = ref([]);
+    const inData = ref([]);
+    const outData = ref([]);
     const loading = ref(true);
     const ids = ref([]);
     const single = ref(true);
@@ -191,15 +234,60 @@
 
 
     function openDetail(item) {
-        alert("待开发~~~")
-        // let data = JSON.parse(JSON.stringify(queryParams.value));
-        // console.log(item);
-        // data.contractId = item.contractId
-        // data.taskTypeIds.push(item.taskTypeId)
-        // getByContract(data).then((res) => {
-        //     console.log(res);
-        //     open.value = true;
-        // });
+        loading.value = true;
+        let data = JSON.parse(JSON.stringify(queryParams.value));
+        data.contractId = item.contractId
+        data.taskTypeIds.push(item.taskTypeId)
+        getByContract(data).then((res) => {
+            if (res.code == 200) {
+                inData.value = res.data.data.inList
+                inData.value.forEach(element => {
+                    element.withdrawalAmount =   item.withdrawalAmount
+                });
+                outData.value = res.data.data.outList
+                loading.value = false;
+                open.value = true;
+            } else {
+                proxy.$modal.msgError(res.msg);
+            }
+        });
+    }
+    
+    function openDetailIn(item) {
+        loading.value = true;
+        let data = JSON.parse(JSON.stringify(queryParams.value));
+        data.contractId = item.contractId
+        data.taskTypeIds.push(item.taskTypeId)
+        getByContract(data).then((res) => {
+            if (res.code == 200) {
+                inData.value = res.data.data.inList
+                inData.value.forEach(element => {
+                    element.withdrawalAmount =   item.withdrawalAmount
+                });
+                outData.value = []
+                loading.value = false;
+                open.value = true;
+            } else {
+                proxy.$modal.msgError(res.msg);
+            }
+        });
+    }
+
+    function openDetailOut(item) {
+        loading.value = true;
+        let data = JSON.parse(JSON.stringify(queryParams.value));
+        data.contractId = item.contractId
+        data.taskTypeIds.push(item.taskTypeId)
+        getByContract(data).then((res) => {
+            if (res.code == 200) {
+                outData.value = res.data.data.outList
+                inData.value = []
+                loading.value = false;
+                open.value = true;
+            } else {
+                proxy.$modal.msgError(res.msg);
+            }
+        });
     }
     /** 保存按钮操作 */
     function handleSave(row) {

src/views/business/service/once/index.vue

@@ -111,13 +111,7 @@
         <template #default="scope">
           <div>
             {{
-              scope.row.noContract === 1
-                ? scope.row.remark
-                : `${scope.row.taskTypeName}${
-                    scope.row.taskTypeDetailName
-                      ? `-${scope.row.taskTypeDetailName}`
-                      : ""
-                  }`
+              scope.row.noContract === 1? scope.row.remark: `${scope.row.taskTypeName}${scope.row.alterType ?`-${scope.row.alterType}` : ""}${scope.row.taskTypeDetailName? `-${scope.row.taskTypeDetailName}` : ""}`
             }}
           </div>
         </template>