diff --git a/src/api/emergency-rescue/index.js b/src/api/emergency-rescue/index.js index 79f65b6..44b4a4e 100644 --- a/src/api/emergency-rescue/index.js +++ b/src/api/emergency-rescue/index.js @@ -48,3 +48,23 @@ export function getDetListById(query) { params: query, }); } + +//勘察录入 +export function intruderyj(data) { + return request({ + url: "/bYjgd/kclr", + method: "post", + data + }); +} + + +//退单 +export function retreatyj(data) { + return request({ + url: "/bYjgd/td", + method: "post", + data + }); +} + diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 37975cc..8087733 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -138,7 +138,7 @@ } .dialog-data{ padding: 10px 10px 0 10px; - min-height: 200px; + min-height: 100px; max-height: 800px; overflow-y: auto; } diff --git a/src/views/emergency-rescue/workOrder/components/chargeBack.vue b/src/views/emergency-rescue/workOrder/components/chargeBack.vue new file mode 100644 index 0000000..28c18b6 --- /dev/null +++ b/src/views/emergency-rescue/workOrder/components/chargeBack.vue @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/emergency-rescue/workOrder/operation.vue b/src/views/emergency-rescue/workOrder/components/operation.vue similarity index 92% rename from src/views/emergency-rescue/workOrder/operation.vue rename to src/views/emergency-rescue/workOrder/components/operation.vue index 05bbed5..660d966 100644 --- a/src/views/emergency-rescue/workOrder/operation.vue +++ b/src/views/emergency-rescue/workOrder/components/operation.vue @@ -70,9 +70,11 @@ - {{ - dict.label - }} + {{ dict.label }} @@ -147,6 +149,7 @@ import { addyj, updateyj, + intruderyj, getDetListById, getyjById, } from "@/api/emergency-rescue"; @@ -174,17 +177,18 @@ const props = defineProps({ type: String, default: "", }, - dict:{ - type:Object, - default:{ - gdlx:[], - dflx:[], - gdlevel:[], - clfa:[], - zyxt:[], - gdms:[], - } + dict: { + type: Object, + default: { + gdlx: [], + dflx: [], + gdlevel: [], + clfa: [], + zyxt: [], + gdms: [], + }, }, + id: { type: Number, }, @@ -227,21 +231,21 @@ const data = reactive({ }, rules: { address: [{ required: true, message: "请填写工单地址", trigger: "blur" }], - gdType: [{ required: true, message: "请选择工单类型", trigger: "change" }], - gdms: [{ required: true, message: "请选择简要描述", trigger: "change" }], - zzjg: [{ required: true, message: "请选择选派人员", trigger: "change" }], + gdType: [{ required: true, message: "请选择工单类型", trigger: "blur" }], + gdms: [{ required: true, message: "请选择简要描述", trigger: "blur" }], + zzjg: [{ required: true, message: "请选择选派人员", trigger: "blur" }], - dflx: [{ required: true, message: "请选择倒伏类型", trigger: "change" }], - gdtp: [{ required: true, message: "请上传工单照片", trigger: "change" }], - gdLevel: [{ required: true, message: "请选择工单等级", trigger: "change" }], + dflx: [{ required: true, message: "请选择倒伏类型", trigger: "blur" }], + gdtp: [{ required: true, message: "请上传工单照片", trigger: "blur" }], + gdLevel: [{ required: true, message: "请选择工单等级", trigger: "blur" }], - clfa: [{ required: true, message: "请选择处置方案", trigger: "change" }], - pqrs: [{ required: true, message: "请填写派遣人数", trigger: "change" }], - pqcl: [{ required: true, message: "请填写派遣车辆", trigger: "change" }], - zyxt: [{ required: true, message: "请选择资源协调", trigger: "change" }], + clfa: [{ required: true, message: "请选择处置方案", trigger: "blur" }], + pqrs: [{ required: true, message: "请填写派遣人数", trigger: "blur" }], + pqcl: [{ required: true, message: "请填写派遣车辆", trigger: "blur" }], + zyxt: [{ required: true, message: "请选择资源协调", trigger: "blur" }], }, }); -const { queryParams, form, rules } = toRefs(data); +const { form, rules } = toRefs(data); const visible = ref(props.modelValue); // 监听外部 modelValue 变化 watch( @@ -268,11 +272,12 @@ const changeType = () => { const confirm = () => { proxy.$refs["formRef"].validate(async (valid) => { if (valid) { - form.value.zzjg = form.value.zzjg.join(); - form.value.dflx = form.value.dflx.join(); - form.value.zyxt = form.value.zyxt.join(); + form.value.zzjg = filterArray( form.value .zzjg,'join'); + form.value .dflx = filterArray( form.value .dflx,'join'); + form.value .zyxt = filterArray( form.value .zyxt,'join'); if (form.value.id) { - await updateyj(form.value); + form.value.status = props.changeStatus; + await intruderyj(form.value); proxy.$modal.msgSuccess(`${props.title}成功`); } else { await addyj(form.value); @@ -309,11 +314,19 @@ const getInfo = async (val) => { } }; -const filterArray = (data) => { - if (data) { - return data.split(","); +const filterArray = ( data,type) => { + if (!type) { + if (data) { + return data.split(","); + } else { + return []; + } } else { - return []; + if (data) { + return data.join(); + } else { + return ""; + } } }; @@ -321,8 +334,8 @@ const filterArray = (data) => { * */ const handlerClose = () => { - proxy.resetForm("formRef"); visible.value = false; + proxy.resetForm("formRef"); gaodePOIList.value = []; if (mapData) { mapData.destroy(); diff --git a/src/views/emergency-rescue/workOrder/index.js b/src/views/emergency-rescue/workOrder/index.js index b0dd1c1..cb28525 100644 --- a/src/views/emergency-rescue/workOrder/index.js +++ b/src/views/emergency-rescue/workOrder/index.js @@ -1 +1,2 @@ -export { default as operation } from './operation.vue' \ No newline at end of file +export { default as operation } from './components/operation.vue' +export { default as chargeBack } from './components/chargeBack.vue' \ No newline at end of file diff --git a/src/views/emergency-rescue/workOrder/index.vue b/src/views/emergency-rescue/workOrder/index.vue index b11950e..23233a2 100644 --- a/src/views/emergency-rescue/workOrder/index.vue +++ b/src/views/emergency-rescue/workOrder/index.vue @@ -85,10 +85,10 @@ key="gdLevel" prop="gdLevel" > - + - + - 勘察录入 - 退单 @@ -141,17 +148,15 @@ 查看 - 删除 + link + type="primary" + icon="Delete" + @click="handlerDel(scope.row.id)" + >删除 @@ -168,32 +173,49 @@ - + + +