bug修正代码更新

@@ -104,7 +104,7 @@ export default {
       default: "mini",
       default: "mini",
     },
     },
     height: {
     height: {
-      type: String,
+      type: [String, Number],
       default: "400",
       default: "400",
     },
     },
     fit: {
     fit: {
@@ -202,10 +202,18 @@ export default {
   created() {
   created() {
     this.newHeader = this.headerData;
     this.newHeader = this.headerData;
   },
   },
-  watch:{
-    page(){
+  watch: {
+    page() {
       this.pageNum = this.page;
       this.pageNum = this.page;
-    }
+    },
+    data() {
+      this.data.forEach((item, index) => {
+        item.index = index;
+      });
+      this.$nextTick(()=>{
+        this.$refs.tables.doLayout()
+      })
+    },
   },
   },
   mounted() {},
   mounted() {},
   methods: {
   methods: {
@@ -226,7 +234,7 @@ export default {
     currentChange(val) {
     currentChange(val) {
       this.$emit("currentChange", {
       this.$emit("currentChange", {
         page: val,
         page: val,
-        start:  val > 1 ? (val-1) * this.limitSize + 1 : val,
+        start: val > 1 ? (val - 1) * this.limitSize + 1 : val,
       });
       });
       scrollTo(0, 800);
       scrollTo(0, 800);
     },
     },
@@ -245,15 +253,15 @@ export default {
         } else if (selection.includes(this.data[row.index])) {
         } else if (selection.includes(this.data[row.index])) {
           if (!selection.includes(this.data[this.start])) {
           if (!selection.includes(this.data[this.start])) {
             this.$refs.tables.toggleRowSelection(this.data[this.start], true);
             this.$refs.tables.toggleRowSelection(this.data[this.start], true);
-            if(this.selectTable.includes(this.data[this.start])){
+            if (this.selectTable.includes(this.data[this.start])) {
               this.selectTable.push(this.data[this.start]);
               this.selectTable.push(this.data[this.start]);
             }
             }
           }
           }
           for (i = min; i <= sum + min; i++) {
           for (i = min; i <= sum + min; i++) {
             this.$refs.tables.toggleRowSelection(this.data[i], true);
             this.$refs.tables.toggleRowSelection(this.data[i], true);
-            if(!this.selectTable.includes(this.data[i])){
+            if (!this.selectTable.includes(this.data[i])) {
               this.selectTable.push(this.data[i]);
               this.selectTable.push(this.data[i]);
-            } 
+            }
           }
           }
         } else if (!selection.includes(this.data[row.index])) {
         } else if (!selection.includes(this.data[row.index])) {
           this.selectTable.splice(min > 1 ? min - 2 : min, sum + 1);
           this.selectTable.splice(min > 1 ? min - 2 : min, sum + 1);
@@ -274,7 +282,7 @@ export default {
           }
           }
         }
         }
       }
       }
-      selection = this.selectTable.sort(this.compare('index','ascending'));
+      selection = this.selectTable.sort(this.compare("index", "ascending"));
       this.$emit("tableSelect", { selection, row });
       this.$emit("tableSelect", { selection, row });
     },
     },
     tableSelectAll(selection) {
     tableSelectAll(selection) {
@@ -313,6 +321,9 @@ export default {
           return dictLabels[column.property][cellValue];
           return dictLabels[column.property][cellValue];
         }
         }
       }
       }
+      if (column.property == "roleNames") {
+        return cellValue.toString();
+      }
       return cellValue;
       return cellValue;
     },
     },
   },
   },

@@ -72,7 +72,7 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="ACCSpool">
           <el-form-item label="ACCSpool">
             <el-select
             <el-select
               placeholder="不限"
               placeholder="不限"
@@ -97,7 +97,7 @@
               </el-option>
               </el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="运单号">
           <el-form-item label="运单号">
             <el-input
             <el-input
@@ -376,7 +376,7 @@ export default {
         handingCodes: null,
         handingCodes: null,
         subCategorys: null,
         subCategorys: null,
         customsReceiptStatusId: null,
         customsReceiptStatusId: null,
-        accsPool:"OSPR"
+        // accsPool:"OSPR"
       }, //查询数据
       }, //查询数据
       tableHeader: [
       tableHeader: [
         {
         {

@@ -875,7 +875,7 @@ export default {
       }
       }
     });
     });
     this.tableHeight =
     this.tableHeight =
