Merge branch 'feature_20260312_周报半月板指标显示配置和首页一样' into uat(dev)

# Conflicts:
#	src/views/home/Atarget.vue
#	src/views/home/Btarget.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/home/Atarget.vue

@@ -380,3 +380,256 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.homeTitle {
+  padding: 6px 16px;
+}
+
+.homeTitle .van-icon__image {
+  width: 1.4em;
+  height: auto;
+}
+
+.container {
+  /* margin: 10px; */
+}
+
+.container .van-collapse-item {
+  margin-bottom: 10px;
+  border-radius: 6px;
+  overflow: hidden;
+}
+
+.progressContentlist {
+  font-size: 14px;
+  border-bottom: 1px dashed #f1f1f1;
+  padding: 10px 0;
+}
+
+.linep p {
+  margin: 10px 0 0 0;
+  font-size: 14px;
+  color: #666;
+}
+
+.leftTitle {
+  background-color: #74a4d9;
+  color: #fff;
+  display: inline-block;
+  padding: 0 4px;
+  border-radius: 2px;
+}
+
+.rightTitle {
+  background-color: #e7b4bb;
+  color: #fff;
+  display: inline-block;
+  padding: 0 4px;
+  border-radius: 2px;
+  white-space: nowrap;
+}
+</style>
+<style lang="scss">
+.myTab .van-tabs__nav--card {
+  margin: 0 !important;
+  border-left: 0;
+  border-right: 0;
+}
+.myTab .van-tabs__wrap,
+.van-tabs__nav--card {
+  height: 39px;
+}
+.myTab .van-tab {
+  line-height: 40px;
+}
+.linep .van-collapse-item__content {
+  color: #666;
+}
+.linep .van-collapse-item__content {
+  color: #666;
+}
+
+.linep .van-cell__title {
+  color: #1e5398;
+  font-weight: 500;
+  font-size: 16px;
+}
+
+.homeCellIcon {
+  line-height: 34px;
+}
+
+.homeTitle .van-cell__title {
+  color: #444;
+  font-size: 16px;
+  font-weight: bold;
+  padding-left: 4px;
+  line-height: 36px;
+  height: 36px;
+}
+
+.updataTime {
+  color: #999;
+  font-size: 12px;
+  text-align: center;
+}
+
+.homeTitle .van-tag--danger {
+  /* border-radius: 20px; */
+}
+
+.van-dialog__confirm,
+.van-dialog__confirm:active {
+  color: #0057ba;
+}
+
+.tipTitleBox p {
+  margin: 0;
+  line-height: 28px;
+  color: #555;
+}
+
+.tipTitleBox .p {
+  color: #555;
+  font-size: 16px;
+  border-bottom: 1px solid #f5f5f5;
+  margin: 0;
+  margin-bottom: 10px;
+  text-align: center;
+  padding: 14px 0px;
+}
+
+.storeTypeHome .van-collapse-item__content {
+  padding: 0;
+}
+
+.storeTypeHome .storeTypeHomeList .van-cell__title {
+  color: #4a4a4a;
+  font-size: 14px;
+}
+
+.storeTypeHome .monthNoVisit {
+  padding: 10px;
+  margin: 10px;
+  border-radius: 5px;
+  background-color: #ebf4ff;
+}
+
+.storeTypeHome .leftContent {
+  padding-right: 68px;
+  position: relative;
+}
+
+.storeTypeHome .monthNoVisitStatstext {
+  font-size: 12px;
+  background-color: #0057ba;
+  position: absolute;
+  right: 0;
+  top: 6px;
+  padding: 2px 6px 2px 12px;
+  border-bottom-left-radius: 60px;
+  border-top-left-radius: 60px;
+  color: #fff;
+}
+.ABtarage {
+  .table-headermd {
+    font-size: 12px;
+    text-align: center;
+    position: initial;
+    width: 98% !important;
+    margin: 0 auto;
+    border-right: 0;
+  }
+  .table-headermdhome {
+    font-size: 14px;
+  }
+  .table-headermdhome th.el-table__cell > .cell {
+    white-space: pre;
+  }
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
+  .table-headermdhome.van-cell {
+    padding: 0 6px;
+    height: 100%;
+  }
+
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
+
+  .table-headermdhometh.el-table__cell:first-child > .cell {
+    text-align: left;
+  }
+
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
+  .table-headermdhome th.el-table__cell {
+    background-color: #fff;
+    color: #444;
+  }
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
+
+  .table-headermdhome.el-table .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
+
+  .table-headermdhome .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    text-align: center;
+  }
+
+  .table-headermd::before {
+    height: 0;
+  }
+
+  .table-headermd .cell,
+  .el-table--border .el-table__cell:first-child .cell {
+    padding: 0 4px;
+  }
+}
+.colBack {
+  width: 100%;
+  height: 100%;
+  display: block;
+  /* overflow: unset; */
+  position: relative;
+  z-index: 2;
+  float: left;
+  z-index: 2;
+  .back {
+    position: absolute;
+    background: rgb(226, 240, 217);
+    height: 100%;
+    display: block;
+    overflow: hidden;
+    /* z-index: 1; */
+    border-radius: 12px;
+    bottom: -4px;
+  }
+  .backLeft {
+    width: 45%;
+    left: -12px;
+  }
+  .backRight {
+    width: 50%;
+    left: calc(50% - 12px);
+  }
+  .van-col {
+    position: relative;
+    z-index: 3;
+  }
+}
+</style>

