Merge remote-tracking branch 'origin/master'

client/.env.dev

@@ -34,7 +34,7 @@ VITE_DROP_DEBUGGER=true
 VITE_DROP_CONSOLE=false
 
 # 是否sourcemap
-VITE_SOURCEMAP=false
+VITE_SOURCEMAP=true
 
 # 输出路径
 VITE_OUT_DIR=dist

client/package.json

@@ -68,6 +68,7 @@
     "moment": "^2.29.4",
     "nprogress": "^0.2.0",
     "pinia": "^2.1.6",
+    "postcss-pxtorem": "^5.1.1",
     "qrcode": "^1.5.3",
     "qs": "^6.11.2",
     "steady-xml": "^0.1.0",

client/postcss.config.js

@@ -1,5 +1,9 @@
 module.exports = {
   plugins: {
-    autoprefixer: {}
-  }
-}
+    'postcss-pxtorem': {
+      rootValue: 16,
+      propList: ['*'], 
+      selectorBlackList: ['van']
+    },
+  },
+};

client/src/main.ts

@@ -42,6 +42,7 @@ import { createApp } from 'vue'
 import App from './App.vue'
 
 import './permission'
+import "./rem" 
 
 import Logger from '@/utils/Logger'
 import subscribe from '@/utils/Subscribe'

client/src/rem.js

@@ -0,0 +1,13 @@
+// 设置 rem 函数
+function setRem() {
+  // 基准大小，一般为设计稿宽度的1/10或1/20，以此来计算页面的总rem，例如此处页面的总宽度为750/32rem
+  const baseSize = 16
+  // 缩放，此处分母填写的750为设计稿宽度
+  const scale = document.documentElement.clientWidth / 1980
+  // 设置页面根节点字体大小
+  document.documentElement.style.fontSize = baseSize * Math.min(scale, 2) + 'px'
+}
+// 初始化
+setRem()
+// 改变窗口大小时重新设置 rem
+window.addEventListener('resize', () => setRem())

client/src/router/modules/remaining.ts