-      window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
+      window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 150;
   },
   },
   methods: {
   methods: {
     //输入航班号后
     //输入航班号后

@@ -792,7 +792,7 @@ export default {
         this.shiftKey = false;
         this.shiftKey = false;
       }
       }
     });
     });
-    this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-50
+    this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-80
   },
   },
 
 
   methods: {
   methods: {

@@ -157,12 +157,15 @@ export default {
     drawer(val,oldVal){
     drawer(val,oldVal){
       if(val){
       if(val){
         this.roleForm = this.roleData;
         this.roleForm = this.roleData;
+      }else{
+        this.loading = false;
       } 
       } 
     }
     }
   },
   },
   methods: {
   methods: {
     //关闭
     //关闭
     handleClose() {
     handleClose() {
+      this.$refs['roleForm'].clearValidate();
       this.$emit("handleClose", false);
       this.$emit("handleClose", false);
     },
     },
 
 
@@ -177,12 +180,12 @@ export default {
       formData.name = this.roleForm.name;
       formData.name = this.roleForm.name;
       addOrUpdateRole(formData)
       addOrUpdateRole(formData)
         .then((res) => {
         .then((res) => {
+          this.loading = false;
           if (res.code === 200) {
           if (res.code === 200) {
             this.$message({
             this.$message({
               message: "操作成功",
               message: "操作成功",
               type: "success",
               type: "success",
             });
             });
-            this.loading = false;
             this.$emit("handleClose", false);
             this.$emit("handleClose", false);
           } else {
           } else {
             this.$message({
             this.$message({

@@ -19,6 +19,7 @@
               range-separator="至"
               range-separator="至"
               start-placeholder="开始日期"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
               clearable
               clearable
             >
             >
             </el-date-picker>
             </el-date-picker>
@@ -28,7 +29,7 @@
           <el-form-item label="状态">
           <el-form-item label="状态">
             <el-select v-model="formData.valid" placeholder="角色状态" clearable>
             <el-select v-model="formData.valid" placeholder="角色状态" clearable>
               <el-option label="开启" value="1"> </el-option>
               <el-option label="开启" value="1"> </el-option>
-              <el-option label="关闭" value="1"> </el-option>
+              <el-option label="关闭" value="2"> </el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -148,7 +149,7 @@ export default {
         {
         {
           type: "",
           type: "",
           name: "创建人",
           name: "创建人",
-          value: "remark",
+          value: "createUserName",
           width: "150px",
           width: "150px",
           align: "center",
           align: "center",
           sorTable: false,
           sorTable: false,
@@ -210,7 +211,6 @@ export default {
         this.formData.createStart = this.createTime[0];
         this.formData.createStart = this.createTime[0];
         this.formData.createEnd = this.createTime[1];
         this.formData.createEnd = this.createTime[1];
       }
       }
-
       getRoleList(this.formData)
       getRoleList(this.formData)
         .then((res) => {
         .then((res) => {
           this.tableLoading = false;
           this.tableLoading = false;
@@ -261,7 +261,7 @@ export default {
       status == 0
       status == 0
         ? (this.roleFormDisabled = true)
         ? (this.roleFormDisabled = true)
         : (this.roleFormDisabled = false);
         : (this.roleFormDisabled = false);
-      this.drawerTitle = "查看/修改角色";
+      this.drawerTitle = "修改角色";
     },
     },
     //修改角色状态
     //修改角色状态
     roleStatus(row) {
     roleStatus(row) {

@@ -103,12 +103,9 @@
             </el-form-item>
             </el-form-item>
           </el-col> -->
           </el-col> -->
           <el-col :span="24">
           <el-col :span="24">
-            <el-form-item
-              label="所属口岸:"
-              prop="portName"
-            >
+            <el-form-item label="所属口岸:" prop="portName">
               <el-select
               <el-select
-                placeholder="不限"
+                placeholder="请选择口岸"
                 v-model="port"
                 v-model="port"
                 :disabled="userFormDisabled"
                 :disabled="userFormDisabled"
                 size="small"
                 size="small"
@@ -216,14 +213,14 @@ export default {
         loginName: [
         loginName: [
           {
           {
             required: true,
             required: true,
-            message: "角色名不能为空",
+            message: "员工号不能为空",
             trigger: "blur",
             trigger: "blur",
           },
           },
         ],
         ],
         username: [
         username: [
           {
           {
             required: true,
             required: true,
-            message: "角色名不能为空",
+            message: "用户名不能为空",
             trigger: "blur",
             trigger: "blur",
           },
           },
         ],
         ],
@@ -238,11 +235,12 @@ export default {
     };
     };
   },
   },
   created() {
   created() {
-    this.selectRoleList();
   },
   },
-  watch:{
-    drawer(val,oldVal){
-      if(val){
+  watch: {
+    drawer(val, oldVal) {
+      if (val) {
+        this.roleList = []
+        this.selectRoleList();
         this.userForm = this.userData;
         this.userForm = this.userData;
         if (this.userForm.roleIds) {
         if (this.userForm.roleIds) {
           this.roleid = this.userForm.roleIds;
           this.roleid = this.userForm.roleIds;
@@ -250,11 +248,16 @@ export default {
         if (this.userForm.portName) {
         if (this.userForm.portName) {
           this.port = this.userForm.portName;
           this.port = this.userForm.portName;
         }
         }
+      }else{
+        this.loading = false;
       }
       }
-    }
+    },
   },
   },
   methods: {
   methods: {
-    change(val){
+    clearValidate(formName){
+      this.$refs[formName].clearValidate();
+    },
+    change(val) {
       this.roleid = val;
       this.roleid = val;
     },
     },
     selectRoleList() {
     selectRoleList() {
@@ -262,11 +265,11 @@ export default {
       getRoleList({ size: null, page: null })
       getRoleList({ size: null, page: null })
         .then((res) => {
         .then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
-            res.data.list.map(item=>{
-              if(item.valid == 1){
-                this.roleList.push(item)
+            res.data.list.map((item) => {
+              if (item.valid == 1) {
+                this.roleList.push(item);
               }
               }
-            })
+            });
           } else {
           } else {
             this.$message({
             this.$message({
               message: res.msg,
               message: res.msg,
@@ -302,35 +305,43 @@ export default {
       this.userForm = {
       this.userForm = {
         roleIds: [],
         roleIds: [],
       };
       };
+      this.clearValidate('userForm')
       this.$emit("handleClose", false);
       this.$emit("handleClose", false);
     },
     },
 
 
     //提交
     //提交
     submit() {
     submit() {
-      this.loading = true;
-      this.userData.isValid ? "" : (this.userForm.isValid = 1);
-      this.userForm.roleIds = this.roleid;
-      this.userForm.portName = this.port.join(",");
-      addOrUpdateUser(this.userForm)
-        .then((res) => {
-          this.loading = false;
-          if (res.code === 200) {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-            });
-            this.$emit("handleClose", false);
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "warning",
-            });
-          }
-        })
-        .catch((err) => {
-          this.loading = false;
-          console.log(err);
-        });
+      if (this.port.join(",").length > 0) {
+        this.loading = true;
+        this.userData.isValid ? "" : (this.userForm.isValid = 1);
+        this.userForm.roleIds = this.roleid;
+        this.userForm.portName = this.port.join(",");
+        addOrUpdateUser(this.userForm)
+          .then((res) => {
+            this.loading = false;
+            if (res.code === 200) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.$emit("handleClose", false);
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "warning",
+              });
+            }
+          })
+          .catch((err) => {
+            this.loading = false;
+            console.log(err);
+          });
+      }else{
+        this.$message({
+                message: "口岸不能为空",
+                type: "warning",
+              });
+      }
     },
     },
   },
   },
 };
 };

@@ -14,7 +14,7 @@
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="手机号码">
           <el-form-item label="手机号码">
             <el-input
             <el-input
-              placeholder="请输入用户名称"
+              placeholder="请输入手机号码"
               v-model="formData.phone"
               v-model="formData.phone"
               clearable
               clearable
             ></el-input>
             ></el-input>
@@ -278,7 +278,7 @@ export default {
       detailUser(id)
       detailUser(id)
         .then((res) => {
         .then((res) => {
           this.drawer = true;
           this.drawer = true;
-          this.drawerTitle = "查看/修改用户";
+          this.drawerTitle = "修改用户";
           if (res.code === 200) {
           if (res.code === 200) {
             this.userData = res.data;
             this.userData = res.data;
             this.userData.portName
             this.userData.portName