diff --git a/src/api/leger/dynamicledger.js b/src/api/leger/dynamicledger.js
new file mode 100644
index 0000000..b602d00
--- /dev/null
+++ b/src/api/leger/dynamicledger.js
@@ -0,0 +1,77 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/leger/dynamicledger/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getDetail = (id) => {
+ return request({
+ url: '/api/leger/dynamicledger/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/leger/dynamicledger/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/api/leger/dynamicledger/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/leger/dynamicledger/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const getWorkOrderbyKksEncoding = (kksEncoding) => {
+ return request({
+ url: '/api/leger/dynamicledger/workOrder',
+ method: 'get',
+ params: {
+ kksEncoding
+ }
+ })
+}
+export const getworkticketbyKksEncoding = (kksEncoding) => {
+ return request({
+ url: '/api/leger/dynamicledger/workticket',
+ method: 'get',
+ params: {
+ kksEncoding
+ }
+ })
+}
+export const getoperationbyKksEncoding = (kksEncoding) => {
+ return request({
+ url: '/api/leger/dynamicledger/operation',
+ method: 'get',
+ params: {
+ kksEncoding
+ }
+ })
+}
diff --git a/src/views/leger/dynamicledger.vue b/src/views/leger/dynamicledger.vue
index 0b1d662..7dba125 100644
--- a/src/views/leger/dynamicledger.vue
+++ b/src/views/leger/dynamicledger.vue
@@ -24,7 +24,7 @@
</template>
<script>
-import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/leger/equipmentledger";
+import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/leger/dynamicledger";
import {mapGetters} from "vuex";
import website from "@/config/website";
import {getToken} from "@/util/auth";
@@ -58,7 +58,7 @@ export default {
column: [
{
label: "场站",
- prop: "station",
+ prop: "status",
type: "select",
search: true,
hide: true,
@@ -80,11 +80,11 @@ export default {
},
{
label: "工单",
- prop: "workorder",
+ prop: "workOrder",
},
{
label: "工作票",
- prop: "workticket",
+ prop: "workTicket",
},
{
label: "操作票",
@@ -95,12 +95,18 @@ export default {
prop: "startDate",
search: true,
hide: true,
+ type: "date",
+ format: 'yyyy/MM/dd',
+ valueFormat: "yyyyMMdd",
},
{
label: "结束日期",
prop: "endDate",
search: true,
hide: true,
+ type: "date",
+ format: 'yyyy/MM/dd',
+ valueFormat: "yyyyMMdd",
},
]
},
@@ -136,7 +142,7 @@ export default {
query: {
frameMode:"search",
id: row.id,
- station: row.station,
+ station: row.status,
kksEncoding: row.kksEncoding,
kksDescription: row.kksDescription
},
diff --git a/src/views/leger/dynamicledgerDetail.vue b/src/views/leger/dynamicledgerDetail.vue
index 002c4f6..2b70670 100644
--- a/src/views/leger/dynamicledgerDetail.vue
+++ b/src/views/leger/dynamicledgerDetail.vue
@@ -41,7 +41,6 @@
:table-loading="loading"
:option="optionWorkOrder"
:permission="permissionList"
- :before-open="beforeOpen"
:header-cell-class-name="headerClass"
v-model="workorder_form"
ref="workorder_crud">
@@ -74,25 +73,10 @@
</basic-container>
</template>
<script>
-import {getList, getDetail, add, update, remove} from "@/api/leger/equipmentledger";
-import {
- parameters_add,
- parameters_update,
- parameters_remove,
- parameters_getListBylegerId,
- parameters_Del
-} from "@/api/leger/techparameters";
-import {
- document_add,
- document_update,
- document_remove,
- document_getListBylegerId,
- document_Del
-} from "@/api/leger/inventorydocument";
+import {getWorkOrderbyKksEncoding, getworkticketbyKksEncoding, getoperationbyKksEncoding} from "@/api/leger/dynamicledger";
import {mapGetters} from "vuex";
-import website from "@/config/website";
-import {readonly} from "vue";
-import {getToken} from "@/util/auth";
+import {Alert} from "element-ui";
+
export default {
name: "dynamicledgerDetail",
data () {
@@ -115,6 +99,7 @@ export default {
kksDesValue:this.$route.query.kksDescription,
frame_class: '',
type: {},
+ workorder_form:{},
shouldShowButton:{},
addUpdateShowButton:{},
readonlyForm:{},
@@ -131,7 +116,8 @@ export default {
}
]
},
- workorder_form: {},
+ loading: true,
+ workorder_data: {},
optionWorkOrder: {
align: 'center',
menuAlign: 'center',
@@ -147,35 +133,65 @@ export default {
column: [
{
label: "工单编号",
- prop: "orderNo",
+ prop: "workOrderNo",
},
{
label: "工单类型",
- prop: "orderType",
+ prop: "workOrderType",
+ type: "select",
+ dicUrl: "/api/daf-system/dict/dictionary?code=workorder_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
},
{
label: "内容描述",
- prop: "orderDescription",
+ prop: "description",
},
{
label: "维护作业类型",
- prop: "maintenenceType",
+ prop: "maintenanceTaskType",
+ type: "select",
+ dicUrl: "/api/daf-system/dict/dictionary?code=maintenance_job_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
},
{
label: "用户状态",
prop: "userStatus",
+ type: "select",
+ dicUrl: "/api/daf-system/dict/dictionary?code=user_status",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
},
{
label: "发生时间",
- prop: "happenDate",
+ prop: "occurrenceTime",
+ type: "datetime",
+ format: 'yyyy/MM/dd HH:mm:ss',
+ valueFormat: "yyyyMMdd HH:mm:ss",
},
{
label: "处理时间",
- prop: "processDate",
+ prop: "processingTime",
+ type: "datetime",
+ format: 'yyyy/MM/dd HH:mm:ss',
+ valueFormat: "yyyyMMdd HH:mm:ss",
},
{
label: "处理结果",
- prop: "processResult",
+ prop: "handlingResult",
+ type: "select",
+ dicUrl: "/api/daf-system/dict/dictionary?code=workorder_process_res",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
},
]
},
@@ -199,11 +215,11 @@ export default {
column: [
{
label: "工作票编号",
- prop: "ticketNo",
+ prop: "workTicketNo",
},
{
label: "工作票类型",
- prop: "ticketType",
+ prop: "workTicketType",
},
{
label: "工作负责人",
@@ -211,19 +227,28 @@ export default {
},
{
label: "许可人",
- prop: "licensor",
+ prop: "licensors",
},
{
label: "签发人",
- prop: "signer",
+ prop: "issuer",
},
{
label: "许可时间",
prop: "permissionDate",
+ type: "datetime",
+ format: 'yyyy/MM/dd HH:mm:ss',
+ valueFormat: "yyyyMMdd HH:mm:ss",
},
{
label: "状态",
prop: "workStatus",
+ type: "select",
+ dicUrl: "/api/daf-system/dict/dictionary?code=work_status",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
},
]
},
@@ -247,27 +272,39 @@ export default {
column: [
{
label: "操作票编号",
- prop: "operationNo",
+ prop: "operationTicketNo",
},
{
label: "状态",
- prop: "operationStatus",
+ prop: "sts",
+ type: "select",
+ dicUrl: "/api/daf-system/dict/dictionary?code=operation_sts",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
},
{
label: "操作票类型",
- prop: "operationType",
+ prop: "operationTicketType",
},
{
label: "操作开始时间",
- prop: "operationStateData",
+ prop: "plannedStartTime",
+ type: "datetime",
+ format: 'yyyy/MM/dd HH:mm:ss',
+ valueFormat: "yyyyMMdd HH:mm:ss",
},
{
label: "操作结束时间",
- prop: "operationEndData",
+ prop: "plannedEndTime",
+ type: "datetime",
+ format: 'yyyy/MM/dd HH:mm:ss',
+ valueFormat: "yyyyMMdd HH:mm:ss",
},
{
label: "操作人",
- prop: "operator",
+ prop: "workLeader",
},
{
label: '监护人',
@@ -275,19 +312,25 @@ export default {
},
{
label: "发令人",
- prop: "enforcer",
+ prop: "givingOrdersUser",
},
{
label: "操作人所属班组",
- prop: "operationTeam",
+ prop: "workTeam",
},
{
label: '风险等级',
- prop: 'risk',
+ prop: 'jobRiskLevel',
},
{
label: '是否合格',
- prop: 'isQualified',
+ prop: 'isQuakified',
+ type: "select",
+ dicUrl: "/api/daf-system/dict/dictionary?code=is_qualified",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
}
]
}
@@ -304,45 +347,48 @@ export default {
};
},
},
+
created () {
this.type = this.option.column[0];
+ this.workOrder_onLoad()
},
methods: {
handleChange (column) {
this.type = column
- // if (column.prop == 'workodrder') {
- // this.workodrder_onLoad();
- // }if (column.prop == 'workticket') {
- // this.workticket_onLoad();
- // }if (column.prop == 'operation') {
- // this.operation_onLoad();
- // }
+ if (column.prop === 'workodrder') {
+ this.workOrder_onLoad();
+ }if (column.prop === 'workticket') {
+ this.workticket_onLoad();
+ }if (column.prop === 'operation') {
+ this.operation_onLoad();
+ }
},
headerClass(){
return 'head-style'
},
- // workodrder_onLoad(row, params = {}) {
- // this.loading = true;
- // workodrder_getListBylegerId(this.$route.query.id).then(res => {
- // this.parameters_data = res.data.data;
- // this.loading = false;
- // });
- // },
- // workticket_onLoad(row, params = {}) {
- // this.loading = true;
- // workticket_getListBylegerId(this.$route.query.id).then(res => {
- // this.document_data = res.data.data;
- // this.loading = false;
- // });
- // },
- // operation_onLoad(row, params = {}) {
- // this.loading = true;
- // operation_getListBylegerId(this.$route.query.id).then(res => {
- // this.document_data = res.data.data;
- // this.loading = false;
- // });
- // }
+ workOrder_onLoad() {
+ this.loading = true;
+ console.log(123,this.$route.query.kksEncoding);
+ getWorkOrderbyKksEncoding(this.$route.query.kksEncoding).then(res => {
+ this.workorder_data = res.data.data;
+ this.loading = false;
+ });
+ },
+ workticket_onLoad(r) {
+ this.loading = true;
+ getworkticketbyKksEncoding(this.$route.query.kksEncoding).then(res => {
+ this.workticket_data = res.data.data;
+ this.loading = false;
+ });
+ },
+ operation_onLoad() {
+ this.loading = true;
+ getoperationbyKksEncoding(this.$route.query.kksEncoding).then(res => {
+ this.operation_data = res.data.data;
+ this.loading = false;
+ });
+ }
}
}
diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue
index 8327a9c..ce0f907 100644
--- a/src/views/smart/operationticketDetail.vue
+++ b/src/views/smart/operationticketDetail.vue
@@ -407,11 +407,11 @@ export default {
{
label: "是否合格",
display: this.$route.query.frameMode == "add"? false : true,
- type: "select",
prop: "isQuakified",
- dicUrl: "/api/daf-system/dict/dictionary?code=is_qualified",
span: 8,
offset: 16,
+ type: "select",
+ dicUrl: "/api/daf-system/dict/dictionary?code=is_qualified",
props: {
label: "dictValue",
value: "dictKey"
@@ -965,4 +965,10 @@ export default {
margin-left: 110px!important;
}
+.frame_class1 div.el-select--small {
+ border: none;
+ box-shadow: none;
+ outline: none;
+ pointer-events: none;
+}
</style>