合并分支 'dev_2nd_20230213' 到 'master'

Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!290

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -1987,6 +1987,9 @@ popconfirmmize {
 .popconfirmmize .anticon-exclamation-circle {
   display: none !important;
 }
+.popconfirmmize .ant-popover-message{
+  padding: 4px 0 36px!important;
+}
 //.customizetable .ant-table-thead > tr > th {
 //  height: 46px !important;
 //padding: 8px 8px !important;

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -3119,6 +3119,9 @@
   .popconfirmmize .anticon-exclamation-circle {
     display: none !important;
   }
+  .popconfirmmize .ant-popover-message{
+    padding: 4px 0 36px!important;
+  }
   //.popconfirm .ant-popover-inner-content{
   //  padding: 0px 16px;
   //}

jero-web/src/views/system/modules/UserModal.vue

@@ -483,13 +483,17 @@
       handleSubmitOk() {
         this.confirmLoading = true
         let selectedRole = JSON.parse(JSON.stringify(this.selectedRole))
-        let dutyTerritorie = JSON.parse(JSON.stringify(this.dutyTerritories))
+        if(this.dutyTerritories){
-        let brand = JSON.parse(JSON.stringify(this.brands))
+          let dutyTerritorie = JSON.parse(JSON.stringify(this.dutyTerritories))
+        }
+        if(this.brands){
+          let brand = JSON.parse(JSON.stringify(this.brands))
+        }
         let param = {
           ids: this.userId,
           selectedroles: selectedRole.join(','),
-          dutyTerritories: dutyTerritorie.join(','),
+          dutyTerritories: this.dutyTerritories ? dutyTerritorie.join(',') : '',
-          brands: brand.join(',')
+          brands: this.brands ? brand.join(',') : ''
         }
         postAction('/sys/user/setRole', param).then((res) => {
           if (res.success) {