Merge remote-tracking branch 'origin/material-ui' into material-ui

src/views/material/back/component/home.vue

@@ -208,11 +208,13 @@
 
 import {
     getBackApplyList,
-    getProjectList,
-    getUnitList,
     backApplyRemove,
     submitBackApply
 } from '@/api/back/index.js'
+import {
+    getProData,
+    getUnitData,
+} from '@/api/lease/outbound.js'
 // import { getInfo, h } from '@/api/login'
 // import {
 //     getUnitData,
@@ -377,7 +379,7 @@ export default {
                 const params = {
                     // projectId: this.queryParams.proId /*  */,
                 }
-                const res = await getUnitList(params)
+                const res = await getUnitData(params)
                 this.unitList = res.data
         },
         unitChange(val){
@@ -390,7 +392,7 @@ export default {
                 const params = {
                     unitId: this.queryParams.unitId,
                 }
-                const res = await getProjectList(params)
+                const res = await getProData(params)
                 this.proList = res.data;
                 this.queryParams.proId=null
         },

src/views/material/stquery/deviceStatusRecord.vue

@@ -413,10 +413,13 @@
           <el-table-column label="退料时间" align="center" prop="leaseTime" :show-overflow-tooltip="true"/>
           <el-table-column label="维修单号" align="center" prop="repairCode" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-                <span class="clickText" @click="jumpRepair(scope.row.repairCode)">
-                {{ scope.row.repairCode }}
+                <span
+                  :class="{clickText: dialogRepairQuery.type === 2}"
+                  @click="dialogRepairQuery.type === 2 && jumpRepair(scope.row.repairCode)"
+                >
+                      {{ scope.row.repairCode }}
                 </span>
-              </template>
+            </template>
           </el-table-column>
         </el-table>