Merge branch 'milestone-20251104-现金二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251104-现金二期

src/views/home.vue

@@ -173,6 +173,8 @@ console.log('权限测试',selectStatusById());
 
 // 获取消息
 const getMessage = async () => {
+  console.log('权限测试',displayMessages);
+  
   try {
     let params = {status: selectStatusById()};
     const res = await API({
@@ -472,7 +474,10 @@ onMounted(() => getMessage())
               </div>
             </div>
 
-            <p class="message-desc">{{ item.desc }}</p>
+            <div class="message-desc">
+              <div v-if="findMenuById(menuTree, permissionMapping.refund_headquarters_finance)">[{{ item.marketName }}] </div>
+              <div>[{{item.name}}{{ item.jwcode }}]用户有条收款订单需审核</div>
+              </div>
             <el-button
                 type="primary"
                 style="margin: 0 auto; display: block;"
@@ -773,6 +778,7 @@ onMounted(() => getMessage())
 }
 
 .message-desc {
+display: flex;
   font-size: 13px;
   color: #666;
   margin: 4px 0 15px 15px;

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -901,7 +901,13 @@ const getlist = async () => {
             markets.value = searchData.value.markets[searchData.value.markets.length - 1]
             console.log('地区转换', markets.value)
         }
-
+        if (searchData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchData.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
         const result = await request({
             url: '/cashCollection/selectCollection',
             data: {

src/views/moneyManage/receiveDetail/receiveHead.vue

@@ -777,6 +777,13 @@ const getlist = async () => {
             markets.value = searchData.value.markets[searchData.value.markets.length - 1]
             console.log('地区转换', markets.value)
         }
+        if (searchData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchData.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
 
         if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
             ElMessage.error('精网号只能是数字')

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -897,12 +897,13 @@ const getlist = async () => {
             markets.value = searchData.value.markets[searchData.value.markets.length - 1]
             console.log('地区转换', markets.value)
         }
-
-        if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
-            ElMessage.error('精网号只能是数字')
-            return
+        if (searchData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchData.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
         }
-
         const result = await request({
             url: '/cashCollection/selectCollection',
             data: {

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -459,7 +459,6 @@ const defaultTime = [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59,
 // 查询按钮
 const search = () => {
     getlist()
-    ElMessage.success('查询成功')
 }
 
 // 重置按钮
@@ -520,6 +519,13 @@ const getlist = async () => {
         } else {
             searchData.value.market = ''
         }
+        if (searchData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchData.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
 
         if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
             ElMessage.error('精网号只能是数字')