From a35ff1ca423e2fea33dc11f37b54d076acaab3c5 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 12 十二月 2023 13:39:28 +0800
Subject: [PATCH] 2023.12.12

---
 src/views/fytz/user/components/CompUserInfo.vue |  266 +++++++++++++++++++++--------------------------------
 1 files changed, 105 insertions(+), 161 deletions(-)

diff --git a/src/views/fytz/user/components/CompUserInfo.vue b/src/views/fytz/user/components/CompUserInfo.vue
index 3e48095..e8be54c 100644
--- a/src/views/fytz/user/components/CompUserInfo.vue
+++ b/src/views/fytz/user/components/CompUserInfo.vue
@@ -1,119 +1,97 @@
 <template>
-  <el-form
-    :inline="false"
-    :model="formObj"
-    ref="formRef"
+  <FYForm
+    :form-info="_formInfo"
     :rules="rules"
-    label-position="right"
-    label-width="150px"
+    :reset="active"
+    v-model:is-edit="_edit"
+    @submit="submit"
+    @cancel="cancel"
   >
-    <!-- <el-form-item label="id" prop="GUID">
-      <el-input clearable v-model="formObj.GUID" placeholder="id" />
-    </el-form-item> -->
-    <!-- <el-form-item label="澶村儚url" prop="HeadIconUrl">
-      <el-input clearable v-model="formObj.HeadIconUrl" placeholder="澶村儚url" />
-    </el-form-item> -->
-    <el-form-item label="璐︽埛鍚�" prop="acountname">
-      <el-input clearable v-model="formObj.acountname" placeholder="璐︽埛鍚�" />
-    </el-form-item>
-    <el-form-item label="鐢ㄦ埛鏄电О" prop="realname">
-      <el-input clearable v-model="formObj.realname" placeholder="鐢ㄦ埛鏄电О" />
-    </el-form-item>
-    <el-form-item label="瀵嗙爜" prop="password">
-      <el-input
-        clearable
-        type="password"
-        v-model="formObj.password"
-        placeholder="榛樿瀵嗙爜123456"
-      />
-    </el-form-item>
-    <!-- <el-form-item label="鐢ㄦ埛绫诲瀷id" prop="UserTypeID">
-      <el-input
-        clearable
-        v-model="formObj.UserTypeID"
-        placeholder="鐢ㄦ埛绫诲瀷id"
-      />
-    </el-form-item> -->
-    <el-form-item label="鐢ㄦ埛绫诲瀷" prop="_usertype">
-      <el-select v-model="formObj._usertype" placeholder="鐢ㄦ埛绫诲瀷">
-        <el-option
-          v-for="s in userTypes"
-          :key="s.value"
-          :label="s.label"
-          :value="s"
+    <template #form-item="{ formObj }">
+      <!-- <el-form-item label="澶村儚url" prop="HeadIconUrl">
+        <el-input
+          clearable
+          v-model="formObj.HeadIconUrl"
+          placeholder="澶村儚url"
         />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="鎵�灞炰紒涓�" prop="departmentname">
