Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts

@@ -14,49 +14,49 @@ export const columns: BasicColumn[] = [
     title: '机构负责人',
     align: 'center',
     dataIndex: 'orgLeader',
-    width: 120,
+    width: '8%'
   },
   {
-    title: '机构负责人电话',
+    title: '负责人电话',
     align: 'center',
     dataIndex: 'orgLeaderPhone',
-    width: 120,
+    width: '8%'
   },
   {
     title: '申请日期',
     align: 'center',
     dataIndex: 'createTime',
-    width: 120,
+    width: '8%'
   },
   {
     title: '房屋性质',
     align: 'center',
     dataIndex: 'orgPropertyType',
-    width: 120,
+    width: '8%'
   },
   {
     title: '面积(㎡)',
     align: 'center',
     dataIndex: 'orgBuildingArea',
-    width: 120,
+    width: '8%'
   },
   {
     title: '审核意见',
     align: 'center',
     dataIndex: 'status_dictText',
-    width: 120,
+    width: '8%'
   },
   {
     title: '当前阶段',
     align: 'center',
     dataIndex: 'buildStatus_dictText',
-    width: 120,
+    width: '8%'
   },
   {
     title: '工单状态',
     align: 'center',
     dataIndex: 'workOrderStatus_dictText',
-    width: 120,
+    width: '8%'
   },
 ];
 

src/views/admin/orgapplyinfo/OrgApplyInfoList.vue

@@ -60,6 +60,16 @@
     </BasicTable>
     <!-- 表单区域 -->
     <OrgApplyInfoModal ref="registerModal" @success="handleSuccess"></OrgApplyInfoModal>
+
+    <a-modal v-model:visible="zhcshVisible" title="账号初始化" >
+      <template #footer> <!-- 自定义底部内容 -->
+        <a-button @click="handleCshCancel">关闭</a-button>
+      </template>
+      <div style="height: 100px;text-align: center;">
+        <p style="margin-top:50px;">账号初始化成功！</p>
+        <p>{{zhcshMessage}}</p>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -88,6 +98,8 @@ const queryParam = reactive<any>({});
 const toggleSearchStatus = ref<boolean>(false);
 const registerModal = ref();
 const userStore = useUserStore();
+const zhcshVisible = ref<boolean>(false);
+const zhcshMessage = ref<string>('');
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
@@ -207,11 +219,19 @@ function handleInitAccount(record) {
   var userInfo = {userName: record.tel,realname: record.name,orgCode:record.id}
   console.log("🚀 ~ handleInitAccount ~ userInfo:", userInfo)
   defHttp.post({ url: '/sys/user/initialization', params: userInfo }).then(res => {
+    console.log("🚀 ~ handleInitAccount ~ res:", res)
+    zhcshVisible.value = true;
+    zhcshMessage.value = res.message;
     handleSuccess();
   })
 
 }
 
+function handleCshCancel(){
+    zhcshVisible.value = false;
+    zhcshMessage.value = '';
+}
+
 /**
  * 信息推送
  * @param record 
@@ -344,4 +364,8 @@ async function setRangeQuery() {
     width: 100%;
   }
 }
+
+.jee-hidden-zhcsh {
+  display: none !important;
+}
 </style>

src/views/admin/orgapplyinfo/components/OrgUpContractForm.vue

@@ -146,8 +146,8 @@ const formData = reactive<Record<string, any>>({
 });
 const tempNullVal = ref('')
 const { createMessage } = useMessage();
-const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
-const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 17 } });
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 14 } });
 const confirmLoading = ref<boolean>(false);
 //表单验证
 const validatorRules = reactive({

src/views/admin/orgmodifyinfo/OrgModifyInfo.data.ts

@@ -14,31 +14,37 @@ export const columns: BasicColumn[] = [
     title: '机构负责人',
     align: 'center',
     dataIndex: 'orgLeader',
+    width: '12%'
   },
   {
-    title: '机构负责人电话',
+    title: '负责人电话',
     align: 'center',
     dataIndex: 'orgLeaderPhone',
+    width: '12%'
   },
   {
     title: '申请日期',
     align: 'center',
     dataIndex: 'createTime',
+    width: '12%'
   },
   {
     title: '房屋性质',
     align: 'center',
     dataIndex: 'orgPropertyType',
+    width: '12%'
   },
   {
-    title: '面积',
+    title: '面积(㎡)',
     align: 'center',
     dataIndex: 'orgBuildingArea',
+    width: '12%'
   },
   {
     title: '审核意见',
     align: 'center',
     dataIndex: 'status_dictText',
+    width: '12%'
   },
 ];