切换项目更新

src/views/tentative/material/sampling.vue

@@ -160,8 +160,8 @@
                         </el-radio-group>
                     </el-form-item>
                 </div>
-                <el-form-item v-if="addEditFormModel.isRfid === 1" label="RFID编号" prop="rfid">
-                    <el-select v-model="addEditFormModel.rfid" clearable block>
+                <el-form-item v-if="addEditFormModel.isRfid === 1" label="RFID编号" prop="rfId">
+                    <el-select v-model="addEditFormModel.rfId" clearable block>
                         <el-option v-for="item in deviceTable" :key="item.epc" :label="item.epc" :value="item.epc" />
                     </el-select>
                 </el-form-item>
@@ -483,7 +483,7 @@ const editFormModalClick = () => {
             ...obj,
             representativeCount: obj.representativeCount === -1 ? '' : obj.representativeCount,
             materialCount: obj.materialCount === -1 ? '' : obj.materialCount,
-            isRfid: isNullES(obj.rfid) ? 0 : 1,
+            isRfid: isNullES(obj.rfId) ? 0 : 1,
         }
         addEditFormModal.value = true
         requestDevice()
@@ -510,7 +510,7 @@ const requestDevice = async () => {
     // 电脑接收到来自设备的消息回调
     deviceTable.value = []
     device.oninputreport = (event) => {
-        const { isRfid, rfid } = addEditFormModel.value
+        const { isRfid, rfId } = addEditFormModel.value
         if (isRfid !== 1 ) return
         const array = new Uint8Array(event.data.buffer)
         const data = array.slice(10, array[0] - 1)
@@ -524,8 +524,8 @@ const requestDevice = async () => {
         if (index === -1) {
             deviceTable.value.push({ epc: epc })
         }
-        if (isNullES(rfid)) {
-            addEditFormModel.value.rfid = epc
+        if (isNullES(rfId)) {
+            addEditFormModel.value.rfId = epc
         }
     }
 }
@@ -534,7 +534,7 @@ const requestDevice = async () => {
 const formRfidChange = () => {
     const { isRfid } = addEditFormModel.value
     if (isRfid !== 1) {
-        addEditFormModel.value.rfid = ''
+        addEditFormModel.value.rfId = ''
         deviceTable.value = []
     }
 }
@@ -575,7 +575,7 @@ const addEditFormRules = {
         },
         trigger: 'blur',
     },
-    rfid: {
+    rfId: {
         required: true,
         validator: async (rule, value, callback) => {
             const { isRfid } = addEditFormModel.value
@@ -615,7 +615,7 @@ const addEditFormClick = async () => {
     addEditFormLoading.value = true
     const form = addEditFormModel.value
     if (form.isRfid !== 1 ) {
-        form.rfid = ''
+        form.rfId = ''
     }
     form.projectId = projectId.value
     form.contractId = searchForm.value.contractId