修改bug

src/views/biz/nuBaseInfo/QyxxList.vue

@@ -105,6 +105,7 @@
     <!-- 表单区域 -->
     <NuBaseInfoModal ref="registerModal" @success="handleSuccess"></NuBaseInfoModal>
     <NuBaseInfoAddModal ref="registerAddModal" @success="handleSuccess"></NuBaseInfoAddModal>
+    <!-- 物联设备 -->
     <BaseWlsbListModal ref="wlsbModal" ></BaseWlsbListModal>
     <CameraPreviewModal ref="previewModal"></CameraPreviewModal>
     <!-- 设备预览 -->
@@ -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);

src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue

@@ -279,6 +279,10 @@
         <div style="margin: 30px auto;">
           <a-empty />
         </div>
+        
+        <div style="margin-top: 10px;padding: 14px;background-color: white;">
+          <span style="font-size: 16px;color:red;font-weight: 700;">提示：请联系平台运维组技术人员绑定物联设备！</span>
+        </div>
       </a-col>
     </a-row>
 

src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyList.vue

@@ -57,7 +57,8 @@
     </BasicTable>
 
     <div style="margin-top: 10px;padding: 14px;background-color: white;">
-      <span style="font-size: 16px;color:red;font-weight: 700;">提示：您停用区域【{{queryParam.nuName}}】，将释放所有设备，请慎重操作！</span>
+      <span style="font-size: 16px;color:red;font-weight: 700;" v-if="nuInfo.tystatus == '5'">提示：您停用区域【{{queryParam.nuName}}】，将释放所有设备，请慎重操作！</span>
+      <span style="font-size: 16px;color:red;font-weight: 700;" v-if="nuInfo.tystatus == '4'">提示：请联系平台运维组技术人员绑定物联设备！</span>
     </div>
     <!-- 表单区域 -->
     <IotDevicesModal ref="registerModal" @success="handleSuccess"></IotDevicesModal>

src/views/biz/nuBaseInfo/iotDevices/IotDevicesTyModal.vue

@@ -4,7 +4,7 @@
   <IotDevicesList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></IotDevicesList>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
-      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">停用</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">{{buttonText}}</a-button>
     </template>
   </a-drawer>
 </template>
@@ -15,6 +15,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
+  const buttonText = ref<string>('停用');
   const width = ref<number>(1200);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(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);
     });
   }

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',
   },

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: '只能输入数字（可包含小数点）!' }],

src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
         <a-col :lg="6">
         <a-form-item name="suppliersName">
-        <template #label><span title="供应商名称">供应商名</span></template>
+        <template #label><span title="供应商名称">供应商名称</span></template>
             <JInput v-model:value="queryParam.suppliersName" placeholder="请输入供应商名称"/>
         </a-form-item>
         </a-col>

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);
       },
     },