Merge branch 'feature_20260228_周报半月报动态配置' into uat(dev)

# Conflicts:
#	src/views/week/doubleHistoricalWeeklyDetils.vue
#	src/views/week/doubleWeeklyApproval.vue
#	src/views/week/doubleWeeklyDetils.vue
#	src/views/week/weeklyApproval.vue
#	src/views/week/weeklyApprovalDetils.vue
#	src/views/week/weeklyHistoricalDetils.vue

src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -16,46 +16,40 @@
       <van-collapse v-model="activeNames">
         <Atarget :reportInfo="reportTarget"></Atarget>
         <Btarget :reportInfo="reportTarget"></Btarget>
-        <van-collapse-item title="上期工作成果" name="7">
-          <div style="margin-top: -10px">
-            <div v-for="(item, index) in reportContentsList2" :key="index">
-              <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item.doubleWeekType)}}</span></p>-->
-              <p class="texttitle texttitle2">计划工作进度</p>
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="reportContentsList1[index].doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-              <p class="texttitle texttitle2">实际工作进度</p>
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="item.doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-            </div>
-          </div>
-        </van-collapse-item>
-        <van-collapse-item title="本期工作规划" name="8">
-          <div style="margin-top: -10px">
-            <div v-for="(item2, index2) in reportContentsList3" :key="index2">
-              <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item2.doubleWeekType)}}</span></p>-->
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="item2.doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
+        <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
+          <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
+
+          <reportCustom
+            ref="reportCustom"
+            :disabled="true"
+            :reportCustomData="reportTarget.customTaskList"></reportCustom>
+        </div>
+        <template v-else>
+          <van-collapse-item title="上期工作成果" name="7">
+            <div style="margin-top: -10px">
+              <div v-for="(item, index) in reportContentsList2" :key="index">
+                <p class="texttitle texttitle2">计划工作进度</p>
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="reportContentsList1[index].doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+                <p class="texttitle texttitle2">实际工作进度</p>
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="item.doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
               </div>
             </div>
-          </div>
-        </van-collapse-item>
+          </van-collapse-item>
+        </template>
       </van-collapse>
       <div
         class="contentContainer"

src/views/week/doubleWeekly.vue

@@ -30,6 +30,7 @@
         <Atarget :reportInfo="reportTarget"></Atarget>
         <Btarget :reportInfo="reportTarget"></Btarget>
         <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
+
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <reportCustom
             ref="reportCustom"

src/views/week/doubleWeeklyApproval.vue

@@ -15,46 +15,56 @@
       <van-collapse v-model="activeNames">
         <Atarget :reportInfo="reportTarget"></Atarget>
         <Btarget :reportInfo="reportTarget"></Btarget>
-        <van-collapse-item title="上期工作成果" name="7">
-          <div style="margin-top: -10px">
-            <div v-for="(item, index) in reportContentsList2" :key="index">
-              <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item.doubleWeekType)}}</span></p>-->
-              <p class="texttitle texttitle2">计划工作进度</p>
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="reportContentsList1[index].doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-              <p class="texttitle texttitle2">实际工作进度</p>
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="item.doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
+        <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
+          <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
+
+          <reportCustom
+            ref="reportCustom"
+            :disabled="true"
+            :reportCustomData="reportTarget.customTaskList"></reportCustom>
+        </div>
+        <template v-else>
+          <van-collapse-item title="上期工作成果" name="7">
+            <div style="margin-top: -10px">
+              <div v-for="(item, index) in reportContentsList2" :key="index">
+                <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item.doubleWeekType)}}</span></p>-->
+                <p class="texttitle texttitle2">计划工作进度</p>
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="reportContentsList1[index].doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+                <p class="texttitle texttitle2">实际工作进度</p>
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="item.doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
               </div>
             </div>
-          </div>
-        </van-collapse-item>
-        <van-collapse-item title="本期工作规划" name="8">
-          <div style="margin-top: -10px">
-            <div v-for="(item2, index2) in reportContentsList3" :key="index2">
-              <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item2.doubleWeekType)}}</span></p>-->
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="item2.doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
+          </van-collapse-item>
+          <van-collapse-item title="本期工作规划" name="8">
+            <div style="margin-top: -10px">
+              <div v-for="(item2, index2) in reportContentsList3" :key="index2">
+                <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item2.doubleWeekType)}}</span></p>-->
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="item2.doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
               </div>
             </div>
