Merge remote-tracking branch 'origin/dev' into dev

src/views/inventory/DeviceInspectMyTake.vue

@@ -16,6 +16,17 @@
                         clearable></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务类型:" class="query-form-item">
+              <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择计划级别" clearable>
+                <el-option label="巡检" :value=1></el-option>
+                <el-option label="养护" :value=2></el-option>
+                <el-option label="报修" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="预计结束时间时间:">
               <el-date-picker
@@ -32,8 +43,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="开始时间:">
               <el-date-picker
@@ -85,6 +94,11 @@
         <el-table-column label="任务编号" prop="orderId"></el-table-column>
         <el-table-column label="资产编码" prop="code"></el-table-column>
         <el-table-column label="设备名称" prop="deviceName"></el-table-column>
+        <el-table-column label="任务类型" prop="repairType">
+          <template slot-scope="scope">
+            <el-tag>{{ repairTypeMap[scope.row.type] }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="任务状态" prop="status">
           <template slot-scope="scope">
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
@@ -247,6 +261,11 @@ export default {
         0: "草稿",
         1: "未分配",
       },
+      repairTypeMap: {
+        1: "巡检",
+        2: "养护",
+        3: "报修",
+      },
       statusdetailMap: {
         1: "未开始",
         2: "已检查",

src/views/inventory/DeviceInspectTakeAdd.vue

@@ -82,7 +82,8 @@
             <el-form-item label="项目类型:" prop="type">
               <el-select v-model="inspectTake.type" style="width: 90%"
                          :disabled="formName == 'edit' || type == 3"
-                         placeholder="请选择项目类型" clearable="true"
+                         @change="repairType"
+                         placeholder="请选择项目类型"
               >
                 <el-option label="巡检" :value="1"></el-option>
                 <el-option label="养护" :value="2"></el-option>
@@ -93,6 +94,32 @@
 
           </el-col>
         </el-row>
+
+        <el-row v-if="ischeck">
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="维修类型:" prop="repairType">
+              <el-select v-model="inspectTake.repairType"
+                         :disabled="formName == 'edit' || type == 3"
+                         placeholder="请选择维修类型" style="width: 90%" clearable>
+                <el-option label="自行维修" :value=1></el-option>
+                <el-option label="外部维修" :value=2></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="紧急程度:" prop="level">
+              <el-select v-model="inspectTake.level"
+                         :disabled="formName == 'edit' || type == 3"
+                         placeholder="请选择紧急程度" style="width: 90%" clearable>
+                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
 
             <el-col :span="10">
@@ -346,6 +373,7 @@ export default {
         updateTime: null,
         taskOrderIdFk: null
       },
+      ischeck:false,
       deviceList: [],
       delectList: [],
       deviceTotal: 0,
@@ -361,6 +389,8 @@ export default {
         deviceName: [{required: true, message:"请输入设备名称!",trigger: 'blur'}],
         code: [{required: true, message:"请输入物资编码!",trigger: 'blur'}],
         type: [{required: true, message:"请选择类型!",trigger: 'blur'}],
+        repairType: [{required: true, message:"请选择维修类型!",trigger: 'blur'}],
+        level: [{required: true, message:"请选择紧急程度!",trigger: 'blur'}],
       },
       statusMap: {
         1: "未开始",
@@ -387,6 +417,15 @@ export default {
         this.getInvList();
       });
     },
+    repairType(val){
+      if(val == 3){
+        //报修
+        this.ischeck = true;
+
+      }else
+        this.ischeck = false;
+
+    },
     getInvList() {
       let params = {deptCode: this.inspectTake.deptCode};
       getInvListByUser(params)
@@ -646,6 +685,9 @@ export default {
     this.getUserBus();
     if (!isBlank(this.inspectTake.id)) {
       this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
+      if(this.inspectTake.type == 3){
+        this.ischeck =true
+      }
     }
   }
   ,

src/views/inventory/DeviceInspectTakeAuditModify.vue

@@ -71,7 +71,9 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="项目类型:" prop="type">
-              <el-select v-model="inspectTake.type" style="width: 90%" disabled placeholder="请选择项目类型" clearable="true">
+              <el-select v-model="inspectTake.type" style="width: 90%"
+                         @change="repairType"
+                         disabled placeholder="请选择项目类型" clearable="true">
                 <el-option label="巡检" :value="1"></el-option>
                 <el-option label="养护" :value="2"></el-option>
                 <el-option label="报修" :value="3"></el-option>
@@ -96,6 +98,31 @@
           </el-col>
         </el-row>
 
+        <el-row v-if="ischeck">
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="维修类型:" prop="repairType">
+              <el-select v-model="inspectTake.repairType"
+                          disabled
+                         placeholder="请选择维修类型" style="width: 90%" clearable>
+                <el-option label="自行维修" :value=1></el-option>
+                <el-option label="外部维修" :value=2></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="紧急程度:" prop="level">
+              <el-select v-model="inspectTake.level"
+                         disabled
+                         placeholder="请选择紧急程度" style="width: 90%" clearable>
+                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -245,6 +272,7 @@ export default {
         updateTime: null,
         taskOrderIdFk: null
       },
+      ischeck:false,
       deviceList: [],
       delectList: [],
       deviceTotal: 0,
@@ -312,6 +340,15 @@ export default {
     },
 
     //!--------------------------------------------------------------   新加方法           --------------------------------------------------------- //
+    repairType(val){
+      if(val == 3){
+        //报修
+        this.ischeck = true;
+      }else
+        this.ischeck = false;
+    },
+
+
     selectDeviceInspecTakeDetail(obj) {
       selectDeviceInspecTakeDetail(obj).then((res) => {
         this.loading = false;
@@ -459,6 +496,9 @@ export default {
     this.getUserBus();
     if (!isBlank(this.inspectTake.id)) {
       this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
+      if(this.inspectTake.type == 3){
+        this.ischeck =true
+      }
     }
   }
   ,

src/views/inventory/DeviceProjectSet.vue

@@ -113,6 +113,7 @@
       :visible.sync="formVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
+      :before-close="closeDialog"
       width="40%"
       v-if="formVisible"
     >
@@ -300,6 +301,7 @@ export default {
     closeDialog() {
       this.formVisible = false;
       this.getList();
+      this.deviceRepairOrder = []
     },
 
   },

src/views/inventory/DeviceProjectSetDialog.vue

@@ -32,6 +32,7 @@
               >
                 <el-option label="巡检" :value="1"></el-option>
                 <el-option label="养护" :value="2"></el-option>
+                <el-option label="报修" :value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/views/inventory/DeviceRepairOrderAudit.vue

@@ -370,6 +370,7 @@ export default {
           if (res.code === 20000) {
             this.$message.success("删除成功！");
             this.getList();
+            this.delectList = [];
           } else {
             this.$message.error(res.message);
           }
@@ -427,6 +428,7 @@ export default {
     },
     closeDialog() {
       this.formVisible = false;
+      this.delectList = [];
       this.getList();
     },
     showImgViewer(row){

src/views/inventory/DeviceRepairOrderCompleted.vue

@@ -401,6 +401,7 @@ export default {
           if (res.code === 20000) {
             this.$message.success("删除成功！");
             this.getList();
+            this.delectList = [];
           } else {
             this.$message.error(res.message);
           }

src/views/inventory/DeviceRepairOrderNew.vue

@@ -386,6 +386,7 @@ export default {
           if (res.code === 20000) {
             this.$message.success("删除成功！");
             this.getList();
+            this.detailList = [];
           } else {
             this.$message.error(res.message);
           }
@@ -396,6 +397,7 @@ export default {
     },
     closeDialog() {
       this.formVisible = false;
+      this.detailList = [];
       this.getList();
     },
     showImgViewer(row) {