Merge remote-tracking branch 'origin/master'

src/api/wms/equipment.js

@@ -105,3 +105,12 @@ export function getPersonList(query) {
     params: query
   });
 }
+
+// 查询设备管理列表
+export function getAuxiliaryEquipmentList(query) {
+  return request({
+    url: '/wms/equipment/getAuxiliaryEquipmentList',
+    method: 'get',
+    params: query
+  });
+}

src/views/wms/equipment/index.vue

@@ -12,7 +12,7 @@
         <el-input
           v-model="queryParams.equipmentCode"
           placeholder="请输入设备编码"
-          style="width: 180px"
+          style="width: 200px"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -22,7 +22,7 @@
           v-model="queryParams.equipmentName"
           placeholder="请输入设备名称"
           clearable
-          style="width: 180px"
+          style="width: 200px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -33,7 +33,7 @@
           @change="$forceUpdate()"
           clearable
           filterable
-          style="width: 180px"
+          style="width: 200px"
           @keyup.enter.native="handleQuery"
         >
           <el-option
@@ -48,7 +48,7 @@
         <el-select
           v-model="queryParams.equipmentStatus"
           placeholder="设备状态"
-          style="width: 180px"
+          style="width: 200px"
           clearable
         >
           <el-option
@@ -60,11 +60,11 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="设备类别(组线/设备)" prop="equipmentStatus">
+      <el-form-item label="设备类别" prop="equipmentStatus">
         <el-select
           v-model="queryParams.equipmentCategory"
           placeholder="设备类别(组线/设备)"
-          style="width: 180px"
+          style="width: 200px"
           clearable
         >
           <el-option
@@ -200,7 +200,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column prop="equipmentStatus" label="设备状态" width="100">
+      <el-table-column prop="equipmentStatus" label="设备状态" width="100" align="center">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.equipment_status"
@@ -208,7 +208,12 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="equipmentCategory" label="设备类别(组线/设备)" width="150">
+      <el-table-column
+        align="center"
+        prop="equipmentCategory"
+        label="设备类别(组线/设备)"
+        width="150"
+      >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.equipment_category"
@@ -352,7 +357,7 @@
             <el-step title="设备使用状况"></el-step>
             <el-step title="设备资产信息"></el-step>
             <el-step title="设备绑定备件"></el-step>
-            <el-step title="设备绑定辅助设备"></el-step>
+            <el-step title="设备绑定辅助设备" v-if="this.form.equipmentCategory == '1' "></el-step>
           </el-steps>
         </div>
         <!-- 维修基本信息 -->
@@ -675,7 +680,7 @@
         </div>
 
         <!-- 设备绑定辅助设备 -->
-        <div v-if="this.repairRecordSteps == 4" class="step-body">
+        <div v-if="this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'  " class="step-body">
           <template>
             <el-transfer
               filterable
@@ -688,7 +693,6 @@
             </el-transfer>
           </template>
         </div>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button v-if="this.repairRecordSteps > 0" @click="stepLast"
@@ -818,7 +822,12 @@
               }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
-
+          <el-tab-pane label="辅助设备" >
+            <ItemEquipment
+              :optType="optType"
+              :equipmentCode="form.equipmentCode"
+            ></ItemEquipment>
+          </el-tab-pane>
           <el-tab-pane label="设备相关图片">
             <el-descriptions
               :column="1"
@@ -945,15 +954,20 @@ import {
 } from "@/api/wms/equipment";
 import { getWorkCenterList, listFactory } from "@/api/wms/factory";
 import { listTeamMembers } from "@/api/wms/team";
-import EquipmentSpareParts from "./single.vue";
 import { Message } from "element-ui";
 import { getToken } from "@/utils/auth";
