aa

src/views/pms/qhse/iotmeasuredetect/IotMeasureDetectForm.vue

@@ -134,13 +134,13 @@
       </el-form>
     </ContentWrap>
     <div class="pb-10">
-      <el-table
-        v-loading="loading"
+      <zm-table
+        :loading="loading"
         :data="measureList"
         :stripe="true"
         :show-overflow-tooltip="true"
         ref="measureTableRef">
-        <el-table-column width="50" align="center">
+        <zm-table-column width="50" align="center">
           <template #default="scope">
             <el-radio
               :model-value="selectedMeasureId"
@@ -149,40 +149,42 @@
               &nbsp;
             </el-radio>
           </template>
-        </el-table-column>
-        <el-table-column :label="t('monitor.serial')" width="70" align="center">
+        </zm-table-column>
+        <zm-table-column :label="t('monitor.serial')" width="70" align="center">
           <template #default="scope">
             {{ scope.$index + 1 }}
           </template>
-        </el-table-column>
-        <el-table-column label="计量单位" align="center" prop="measureUnit" />
-        <el-table-column label="名称" align="center" prop="measureName" />
-        <el-table-column label="责任人" align="center" prop="dutyPerson" />
-        <el-table-column label="品牌" align="center" prop="brand" />
-        <el-table-column label="规格型号" align="center" prop="modelName" />
-        <el-table-column label="分类" align="center" prop="classify" />
-        <el-table-column label="采购日期" align="center" prop="buyDate">
+        </zm-table-column>
+        <zm-table-column label="计量器具编码" align="center" prop="measureCode" />
+        <zm-table-column label="计量器具名称" align="center" prop="measureName" />
+        <zm-table-column label="计量单位" align="center" prop="measureUnit" />
+
+        <zm-table-column label="责任人" align="center" prop="dutyPerson" />
+        <zm-table-column label="品牌" align="center" prop="brand" />
+        <zm-table-column label="规格型号" align="center" prop="modelName" />
+        <zm-table-column label="分类" align="center" prop="classify" />
+        <zm-table-column label="采购日期" align="center" prop="buyDate">
           <template #default="scope">
             {{ formatDateCorrectly(scope.row.buyDate) }}
           </template>
-        </el-table-column>
-        <el-table-column label="有效期" align="center" prop="validity">
+        </zm-table-column>
+        <zm-table-column label="有效期" align="center" prop="validity">
           <template #default="scope">
             {{ formatDateCorrectly(scope.row.validity) }}
           </template>
-        </el-table-column>
-        <el-table-column label="上次检验日期" align="center" prop="lastTime" min-width="150">
+        </zm-table-column>
+        <zm-table-column label="上次检验日期" align="center" prop="lastTime" min-width="150">
           <template #default="scope">
             {{ formatDateCorrectly(scope.row.lastTime) }}
           </template>
-        </el-table-column>
-        <el-table-column label="价格" align="center" prop="measurePrice">
+        </zm-table-column>
+        <zm-table-column label="价格" align="center" prop="measurePrice">
           <template #default="scope">
             {{ scope.row.measurePrice }}
           </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
-      </el-table>
+        </zm-table-column>
+        <zm-table-column label="备注" align="center" prop="remark" />
+      </zm-table>
       <!-- 分页 -->
       <Pagination
         :total="total"

src/views/pms/qhse/iotmeasuredetect/index.vue

@@ -14,8 +14,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-              class="!w-200px"
-            />
+              class="!w-200px" />
           </el-form-item>
           <el-form-item label="检测/校准机构" prop="detectOrg">
             <el-input
@@ -23,8 +22,7 @@
               placeholder="请输入检测/校准机构"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-150px"
-            />
+              class="!w-150px" />
           </el-form-item>
           <el-form-item label="检测/校准有效期" prop="validityPeriod">
             <el-date-picker
@@ -33,8 +31,7 @@
               type="date"
               placeholder="选择检测/校准有效期"
               clearable
-              class="!w-150px"
-            />
+              class="!w-150px" />
           </el-form-item>
           <el-form-item label="校准金额" prop="detectAmount">
             <el-input
@@ -42,8 +39,7 @@
               placeholder="请输入校准金额"
               clearable
               @keyup.enter="handleQuery"
-              class="!w-150px"
-            />
+              class="!w-150px" />
           </el-form-item>
 
           <el-form-item>
@@ -70,13 +66,13 @@
           :data="list"
           :stripe="true"
           height="calc(85vh - 195px)"
-          :show-overflow-tooltip="true"
-        >
+          :show-overflow-tooltip="true">
           <zm-table-column :label="t('monitor.serial')" width="70" align="center">
             <template #default="scope">
               {{ scope.$index + 1 }}
             </template>
           </zm-table-column>
+          <zm-table-column label="计量器具编码" align="center" prop="measureCode" />
           <zm-table-column label="计量器具名称" align="center" prop="measureName" />
           <zm-table-column label="证书编码" align="center" prop="measureCertNo" />
           <zm-table-column label="检测/校准日期" align="center" prop="detectDate" width="140">
@@ -104,8 +100,7 @@
                 v-if="scope.row.file"
                 link
                 type="primary"
-                @click="viewFile(scope.row.file)"
-              >
+                @click="viewFile(scope.row.file)">
                 查看
               </el-button>
             </template>
@@ -124,8 +119,7 @@
             :total="total"
             v-model:page="queryParams.pageNo"
             v-model:limit="queryParams.pageSize"
-            @pagination="getList"
-          />
+            @pagination="getList" />
         </div>
       </ContentWrap>
     </el-col>
@@ -135,8 +129,7 @@
     <div
       v-for="(file, index) in fileList"
       :key="index"
-      class="flex items-center justify-between mt-5"
-    >
+      class="flex items-center justify-between mt-5">
       <span class="file-name-text">{{ extractFileName(file) }}</span>
       <div>
         <el-button link type="primary" @click="viewFileInfo(file)">