-          </div>
-        </van-collapse-item>
+          </van-collapse-item>
+        </template>
       </van-collapse>
       <div class="contentContainer">
         <p class="contentContainerTitle">打分 <span>请点亮小星星，一颗小星星代表1分</span></p>

src/views/week/doubleWeeklyDetils.vue

@@ -16,49 +16,59 @@
       <van-collapse v-model="activeNames">
         <Atarget :reportInfo="reportTarget"></Atarget>
         <Btarget :reportInfo="reportTarget"></Btarget>
-        <van-collapse-item title="上期工作成果" name="7">
-          <div style="margin-top: -10px">
-            <div v-for="(item, index) in reportContentsList2" :key="index">
-              <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item.doubleWeekType)}}</span></p>-->
-              <p class="texttitle texttitle2">计划工作进度</p>
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="reportContentsList1[index].doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-              <!--              <p  style="min-height: 32px;">{{reportContentsList1[index].doubleWeekContent}}</p>-->
-              <p class="texttitle texttitle2">实际工作进度</p>
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="item.doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
+        <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
+          <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
+
+          <reportCustom
+            ref="reportCustom"
+            :disabled="true"
+            :reportCustomData="reportTarget.customTaskList"></reportCustom>
+        </div>
+        <template v-else>
+          <van-collapse-item title="上期工作成果" name="7">
+            <div style="margin-top: -10px">
+              <div v-for="(item, index) in reportContentsList2" :key="index">
+                <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item.doubleWeekType)}}</span></p>-->
+                <p class="texttitle texttitle2">计划工作进度</p>
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="reportContentsList1[index].doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+                <!--              <p  style="min-height: 32px;">{{reportContentsList1[index].doubleWeekContent}}</p>-->
+                <p class="texttitle texttitle2">实际工作进度</p>
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="item.doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+                <!--              <p>{{}}</p>-->
               </div>
-              <!--              <p>{{}}</p>-->
             </div>
-          </div>
-        </van-collapse-item>
-        <van-collapse-item title="本期工作规划" name="8">
-          <div style="margin-top: -10px">
-            <div v-for="(item2, index2) in reportContentsList3" :key="index2">
-              <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item2.doubleWeekType)}}</span></p>-->
-              <!--              <p>{{item2.doubleWeekContent}}</p>-->
-              <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
-                <van-field
-                  v-model="item2.doubleWeekContent"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
+          </van-collapse-item>
+          <van-collapse-item title="本期工作规划" name="8">
+            <div style="margin-top: -10px">
+              <div v-for="(item2, index2) in reportContentsList3" :key="index2">
+                <!--              <p class="texttitle"><span class="opint"></span><span>{{selectDictLabel(weekType,item2.doubleWeekType)}}</span></p>-->
+                <!--              <p>{{item2.doubleWeekContent}}</p>-->
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="item2.doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
               </div>
             </div>
-          </div>
-        </van-collapse-item>
+          </van-collapse-item>
+        </template>
         <div
           class="contentContainer"
           v-if="reportTarget.status > 1 || reportTarget.reportRemarks != null">

src/views/week/weekly.vue

@@ -33,6 +33,7 @@
           <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
         <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
+
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <reportCustom
             ref="reportCustom"

src/views/week/weeklyApproval.vue

@@ -17,74 +17,88 @@
           <Atarget :reportInfo="reportTarget"></Atarget>
           <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