-import ItemSelectPerson from "./single.vue";
+import ItemSelectPerson from "./itemPerson.vue";
+import ItemEquipment from "./itemEquipment.vue";
 
 export default {
   name: "Equipment",
-  dicts: ["sys_normal_disable", "equ_type", "equipment_status","equipment_category"],
-  components: { EquipmentSpareParts ,ItemSelectPerson},
+  dicts: [
+    "sys_normal_disable",
+    "equ_type",
+    "equipment_status",
+    "equipment_category",
+  ],
+  components: { ItemSelectPerson, ItemEquipment },
   data() {
     return {
       CS: {
@@ -1202,6 +1216,7 @@ export default {
     indexMethod(index) {
       return index + 1;
     },
+
     /** 查询设备管理列表 */
     getList() {
       this.loading = true;
@@ -1215,7 +1230,8 @@ export default {
         }
         for (let i in response.selected) {
           this.auxiliaryEquipmentLeftList.push(response.selected[i].key);
-          this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList;
+          this.form.auxiliaryEquipmentRightData =
+            this.auxiliaryEquipmentRightList;
         }
         this.equipmentList = response.rows;
         this.total = response.total;
@@ -1319,6 +1335,8 @@ export default {
         this.options1 = response.rows;
       });
       this.repairRecordSteps = 0;
+      this.rightList = [];
+      this.auxiliaryEquipmentRightList = [];
       this.open = true;
       this.title = "添加设备管理";
     },
@@ -1332,13 +1350,17 @@ export default {
       });
       getEquipment(equipmentId).then((response) => {
         this.form = response.data;
+        this.rightList = [];
         for (let i in response.data.selectedData) {
           // 将返回的备品备件列表赋值于穿梭框右边列表
           this.rightList.push(response.data.selectedData[i].spareCode);
         }
+        this.auxiliaryEquipmentRightList = [];
         for (let i in response.data.selectedEquipmentData) {
           // 将返回的辅助设备列表赋值于穿梭框右边列表
-          this.auxiliaryEquipmentRightList.push(response.data.selectedEquipmentData[i].auxiliaryEquipmentCode);
+          this.auxiliaryEquipmentRightList.push(
+            response.data.selectedEquipmentData[i].auxiliaryEquipmentCode
+          );
         }
 
         if (response.data.imageFiles != null) {
@@ -1382,8 +1404,6 @@ export default {
     handleView(row) {
       this.reset();
       const equipmentId = row.equipmentId || this.ids;
-      getWorkCenterList().then((response) => {
-      });
       getEquipment(equipmentId).then((response) => {
         this.form = response.data;
         //设备图片
@@ -1410,7 +1430,6 @@ export default {
           });
           this.form.barCodeFileList = newFiles;
         }
-
         this.queryOpen = true;
         this.title = "查看设备信息";
         this.optType = "view";
@@ -1434,7 +1453,8 @@ export default {
         if (valid) {
           if (this.form.equipmentId != null) {
             this.form.rightData = this.rightList;
-            this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList;
+            this.form.auxiliaryEquipmentRightData =
+              this.auxiliaryEquipmentRightList;
             updateEquipment(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -1458,7 +1478,8 @@ export default {
                 "【设备基础信息】设备类型为空，请选择设备类型！"
               );
             } else {
-              this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList;
+              this.form.auxiliaryEquipmentRightData =
+                this.auxiliaryEquipmentRightList;
               this.form.rightData = this.rightList;
               addEquipment(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
@@ -1552,7 +1573,11 @@ export default {
 
     //人员选择
     onItemSelectedPerson(obj) {
-      this.$set(this.form,"equipmentHead",obj[0].nickName + "(" + obj[0].userName+")" );
+      this.$set(
+        this.form,
+        "equipmentHead",
+        obj[0].nickName + "(" + obj[0].userName + ")"
+      );
       console.log(this.form.equipmentHead);
     },
 

src/views/wms/equipment/itemEquipment.vue

@@ -0,0 +1,123 @@
+<template>
+  <div class="app-container">
+    <el-table
+      :data="itemList"
+      border
+    >
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+        fixed
+      />
+      <el-table-column
+        label="设备名称"
+        align="center"
+        prop="equipmentName"
+      />
+      <el-table-column
+        label="设备状态"
+        align="center"
+        prop="equipmentStatus"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.equipment_status"
+            :value="scope.row.equipmentStatus"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { getAuxiliaryEquipmentList } from "@/api/wms/equipment";
+import { Message } from "element-ui";
+
+export default {
+  name: "MdItemSingle",
+  dicts: ["equipment_status"],
+  data() {
+    return {
+      showFlag: false,
+      // 选中数组
+      selectedItemId: undefined,
+      selectedRows: undefined,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        equipmentCode: this.equipmentCode,
+      },
+    };
+  },
+
+  props: {
+    equipmentCode: undefined,
+    optType: undefined,
+    workStatus: undefined,
+  },
+
+  created() {
+    this.getList();
+  },
+
+  methods: {
+    // 取消按钮
+    cancel() {
+      this.showFlag = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        itemId: null,
+        itemCode: this.processId,
+        itemType: null,
+      };
+      this.resetForm("form");
+    },
+
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+
+    /** 查询设备编码列表*/
+    getList() {
+      getAuxiliaryEquipmentList(this.queryParams).then((response) => {
+        this.itemList = response.rows;
+        this.total = response.total;
+      });
+    },
+
+  },
+};
+</script>