src/views/home/Btarget.vue

@@ -256,3 +256,256 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.homeTitle {
+  padding: 6px 16px;
+}
+
+.homeTitle .van-icon__image {
+  width: 1.4em;
+  height: auto;
+}
+
+.container {
+  /* margin: 10px; */
+}
+
+.container .van-collapse-item {
+  margin-bottom: 10px;
+  border-radius: 6px;
+  overflow: hidden;
+}
+
+.progressContentlist {
+  font-size: 14px;
+  border-bottom: 1px dashed #f1f1f1;
+  padding: 10px 0;
+}
+
+.linep p {
+  margin: 10px 0 0 0;
+  font-size: 14px;
+  color: #666;
+}
+
+.leftTitle {
+  background-color: #74a4d9;
+  color: #fff;
+  display: inline-block;
+  padding: 0 4px;
+  border-radius: 2px;
+}
+
+.rightTitle {
+  background-color: #e7b4bb;
+  color: #fff;
+  display: inline-block;
+  padding: 0 4px;
+  border-radius: 2px;
+  white-space: nowrap;
+}
+</style>
+<style lang="scss">
+.myTab .van-tabs__nav--card {
+  margin: 0 !important;
+  border-left: 0;
+  border-right: 0;
+}
+.myTab .van-tabs__wrap,
+.van-tabs__nav--card {
+  height: 39px;
+}
+.myTab .van-tab {
+  line-height: 40px;
+}
+.linep .van-collapse-item__content {
+  color: #666;
+}
+.linep .van-collapse-item__content {
+  color: #666;
+}
+
+.linep .van-cell__title {
+  color: #1e5398;
+  font-weight: 500;
+  font-size: 16px;
+}
+
+.homeCellIcon {
+  line-height: 34px;
+}
+
+.homeTitle .van-cell__title {
+  color: #444;
+  font-size: 16px;
+  font-weight: bold;
+  padding-left: 4px;
+  line-height: 36px;
+  height: 36px;
+}
+
+.updataTime {
+  color: #999;
+  font-size: 12px;
+  text-align: center;
+}
+
+.homeTitle .van-tag--danger {
+  /* border-radius: 20px; */
+}
+
+.van-dialog__confirm,
+.van-dialog__confirm:active {
+  color: #0057ba;
+}
+
+.tipTitleBox p {
+  margin: 0;
+  line-height: 28px;
+  color: #555;
+}
+
+.tipTitleBox .p {
+  color: #555;
+  font-size: 16px;
+  border-bottom: 1px solid #f5f5f5;
+  margin: 0;
+  margin-bottom: 10px;
+  text-align: center;
+  padding: 14px 0px;
+}
+
+.storeTypeHome .van-collapse-item__content {
+  padding: 0;
+}
+
+.storeTypeHome .storeTypeHomeList .van-cell__title {
+  color: #4a4a4a;
+  font-size: 14px;
+}
+
+.storeTypeHome .monthNoVisit {
+  padding: 10px;
+  margin: 10px;
+  border-radius: 5px;
+  background-color: #ebf4ff;
+}
+
+.storeTypeHome .leftContent {
+  padding-right: 68px;
+  position: relative;
+}
+
+.storeTypeHome .monthNoVisitStatstext {
+  font-size: 12px;
+  background-color: #0057ba;
+  position: absolute;
+  right: 0;
+  top: 6px;
+  padding: 2px 6px 2px 12px;
+  border-bottom-left-radius: 60px;
+  border-top-left-radius: 60px;
+  color: #fff;
+}
+.ABtarage {
+  .table-headermd {
+    font-size: 12px;
+    text-align: center;
+    position: initial;
+    width: 98% !important;
+    margin: 0 auto;
+    border-right: 0;
+  }
+  .table-headermdhome {
+    font-size: 14px;
+  }
+  .table-headermdhome th.el-table__cell > .cell {
+    white-space: pre;
+  }
+  .table-headermd .el-table__header,
+  .table-headermd .el-table__body {
+    width: 100% !important;
+  }
+  .table-headermdhome.van-cell {
+    padding: 0 6px;
+    height: 100%;
+  }
+
+  .table-headermd th.el-table__cell > .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
+
+  .table-headermdhometh.el-table__cell:first-child > .cell {
+    text-align: left;
+  }
+
+  .table-headermd th.el-table__cell {
+    background-color: #1989fa;
+    color: #fff;
+  }
+  .table-headermdhome th.el-table__cell {
+    background-color: #fff;
+    color: #444;
+  }
+  .table-headermd .el-table__cell {
+    padding: 4px 0;
+  }
+
+  .table-headermdhome.el-table .cell {
+    padding: 0 4px;
+    text-align: center;
+  }
+
+  .table-headermdhome .tipTitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    text-align: center;
+  }
+
+  .table-headermd::before {
+    height: 0;
+  }
+
+  .table-headermd .cell,
+  .el-table--border .el-table__cell:first-child .cell {
+    padding: 0 4px;
+  }
+}
+.colBack {
+  width: 100%;
+  height: 100%;
+  display: block;
+  /* overflow: unset; */
+  position: relative;
+  z-index: 2;
+  float: left;
+  z-index: 2;
+  .back {
+    position: absolute;
+    background: rgb(226, 240, 217);
+    height: 100%;
+    display: block;
+    overflow: hidden;
+    /* z-index: 1; */
+    border-radius: 12px;
+    bottom: -4px;
+  }
+  .backLeft {
+    width: 45%;
+    left: -12px;
+  }
+  .backRight {
+    width: 50%;
+    left: calc(50% - 12px);
+  }
+  .van-col {
+    position: relative;
+    z-index: 3;
+  }
+}
+</style>