-      <el-input
-        clearable
-        v-model="formObj.departmentname"
-        placeholder="鎵�灞炰紒涓�"
-        disabled
-      />
-    </el-form-item>
-    <el-form-item label="鏄惁鍙敤" prop="isenable">
-      <el-switch v-model="formObj.isenable" />
-      <span style="margin-left: 16px">{{
-        formObj.isenable ? '鍙敤' : '涓嶅彲鐢�'
-      }}</span>
-    </el-form-item>
-    <el-form-item label="宸ュ彿" prop="workno">
-      <el-input clearable v-model="formObj.workno" placeholder="宸ュ彿" />
-    </el-form-item>
-
-    <el-form-item label="鎵嬫満" prop="telephone">
-      <el-input
-        clearable
-        type="tel"
-        v-model="formObj.telephone"
-        placeholder="鎵嬫満"
-      />
-    </el-form-item>
-    <!-- <el-form-item label="寰俊id" prop="WechatID">
-      <el-input clearable v-model="formObj.WechatID" placeholder="寰俊id" />
-    </el-form-item> -->
-    <el-form-item label="鐪�/甯�/鍖�/闀�" prop="_locations">
-      <el-cascader
-        v-model="formObj._locations"
-        :options="locations"
-        placeholder="鐪�/甯�/鍖�/闀�"
-        :props="locationsProps"
-        style="width: 280px"
-        :disabled="!create"
-      />
-    </el-form-item>
-    <el-form-item label="鍦烘櫙绫诲瀷" prop="_scenetype">
-      <el-select
-        v-model="formObj._scenetype"
-        placeholder="鍦烘櫙绫诲瀷"
-      >
-        <el-option
-          v-for="s in sceneTypes"
-          :key="s.value"
-          :label="s.label"
-          :value="s"
+      </el-form-item> -->
+      <el-form-item label="璐︽埛鍚�" prop="acountname">
+        <el-input clearable v-model="formObj.acountname" placeholder="璐︽埛鍚�" />
+      </el-form-item>
+      <el-form-item label="鐢ㄦ埛鏄电О" prop="realname">
+        <el-input clearable v-model="formObj.realname" placeholder="鐢ㄦ埛鏄电О" />
+      </el-form-item>
+      <el-form-item label="瀵嗙爜" prop="password">
+        <el-col :span="18">
+          <el-input
+            :disabled="true"
+            clearable
+            type="password"
+            v-model="formObj.password"
+            placeholder="榛樿瀵嗙爜123456"
+          />
+        </el-col>
+        <el-col :span="6" v-if="!create">
+          <el-row justify="end">
+            <el-button type="danger" @click="onResetPw" :loading="pwLoading"
+              >閲嶇疆瀵嗙爜</el-button
+            >
+          </el-row>
+        </el-col>
+      </el-form-item>
+      <FYOptionUserType
+        :allOption="false"
+        :initValue="false"
+        v-model:value="formObj._usertype"
+      ></FYOptionUserType>
+      <!-- <el-form-item label="鎵�灞炰紒涓�" prop="departmentname">
+        <el-input
+          clearable
+          v-model="formObj.departmentname"
+          placeholder="鎵�灞炰紒涓�"
+          disabled
         />
-      </el-select>
-    </el-form-item>
-    <el-form-item>
-      <el-button
-        :disabled="!edit"
-        type="primary"
-        @click="onSubmit"
-        :loading="loading"
-        >鎻愪氦</el-button
-      >
-      <el-button :disabled="!edit" @click="onReset">閲嶇疆</el-button>
-    </el-form-item>
-  </el-form>
+      </el-form-item> -->
+      <el-form-item label="鏄惁鍙敤" prop="isenable">
+        <el-switch v-model="formObj.isenable" />
+        <span style="margin-left: 16px">{{
+          formObj.isenable ? '鍙敤' : '涓嶅彲鐢�'
+        }}</span>
+      </el-form-item>
+      <el-form-item label="宸ュ彿" prop="workno">
+        <el-input clearable v-model="formObj.workno" placeholder="宸ュ彿" />
+      </el-form-item>
+      <el-form-item label="鎵嬫満" prop="telephone">
+        <el-input
+          clearable
+          type="tel"
+          v-model="formObj.telephone"
+          placeholder="鎵嬫満"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="鐪�/甯�/鍖�/闀�" prop="_locations">
+        <el-cascader
+          v-model="formObj._locations"
+          :options="locations"
+          placeholder="鐪�/甯�/鍖�/闀�"
+          :props="locationsProps"
+          style="width: 280px"
+          :disabled="!create"
+        />
+      </el-form-item> -->
+      <FYOptionScene
+        :allOption="false"
+        :type="1"
+        :initValue="false"
+        v-model:value="formObj._scenetype"
+      ></FYOptionScene>
+    </template>
+  </FYForm>
 </template>
 
 <script setup>
 import { defineProps, defineEmits, reactive, ref, watch } from 'vue';
