2022.7.18 octopus考勤设置操作调整

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -169,9 +169,20 @@
         <el-dialog v-if="editDialogF" :visible.sync="editDialogF" title="考勤同步">
             <el-form label-width="200px">
                 <el-form-item label="企业名称"><span>{{dialogData.companyName}}</span></el-form-item>
-                <el-form-item label="企业微信考勤" v-if="dialogData.wxCorpid"><el-button @click="ConfirmF(1)" :loading='FLoading1' size="small" style="margin:0 40px 0">同步</el-button><el-checkbox v-model="dialogData.showCorpwxCardtime">显示打卡时长</el-checkbox></el-form-item>
-                <el-form-item label="钉钉考勤" v-if="dialogData.dingdingCorpid"><el-button @click="ConfirmF(0)" :loading='FLoading0' size="small" style="margin:0 40px 0">同步</el-button><el-checkbox v-model="dialogData.showDdCardtime">显示打卡时长</el-checkbox></el-form-item>
+                <el-form-item label="企业微信" v-if="dialogData.wxCorpid">
+                    <!-- <el-button @click="ConfirmF(1)" :loading='FLoading1' size="small" style="margin:0 40px 0">同步</el-button> -->
+                    <el-checkbox v-model="dialogData.syncCorpwxTime" style="margin:0 40px 0">考勤同步</el-checkbox>
+                    <el-checkbox v-model="dialogData.showCorpwxCardtime">显示打卡时长</el-checkbox>
+                </el-form-item>
+                <el-form-item label="钉钉" v-if="dialogData.dingdingCorpid">
+                    <el-checkbox v-model="dialogData.syncDingding" style="margin:0 40px 0">考勤同步</el-checkbox>
+                    <el-checkbox v-model="dialogData.showDdCardtime">显示打卡时长</el-checkbox>
+                </el-form-item>
             </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="editDialogF = false">取 消</el-button>
+                <el-button type="primary" @click="ConfirmF()">确 定</el-button>
+            </span>
         </el-dialog>
         <!-- 其他设置 -->
         <el-dialog v-if="editDialogG" :visible.sync="editDialogG" title="其他设置">
@@ -206,8 +217,6 @@
                 editDialogG: false,
 
 
-                FLoading0: false,
-                FLoading1: false,
 
                 dialogData: null,
                 // 增加人数上限
@@ -272,6 +281,8 @@
                         if(res.code == 'ok'){
                             this.$set(this.dialogData,'showCorpwxCardtime',res.data.showCorpwxCardtime ? true : false)
                             this.$set(this.dialogData,'showDdCardtime',res.data.showDdCardtime ? true : false)
+                            this.$set(this.dialogData,'syncCorpwxTime',res.data.syncCorpwxTime ? true : false)
+                            this.$set(this.dialogData,'syncDingding',res.data.syncDingding ? true : false)
                         }else{
                             this.$message({
                                 message: res.msg,
@@ -479,36 +490,36 @@
             },
 
             // 考勤同步
-            ConfirmF(e){
+            ConfirmF(){
                 let parameter = {
                     companyId: this.dialogData.id
                 }
-                if(e == 0){
-                    this.FLoading0 = true
-                    parameter.syncDingding = 1
-                    parameter.showDdCardtime = this.dialogData.showDdCardtime ? 1 : 0
-                }else{
-                    this.FLoading1 = true
-                    parameter.syncCorpwxTime = 1
+                if(this.dialogData.wxCorpid){
+                    parameter.syncCorpwxTime = this.dialogData.syncCorpwxTime ? 1 : 0
                     parameter.showCorpwxCardtime = this.dialogData.showCorpwxCardtime ? 1 : 0
                 }
+                if(this.dialogData.dingdingCorpid){
+                    parameter.syncDingding = this.dialogData.syncDingding ? 1 : 0
+                    parameter.showDdCardtime = this.dialogData.showDdCardtime ? 1 : 0
+                }
+                
                 this.http.post('/company/setTimeTypeSetting',parameter,
                 res => {
                     if(res.code == 'ok'){
-                        e == 0 ? this.FLoading0 = false : this.FLoading1 = false
+                        this.editDialogF = false
                         this.$message({
-                            message: e == 0 ? '钉钉考勤同步成功' : '企业微信考勤同步成功',
+                            message: '操作成功',
                             type: 'success'
                         })
                     }else{
-                        e == 0 ? this.FLoading0 = false : this.FLoading1 = false
+                        this.editDialogF = false
                         this.$message({
                             message: res.msg,
                             type: 'error'
                         })
                     }
                 },err => {
-                    e == 0 ? this.FLoading0 = false : this.FLoading1 = false
+                    this.editDialogF = false
                     this.$message({
                         message: err,
                         type: 'error'