src/views/week/doubleHistoricalWeeklyDetils.vue

@@ -3,6 +3,7 @@
     <!--        顶部条-->
     <div class="navBarTOP">
       <van-nav-bar class="navBar" title="半月报详情" left-arrow @click-left="onClickLeft" />
+      <!--      <p style="margin-left: 16px;    font-size: 14px;">{{title}}</p>-->
     </div>
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
@@ -15,53 +16,46 @@
       <van-collapse v-model="activeNames">
         <Atarget :reportInfo="reportTarget"></Atarget>
         <Btarget :reportInfo="reportTarget"></Btarget>
-        <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>
+        <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>
-          </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>
+          </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>
             </div>
-          </van-collapse-item>
-        </template>
+          </div>
+        </van-collapse-item>
       </van-collapse>
       <div
         class="contentContainer"
@@ -100,6 +94,7 @@
             <div style="padding: 10px 0">
               <van-field v-model="item.remarkContent" rows="4" autosize readonly type="textarea" />
             </div>
+            <!-- <p style="text-align: right">点评时间：{{ item.createTime }}</p> -->
           </div>
         </div>
       </div>
@@ -122,6 +117,10 @@
       <van-button type="info" size="small" plain class="Btn1" @click="submint">提交点评</van-button>
     </div>
     <br />