-import { useFormConfirm } from '@/composables/formConfirm';
-import { enumUserNA } from '@/enum/user';
-import { enumScene, getSceneName } from '@/enum/scene';
+import { getSceneName } from '@/enum/scene';
 import { enumLocation } from '@/enum/location';
 import userApi from '@/api/fytz/userApi';
 
@@ -133,26 +111,12 @@
 
 const emit = defineEmits(['onSubmit', 'onCancel', 'update:isEdit']);
 
-const { formObj, formRef, edit, onSubmit, onReset } = useFormConfirm({
-  defaultForm: {
-    isenable: true,
-  },
-  submit: {
-    do: submit,
-  },
-  cancel: {
-    do: cancel,
-  },
-});
-
-const userTypes = reactive(enumUserNA());
-const sceneTypes = reactive(enumScene(1, false));
+const _formInfo = ref();
+const _edit = ref(false);
 const locations = enumLocation(false);
 const locationsProps = reactive({
   checkStrictly: true,
 });
-const loading = ref(false);
-
 const rules = reactive({
   acountname: [
     {
@@ -168,13 +132,13 @@
       trigger: 'blur',
     },
   ],
-  password: [
-    {
-      required: props.create,
-      message: '瀵嗙爜涓嶈兘涓虹┖',
-      trigger: 'blur',
-    },
-  ],
+  // password: [
+  //   {
+  //     required: props.create,
+  //     message: '瀵嗙爜涓嶈兘涓虹┖',
+  //     trigger: 'blur',
+  //   },
+  // ],
   _usertype: [
     {
       required: true,
@@ -205,49 +169,36 @@
     value: s.usertypeid + '',
   };
 
-  s._scenetype = {
-    label: getSceneName(s.extension2, 1),
-    value: s.extension2,
-  };
+  s._scenetype = getSceneName(s.extension2, 1);
 
   s._locations = [];
-  // if (s.provincecode && s.provincecode.length > 0)
-  //   s._locations.push([s.provincecode, s.provincename]);
-  // if (s.citycode && s.citycode.length > 0)
-  //   s._locations.push([s.citycode, s.cityname]);
-  // if (s.districtcode && s.districtcode.length > 0)
-  //   s._locations.push([s.districtcode, s.districtname]);
-  // if (s.towncode && s.towncode.length > 0)
-  //   s._locations.push([s.towncode, s.townname]);
 
   return s;
 }
 
-function createUser() {
-  loading.value = true;
+function createUser(formObj, func) {
   return userApi
     .createUser(formObj.value)
     .then(() => {
       emit('onSubmit', formObj);
     })
     .finally(() => {
-      loading.value = false;
+      func();
     });
 }
 
-function updateUser() {
-  loading.value = true;
+function updateUser(formObj, func) {
   return userApi
     .updateUserInfo(formObj.value)
     .then(() => {
       emit('onSubmit', formObj);
     })
     .finally(() => {
-      loading.value = false;
+      func();
     });
 }
 
-function submit() {
+function submit(formObj, func) {
   // 琛屾斂鍖哄垝淇℃伅濉厖
   const a = formObj.value._locations;
   if (a[0]) {
@@ -276,7 +227,7 @@
   const c = formObj.value._scenetype;
   formObj.value.extension2 = c.value;
 
-  return props.create ? createUser() : updateUser();
+  return props.create ? createUser(formObj, func) : updateUser(formObj, func);
 }
 
 function cancel() {
@@ -286,20 +237,13 @@
 watch(
   () => props.formInfo,
   (nValue) => {
-    formObj.value = parseUserInfo(nValue);
+    _formInfo.value = parseUserInfo(nValue);
   }
 );
 
-watch(
-  () => props.active,
-  (nValue) => {
-    if (!nValue) {
-      onReset();
-    }
-  }
-);
-
-watch(edit, (nValue) => {
+watch(_edit, (nValue) => {
   emit('update:isEdit', nValue);
 });
+
+const pwLoading = ref(false);
 </script>

--
Gitblit v1.9.3