ming 3 rokov pred
rodič
commit
fc72a4c6a1

+ 1 - 0
src/views/tenantManage/adminConfig/component/adminDialog.vue

@@ -138,6 +138,7 @@ export default defineComponent({
 
     const open = () => {
       form.value = props.itemInfo
+      form.value.status=Number(form.value.status)
       console.log('form.value')
       console.log(form.value)
     }

+ 1 - 1
src/views/tenantManage/adminConfig/component/checkAdminList.vue

@@ -195,7 +195,7 @@ export default defineComponent({
 
     //管理员配置  (修改操作)
     const adminConfig = (row) => {
-      alert('编辑操作')
+      // alert('编辑操作')
        console.log('row')
       console.log(row)
 

+ 1 - 0
src/views/tenantManage/adminConfig/index.vue

@@ -215,6 +215,7 @@ export default defineComponent({
     const adminConfig = (row) => {
       tableItem.value = {
         tenantId: row.id,
+        status:0
       }
       DialogArray.value = row
       dialogTitle.value = '配置管理员'

+ 1 - 0
src/views/tenantManage/authConfig/dialogComponent.vue

@@ -490,6 +490,7 @@ export default defineComponent({
       resetForm()
       showDialog.value = false
       emit('closeDialog', flag)
+      checkedArr.value=[]
     }
 
     function resetForm() {

+ 19 - 21
src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -364,10 +364,8 @@ export default defineComponent({
 
     // 主页配置保存操作
     const submitForm = () => {
-      // alert(params)
-      // if(params=='formInfo'){
-      //   alert(1)
-      // }
+      alert(1)
+
  
       formInfo.value.validate((valid) => {
         if (valid) {
@@ -397,7 +395,7 @@ export default defineComponent({
             })
           } else {
             // alert('未配置新增提交')
-            api.addMiddleConfig(form.value).then((requset) => {
+            api.addMiddleConfig(aa).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '新增配置成功',
@@ -431,7 +429,7 @@ export default defineComponent({
               labelIcon :form.value.labelIcon,
             }
           if (props.configStatus) {
-            alert('已配置修改提交')
+            // alert('已配置修改提交')
             api.updaMiddleConfig(aa).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
@@ -445,7 +443,7 @@ export default defineComponent({
             })
           } else {
             // alert('未配置新增提交')
-            api.addMiddleConfig(form.value).then((requset) => {
+            api.addMiddleConfig(aa).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '新增配置成功',
@@ -478,7 +476,7 @@ export default defineComponent({
               middleFooter :form.value.middleFooter,
             }
           if (props.configStatus) {
-            alert('已配置修改提交')
+            // alert('已配置修改提交')
             api.updaMiddleConfig(aa).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
@@ -492,7 +490,7 @@ export default defineComponent({
             })
           } else {
             // alert('未配置新增提交')
-            api.addMiddleConfig(form.value).then((requset) => {
+            api.addMiddleConfig(aa).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '新增配置成功',
@@ -621,7 +619,7 @@ export default defineComponent({
 
       rules: {
         middleTitle: [
-          { required: true, message: '请输入主页标题', trigger: 'blur' },
+          { required: false, message: '请输入主页标题', trigger: 'blur' },
           {
             min: 1,
             max: 30,
@@ -630,40 +628,40 @@ export default defineComponent({
           },
         ],
         homeLogo: [
-          { required: true, message: '请输入主页logo', trigger: 'blur' },
+          { required: false, message: '请输入主页logo', trigger: 'blur' },
         ],
         homeLayout: [
-          { required: true, message: '请选则主页导航布局', trigger: 'blur' },
+          { required: false, message: '请选则主页导航布局', trigger: 'blur' },
         ],
 
         loginTitle: [
-          { required: true, message: '请输入登录页标题', trigger: 'blur' },
+          { required: false, message: '请输入登录页标题', trigger: 'blur' },
         ],
         loginLogo: [
-          { required: true, message: '请选则登录页logo', trigger: 'blur' },
+          { required: false, message: '请选则登录页logo', trigger: 'blur' },
         ],
         loginBackUrl: [
-          { required: true, message: '请选择登录页背景图', trigger: 'blur' },
+          { required: false, message: '请选择登录页背景图', trigger: 'blur' },
         ],
         loginFooter: [
-          { required: true, message: '请输入登录页底部标题', trigger: 'blur' },
+          { required: false, message: '请输入登录页底部标题', trigger: 'blur' },
         ],
         labelIcon: [
-          { required: true, message: '请输入标签页图标', trigger: 'blur' },
+          { required: false, message: '请输入标签页图标', trigger: 'blur' },
         ],
 
 
         // middleStatus: [
-        //   { required: true, message: '请选则中间页状态', trigger: 'blur' },
+        //   { required: false, message: '请选则中间页状态', trigger: 'blur' },
         // ],
          middleLogo: [
-          { required: true, message: '请输入中间页logo', trigger: 'blur' },
+          { required: false, message: '请输入中间页logo', trigger: 'blur' },
         ],
         middleBackUrl: [
-          { required: true, message: '请选择中间页背景图', trigger: 'blur' },
+          { required: false, message: '请选择中间页背景图', trigger: 'blur' },
         ],
         middleFooter: [
-          { required: true, message: '请输入中间页底部标题', trigger: 'blur' },
+          { required: false, message: '请输入中间页底部标题', trigger: 'blur' },
         ],
        
 

+ 15 - 1
src/views/tenantManage/tenantUnit/dialogComponent.vue

@@ -27,7 +27,9 @@
               <el-radio :label="3" value="3">永久有效</el-radio>
               <el-radio :label="4" value="4">
                 <el-date-picker
+                  :min-time="nowDate"
                   v-model="form.value1"
+                   :disabled-date="disabledDate"
                   type="date"
                   placeholder="请选择日期"
                 />
@@ -87,7 +89,7 @@
         <div
           style="
             width: 670px;
-            height: 130px;
+            height: 300px;
             background: #016ddb;
             text-align: center;
             position: relative;
@@ -157,6 +159,7 @@ export default defineComponent({
     const showDialog = ref(false)
     const form = ref({})
     const formInfo = ref(null)
+     const nowDate=ref(new Date().getTime())
 
     const getPlatformBoxList = ref([])
 
@@ -169,6 +172,15 @@ export default defineComponent({
       }
     }
 
+    const disabledDate = (time) => {
+  return time.getTime()<Date.now()
+}
+
+    
+
+
+   
+
     // 保存操作
     const submitForm = () => {
       formInfo.value.validate((valid) => {
@@ -297,6 +309,8 @@ export default defineComponent({
       showDialog,
 
       initMap,
+      nowDate,
+      disabledDate,
 
       checked: true,
       form,

+ 1 - 1
src/views/tenantManage/tenantUnit/index.vue

@@ -255,7 +255,7 @@ export default defineComponent({
         systemName: '',
         email: '',
         address: '',
-        status:''
+        status:0
       }
       dialogTitle.value = '新增'
       showDialog.value = true