@@ -47,7 +47,7 @@
v-model="advanceSearch.Date"
type="daterange"
format="YYYY-MM-DD"
- style="width: 240px;"
+ style="width: 240px"
value-format="YYYY-MM-DD"
range-separator="-"
start-placeholder="开始日期"
@@ -74,7 +74,7 @@
- 编辑
+ 编辑
详情
删除
@@ -101,8 +101,7 @@
:draggable="true"
>
-
-
+
@@ -143,6 +142,7 @@
accept=".jpg,.jpeg,.png,.gif.webp"
:limit="9"
list-type="picture-card"
+ :class="{ 'hide-add-btn': !cEdit.isEdit }"
>
![]()
-
+
@@ -179,6 +179,7 @@
accept=".jpg,.jpeg,.png,.gif.webp"
:limit="9"
list-type="picture-card"
+ :class="{ 'hide-add-btn': !cEdit.isEdit }"
>
![]()
-
+
@@ -338,7 +339,6 @@
import api from '@/api/equipmentManagement/repairRecords/index';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
var grid = ref(null);
var deviceGrid = ref(null);
@@ -490,15 +490,12 @@ function DropRecord(arr = undefined) {
() => {
showloading('fullLoading');
arr = arr.map((item) => item.recordId);
- api.dropRepir(arr).then(res=>{
- if(res && res.code==200){
+ api.dropRepir(arr).then((res) => {
+ if (res && res.code == 200) {
Search();
}
alert(res.msg);
});
-
-
-
},
hideConfirm,
'提示'
@@ -511,7 +508,7 @@ function ToggleAdvance() {
}
//显示编辑
-function ShowEdit(item = undefined, isEdit = true,formEl=undefined) {
+function ShowEdit(item = undefined, isEdit = true, formEl = undefined) {
Status.ShowEditPop = true;
let def = {
recordId: null, //维修记录id
@@ -590,9 +587,9 @@ function ShowEdit(item = undefined, isEdit = true,formEl=undefined) {
return { name: v.imageId, url: v.imageUrl, id: v.imageId };
});
- if (!formEl) return
+ if (!formEl) return;
- formEl.validate();
+ formEl.validate();
}
if (item) {
selectedRow.value['deviceName'] = item.deviceName;
@@ -671,80 +668,79 @@ var dropImg = (type, file, index) => {
//保存表单数据
function SaveFormData(formEl: FormInstance | undefined) {
if (!cEdit.isEdit) {
+ CloseEdit();
return;
}
- if (!formEl) return
+ if (!formEl) return;
- let submit=()=>{
- showloading('fullLoading');
- setTimeout(() => {
- let promise = null;
+ let submit = () => {
+ showloading('fullLoading');
+ setTimeout(() => {
+ let promise = null;
- let formData = new FormData();
+ let formData = new FormData();
- let keys = Object.keys(cEdit);
- for (let i = 0; i < keys.length; i++) {
- let key = keys[i];
- if (key == 'isEdit') {
- continue;
+ let keys = Object.keys(cEdit);
+ for (let i = 0; i < keys.length; i++) {
+ let key = keys[i];
+ if (key == 'isEdit') {
+ continue;
+ }
+ if (cEdit[key] === null || cEdit[key] === undefined) {
+ continue;
+ }
+ formData.append(key, cEdit[key]);
}
- if (cEdit[key] === null || cEdit[key] === undefined) {
- continue;
- }
- formData.append(key, cEdit[key]);
- }
- // 添加第一个控件的文件
- if (beforeFile.value.length > 0) {
- for (let i = 0; i < beforeFile.value.length; i++) {
- let file = beforeFile.value[i];
- if (file && !file.id) {
- formData.append('beforeFile', file);
+ // 添加第一个控件的文件
+ if (beforeFile.value.length > 0) {
+ for (let i = 0; i < beforeFile.value.length; i++) {
+ let file = beforeFile.value[i];
+ if (file && !file.id) {
+ formData.append('beforeFile', file);
+ }
}
}
- }
- if (afterFile.value.length > 0) {
- // formData.append('afterFile', afterFile.value[0]);
+ if (afterFile.value.length > 0) {
+ // formData.append('afterFile', afterFile.value[0]);
- for (let i = 0; i < afterFile.value.length; i++) {
- let file = afterFile.value[i];
- if (file && !file.id) {
- formData.append('afterFile', file);
+ for (let i = 0; i < afterFile.value.length; i++) {
+ let file = afterFile.value[i];
+ if (file && !file.id) {
+ formData.append('afterFile', file);
+ }
}
}
- }
- if (cEdit.recordId) {
- promise = api.updateRepair(formData);
- } else {
- promise = api.addRepir(formData);
- }
+ if (cEdit.recordId) {
+ promise = api.updateRepair(formData);
+ } else {
+ promise = api.addRepir(formData);
+ }
- promise
- .then((res) => {
- if (res.code == 200) {
- alert('操作成功');
- CloseEdit();
- Search();
- } else {
- alert(res.msg);
- }
- })
- .finally(() => {
- ResetFormData();
- hideloading();
- });
- }, 0);
- }
+ promise
+ .then((res) => {
+ if (res.code == 200) {
+ alert('操作成功');
+ CloseEdit();
+ Search();
+ } else {
+ alert(res.msg);
+ }
+ })
+ .finally(() => {
+ ResetFormData();
+ hideloading();
+ });
+ }, 0);
+ };
formEl.validate((valid) => {
if (valid) {
submit();
- }
- })
-
-
+ }
+ });
}
//导出
@@ -1079,12 +1075,16 @@ input:focus {
}
:deep .el-upload-list--picture-card .el-upload-list__item .el-upload-list__item,
-.el-upload-list--picture-card .el-upload-list__item .el-upload-list__item{
- margin:0px ;
+.el-upload-list--picture-card .el-upload-list__item .el-upload-list__item {
+ margin: 0px;
}
// :deep .el-upload-list__item,.el-upload-list__item{
// margin-right: 8px !important;
// }
+:deep .hide-add-btn .el-upload.is-disabled,
+.hide-add-btn .el-upload.is-disabled {
+ display: none !important;
+}
diff --git a/src/views/system/user/profile/appVer.vue b/src/views/system/user/profile/appVer.vue
new file mode 100644
index 0000000..000a39d
--- /dev/null
+++ b/src/views/system/user/profile/appVer.vue
@@ -0,0 +1,83 @@
+
+
+
+ 保存
+
+
+
+
+
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 97d70ae..4618fa4 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -61,6 +61,9 @@
+
+
@@ -78,7 +81,7 @@ import { getAuthList } from '@/api/system/social/auth';
import { getUserProfile } from '@/api/system/user';
import { getOnline } from '@/api/monitor/online';
import { UserVO } from '@/api/system/user/types';
-
+import appVer from './appVer.vue';
const activeTab = ref('userinfo');
interface State {
user: Partial;
@@ -86,13 +89,15 @@ interface State {
postGroup: string;
auths: any;
devices: any;
+ vers: any;
}
const state = ref({
user: {},
roleGroup: '',
postGroup: '',
auths: [],
- devices: []
+ devices: [],
+ vers: ''
});
const userForm = ref({});
+
+
+
+
+
+
+
+
+