@@ -380,7 +380,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       {
         path: 'oaSystem/DeptCenter/weeklyStatistic',
         component: () => import('@/views/OaSystem/personnelManagement/weeklyStatistic/index.vue'),
-        name: 'weeklyStatistic',
+        name: '"DeptWeeklyStatistic"',
         meta: {
           title: '部门周报统计'
         }

client/src/views/OaSystem/financialManagement/kpglPage/deptIndex.vue

@@ -252,7 +252,9 @@ const handleSelectionChange = (arrs) => {
 /** 列表导出 */
 const getExportContractInvoiceListExcel = async () => {
   if (idList.value.length === 0) {
-    ElMessage.warning('请至少选择一条数据！')
+    idList.value = list.value.map((item) => item.id)
+  }
+  if (idList.value.length === 0) {
     return
   }
   const data = await kpglApi.exportContractInvoiceListExcel({

client/src/views/OaSystem/financialManagement/kpglPage/index.vue

@@ -39,6 +39,15 @@
         />
       </div>
 
+      <div class="form">
+        <span class="formSpan">开票金额：</span>
+        <el-input
+          v-model="queryParams.invoiceAmount"
+          style="width: 160px"
+          placeholder="请输入开票金额"
+        />
+      </div>
+
       <div class="form">
         <span class="formSpan">开票状态：</span>
         <el-select
@@ -238,6 +247,7 @@ const queryParams = reactive({
   invoiceNumber: '',
   contractName: '',
   payCompany: '',
+  invoiceAmount: '',
   deptId: '',
   managerId: '',
   xmmc: '',
@@ -270,7 +280,9 @@ const handleSelectionChange = (arrs) => {
 /** 列表导出 */
 const getExportContractInvoiceListExcel = async () => {
   if (idList.value.length === 0) {
-    ElMessage.warning('请至少选择一条数据！')
+    idList.value = list.value.map((item) => item.id)
+  }
+  if (idList.value.length === 0) {
     return
   }
   const data = await kpglApi.exportContractInvoiceListExcel({

client/src/views/OaSystem/financialManagement/kpglPage/myIndex.vue

@@ -256,7 +256,9 @@ const handleSelectionChange = (arrs) => {
 /** 列表导出 */
 const getExportContractInvoiceListExcel = async () => {
   if (idList.value.length === 0) {
-    ElMessage.warning('请至少选择一条数据！')
+    idList.value = list.value.map((item) => item.id)
+  }
+  if (idList.value.length === 0) {
     return
   }
   const data = await kpglApi.exportContractInvoiceListExcel({
@@ -299,9 +301,11 @@ const getStatics = async () => {
     queryParams.returnOff = formatDate(returnTime.value[1], 'YYYY-MM-DD')
   }
   const data = await kpglApi.getStatics(queryParams)
-  infoList.value[0].num = data.ykp
-  infoList.value[1].num = data.yhk
-  infoList.value[2].num = data.ykp - data.yhk
+  if (data) {
+    infoList.value[0].num = data.ykp
+    infoList.value[1].num = data.yhk
+    infoList.value[2].num = data.ykp - data.yhk
+  }
 }
 const handleCurrentChange = (pageNo: number) => {
   queryParams.pageNo = pageNo

client/src/views/OaSystem/home/components/CardItemThree.vue

@@ -118,8 +118,6 @@ queryContractInfo()
 
       &:nth-child(1),
       &:nth-child(2) {
-        cursor: pointer;
-
         // &.active,
         // &:hover {
         //   background: linear-gradient(270deg, #eaf4ff 0%, #f9fcff 100%);

client/src/views/OaSystem/marketCenter/returnMessage/MessageTop.vue

@@ -32,17 +32,17 @@ const yearOptions = (time) => {
 
 const dataSource = ref([
   {
-    name: '已签（万元）',
+    name: '已签',
     icon: 'xmzx/xmzcz',
     num: 0
   },
   {
-    name: '新开拓（万元）',
+    name: '新开拓',
     icon: 'xmzx/xmzcb',
     num: 0
   },
   {
-    name: '回款（万元）',
+    name: '回款',
     icon: 'xmzx/xmzlr',
     num: 0
   }
@@ -50,10 +50,6 @@ const dataSource = ref([
 
 const setYear = ref(curYear)
 
-// 转换单位为 万
-const formatNumber = (num) => {
-  return Number((num / 10000).toFixed(2))
-}
 // 获取回款金额
 const getMoneyCount = async (year) => {
   let managerId = ''
@@ -74,9 +70,9 @@ const getMoneyCount = async (year) => {
     },
     '/business'
   )
-  dataSource.value[0].num = formatNumber(data.signAmount) ?? 0
-  dataSource.value[1].num = formatNumber(data.newAmount) ?? 0
-  dataSource.value[2].num = formatNumber(data.returnAmount) ?? 0
+  dataSource.value[0].num = data.signAmount ?? 0
+  dataSource.value[1].num = data.newAmount ?? 0
+  dataSource.value[2].num = data.returnAmount ?? 0
 }
 
 const panelChange = (val) => {
@@ -109,7 +105,7 @@ const panelChange = (val) => {
       <li v-for="(item, index) in dataSource" :key="index" class="data">
         <img class="icon" :src="getAssetURL(item.icon)" alt="" />
         <span class="label">{{ item.name }}：</span>
-        <span>{{ item.num }}</span>
+        <span v-money:unit="item.num"></span>
       </li>
     </ul>
   </div>

client/src/views/OaSystem/personnelManagement/weeklyStatistic/index.vue

@@ -76,7 +76,7 @@ import { getUserInfo, calculateTableHeight } from '@/utils/tool'
 import DeptAndUserSelect from '@/components/DeptAndUserSelect/index.vue'
 
 defineOptions({
-  name: 'WeeklyStatistic'
+  name: 'DeptWeeklyStatistic'
 })
 const loading = ref(false)
 

client/src/views/OaSystem/projectCenter/purchaseContract/common.ts

@@ -4,27 +4,27 @@ import download from '@/utils/download'
 export const infoList: any = ref([
   {
     icon: 'xmzx/xmzcz',
-    name: '总合同金额(万元)',
+    name: '总合同金额',
     key: 'contractAmount'
   },
   {
     icon: 'xmzx/xmzcb',
-    name: '总开票金额(万元)',
+    name: '总开票金额',
     key: 'invoiceAmount'
   },
   {
     icon: 'xmzx/xmzlr',
-    name: '总回款金额(万元)',
+    name: '总回款金额',
     key: 'returnAmount'
   },
   {
     icon: 'xmzx/xmzlr',
-    name: '总应收款(万元)',
+    name: '总应收款',
     key: 'receivableAmount'
   },
   {
     icon: 'xmzx/xmzlr',
-    name: '总合同余额(万元)',
+    name: '总合同余额',
     key: 'contractBalance'
   }
 ])

client/src/views/OaSystem/projectCenter/purchaseContract/purchaseContract.vue

@@ -126,7 +126,7 @@
         <li v-for="(item, index) in infoList" :key="index" class="mr-40px">
           <img class="mr-8px" :src="getAssetURL(item.icon)" alt="" />
           <p>{{ item.name }}：</p>
-          <h4 class="font-size-18px">{{ (contractListCalc[item.key] / 10000).toFixed(2) }}</h4>
+          <h4 class="font-size-18px" v-money:unit="contractListCalc[item.key]"></h4>
         </li>
       </ul>
     </div>

client/vite.config.ts

@@ -79,7 +79,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
           drop_debugger: env.VITE_DROP_DEBUGGER === 'true',
           drop_console: env.VITE_DROP_CONSOLE === 'true'
         }
-      }
+      },
     },
     optimizeDeps: { include, exclude }
   }

client_h5/.env.dev

@@ -1,8 +1,6 @@
-VITE_BASE_URL='http://oa.zjugis.com:28080'
+VITE_BASE_URL='http://10.10.10.7:18080'
 # VITE_BASE_URL='http://localhost:6090/'
 
 
 # File上传路径
 VITE_FILE_BASE_URI='/admin-api/infra/file'
-
-VITE_AUTHORIZATION='d1093ca59ef54442aef29d47555fe81d'

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractExcelResponse.java

@@ -25,6 +25,9 @@ public class ContractExcelResponse {
     @ExcelProperty(value = "合同费用状态",converter = ContractConverter.class)
     private Integer amountStatus;
 
+    @ExcelProperty("合同编号")
+    private String contractNumber;
+
     @ExcelProperty("合同名称")
     private String name;
 
@@ -55,9 +58,6 @@ public class ContractExcelResponse {
     @ExcelProperty("合同余额（元）")
     private BigDecimal contractBalance;
 
-    @ExcelProperty("合同编号")
-    private String contractNumber;
-
     @ExcelProperty("合同拿出日期")
     private LocalDate contractOn;
     //总产值