+    <!--    <div class="envelopes" @click="openEnterpriseChat" >-->
+    <!--      <img :src="envelopes">-->
+    <!--      <p>红包奖励</p>-->
+    <!--    </div>-->
     <br /><br />
     <br /><br />
   </div>
@@ -140,15 +139,27 @@ import {
 } from '@/api/index';
 import envelopes from '@/assets/envelopes.png';
 import axios from 'axios';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
-import reportCustom from './reportCustom';
 export default {
   name: 'home',
   components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
     Atarget,
     Btarget,
-    reportCustom,
   },
   data() {
     return {
@@ -191,7 +202,6 @@ export default {
       managerRemarkContent: '',
       isDiy: false,
       type: '-1',
-      JZQuota: false,
       //
     };
   },
@@ -354,10 +364,6 @@ export default {
       });
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         loading1.clear();
-        this.JZQuota = false;
-        if (res.data.postType == 'JZ') {
-          this.JZQuota = true;
-        }
         this.title =
           res.data.deptName + '-' + res.data.postName + '-' + res.data.nickName + '的半月报';
         this.ptitle = res.data.pdeptName + '-' + res.data.ppostName + '-' + res.data.pnickName;

src/views/week/doubleWeekly.vue

@@ -106,6 +106,13 @@ import {
   getReportInfo,
   tsContents,
 } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
 import reportCustom from './reportCustom';
