+ >
+
+ {{ scope.row.type | typeText(rulesTypeList) }}
+
+
-
+ > -->
+
+
+
-
+
删除
@@ -264,6 +276,12 @@ import {
export default {
data() {
return {
+ rulesTypeList: [
+ { name: "人员日常考勤", value: 1 },
+ { name: "每个项目自检任务", value: 2 },
+ { name: "一个月内缺勤超过", value: 3 },
+ { name: "一个月内迟到超过", value: 4 },
+ ],
pageInfo: {
total: 0,
pageNo: 1,
@@ -305,8 +323,14 @@ export default {
this.getDataList();
this.getProjectDetailFn();
},
+ filters: {
+ typeText(val, list) {
+ let findItem = list.find((item) => val == item.value);
+ return findItem ? findItem.name : "";
+ },
+ },
methods: {
- enterpriseChange(e,index) {
+ enterpriseChange(e, index) {
this.getPersonListFn(e);
this.dialogPushList[index].userId = [];
},
@@ -353,34 +377,38 @@ export default {
this.getEnterpriseListFn();
},
// 删除弹窗数据
- deleteDialogItem(obj) {
- this.$confirm("请确认是否删除?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- SafeWatchManagerDeleteApi({ id: obj.id }).then((res) => {
- if (res.success) {
- this.getDialogDataList();
- this.$message({
- type: "success",
- message: "删除成功!",
- });
- } else {
- this.$message({
- type: "error",
- message: res.message,
- });
- }
- });
+ deleteDialogItem(obj,index) {
+ if(obj.id){
+ this.$confirm("请确认是否删除?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
})
- .catch(() => {
- this.$message({
- type: "info",
- message: "已取消删除",
+ .then(() => {
+ SafeWatchManagerDeleteApi({ id: obj.id }).then((res) => {
+ if (res.success) {
+ this.getDialogDataList();
+ this.$message({
+ type: "success",
+ message: "删除成功!",
+ });
+ } else {
+ this.$message({
+ type: "error",
+ message: res.message,
+ });
+ }
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "已取消删除",
+ });
});
- });
+ } else {
+ this.dialogPushList.splice(index,1)
+ }
},
// 切换弹窗保存
saveDialogForm(obj, index) {
@@ -407,7 +435,7 @@ export default {
},
// 切换弹窗编辑
editDialogForm(index) {
- console.log(this.dialogPushList[index])
+ console.log(this.dialogPushList[index]);
this.getPersonListFn(this.dialogPushList[index].enterpriseId);
if (this.dialogPushList[index].userId) {
this.dialogPushList[index].userId =
@@ -466,7 +494,7 @@ export default {
let reqeustData = {
projectSn: this.$store.state.projectSn,
enableWorkerSafeWatch: this.radioVal,
- workerSafeWatchTime: this.alarmTime
+ workerSafeWatchTime: this.alarmTime,
};
editProjectInfo(reqeustData).then((res) => {
if (res.success) {
@@ -497,9 +525,9 @@ export default {
// }
SafeWatchManagerListApi(requestData).then((res) => {
that.dialogPushList = [];
- res.result.map(item => {
- that.dialogPushList.push({...item,isEdit: false})
- })
+ res.result.map((item) => {
+ that.dialogPushList.push({ ...item, isEdit: false });
+ });
});
},
getDataList() {
@@ -516,9 +544,9 @@ export default {
SafeWatchConfigPageApi(requestData).then((res) => {
let responseData = [...res.result.records];
that.rulesList = [];
- responseData.map(item => {
- that.rulesList.push({...item,isEdit: false})
- })
+ responseData.map((item) => {
+ that.rulesList.push({ ...item, isEdit: false });
+ });
that.pageInfo.total = res.result.total;
});
},
diff --git a/src/views/projectFront/progressManagementAg/progressApproval.vue b/src/views/projectFront/progressManagementAg/progressApproval.vue
index 1dca580b..cf823ad6 100644
--- a/src/views/projectFront/progressManagementAg/progressApproval.vue
+++ b/src/views/projectFront/progressManagementAg/progressApproval.vue
@@ -140,6 +140,7 @@
prop="rejectReason"
align="center"
label="驳回原因"
+ show-overflow-tooltip
>
diff --git a/src/views/userCenter/userCenter/componentsModule/dataInfoFormData.vue b/src/views/userCenter/userCenter/componentsModule/dataInfoFormData.vue
new file mode 100644
index 00000000..2006b381
--- /dev/null
+++ b/src/views/userCenter/userCenter/componentsModule/dataInfoFormData.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+ {{
+ $store.state.userInfo.account
+ }}
+
+
+
+ ![]()
+
+
+ 上传头像
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 清空
+ 确认
+
+
+
+
+ ![]()
+
+