From 3c857c1889024a2c538b3e974c12a9d949a03bf3 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202303>
Date: Tue, 1 Aug 2023 14:54:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86-=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=BA=8F-=E4=BF=AE=E6=94=B9/=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=95=8C=E9=9D=A2-=E8=BE=85=E5=8A=A9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/equipment.js                 |  56 +++--
 src/views/technology/process/content.vue |  42 +++-
 src/views/technology/process/index.vue   |   7 -
 src/views/technology/process/single.vue  | 301 +++++++++++++++++++++++
 src/views/wms/equipment/index.vue        |  14 +-
 5 files changed, 375 insertions(+), 45 deletions(-)
 create mode 100644 src/views/technology/process/single.vue

diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js
index 05aa299..c46a7ff 100644
--- a/src/api/wms/equipment.js
+++ b/src/api/wms/equipment.js
@@ -2,43 +2,51 @@ import request from '@/utils/request'
 
 // 查询设备管理列表
 export function listEquipment(query) {
-	return request({
-		url: '/wms/equipment/list',
-		method: 'get',
-		params: query
-	});
+  return request({
+    url: '/wms/equipment/list',
+    method: 'get',
+    params: query
+  });
 }
 
 // 查询设备管理详细
 export function getEquipment(equipmentId) {
-	return request({
-		url: '/wms/equipment/' + equipmentId,
-		method: 'get'
-		});
+  return request({
+    url: '/wms/equipment/' + equipmentId,
+    method: 'get'
+  });
 }
 
 // 新增设备管理
 export function addEquipment(data) {
-	return request({
-		url: '/wms/equipment',
-		method: 'post',
-		data: data
-	});
+  return request({
+    url: '/wms/equipment',
+    method: 'post',
+    data: data
+  });
 }
 
 // 修改设备管理
 export function updateEquipment(data) {
-	return request({
-		url: '/wms/equipment',
-		method: 'put',
-		data: data
-	});
+  return request({
+    url: '/wms/equipment',
+    method: 'put',
+    data: data
+  });
 }
 
-// 删除设备管理
+// 删除设备管
 export function delEquipment(equipmentId) {
-	return request({
-		url: '/wms/equipment/' + equipmentId,
-		method: 'delete'
-	});
+  return request({
+    url: '/wms/equipment/' + equipmentId,
+    method: 'delete'
+  });
+}
+
+// 查询部门下拉树结构
+export function treeselect() {
+  return request({
+    url: '/wms/equipment/tree',
+    method: 'get'
+  })
 }
diff --git a/src/views/technology/process/content.vue b/src/views/technology/process/content.vue
index 2e784c8..837e770 100644
--- a/src/views/technology/process/content.vue
+++ b/src/views/technology/process/content.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-
+          v-hasPermi="['mes:pro:processcontent:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -19,7 +19,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-
+          v-hasPermi="['mes:pro:processcontent:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -30,7 +30,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-
+          v-hasPermi="['mes:pro:processcontent:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -40,7 +40,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-
+          v-hasPermi="['mes:pro:processcontent:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -60,14 +60,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-
+            v-hasPermi="['mes:pro:processcontent:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-
+            v-hasPermi="['mes:pro:processcontent:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -100,7 +100,10 @@
         <el-row>
             <el-col :span="12">
                 <el-form-item label="辅助设备" prop="device">
-                    <el-input v-model="form.device" placeholder="请输入辅助设备" />
+                  <el-input v-model="form.device" placeholder="请选择辅助设备" >
+                        <el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button>
+                    </el-input>
+                    <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
                 </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -129,16 +132,15 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
   </div>
 </template>
 
 <script>
 import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/processcontent";
