Merge remote-tracking branch 'origin/master'

src/views/wms/equipment/index.vue

@@ -17,6 +17,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="SAP资产号" prop="sapAsset">
+        <el-input
+          v-model="queryParams.sapAsset"
+          placeholder="请输入SAP资产号"
+          style="width: 200px"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="设备名称" prop="equipmentName">
         <el-input
           v-model="queryParams.equipmentName"
@@ -189,8 +198,9 @@
         label="设备编码"
         align="center"
         prop="equipmentCode"
-        width="100"
+        width="150"
         fixed="left"
+        show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
           <el-button
@@ -201,6 +211,12 @@
           >
         </template>
       </el-table-column>
+      <el-table-column
+        label="SAP资产号"
+        align="center"
+        prop="sapAsset"
+        width="200"
+      />
       <el-table-column
         label="设备名称"
         align="center"
@@ -912,6 +928,9 @@
               <el-descriptions-item label="设备编码">{{
                 form.equipmentCode
               }}</el-descriptions-item>
+              <el-descriptions-item label="SAP资产号">{{
+                form.sapAsset
+              }}</el-descriptions-item>
               <el-descriptions-item label="设备名称">{{
                 form.equipmentName
               }}</el-descriptions-item>
@@ -1327,6 +1346,7 @@ export default {
         hourlyUnitPrice: null,
         equipmentCategory: null,
         factoryWorkshop: null,
+        sapAsset: null,
       },
       queryEquipmentHeadParams: {
         pageNum: 1,
@@ -1552,6 +1572,7 @@ export default {
         sapCode: null,
         sapName: null,
         factoryWorkshop: null,
+        sapAsset: null,
       };
       this.resetForm("form");
     },