|
@@ -306,6 +306,7 @@ import { container, ImageExtend, QuillWatch } from "quill-image-extend-module";
|
|
|
Quill.register("modules/ImageExtend", ImageExtend);
|
|
|
import ScoreResultsTable from "./ScoreResultsTable.vue";
|
|
|
import rules from "./rules";
|
|
|
+import { resolve } from "path";
|
|
|
const defaultDate = {
|
|
|
groupId: new Date().valueOf().toString(),
|
|
|
issueId: new Date().valueOf().toString() + "-" + new Date().valueOf(),
|
|
@@ -509,32 +510,9 @@ export default {
|
|
|
onEditorChange(e) {
|
|
|
e.quill.deleteText(1000, 4);
|
|
|
console.log(e.quill.getLength());
|
|
|
- // if(e.quill.getLength()>1000){
|
|
|
-
|
|
|
- // }
|
|
|
- // if(this.form.intro==''){
|
|
|
- // this.TiLength=0
|
|
|
- // }else{
|
|
|
- // this.TiLength=e.quill.getLength()-1
|
|
|
- // }
|
|
|
+ // e.quill.getLength()>1000
|
|
|
},
|
|
|
- // 提交 (父级调用)
|
|
|
- assessCommit() {
|
|
|
- this.$refs["scaleFormRef"].validate((valid) => {
|
|
|
- console.log(valid);
|
|
|
- if (valid) {
|
|
|
- } else {
|
|
|
- return false;
|
|
|
- }
|
|
|
- });
|
|
|
- console.log(123);
|
|
|
- this.$refs["ScoreResultsRef"].validate((valid) => {
|
|
|
- console.log(valid);
|
|
|
- if (valid) {
|
|
|
- } else {
|
|
|
- return false;
|
|
|
- }
|
|
|
- });
|
|
|
+ formtParams() {
|
|
|
// 提交数据的处理 start....
|
|
|
// 1. 新建一个整体对象
|
|
|
const params = {
|
|
@@ -711,10 +689,44 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
|
|
|
- console.dir(params);
|
|
|
-
|
|
|
+ return params;
|
|
|
// 提交数据的处理 end....
|
|
|
},
|
|
|
+ // 提交 (父级调用)
|
|
|
+ assessCommit() {
|
|
|
+ // new Promise((resolve))
|
|
|
+ let valid1 = new Promise((resolve, reject) => {
|
|
|
+ this.$refs["scaleFormRef"].validate((valid) => {
|
|
|
+ console.log(valid);
|
|
|
+ if (valid) {
|
|
|
+ resolve();
|
|
|
+ } else {
|
|
|
+ reject();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ let valid2 = new Promise((resolve, reject) => {
|
|
|
+ this.$refs["ScoreResultsRef"].validate((valid) => {
|
|
|
+ console.log(valid);
|
|
|
+ if (valid) {
|
|
|
+ resolve();
|
|
|
+ } else {
|
|
|
+ reject();
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ console.log(123);
|
|
|
+ Promise.all([valid1, valid2])
|
|
|
+ .then(() => {
|
|
|
+ console.log("allllll");
|
|
|
+ console.dir(this.formtParams());
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ console.log("fillllll");
|
|
|
+ });
|
|
|
+ },
|
|
|
/**
|
|
|
* 增/删/得分结果表格
|
|
|
* @param type : 1:add 0:remove
|