-        <van-collapse-item title="上周工作成果" name="8">
-          <div style="margin-top: -10px">
-            <div v-for="(item2, index2) in reportContentsList2" :key="index2">
-              <div v-if="index2 < 7">
-                <p class="texttitle">
+        <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
+          <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
+
+          <reportCustom
+            ref="reportCustom"
+            :disabled="true"
+            :reportCustomData="reportTarget.customTaskList"></reportCustom>
+        </div>
+        <template v-else>
+          <van-collapse-item title="上周工作成果" name="8">
+            <div style="margin-top: -10px">
+              <div v-for="(item2, index2) in reportContentsList2" :key="index2">
+                <div v-if="index2 < 7">
+                  <p class="texttitle">
+                    <span class="opint"></span
+                    ><span v-if="!reportTarget.hideWeekDate">{{
+                      weeklyTimeDivision(item2.contentTime, 0)
+                    }}</span
+                    ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
+                  </p>
+                  <p>
+                    <span class="colorbalck">上午:</span
+                    >{{ reportContentsList1[index2].weekContentAm }}
+                  </p>
+                  <p>
+                    <span class="colorbalck">下午:</span
+                    >{{ reportContentsList1[index2].weekContentPm }}
+                  </p>
+                  <p class="texttitle texttitle2">实际工作进度</p>
+                  <p><span class="colorbalck">上午:</span>{{ item2.weekContentAm }}</p>
+                  <p><span class="colorbalck">下午:</span>{{ item2.weekContentPm }}</p>
+                </div>
+                <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作重点</p>
+                <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="reportContentsList1[index2].weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+                <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作成果</p>
+                <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="item2.weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+              </div>
+            </div>
+          </van-collapse-item>
+          <van-collapse-item title="本周工作规划" name="9">
+            <div style="margin-top: -10px">
+              <div v-for="(item, index) in reportContentsList3" :key="index">
+                <p v-if="index < 7" class="texttitle">
                   <span class="opint"></span
                   ><span v-if="!reportTarget.hideWeekDate">{{
-                    weeklyTimeDivision(item2.contentTime, 0)
+                    weeklyTimeDivision(item.contentTime, 0)
                   }}</span
-                  ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
+                  ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
                 </p>
-                <p>
-                  <span class="colorbalck">上午:</span
-                  >{{ reportContentsList1[index2].weekContentAm }}
+                <p v-if="index < 7">
+                  <span class="colorbalck">上午:</span>{{ item.weekContentAm }}
                 </p>
-                <p>
-                  <span class="colorbalck">下午:</span
-                  >{{ reportContentsList1[index2].weekContentPm }}
+                <p v-if="index < 7">
+                  <span class="colorbalck">下午:</span>{{ item.weekContentPm }}
                 </p>
-                <p class="texttitle texttitle2">实际工作进度</p>
-                <p><span class="colorbalck">上午:</span>{{ item2.weekContentAm }}</p>
-                <p><span class="colorbalck">下午:</span>{{ item2.weekContentPm }}</p>
-              </div>
-              <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作重点</p>
-              <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="reportContentsList1[index2].weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-              <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作成果</p>
-              <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="item2.weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-            </div>
-          </div>
-        </van-collapse-item>
-        <van-collapse-item title="本周工作规划" name="9">
-          <div style="margin-top: -10px">
-            <div v-for="(item, index) in reportContentsList3" :key="index">
-              <p v-if="index < 7" class="texttitle">
-                <span class="opint"></span
-                ><span v-if="!reportTarget.hideWeekDate">{{
-                  weeklyTimeDivision(item.contentTime, 0)
-                }}</span
-                ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
-              </p>
-              <p v-if="index < 7"><span class="colorbalck">上午:</span>{{ item.weekContentAm }}</p>
-              <p v-if="index < 7"><span class="colorbalck">下午:</span>{{ item.weekContentPm }}</p>
-              <p v-if="index == 7" class="texttitle"><span class="opint"></span>本周工作重点</p>
-              <div v-if="index == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="item.weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
+                <p v-if="index == 7" class="texttitle"><span class="opint"></span>本周工作重点</p>
+                <div v-if="index == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="item.weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
               </div>
             </div>
-          </div>
-        </van-collapse-item>
+          </van-collapse-item>
+        </template>
       </van-collapse>
       <div class="contentContainer">
         <p class="contentContainerTitle">打分 <span>请点亮小星星，一颗小星星代表1分</span></p>

src/views/week/weeklyApprovalDetils.vue

@@ -17,74 +17,88 @@
           <Atarget :reportInfo="reportTarget"></Atarget>
           <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
