Browse Source

pms 设备动态功能优化

zhangcl 2 tháng trước cách đây
mục cha
commit
2a3464a390

+ 15 - 0
src/views/pms/device/ConfigDevicePerson.vue

@@ -72,6 +72,7 @@
     <!-- 暂存关联列表 -->
     <div class="submit-area">
       <div class="card">
+        <h3>调整原因<span class="required-star">*</span></h3>
         <el-input
           v-model="formData.reason"
           placeholder="请输入调整原因"
@@ -326,6 +327,14 @@ const removeTempRelation = (deviceIds: string[]) => {
 
 const submitRelations = async () => {
   try {
+    // 校验所有调整原因
+    const hasEmptyReason = tempRelations.value.some(
+      item => !item.reason?.trim()
+    )
+    if (hasEmptyReason) {
+      ElMessage.error('请填写调整原因')
+      return
+    }
     // 转换为后端需要的格式
     const submitData = tempRelations.value.flatMap(relation => {
       return relation.deviceIds.map(deviceId => ({
@@ -417,4 +426,10 @@ h3 {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.required-star {
+  color: #ff4d4f;
+  margin-left: 3px;
+  vertical-align: middle;
+}
 </style>

+ 10 - 9
src/views/pms/device/DeviceAllot.vue

@@ -34,15 +34,6 @@
               class="!w-200px"
             />
           </el-form-item>
-          <el-form-item label="品牌" prop="brand">
-            <el-input
-              v-model="queryParams.brand"
-              placeholder="请输入品牌"
-              clearable
-              @keyup.enter="handleQuery"
-              class="!w-200px"
-            />
-          </el-form-item>
           <el-form-item label="是否发生过调拨" prop="setFlag" label-width="140px">
             <el-select
               v-model="queryParams.setFlag"
@@ -90,6 +81,16 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item v-show="ifShow" label="品牌" prop="brand">
+            <el-input
+              v-model="queryParams.brand"
+              placeholder="请输入品牌"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-200px"
+            />
+          </el-form-item>
+
           <el-form-item>
             <el-button v-if="!ifShow" @click="moreQuery(true)" type="warning"
               ><Icon icon="ep:search" class="mr-5px" /> 更多查询</el-button

+ 11 - 9
src/views/pms/device/DevicePerson.vue

@@ -34,15 +34,7 @@
               class="!w-200px"
             />
           </el-form-item>
-          <el-form-item label="品牌" prop="brand">
-            <el-input
-              v-model="queryParams.brand"
-              placeholder="请输入品牌"
-              clearable
-              @keyup.enter="handleQuery"
-              class="!w-200px"
-            />
-          </el-form-item>
+
           <el-form-item label="是否设置了责任人" prop="setFlag" label-width="140px">
             <el-select
               v-model="queryParams.setFlag"
@@ -90,6 +82,16 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item v-show="ifShow" label="品牌" prop="brand">
+            <el-input
+              v-model="queryParams.brand"
+              placeholder="请输入品牌"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-200px"
+            />
+          </el-form-item>
+
           <el-form-item>
             <el-button v-if="!ifShow" @click="moreQuery(true)" type="warning"
               ><Icon icon="ep:search" class="mr-5px" /> 更多查询</el-button

+ 10 - 9
src/views/pms/device/DeviceStatus.vue

@@ -34,15 +34,6 @@
               class="!w-200px"
             />
           </el-form-item>
-          <el-form-item label="品牌" prop="brand">
-            <el-input
-              v-model="queryParams.brand"
-              placeholder="请输入品牌"
-              clearable
-              @keyup.enter="handleQuery"
-              class="!w-200px"
-            />
-          </el-form-item>
           <el-form-item label="是否调整了状态" prop="setFlag" label-width="140px">
             <el-select
               v-model="queryParams.setFlag"
@@ -90,6 +81,16 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item v-show="ifShow" label="品牌" prop="brand">
+            <el-input
+              v-model="queryParams.brand"
+              placeholder="请输入品牌"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-200px"
+            />
+          </el-form-item>
+
           <el-form-item>
             <el-button v-if="!ifShow" @click="moreQuery(true)" type="warning"
               ><Icon icon="ep:search" class="mr-5px" /> 更多查询</el-button