@@ -113,6 +120,13 @@ import reportCustom from './reportCustom';
 export default {
   name: 'home',
   components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
     Atarget,
     Btarget,
     reportCustom,

src/views/week/doubleWeeklyApproval.vue

@@ -15,53 +15,46 @@
       <van-collapse v-model="activeNames">
         <Atarget :reportInfo="reportTarget"></Atarget>
         <Btarget :reportInfo="reportTarget"></Btarget>
-        <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>
+        <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>
-          </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>
+          </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>
             </div>
-          </van-collapse-item>
-        </template>
+          </div>
+        </van-collapse-item>
       </van-collapse>
       <div class="contentContainer">
         <p class="contentContainerTitle">打分 <span>请点亮小星星，一颗小星星代表1分</span></p>
@@ -112,16 +105,28 @@
 
 <script>
 import { double_week_type, updateReport, getDetailById, getReportInfo } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
-import reportCustom from './reportCustom';
 
 export default {
   name: 'home',
   components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
     Atarget,
     Btarget,
-    reportCustom,
   },
   data() {
     return {
@@ -155,8 +160,6 @@ export default {
       updateReport: {},
       weekType: [],
       type: '-1',
-      JZQuota: false,
-      reportTarget: {},
     };
   },
   created() {
@@ -170,7 +173,7 @@ export default {
     $route(to, from) {
       this.powerGrade = localStorage.getItem('powerGrade');
       if (to.path == '/doubleWeeklyApproval') {
-        this.getReportInfo();
+        this.getDetailById();
         this.number == 0;
         this.Content = '';
       }
@@ -264,10 +267,6 @@ export default {
       getDetailById({ reportId: this.$route.query.reportId }).then((res) => {
         loading1.clear();
         if (res.code == 200) {
-          this.JZQuota = false;
-          if (res.data.postType == 'JZ') {
-            this.JZQuota = true;
-          }
           if (res.data.status != '1') {
             this.$dialog
               .alert({

src/views/week/doubleWeeklyDetils.vue

@@ -3,64 +3,62 @@
     <!--        顶部条-->
     <div class="navBarTOP">
       <van-nav-bar class="navBar" title="半月报详情" left-arrow @click-left="onClickLeft" />
+      <!--      <p style="text-align: right;margin-right: 16px;color: #1e5398;">{{title}}</p>-->
     </div>
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
+    <!--    <div class="lineGrey"></div>-->
     <!--        主体内容-->
     <div class="container linep">
       <van-collapse v-model="activeNames">
         <Atarget :reportInfo="reportTarget"></Atarget>
         <Btarget :reportInfo="reportTarget"></Btarget>
-        <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>
+        <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>
-          </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>
+          </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" />
               </div>
             </div>
-          </van-collapse-item>
-        </template>
+          </div>
+        </van-collapse-item>
         <div
           class="contentContainer"
           v-if="reportTarget.status > 1 || reportTarget.reportRemarks != null">
@@ -120,16 +118,28 @@
 <script>
 import history from '@/assets/Icon/history.png';
 import { userTodayPlanNum, loginLog, homeImge, getDetailById, double_week_type } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
-import reportCustom from './reportCustom';
 
 export default {
   name: 'home',
   components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
     Atarget,
     Btarget,
-    reportCustom,
   },
   data() {
     return {

src/views/week/weekly.vue

@@ -148,15 +148,37 @@
 </template>
 <script>
 import { updateReport, getReportInfo, getDetailById, tsContents } from '@/api/index';
-import reportCustom from './reportCustom';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import cizhuanjiaoSAP from '@/views/componentsTarget/cizhuanjiaoSAP';
+import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
+import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
+import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
+import reportCustom from '@/views/week/reportCustom';
 export default {
   name: 'home',
   components: {
-    reportCustom,
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
+    cizhuanjiaoSAP,
+    neiqiangzhonggaoduanSAP,
+    moshouqiSAP,
+    fangshuiSAP,
     Atarget,
     Btarget,
+    reportCustom,
   },
   data() {
     return {

src/views/week/weeklyApproval.vue

@@ -17,87 +17,74 @@
           <Atarget :reportInfo="reportTarget"></Atarget>
           <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
-        <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">
+        <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(item.contentTime, 0)
+                    weeklyTimeDivision(item2.contentTime, 0)
                   }}</span
-                  ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
+                  ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
                 </p>
-                <p v-if="index < 7">
-                  <span class="colorbalck">上午:</span>{{ item.weekContentAm }}
+                <p>
+                  <span class="colorbalck">上午:</span
+                  >{{ reportContentsList1[index2].weekContentAm }}
                 </p>
-                <p v-if="index < 7">
-                  <span class="colorbalck">下午:</span>{{ item.weekContentPm }}
+                <p>
+                  <span class="colorbalck">下午:</span
+                  >{{ reportContentsList1[index2].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>
+                <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>
-          </van-collapse-item>
-        </template>
+          </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>
       <div class="contentContainer">
         <p class="contentContainerTitle">打分 <span>请点亮小星星，一颗小星星代表1分</span></p>
@@ -146,12 +133,34 @@
 
 <script>
 import { updateReport, getDetailById } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import cizhuanjiaoSAP from '@/views/componentsTarget/cizhuanjiaoSAP';
+import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
+import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
+import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
-import reportCustom from './reportCustom';
+import reportCustom from '@/views/week/reportCustom';
 export default {
   name: 'weeklyApproval',
   components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
+    cizhuanjiaoSAP,
+    neiqiangzhonggaoduanSAP,
+    moshouqiSAP,
+    fangshuiSAP,
     Atarget,
     Btarget,
     reportCustom,

src/views/week/weeklyApprovalDetils.vue

@@ -17,87 +17,74 @@
           <Atarget :reportInfo="reportTarget"></Atarget>
           <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
-        <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">
+        <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(item.contentTime, 0)
+                    weeklyTimeDivision(item2.contentTime, 0)
                   }}</span
-                  ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
+                  ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
                 </p>
-                <p v-if="index < 7">
-                  <span class="colorbalck">上午:</span>{{ item.weekContentAm }}
+                <p>
+                  <span class="colorbalck">上午:</span
+                  >{{ reportContentsList1[index2].weekContentAm }}
                 </p>
-                <p v-if="index < 7">
-                  <span class="colorbalck">下午:</span>{{ item.weekContentPm }}
+                <p>
+                  <span class="colorbalck">下午:</span
+                  >{{ reportContentsList1[index2].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>
+                <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>
-          </van-collapse-item>
-        </template>
+          </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>
         <div
           class="contentContainer"
           v-if="reportTarget.status > 1 || reportTarget.reportRemarks != null">
@@ -160,13 +147,35 @@
 <script>
 import history from '@/assets/Icon/history.png';
 import { userTodayPlanNum, loginLog, homeImge, getDetailById } from '@/api/index';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import cizhuanjiaoSAP from '@/views/componentsTarget/cizhuanjiaoSAP';
+import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
+import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
+import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
-import reportCustom from './reportCustom';
+import reportCustom from '@/views/week/reportCustom';
 
 export default {
   name: 'home',
   components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
+    cizhuanjiaoSAP,
+    neiqiangzhonggaoduanSAP,
+    moshouqiSAP,
+    fangshuiSAP,
     Atarget,
     Btarget,
     reportCustom,

src/views/week/weeklyHistoricalDetils.vue

@@ -18,87 +18,74 @@
           <Atarget :reportInfo="reportTarget"></Atarget>
           <Btarget :reportInfo="reportTarget"></Btarget>
         </template>
-        <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">
+        <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(item.contentTime, 0)
+                    weeklyTimeDivision(item2.contentTime, 0)
                   }}</span
-                  ><span>{{ weeklyTimeDivision(item.contentTime, 1) }}</span>
+                  ><span>{{ weeklyTimeDivision(item2.contentTime, 1) }}</span>
                 </p>
-                <p v-if="index < 7">
-                  <span class="colorbalck">上午:</span>{{ item.weekContentAm }}
+                <p>
+                  <span class="colorbalck">上午:</span
+                  >{{ reportContentsList1[index2].weekContentAm }}
                 </p>
-                <p v-if="index < 7">
-                  <span class="colorbalck">下午:</span>{{ item.weekContentPm }}
+                <p>
+                  <span class="colorbalck">下午:</span
+                  >{{ reportContentsList1[index2].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>
+                <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>
-          </van-collapse-item>
-        </template>
+          </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>
       <div
         class="contentContainer"
@@ -172,12 +159,34 @@ import history from '@/assets/Icon/history.png';
 import { loginLog, insertRemark, getDetailById, updateReport } from '@/api/index';
 import envelopes from '@/assets/envelopes.png';
 import axios from 'axios';
+import createStoreBJ from '@/views/componentsTarget/createStoreBJ';
+import ZYPlaceOrder from '@/views/componentsTarget/ZYPlaceOrder';
+import performanceSAP from '@/views/componentsTarget/performanceSAP';
+import ZYSAP from '@/views/componentsTarget/ZYSAP';
+import veryGoodPlaceOrder from '@/views/componentsTarget/veryGoodPlaceOrder';
+import neiwaiqiangpingtu from '@/views/componentsTarget/neiwaiqiangpingtu';
+import zhiganwaiqiangSAP from '@/views/componentsTarget/zhiganwaiqiangSAP';
+import cizhuanjiaoSAP from '@/views/componentsTarget/cizhuanjiaoSAP';
+import neiqiangzhonggaoduanSAP from '@/views/componentsTarget/neiqiangzhonggaoduanSAP';
+import moshouqiSAP from '@/views/componentsTarget/moshouqiSAP';
+import fangshuiSAP from '@/views/componentsTarget/fangshuiSAP';
 import Atarget from '@/views/home/Atarget.vue';
 import Btarget from '@/views/home/Btarget.vue';
-import reportCustom from './reportCustom';
+import reportCustom from '@/views/week/reportCustom';
 export default {
   name: 'home',
   components: {
+    createStoreBJ,
+    ZYPlaceOrder,
+    performanceSAP,
+    ZYSAP,
+    veryGoodPlaceOrder,
+    neiwaiqiangpingtu,
+    zhiganwaiqiangSAP,
+    cizhuanjiaoSAP,
+    neiqiangzhonggaoduanSAP,
+    moshouqiSAP,
+    fangshuiSAP,
     Atarget,
     Btarget,
     reportCustom,

vue.config.js

@@ -6,6 +6,7 @@ function resolve(dir) {
 const name = process.env.VUE_APP_TITLE || '门店拜访'; // 网页标题
 const port = 8888; // 端口
 module.exports = {
+  parallel: false, // 强制关闭多线程构建
   // publicPath: process.env.NODE_ENV === "production" ? "/mobile/" : "/",
   publicPath: '/mobile/',
   outputDir: 'mobile',