From 599da2fa4b829f2f25c1f2a0bfc5e9f9d568122a Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Fri, 6 Jun 2025 11:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E8=AE=B0=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heli/dal/mysql/orderys/OrderYsMapper.java |  4 +-
 .../service/invoice/InvoiceServiceImpl.java   |  1 +
 .../bdgzsomthing/bdgzsomthingMapper.xml       |  2 +-
 .../src/views/heli/orderys/index.vue          |  4 +-
 .../src/views/heli/orderys/record.vue         | 80 +++++++++++--------
 .../src/views/heli/taskreport/index.vue       | 11 +++
 mes-ui/mini-app/src/services/constants.ts     |  4 +-
 7 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java
index 5086aea..936c82f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java
@@ -32,7 +32,7 @@ public interface OrderYsMapper extends BaseMapperX<OrderYsDO> {
         query.selectAll(OrderYsDO.class)
                 .select("sum(i.amount) as amount")
                 .leftJoin(
-                        "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE'")
+                        "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE' AND i.status !='3'")
                 .disableSubLogicDel()
                 .groupBy(OrderYsDO::getId)
                 .orderByDesc(OrderYsDO::getCreateTime);
@@ -53,7 +53,7 @@ public interface OrderYsMapper extends BaseMapperX<OrderYsDO> {
                 .select("p.shou_Fu_Kuan_Bi_Li as shouFuKuanBiLi","p.two_Fu_Kuan_Bi_Li as twoFuKuanBiLi","p.three_Fu_Kuan_Bi_Li as threeFuKuanBiLi")
                 .select("p.four_Fu_Kuan_Bi_Li as fourFuKuanBiLi","p.five_Fu_Kuan_Bi_Li as fiveFuKuanBiLi","p.six_Fu_Kuan_Bi_Li as sixFuKuanBiLi")
                 .leftJoin(
-                        "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE'")
+                        "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE' AND i.status !='3'")
                 .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getCode, OrderYsDO::getCode)
                 .disableSubLogicDel();
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java
index c1f89c0..86ae1c9 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java
@@ -109,6 +109,7 @@ public class InvoiceServiceImpl implements InvoiceService {
     public List<InvoiceDO> getOrderYsInvoice(String code) {
         LambdaQueryWrapper<InvoiceDO> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InvoiceDO::getOrderCode, code);
+        wrapper.ne(InvoiceDO::getStatus, InvoiceStatusEnum.CANCEL.getCode());
         return invoiceMapper.selectList(wrapper);
     }
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml
index ba3d78f..75b4e05 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/bdgzsomthing/bdgzsomthingMapper.xml
@@ -101,7 +101,7 @@
     <select id="selecteqintAttr12IsNull"
             parameterType="String"
             resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO">
