Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

2026-01-26 f20a697d4d3b666b2754b6d7057205f3d98503b7

 pages/ZLGL/shoujianjianyan/firstCheckBill.vue

@@ -1264,7 +1264,7 @@
               let res = await CommonUtils.doRequest2Async({
                  url: "/Gy_Employee/list",
                  data: {
                     sWhere: `  and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' order by 部门代码`,
                     sWhere: `  and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' `,
                     user: getUserInfo()["Czymc"],
                     Organization: uni.getStorageSync("Organization"),
                  },
@@ -2082,9 +2082,9 @@
                           });
                        } else if (res.cancel) {
                           console.log("用户点击取消");
                           // setTimeout(() => {
                           //     uni.navigateBack();
                           // }, 50)
                           setTimeout(() => {
                               uni.navigateBack();
                           }, 50)
                        }
                     },
                  });
@@ -2425,7 +2425,7 @@
      }

      .btn-c {
         background-color: #acacac;
         background-color: #FFA500;
         color: #fff;
         // position: absolute;
         // right: 120rpx;