修改提示

This commit is contained in:
zhangyc
2022-12-07 08:50:51 +08:00
parent 30b68631cb
commit 4ed7a4398d
7 changed files with 28 additions and 33 deletions

21
package-lock.json generated
View File

@@ -3579,8 +3579,6 @@
"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz", "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
"dev": true, "dev": true,
"optional": true,
"peer": true,
"dependencies": { "dependencies": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0", "json-schema-traverse": "^1.0.0",
@@ -3592,9 +3590,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true, "dev": true
"optional": true,
"peer": true
}, },
"node_modules/ajv-keywords": { "node_modules/ajv-keywords": {
"version": "3.5.2", "version": "3.5.2",
@@ -13727,6 +13723,7 @@
"integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==", "integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/core": "^7.12.16",
"@babel/helper-compilation-targets": "^7.12.16", "@babel/helper-compilation-targets": "^7.12.16",
"@babel/helper-module-imports": "^7.12.13", "@babel/helper-module-imports": "^7.12.13",
"@babel/plugin-proposal-class-properties": "^7.12.13", "@babel/plugin-proposal-class-properties": "^7.12.13",
@@ -13739,6 +13736,7 @@
"@vue/babel-plugin-jsx": "^1.0.3", "@vue/babel-plugin-jsx": "^1.0.3",
"@vue/babel-preset-jsx": "^1.1.2", "@vue/babel-preset-jsx": "^1.1.2",
"babel-plugin-dynamic-import-node": "^2.3.3", "babel-plugin-dynamic-import-node": "^2.3.3",
"core-js": "^3.8.3",
"core-js-compat": "^3.8.3", "core-js-compat": "^3.8.3",
"semver": "^7.3.4" "semver": "^7.3.4"
}, },
@@ -14577,14 +14575,15 @@
"resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz", "resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
"dev": true, "dev": true,
"requires": {}, "requires": {
"ajv": "^8.0.0"
},
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz", "version": "8.11.0",
"resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
"dev": true, "dev": true,
"optional": true,
"peer": true,
"requires": { "requires": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0", "json-schema-traverse": "^1.0.0",
@@ -14596,9 +14595,7 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true, "dev": true
"optional": true,
"peer": true
} }
} }
}, },

View File

@@ -303,13 +303,13 @@ export default {
}) })
.then(() => { .then(() => {
message.destroy(); message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
}); });
} }
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
@@ -327,13 +327,13 @@ export default {
}) })
.then(() => { .then(() => {
message.destroy(); message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
}); });
} }
} }

View File

@@ -203,11 +203,11 @@ export default {
type: 10, type: 10,
}) })
.then(() => { .then(() => {
message.destroy() //message.destroy()
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
}) })
.catch(() => { .catch(() => {
message.destroy() // message.destroy()
//message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {

View File

@@ -711,7 +711,7 @@ export default {
await ProjectEditTask(editObj) await ProjectEditTask(editObj)
.then(() => { .then(() => {
console.log("props.EditFaceId", props.EditFaceId); console.log("props.EditFaceId", props.EditFaceId);
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
}) })
.catch(() => { .catch(() => {
//message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`); //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);

View File

@@ -251,12 +251,12 @@ export default {
type: 11, type: 11,
}) })
.then(() => { .then(() => {
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
}); });
} else if (props.isLevel == 3) { } else if (props.isLevel == 3) {
addTempTask({ addTempTask({
@@ -269,13 +269,13 @@ export default {
}) })
.then(() => { .then(() => {
message.destroy(); message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
}) })
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
}); });
} }
}; };

View File

@@ -540,7 +540,7 @@ export default {
.then(() => { .then(() => {
message.destroy(); message.destroy();
message.success( message.success(
`${props.edit ? "编辑" : "新增"}阶段任务成功` `${props.edit ? "编辑" : "新增"}任务成功`
); );
ctx.emit("changeData", false); ctx.emit("changeData", false);
closeDrawer(); closeDrawer();
@@ -548,7 +548,7 @@ export default {
.catch(() => { .catch(() => {
message.destroy(); message.destroy();
message.error( message.error(
`${props.edit ? "编辑" : "新增"}阶段任务失败` `${props.edit ? "编辑" : "新增"}任务失败`
); );
}); });
}); });

View File

@@ -712,12 +712,10 @@
<div class="btn btn5" @click="ft_exit_1"> <div class="btn btn5" @click="ft_exit_1">
<div class="btnText">取消</div> <div class="btnText">取消</div>
</div> </div>
<div class="btn btn6" v-if="isEdit == 0" @click="handlePush"> <div class="btn btn6" @click="handlePush">
<div class="btnText">保存</div> <div class="btnText">保存</div>
</div> </div>
<div class="btn btn6" v-if="isEdit == 1">
<div class="btnText">未提交</div>
</div>
<div <div
class="btn btn6" class="btn btn6"
v-if="statusTingQi == 1" v-if="statusTingQi == 1"
@@ -4719,7 +4717,7 @@ export default defineComponent({
// ft_exit_1(); // ft_exit_1();
rest(); rest();
state.addLoading = false; state.addLoading = false;
state.isEdit = 1;
state.statusTingQi = 1; state.statusTingQi = 1;
// console.log("res.data", res.data); // console.log("res.data", res.data);
if (param === "review") { if (param === "review") {
@@ -5252,7 +5250,7 @@ export default defineComponent({
state.isEdit = 0;
console.log(45555); console.log(45555);
console.log(itm); console.log(itm);
if (type === "1") { if (type === "1") {
@@ -5324,7 +5322,7 @@ export default defineComponent({
state.lookCourseModal = false; state.lookCourseModal = false;
}; };
const handleLook = async (itm, type) => { const handleLook = async (itm, type) => {
// state.isEdit = 0;
if (type === "1") { if (type === "1") {
return; return;
} }