feat: 设备管理优化-0510

src/utils/enum.js

@@ -22,15 +22,15 @@ export const deviceStatus = {
 }
 
 export const deviceRepairApplyStatus = {
-  WAIT_PROCESS: {key: "WAIT_PROCESS", tagType: "warning", desc: "待受理"},
+  WAIT_PROCESS: {key: "WAIT_PROCESS", tagType: "warning", desc: "未受理"},
-  PROCESSING: {key: "PROCESSING", tagType: "primary", desc: "受理中"},
+  PROCESSING: {key: "PROCESSING", tagType: "primary", desc: "部分受理"},
   // REPAIRING: {key: "REPAIRING", tagType: "primary", desc: "维修中"},
-  FINISH: {key: "FINISH", tagType: "success", desc: "完成"},
+  FINISH: {key: "FINISH", tagType: "success", desc: "已完成"},
 }
 
 export const deviceRepairApplyDetailStatus = {
-  WAIT_DIAGNOSIS: {key: "WAIT_DIAGNOSIS", tagType: "warning", desc: "待诊断"},
+  WAIT_DIAGNOSIS: {key: "WAIT_DIAGNOSIS", tagType: "warning", desc: "待受理"},
   // WAIT_REPAIR: {key: "WAIT_REPAIR", tagType: "warning", desc: "待维修"},
   REPAIRING: {key: "REPAIRING", tagType: "primary", desc: "维修中"},
-  FINISH: {key: "FINISH", tagType: "success", desc: "完成"},
+  FINISH: {key: "FINISH", tagType: "success", desc: "已完成"},
 }

src/views/dev/deviceRepairApplyHall.vue

@@ -26,6 +26,14 @@
                   <el-input v-model.trim="query.applyId" clearable/>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="状态">
+                  <el-select v-model="query.isFinish" clearable>
+                    <el-option  label="未完成" :value="0" :key="0"></el-option>
+                    <el-option  label="已完成" :value="1" :key="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div class="top-right-btn">
@@ -65,11 +73,11 @@
             <el-table-column label="受理时间" width="140" prop="confirmTime"/>
             <el-table-column label="设备数量" width="100" prop="deviceCount"/>
             <el-table-column label="已完成数量" width="100" prop="finishCount"/>
-            <el-table-column v-if="tabActive==1" label="操作" fixed="right" width="80">
+<!--            <el-table-column v-if="tabActive==1" label="操作" fixed="right" width="80">-->
-              <template slot-scope="scope">
+<!--              <template slot-scope="scope">-->
-                <el-button type="text" @click="confirm(scope.row)">受理</el-button>
+<!--                <el-button type="text" @click="confirm(scope.row)">受理</el-button>-->
-              </template>
+<!--              </template>-->
-            </el-table-column>
+<!--            </el-table-column>-->
           </el-table>
           <pagination
             v-show="total>0"
@@ -123,10 +131,10 @@
             <el-table-column label="udi码" width="150" prop="udi"/>
             <el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
             <el-table-column label="生产企业" width="180" prop="manufactory"/>
-            <el-table-column v-if="tabActive==2" label="操作" fixed="right" width="100">
+            <el-table-column v-if="tabActive==1" label="操作" fixed="right" width="100">
               <template slot-scope="scope">
                 <el-button type="text" v-if="scope.row.status==deviceRepairApplyDetailStatus.WAIT_DIAGNOSIS.key"
-                           @click="openDiagnosisDialog(scope.row)">诊断
+                           @click="openDiagnosisDialog(scope.row)">受理
                 </el-button>
                 <el-button type="text" v-if="scope.row.repairId" @click="repairId = scope.row.repairId">查看维修单</el-button>
               </template>

src/views/dev/deviceRepairApplyMy.vue

@@ -65,11 +65,11 @@
             <el-table-column label="受理时间" width="140" prop="confirmTime"/>
             <el-table-column label="设备数量" width="100" prop="deviceCount"/>
             <el-table-column label="已完成数量" width="100" prop="finishCount"/>
-            <el-table-column v-if="tabActive==1" label="操作" fixed="right" width="80">
+<!--            <el-table-column v-if="tabActive==1" label="操作" fixed="right" width="80">-->
-              <template slot-scope="scope">
+<!--              <template slot-scope="scope">-->
-                <el-button type="text" @click="confirm(scope.row)">受理</el-button>
+<!--                <el-button type="text" @click="confirm(scope.row)">受理</el-button>-->
-              </template>
+<!--              </template>-->
-            </el-table-column>
+<!--            </el-table-column>-->
           </el-table>
           <pagination
             v-show="total>0"
@@ -124,9 +124,9 @@
             <el-table-column label="生产企业" width="180" prop="manufactory"/>
             <el-table-column v-if="tabActive==2" label="操作" fixed="right" width="100">
               <template slot-scope="scope">
-                <el-button type="text" v-if="scope.row.status==deviceRepairApplyDetailStatus.WAIT_DIAGNOSIS.key"
+<!--                <el-button type="text" v-if="scope.row.status==deviceRepairApplyDetailStatus.WAIT_DIAGNOSIS.key"-->
-                           @click="openDiagnosisDialog(scope.row)">诊断
+<!--                           @click="openDiagnosisDialog(scope.row)">诊断-->
-                </el-button>
+<!--                </el-button>-->
                 <el-button type="text" v-if="scope.row.repairId" @click="repairId = scope.row.repairId">查看维修单</el-button>
               </template>
             </el-table-column>

src/views/dev/js/deviceRepairApplyHall.js

@@ -13,6 +13,7 @@ let query = {
   page: 1,
   limit: 10,
   applyId: null,
+  isFinish: 0,
   status: null,
   applyDeptCode: null,
 }