diff --git a/src/views/IO/workOrder/orderAudit/auditModal.vue b/src/views/IO/workOrder/orderAudit/auditModal.vue
index 4d2482e..9f21552 100644
--- a/src/views/IO/workOrder/orderAudit/auditModal.vue
+++ b/src/views/IO/workOrder/orderAudit/auditModal.vue
@@ -133,6 +133,8 @@
if (status.value == 5) {
form.isCloseCase = '是';
}
+ form.otherCost = 0
+ form.otherCostReason = '无'
};
const handleOk = () => {
diff --git a/src/views/IO/workOrder/orderHandle/data.ts b/src/views/IO/workOrder/orderHandle/data.ts
index 4ce9139..a76f02f 100644
--- a/src/views/IO/workOrder/orderHandle/data.ts
+++ b/src/views/IO/workOrder/orderHandle/data.ts
@@ -81,8 +81,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'faultLocation',
},
{
- title: '剩余时间',
+ title: '剩余处理时间',
dataIndex: 'restTime',
+ },
+ {
+ title: '剩余接单时间',
+ dataIndex: 'orderAcceptDeadline',
},
{
title: '当前状态',
diff --git a/src/views/IO/workOrder/orderHandle/index.vue b/src/views/IO/workOrder/orderHandle/index.vue
index 42b4021..c47cd8f 100644
--- a/src/views/IO/workOrder/orderHandle/index.vue
+++ b/src/views/IO/workOrder/orderHandle/index.vue
@@ -10,33 +10,54 @@
cancel-text="否"
@confirm="receive(record.id)"
>
- 接单
+ 接单
- 处理
- 回退
- 延期
+ 处理
+ 回退
+ 延期
+
+
+ {{ record.restTime }}
+
+
+ {{ record.orderAcceptDeadline }}
-
-
-
+
+
+
diff --git a/src/views/IO/workOrder/orderSend/sendModal.vue b/src/views/IO/workOrder/orderSend/sendModal.vue
index 934fc12..c9bc1be 100644
--- a/src/views/IO/workOrder/orderSend/sendModal.vue
+++ b/src/views/IO/workOrder/orderSend/sendModal.vue
@@ -127,6 +127,7 @@
for (let i in form) {
form[i] = data[i];
}
+ form.dispatchOpinion = ''
const res = await getContractNamesByProjectName({ projectName: form.projectName });
contractNameOptions.value = res;
};
diff --git a/src/views/project/contractManage/data.ts b/src/views/project/contractManage/data.ts
index 6a31fbf..322263f 100644
--- a/src/views/project/contractManage/data.ts
+++ b/src/views/project/contractManage/data.ts
@@ -20,6 +20,7 @@ export const columns: BasicColumn[] = [
{
title: '合同名称',
dataIndex: 'contractName',
+ width:300
},
{
title: '合同金额(万元)',
diff --git a/src/views/project/serviceManage/addModal.vue b/src/views/project/serviceManage/addModal.vue
index e3b7c8c..743b237 100644
--- a/src/views/project/serviceManage/addModal.vue
+++ b/src/views/project/serviceManage/addModal.vue
@@ -47,7 +47,7 @@
>
diff --git a/src/views/property/point/addModal.vue b/src/views/property/point/addModal.vue
index 1f54fac..5c1c799 100644
--- a/src/views/property/point/addModal.vue
+++ b/src/views/property/point/addModal.vue
@@ -18,6 +18,24 @@
+
+
+
+
+
+
+
@@ -89,6 +107,8 @@
getProjectInfo,
getOrganizationType,
getContractPartyBNameByProjectName,
+ getIoCompanyByName,
+ getContractNamesByProjectName,
} from './api';
export default {
setup(props, { emit }) {
@@ -100,7 +120,7 @@
remark: '',
maintenanceUnit: '',
// address: '',
- linkUnit:'',
+ linkUnit: '',
longitude: '',
latitude: '',
pointName: '',
@@ -117,6 +137,7 @@
const res = await getOrganizationType();
organizationNameOptions.value = res.rows;
};
+ const contractNameOptions = ref([]);
const showModal = async (type, id, projectId, selectInfo) => {
console.log(selectInfo);
visible.value = true;
@@ -125,10 +146,12 @@
title.value = '新增';
form.projectName = selectInfo.node.ownerName;
form.organizationName = selectInfo.node.projectName;
- const res = await getContractPartyBNameByProjectName({
- projectName: selectInfo.node.ownerName,
- });
- form.maintenanceUnit = res;
+ const res = await getContractNamesByProjectName({ projectName: form.projectName });
+ contractNameOptions.value = res;
+ // const res = await getContractPartyBNameByProjectName({
+ // projectName: selectInfo.node.ownerName,
+ // });
+ // form.maintenanceUnit = res;
initMap();
} else if (type == 2) {
title.value = '编辑';
@@ -136,13 +159,18 @@
for (let i in form) {
form[i] = data[i];
}
+ const res = await getContractNamesByProjectName({ projectName: form.projectName });
+ contractNameOptions.value = res;
initMap();
}
form.projectId = projectId;
getProjectNameOptions();
getOrganizationNameOptions();
};
-
+ const contractNameChange = async (val) => {
+ const res = await getIoCompanyByName(val);
+ form.maintenanceUnit = res;
+ };
const handleOk = () => {
formRef.value.validate().then((valid) => {
if (valid) {
@@ -182,7 +210,7 @@
remark: [{ required: true, message: '请输入' }],
maintenanceUnit: [{ required: true, message: '请输入' }],
// address: [{ required: true, message: '请输入' }],
- linkUnit : [{ required: true, message: '请输入' }],
+ linkUnit: [{ required: true, message: '请输入' }],
pointName: [{ required: true, message: '请输入' }],
};
//地图
@@ -246,6 +274,8 @@
closeModal,
formRef,
rules,
+ contractNameChange,
+ contractNameOptions,
};
},
};
diff --git a/src/views/property/point/api.ts b/src/views/property/point/api.ts
index 5f43952..29b161d 100644
--- a/src/views/property/point/api.ts
+++ b/src/views/property/point/api.ts
@@ -13,7 +13,8 @@ enum Api {
getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName',
getIoCompanyByName = '/platform/contractInfo/getIoCompany',
getContractPartyBNameByProjectName = '/platform/projectInfo/getContractPartyBNameByProjectName',
- upload = '/platform/excel/uploadPointInfo',
+ uploadPointInfo = '/platform/excel/uploadPointInfo',
+ uploadWorkOrderInfo = '/platform/excel/uploadWorkOrderInfo',
}
export function list(params: any) {
@@ -31,7 +32,14 @@ export function getInfo(id: ID) {
}
export function listUpload(params: any) {
return defHttp.post({
- url: Api.upload,
+ url: Api.uploadPointInfo,
+ headers: { 'Content-Type': 'multipart/form-data' },
+ params,
+ });
+}
+export function uploadWorkOrderInfo(params: any) {
+ return defHttp.post({
+ url: Api.uploadWorkOrderInfo,
headers: { 'Content-Type': 'multipart/form-data' },
params,
});
diff --git a/src/views/property/point/index.vue b/src/views/property/point/index.vue
index 936ff37..9039fa4 100644
--- a/src/views/property/point/index.vue
+++ b/src/views/property/point/index.vue
@@ -28,9 +28,16 @@
>
导入
-
-
+ 批量点位上报
+
+ 导出
@@ -61,16 +68,17 @@