-        select * from dbzz_table where things like concat('%',#{things},'%') and attr3 = #{attr3} and  (attr12 is null or attr12 = '1')
+        select * from dbzz_table where things like concat('%',#{things},'%') and attr3 = #{attr3} and  (attr12 is null or attr12 = '1') and deleted=0
 
     </select>
     <select id="selecteqintq"
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
index 118335c..1c407ba 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
@@ -23,7 +23,7 @@
           placeholder="请输入项目名称"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-200px"
+          class="!w-250px"
         />
       </el-form-item>
 
@@ -33,7 +33,7 @@
           placeholder="请输入客户名称"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-200px"
+          class="!w-250px"
         />
       </el-form-item>
       <el-form-item label="回款状态" prop="cgTypee">
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/record.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/record.vue
index 66e6354..03c40aa 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/record.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/record.vue
@@ -23,7 +23,7 @@
           placeholder="请输入项目名称"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-200px"
+          class="!w-250px"
         />
       </el-form-item>
 
@@ -33,7 +33,7 @@
           placeholder="请输入客户名称"
           clearable
           @keyup.enter="handleQuery"
-          class="!w-200px"
+          class="!w-250px"
         />
       </el-form-item>
       <el-form-item label="回款状态" prop="cgTypee">
@@ -86,7 +86,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-click="rowClick" :row-class-name="tableRowClassName" highlight-current-row>
-      <el-table-column label="项目名称" align="center" prop="projectName" width="150"/>
+      <el-table-column label="项目名称" align="center" prop="projectName" width="250"/>
 <!--      <el-table-column-->
 <!--        label="生成日期"-->
 <!--        align="center"-->
@@ -94,7 +94,7 @@
 <!--        :formatter="dateFormatter"-->
 <!--        width="250px"-->
 <!--      />-->
-      <el-table-column label="客户名称" align="center" prop="cgKhname" width="200px"/>
+      <el-table-column label="客户名称" align="center" prop="cgKhname" width="250px"/>
       <el-table-column
         label="预计回款日期"
         align="center"
@@ -140,37 +140,41 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-    <div class="footer">
-      <el-table :data="OrderYsDetailLiat" highlight-current-row  style="width: 50%; height: 100%">
-        <el-table-column prop="paymentDate" label="回款日期"           :formatter="dateFormatter2"
-        />
-        <el-table-column prop="cgType" label="回款类型" >
-          <template #default="scope">
-            <dict-tag :type="DICT_TYPE.HELI_CGTYPE" :value="scope.row.cgType" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="cgYishou" label="回款金额" />
-      </el-table>
-      <el-table :data="InvoiceList" class="ml-10" style="width: 50%;height: 100%">
-        <el-table-column  label="发票编码" align="center" prop="number"/>
-
-        <el-table-column
-          label="开票日期"
-          align="center"
-          prop="billingDate"
-          :formatter="dateFormatter2"
-        />
-        <el-table-column  label="发票金额" align="center" prop="amount"  />
-        <el-table-column label="发票类型" align="center" prop="type" width="160">
-          <template #default="scope">
-            <dict-tag :type="DICT_TYPE.HELI_INVOICE_TYPE" :value="scope.row.type" />
-          </template>
-        </el-table-column>
-        <el-table-column label="税率（%）" align="center" prop="rate" width="140" />
-      </el-table>
-    </div>
   </ContentWrap>
+  <ContentWrap>
+  <div class="footer">
+    <el-table :data="OrderYsDetailLiat" highlight-current-row  style="width: 50%; height: 100%;box-shadow: 3px 0 10px rgba(0,0,0,0.1)">
+      <el-table-column prop="paymentDate" label="回款日期"      align="center"     :formatter="dateFormatter2"
+      />
+      <el-table-column prop="cgType" label="回款类型" align="center">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_CGTYPE" :value="scope.row.cgType" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="cgYishou" label="回款金额" align="center"/>
+    </el-table>
+    <el-table :data="InvoiceList" class="ml-10" style="width: 50%;height: 100%;box-shadow: 3px 0 10px rgba(0,0,0,0.1)">
+      <el-table-column  label="发票编码" align="center" prop="number"/>
 
+      <el-table-column
+        label="开票日期"
+        align="center"
+        prop="billingDate"
+        :formatter="dateFormatter2"
+      />
+      <el-table-column  label="发票金额" align="center" prop="amount"  />
+      <el-table-column label="发票类型" align="center" prop="type" width="160">
+<!--        <template #default="scope">-->
+<!--          <dict-tag :type="DICT_TYPE.HELI_INVOICE_TYPE" :value="scope.row.type" />-->
+<!--        </template>-->
+        <template #default="scope">
+          {{ getDictLabel(DICT_TYPE.HELI_INVOICE_TYPE,scope.row.type) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="税率（%）" align="center" prop="rate" width="140" />
+    </el-table>
+  </div>
+  </ContentWrap>
   <!-- 表单弹窗：添加/修改 -->
 <!--  <OrderYsForm ref="formRef" @success="getList" />-->
 </template>
@@ -234,6 +238,16 @@ const rowClick = async (row) => {
   InvoiceList.value= await InvoiceApi.getOrderYsInvoice(row.code)
   // OrderYsDetailLiat.value.map(item=>{item.cgTypee=Number(item.cgTypee)})
 }
+const getDictLabel = (dictType, value) => {
+  console.log(dictType)
+  console.log(value)
+  var intDictOptions = getIntDictOptions(dictType);
+  console.log(intDictOptions)
+  const dict = intDictOptions.find(item => item.value == value)
+  console.log(value)
+  console.log(dict)
+  return dict?.label || value // 找不到时显示原始值
+}
 const tableRowClassName = ({ row }) => {
   if (row.paymentDate!=null){
     var endTime = new Date(row.paymentDate);
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
index 0b3771d..b4872bd 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
@@ -133,6 +133,15 @@
         :formatter="dateFormatter"
         width="220"
       />
+<!--      <el-table-column align="center" width="40" fixed="right">-->
+<!--        <template #header>-->
+<!--          <el-tooltip content="表头设置" placement="top">-->
+<!--            <el-icon >-->
+<!--              <Setting/>-->
+<!--            </el-icon>-->
+<!--          </el-tooltip>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column fixed="right" label="操作" align="center" width="140">
         <template #default="scope">
           <el-button
@@ -167,6 +176,8 @@ import download from '@/utils/download'
 import * as TaskReportApi from '@/api/heli/taskreport'
 import TaskReportForm from './TaskReportForm.vue'
 import dayjs from "dayjs";
+import {Setting} from "@element-plus/icons-vue";
+import ElTooltip from "element-plus/es/components/tooltip";
 
 defineOptions({ name: 'TaskReport' })
 
diff --git a/mes-ui/mini-app/src/services/constants.ts b/mes-ui/mini-app/src/services/constants.ts
index ed28f3e..63ce0a9 100644
--- a/mes-ui/mini-app/src/services/constants.ts
+++ b/mes-ui/mini-app/src/services/constants.ts
@@ -7,7 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 // export const serviceDomain = 'https://nxhs.cjyx.cc'
- export const serviceDomain = 'https://star.hz-hl.com'
+ // export const serviceDomain = 'https://star.hz-hl.com'
 // export const serviceDomain = 'http://222.71.165.187:9010'
- // export const serviceDomain = 'http://localhost:8080'
+ export const serviceDomain = 'http://localhost:8080'
 // export const serviceDomain = 'https://nxhs.cjyx.cc'