-        <van-collapse-item title="上周工作成果" name="8">
-          <div style="margin-top: -10px">
-            <div v-for="(item2, index2) in reportContentsList2" :key="index2">
-              <div v-if="index2 < 7">
-                <p class="texttitle">
+        <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
+          <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
+
+          <reportCustom
+            ref="reportCustom"
+            :disabled="true"
+            :reportCustomData="reportTarget.customTaskList"></reportCustom>
+        </div>
+        <template v-else>
+          <van-collapse-item title="上周工作成果" name="8">
+            <div style="margin-top: -10px">
+              <div v-for="(item2, index2) in reportContentsList2" :key="index2">
+                <div v-if="index2 < 7">
+                  <p class="texttitle">
+                    <span class="opint"></span
+                    ><span v-if="!reportTarget.hideWeekDate">{{
+                      weeklyTimeDivision(item2.contentTime, 0)
+                    }}</span
+                    ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
+                  </p>
+                  <p>
+                    <span class="colorbalck">上午:</span
+                    >{{ reportContentsList1[index2].weekContentAm }}
+                  </p>
+                  <p>
+                    <span class="colorbalck">下午:</span
+                    >{{ reportContentsList1[index2].weekContentPm }}
+                  </p>
+                  <p class="texttitle texttitle2">实际工作进度</p>
+                  <p><span class="colorbalck">上午:</span>{{ item2.weekContentAm }}</p>
+                  <p><span class="colorbalck">下午:</span>{{ item2.weekContentPm }}</p>
+                </div>
+                <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作重点</p>
+                <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="reportContentsList1[index2].weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+                <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作成果</p>
+                <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="item2.weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+              </div>
+            </div>
+          </van-collapse-item>
+          <van-collapse-item title="本周工作规划" name="9">
+            <div style="margin-top: -10px">
+              <div v-for="(item, index) in reportContentsList3" :key="index">
+                <p v-if="index < 7" class="texttitle">
                   <span class="opint"></span
                   ><span v-if="!reportTarget.hideWeekDate">{{
-                    weeklyTimeDivision(item2.contentTime, 0)
+                    weeklyTimeDivision(item.contentTime, 0)
                   }}</span
-                  ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
+                  ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
                 </p>
-                <p>
-                  <span class="colorbalck">上午:</span
-                  >{{ reportContentsList1[index2].weekContentAm }}
+                <p v-if="index < 7">
+                  <span class="colorbalck">上午:</span>{{ item.weekContentAm }}
                 </p>
-                <p>
-                  <span class="colorbalck">下午:</span
-                  >{{ reportContentsList1[index2].weekContentPm }}
+                <p v-if="index < 7">
+                  <span class="colorbalck">下午:</span>{{ item.weekContentPm }}
                 </p>
-                <p class="texttitle texttitle2">实际工作进度</p>
-                <p><span class="colorbalck">上午:</span>{{ item2.weekContentAm }}</p>
-                <p><span class="colorbalck">下午:</span>{{ item2.weekContentPm }}</p>
-              </div>
-              <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作重点</p>
-              <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="reportContentsList1[index2].weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-              <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作成果</p>
-              <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="item2.weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
+                <p v-if="index == 7" class="texttitle"><span class="opint"></span>本周工作重点</p>
+                <div v-if="index == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="item.weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
               </div>
             </div>
-          </div>
-        </van-collapse-item>
-        <van-collapse-item title="本周工作规划" name="9">
-          <div style="margin-top: -10px">
-            <div v-for="(item, index) in reportContentsList3" :key="index">
-              <p v-if="index < 7" class="texttitle">
-                <span class="opint"></span
-                ><span v-if="!reportTarget.hideWeekDate">{{
-                  weeklyTimeDivision(item.contentTime, 0)
-                }}</span
-                ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
-              </p>
-              <p v-if="index < 7"><span class="colorbalck">上午:</span>{{ item.weekContentAm }}</p>
-              <p v-if="index < 7"><span class="colorbalck">下午:</span>{{ item.weekContentPm }}</p>
-              <p v-if="index == 7" class="texttitle"><span class="opint"></span>本周工作重点</p>
-              <div v-if="index == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="item.weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-            </div>
-          </div>
-        </van-collapse-item>
+          </van-collapse-item>
+        </template>
         <div
           class="contentContainer"
           v-if="reportTarget.status > 1 || reportTarget.reportRemarks != null">

src/views/week/weeklyHistoricalDetils.vue

@@ -18,74 +18,88 @@
           <Atarget :reportInfo="reportTarget"></Atarget>
           <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
