Merge remote-tracking branch 'origin/main'

miniprogram/pages/approvalWarning/approvalForm/approvalForm.wxml

@@ -1,9 +1,31 @@
 <!--pages/approvalWarning/approvalForm/approvalForm.wxml-->
 <view class="approval_form_wrap">
     <view class="form_one">
-        <view>提交人：{{fData.header || '暂无'}}</view>
-        <view>提交时间：{{fData.updateTime || '暂无'}}</view>
-        <view>提交指标：{{fData.target || '暂无'}}</view>
+        <view wx:if="{{fData.type === '党务及意识形态' || fData.type === '党风廉政建设'}}">
+            <view>类型：{{fData.type || '暂无'}}</view>
+            <view>目标项：{{fData.target || '暂无'}}</view>
+            <view>目标要求：{{fData.demand || '暂无'}}</view>
+            <view>工作任务：{{fData.detailed || '暂无'}}</view>
+            <view>达标分：{{fData.score || '暂无'}}</view>
+            <view>当前得分：{{fData.nowScore || '暂无'}}</view>
+            <view>考核方式：{{fData.method || '暂无'}}</view>
+            <view>截止时间：{{fData.finishDate || '暂无'}}</view>
+            <view>提交人：{{fData.header || '暂无'}}</view>
+            <view>提交时间：{{fData.updateTime || '暂无'}}</view>
+        </view>
+        <view wx:if="{{fData.type === '季度考核指标' || fData.type === '日常考核指标'}}">
+            <view>类型：{{fData.type || '暂无'}}</view>
+            <view>考核内容：{{fData.target || '暂无'}}</view>
+            <view>考核目标：{{fData.demand || '暂无'}}</view>
+            <view>标准要求：{{fData.method || '暂无'}}</view>
+            <view>工作任务：{{fData.detailed || '暂无'}}</view>
+            <view>达标分：{{fData.score || '暂无'}}</view>
+            <view>当前得分：{{fData.nowScore || '暂无'}}</view>
+            <view>考核类别：{{fData.unit || '暂无'}}</view>
+            <view>考核类别：{{fData.unit || '暂无'}}</view>
+            <view>提交人：{{fData.header || '暂无'}}</view>
+            <view>提交时间：{{fData.updateTime || '暂无'}}</view>
+        </view>
     </view>
     <view class="public_content">
         <view class="public_title">附件信息</view>