Merge branch 'feature_20260319_生动化陈列照片最少数量限制' into uat(dev)

# Conflicts:
#	src/views/week/daily.vue
#	src/views/week/dailyApproval.vue
#	src/views/week/dailyDetails.vue
#	src/views/week/dailyHistoricalDetails.vue
#	src/views/week/doubleHistoricalWeeklyDetils.vue
#	src/views/week/doubleWeekly.vue
#	src/views/week/doubleWeeklyApproval.vue
#	src/views/week/doubleWeeklyDetils.vue
#	src/views/week/weekly.vue
#	src/views/week/weeklyApproval.vue
#	src/views/week/weeklyApprovalDetils.vue
#	src/views/week/weeklyHistoricalDetils.vue

src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -619,7 +619,7 @@ export default {
           ...list[taskType5Index],
           taskIds: taskIds,
         };
-        taskType5.taskName = '生动化陈列（勿拍店招，最少上传3张）';
+        taskType5.taskName = '生动化陈列（拍全产品和道具）';
         taskTypeArr.splice(taskType5Index, 0, taskType5);
       }
       console.log(taskTypeArr);

src/views/deviceWithin/taskPhotoTaking.vue

@@ -29,7 +29,7 @@
                     <span class="headlineTitle"
                       >上传照片
                       <span v-if="formData.sdhclPhotoNum" style="color: red">
-                        (拍全产品+道具，至少{{ formData.sdhclPhotoNum }}张)
+                        (拍全产品和道具，至少{{ formData.sdhclPhotoNum }}张)
                       </span>
                     </span>
                   </div>

src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -18,7 +18,6 @@
         <Btarget :reportInfo="reportTarget"></Btarget>
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
-
           <reportCustom
             ref="reportCustom"
             :disabled="true"
@@ -28,6 +27,7 @@
           <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
@@ -46,6 +46,22 @@
                     readonly
                     type="textarea" />
                 </div>
+                <<<<<<< HEAD =======
+              </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">
+                <div style="padding: 10px 0; min-height: 32px" class="contentContainer">
+                  <van-field
+                    v-model="item2.doubleWeekContent"
+                    rows="4"
+                    autosize
+                    readonly
+                    type="textarea" />
+                </div>
+                >>>>>>> feature_20260319_生动化陈列照片最少数量限制
               </div>
             </div>
           </van-collapse-item>
@@ -155,6 +171,7 @@ export default {
     zhiganwaiqiangSAP,
     Atarget,
     Btarget,
+    reportCustom,
   },
   data() {
     return {

src/views/week/doubleWeekly.vue

@@ -30,7 +30,6 @@
         <Atarget :reportInfo="reportTarget"></Atarget>
         <Btarget :reportInfo="reportTarget"></Btarget>
         <!-- isHistory 是否为历史汇报：0-新汇报 1-历史汇报 -->
-
         <div class="contentContainer" v-if="reportTarget.isHistory == '0'">
           <reportCustom
             ref="reportCustom"
@@ -43,6 +42,8 @@
             </template>
             <div style="margin-top: -10px">
               <div class="weekContent" v-for="(item2, index2) in reportContentsList2" :key="index2">
+                <!--              <p class="texttitle"><span class="opint"></span><span>{{ item2.title }}</span><span-->
+                <!--                  class="colorRed">(必填)</span></p>-->
                 <p class="texttitle texttitle2">计划工作进度</p>
                 <p class="contentContainerp1">
                   <van-field
@@ -53,6 +54,7 @@
                     :formatter="formatter"
                     type="textarea" />
                 </p>
+                <!--              <p style="min-height: 32px;">{{ reportContentsList3[index2].doubleWeekContent }}</p>-->
                 <p class="texttitle texttitle2">实际工作进度</p>
                 <p class="contentContainerp">
                   <van-field

src/views/week/doubleWeeklyApproval.vue

@@ -172,6 +172,7 @@ export default {
       updateReport: {},
       weekType: [],
       type: '-1',
+      JZQuota: false,
       reportTarget: {},
     };
   },

src/views/week/doubleWeeklyDetils.vue

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

src/views/week/weekly.vue

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