diff --git a/src/components/scEditor/index.vue b/src/components/scEditor/index.vue
index 46c7855..c946dd9 100644
--- a/src/components/scEditor/index.vue
+++ b/src/components/scEditor/index.vue
@@ -49,9 +49,9 @@ export default {
},
toolbar: {
type: [String, Array],
- default: 'undo redo | forecolor backcolor bold italic underline strikethrough link | formatselect fontselect fontsizeselect | \
+ default: 'undo redo | forecolor backcolor bold italic underline strikethrough link image | formatselect fontselect fontsizeselect | \
alignleft aligncenter alignright alignjustify outdent indent lineheight | bullist numlist | \
- image table preview | code selectall'
+ table preview | code selectall'
}
},
data () {
@@ -72,6 +72,7 @@ export default {
resize: true,
elementpath: true,
content_style: "",
+ convert_urls: false,
images_upload_handler: async (blobInfo, success, failure) => {
const data = new FormData();
data.append("file", blobInfo.blob(), blobInfo.filename());
diff --git a/src/views/examine/exhibit.vue b/src/views/examine/exhibit.vue
index 1793a3b..4e229ef 100644
--- a/src/views/examine/exhibit.vue
+++ b/src/views/examine/exhibit.vue
@@ -4,6 +4,12 @@
+
+
+
+
+
+
@@ -40,10 +46,29 @@
+
+
+ 未审核
+ 通过
+ 拒绝
+
+
+
+
+ {{ scope.row.examineUser }}
+ 暂无
+
+
+
+
+ {{ scope.row.examineDate }}
+ 暂无
+
+
审核
+ @click.stop="getdetail('审核', scope.row.id)" v-if="scope.row.examineState == '0'">审核
@@ -111,6 +136,20 @@ export default {
},
multipleSelection: [],
ids: '',
+ selectValue: '',
+ options: [{
+ value: '',
+ label: '全部'
+ }, {
+ value: '1',
+ label: '已通过'
+ }, {
+ value: '2',
+ label: '未通过'
+ }, {
+ value: '0',
+ label: '未审核'
+ }],
}
},
created() {
@@ -137,6 +176,7 @@ export default {
//获取数据
getData() {
let parame = {
+ examineState: this.selectValue,
title: this.value1,
page: this.currentPage,
size: this.pageSize
diff --git a/src/views/examine/order.vue b/src/views/examine/order.vue
index 3acdc11..d3e84a4 100644
--- a/src/views/examine/order.vue
+++ b/src/views/examine/order.vue
@@ -4,6 +4,12 @@
+
+
+
+
+
+
@@ -25,10 +31,29 @@
+
+
+ 未审核
+ 通过
+ 拒绝
+
+
+
+
+ {{ scope.row.examineUser }}
+ 暂无
+
+
+
+
+ {{ scope.row.examineDate }}
+ 暂无
+
+
审核
+ @click.stop="getdetail('审核', scope.row.id)" v-if="scope.row.examineState == '0'">审核
@@ -96,6 +121,20 @@ export default {
},
multipleSelection: [],
ids: '',
+ selectValue: '',
+ options: [{
+ value: '',
+ label: '全部'
+ }, {
+ value: '1',
+ label: '已通过'
+ }, {
+ value: '2',
+ label: '未通过'
+ }, {
+ value: '0',
+ label: '未审核'
+ }],
}
},
created() {
@@ -123,6 +162,7 @@ export default {
//获取数据
getData() {
let parame = {
+ examineState: this.selectValue,
title: this.value1,
page: this.currentPage,
size: this.pageSize
diff --git a/src/views/examine/works.vue b/src/views/examine/works.vue
index 514e363..3feafb6 100644
--- a/src/views/examine/works.vue
+++ b/src/views/examine/works.vue
@@ -4,6 +4,12 @@
+
+
+
+
+
+
@@ -27,10 +33,29 @@
{{ scope.row.typeName }} - {{ scope.row.typesName }}
+
+
+ 未审核
+ 通过
+ 拒绝
+
+
+
+
+ {{ scope.row.examineUser }}
+ 暂无
+
+
+
+
+ {{ scope.row.examineDate }}
+ 暂无
+
+
审核
+ @click.stop="getdetail('审核', scope.row.id)" v-if="scope.row.examineState == '0'">审核
@@ -98,6 +123,20 @@ export default {
},
multipleSelection: [],
ids: '',
+ selectValue: '',
+ options: [{
+ value: '',
+ label: '全部'
+ }, {
+ value: '1',
+ label: '已通过'
+ }, {
+ value: '2',
+ label: '未通过'
+ }, {
+ value: '0',
+ label: '未审核'
+ }],
}
},
created() {
@@ -124,6 +163,7 @@ export default {
//获取数据
getData() {
let parame = {
+ examineState: this.selectValue,
title: this.value1,
page: this.currentPage,
size: this.pageSize
diff --git a/src/views/grape/components/grapeDialogForm.vue b/src/views/grape/components/grapeDialogForm.vue
index 6683eb0..e970497 100644
--- a/src/views/grape/components/grapeDialogForm.vue
+++ b/src/views/grape/components/grapeDialogForm.vue
@@ -37,7 +37,7 @@
+ :placeholder="formColumn.placeholder" :height="450">
-
+