二期项目/台账bug修改

RuoYi-Mobile-master/pages/login/index.vue

@@ -44,9 +44,9 @@
 				// 图形验证码信息
 				captcha: null,
 				// 登录账号
-				username: 'admin',
+				username: '',
 				// 密码
-				password: 'admin123',
+				password: '',
 				// 图形验证码
 				captchaCode: '',
 				uuid: '',

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/TcProjectMapper.xml

@@ -730,7 +730,7 @@
 --                       pe.project_id
                     select project_id,
                                SUM(IFNULL(equipment_quantity,0)) as deviceTotal,
-                               SUM(IFNULL(equipment_quantity,0) * IFNULL(amount,0)  / IFNULL(exchange_rate,1)) as priceTotal
+                               SUM(IFNULL(equipment_quantity,0) * IFNULL(amount,0) ) as priceTotal
                         from(
                             SELECT
                                 main.project_id,

ruoyi-ui-vue2/src/views/board/projectFollow/index.vue

@@ -62,6 +62,9 @@
 
           <!--设备总数-->
           <Column :label="$t('project.deviceTotal')" prop="deviceTotal" />
+          <!--币种-->
+          <Column :label="$t('project.currency')" prop="currencyId"
+                  searchType="select" :searchDict="dict.type.currency_type"/>
           <!--总价-->
           <Column :label="$t('project.priceTotal')" prop="priceTotal" align="right">
             <template #default="{ row }">
@@ -110,7 +113,7 @@ import Column from '@/components/element/table/Column.vue'
 export default {
   components: { Column, Treeselect, QuarterPicker, DatePicker},
 
-  dicts: ['project_flag'],
+  dicts: ['project_flag','currency_type'],
 
   props: {
     height: {