主管任务审批

src/views/week/SUPTaskApproval/SUPTaskApprovalDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="info">
+  <div v-if="info" class="SUPTaskApprovalDetail">
     <!--        顶部条-->
     <div class="navBarTOP">
       <van-nav-bar
@@ -46,8 +46,20 @@
         :approvalStatus="info.approvalStatus"
         ref="detailItem"></detailItem>
     </div>
+    <div
+      class="newCarList"
+      v-for="(item, index) in info.summaryApprovals"
+      :key="index"
+      v-if="info.summaryApprovals">
+      <div class="newlist">
+        <div class="info">审批人：{{ item.handleUserName }}</div>
+        <div class="info">审批结果：{{ setApprovalStatus(item.approvalStatus) }}</div>
+        <div class="info">审批时间：{{ item.handleTime }}</div>
+        <div class="info">审批意见：{{ item.approvalOpinion }}</div>
+      </div>
+    </div>
     <br />
-    <div class="approvalRemarh" v-if="info.approvalStatus == '1'">
+    <div class="approvalRemarh" v-if="tabVal == '1'">
       <div class="approvalLabel">审批意见</div>
       <div class="remark">
         <van-field
@@ -57,7 +69,7 @@
           placeholder="请输入审批意见" />
       </div>
     </div>
-    <template v-if="info.approvalStatus == '1'">
+    <template v-if="tabVal == '1'">
       <div class="bottomBtn">
         <van-button color="red" round @click="approvalStoreFun('Nopass')">拒绝</van-button>
         <van-button type="primary" round @click="approvalStoreFun('pass')">通过</van-button>
