Merge branch 'suzhou_blueVersion' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into suzhou_blueVersion

.env.production

@@ -2,5 +2,5 @@
 VUE_APP_ENV = 'Prod'
 NODE_ENV = 'production'
 # base api
-# VUE_APP_BASE_API = 'http://10.122.64.86:8095'
+# 正式版本
 VUE_APP_BASE_API = 'http://192.168.3.22:8095'

src/views/equip/basic/service.vue

@@ -170,7 +170,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item :label="getColumnName('pm_service-maintimelen')">
-            <el-input v-model="form['pm_service-maintimelen']" placeholder="请输入" />
+            <el-input-number v-model="form['pm_service-maintimelen']" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="6">

src/views/equip/reportform/history.vue

@@ -135,6 +135,7 @@
                 <span> {{ parseTime(row.credatuz) }} </span>
               </template>
             </vxe-table-column>
+            
           </vxe-table>
         </template>
       </vxe-table-column>
@@ -154,6 +155,18 @@
           <span> {{ parseTime(scope.row.schedendtime) }} </span>
         </template>
       </vxe-table-column>
+      <!-- 实际开始时间 -->
+      <vxe-table-column field="actbegtime" width="200" :title="getColumnName('actbegtime')" >
+        <template slot-scope="scope">
+          <span> {{ parseTime(scope.row.actbegtime) }} </span>
+        </template>
+      </vxe-table-column>
+      <!-- 实际结束时间 -->
+      <vxe-table-column field="actendtime" width="200" :title="getColumnName('actendtime')">
+        <template slot-scope="scope">
+          <span> {{ parseTime(scope.row.actendtime) }} </span>
+        </template>
+      </vxe-table-column>
       <vxe-table-column field="lastuser" :title="getColumnName('lastuser')" />
       <vxe-table-column field="credatuz" :title="getColumnName('credatuz')">
         <template slot-scope="scope">

src/views/equip/workbench/order.vue

@@ -50,14 +50,15 @@
     </el-form>
 		<!-- 列表 -->
     <vxe-table ref="xTable"
-               v-loading="loading"
-               :align="allAlign"
-               :data="dataList"
-               show-overflow
-               resizable
-               border
-               highlight-hover-row
-               :cell-style="columnStyle">
+      v-loading="loading"
+      :align="allAlign"
+      :data="dataList"
+      show-overflow
+      resizable
+      border
+      highlight-hover-row
+      :cell-style="columnStyle"
+    >
 			<!-- 维护工单 -->
       <vxe-table-column field="maintwoid" width="150" show-overflow :title="getColumnName('maintwoid')" />
 			<!-- 描述 -->
@@ -87,9 +88,22 @@
         <template slot-scope="scope">
           <span> {{ parseTime(scope.row.schedendtime) }} </span>
         </template>
+      </vxe-table-column>
+      <!-- 实际开始时间 -->
+      <vxe-table-column field="actbegtime" width="200" :title="getColumnName('actbegtime')" >
+        <template slot-scope="scope">
+          <span> {{ parseTime(scope.row.actbegtime) }} </span>
+        </template>
+      </vxe-table-column>
+      <!-- 实际结束时间 -->
+      <vxe-table-column field="actendtime" width="200" :title="getColumnName('actendtime')">
+        <template slot-scope="scope">
+          <span> {{ parseTime(scope.row.actendtime) }} </span>
+        </template>
       </vxe-table-column>
 			<!-- 最近一次更改人 -->
       <vxe-table-column field="lastuser" width="200" :title="getColumnName('lastuser')" />
+      
 			<!-- 创建时间 -->
       <vxe-table-column field="credatuz" width="200" :title="getColumnName('credatuz')">
         <template slot-scope="scope">