瀏覽代碼

大门进出控制更新。

zhengqiang 4 年之前
父節點
當前提交
b0477edcad
共有 2 個文件被更改,包括 153 次插入96 次删除
  1. 70 40
      src/views/base/roleCheckOn-detail.vue
  2. 83 56
      src/views/base/rolePersonCheckOn-detail.vue

+ 70 - 40
src/views/base/roleCheckOn-detail.vue

@@ -64,6 +64,7 @@
         </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
+      <el-button type="danger" @click="handleDelete" v-if="formModel.id!=null">删 除</el-button>
       <el-button @click="closeDialog">取 消</el-button>
       <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
     </span>
@@ -77,7 +78,9 @@ export default {
         return {
             ruleValidate: {
             },
-            formModel:{},
+            formModel:{
+                checkTimeRange: []
+            },
             showDialog: true,
             loading: false,
             submitting: false,
@@ -100,55 +103,77 @@ export default {
         
         },
         handleSubmit() {
-        var self = this;
-        this.$refs["form"].validate(valid => {
-            if (valid) {
-            (function() {
-                
-                if(self.formModel.checkTimeRange.length>0){
-                   self.formModel.checkTimeRange = self.formModel.checkTimeRange[0]+","+self.formModel.checkTimeRange[1];
-                }
-                //alert(JSON.stringify(self.formModel))
-                return rolePersonCheckOnApi.save(self.formModel);
-            })().then(function(response) {
-                var jsonData = response.data;
-
-                if (jsonData.result) {
-                self.$message({
-                    message: "保存成功!",
-                    type: "success"
-                });
+            var self = this;
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                (function() {
+                    var formModel = JSON.parse(JSON.stringify(self.formModel));
 
-                self.$emit("close", {
-                    result : true,
-                    data : jsonData.data
-                });
-                } else {
-                self.$message({
-                    message: jsonData.message + "",
-                    type: "warning"
-                });
+                    if(formModel.checkTimeRange.length>0){
+                        formModel.checkTimeRange = formModel.checkTimeRange[0] +","+ formModel.checkTimeRange[1];
+                    }
+
+                    return rolePersonCheckOnApi.save(formModel);
+                })().then(function(response) {
+                    var jsonData = response.data;
+
+                    if (jsonData.result) {
+                    self.$message({
+                        message: "保存成功!",
+                        type: "success"
+                    });
 
-                self.$emit("close", {
-                    result : false
+                    self.$emit("close", {
+                        result : true,
+                        data : jsonData.data
+                    });
+                    } else {
+                    self.$message({
+                        message: jsonData.message + "",
+                        type: "warning"
+                    });
+
+                    self.$emit("close", {
+                        result : false
+                    });
+                    }
                 });
                 }
             });
-            }
-        });
         },
+        handleDelete() {
+            var self = this;
+
+            self.$confirm("是否确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                self.loading = true;
+                rolePersonCheckOnApi.remove(self.formModel.id).then(function (response) {
+                    var jsonData = response.data;
+                    self.loading = false;
+                    if (jsonData.result) {
+                        self.$message({
+                            type: "success",
+                            message: "删除成功!",
+                        });
+
+                        self.$emit("close", false);
+                    }
+                });
+            })
+            .catch(() => {
+                self.loading = false;
+            });
+        }
     },
     mounted: function() {
         var self = this;
-        (function() {
+
         self.loading = true;
 
-        if (self.businessKey.length == 0) {
-            return rolePersonCheckOnApi.create();
-        } else {
-            return rolePersonCheckOnApi.editRole(self.businessKey);
-        }
-        })()
+        rolePersonCheckOnApi.editRole(self.businessKey)
         .then(response => {
             var jsonData = response.data;
             self.loading = false;
@@ -156,9 +181,14 @@ export default {
             if (jsonData.result) {
                 self.formModel = jsonData.data;
                 var checkTimeRange = new Array();
+
                 checkTimeRange[0]=jsonData.data.checkStartTime;
                 checkTimeRange[1]=jsonData.data.checkEndTime
-                self.formModel.checkTimeRange = checkTimeRange;
+
+                if(checkTimeRange[0]!=null && checkTimeRange[1]!=null){
+                    self.formModel.checkTimeRange = checkTimeRange;
+                }
+
                 self.formModel.rolePerson = 0
 
                 var checkOnTimeFlag = jsonData.data.checkOnTimeFlag;

+ 83 - 56
src/views/base/rolePersonCheckOn-detail.vue

@@ -9,7 +9,7 @@
 <template>
     <el-dialog
     :visible.sync="showDialog"
-    title="出入权限配置"
+    title="出入权限配置123"
     :modal-append-to-body="false"
     style="text-align:left;"
     @close="closeDialog"
@@ -64,8 +64,9 @@
         </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog">取 消</el-button>
-      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+        <el-button type="danger" @click="handleDelete" v-if="formModel.id!=null">删 除</el-button>
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
     </span>
     </el-dialog>
 </template>
@@ -76,8 +77,11 @@ export default {
     data(){
         return {
             ruleValidate: {
+                
+            },
+            formModel:{
+                checkTimeRange: []
             },
-            formModel:{},
             showDialog: true,
             loading: false,
             submitting: false,
@@ -88,67 +92,86 @@ export default {
             this.$emit("close", false);
         },
         handleClose(tag) {
-        if(this.formModel.personInfoList.length>1){
-            this.formModel.personInfoList.splice(this.formModel.personInfoList.indexOf(tag), 1);
-        }
-        else{
-            this.$message({
-            message: "人员至少保留一位",
-            type: "error"
-            });
-        } 
-        
+            if(this.formModel.personInfoList.length>1){
+                this.formModel.personInfoList.splice(this.formModel.personInfoList.indexOf(tag), 1);
+            }
+            else{
+                this.$message({
+                message: "人员至少保留一位",
+                type: "error"
+                });
+            }
         },
         handleSubmit() {
-        var self = this;
-        this.$refs["form"].validate(valid => {
-            if (valid) {
-            (function() {
-                
-                if(self.formModel.checkTimeRange.length>0){
-                   self.formModel.checkTimeRange = self.formModel.checkTimeRange[0]+","+self.formModel.checkTimeRange[1];
-                }
-                //alert(JSON.stringify(self.formModel))
-                return rolePersonCheckOnApi.save(self.formModel);
-            })().then(function(response) {
-                var jsonData = response.data;
+            var self = this;
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    (function() {
+                        var formModel = JSON.parse(JSON.stringify(self.formModel));
 
-                if (jsonData.result) {
-                self.$message({
-                    message: "保存成功!",
-                    type: "success"
-                });
+                        if(formModel.checkTimeRange.length>0){
+                            formModel.checkTimeRange = formModel.checkTimeRange[0] +","+ formModel.checkTimeRange[1];
+                        }
 
-                self.$emit("close", {
-                    result : true,
-                    data : jsonData.data
-                });
-                } else {
-                self.$message({
-                    message: jsonData.message + "",
-                    type: "warning"
-                });
+                        return rolePersonCheckOnApi.save(formModel);
+                    })().then(function(response) {
+                        var jsonData = response.data;
 
-                self.$emit("close", {
-                    result : false
-                });
+                        if (jsonData.result) {
+                        self.$message({
+                            message: "保存成功!",
+                            type: "success"
+                        });
+
+                        self.$emit("close", {
+                            result : true,
+                            data : jsonData.data
+                        });
+                        } else {
+                        self.$message({
+                            message: jsonData.message + "",
+                            type: "warning"
+                        });
+
+                        self.$emit("close", {
+                            result : false
+                        });
+                        }
+                    });
                 }
             });
-            }
-        });
-        },
+        },        
+        handleDelete() {
+            var self = this;
+
+            self.$confirm("是否确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                self.loading = true;
+                rolePersonCheckOnApi.remove(self.formModel.id).then(function (response) {
+                    var jsonData = response.data;
+                    self.loading = false;
+                    if (jsonData.result) {
+                        self.$message({
+                            type: "success",
+                            message: "删除成功!",
+                        });
+
+                        self.$emit("close", false);
+                    }
+                });
+            })
+            .catch(() => {
+                self.loading = false;
+            });
+        }
     },
     mounted: function() {
         var self = this;
-        (function() {
-        self.loading = true;
-
-        if (self.businessKey.length == 0) {
-            return rolePersonCheckOnApi.create();
-        } else {
-            return rolePersonCheckOnApi.edit(self.businessKey);
-        }
-        })()
+        
+        rolePersonCheckOnApi.edit(self.businessKey)
         .then(response => {
             var jsonData = response.data;
             self.loading = false;
@@ -158,7 +181,11 @@ export default {
                 var checkTimeRange = new Array();
                 checkTimeRange[0]=jsonData.data.checkStartTime;
                 checkTimeRange[1]=jsonData.data.checkEndTime
-                self.formModel.checkTimeRange = checkTimeRange;
+
+                if(checkTimeRange[0]!=null && checkTimeRange[1]!=null){
+                    self.formModel.checkTimeRange = checkTimeRange;
+                }
+
                 self.formModel.rolePerson = 1
 
                 var checkOnTimeFlag = jsonData.data.checkOnTimeFlag;