Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/contract/index.vue

@@ -227,8 +227,12 @@ async function addEditorSave() {
     startDate: data.startDate ? formatDate(new Date(data.startDate)) : '',
     endDate: data.endDate ? formatDate(new Date(data.endDate)) : '',
     paymentListStr: JSON.stringify(newPaymentPlan.map((item: any) => { 
+      let newItem = { ...item }
+      if(!newItem.billDate) {
+        delete newItem.billDate
+      }
       return {
-        ...item,
+        ...newItem,
         isBilled: item.isBilled ? 1 : 0
       }
     }))

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -690,6 +690,38 @@
             </div>
         </span>
     </div>
+
+    <!-- 发起会议 -->
+    <el-dialog :title="$t('faQiHuiYi')" :visible.sync="meetingVisable" width="500px" :before-close="handleClose" append-to-body>
+        <div class="block">
+            <div>
+                <span class="demonstration">{{ $t('huiYiKaiShiShiJian') }}</span>
+                <el-date-picker
+                v-model="initiateAMeetingForm.startTime"
+                type="datetime"
+                :placeholder="$t('xuanZeRiQiShiJian')"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                clearable
+                default-time="10:00:00">
+                </el-date-picker>
+            </div>
+            <div style="margin-top: 20px">
+                <span class="demonstration">{{ $t('huiYiJieShuShiJian') }}</span>
+                <el-date-picker
+                v-model="initiateAMeetingForm.endTime"
+                type="datetime"
+                :placeholder="$t('xuanZeRiQiShiJian')"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                clearable.
+                default-time="11:00:00">
+                </el-date-picker>
+            </div>
+        </div>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="meetingVisable = false">{{ $t('quXiao') }}</el-button>
+            <el-button type="primary" @click="confirmMeeting()">{{ $t('queDing') }}</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -935,6 +967,12 @@ export default {
         meetingId: '',
         integrationProjectList: [],
         sapServiceList:[],
+        meetingVisable: false,
+        initiateAMeetingForm: {
+            startTime: '',
+            endTime: '',
+            taskId: ''
+        }
     };
   },
   computed: {
@@ -1017,9 +1055,41 @@ export default {
     serviceIdChange() {
         this.refreshData()
     },
+    confirmMeeting() {
+        this.http.post('/task//operateMeeting',{...this.initiateAMeetingForm},
+        res => {
+            if (res.code == "ok") {
+                this.meetingVisable=false,
+                this.$message({
+                    message: this.$t('chengGongFaQiHuiYi'),
+                    type: "success"
+                });
+            } else {
+                this.meetingVisable=false,
+                this.$message({
+                message: res.msg,
+                type: "error"
+                });
+            }
+        },
+        error => {
+            this.meetingVisable=false,
+            this.$message({
+                message: error,
+                type: "error"
+            });
+        });
+    },
     // 触发外层的会议
     meetingCli() {
-        this.$parent.$parent.parentMeetingCli(this.integrationTask.id)
+        // this.$parent.$parent.parentMeetingCli(this.integrationTask.id)
+        this.initiateAMeetingForm = {
+            startTime: '',
+            endTime: '',
+            taskId: this.integrationTask.id
+        }
+
+        this.meetingVisable = true
     },
     // 触发事件
     triggerEvent(obj) {