-        <van-collapse-item title="上周工作成果" name="8">
-          <div style="margin-top: -10px">
-            <div v-for="(item2, index2) in reportContentsList2" :key="index2">
-              <div v-if="index2 < 7">
-                <p class="texttitle">
+        <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
+          <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
+
+          <reportCustom
+            ref="reportCustom"
+            :disabled="true"
+            :reportCustomData="reportTarget.customTaskList"></reportCustom>
+        </div>
+        <template v-else>
+          <van-collapse-item title="上周工作成果" name="8">
+            <div style="margin-top: -10px">
+              <div v-for="(item2, index2) in reportContentsList2" :key="index2">
+                <div v-if="index2 < 7">
+                  <p class="texttitle">
+                    <span class="opint"></span
+                    ><span v-if="!reportTarget.hideWeekDate">{{
+                      weeklyTimeDivision(item2.contentTime, 0)
+                    }}</span
+                    ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
+                  </p>
+                  <p>
+                    <span class="colorbalck">上午:</span
+                    >{{ reportContentsList1[index2].weekContentAm }}
+                  </p>
+                  <p>
+                    <span class="colorbalck">下午:</span
+                    >{{ reportContentsList1[index2].weekContentPm }}
+                  </p>
+                  <p class="texttitle texttitle2">实际工作进度</p>
+                  <p><span class="colorbalck">上午:</span>{{ item2.weekContentAm }}</p>
+                  <p><span class="colorbalck">下午:</span>{{ item2.weekContentPm }}</p>
+                </div>
+                <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作重点</p>
+                <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="reportContentsList1[index2].weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+                <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作成果</p>
+                <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="item2.weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+              </div>
+            </div>
+          </van-collapse-item>
+          <van-collapse-item title="本周工作规划" name="9">
+            <div style="margin-top: -10px">
+              <div v-for="(item, index) in reportContentsList3" :key="index">
+                <p v-if="index < 7" class="texttitle">
                   <span class="opint"></span
                   ><span v-if="!reportTarget.hideWeekDate">{{
-                    weeklyTimeDivision(item2.contentTime, 0)
+                    weeklyTimeDivision(item.contentTime, 0)
                   }}</span
-                  ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
+                  ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
                 </p>
-                <p>
-                  <span class="colorbalck">上午:</span
-                  >{{ reportContentsList1[index2].weekContentAm }}
+                <p v-if="index < 7">
+                  <span class="colorbalck">上午:</span>{{ item.weekContentAm }}
                 </p>
-                <p>
-                  <span class="colorbalck">下午:</span
-                  >{{ reportContentsList1[index2].weekContentPm }}
+                <p v-if="index < 7">
+                  <span class="colorbalck">下午:</span>{{ item.weekContentPm }}
                 </p>
-                <p class="texttitle texttitle2">实际工作进度</p>
-                <p><span class="colorbalck">上午:</span>{{ item2.weekContentAm }}</p>
-                <p><span class="colorbalck">下午:</span>{{ item2.weekContentPm }}</p>
-              </div>
-              <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作重点</p>
-              <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="reportContentsList1[index2].weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-              <p v-if="index2 == 7" class="texttitle"><span class="opint"></span>上周工作成果</p>
-              <div v-if="index2 == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="item2.weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
+                <p v-if="index == 7" class="texttitle"><span class="opint"></span>本周工作重点</p>
+                <div v-if="index == 7" style="padding: 10px 0" class="contentContainer">
+                  <van-field
+                    v-model="item.weekContentSummary"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
               </div>
             </div>
-          </div>
-        </van-collapse-item>
-        <van-collapse-item title="本周工作规划" name="9">
-          <div style="margin-top: -10px">
-            <div v-for="(item, index) in reportContentsList3" :key="index">
-              <p v-if="index < 7" class="texttitle">
-                <span class="opint"></span
-                ><span v-if="!reportTarget.hideWeekDate">{{
-                  weeklyTimeDivision(item.contentTime, 0)
-                }}</span
-                ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
-              </p>
-              <p v-if="index < 7"><span class="colorbalck">上午:</span>{{ item.weekContentAm }}</p>
-              <p v-if="index < 7"><span class="colorbalck">下午:</span>{{ item.weekContentPm }}</p>
-              <p v-if="index == 7" class="texttitle"><span class="opint"></span>本周工作重点</p>
-              <div v-if="index == 7" style="padding: 10px 0" class="contentContainer">
-                <van-field
-                  v-model="item.weekContentSummary"
-                  rows="4"
-                  autosize
-                  readonly
-                  type="textarea" />
-              </div>
-            </div>
-          </div>
-        </van-collapse-item>
+          </van-collapse-item>
+        </template>
       </van-collapse>
       <div
         class="contentContainer"