Merge branch 'feat' of http://101.201.226.163:3000/TALL/TALL-MUI-4 into feat

CHANGELOG.md

@@ -75,6 +75,7 @@
 ### 🎨 代码样式
 范围|描述|commitId
 --|--|--
+<<<<<<< HEAD
  - | 插件样式调整 | [7411d3a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/7411d3a)
  - | 更新代码 | [aa6093a](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/aa6093a)
  - | 交付物相关细节调整 | [87ae00d](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/87ae00d)
@@ -85,6 +86,18 @@
  - | 细节调整 | [bdd5f87](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/bdd5f87)
  - | 重排代码格式、删除打印 | [83a14c4](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/83a14c4)
  - | calender格式及细节调整 | [db9602b](http://101.201.226.163:3000/TALL/TALL-MUI-4/commits/db9602b)
+=======
+ - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b)
+ - | 交付物相关细节调整 | [87ae00d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/87ae00d)
+ - | 删除打印 | [3e75576](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3e75576)
+ - | 插件样式调整 | [7411d3a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7411d3a)
+ - | 更新代码 | [aa6093a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa6093a)
+ - | 细节调整 | [a43fa83](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a43fa83)
+ - | 细节调整 | [ebf678f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf678f)
+ - | 细节调整 | [759ef52](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/759ef52)
+ - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87)
+ - | 重排代码格式、删除打印 | [83a14c4](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/83a14c4)
+>>>>>>> 4ace5a93044579bb1672a6aa69c7b0734c1ceba7
 
 
 ### 🐛 Bug 修复

plugins/p-finance-audit/p-finance-audit.vue

@@ -15,7 +15,7 @@ const { projectId, projectName, token } = useGenerateWebviewParam();
 // DEBUG:打开财务审批详情页
 function openAudit() {
   uni.$ui.openDetail({
-    url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}`,
+    url: `http://121.36.3.207/finance/index?name=财务审批&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`,
     name: '财务审批',
   });
 }
@@ -23,7 +23,7 @@ function openAudit() {
 // DEBUG:打开财务统计详情页
 function openStatistical() {
   uni.$ui.openDetail({
-    url: `http://121.36.3.207/finance/financial-approval?name=财务统计&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}`,
+    url: `http://121.36.3.207/finance/financial-approval?name=财务统计&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`,
     name: '财务统计',
   });
 }

plugins/p-finance/p-finance.vue

@@ -3,10 +3,16 @@
   <view class="finance-wrap" v-if="data" @click="openFinance">
     <!-- 预算和奖金 -->
     <view class="finance-row">
-      <view class="finance-item" :style="{ width: `${(data.budget * 100) / (data.budget + data.bonus)}%`, 'background-color': '#93C5FD' }">
+      <view
+        class="finance-item"
+        :style="{ width: `${(+data.budget * 100) / (+data.budget + +data.bonus)}%`, 'background-color': '#93C5FD' }"
+      >
         预算{{ data.budget / 100 }}
       </view>
-      <view class="finance-item" :style="{ width: `${(data.bonus * 100) / (data.budget + data.bonus)}%`, 'background-color': '#12c77e' }">
+      <view
+        class="finance-item"
+        :style="{ width: `${(+data.bonus * 100) / (+data.budget + +data.bonus)}%`, 'background-color': '#12c77e' }"
+      >
         奖金{{ data.bonus / 100 }}
       </view>
     </view>
@@ -14,15 +20,15 @@
     <view class="finance-row">
       <view
         class="finance-item"
-        :style="{ width: `${(data.projectExpend * 100) / (data.projectExpend + data.dailyExpend)}%`, 'background-color': '#FBBF24' }"
+        :style="{ width: `${(+data.projectExpend * 100) / (+data.projectExpend + +data.dailyExpend)}%`, 'background-color': '#FBBF24' }"
       >
         项目采购{{ data.dailyExpend / 100 }}
       </view>
       <view
         class="finance-item"
-        :style="{ width: `${(data.dailyExpend * 100) / (data.projectExpend + data.dailyExpend)}%`, 'background-color': '#a1fd93' }"
+        :style="{ width: `${(+data.dailyExpend * 100) / (+data.projectExpend + +data.dailyExpend)}%`, 'background-color': '#a1fd93' }"
       >
-        日常采购{{ data.dailyExpend / 100 }}
+        日常采购{{ +data.dailyExpend / 100 }}
       </view>
     </view>
   </view>
@@ -51,7 +57,9 @@ getFinanceByTaskData();
 // 打开详情页
 function openFinance() {
   // DEBUG: 假数据 换成财务条详情页的地址
-  uni.$ui.openDetail({ url: `http://121.36.3.207/finance/applicant?name=财务&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}` });
+  uni.$ui.openDetail({
+    url: `http://121.36.3.207/finance/applicant?name=财务&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`,
+  });
 }
 </script>
 

plugins/p-source-manage/p-source-manage.vue

@@ -14,7 +14,7 @@ const { projectId, projectName, token } = useGenerateWebviewParam();
 
 function openSourceManage() {
   uni.$ui.openDetail({
-    url: `http://121.36.3.207/finance/index?name=资源管理&token=${token}&projectId=${projectId}&id=${task.id}&pn=${projectName}&tn=${task.name}`,
+    url: `http://121.36.3.207/finance/index?name=资源管理&token=${token}&projectId=${projectId}&id=${task.detailId}&pn=${projectName}&tn=${task.name}`,
     name: '资源管理',
   });
 }