diff --git a/src/views/biz/nuBaseInfo/QyxxList.vue b/src/views/biz/nuBaseInfo/QyxxList.vue index 00e36a0..31499c6 100644 --- a/src/views/biz/nuBaseInfo/QyxxList.vue +++ b/src/views/biz/nuBaseInfo/QyxxList.vue @@ -105,6 +105,7 @@ + @@ -194,8 +195,11 @@ const { createMessage } = useMessage(); function handleChangeValidateStatus(record,checked) { console.log("🚀 ~ handleChangeValidateStatus ~ record,checked:", record,checked) + record.tystatus = checked ? 4 : 5; if (checked) { - handleQiyong(record); + // handleQiyong(record); + iotDevicesTyModal.value.disableSubmit = false; + iotDevicesTyModal.value.init(record); } else { iotDevicesTyModal.value.disableSubmit = false; iotDevicesTyModal.value.init(record); @@ -257,7 +261,15 @@ function handleChangeValidateStatus(record,checked) { */ async function handleTingyong(record) { console.log("🚀 ~ handleTingyong ~ record:", record) - record.status = 5; + if(record.tystatus==4){ + if(record.areaFlag=='1'){ + record.status = 0; + }else{ + record.status = 4; + } + }else if(record.tystatus==5){ + record.status = 5; + } await hldyQyty(record, true).then((res) => { if (res.success) { createMessage.success(res.message); diff --git a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue index b060a6b..8ace040 100644 --- a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue +++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue @@ -279,6 +279,10 @@
+ +
+ 提示:请联系平台运维组技术人员绑定物联设备! +
diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue index dce7616..90c3109 100644 --- a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue +++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue @@ -57,7 +57,8 @@
- 提示:您停用区域【{{queryParam.nuName}}】,将释放所有设备,请慎重操作! + 提示:您停用区域【{{queryParam.nuName}}】,将释放所有设备,请慎重操作! + 提示:请联系平台运维组技术人员绑定物联设备!
diff --git a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue index 4b83fd8..9f0d82e 100644 --- a/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue +++ b/src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue @@ -4,7 +4,7 @@ @@ -15,6 +15,7 @@ import JModal from '/@/components/Modal/src/JModal/JModal.vue'; const title = ref(''); + const buttonText = ref('停用'); const width = ref(1200); const visible = ref(false); const disableSubmit = ref(false); @@ -26,9 +27,16 @@ * @param record */ function init(record) { - title.value = '区域停用'; + console.log("🚀 ~ init ~ record:", record) visible.value = true; nextTick(() => { + if(record.tystatus=='4'){ + title.value = '区域启用'; + buttonText.value = "启用"; + }else if(record.tystatus == '5'){ + title.value = '区域停用'; + buttonText.value = "停用"; + } registerForm.value.init(record); }); } diff --git a/src/views/elder/elderinfo/ElderInfo.data.ts b/src/views/elder/elderinfo/ElderInfo.data.ts index 1ef6afc..c64e2f5 100644 --- a/src/views/elder/elderinfo/ElderInfo.data.ts +++ b/src/views/elder/elderinfo/ElderInfo.data.ts @@ -71,13 +71,13 @@ export const auditHisColumns: BasicColumn[] = [ width: 100, }, { - title: '性别', + title: '长者性别', align: 'center', dataIndex: 'sex', width: 80, }, { - title: '年龄', + title: '长者年龄', align: 'center', dataIndex: 'age', width: 80, @@ -149,12 +149,12 @@ export const elderColumns: BasicColumn[] = [ dataIndex: 'name', }, { - title: '性别', + title: '长者性别', align: 'center', dataIndex: 'sex', }, { - title: '年龄', + title: '长者年龄', align: 'center', dataIndex: 'age', }, diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue index 12531bf..15e69cc 100644 --- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue +++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue @@ -263,7 +263,7 @@ function getRemark(){ salesUnitPrice: [{ required: true, message: '请输入销售单价!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字(可包含小数点)!' }], referenceUnitPrice: [{ required: true, message: '请输入参考单价!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字(可包含小数点)!' }], materialUnits: [{ required: true, message: '请输入物料单位!'}], - suppliers: [{ required: true, message: '请选择供应商!'},], + // suppliers: [{ required: true, message: '请选择供应商!'},], izYbbx: [{ required: true, message: '请选择是否医保报销!'},], izJgyh: [{ required: true, message: '请选择是否机构优惠!'},], upperLimit: [{ required: true, message: '请输入物料上限!'},{ pattern: /^\d+(\.\d+)?$/, message: '只能输入数字(可包含小数点)!' }], diff --git a/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue b/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue index ca8a415..a898f1f 100644 --- a/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue +++ b/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue @@ -6,7 +6,7 @@ - + diff --git a/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfoList.vue b/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfoList.vue index c5dfb4e..aaa4ef4 100644 --- a/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfoList.vue +++ b/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfoList.vue @@ -63,6 +63,8 @@ fixed: 'right', }, beforeFetch: async (params) => { + params.column = 'id' + params.order = 'desc' return Object.assign(params, queryParam); }, },