Merge remote-tracking branch 'origin/master'

src/locales/zh-CN.ts

@@ -802,7 +802,6 @@ export default {
     picture: '图片',
     repairCosts:'维修费用',
     costHolder:'请输入维修费用',
-
     faultDescription:'故障描述',
     repairDescription:'维修描述',
     solution:'解决办法',

src/views/pms/inspect/plan/InspectRouteList.vue

@@ -14,7 +14,7 @@
             :placeholder="t('iotDevice.nameHolder')"
             clearable
             @keyup.enter="handleQuery"
-            class="!w-200px"
+            class="!w-220px"
           />
         </el-form-item>
         <el-form-item  :label="t('iotDevice.code')" prop="deviceCode">
@@ -23,7 +23,16 @@
             :placeholder="t('iotDevice.codeHolder')"
             clearable
             @keyup.enter="handleQuery"
-            class="!w-200px"
+            class="!w-220px"
+          />
+        </el-form-item>
+        <el-form-item  :label="t('route.RouteName')" prop="routeName">
+          <el-input
+            v-model="queryParams.routeName"
+            :placeholder="t('route.nHolder')"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-220px"
           />
         </el-form-item>
         <el-form-item>
@@ -48,12 +57,13 @@
         :data="list"
         :stripe="true"
         :show-overflow-tooltip="true"
+        @row-click="handleRowClick"
         row-key="id"
         @selection-change="handleSelectionChange"
       >
         <el-table-column
           type="selection"
-          :reserve-selection="false"
+          :reserve-selection="true"
           :selectable="(row) => !row.disabled"
         />
         <el-table-column :label="t('iotDevice.code')" align="center" prop="deviceCode" />
@@ -117,6 +127,7 @@ const queryParams = reactive({
   assetClass: undefined,
   deviceName: undefined,
   deviceCode: undefined,
+  routeName: undefined,
 })
 
 const handleConfirm = () => {
@@ -198,7 +209,6 @@ const getList = async () => {
   list.value = []
   try {
     const data = await IotInspectRouteApi.getDeviceIotInspectRoutePage(queryParams)
-    debugger
     list.value = data.list
     total.value = data.total
   } finally {

src/views/pms/inspect/plan/IotInspectPlan.vue

@@ -107,7 +107,7 @@
                       style="vertical-align: middle"
                       link
                       type="danger"
-                      @click="handleDelete(scope.row.code)"
+                      @click="handleDelete(scope.row.id,scope.row.deviceId)"
                     >
                       <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
                       {{ t('form.delete') }}
@@ -277,9 +277,10 @@ onMounted(async () => {
     formType.value = 'create'
   }
 })
-const handleDelete = async (id: number) => {
+const handleDelete = async (id: number, deviceId: number) => {
   try {
-    const index = list.value.findIndex((item) => item.code === id)
+    debugger
+    const index = list.value.findIndex((item) => item.id === id&&item.deviceId===deviceId)
     if (index !== -1) {
       // 通过 splice 删除元素
       list.value.splice(index, 1)

src/views/pms/maintain/IotMaintain.vue

@@ -105,11 +105,11 @@
                 <UploadImg v-model="formData.pic" height="55px" />
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="formData.type === 'out'&&formData.maintainPerson===userId">
-              <el-form-item label="供应商" prop="supplier" :rules="supplierRules">
+            <el-col :span="8" v-if="formData.type === 'out'">
+              <el-form-item :label="t('iotMaintain.supplier')" prop="supplier" :rules="supplierRules">
                 <el-select
                   v-model="formData.supplier"
-                  placeholder="请输入供应商"
+                  :placeholder="t('iotMaintain.suppHolder')"
                   :model-value="supplierLabel"
                   @click="openCustomer('supplier')"
                 />
@@ -127,8 +127,8 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="formData.type === 'out'&&formData.maintainPerson===userId">
-              <el-form-item label="委外相关附件" prop="outFile">
+            <el-col :span="8" v-if="formData.type === 'out'">
+              <el-form-item :label="t('iotMaintain.attachment')" prop="outFile">
                 <UploadFile v-model="formData.outFile" class="min-w-80px" multiple :limit="2" />
               </el-form-item>
             </el-col>

src/views/pms/maintain/index.vue

@@ -148,9 +148,14 @@
             </template>
           </el-table-column>
           <el-table-column :label="t('maintain.source')" align="center" prop="maintainType" width="135"/>
-          <el-table-column :label="t('maintain.audit')" align="center" prop="auditStatus" width="135">
+<!--          <el-table-column :label="t('maintain.audit')" align="center" prop="auditStatus" width="135">-->
+<!--            <template #default="scope">-->
+<!--              <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column :label="t('iotMaintain.repairType')" align="center" prop="type" width="135">
             <template #default="scope">
-              <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
+              <dict-tag :type="DICT_TYPE.PMS_MAIN_TYPE" :value="scope.row.type" />
             </template>
           </el-table-column>
           <el-table-column :label="t('maintain.shutDown')" align="center" prop="ifStop"  width="135">