Merge remote-tracking branch 'origin/master'

src/views/pms/inspect/order/index.vue

@@ -104,7 +104,7 @@
             </template>
           </el-table-column>
           <el-table-column label="负责人" align="center" prop="chargeName" />
-          <el-table-column label="备注" align="center" prop="remark" />
+<!--          <el-table-column label="备注" align="center" prop="remark" />-->
 <!--          <el-table-column-->
 <!--            label="创建时间"-->
 <!--            align="center"-->

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

@@ -203,6 +203,7 @@ const deviceChoose = (rows) => {
   // formData.value.deviceName = row.deviceName
   // formData.value.deptId = row.deptId
   // deviceLabel.value = row.deviceName
+  debugger
   list.value = rows
 }
 

src/views/pms/inspect/route/IotInspectRoute.vue

@@ -274,8 +274,8 @@ const submitForm = async () => {
 
 /** 重置表单 */
 onMounted(async () => {
-  const deptId = useUserStore().getUser.deptId
-  deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
+  // const deptId = useUserStore().getUser.deptId
+  // deptUsers.value = await UserApi.getDeptUsersByDeptId(deptId)
   if (id) {
     formType.value = 'update'
     const iotInspectRoute = await IotInspectRouteApi.getIotInspectRoute(id)

src/views/pms/maintain/index.vue

@@ -208,7 +208,7 @@
               </el-button>
               <el-button
                 link
-                v-if="scope.row.status==='tx'&&scope.row.auditStatus===20"
+                v-if="scope.row.status==='tx'&&(scope.row.auditStatus===20||scope.row.auditStatus===null)"
                 type="danger"
                 @click="openForm('update',scope.row.id)"
               >