diff --git a/src/api/system/role.js b/src/api/system/role.js index f7fb0a7..3d9555d 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -85,3 +85,12 @@ export const getRoleTree = (tenantId) => { } }) } + +export const honePageData = () => { + return request({ + url: '/api/daf-system/role/honePageData', + method: 'get', + params: {} + }) +} + diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index ae37848..b0b880c 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -60,7 +60,8 @@ :upload-before="uploadBefore" :upload-after="uploadAfter" :upload-preview="(file) => handleUploadPreview(file)" - :upload-delete="(file) => handleUploadDelete(file)"> + :upload-delete="(file) => handleUploadDelete(file)" + :upload-exceed="uploadExceed"> @@ -880,6 +881,7 @@ console.log(form) document_update(form).then(() => { done(form); + this.document_onLoad(this.page); this.$message({ type: "success", message: "操作成功!" @@ -987,6 +989,11 @@ document_onLoad(row, params = {}) { this.loading = true; document_getListBylegerId(this.$route.query.id).then(res => { + for (var index = 0; index < res.data.data.length; index ++) { + if (res.data.data[index].prAccessoryName) { + res.data.data[index].accessoryNameExt = [{ label: res.data.data[index].prAccessoryName }]; + } + } this.document_data = res.data.data; this.loading = false; }); @@ -1004,6 +1011,7 @@ } }, uploadAfter(response, done) { + console.log(response) // response 是服务器响应 this.document_form.accessoryName = response.fileName; this.document_form.prAccessoryName = response.name; @@ -1014,8 +1022,13 @@ return false; }, handleUploadDelete(file) { + this.document_form.accessoryNameExt = []; this.document_form.accessoryName = ''; this.document_form.prAccessoryName = ''; + }, + uploadExceed (limit, files, fileList, column) { + console.log(limit, files, fileList, column) + this.$message.error('超出上传限制文件数量') } } } diff --git a/src/views/smart/workorderDetail.vue b/src/views/smart/workorderDetail.vue index d67886a..e82638d 100644 --- a/src/views/smart/workorderDetail.vue +++ b/src/views/smart/workorderDetail.vue @@ -372,6 +372,7 @@ cancelButtonText: "取消", type: "warning" }).then(() => { + this.tab1_form.approvalStatus = 1; add(this.tab1_form).then(() => { this.$router.push({ path: "/smart/workorder", diff --git a/src/views/spares/materialclassification.vue b/src/views/spares/materialclassification.vue index b56c794..804042d 100644 --- a/src/views/spares/materialclassification.vue +++ b/src/views/spares/materialclassification.vue @@ -62,12 +62,12 @@ searchShowBtn: false, column: [ { - label: "物资分配码", + label: "物资分类码", prop: "code", search: true, rules: [{ required: true, - message: "请输入物资分配码", + message: "请输入物资分类码", trigger: "blur" }] }, @@ -75,15 +75,9 @@ label: "物资类型", search: true, prop: "type", - type: "select", - dicUrl: "/api/daf-system/dict/dictionary?code=supplies_type", - props: { - label: "dictValue", - value: "dictKey" - }, rules: [{ required: true, - message: "请输入物资分配码", + message: "请输入物资类型", trigger: "blur" }] }, diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index 430dc26..d043365 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -77,47 +77,64 @@
审核信息

今日待审核

-
- + +
+ +
-
-
待审核设备台账
-
-
-
一致性 Consistency
-
-
-
一致性 Consistency
-
-
-
-
待审核智能两票
+
+
+
待审核设备台账
+
+
+
{{item.eqLedgerCode}}号设备台账待审核
+
+
+
{{item.toolsCodeId}}号工器具编码待审核
+
-
-
一致性 Consistency
+
+
+
待审核智能两票
+
+
+
{{item.operationTicketNo}}号操作票待审核
+
+
+
{{item.workTicketNo}}号工作票待审核
+
-
-
一致性 Consistency
+
+
+
待审核备件管理
+
+
+
{{item.code}}号仓库待审核
+
+
+
{{item.materialNo}}号物资待审核
+
+
+
{{item.creditCode}}号制造商待审核
+
+
+
{{item.creditCode}}号供应商待审核
+
-
-
-
待审核备件管理
-
-
-
一致性 Consistency
-
-
-
一致性 Consistency
-
-
-
-
待审核工单
-
-
-
一致性 Consistency
-
-
-
一致性 Consistency
+
+
+
待审核工单
+
+
+
{{item.workOrderNo}}号工单待审核
+
@@ -137,25 +154,40 @@ import {mapGetters} from "vuex"; // import * as echarts from 'echarts'; // import {dayLineStatistics , activities} from '@/api/desk/dashboard' + import {honePageData} from "@/api/system/role"; export default { name: "wel", data() { return { - data:[], + homePageData: {}, skeleton: false, - option: { - span:6, - data: [] - }, + auditSkeleton: false, }; }, computed: { ...mapGetters(["userInfo"]), }, mounted() { - + this.auditLoad(); }, methods: { + auditLoad(){ + this.auditSkeleton = true; + honePageData().then(res => { + this.homePageData = res.data.data; + this.auditSkeleton = false; + this.selectionClear(); + }); + }, + skip(path, id){ + this.$router.push({ + path: path, + query: { + frameMode:"search", + id: id + }, + }); + } } };