Merge branch 'feature/jq_1' into 'develop'

外呼新接口排班周切换

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!191

src/api/diagnosis.js

@@ -280,3 +280,11 @@ export const getLeisureTime = async (data) => {
     method: 'post',
   });
 };
+
+export const outboundIntention = async (data) => {
+  return request({
+    url: '/diagnose/admin/diagnose/outbound/intention',
+    data: data,
+    method: 'post',
+  });
+};

src/components/common/diagnosis-time.vue

@@ -90,8 +90,8 @@
 </template>
 
 <script>
-  import { updateDiagnosis } from '../../utils/diagnosis';
-  import { getLeisureTime } from '@/api/diagnosis';
+// import { updateDiagnosis } from '../../utils/diagnosis';
+  import { getLeisureTime, outboundIntention } from '@/api/diagnosis';
   import dayjs from 'dayjs';
   let vm = null;
   export default {
@@ -136,8 +136,8 @@
           assistantRemark: '',
         },
         rangeTime: '',
-        startDate:'',
-        endDate:'',
+        startDate: '',
+        endDate: '',
         chooseTime: dayjs(new Date()).format('YYYY-MM-DD'),
         timeChoosetList: [],
         chooseTimeIndex: 1000,
@@ -152,8 +152,7 @@
         },
       };
     },
-    watch: {
-    },
+    watch: {},
     created() {
       vm = this;
       console.log(this.departmentId, 'bizTypebizTypebizType');
@@ -213,12 +212,10 @@
         vm.isClick = true;
         const req = {
           id: this.diagnoseLogId,
-          bizType: this.bizType,
           assistantBeginTime: this.startDate,
           assistantEndTime: this.endDate,
-          assistantRemark: this.model.assistantRemark,
         };
-        updateDiagnosis(req)
+        outboundIntention(req)
           .then(function (res) {
             vm.isClick = false;
             if (res.code == '000000') {

src/views/IM/diagnosis-admin/modal/newScheduling.vue

@@ -586,16 +586,25 @@
           const objParms = {};
           objParms.week = weekV ? weekV : this.week;
           objParms.workId = this.schedulingTypeValue.id;
-          objParms.list = [];
+          // objParms.list = [];
+          const lastData = [];
           const data = this.calendarOptions.events;
+          console.log('data=======', data);
           data.forEach((item) => {
             if (item.week == (weekV ? weekV : this.week)) {
               const obj = {};
               obj.startTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', item.start);
               obj.endTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', item.end);
-              objParms.list.push(obj);
+              lastData.push(obj);
             }
           });
+          console.log('objParms=======', objParms);
+          objParms.list = lastData.filter((item) => {
+            return (
+              item.startTime.split(' ')[1] !== '12:00:00' &&
+              item.startTime.split(' ')[1] !== '17:00:00'
+            );
+          });
           saveDutyRoster(objParms).then((res) => {
             if (res.code === '000000') {
               this.loading = false;
@@ -606,6 +615,7 @@
                 });
               }
               this.isDoIt = false;
+              this.handleInitSearch(true);
             } else {
               this.$message.error(res.message || '排班保存失败');
             }