diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts
index 5ed47e3..8363cac 100644
--- a/src/api/sys/user.ts
+++ b/src/api/sys/user.ts
@@ -23,6 +23,7 @@ enum Api {
GetPermCode = '/sys/permission/getPermCode',
//新加的获取图形验证码的接口
getInputCode = '/sys/randomImage',
+ randomCode = '/sys/randomInputCode',
//获取短信验证码的接口
getCaptcha = '/sys/sms',
//注册接口
@@ -114,6 +115,10 @@ export function getCodeInfo(currdatetime) {
let url = Api.getInputCode + `/${currdatetime}`;
return defHttp.get({ url: url });
}
+export function randomCode(currdatetime) {
+ let url = Api.randomCode + `/${currdatetime}`;
+ return defHttp.get({ url: url });
+}
/**
* @description: 获取短信验证码
*/
diff --git a/src/views/admin/orginfo/components/OrgInfoForm.vue b/src/views/admin/orginfo/components/OrgInfoForm.vue
index 529f5ba..305abf8 100644
--- a/src/views/admin/orginfo/components/OrgInfoForm.vue
+++ b/src/views/admin/orginfo/components/OrgInfoForm.vue
@@ -8,11 +8,8 @@
-
-
- {{formData.departName}}
-
-
+
+
{{formData.orgCode}}
@@ -24,105 +21,42 @@
{{formData.orgLeader}}
+
+
+ {{cityViewValue}}
+
+
{{formData.orgLeaderPhone}}
+
+
+ {{formData.departName}}
+
+
{{formData.orgPropertyType}}
-
-
- {{formData.orgBuildingArea}} ㎡
-
-
-
{{formData.orgAddress}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{formData.name}}
-
-
-
-
- {{formData.sex}}
-
-
-
-
- {{formData.idCard}}
-
-
-
-
- {{formData.birthDate?formData.birthDate.substring(0,10):""}}
-
-
-
-
- {{formData.startTime?formData.startTime.substring(0,10):""}}
-
-
-
-
- {{formData.endTime?formData.endTime.substring(0,10):""}}
-
-
-
-
- {{formData.national}}
-
-
-
-
- {{formData.idCardAddress}}
-
-
-
-
- {{formData.issuingAuthority}}
+
+ {{formData.orgBuildingArea}} ㎡
+
@@ -136,28 +70,28 @@
-
- {{formData.comName}}
-
-
-
-
- {{formData.comRegisterAddress}}
-
-
-
-
{{formData.comCreditCode}}
+
+
+ {{formData.comName}}
+
+
{{formData.comLegalPerson}}
+
+
+ {{formData.comRegisterAddress}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{formData.name}}
+
+
+
+
+ {{formData.sex}}
+
+
+
+
+ {{formData.birthDate?formData.birthDate.substring(0,10):""}}
+
+
+
+
+ {{formData.idCard}}
+
+
+
+
+ {{formData.idCardAddress}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{formData.startTime?formData.startTime.substring(0,10):""}}
+
+
+
+
+ {{formData.endTime?formData.endTime.substring(0,10):""}}
+
+
+
+
+
+ {{formData.issuingAuthority}}
+
+
+
+
+
+
+
@@ -293,8 +306,9 @@ const formData = reactive>({
franchiseTime: null,
contract: null,
});
+const cityViewValue = ref('')
const { createMessage } = useMessage();
-const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
+const labelCol = ref({ xs: { span: 24 }, sm: { span: 8 } });
const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref(false);
//表单验证
@@ -334,6 +348,7 @@ function edit(record) {
tmpData[key] = record[key]
}
})
+
//赋值
Object.assign(formData, tmpData);
});
@@ -342,6 +357,10 @@ function edit(record) {
function open(orgCode) {
getOrgInfo({ orgCode }).then(res => {
Object.assign(formData, res);
+
+ cityViewValue.value = res.orgProvince
+ + (!!res.orgCity ? res.orgCity : '')
+ + (!!res.orgDistrict ? res.orgDistrict : '')
})
}
diff --git a/src/views/admin/workorder/components/WorkOrderForm.vue b/src/views/admin/workorder/components/WorkOrderForm.vue
index 540fe06..bb9342c 100644
--- a/src/views/admin/workorder/components/WorkOrderForm.vue
+++ b/src/views/admin/workorder/components/WorkOrderForm.vue
@@ -57,7 +57,7 @@
-
+
{{formData.replyTime?formData.replyTime:'暂未处理'}}
@@ -67,12 +67,12 @@
-
+
-
+
{{formData.replyContent}}
diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue
index 2319596..9d85fef 100644
--- a/src/views/system/loginmini/MiniLogin.vue
+++ b/src/views/system/loginmini/MiniLogin.vue
@@ -53,7 +53,10 @@
-
@@ -92,7 +95,7 @@
diff --git a/src/views/system/loginmini/huakuai.vue b/src/views/system/loginmini/huakuai.vue
new file mode 100644
index 0000000..57c8048
--- /dev/null
+++ b/src/views/system/loginmini/huakuai.vue
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ verified ? "验证通过" : "将滑块拖动至右侧完成验证" }}
+
+
+
+
+
+
+
\ No newline at end of file