-import ItemSelect  from "@/components/itemSelect/index.vue";
+import ItemSelect  from "./single.vue";
 export default {
   name: "Processcontent",
-  components: { ItemSelect },
+  components: {ItemSelect},
   data() {
     return {
       // 遮罩层
@@ -188,6 +190,26 @@ export default {
     this.getList();
   },
   methods: {
+    //新增 设备选择弹出框
+    onItemSelected(obj){
+      if(obj != undefined && obj != null){
+        console.log('返回',obj);
+      if(this.form.device == null){
+        //obj = obj.slice(1);
+        console.log("if获取的",obj);
+        console.log("if获取的device",this.form.device);
+        this.form.device = obj;
+      }else{
+        console.log("else获取的",obj);
+        console.log("else获取的device",this.form.device);
+        this.form.device = this.form.device +","+obj;
+      }
+    }
+    },
+    //新增 设备选择弹出框
+    handleSelectEquipment(){
+      this.$refs.itemSelect.showFlag = true;
+    },
     /** 查询生产工序内容列表 */
     getList() {
       this.loading = true;
diff --git a/src/views/technology/process/index.vue b/src/views/technology/process/index.vue
index f03705d..233a7de 100644
--- a/src/views/technology/process/index.vue
+++ b/src/views/technology/process/index.vue
@@ -355,7 +355,6 @@ export default {
           }
         ]
         }],
-      useTypeKey:0,
       //自动生成编码
       autoGenFlag:false,
       optType: undefined,
@@ -427,17 +426,11 @@ export default {
       },
       fileList:[],
       equipmentId:'',
-      watch: {
-        equipmentTypeName(val) {
-        this.$refs.tree.filter(val);
-      }
-      }
     };
   },
   created() {
     this.getList();
     this.getEquipmentList();
-
   },
   methods: {
     activated(){
diff --git a/src/views/technology/process/single.vue b/src/views/technology/process/single.vue
new file mode 100644
index 0000000..ae9da39
--- /dev/null
+++ b/src/views/technology/process/single.vue
@@ -0,0 +1,301 @@
+<template>
+  <el-dialog title="设备选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1100px"
+    center
+  >
+    <el-row :gutter="20">
+      <!--分类数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-tree
+            :data="treeData"
+            node-key="id"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+
+      <!--设备数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="设备编码" prop="itemCode">
+            <el-input
+              v-model="queryParams.itemCode"
+              placeholder="请输入设备编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="设备名称" prop="itemName">
+            <el-input
+              v-model="queryParams.itemName"
+              placeholder="请输入设备名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="itemList" @selection-change="handleEquipmentSelectionChange" ref="myTable">
+          <el-table-column width="50" align="center" type="selection">
+              <!-- <template v-slot="scope">
+                  <el-radio v-model="selectedItemId" :label="scope.row.itemId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+              </template> -->
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
+          <el-table-column label="设备编码" align="center" key="itemCode" prop="equipmentCode" v-if="columns[0].visible" >
+          </el-table-column>
+          <el-table-column label="设备类型编码" align="center" key="itemTypeCode" prop="equipmentTypeCode" v-if="columns[2].visible" >
+          </el-table-column>
+          <el-table-column label="设备名称"  align="left" key="itemName" prop="equipmentName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitEquipmentForm">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
+import { treeselect } from "@/api/wms/equipment";
+// import Treeselect from "@riophae/vue-treeselect";
+// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "MdItemSingle",
+  // components: { Treeselect },
+  data() {
+    return {
+      treeData: [{
+          id: '1',
+          label: '设备类别',
+          children: [{
+            id: 'equ_type_lg',
+            label: '料罐'
+          }, {
+            id: 'equ_type_cxj',
+            label: '成型机'
+          }, {
+            id: 'equ_type_hf',
+            label: '烘房'
+          }, {
+            id: 'equ_type_spj',
+            label: '收坯机'
+          }, {
+            id: 'equ_type_bzx',
+            label: '包装线'
+          }
+        ]
+        }],
+      showFlag:false,
+      // 选中数组
+      selectedItemId: undefined,
+      selectedRows: undefined,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备产品表格数据
+      itemList: null,
+      // 树选项
+      itemTypeOptions: undefined,
+      //树名称
+      equipmentTypeCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        itemName: undefined,
+        equipmentTypeCode: undefined,
+        itemTypeId: 0,
+        itemCodeGet: '',
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `设备编码`, visible: true },
+        { key: 1, label: `设备名称`, visible: true },
+        { key: 2, label: `设备类型`, visible: true },
+      ]
+    };
+  },
+  created() {
+    this.getList();
+    // this.getTreeselect();
+  },
+
+  methods: {
+
+      // 表单重置
+      reset() {
+        this.form = {
+          itemId: null,
+          itemCode: this.processId,
+          itemType: null,
+        };
+        this.resetForm("form");
+      },
+
+    handleEquipmentSelectionChange (val) {
+       this.itemList = val
+    },
+
+  	 // 生成表头序号
+        indexMethod(index){
+          return index+1 ;
+        },
+    //
+
+    /** 查询设备编码列表*/
+    getList() {
+      this.loading = true;
+      listEquipment(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 查询分类下拉树结构 */
+    // getTreeselect() {
+    //   treeselect().then(response => {
+    //     this.itemTypeOptions = response.rows;
+    //     console.log(response.rows);
+    //     num = response.total;
+    //     for (let id of response.rows) {
+    //       if(id == 'equ_type_lg'){
+    //         lable = '料罐';
+    //       }else if(id == 'equ_type_hf'){
+    //         lable = '烘房';
+    //       }else if(id == 'equ_type_cpj'){
+    //         lable = '收坯机';
+    //       }else if(id == 'equ_type_bzx'){
+    //         lable = '包装线';
+    //       }else if(id == 'equ_type_cxj'){
+    //         lable = '成型机';
+    //       }
+    //     }
+    //   });
+    // },
+
+    // 筛选节点
+    filterNode(value, data) {
+      console.log(value, data);
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.equipmentTypeCode = data.id;
+      console.log(this.equipmentTypeCode);
+      this.handleQuery();
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    // handleCurrent(row){
+    //     if(row){
+    //         this.selectedRows = row;
+    //     }
+    // },
+
+    // handleRowDbClick(row){
+    //   if(row){
+    //     this.selectedRows = row;
+    //     this.$emit('onSelected',this.selectedRows);
+    //     this.showFlag = false;
+    //   }
+    // },
+
+    // 多选框选中数据
+		handleEquipmentSelectionChange(selection) {
+			this.ids = selection.map(item => item.equipmentCode);
+			this.single = selection.length!==1;
+			this.multiple = !selection.length;
+			console.log("多选框",this.ids);
+		},
+
+    // 单选选中数据
+    // handleRowChange(row) {
+    //   debugger;
+    //   if(row){
+    //     this.selectedRows = row;
+    //   }
+    // },
+
+    //确定选中
+    // confirmSelect(){
+    //     if(this.selectedItemId ==null || this.selectedItemId==0){
+    //         this.$notify({
+    //             title:'提示',
+    //             type:'warning',
+    //             message: '请至少选择一条数据!'
+    //         });
+    //         return;
+    //     }
+    //     this.$emit('onSelected',this.selectedRows);
+    //     this.showFlag = false;
+    // }
+    //
+    submitEquipmentForm() {
+      const data = this.ids;
+      console.log("数据",data);
+      const equipmentCode = data.toString();
+      console.log("拆分数据",equipmentCode);
+      console.log("原来的数据",this.queryParams.itemCodeGet);
+      if(this.queryParams.itemCodeGet == ""){
+        this.queryParams.itemCodeGet = equipmentCode;
+      }else{
+        this.queryParams.itemCodeGet = this.queryParams.itemCodeGet + ','+ equipmentCode;
+      }
+     this.selectedRows = this.queryParams.itemCodeGet;
+     this.$emit('onSelected', this.selectedRows);
+     this.showFlag = false;
+     this.queryParams.itemCodeGet = "";
+    },
+  }
+};
+</script>
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 17e96a4..5957b30 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -90,10 +90,8 @@
 		</el-table-column>
 			<el-table-column label="设备名称" align="center" prop="equipmentName" />
 			<el-table-column label="规格型号" align="center" prop="equipmentSpec" />
-			<el-table-column label="设备类型ID" align="center" prop="equipmentTypeId" width="100"/>
 			<el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="100" />
 			<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="100"/>
-			<el-table-column label="所属车间ID" align="center" prop="workshopId" width="100"/>
 			<el-table-column label="所属车间编码" align="center" prop="workshopCode" width="100"/>
 			<el-table-column label="所属车间名称" align="center" prop="workshopName" width="100"/>
 			<el-table-column label="设备状态" align="center" prop="status" />
@@ -151,8 +149,15 @@
 						</el-form-item>
                     </el-col>
                     <el-col :span="12">
-						<el-form-item label="设备类型名称" prop="equipmentTypeName">
-							<el-input v-model="form.equipmentTypeName" placeholder="请输入设备类型名称" />
+						<el-form-item label="设备类型" prop="equipmentTypeCode">
+							<el-select v-model="form.equipmentTypeCode" placeholder="请选择设备类型">
+                <el-option
+                  v-for="dict in dict.type.equ_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
 						</el-form-item>
                     </el-col>
                 </el-row>
@@ -212,6 +217,7 @@ import EquipmentBoundMaterials from "./equipmentBoundMaterials";
 export default {
 	name: "Equipment",
 	components: {EquipmentBoundMaterials},
+	dicts: ['sys_normal_disable', 'equ_type'],
 	data() {
 		return {
 			// 遮罩层