-
selectValue = e">
+
任意词
@@ -27,28 +27,28 @@
-
- 规章制度
-
-
- 工作流程
-
-
- 岗位工作及标准
-
-
- 表单中心
-
-
- 部门工作职责
+
+ 任意词
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- 搜 索
+ 搜 索
@@ -61,7 +61,7 @@
常用搜索
- {{ i }}{{ index !== 3 ? ' | ' : '' }}
+ {{ i }}{{ index !== 3 ? ' | ' : '' }}
@@ -81,11 +81,17 @@ export default {
data() {
return {
popoverShow: false,
- selectValue: '搜索内部资料',
+ selectLabel: '搜索内部资料',
+ selectValue: '',
inputValue: '',
}
},
- methods: {},
+ methods: {
+ search () {
+
+ this.$router.push(`/index/list${this.selectValue == 2 ? '2' : '1'}?leixing=${this.selectValue}&keyword=${this.inputValue}&t=${new Date().getTime()}`)
+ }
+ },
computed: {},
mounted() {
this.popoverShow = true
diff --git a/src/utils/request.js b/src/utils/request.js
index 91800c5..9aeb4b2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,7 +21,6 @@ const service = axios.create({
// request interceptor
service.interceptors.request.use(
config => {
- console.log(config)
if(config.isLoading){
loading = Loading.service({
lock:true,
diff --git a/src/views/component/biaoqian.vue b/src/views/component/biaoqian.vue
index 8426d03..250cdbd 100644
--- a/src/views/component/biaoqian.vue
+++ b/src/views/component/biaoqian.vue
@@ -20,7 +20,7 @@
infinite-scroll-disabled="disabled"
@change="change"
>
- {{
+ {{
item.mingcheng
}}
@@ -34,6 +34,7 @@
-
-
diff --git a/src/views/component/table.vue b/src/views/component/table.vue
index 2f419cc..fd4e367 100644
--- a/src/views/component/table.vue
+++ b/src/views/component/table.vue
@@ -314,14 +314,14 @@
:field-info="fieldInfo"
:form="form"
:file="file"
- @update="(val) => (form['fujian'] = val)"
+ @update="(val) => ($set(file, 'fujian', val))"
>
(form['biaoqian_tags_id_relation'] = val)"
+ @update="(val) => (form['id_material_biaoqian_tags_material_id_relation'] = val)"
>
@@ -360,7 +360,6 @@ import drawer from "@/views/component/drawer.vue";
import imports from "./imports.vue";
import flow from "@/views/flow/flow.vue";
import biaoqian from "./biaoqian.vue";
-import fujian from "./fujian.vue";
import examine from "./examine.vue";
export default {
components: {
@@ -373,7 +372,6 @@ export default {
flow,
biaoqian,
- fujian,
},
mixins: [authMixin],
provide: {
@@ -499,7 +497,7 @@ export default {
//初始表
let baseTable = new Map([
[
- "departments",
+ "material_shenhebumen_depts",
async () => {
const res = await listdept();
return res;
@@ -527,7 +525,7 @@ export default {
throw new Error("fields或relation格式错误");
}
fieldRes?.data?.forEach((i, index) => {
- i._relations = relation.find((j) => j.local_key === i.field);
+ i._relations = relation.find((j) => j.link_table_name.split('_')[1] === i.field);
if (i.select_item && typeof i.select_item === "object") {
let keys = Object.keys(i.select_item);
i._params = keys.map((key) => {
@@ -625,7 +623,7 @@ export default {
return (
{row[link_with_name]?.map((o) => (
-
{o?.name || o?.no || o?.value}
+
{ o?.name || o?.no || o?.value || o?.biaoti || o?.mingcheng }
))}
);
diff --git a/src/views/flow/flow.vue b/src/views/flow/flow.vue
index 25aa707..3750221 100644
--- a/src/views/flow/flow.vue
+++ b/src/views/flow/flow.vue
@@ -9,13 +9,17 @@
ref="upload"
:action="action"
:file-list="fileList"
- :auto-upload="false">
+ :auto-upload="false"
+ :before-upload="beforeUpload"
+ :on-success="onSuccess"
+ :on-remove="onRemove"
+ :on-error="onError">
选取文件
- 上传到服务器
+ 上传到服务器
只能上传jpg/png文件,且不超过500kb
-
+
@@ -33,27 +37,50 @@ export default {
data() {
return {
action: process.env.VUE_APP_UPLOAD_API,
- selections: [],
+ fileList: []
}
},
methods: {
- selectedHandler (ids) {
- this.selections = Array.from(new Set(ids))
+ selectedHandler (selections) {
+ this.fileList.push(...selections)
+ this.$emit('update', this.fileList)
+ },
- this.$emit('update', this.selections)
- }
+ beforeUpload (file) {
+ if (file.size / 1000 > 500) {
+ this.$message({
+ type: "warning",
+ message: "上传图片大小超过500kb!",
+ });
+ return false;
+ }
+ },
+
+ onSuccess (response, file, fileList) {
+ this.fileList = fileList;
+ this.$emit('update', this.fileList)
+ },
+
+ onRemove (file, fileList) {
+ this.fileList = fileList;
+ },
+
+ onError (err, file, fileList) {
+ this.fileList = fileList;
+ this.$message({
+ type: "warning",
+ message: err,
+ });
+ },
},
computed: {
- fileList () {
- return (this.file && this.fieldInfo?.field) ? this.file[this.fieldInfo.field] : []
- },
},
watch: {
- form: {
- handler(newVal) {
- this.selections = newVal[this.fieldInfo.field]
+ 'form.id_material_fujian_uploads_material_id_relation': {
+ handler (newVal) {
+ this.fileList = newVal
},
- immediate: true
+ deep: true
}
}
}
diff --git a/src/views/flow/formList.vue b/src/views/flow/formList.vue
index 7c13234..9c0b5c1 100644
--- a/src/views/flow/formList.vue
+++ b/src/views/flow/formList.vue
@@ -22,7 +22,7 @@
取 消
- 确 定
+ 确 定
@@ -31,9 +31,6 @@
diff --git a/src/views/reception/home/index.vue b/src/views/reception/home/index.vue
index f5988b5..962f045 100644
--- a/src/views/reception/home/index.vue
+++ b/src/views/reception/home/index.vue
@@ -7,13 +7,22 @@