@@ -110,16 +122,25 @@ export default {
       collectionItemLists: [],
       writeAgain: false,
       approvalMessage: '',
+      tabVal: '1',
       //
     };
   },
   created() {
     this.powerGrade = localStorage.getItem('powerGrade');
+    this.tabVal = this.$route.query.tabVal;
     this.getDetailById();
     this.num = 0;
     this.userTodayPlanNum();
   },
   methods: {
+    setApprovalStatus(status) {
+      if (status == '1') {
+        return '通过';
+      } else if (status == '2') {
+        return '拒绝';
+      }
+    },
     pviewFn(val, imgVal) {
       var imgList = [];
       var photos = this.reportTarget.photos[val].photos;
@@ -192,7 +213,7 @@ export default {
       this.$router.replace({
         path: '/SUPTaskApproval',
         query: {
-          tabVal: this.info.approvalStatus == '1' ? '1' : '2',
+          tabVal: this.tabVal,
         },
       });
     },
@@ -340,7 +361,7 @@ export default {
   }
 }
 </style>
-<style>
+<style lang="scss">
 .table-headermd {
   font-size: 1.2rem;
   text-align: center;
@@ -418,4 +439,52 @@ export default {
 .z-cells .van-cell {
   padding-bottom: 0;
 }
+.SUPTaskApprovalDetail {
+  .newCarList {
+    width: 94%;
+    padding: 14px;
+    margin: 0px auto;
+    border-radius: 8px;
+    overflow: hidden;
+    background: #fff;
+    margin-top: 10px;
+  }
+  .newCarList .van-cell {
+    border-radius: 6px;
+    overflow: hidden;
+  }
+  .newCarList .newlist .title {
+    /* line-height: 32px; */
+  }
+  .newCarList .van-cell__right-icon {
+    top: 5px;
+  }
+  .newCarList .newlist {
+    box-sizing: border-box;
+  }
+  .newCarList .newlist .title {
+    font-size: 14px;
+    font-weight: bold;
+    color: #333;
+    padding: 5px 0;
+    /* line-height: 14px; */
+  }
+  .newCarList .newlist .info {
+    font-size: 14px;
+    color: #999;
+    line-height: 26px;
+  }
+  .newCarList .newlist .title p {
+    padding: 0;
+    margin: 0;
+  }
+  .newCarList .newlist .title .textLeft {
+    display: inline-block;
+    /* padding-bottom: 10px; */
+  }
+  .newCarList .newlist .title .textRight {
+    float: right;
+    color: #0057ba;
+  }
+}
 </style>

src/views/week/SUPTaskApproval/detailItem.vue

@@ -89,7 +89,7 @@
               ></template
             >
           </van-cell>
-          <p class="mg0">{{ item.answerValue }}</p>
+          <p class="mg0">{{ item.answerName }}</p>
         </div>
         <div v-if="item.answerType == 'duox'" class="formLabel z-cell">
           <van-cell>
@@ -298,7 +298,7 @@ export default {
     },
     onConfirm(date) {
       this.showCalendar = false;
-      this.collectionItemList[this.dateIndex].answerValue = this.formatDate(date);
+      this.collectionItemList[this.dateIndex].answerName = this.formatDate(date);
     },
     formatter(value) {
       return value.replace(
@@ -307,13 +307,13 @@ export default {
       );
     },
     numberFn(val, index) {
-      if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(this.collectionItemList[index].answerValue)) {
-        this.collectionItemList[index].answerValue = this.collectionItemList[
+      if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(this.collectionItemList[index].answerName)) {
+        this.collectionItemList[index].answerName = this.collectionItemList[
           index
-        ].answerValue.replace(
+        ].answerName.replace(
           /\.\d{2,}$/,
-          this.collectionItemList[index].answerValue.substr(
-            this.collectionItemList[index].answerValue.indexOf('.'),
+          this.collectionItemList[index].answerName.substr(
+            this.collectionItemList[index].answerName.indexOf('.'),
             3
           )
         );
@@ -386,7 +386,7 @@ export default {
       this.collectionAnswerlisd = [];
       this.collectionItemList = JSON.parse(JSON.stringify(this.collectionItemLists));
       for (var q = 0; q < this.collectionItemList.length; q++) {
-        this.collectionItemList[q].answerName = undefined;
+        // this.collectionItemList[q].answerName = undefined;
         // 公司
         // if (
         //   (this.collectionItemList[q].answerType == 'gs' ||
@@ -506,7 +506,7 @@ export default {
       var days = (endData - stratDate) / (1000 * 60 * 60 * 24);
       return days;
     },
-    getDeptInfo(type, grade, answerValue) {
+    getDeptInfo(type, grade, answerName) {
       this.deptForm.type = type;
       if (grade == 'dq') {
         this.deptForm.parentId = this.companyCode;
@@ -520,8 +520,8 @@ export default {
         if (grade == 'dq') {
           if (res.data.region != null) {
             this.regionList = res.data.region;
-            if (answerValue) {
-              let findCompany = this.companyList.find((item) => item.deptName == answerValue);
+            if (answerName) {
+              let findCompany = this.companyList.find((item) => item.deptName == answerName);
               // this.onSalesRegionConfirm(findCompany);
             } else {
               this.onSalesRegionConfirm(this.regionList[0]);
@@ -530,8 +530,8 @@ export default {
         } else if (grade == 'xsb') {
           if (res.data.dept != null) {
             this.deptList = res.data.dept;
-            if (answerValue) {
-              let findCompany = this.regionList.find((item) => item.deptName == answerValue);
+            if (answerName) {
+              let findCompany = this.regionList.find((item) => item.deptName == answerName);
               // this.onSalesDepartmentConfirm(findCompany);
             } else {
               this.onSalesDepartmentConfirm(this.deptList[0]);
@@ -539,8 +539,8 @@ export default {
           }
         } else if (grade == 'gs') {
           this.companyList = res.data.company;
-          if (answerValue) {
-            let findCompany = this.companyList.find((item) => item.deptName == answerValue);
+          if (answerName) {
+            let findCompany = this.companyList.find((item) => item.deptName == answerName);
             // this.onregionConfirm(findCompany);
           } else {
             this.onregionConfirm(this.companyList[0]);
@@ -554,7 +554,7 @@ export default {
         }
       });
     },
-    getDeptsBy(answerValue) {
+    getDeptsBy(answerName) {
       getDeptsByUser().then((res) => {
         if (res.data && res.code == 200) {
           let arr = [];
@@ -569,8 +569,8 @@ export default {
             });
           });
           this.deptList = arr;
-          if (answerValue) {
-            let findCompany = this.regionList.find((item) => item.deptCode == answerValue);
+          if (answerName) {
+            let findCompany = this.regionList.find((item) => item.deptCode == answerName);
             // this.onSalesDepartmentConfirm(findCompany);
           } else {
             this.onSalesDepartmentConfirm(this.deptList[0]);
@@ -637,8 +637,8 @@ export default {
           this.collectionItemList[k1].answerValue = '';
         }
         if (this.collectionItemList[k1].answerType == 'dq') {
-          this.collectionItemList[k1].answerName = val.deptCode;
-          this.collectionItemList[k1].answerValue = val.deptName;
+          this.collectionItemList[k1].answerName = val.deptName;
+          this.collectionItemList[k1].answerValue = val.deptCode;
         }
         if (this.collectionItemList[k1].answerType == 'xsb' && val.deptId != '') {
           this.getDeptInfo('dept', 'xsb');
@@ -658,8 +658,8 @@ export default {
           this.collectionItemList[k1].answerValue = '';
         }
         if (this.collectionItemList[k1].answerType == 'gs') {
-          this.collectionItemList[k1].answerName = val.deptCode;
-          this.collectionItemList[k1].answerValue = val.deptName;
+          this.collectionItemList[k1].answerName = val.deptName;
+          this.collectionItemList[k1].answerValue = val.deptCode;
         }
         if (this.collectionItemList[k1].answerType == 'dq') {
           this.getDeptInfo('dept', 'dq');
@@ -670,8 +670,8 @@ export default {
       this.SalesDepartmentShow = false;
       for (var k1 = 0; k1 < this.collectionItemList.length; k1++) {
         if (this.collectionItemList[k1].answerType == 'xsb') {
-          this.collectionItemList[k1].answerName = val.deptCode;
-          this.collectionItemList[k1].answerValue = val.deptName;
+          this.collectionItemList[k1].answerName = val.deptName;
+          this.collectionItemList[k1].answerValue = val.deptCode;
         }
       }
     },

src/views/week/SUPTaskApproval/index.vue

@@ -71,6 +71,7 @@ export default {
         query: {
           userSummaryId: row.userSummaryId,
           summaryApprovalId: row.summaryApprovalId,
+          tabVal: this.tabVal,
         },
       });
     },

src/views/week/VisitSummary.vue

@@ -210,7 +210,7 @@ export default {
       approvalStatus: {},
     };
   },
-  created() {
+  activated() {
     this.approvalStatus = this.approvalStatusList[0];
     this.userList = [];
     this.formData.startTime = this.getThreeDaysAgo();

src/views/week/VisitSummaryDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="info">
+  <div v-if="info" class="VisitSummaryDetail">
     <!--        顶部条-->
     <div class="navBarTOP">
       <van-nav-bar
@@ -56,6 +56,18 @@
           ref="allowWriteAgainSummary"></allowWriteAgainSummary>
       </template>
     </div>
+    <div
+      class="newCarList"
+      v-for="(item, index) in info.summaryApprovals"
+      :key="index"
+      v-if="info.summaryApprovals">
+      <div class="newlist">
+        <div class="info">审批人：{{ item.handleUserName }}</div>
+        <div class="info">审批结果：{{ setApprovalStatus(item.approvalStatus) }}</div>
+        <div class="info">审批时间：{{ item.handleTime }}</div>
+        <div class="info">审批意见：{{ item.approvalOpinion }}</div>
+      </div>
+    </div>
     <br />
     <!-- 从查询列表来 -->
     <!-- approvalStatus//1-待审批 2-审批通过 3-拒绝待提交 -->
@@ -129,6 +141,13 @@ export default {
     this.userTodayPlanNum();
   },
   methods: {
+    setApprovalStatus(status) {
+      if (status == '1') {
+        return '通过';
+      } else if (status == '2') {
+        return '拒绝';
+      }
+    },
     pviewFn(val, imgVal) {
       var imgList = [];
       var photos = this.reportTarget.photos[val].photos;
@@ -366,7 +385,7 @@ export default {
   }
 }
 </style>
-<style>
+<style lang="scss">
 .table-headermd {
   font-size: 1.2rem;
   text-align: center;
@@ -444,4 +463,53 @@ export default {
 .z-cells .van-cell {
   padding-bottom: 0;
 }
+
+.VisitSummaryDetail {
+  .newCarList {
+    width: 94%;
+    padding: 14px;
+    margin: 0px auto;
+    border-radius: 8px;
+    overflow: hidden;
+    background: #fff;
+    margin-top: 10px;
+  }
+  .newCarList .van-cell {
+    border-radius: 6px;
+    overflow: hidden;
+  }
+  .newCarList .newlist .title {
+    /* line-height: 32px; */
+  }
+  .newCarList .van-cell__right-icon {
+    top: 5px;
+  }
+  .newCarList .newlist {
+    box-sizing: border-box;
+  }
+  .newCarList .newlist .title {
+    font-size: 14px;
+    font-weight: bold;
+    color: #333;
+    padding: 5px 0;
+    /* line-height: 14px; */
+  }
+  .newCarList .newlist .info {
+    font-size: 14px;
+    color: #999;
+    line-height: 26px;
+  }
+  .newCarList .newlist .title p {
+    padding: 0;
+    margin: 0;
+  }
+  .newCarList .newlist .title .textLeft {
+    display: inline-block;
+    /* padding-bottom: 10px; */
+  }
+  .newCarList .newlist .title .textRight {
+    float: right;
+    color: #0057ba;
+  }
+}
 </style>

src/views/week/allowWriteAgainSummary.vue

@@ -90,7 +90,7 @@
               ></template
             >
           </van-cell>
-          <p class="mg0">{{ item.answerValue }}</p>
+          <p class="mg0">{{ item.answerName }}</p>
         </div>
         <div v-if="item.answerType == 'duox'" class="formLabel z-cell">
           <van-cell>
@@ -187,7 +187,7 @@ import uploadImg from '@/components/uploadVTask';
 import deleteUploadImg from '@/components/deleteUploadImg2';
 
 export default {
-  name: 'MyHistoricalWeekly',
+  name: 'allowWriteAgainSummary',
   components: { zRadio, zCheckbox, uploadImg, deleteUploadImg },
   props: {
     collectionItemLists: {
@@ -291,7 +291,7 @@ export default {
     },
     onConfirm(date) {
       this.showCalendar = false;
-      this.collectionItemList[this.dateIndex].answerValue = this.formatDate(date);
+      this.collectionItemList[this.dateIndex].answerName = this.formatDate(date);
     },
     formatter(value) {
       return value.replace(
@@ -300,13 +300,13 @@ export default {
       );
     },
     numberFn(val, index) {
-      if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(this.collectionItemList[index].answerValue)) {
-        this.collectionItemList[index].answerValue = this.collectionItemList[
+      if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(this.collectionItemList[index].answerName)) {
+        this.collectionItemList[index].answerName = this.collectionItemList[
           index
-        ].answerValue.replace(
+        ].answerName.replace(
           /\.\d{2,}$/,
-          this.collectionItemList[index].answerValue.substr(
-            this.collectionItemList[index].answerValue.indexOf('.'),
+          this.collectionItemList[index].answerName.substr(
+            this.collectionItemList[index].answerName.indexOf('.'),
             3
           )
         );
@@ -379,7 +379,7 @@ export default {
       this.collectionAnswerlisd = [];
       this.collectionItemList = JSON.parse(JSON.stringify(this.collectionItemLists));
       for (var q = 0; q < this.collectionItemList.length; q++) {
-        this.collectionItemList[q].answerName = undefined;
+        // this.collectionItemList[q].answerName = undefined;
         // 公司
         // if (
         //   (this.collectionItemList[q].answerType == 'gs' ||
@@ -389,17 +389,17 @@ export default {
         // ) {
         //   this.activaFlag = false;
         //   if (this.collectionItemList[q].answerType == 'xsb') {
-        //     this.getDeptsBy(this.collectionItemList[q].answerValue);
+        //     this.getDeptsBy(this.collectionItemList[q].answerName);
         //     this.getDeptInfo(
         //       'dept',
         //       this.collectionItemList[q].answerType,
-        //       this.collectionItemList[q].answerValue
+        //       this.collectionItemList[q].answerName
         //     );
         //   } else {
         //     this.getDeptInfo(
         //       'dept',
         //       this.collectionItemList[q].answerType,
-        //       this.collectionItemList[q].answerValue
+        //       this.collectionItemList[q].answerName
         //     );
         //   }
         // }
@@ -499,7 +499,7 @@ export default {
       var days = (endData - stratDate) / (1000 * 60 * 60 * 24);
       return days;
     },
-    getDeptInfo(type, grade, answerValue) {
+    getDeptInfo(type, grade, answerName) {
       this.deptForm.type = type;
       if (grade == 'dq') {
         this.deptForm.parentId = this.companyCode;
@@ -513,8 +513,8 @@ export default {
         if (grade == 'dq') {
           if (res.data.region != null) {
             this.regionList = res.data.region;
-            if (answerValue) {
-              let findCompany = this.companyList.find((item) => item.deptName == answerValue);
+            if (answerName) {
+              let findCompany = this.companyList.find((item) => item.deptName == answerName);
               // this.onSalesRegionConfirm(findCompany);
             } else {
               this.onSalesRegionConfirm(this.regionList[0]);
@@ -523,8 +523,8 @@ export default {
         } else if (grade == 'xsb') {
           if (res.data.dept != null) {
             this.deptList = res.data.dept;
-            if (answerValue) {
-              let findCompany = this.regionList.find((item) => item.deptName == answerValue);
+            if (answerName) {
+              let findCompany = this.regionList.find((item) => item.deptName == answerName);
               // this.onSalesDepartmentConfirm(findCompany);
             } else {
               this.onSalesDepartmentConfirm(this.deptList[0]);
@@ -532,8 +532,8 @@ export default {
           }
         } else if (grade == 'gs') {
           this.companyList = res.data.company;
-          if (answerValue) {
-            let findCompany = this.companyList.find((item) => item.deptName == answerValue);
+          if (answerName) {
+            let findCompany = this.companyList.find((item) => item.deptName == answerName);
             // this.onregionConfirm(findCompany);
           } else {
             this.onregionConfirm(this.companyList[0]);
@@ -547,7 +547,7 @@ export default {
         }
       });
     },
-    getDeptsBy(answerValue) {
+    getDeptsBy(answerName) {
       getDeptsByUser().then((res) => {
         if (res.data && res.code == 200) {
           let arr = [];
@@ -562,8 +562,8 @@ export default {
             });
           });
           this.deptList = arr;
-          if (answerValue) {
-            let findCompany = this.regionList.find((item) => item.deptCode == answerValue);
+          if (answerName) {
+            let findCompany = this.regionList.find((item) => item.deptCode == answerName);
             // this.onSalesDepartmentConfirm(findCompany);
           } else {
             this.onSalesDepartmentConfirm(this.deptList[0]);

src/views/week/componVisitSummary.vue

@@ -80,7 +80,7 @@
           </van-cell>
           <van-field
             readonly
-            v-model="item.answerValue"
+            v-model="item.answerName"
             :formatter="formatter"
             :placeholder="item.customName"></van-field>
           <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
@@ -98,7 +98,7 @@
           </van-cell>
           <van-field
             readonly
-            v-model="item.answerValue"
+            v-model="item.answerName"
             :formatter="formatter"
             :placeholder="item.customName"></van-field>
           <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
@@ -116,7 +116,7 @@
           </van-cell>
           <van-field
             readonly
-            v-model="item.answerValue"
+            v-model="item.answerName"
             :formatter="formatter"
             :placeholder="item.customName"></van-field>
           <p style="color: #444; font-size: 12px; margin: 0; padding: 10px 0; text-align: right">
@@ -328,7 +328,7 @@ export default {
     },
     onConfirm(date) {
       this.showCalendar = false;
-      this.collectionItemList[this.dateIndex].answerValue = this.formatDate(date);
+      this.collectionItemList[this.dateIndex].answerName = this.formatDate(date);
     },
     formatter(value) {
       return value.replace(
@@ -337,13 +337,13 @@ export default {
       );
     },
     numberFn(val, index) {
-      if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(this.collectionItemList[index].answerValue)) {
-        this.collectionItemList[index].answerValue = this.collectionItemList[
+      if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(this.collectionItemList[index].answerName)) {
+        this.collectionItemList[index].answerName = this.collectionItemList[
           index
-        ].answerValue.replace(
+        ].answerName.replace(
           /\.\d{2,}$/,
-          this.collectionItemList[index].answerValue.substr(
-            this.collectionItemList[index].answerValue.indexOf('.'),
+          this.collectionItemList[index].answerName.substr(
+            this.collectionItemList[index].answerName.indexOf('.'),
             3
           )
         );
@@ -416,7 +416,6 @@ export default {
       this.collectionAnswerlisd = [];
       this.collectionItemList = JSON.parse(JSON.stringify(this.collectionItemLists));
       for (var q = 0; q < this.collectionItemList.length; q++) {
-        this.collectionItemList[q].answerName = undefined;
         // 公司
         if (
           (this.collectionItemList[q].answerType == 'gs' ||
@@ -426,17 +425,17 @@ export default {
         ) {
           this.activaFlag = false;
           if (this.collectionItemList[q].answerType == 'xsb') {
-            this.getDeptsBy(this.collectionItemList[q].answerValue);
+            this.getDeptsBy(this.collectionItemList[q].answerName);
             this.getDeptInfo(
               'dept',
               this.collectionItemList[q].answerType,
-              this.collectionItemList[q].answerValue
+              this.collectionItemList[q].answerName
             );
           } else {
             this.getDeptInfo(
               'dept',
               this.collectionItemList[q].answerType,
-              this.collectionItemList[q].answerValue
+              this.collectionItemList[q].answerName
             );
           }
         }
@@ -536,7 +535,7 @@ export default {
       var days = (endData - stratDate) / (1000 * 60 * 60 * 24);
       return days;
     },
-    getDeptInfo(type, grade, answerValue) {
+    getDeptInfo(type, grade, answerName) {
       this.deptForm.type = type;
       if (grade == 'dq') {
         this.deptForm.parentId = this.companyCode;
@@ -550,8 +549,8 @@ export default {
         if (grade == 'dq') {
           if (res.data.region != null) {
             this.regionList = res.data.region;
-            if (answerValue) {
-              let findCompany = this.companyList.find((item) => item.deptName == answerValue);
+            if (answerName) {
+              let findCompany = this.companyList.find((item) => item.deptName == answerName);
               // this.onSalesRegionConfirm(findCompany);
             } else {
               this.onSalesRegionConfirm(this.regionList[0]);
@@ -560,8 +559,8 @@ export default {
         } else if (grade == 'xsb') {
           if (res.data.dept != null) {
             this.deptList = res.data.dept;
-            if (answerValue) {
-              let findCompany = this.regionList.find((item) => item.deptName == answerValue);
+            if (answerName) {
+              let findCompany = this.regionList.find((item) => item.deptName == answerName);
               // this.onSalesDepartmentConfirm(findCompany);
             } else {
               this.onSalesDepartmentConfirm(this.deptList[0]);
@@ -569,8 +568,8 @@ export default {
           }
         } else if (grade == 'gs') {
           this.companyList = res.data.company;
-          if (answerValue) {
-            let findCompany = this.companyList.find((item) => item.deptName == answerValue);
+          if (answerName) {
+            let findCompany = this.companyList.find((item) => item.deptName == answerName);
             // this.onregionConfirm(findCompany);
           } else {
             this.onregionConfirm(this.companyList[0]);
@@ -584,7 +583,7 @@ export default {
         }
       });
     },
-    getDeptsBy(answerValue) {
+    getDeptsBy(answerName) {
       getDeptsByUser().then((res) => {
         if (res.data && res.code == 200) {
           let arr = [];
@@ -599,8 +598,8 @@ export default {
             });
           });
           this.deptList = arr;
-          if (answerValue) {
-            let findCompany = this.regionList.find((item) => item.deptCode == answerValue);
+          if (answerName) {
+            let findCompany = this.regionList.find((item) => item.deptCode == answerName);
             // this.onSalesDepartmentConfirm(findCompany);
           } else {
             this.onSalesDepartmentConfirm(this.deptList[0]);