Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/components/Plugins/Plugins.js

@@ -1,254 +1,256 @@
-export default {
-     install(Vue) {
-
-     	//常量
-        Vue.prototype.$constWKS = {
-        	// 当下拉没有数据的时候，这个是用来测试使用
-            OPTIONS: [{value: '选项1', label: '黄金糕', remark: "数字"},{value: '选项2',label: '双皮奶', remark: "文本"},{value: '选项3', label: '蚵仔煎', remark: "文本"},{ value: '选项4',label: '龙须面', remark: "文本"},{value: '选项5', label: '北京烤鸭', remark: "数字"}],
-         	// [启用、停用]
-         	STATUSLIST: [{ value: '', label: '全部'},{ value: '1',label: '启用'},{ value: '0', label: '停用' }],
-         	// [类型]
-         	OPTTYPE: [
-         		{ value: '', label: '全部'},
-         		{ value: '1',label: '入库'},
-         		{ value: '2', label: '批量入库' },
-         		{ value: '3', label: '任务号入库' },
-         		{ value: '4', label: '出库' },
-         		{ value: '5', label: '任务号出库' },
-         		{ value: '6', label: '锁定' },
-         		{ value: '7', label: '解锁' }
-         	],
-         	// [显示、隐藏]
-         	SHOWHIDE: [{ value: '', label: '全部'},{ value: '1',label: '显示'},{ value: '0', label: '隐藏' }],
-         	// [是、否]
-         	ONOFF: [{ value: '1',label: '是'},{ value: '0', label: '否' }],
-         	// [审核通过、审核不通过]
-         	AUDIOLIST: [{ value: '', label: '全部'},{ value: '0',label: '新增'},{ value: '1',label: '待审核'},{ value: '2',label: '审核通过'},{ value: '3', label: '审核不通过' }],
-         	// [启用、冻结]
-         	STATUSORTHERLIST: [{ value: '', label: '全部'},{ value: '1',label: '启用'},{ value: '0', label: '冻结' }],
-         	// [程序执行状态]
-         	STATUSTASKLIST: [{ value: '', label: '全部'},{ value: '1',label: '执行中'},{ value: '0', label: '停止' },{ value: '2', label: '已完成' }],
-         	// 【生产资源】的[在线状态]
-         	INLINESTATUSLIST: [{ value: '', label: '全部'},{ value: '0',label: '离线'},{ value: '1', label: '在线'},{ value: '2', label: '未激活'}],
-
-          CUTTINGTOOLAPPLYLIST: [{ value: '', label: '全部'},{ value: '0',label: '未处理'},{ value: '1', label: '缺料' },{ value: '2', label: '标记完成' }],
-         	// 【级联选择器】-测试数据
-         	CASCADERLIST: [{
-		          value: 'zhinan',
-		          label: '指南',
-		          disabled: true,
-		          children: [{
-		            value: 'shejiyuanze',
-		            label: '设计原则',
-		            children: [{
-		              value: 'yizhi',
-		              label: '一致'
-		            }, {
-		              value: 'fankui',
-		              label: '反馈'
-		            }, {
-		              value: 'xiaolv',
-		              label: '效率'
-		            }, {
-		              value: 'kekong',
-		              label: '可控'
-		            }]
-		          }, {
-		            value: 'daohang',
-		            label: '导航',
-		            disabled: true,
-		            children: [{
-		              value: 'cexiangdaohang',
-		              label: '侧向导航'
-		            }, {
-		              value: 'dingbudaohang',
-		              label: '顶部导航',
-		              children: [{
-			              value: 'cexiangdaohang22',
-			              label: '侧向导航22'
-			            }, {
-			              value: 'dingbudaohang2222',
-			              label: '顶部导航2222'
-			            }]
-		            }]
-		          }]
-		        }, {
-		          value: 'zujian',
-		          label: '组件',
-		          children: [{
-		            value: 'basic',
-		            label: 'Basic',
-		            children: [{
-		              value: 'layout',
-		              label: 'Layout 布局'
-		            }, {
-		              value: 'color',
-		              label: 'Color 色彩'
-		            }, {
-		              value: 'typography',
-		              label: 'Typography 字体'
-		            }, {
-		              value: 'icon',
-		              label: 'Icon 图标'
-		            }, {
-		              value: 'button',
-		              label: 'Button 按钮'
-		            }]
-		          }, {
-		            value: 'form',
-		            label: 'Form',
-		            children: [{
-		              value: 'radio',
-		              label: 'Radio 单选框'
-		            }, {
-		              value: 'checkbox',
-		              label: 'Checkbox 多选框'
-		            }, {
-		              value: 'input',
-		              label: 'Input 输入框'
-		            }, {
-		              value: 'input-number',
-		              label: 'InputNumber 计数器'
-		            }, {
-		              value: 'select',
-		              label: 'Select 选择器'
-		            }, {
-		              value: 'cascader',
-		              label: 'Cascader 级联选择器'
-		            }, {
-		              value: 'switch',
-		              label: 'Switch 开关'
-		            }, {
-		              value: 'slider',
-		              label: 'Slider 滑块'
-		            }, {
-		              value: 'time-picker',
-		              label: 'TimePicker 时间选择器'
-		            }, {
-		              value: 'date-picker',
-		              label: 'DatePicker 日期选择器'
-		            }, {
-		              value: 'datetime-picker',
-		              label: 'DateTimePicker 日期时间选择器'
-		            }, {
-		              value: 'upload',
-		              label: 'Upload 上传'
-		            }, {
-		              value: 'rate',
-		              label: 'Rate 评分'
-		            }, {
-		              value: 'form',
-		              label: 'Form 表单'
-		            }]
-		          }, {
-		            value: 'data',
-		            label: 'Data',
-		            children: [{
-		              value: 'table',
-		              label: 'Table 表格'
-		            }, {
-		              value: 'tag',
-		              label: 'Tag 标签'
-		            }, {
-		              value: 'progress',
-		              label: 'Progress 进度条'
-		            }, {
-		              value: 'tree',
-		              label: 'Tree 树形控件'
-		            }, {
-		              value: 'pagination',
-		              label: 'Pagination 分页'
-		            }, {
-		              value: 'badge',
-		              label: 'Badge 标记'
-		            }]
-		          }, {
-		            value: 'notice',
-		            label: 'Notice',
-		            children: [{
-		              value: 'alert',
-		              label: 'Alert 警告'
-		            }, {
-		              value: 'loading',
-		              label: 'Loading 加载'
-		            }, {
-		              value: 'message',
-		              label: 'Message 消息提示'
-		            }, {
-		              value: 'message-box',
-		              label: 'MessageBox 弹框'
-		            }, {
-		              value: 'notification',
-		              label: 'Notification 通知'
-		            }]
-		          }, {
-		            value: 'navigation',
-		            label: 'Navigation',
-		            children: [{
-		              value: 'menu',
-		              label: 'NavMenu 导航菜单'
-		            }, {
-		              value: 'tabs',
-		              label: 'Tabs 标签页'
-		            }, {
-		              value: 'breadcrumb',
-		              label: 'Breadcrumb 面包屑'
-		            }, {
-		              value: 'dropdown',
-		              label: 'Dropdown 下拉菜单'
-		            }, {
-		              value: 'steps',
-		              label: 'Steps 步骤条'
-		            }]
-		          }, {
-		            value: 'others',
-		            label: 'Others',
-		            children: [{
-		              value: 'dialog',
-		              label: 'Dialog 对话框'
-		            }, {
-		              value: 'tooltip',
-		              label: 'Tooltip 文字提示'
-		            }, {
-		              value: 'popover',
-		              label: 'Popover 弹出框'
-		            }, {
-		              value: 'card',
-		              label: 'Card 卡片'
-		            }, {
-		              value: 'carousel',
-		              label: 'Carousel 走马灯'
-		            }, {
-		              value: 'collapse',
-		              label: 'Collapse 折叠面板'
-		            }]
-		          }]
-		        }, {
-		          value: 'ziyuan',
-		          label: '资源',
-		          children: [{
-		            value: 'axure',
-		            label: 'Axure Components'
-		          }, {
-		            value: 'sketch',
-		            label: 'Sketch Templates'
-		          }, {
-		            value: 'jiaohu',
-		            label: '组件交互文档'
-		          }]
-		        }]
-        }
-
-        //全局方法
-        Vue.prototype.$utilsWKS = {
-            getUrlParam: function (name) { //获取url中的参数
-                var reg = new RegExp('(^|&?)' + name + '=([^&]*)(&|$)', 'i');
-                var r = window.location.href.substr(1).match(reg);
-                if (r != null) {
-                    return decodeURI(r[2]);
-                }
-                return undefined;
-            }
-        }
-    }
-}
+export default {
+     install(Vue) {
+
+     	//常量
+        Vue.prototype.$constWKS = {
+        	// 当下拉没有数据的时候，这个是用来测试使用
+            OPTIONS: [{value: '选项1', label: '黄金糕', remark: "数字"},{value: '选项2',label: '双皮奶', remark: "文本"},{value: '选项3', label: '蚵仔煎', remark: "文本"},{ value: '选项4',label: '龙须面', remark: "文本"},{value: '选项5', label: '北京烤鸭', remark: "数字"}],
+         	// [启用、停用]
+         	STATUSLIST: [{ value: '', label: '全部'},{ value: '1',label: '启用'},{ value: '0', label: '停用' }],
+         	// [类型]
+         	OPTTYPE: [
+         		{ value: '', label: '全部'},
+         		{ value: '1',label: '入库'},
+         		{ value: '2', label: '批量入库' },
+         		{ value: '3', label: '任务号入库' },
+         		{ value: '4', label: '出库' },
+         		{ value: '5', label: '任务号出库' },
+         		{ value: '6', label: '锁定' },
+         		{ value: '7', label: '解锁' }
+         	],
+         	// [显示、隐藏]
+         	SHOWHIDE: [{ value: '', label: '全部'},{ value: '1',label: '显示'},{ value: '0', label: '隐藏' }],
+         	// [是、否]
+         	ONOFF: [{ value: '1',label: '是'},{ value: '0', label: '否' }],
+         	// [审核通过、审核不通过]
+         	AUDIOLIST: [{ value: '', label: '全部'},{ value: '0',label: '新增'},{ value: '1',label: '待审核'},{ value: '2',label: '审核通过'},{ value: '3', label: '审核不通过' }],
+         	// [启用、冻结]
+         	STATUSORTHERLIST: [{ value: '', label: '全部'},{ value: '1',label: '启用'},{ value: '0', label: '冻结' }],
+         	// [待处理、已处理]
+         	WAITINGLIST: [{ value: '', label: '全部'},{ value: '1',label: '待处理'},{ value: '2', label: '已处理' }],
+         	// [程序执行状态]
+         	STATUSTASKLIST: [{ value: '', label: '全部'},{ value: '1',label: '执行中'},{ value: '0', label: '停止' },{ value: '2', label: '已完成' }],
+         	// 【生产资源】的[在线状态]
+         	INLINESTATUSLIST: [{ value: '', label: '全部'},{ value: '0',label: '离线'},{ value: '1', label: '在线'},{ value: '2', label: '未激活'}],
+
+          CUTTINGTOOLAPPLYLIST: [{ value: '', label: '全部'},{ value: '0',label: '未处理'},{ value: '1', label: '缺料' },{ value: '2', label: '标记完成' }],
+         	// 【级联选择器】-测试数据
+         	CASCADERLIST: [{
+		          value: 'zhinan',
+		          label: '指南',
+		          disabled: true,
+		          children: [{
+		            value: 'shejiyuanze',
+		            label: '设计原则',
+		            children: [{
+		              value: 'yizhi',
+		              label: '一致'
+		            }, {
+		              value: 'fankui',
+		              label: '反馈'
+		            }, {
+		              value: 'xiaolv',
+		              label: '效率'
+		            }, {
+		              value: 'kekong',
+		              label: '可控'
+		            }]
+		          }, {
+		            value: 'daohang',
+		            label: '导航',
+		            disabled: true,
+		            children: [{
+		              value: 'cexiangdaohang',
+		              label: '侧向导航'
+		            }, {
+		              value: 'dingbudaohang',
+		              label: '顶部导航',
+		              children: [{
+			              value: 'cexiangdaohang22',
+			              label: '侧向导航22'
+			            }, {
+			              value: 'dingbudaohang2222',
+			              label: '顶部导航2222'
+			            }]
+		            }]
+		          }]
+		        }, {
+		          value: 'zujian',
+		          label: '组件',
+		          children: [{
+		            value: 'basic',
+		            label: 'Basic',
+		            children: [{
+		              value: 'layout',
+		              label: 'Layout 布局'
+		            }, {
+		              value: 'color',
+		              label: 'Color 色彩'
+		            }, {
+		              value: 'typography',
+		              label: 'Typography 字体'
+		            }, {
+		              value: 'icon',
+		              label: 'Icon 图标'
+		            }, {
+		              value: 'button',
+		              label: 'Button 按钮'
+		            }]
+		          }, {
+		            value: 'form',
+		            label: 'Form',
+		            children: [{
+		              value: 'radio',
+		              label: 'Radio 单选框'
+		            }, {
+		              value: 'checkbox',
+		              label: 'Checkbox 多选框'
+		            }, {
+		              value: 'input',
+		              label: 'Input 输入框'
+		            }, {
+		              value: 'input-number',
+		              label: 'InputNumber 计数器'
+		            }, {
+		              value: 'select',
+		              label: 'Select 选择器'
+		            }, {
+		              value: 'cascader',
+		              label: 'Cascader 级联选择器'
+		            }, {
+		              value: 'switch',
+		              label: 'Switch 开关'
+		            }, {
+		              value: 'slider',
+		              label: 'Slider 滑块'
+		            }, {
+		              value: 'time-picker',
+		              label: 'TimePicker 时间选择器'
+		            }, {
+		              value: 'date-picker',
+		              label: 'DatePicker 日期选择器'
+		            }, {
+		              value: 'datetime-picker',
+		              label: 'DateTimePicker 日期时间选择器'
+		            }, {
+		              value: 'upload',
+		              label: 'Upload 上传'
+		            }, {
+		              value: 'rate',
+		              label: 'Rate 评分'
+		            }, {
+		              value: 'form',
+		              label: 'Form 表单'
+		            }]
+		          }, {
+		            value: 'data',
+		            label: 'Data',
+		            children: [{
+		              value: 'table',
+		              label: 'Table 表格'
+		            }, {
+		              value: 'tag',
+		              label: 'Tag 标签'
+		            }, {
+		              value: 'progress',
+		              label: 'Progress 进度条'
+		            }, {
+		              value: 'tree',
+		              label: 'Tree 树形控件'
+		            }, {
+		              value: 'pagination',
+		              label: 'Pagination 分页'
+		            }, {
+		              value: 'badge',
+		              label: 'Badge 标记'
+		            }]
+		          }, {
+		            value: 'notice',
+		            label: 'Notice',
+		            children: [{
+		              value: 'alert',
+		              label: 'Alert 警告'
+		            }, {
+		              value: 'loading',
+		              label: 'Loading 加载'
+		            }, {
+		              value: 'message',
+		              label: 'Message 消息提示'
+		            }, {
+		              value: 'message-box',
+		              label: 'MessageBox 弹框'
+		            }, {
+		              value: 'notification',
+		              label: 'Notification 通知'
+		            }]
+		          }, {
+		            value: 'navigation',
+		            label: 'Navigation',
+		            children: [{
+		              value: 'menu',
+		              label: 'NavMenu 导航菜单'
+		            }, {
+		              value: 'tabs',
+		              label: 'Tabs 标签页'
+		            }, {
+		              value: 'breadcrumb',
+		              label: 'Breadcrumb 面包屑'
+		            }, {
+		              value: 'dropdown',
+		              label: 'Dropdown 下拉菜单'
+		            }, {
+		              value: 'steps',
+		              label: 'Steps 步骤条'
+		            }]
+		          }, {
+		            value: 'others',
+		            label: 'Others',
+		            children: [{
+		              value: 'dialog',
+		              label: 'Dialog 对话框'
+		            }, {
+		              value: 'tooltip',
+		              label: 'Tooltip 文字提示'
+		            }, {
+		              value: 'popover',
+		              label: 'Popover 弹出框'
+		            }, {
+		              value: 'card',
+		              label: 'Card 卡片'
+		            }, {
+		              value: 'carousel',
+		              label: 'Carousel 走马灯'
+		            }, {
+		              value: 'collapse',
+		              label: 'Collapse 折叠面板'
+		            }]
+		          }]
+		        }, {
+		          value: 'ziyuan',
+		          label: '资源',
+		          children: [{
+		            value: 'axure',
+		            label: 'Axure Components'
+		          }, {
+		            value: 'sketch',
+		            label: 'Sketch Templates'
+		          }, {
+		            value: 'jiaohu',
+		            label: '组件交互文档'
+		          }]
+		        }]
+        }
+
+        //全局方法
+        Vue.prototype.$utilsWKS = {
+            getUrlParam: function (name) { //获取url中的参数
+                var reg = new RegExp('(^|&?)' + name + '=([^&]*)(&|$)', 'i');
+                var r = window.location.href.substr(1).match(reg);
+                if (r != null) {
+                    return decodeURI(r[2]);
+                }
+                return undefined;
+            }
+        }
+    }
+}

imcs-ui/src/views/zuihou/prepareProductMgr/technologyMgr/Index.vue

@@ -239,7 +239,7 @@ export default {
 	    // 启用子组件的按钮
 	    this.$refs.technology.currBtn = false
 	    // 查询【工艺管理】列表数据
-      this.$refs.technology.fetch({bomId: this.currentRow.id, bomVersionId: this.currentRow.id})
+      this.$refs.technology.getPageList({bomId: this.currentRow.id, bomVersionId: this.currentRow.id})
 	  },
   	// 跳转【版本管理】-；列表上的Btn事件
     factoryMgr() {

imcs-ui/src/views/zuihou/prepareProductMgr/technologyMgr/components/TechnologyTable.vue

@@ -104,6 +104,7 @@
 	    	currBtn: true, // 默认不能用
 	    	processModeling: {}, // 工艺对象
 	    	audioStatus: [],
+	    	bomInfo: {}, // 零件对象信息
 	      dialog: {
 	        isVisible: false,
 	        title: ""
@@ -312,6 +313,13 @@
 	      this.dialog.title = this.$t("common.edit")
 	      this.dialog.isVisible = true
 	    },
+	    
+	    // 根据条件，查询数据
+	    getPageList(obj) {
+	    	this.bomInfo = obj;
+	    	this.search ();
+	    },
+	    
 	    fetch (params = {}) {
 	    	this.loading = true
 			
@@ -321,9 +329,9 @@
 	      
 				// 参数 bomVersionId  、bomId
 				// 获取Bom产品的id
-				this.queryParams.bomId = params.bomId
+				this.queryParams.bomId = this.bomInfo.bomId
 				// 获取版本id
-				this.queryParams.bomVersionId = params.bomVersionId
+				this.queryParams.bomVersionId = this.bomInfo.bomVersionId
 				// bizType = 0 ;是工艺版本的列表; 如果是1 的话，则是正式工艺的列表
 				this.queryParams.bizType = "1"
 				console.log("工艺参数：", this.queryParams)

imcs-ui/src/views/zuihou/prepareProductMgr/trayMgr/components/Edit.vue

@@ -1,371 +1,371 @@
-<template>
-  <el-dialog
-  	:close-on-click-modal="false"
-  	:close-on-press-escape="false"
-  	:title="title"
-  	:append-to-body="true"
-  	:visible.sync="isVisible"
-  	:width="width"
-  	top="50px"
-  >
-    <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
-      <!--编码-->
-      <el-form-item :label='$t("prepare.table.tray.no")+"："' prop="no">
-        <el-input v-model="tenant.no" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-      <!--名称-->
-      <el-form-item :label='$t("prepare.table.tray.name")+"："' prop="name">
-        <el-input v-model="tenant.name" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-      <!--物料类型-->
-      <el-form-item :label='$t("prepare.table.tray.materialType")+"："' prop="materialType">
-        <el-input v-model="tenant.materialType" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-<!--      &lt;!&ndash;品牌&ndash;&gt;-->
-<!--    	<el-form-item :label='$t("prepare.table.tray.brand")+"："' prop="brand">-->
-<!--      	<el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.brand.key" value>-->
-<!--          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.METERIAL_BRAND" />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-      <!--生产分厂/制造商-->
-      <el-form-item :label='$t("prepare.table.tray.factory")+"："' prop="factory">
-        <el-input v-model="tenant.factory" :placeholder='$t("common.pleaseEnter")'/>
-      </el-form-item>
-
-      <el-form-item :label='$t("prepare.table.tray.joinDate")+"："' prop="joinDate">
-        <el-date-picker
-          v-model="tenant.joinDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label='$t("prepare.table.tray.period")+"："' prop="period">
-        <el-input-number v-model="tenant.period" :min="1" :max="1000" label="12"></el-input-number>
-      </el-form-item>
-      <el-form-item :label="$t('prepare.table.tray.expiryDate')+'：'" prop="expiryDate">
-        <el-input-number v-model="tenant.expiryDate" :min="1" :max="1000" label="12"></el-input-number>
-      </el-form-item>
-      <el-form-item :label='$t("prepare.table.tray.num")+"："' prop="num">
-        <el-input-number v-model="tenant.num" :min="1" :max="1000" label="1"></el-input-number>
-      </el-form-item>
-
-      <!--夹紧位置-->
-<!--      <el-form-item :label='$t("prepare.table.tray.positionSort")+"："'>-->
-<!--        &lt;!&ndash; 功能按钮 &ndash;&gt;-->
-<!--		    <el-row class="filter-container">-->
-<!--		    	<el-col>-->
-<!--		    		<el-button type="primary" icon="el-icon-plus" size="medium" @click="addRes">新增</el-button>-->
-<!--		    	</el-col>-->
-<!--		    </el-row>-->
-<!--		    &lt;!&ndash; Table数据 &ndash;&gt;-->
-<!--				<el-table-->
-<!--		      ref="table"-->
-<!--		      v-loading="loading"-->
-<!--		      :data="tableData"-->
-<!--		      border-->
-<!--		      fit-->
-<!--		      style="width: 100%;"-->
-<!--		      @selection-change="onSelectChange"-->
-<!--		    >-->
-<!--		      <el-table-column prop="positionSort" :label='$t("prepare.table.trayPosition.positionSort")' align="center" width="70px">-->
-<!--		      	<template slot-scope="{ row }">-->
-<!--		      		<span>{{row.positionSort}}</span>-->
-<!--		      	</template>-->
-<!--		      </el-table-column>-->
-<!--		      <el-table-column prop="size" :label='$t("prepare.table.trayPosition.size")' align="center" width="100px">-->
-<!--		      	<template slot-scope="{ row }">-->
-<!--		      		<el-input size="small" v-model="row.size" v-if="row.isEdit" :placeholder='$t("common.pleaseEnter")'></el-input>-->
-<!--		      		<span v-else>{{row.size}}</span>-->
-<!--		      	</template>-->
-<!--		      </el-table-column>-->
-<!--		      <el-table-column prop="remark" :label='$t("prepare.table.trayPosition.remark")'>-->
-<!--		      	<template slot-scope="{ row }">-->
-<!--		      		<el-input size="small" v-model="row.remark" v-if="row.isEdit" :placeholder='$t("common.pleaseEnter")'></el-input>-->
-<!--		      		<span v-else>{{row.remark}}</span>-->
-<!--		      	</template>-->
-<!--		      </el-table-column>-->
-<!--		      <el-table-column-->
-<!--		        :label="$t('table.operation')"-->
-<!--		        fixed="right"-->
-<!--		        align="center"-->
-<!--		        column-key="operation"-->
-<!--		        width="80px"-->
-<!--		      >-->
-<!--		        <template slot-scope="{ row }">-->
-<!--		        	<el-tooltip v-if="type != 'add'" class="item" :content='$t("common.edit")' effect="dark" placement="top-start">-->
-<!--			          <i-->
-<!--			            class="el-icon-edit table-operation"-->
-<!--			            style="color: #2db7f5;"-->
-<!--			            @click="edit(row)"-->
-<!--			          />-->
-<!--			        </el-tooltip>-->
-<!--		          <el-tooltip class="item" :content='$t("common.delete")' effect="dark" placement="top-start">-->
-<!--			          <i-->
-<!--			            class="el-icon-delete table-operation"-->
-<!--			            style="color: #f50;"-->
-<!--			            @click="singleDelete(row)"-->
-<!--			          />-->
-<!--		          </el-tooltip>-->
-<!--		        </template>-->
-<!--		      </el-table-column>-->
-<!--		    </el-table>-->
-<!--      </el-form-item>-->
-      <el-form-item :label='$t("prepare.table.tools.status")+"："' prop="status">
-        <template>
-				  <el-radio v-model="tenant.status" label="1">{{$t("common.status.valid")}}</el-radio>
-				  <el-radio v-model="tenant.status" label="0">{{$t("common.frozen")}}</el-radio>
-				</template>
-      </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button plain type="warning" @click="isVisible = false">{{ $t('common.cancel') }}</el-button>
-      <el-button plain type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('common.confirm') }}</el-button>
-    </div>
-  </el-dialog>
-</template>
-<script>
-// 【夹具管理】-API
-import trayMgrApi from "@/api/prepareProductMgr/trayMgr"
-
-export default {
-  name: 'TenantEdit',
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-    	loading: false,
-      type: 'add',
-      tableData: [],
-      tenant: this.initTenant(),
-      screenWidth: 0,
-      width: this.initWidth(),
-      confirmDisabled: false,
-      dicts: {
-	      METERIAL_BRAND: {} //工具材料品牌
-	    },
-      roles: [],
-      rules: {
-        name: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  computed: {
-    isVisible: {
-      get () {
-        return this.dialogVisible
-      },
-      set () {
-        this.close()
-        this.reset()
-      }
-    }
-  },
-  mounted () {
-    window.onresize = () => {
-      return (() => {
-        this.width = this.initWidth()
-      })()
-    }
-  },
-  methods: {
-  	// 【新增】按钮-事件
-    addRes(){
-      this.tableData.push({
-      	key: "WKS_"+ Math.random(),
-      	id: '',
-      	positionSort: this.tableData.length + 1,
-      	size: '',
-      	remark: '',
-      	isEdit: true
-      })
-    },
-    // Table的选择事件
-    onSelectChange (selection) {
-      this.selection = selection
-    },
-    // 【删除】按钮事件
-    singleDelete(row){
-    	this.$confirm(this.$t("tips.comTips"), this.$t("common.tips"), {
-      	distinguishCancelAndClose: true,
-        confirmButtonText: this.$t("common.confirm"),
-        cancelButtonText: this.$t("common.cancel"),
-        type: "warning"
-      }).then(() => {
-      	// 过滤符合条件的数据
-      	let arr = this.tableData.filter(item => item.key != row.key || item.id != row.id)
-      	// 给数据排序
-    		arr.forEach((item, index) => {
-    			item.positionSort = index + 1
-    		})
-      	// 给新的数据赋值
-    		this.tableData = arr;
-
-      }).catch(() => {})
-    },
-    // 【修改】按钮事件
-    edit(row){
-    	let list = new Array();
-    	this.tableData.forEach((item, index) => {
-    		// 当前编辑行
-    		if(!!item.id && item.id == row.id){
-    			item.isEdit = true
-    		}
-    		list.push(item)
-    	})
-    	// 赋值给当前
-    	this.tableData = list
-    },
-    initTenant () {
-      return {
-      	model: '',
-        name: '',
-        category: {
-          key: ''
-        },
-        brand: {
-          key: ''
-        },
-        status: '1',
-        num: '1'
-      }
-    },
-    initWidth () {
-      this.screenWidth = document.body.clientWidth
-      if (this.screenWidth < 991) {
-        return '90%'
-      } else if (this.screenWidth < 1400) {
-        return '45%'
-      } else {
-        return '800px'
-      }
-    },
-    setTenant (val, dicts) {
-    	if(val){
-    		this.tenant = { ...val }
-    		// 根据id,查询规格列表数据
-    		this.getSpecsList(val)
-    	}
-      // 字典表
-      this.dicts = dicts
-    },
-    close () {
-      this.$emit('close')
-    },
-    reset () {
-      // 先清除校验，再清除表单，不然有奇怪的bug
-      this.$refs.form.clearValidate()
-      this.$refs.form.resetFields()
-      this.tenant = this.initTenant()
-      this.tableData = []  	//清空【规格】数据
-    },
-    submitForm () {
-    	// 添加夹紧位置数据
-    	this.tenant.trayPositionList = this.tableData
-    	//console.log("Form数据：", this.tenant)
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.confirmDisabled = true
-          if (this.type === 'add') {
-            this.save()
-          } else {
-            this.update()
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    save () {
-      trayMgrApi.save(this.tenant)
-        .then((response) => {
-          const res = response.data
-          if (res.isSuccess) {
-            this.isVisible = false
-            this.$message({
-              message: this.$t('tips.createSuccess'),
-              type: 'success'
-            })
-            // 通知列表
-	          this.$emit("success");
-	          // 通知列表-并关闭弹出框
-	          this.$emit("close");
-          }
-        }).finally(() => {
-          this.confirmDisabled = false
-          return true
-        })
-    },
-    update () {
-      trayMgrApi.update(this.tenant)
-        .then((response) => {
-          const res = response.data
-          if (res.isSuccess) {
-            this.isVisible = false
-            this.$message({
-              message: this.$t('tips.updateSuccess'),
-              type: 'success'
-            })
-            // 通知列表
-	          this.$emit("success");
-	          // 通知列表-并关闭弹出框
-	          this.$emit("close");
-          }
-        }).finally(() => {
-          this.confirmDisabled = false
-          return true
-        })
-    },
-    // 根据【托盘】的id，查询，夹紧位置列表数据
-    getSpecsList(row){
-    	trayMgrApi.listSpecs(row).then(res => {
-    		res = res.data
-    		// console.log("夹紧位置数据：", res)
-    		if(res.isSuccess){
-    			this.tableData = res.data
-    		}
-    	})
-    }
-  }
-}
-</script>
-<style lang="scss" >
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 100px;
-  height: 100px;
-  line-height: 100px;
-  text-align: center;
-}
-.avatar {
-  width: 100px;
-  height: 100px;
-  display: block;
-}
-.checkUsed{
-	display: inline-block;
-	margin-left: 10px;
-	color: #1890ff;
-}
-</style>
+<template>
+  <el-dialog
+  	:close-on-click-modal="false"
+  	:close-on-press-escape="false"
+  	:title="title"
+  	:append-to-body="true"
+  	:visible.sync="isVisible"
+  	:width="width"
+  	top="50px"
+  >
+    <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
+      <!--编码-->
+      <el-form-item :label='$t("prepare.table.tray.no")+"："' prop="no">
+        <el-input v-model="tenant.no" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <!--名称-->
+      <el-form-item :label='$t("prepare.table.tray.name")+"："' prop="name">
+        <el-input v-model="tenant.name" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <!--物料类型-->
+      <el-form-item :label='$t("prepare.table.tray.materialType")+"："' prop="materialType">
+        <el-input v-model="tenant.materialType" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+<!--      &lt;!&ndash;品牌&ndash;&gt;-->
+<!--    	<el-form-item :label='$t("prepare.table.tray.brand")+"："' prop="brand">-->
+<!--      	<el-select style="width:100%" :placeholder='$t("common.pleaseSelect")' v-model="tenant.brand.key" value>-->
+<!--          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.METERIAL_BRAND" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <!--生产分厂/制造商-->
+      <el-form-item :label='$t("prepare.table.tray.factory")+"："' prop="factory">
+        <el-input v-model="tenant.factory" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+
+      <el-form-item :label='$t("prepare.table.tray.joinDate")+"："' prop="joinDate">
+        <el-date-picker
+          v-model="tenant.joinDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item :label='$t("prepare.table.tray.period")+"："' prop="period">
+        <el-input-number v-model="tenant.period" :min="1" :max="1000" label="12"></el-input-number>&nbsp;&nbsp;月
+      </el-form-item>
+      <el-form-item :label="$t('prepare.table.tray.expiryDate')+'：'" prop="expiryDate">
+        <el-input-number v-model="tenant.expiryDate" :min="1" :max="1000" label="12"></el-input-number>&nbsp;&nbsp;月
+      </el-form-item>
+      <el-form-item :label='$t("prepare.table.tray.num")+"："' prop="num">
+        <el-input-number v-model="tenant.num" :min="1" :max="1000" label="1"></el-input-number>&nbsp;&nbsp;个
+      </el-form-item>
+
+      <!--夹紧位置-->
+<!--      <el-form-item :label='$t("prepare.table.tray.positionSort")+"："'>-->
+<!--        &lt;!&ndash; 功能按钮 &ndash;&gt;-->
+<!--		    <el-row class="filter-container">-->
+<!--		    	<el-col>-->
+<!--		    		<el-button type="primary" icon="el-icon-plus" size="medium" @click="addRes">新增</el-button>-->
+<!--		    	</el-col>-->
+<!--		    </el-row>-->
+<!--		    &lt;!&ndash; Table数据 &ndash;&gt;-->
+<!--				<el-table-->
+<!--		      ref="table"-->
+<!--		      v-loading="loading"-->
+<!--		      :data="tableData"-->
+<!--		      border-->
+<!--		      fit-->
+<!--		      style="width: 100%;"-->
+<!--		      @selection-change="onSelectChange"-->
+<!--		    >-->
+<!--		      <el-table-column prop="positionSort" :label='$t("prepare.table.trayPosition.positionSort")' align="center" width="70px">-->
+<!--		      	<template slot-scope="{ row }">-->
+<!--		      		<span>{{row.positionSort}}</span>-->
+<!--		      	</template>-->
+<!--		      </el-table-column>-->
+<!--		      <el-table-column prop="size" :label='$t("prepare.table.trayPosition.size")' align="center" width="100px">-->
+<!--		      	<template slot-scope="{ row }">-->
+<!--		      		<el-input size="small" v-model="row.size" v-if="row.isEdit" :placeholder='$t("common.pleaseEnter")'></el-input>-->
+<!--		      		<span v-else>{{row.size}}</span>-->
+<!--		      	</template>-->
+<!--		      </el-table-column>-->
+<!--		      <el-table-column prop="remark" :label='$t("prepare.table.trayPosition.remark")'>-->
+<!--		      	<template slot-scope="{ row }">-->
+<!--		      		<el-input size="small" v-model="row.remark" v-if="row.isEdit" :placeholder='$t("common.pleaseEnter")'></el-input>-->
+<!--		      		<span v-else>{{row.remark}}</span>-->
+<!--		      	</template>-->
+<!--		      </el-table-column>-->
+<!--		      <el-table-column-->
+<!--		        :label="$t('table.operation')"-->
+<!--		        fixed="right"-->
+<!--		        align="center"-->
+<!--		        column-key="operation"-->
+<!--		        width="80px"-->
+<!--		      >-->
+<!--		        <template slot-scope="{ row }">-->
+<!--		        	<el-tooltip v-if="type != 'add'" class="item" :content='$t("common.edit")' effect="dark" placement="top-start">-->
+<!--			          <i-->
+<!--			            class="el-icon-edit table-operation"-->
+<!--			            style="color: #2db7f5;"-->
+<!--			            @click="edit(row)"-->
+<!--			          />-->
+<!--			        </el-tooltip>-->
+<!--		          <el-tooltip class="item" :content='$t("common.delete")' effect="dark" placement="top-start">-->
+<!--			          <i-->
+<!--			            class="el-icon-delete table-operation"-->
+<!--			            style="color: #f50;"-->
+<!--			            @click="singleDelete(row)"-->
+<!--			          />-->
+<!--		          </el-tooltip>-->
+<!--		        </template>-->
+<!--		      </el-table-column>-->
+<!--		    </el-table>-->
+<!--      </el-form-item>-->
+      <el-form-item :label='$t("prepare.table.tools.status")+"："' prop="status">
+        <template>
+				  <el-radio v-model="tenant.status" label="1">{{$t("common.status.valid")}}</el-radio>
+				  <el-radio v-model="tenant.status" label="0">{{$t("common.frozen")}}</el-radio>
+				</template>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button plain type="warning" @click="isVisible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button plain type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('common.confirm') }}</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+// 【夹具管理】-API
+import trayMgrApi from "@/api/prepareProductMgr/trayMgr"
+
+export default {
+  name: 'TenantEdit',
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+    	loading: false,
+      type: 'add',
+      tableData: [],
+      tenant: this.initTenant(),
+      screenWidth: 0,
+      width: this.initWidth(),
+      confirmDisabled: false,
+      dicts: {
+	      METERIAL_BRAND: {} //工具材料品牌
+	    },
+      roles: [],
+      rules: {
+        name: [
+        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  computed: {
+    isVisible: {
+      get () {
+        return this.dialogVisible
+      },
+      set () {
+        this.close()
+        this.reset()
+      }
+    }
+  },
+  mounted () {
+    window.onresize = () => {
+      return (() => {
+        this.width = this.initWidth()
+      })()
+    }
+  },
+  methods: {
+  	// 【新增】按钮-事件
+    addRes(){
+      this.tableData.push({
+      	key: "WKS_"+ Math.random(),
+      	id: '',
+      	positionSort: this.tableData.length + 1,
+      	size: '',
+      	remark: '',
+      	isEdit: true
+      })
+    },
+    // Table的选择事件
+    onSelectChange (selection) {
+      this.selection = selection
+    },
+    // 【删除】按钮事件
+    singleDelete(row){
+    	this.$confirm(this.$t("tips.comTips"), this.$t("common.tips"), {
+      	distinguishCancelAndClose: true,
+        confirmButtonText: this.$t("common.confirm"),
+        cancelButtonText: this.$t("common.cancel"),
+        type: "warning"
+      }).then(() => {
+      	// 过滤符合条件的数据
+      	let arr = this.tableData.filter(item => item.key != row.key || item.id != row.id)
+      	// 给数据排序
+    		arr.forEach((item, index) => {
+    			item.positionSort = index + 1
+    		})
+      	// 给新的数据赋值
+    		this.tableData = arr;
+
+      }).catch(() => {})
+    },
+    // 【修改】按钮事件
+    edit(row){
+    	let list = new Array();
+    	this.tableData.forEach((item, index) => {
+    		// 当前编辑行
+    		if(!!item.id && item.id == row.id){
+    			item.isEdit = true
+    		}
+    		list.push(item)
+    	})
+    	// 赋值给当前
+    	this.tableData = list
+    },
+    initTenant () {
+      return {
+      	model: '',
+        name: '',
+        category: {
+          key: ''
+        },
+        brand: {
+          key: ''
+        },
+        status: '1',
+        num: '1'
+      }
+    },
+    initWidth () {
+      this.screenWidth = document.body.clientWidth
+      if (this.screenWidth < 991) {
+        return '90%'
+      } else if (this.screenWidth < 1400) {
+        return '45%'
+      } else {
+        return '800px'
+      }
+    },
+    setTenant (val, dicts) {
+    	if(val){
+    		this.tenant = { ...val }
+    		// 根据id,查询规格列表数据
+    		this.getSpecsList(val)
+    	}
+      // 字典表
+      this.dicts = dicts
+    },
+    close () {
+      this.$emit('close')
+    },
+    reset () {
+      // 先清除校验，再清除表单，不然有奇怪的bug
+      this.$refs.form.clearValidate()
+      this.$refs.form.resetFields()
+      this.tenant = this.initTenant()
+      this.tableData = []  	//清空【规格】数据
+    },
+    submitForm () {
+    	// 添加夹紧位置数据
+    	this.tenant.trayPositionList = this.tableData
+    	//console.log("Form数据：", this.tenant)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.confirmDisabled = true
+          if (this.type === 'add') {
+            this.save()
+          } else {
+            this.update()
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    save () {
+      trayMgrApi.save(this.tenant)
+        .then((response) => {
+          const res = response.data
+          if (res.isSuccess) {
+            this.isVisible = false
+            this.$message({
+              message: this.$t('tips.createSuccess'),
+              type: 'success'
+            })
+            // 通知列表
+	          this.$emit("success");
+	          // 通知列表-并关闭弹出框
+	          this.$emit("close");
+          }
+        }).finally(() => {
+          this.confirmDisabled = false
+          return true
+        })
+    },
+    update () {
+      trayMgrApi.update(this.tenant)
+        .then((response) => {
+          const res = response.data
+          if (res.isSuccess) {
+            this.isVisible = false
+            this.$message({
+              message: this.$t('tips.updateSuccess'),
+              type: 'success'
+            })
+            // 通知列表
+	          this.$emit("success");
+	          // 通知列表-并关闭弹出框
+	          this.$emit("close");
+          }
+        }).finally(() => {
+          this.confirmDisabled = false
+          return true
+        })
+    },
+    // 根据【托盘】的id，查询，夹紧位置列表数据
+    getSpecsList(row){
+    	trayMgrApi.listSpecs(row).then(res => {
+    		res = res.data
+    		// console.log("夹紧位置数据：", res)
+    		if(res.isSuccess){
+    			this.tableData = res.data
+    		}
+    	})
+    }
+  }
+}
+</script>
+<style lang="scss" >
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+}
+.avatar {
+  width: 100px;
+  height: 100px;
+  display: block;
+}
+.checkUsed{
+	display: inline-block;
+	margin-left: 10px;
+	color: #1890ff;
+}
+</style>

imcs-ui/src/views/zuihou/qualityCenter/unqualifiedMgr/Index.vue

@@ -3,12 +3,8 @@
 		<!-- 搜索模块 -->
     <div class="filter-container">
     	<span>
-    		<span>{{$t("lineSide.searchForm.typeName")}}：</span>
-    		<el-input v-model="queryParams.model.name" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
     		<span>{{$t("lineSide.searchForm.status")}}：</span>
-    		<el-select v-model="queryParams.model.status" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
+    		<el-select v-model="queryParams.model.handleStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
         	<el-option
 			      v-for="item in audioStatus"
 			      :key="item.value"
@@ -17,6 +13,18 @@
 			    </el-option>
       	</el-select>
     	</span>
+    	<span style="margin-left: 15px;">
+    		<span>{{$t("machining.table.unQuality.uniqueCode")}}：</span>
+    		<el-input v-model="queryParams.model.uniqueCode" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    	</span>
+    	<span style="margin-left: 15px;">
+    		<span>订单名称：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    	</span>
+    	<span style="margin-left: 15px;">
+    		<span>零件名称：</span>
+    		<el-input v-model="queryParams.model.bomName" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    	</span>
       <span style="margin-left: 15px;">
 	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
 	        {{ $t("table.search") }}
@@ -228,7 +236,7 @@
 	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
 	  created() {
 	  	// 调用常量-审核状态
-	  	this.audioStatus = this.$constWKS.SHOWHIDE
+	  	this.audioStatus = this.$constWKS.WAITINGLIST
 	  	// 加载【字典】
 	  	initDicts(['NATION'], this.dicts);
 	  	// 加载列表数据

imcs-ui/src/views/zuihou/resourceProductMgr/deviceMgr/Index.vue

@@ -1,36 +1,73 @@
 <template>
   <div class="app-container">
-		<!-- 搜索模块 -->
+    <!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
-    		<span>{{$t("resource.searchForm.name")}}：</span>
-    		<el-input v-model="queryParams.model.name" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("resource.searchForm.no")}}：</span>
-    		<el-input v-model="queryParams.model.code" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-      <span style="margin-left: 15px;">
-	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
-	        {{ $t("table.search") }}
-	      </el-button>
-	      <el-button plain type="warning" icon="el-icon-refresh" size="medium" @click="reset">
-	        {{ $t("table.reset") }}
-	      </el-button>
+      <span>
+        <span>{{ $t("resource.table.resours.zoneName") }}：</span>
+        <el-select
+          v-model="queryParams.model.zoneId"
+          placeholder="请选择"
+          style="width: 20%"
+        >
+          <el-option
+            v-for="(item, index) in zoneList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </span>
+      <span>
+        <span>{{ $t("resource.searchForm.name") }}：</span>
+        <el-input
+          v-model="queryParams.model.name"
+          :placeholder="$t('common.pleaseEnter')"
+          style="width: 150px"
+          size="medium"
+        />
+      </span>
+      <span style="margin-left: 15px">
+        <span>{{ $t("resource.searchForm.no") }}：</span>
+        <el-input
+          v-model="queryParams.model.code"
+          :placeholder="$t('common.pleaseEnter')"
+          style="width: 150px"
+          size="medium"
+        />
+      </span>
+      <span style="margin-left: 15px">
+        <el-button
+          plain
+          type="primary"
+          icon="el-icon-search"
+          size="medium"
+          @click="search"
+        >
+          {{ $t("table.search") }}
+        </el-button>
+        <el-button
+          plain
+          type="warning"
+          icon="el-icon-refresh"
+          size="medium"
+          @click="reset"
+        >
+          {{ $t("table.reset") }}
+        </el-button>
       </span>
     </div>
 
     <!-- 功能按钮 -->
     <el-row class="filter-container">
-    	<el-col>
-    		<!--<el-button type="primary" icon="el-icon-s-tools" size="medium">{{ $t("resource.buttons.setBtn") }}</el-button>-->
-	      <!--<el-button type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
+      <el-col>
+        <!--<el-button type="primary" icon="el-icon-s-tools" size="medium">{{ $t("resource.buttons.setBtn") }}</el-button>-->
+        <!--<el-button type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
 	        {{ $t("table.delete") }}
 	      </el-button>-->
-    	</el-col>
+      </el-col>
     </el-row>
 
-		<!-- 列表数据 -->
+    <!-- 列表数据 -->
     <el-table
       :key="tableKey"
       ref="table"
@@ -39,68 +76,183 @@
       border
       fit
       row-key="id"
-      style="width: 100%;"
+      style="width: 100%"
       highlight-current-row
-    	@current-change="handleCurrentChange"
+      @current-change="handleCurrentChange"
     >
-    	<el-table-column :label='$t("common.serialNo")' width="55px" align="center">
-	      <template slot-scope="scope">
-	        <div>
-	          {{scope.$index+(queryParams.current - 1) * queryParams.size + 1}}
-	        </div>
-	      </template>
+      <el-table-column
+        :label="$t('common.serialNo')"
+        width="55px"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <div>
+            {{
+              scope.$index + (queryParams.current - 1) * queryParams.size + 1
+            }}
+          </div>
+        </template>
       </el-table-column>
-      <el-table-column prop="pic" :label='$t("resource.table.resours.pic")' align="center" width="150px">
-      	<template slot-scope="{ row }">
-      		<div v-if="row.pic" class="demo-image__preview">
-					  <el-image
-					    style="width: 100px; height: 60px"
-					    :src="row.pic"
-					    :preview-src-list="row.srcList">
-					  </el-image>
-					</div>
-					<span v-else>{{$t("common.noData")}}</span>
-      	</template>
+      <el-table-column
+        prop="pic"
+        :label="$t('resource.table.resours.pic')"
+        align="center"
+        width="150px"
+      >
+        <template slot-scope="{ row }">
+          <div v-if="row.pic" class="demo-image__preview">
+            <el-image
+              style="width: 100px; height: 60px"
+              :src="row.pic"
+              :preview-src-list="row.srcList"
+            >
+            </el-image>
+          </div>
+          <span v-else>{{ $t("common.noData") }}</span>
+        </template>
       </el-table-column>
-      <el-table-column prop="name" :label='$t("resource.table.resours.name")' :show-overflow-tooltip="true" width="180px"></el-table-column>
-      <el-table-column prop="code" :label='$t("resource.table.resours.no")' :show-overflow-tooltip="true" width="100px"></el-table-column>
-      <el-table-column prop="brand" :label='$t("resource.table.resours.brand")' width="100px" v-if="this.$store.state.account.permissions.includes('resource:superview')"></el-table-column>
-      <el-table-column prop="specification" :label='$t("resource.table.resours.specification")'></el-table-column>
-      
-	  <el-table-column prop="capitalNo" :label='$t("resource.table.resours.capitalNo")'></el-table-column>
-	  <el-table-column prop="capitalName" :label='$t("resource.table.resours.capitalName")'></el-table-column>
-	  <el-table-column prop="capitalType" :label='$t("resource.table.resours.capitalType")'></el-table-column>
-	  <el-table-column prop="modeSpecification" :label='$t("resource.table.resours.modeSpecification")'></el-table-column>
-	  <el-table-column prop="capitalPrice" :label='$t("resource.table.resours.capitalPrice")'></el-table-column>
-	  <el-table-column prop="productionDate" :label='$t("resource.table.resours.productionDate")'></el-table-column>
-      <el-table-column prop="productionNo" :label='$t("resource.table.resours.productionNo")'></el-table-column>
-	  <el-table-column prop="manufacturer" :label='$t("resource.table.resours.manufacturer")'></el-table-column>
-   
-	  <el-table-column prop="model" :label='$t("resource.table.resours.model")' v-if="this.$store.state.account.permissions.includes('resource:superview')" ></el-table-column>
-      <el-table-column prop="category.data" :label='$t("resource.table.resours.category")' width="100px"></el-table-column>
-      <el-table-column prop="zoneName" :label='$t("resource.table.resours.zoneName")' width="180px"></el-table-column>
-      <el-table-column prop="positionCount" :label='$t("resource.table.resours.nums")' width="120px"></el-table-column>
-      <el-table-column prop="cncProgram" :label='$t("resource.table.resours.isProgram")' width="110px" align="center">
-      	<template slot-scope="{ row }">
-      		<el-tag :type="row.cncProgram == '1' ? 'success' : 'info'">
-      			{{row.cncProgram == '1' ? $t("common.yes") : $t("common.no")}}
-      		</el-tag>
-      	</template>
+      <el-table-column
+        prop="name"
+        :label="$t('resource.table.resours.name')"
+        :show-overflow-tooltip="true"
+        width="180px"
+      ></el-table-column>
+      <el-table-column
+        prop="code"
+        :label="$t('resource.table.resours.no')"
+        :show-overflow-tooltip="true"
+        width="100px"
+      ></el-table-column>
+      <el-table-column
+        prop="brand"
+        :label="$t('resource.table.resours.brand')"
+        width="100px"
+        v-if="
+          this.$store.state.account.permissions.includes('resource:superview')
+        "
+      ></el-table-column>
+      <el-table-column
+        prop="specification"
+        :label="$t('resource.table.resours.specification')"
+      ></el-table-column>
+
+      <el-table-column
+        prop="capitalNo"
+        :label="$t('resource.table.resours.capitalNo')"
+      ></el-table-column>
+      <el-table-column
+        prop="capitalName"
+        :label="$t('resource.table.resours.capitalName')"
+      ></el-table-column>
+      <el-table-column
+        prop="capitalType"
+        :label="$t('resource.table.resours.capitalType')"
+      ></el-table-column>
+      <el-table-column
+        prop="modeSpecification"
+        :label="$t('resource.table.resours.modeSpecification')"
+      ></el-table-column>
+      <el-table-column
+        prop="capitalPrice"
+        :label="$t('resource.table.resours.capitalPrice')"
+      ></el-table-column>
+      <el-table-column
+        prop="productionDate"
+        :label="$t('resource.table.resours.productionDate')"
+      ></el-table-column>
+      <el-table-column
+        prop="productionNo"
+        :label="$t('resource.table.resours.productionNo')"
+      ></el-table-column>
+      <el-table-column
+        prop="manufacturer"
+        :label="$t('resource.table.resours.manufacturer')"
+      ></el-table-column>
+
+      <el-table-column
+        prop="model"
+        :label="$t('resource.table.resours.model')"
+        v-if="
+          this.$store.state.account.permissions.includes('resource:superview')
+        "
+      ></el-table-column>
+      <el-table-column
+        prop="category.data"
+        :label="$t('resource.table.resours.category')"
+        width="100px"
+        v-if="
+          this.$store.state.account.permissions.includes('resource:superview')
+        "
+      ></el-table-column>
+      <el-table-column
+        prop="zoneName"
+        :label="$t('resource.table.resours.zoneName')"
+        width="180px"
+      ></el-table-column>
+      <el-table-column
+        prop="positionCount"
+        :label="$t('resource.table.resours.nums')"
+        width="120px"
+        v-if="
+          this.$store.state.account.permissions.includes('resource:superview')
+        "
+      ></el-table-column>
+      <el-table-column
+        prop="cncProgram"
+        :label="$t('resource.table.resours.isProgram')"
+        width="110px"
+        align="center"
+      >
+        <template slot-scope="{ row }">
+          <el-tag :type="row.cncProgram == '1' ? 'success' : 'info'">
+            {{ row.cncProgram == "1" ? $t("common.yes") : $t("common.no") }}
+          </el-tag>
+        </template>
       </el-table-column>
-      <el-table-column prop="linkStatus" :label='$t("resource.table.resours.linkStatus")' width="180px" align="center">
-      	<template slot-scope="{ row }">
-      		<div class="statusDiv" :style="'background:'+ row.linkStatus.background">{{row.linkStatus.text}}</div>
-      	</template>
+      <el-table-column
+        prop="linkStatus"
+        :label="$t('resource.table.resours.linkStatus')"
+        width="180px"
+        align="center"
+      >
+        <template slot-scope="{ row }">
+          <div
+            class="statusDiv"
+            :style="'background:' + row.linkStatus.background"
+          >
+            {{ row.linkStatus.text }}
+          </div>
+        </template>
       </el-table-column>
-      <el-table-column prop="controlStatus" :label='$t("resource.table.resours.controlStatus")' width="180px" align="center">
-      	<template slot-scope="{ row }">
-      		<div class="statusDiv" :style="'background:'+ row.controlStatus.background">{{row.controlStatus.text}}</div>
-      	</template>
+      <el-table-column
+        prop="controlStatus"
+        :label="$t('resource.table.resours.controlStatus')"
+        width="180px"
+        align="center"
+      >
+        <template slot-scope="{ row }">
+          <div
+            class="statusDiv"
+            :style="'background:' + row.controlStatus.background"
+          >
+            {{ row.controlStatus.text }}
+          </div>
+        </template>
       </el-table-column>
-      <el-table-column prop="productionStatus" :label='$t("resource.table.resours.productionStatus")' width="180px" align="center">
-      	<template slot-scope="{ row }">
-      		<div class="statusDiv" :style="'background:'+ row.productionStatus.background">{{row.productionStatus.text}}</div>
-      	</template>
+      <el-table-column
+        prop="productionStatus"
+        :label="$t('resource.table.resours.productionStatus')"
+        width="180px"
+        align="center"
+      >
+        <template slot-scope="{ row }">
+          <div
+            class="statusDiv"
+            :style="'background:' + row.productionStatus.background"
+          >
+            {{ row.productionStatus.text }}
+          </div>
+        </template>
       </el-table-column>
       <el-table-column
         :label="$t('table.operation')"
@@ -110,47 +262,77 @@
         width="180px"
       >
         <template slot-scope="{ row }">
-        	<!--<el-tooltip class="item" content="查看详情" effect="dark" placement="top-start">
+          <!--<el-tooltip class="item" content="查看详情" effect="dark" placement="top-start">
 	          <i
 	            class="el-icon-view table-operation"
 	            style="color: #87d068;"
 	            @click="view(row)"
 	          />
           </el-tooltip>-->
-          <el-tooltip class="item" :content='$t("resource.buttons.work")' effect="dark" placement="top-start" v-hasPermission="['resource:superview']">
-	          <i
-	            class="el-icon-location-information table-operation"
-	            style="color: #2db7f5;"
-	            @click="equipment(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.work')"
+            effect="dark"
+            placement="top-start"
+            v-hasPermission="['resource:superview']"
+          >
+            <i
+              class="el-icon-location-information table-operation"
+              style="color: #2db7f5"
+              @click="equipment(row)"
+            />
           </el-tooltip>
-          <el-tooltip class="item" :content='$t("resource.buttons.setting")' effect="dark" placement="top-start" v-hasPermission="['resource:superview']">
-	          <i
-	            class="el-icon-setting table-operation"
-	            style="color: #2db7f5;"
-	            @click="edit(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.setting')"
+            effect="dark"
+            placement="top-start"
+            v-hasPermission="['resource:superview']"
+          >
+            <i
+              class="el-icon-setting table-operation"
+              style="color: #2db7f5"
+              @click="edit(row)"
+            />
           </el-tooltip>
-          <el-tooltip class="item" :content='$t("resource.buttons.hardware")' effect="dark" placement="top-start" v-hasPermission="['resource:superview']">
-	          <i
-	            class="el-icon-s-help table-operation"
-	            style="color: #2db7f5;"
-	            @click="editHardware(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.hardware')"
+            effect="dark"
+            placement="top-start"
+            v-hasPermission="['resource:superview']"
+          >
+            <i
+              class="el-icon-s-help table-operation"
+              style="color: #2db7f5"
+              @click="editHardware(row)"
+            />
           </el-tooltip>
-		  <el-tooltip class="item" :content='$t("resource.buttons.autoCode")' effect="dark" placement="top-start" v-if="row.isAutoCode=='1'"  v-hasPermission="['resource:superview']">
-	          <i
-	            class="el-icon-place table-operation"
-	            style="color: #2db7f5;"
-	            @click="autoCode(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.autoCode')"
+            effect="dark"
+            placement="top-start"
+            v-if="row.isAutoCode == '1'"
+            v-hasPermission="['resource:superview']"
+          >
+            <i
+              class="el-icon-place table-operation"
+              style="color: #2db7f5"
+              @click="autoCode(row)"
+            />
           </el-tooltip>
-          <el-tooltip class="item" :content='$t("resource.buttons.detailConf")' effect="dark" placement="top-start">
-	          <i
-	            class="el-icon-guide table-operation"
-	            style="color: #f50;"
-	            @click="detailConf(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.detailConf')"
+            effect="dark"
+            placement="top-start"
+          >
+            <i
+              class="el-icon-guide table-operation"
+              style="color: #f50"
+              @click="detailConf(row)"
+            />
           </el-tooltip>
         </template>
       </el-table-column>
@@ -182,7 +364,7 @@
       @close="editHardwareClose"
       @success="editHardwareSuccess"
     />
-	<!-- 生产资源资料  -->
+    <!-- 生产资源资料  -->
     <detailConf
       ref="detailConf"
       :dialog-visible="dialogDetailConf.isVisible"
@@ -190,17 +372,20 @@
       @close="editDetailConfClose"
       @success="editDetailConfSuccess"
     />
-	
-	<el-dialog	       
-		  :title='$t("resource.buttons.autoCode")'
-		  :visible.sync="autoCodeVisible"
-		  width="80%"
-		  custom-class="dialogNoTop"
-		>
-			<!--【设备自动化节点配置】 -->
-		<autoCode :rowData="rowData" @close="editAutoCodeClose" @success="editAutoCodeSuccess" />
 
-	</el-dialog>
+    <el-dialog
+      :title="$t('resource.buttons.autoCode')"
+      :visible.sync="autoCodeVisible"
+      width="80%"
+      custom-class="dialogNoTop"
+    >
+      <!--【设备自动化节点配置】 -->
+      <autoCode
+        :rowData="rowData"
+        @close="editAutoCodeClose"
+        @success="editAutoCodeSuccess"
+      />
+    </el-dialog>
 
     <!-- 详情 -->
     <tenant-view
@@ -212,7 +397,7 @@
       v-el-drag-dialog
       :close-on-click-modal="false"
       :close-on-press-escape="true"
-      :title='$t("common.preview")'
+      :title="$t('common.preview')"
       width="80%"
       top="50px"
       :visible.sync="preview.isVisible"
@@ -223,186 +408,203 @@
     </el-dialog>
 
     <el-dialog
-		  :title='$t("resource.buttons.position")'
-		  :visible.sync="equipmentVisible"
-		  width="80%"
-		  custom-class="dialogNoTop"
-		>
-			<!--【	工作位置管理】 -->
-			<equipmentPosition :rowData="rowData" @close="editEquipmentClose" @success="editEquipmentSuccess" />
-
-		</el-dialog>
-
+      :title="$t('resource.buttons.position')"
+      :visible.sync="equipmentVisible"
+      width="80%"
+      custom-class="dialogNoTop"
+    >
+      <!--【	工作位置管理】 -->
+      <equipmentPosition
+        :rowData="rowData"
+        @close="editEquipmentClose"
+        @success="editEquipmentSuccess"
+      />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-	import Pagination from "@/components/Pagination"
-	import TenantEdit from "../resourcesMgr/components/Edit"
-	// 【硬件配置】
-	import Hardware from "../resourcesMgr/components/Hardware"
-	import AutoCode from "../resourcesMgr/components/AutoCode"
-	import DetailConf from "../resourcesMgr/components/DetailConf"
-	import TenantView from "../resourcesMgr/components/View"
-	// 【设备管理】-API
-	import equipmentMgrApi from "@/api/resourceProductMgr/equipmentMgr"
-	// 【工作位置管理】组件
-	import equipmentPosition from "../equipmentPosition/Index"
-	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
-	export default {
-	  name: "ResourcesMgr",
-	  directives: { elDragDialog },
-	  components: { Pagination, TenantEdit, Hardware, AutoCode, TenantView, DetailConf, equipmentMgrApi, equipmentPosition },
-	  props: {
-	  },
-	  data () {
-	    return {
-	    	currentRow: null, // 当前选中的行数据
-	    	equipmentVisible: false, // 设备管理
-			autoCodeVisible:false,  //节点配置			
-	    	rowData: {}, // row数据,
-	    	audioStatus: [],
-	      dialog: {
-	        isVisible: false,
-	        title: ""
-	      },
-	      dialogHardware: {
-	        isVisible: false,
-	        title: ""
-	      },
-		  dialogDetailConf: {
-	        isVisible: false,
-	        title: ""
-	      },		  
-	      preview: {
-	        isVisible: false,
-	        context: ''
-	      },
-	      tenantViewVisible: false,
-	      tableKey: 0,
-	      queryParams: initQueryParams({}),
-	      selection: [],
-	      loading: false,
-	      tableData: {
-	        count: 0
-	      },
-	      dicts: {
-          NATION: {}
-        },
-	      enums: {
-	        TenantTypeEnum: {},
-	        TenantStatusEnum: {}
-	      }
-	    }
-	  },
-	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
-	  created() {
-	  	// 调用常量-审核状态
-	  	this.audioStatus = this.$constWKS.SHOWHIDE
-	  	// 加载【字典】
-	  	initDicts(['NATION'], this.dicts);
-	  	// 加载列表数据
-	  	this.fetch()
-		},
-	  computed: {
-	    currentUser () {
-	      return this.$store.state.account.user
-	    },
-	    nationList() {
-        return convertEnum(this.dicts.NATION)
-        }
-	  },
-	  mounted () {
-
-	  },
-	  methods: {
-	  	// table的当前行值变化后
-	  	handleCurrentChange(val) {
-	  		// 设置当前行
-		    this.currentRow = val;
-		  },
-	  	// 【设备管理】按钮-事件
-	  	equipment(row){
-	  		this.rowData = row
-	  		this.equipmentVisible = true
-	  	},
-		// 【节点配置】按钮-事件
-		autoCode(row){
-	  		this.rowData = row
-	  		this.autoCodeVisible = true
-	  	},
-	  	editEquipmentClose(){
-	  		this.equipmentVisible = false
-	  	},
-	  	editEquipmentSuccess(data){
-	  		this.search()
-	  	},
-	    viewClose () {
-	      this.tenantViewVisible = false
-	    },
-	    editClose () {
-	      this.dialog.isVisible = false
-	    },
-	    editSuccess () {
-	      this.search()
-	    },
-		detailConf(row){
-			this.$refs.detailConf.type = 'edit'
-			this.$refs.detailConf.setTenant(row, this.dicts)
-            this.dialogDetailConf.isVisible = true
-		},
-	    // 【硬件配置】-确定
-	    editHardwareSuccess(){
-	    	this.search()
-	    },
-	    // 【硬件配置】-取消
-	    editHardwareClose (){
-	    	this.dialogHardware.isVisible = false
-	    },
-		editAutoCodeClose (){
-	    	this.autoCodeVisible = false
-	    },
-		editAutoCodeSuccess(){
-	    	this.search()
-	    },
-		editDetailConfClose (){
-	    	this.dialogDetailConf.isVisible = false
-	    },
-		editDetailConfSuccess(){
-	    	this.search()
-	    },
-	    onSelectChange (selection) {
-	      this.selection = selection
-	    },
-	    search () {
-	      this.fetch({
-	        ...this.queryParams
-	      })
-	    },
-	    reset () {
-	      this.queryParams = initQueryParams({})
-	      this.$refs.table.clearSort()
-	      this.$refs.table.clearFilter()
-	      this.search()
-	    },
-	    add () {
-	      this.$refs.edit.type = "add"
-	      this.$refs.edit.setTenant(false, this.dicts)
-	      this.dialog.title = this.$t("common.add")
-	      this.dialog.isVisible = true
-	    },
-	    singleDelete (row) {
-	      this.$refs.table.clearSelection()
-	      this.$refs.table.toggleRowSelection(row, true)
-	      // 调用单个删除API
-      	this.remove(row)
-      	// 如果是多选删除API
-      	// this.batchDelete()
-	    },
-	    batchDelete () {
-	      /*if (!this.selection.length) {
+import Pagination from "@/components/Pagination";
+import TenantEdit from "../resourcesMgr/components/Edit";
+// 【硬件配置】
+import Hardware from "../resourcesMgr/components/Hardware";
+import AutoCode from "../resourcesMgr/components/AutoCode";
+import DetailConf from "../resourcesMgr/components/DetailConf";
+import TenantView from "../resourcesMgr/components/View";
+// 【设备管理】-API
+import equipmentMgrApi from "@/api/resourceProductMgr/equipmentMgr";
+// 【工作位置管理】组件
+import equipmentPosition from "../equipmentPosition/Index";
+import elDragDialog from "@/directive/el-drag-dialog";
+//【所属产线】-API
+import areaMgrApi from "@/api/resourceProductMgr/areaMgr";
+import {
+  downloadFile,
+  initEnums,
+  initDicts,
+  initQueryParams,
+} from "@/utils/commons";
+import axios from "axios";
+export default {
+  name: "ResourcesMgr",
+  directives: { elDragDialog },
+  components: {
+    Pagination,
+    TenantEdit,
+    Hardware,
+    AutoCode,
+    TenantView,
+    DetailConf,
+    equipmentMgrApi,
+    equipmentPosition,
+  },
+  props: {},
+  data() {
+    return {
+      currentRow: null, // 当前选中的行数据
+      equipmentVisible: false, // 设备管理
+      autoCodeVisible: false, //节点配置
+      rowData: {}, // row数据,
+      audioStatus: [],
+      zoneList: [],
+      dialog: {
+        isVisible: false,
+        title: "",
+      },
+      dialogHardware: {
+        isVisible: false,
+        title: "",
+      },
+      dialogDetailConf: {
+        isVisible: false,
+        title: "",
+      },
+      preview: {
+        isVisible: false,
+        context: "",
+      },
+      tenantViewVisible: false,
+      tableKey: 0,
+      queryParams: initQueryParams({}),
+      selection: [],
+      loading: false,
+      tableData: {
+        count: 0,
+      },
+      dicts: {
+        NATION: {},
+      },
+      enums: {
+        TenantTypeEnum: {},
+        TenantStatusEnum: {},
+      },
+    };
+  },
+  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+  created() {
+    // 调用常量-审核状态
+    this.audioStatus = this.$constWKS.SHOWHIDE;
+    // 加载【字典】
+    initDicts(["NATION"], this.dicts);
+    // 加载列表数据
+    this.fetch();
+    this.getZoneList();
+  },
+  computed: {
+    currentUser() {
+      return this.$store.state.account.user;
+    },
+    nationList() {
+      return convertEnum(this.dicts.NATION);
+    },
+  },
+  mounted() {},
+  methods: {
+    // table的当前行值变化后
+    handleCurrentChange(val) {
+      // 设置当前行
+      this.currentRow = val;
+    },
+    // 【设备管理】按钮-事件
+    equipment(row) {
+      this.rowData = row;
+      this.equipmentVisible = true;
+    },
+    // 【节点配置】按钮-事件
+    autoCode(row) {
+      this.rowData = row;
+      this.autoCodeVisible = true;
+    },
+    editEquipmentClose() {
+      this.equipmentVisible = false;
+    },
+    editEquipmentSuccess(data) {
+      this.search();
+    },
+    viewClose() {
+      this.tenantViewVisible = false;
+    },
+    editClose() {
+      this.dialog.isVisible = false;
+    },
+    editSuccess() {
+      this.search();
+    },
+    detailConf(row) {
+      this.$refs.detailConf.type = "edit";
+      this.$refs.detailConf.setTenant(row, this.dicts);
+      this.dialogDetailConf.isVisible = true;
+    },
+    // 【硬件配置】-确定
+    editHardwareSuccess() {
+      this.search();
+    },
+    // 【硬件配置】-取消
+    editHardwareClose() {
+      this.dialogHardware.isVisible = false;
+    },
+    editAutoCodeClose() {
+      this.autoCodeVisible = false;
+    },
+    editAutoCodeSuccess() {
+      this.search();
+    },
+    editDetailConfClose() {
+      this.dialogDetailConf.isVisible = false;
+    },
+    editDetailConfSuccess() {
+      this.search();
+    },
+    onSelectChange(selection) {
+      this.selection = selection;
+    },
+    search() {
+      this.fetch({
+        ...this.queryParams,
+      });
+    },
+    reset() {
+      this.queryParams = initQueryParams({});
+      this.$refs.table.clearSort();
+      this.$refs.table.clearFilter();
+      this.search();
+    },
+    add() {
+      this.$refs.edit.type = "add";
+      this.$refs.edit.setTenant(false, this.dicts);
+      this.dialog.title = this.$t("common.add");
+      this.dialog.isVisible = true;
+    },
+    singleDelete(row) {
+      this.$refs.table.clearSelection();
+      this.$refs.table.toggleRowSelection(row, true);
+      // 调用单个删除API
+      this.remove(row);
+      // 如果是多选删除API
+      // this.batchDelete()
+    },
+    batchDelete() {
+      /*if (!this.selection.length) {
 	        this.$message({
 	          message: this.$t("tips.noDataSelected"),
 	          type: "warning"
@@ -418,181 +620,204 @@
 	        return
 	      }*/
 
-	     	if(!this.currentRow){
-	     		this.$message({
-	          message: this.$t("tips.noDataSelected"),
-	          type: "warning"
-	        })
-	        return
-	     	}
+      if (!this.currentRow) {
+        this.$message({
+          message: this.$t("tips.noDataSelected"),
+          type: "warning",
+        });
+        return;
+      }
 
-	      this.$confirm(this.$t("resource.tips.resourTips"), this.$t("common.tips"), {
-	      	distinguishCancelAndClose: true,
-	        confirmButtonText: this.$t("common.confirm"),
-	        cancelButtonText: this.$t("common.cancel"),
-	        type: "warning"
-	      }).then(() => {
-	      	/*const ids = []
+      this.$confirm(
+        this.$t("resource.tips.resourTips"),
+        this.$t("common.tips"),
+        {
+          distinguishCancelAndClose: true,
+          confirmButtonText: this.$t("common.confirm"),
+          cancelButtonText: this.$t("common.cancel"),
+          type: "warning",
+        }
+      )
+        .then(() => {
+          /*const ids = []
 		      this.selection.forEach(item => {
 		        ids.push(item.id)
 		      })
 		      // 如果是多选删除API
 		      this.delete(ids)*/
-		     	// 调用删除API
-    		 	this.remove(this.currentRow)
-	      }).catch(() => {})
-	    },
-	    clearSelections () {
-	      this.$refs.table.clearSelection()
-	    },
-	    delete (ids) {
-	      equipmentMgrApi.remove({ ids: ids }).then(response => {
-	        const res = response.data
-	        if (res.isSuccess) {
-	          this.$message({
-	            message: this.$t("tips.deleteSuccess"),
-	            type: "success"
-	          })
-	          // 查询列表
-	          this.search()
-	          // 清理已经删除的数据
-	          this.$refs.table.clearSelection()
-	        }
-	      })
-	    },
-	    // 【单体-删除】-函数
-	    remove(row) {
-	    	this.$confirm(this.$t("resource.tips.resourTips"), this.$t("common.tips"), {
-	      	distinguishCancelAndClose: true,
-	        confirmButtonText: this.$t("common.confirm"),
-	        cancelButtonText: this.$t("common.cancel"),
-	        type: "warning"
-	      }).then(() => {
-		    	equipmentMgrApi.removeMore(row).then(response => {
-		        const res = response.data
-		        if (res.isSuccess) {
-		          this.$message({
-		            message: this.$t("tips.deleteSuccess"),
-		            type: "success"
-		          })
-		          // 查询列表
-		          this.search()
-		          // 清理已经删除的数据
-	          	this.$refs.table.clearSelection()
-		        }
-		      })
-		    }).catch(() => {
-		    })
-	    },
-	    view (row) {
-	      this.$refs.view.setTenant(row)
-	      this.tenantViewVisible = true
-	    },
-	    // 【修改】表头上Btn-事件
-	    editOne() {
-	    	if (!this.selection.length) {
-	        this.$message({
-	          message: this.$t("tips.noDataSelected"),
-	          type: "warning"
-	        })
-	        return
-	      }
-	    	if (this.selection.length > 1) {
-	        this.$message({
-	          message: this.$t("tips.mustOne"),
-	          type: "warning"
-	        })
-	        return
-	      }
-	    	this.edit(this.selection[0]);
-	    },
-	    edit (row) {
-	      this.$refs.edit.setTenant(row, this.dicts)
-	      this.$refs.edit.type = "edit"
-	      this.dialog.title = this.$t("resource.common.peizhi")
-	      this.dialog.isVisible = true
-	    },
+          // 调用删除API
+          this.remove(this.currentRow);
+        })
+        .catch(() => {});
+    },
+    clearSelections() {
+      this.$refs.table.clearSelection();
+    },
+    delete(ids) {
+      equipmentMgrApi.remove({ ids: ids }).then((response) => {
+        const res = response.data;
+        if (res.isSuccess) {
+          this.$message({
+            message: this.$t("tips.deleteSuccess"),
+            type: "success",
+          });
+          // 查询列表
+          this.search();
+          // 清理已经删除的数据
+          this.$refs.table.clearSelection();
+        }
+      });
+    },
+    // 【单体-删除】-函数
+    remove(row) {
+      this.$confirm(
+        this.$t("resource.tips.resourTips"),
+        this.$t("common.tips"),
+        {
+          distinguishCancelAndClose: true,
+          confirmButtonText: this.$t("common.confirm"),
+          cancelButtonText: this.$t("common.cancel"),
+          type: "warning",
+        }
+      )
+        .then(() => {
+          equipmentMgrApi.removeMore(row).then((response) => {
+            const res = response.data;
+            if (res.isSuccess) {
+              this.$message({
+                message: this.$t("tips.deleteSuccess"),
+                type: "success",
+              });
+              // 查询列表
+              this.search();
+              // 清理已经删除的数据
+              this.$refs.table.clearSelection();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    view(row) {
+      this.$refs.view.setTenant(row);
+      this.tenantViewVisible = true;
+    },
+    // 【修改】表头上Btn-事件
+    editOne() {
+      if (!this.selection.length) {
+        this.$message({
+          message: this.$t("tips.noDataSelected"),
+          type: "warning",
+        });
+        return;
+      }
+      if (this.selection.length > 1) {
+        this.$message({
+          message: this.$t("tips.mustOne"),
+          type: "warning",
+        });
+        return;
+      }
+      this.edit(this.selection[0]);
+    },
+    edit(row) {
+      this.$refs.edit.setTenant(row, this.dicts);
+      this.$refs.edit.type = "edit";
+      this.dialog.title = this.$t("resource.common.peizhi");
+      this.dialog.isVisible = true;
+    },
 
-	    // 【硬件配置】-事件
-	    editHardware (row) {
-	    	// 如果可以配置（agv、arm、machine）
-	    	let str = "agv,arm,machine";
-	    	if(str.indexOf(row.category.key) > -1) {
-	    		this.$refs.hardware.setTenant(row)
-		      this.$refs.hardware.type = "edit"
-		      this.dialogHardware.title = this.$t("resource.buttons.hardware")
-		      this.dialogHardware.isVisible = true
-	    	} else {
-	    		this.$message({
-              message: this.$t('resource.tips.hardware'),
-              type: 'warning'
-            })
-	    	}
-	    },
-		editAutoCode (row) {
-	    	//
-	    	this.dialogAutoCode.isVisible = true
-	    },
+    // 【硬件配置】-事件
+    editHardware(row) {
+      // 如果可以配置（agv、arm、machine）
+      let str = "agv,arm,machine";
+      if (str.indexOf(row.category.key) > -1) {
+        this.$refs.hardware.setTenant(row);
+        this.$refs.hardware.type = "edit";
+        this.dialogHardware.title = this.$t("resource.buttons.hardware");
+        this.dialogHardware.isVisible = true;
+      } else {
+        this.$message({
+          message: this.$t("resource.tips.hardware"),
+          type: "warning",
+        });
+      }
+    },
+    editAutoCode(row) {
+      //
+      this.dialogAutoCode.isVisible = true;
+    },
 
-	    fetch (params = {}) {
-	      this.loading = true
-	      if (this.queryParams.timeRange) {
-	        this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
-	        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]
-	      }
+    fetch(params = {}) {
+      this.loading = true;
+      if (this.queryParams.timeRange) {
+        this.queryParams.map.createTime_st = this.queryParams.timeRange[0];
+        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1];
+      }
 
-	      this.queryParams.current = params.current ? params.current : this.queryParams.current
-	      this.queryParams.size = params.size ? params.size : this.queryParams.size
-	      // 固定参数（采集的生产资源）
-	      this.queryParams.resourceStatus = "1"
-		  this.queryParams.displayStatus = "1"
+      this.queryParams.current = params.current
+        ? params.current
+        : this.queryParams.current;
+      this.queryParams.size = params.size ? params.size : this.queryParams.size;
+      // 固定参数（采集的生产资源）
+      this.queryParams.resourceStatus = "1";
+      this.queryParams.displayStatus = "1";
 
-	      equipmentMgrApi.getPageList(this.queryParams).then(response => {
-	        const res = response.data
-	        if (res.isSuccess) {
-	          // 赋值
-	          this.tableData = res.data			  
-	          if(this.tableData.data && this.tableData.data.length > 0){
-	          	// 设置图片，放大属性
-	          	this.tableData.data.forEach((item, index) => {
-		        		// item.url = 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg';
-		        		item.srcList = [item.pic];
-		        	})
-	          }
-	        }
-	        // eslint-disable-next-line no-return-assign
-	      }).finally(() => this.loading = false)
-
-	    },
-	    cellClick (row, column) {
-	      if (column['columnKey'] === "operation") {
-	        return
-	      }
-	      let flag = false
-	      this.selection.forEach((item) => {
-	        if (item.id === row.id) {
-	          flag = true
-	          this.$refs.table.toggleRowSelection(row)
-	        }
-	      })
+      equipmentMgrApi
+        .getPageList(this.queryParams)
+        .then((response) => {
+          const res = response.data;
+          if (res.isSuccess) {
+            // 赋值
+            this.tableData = res.data;
+            if (this.tableData.data && this.tableData.data.length > 0) {
+              // 设置图片，放大属性
+              this.tableData.data.forEach((item, index) => {
+                // item.url = 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg';
+                item.srcList = [item.pic];
+              });
+            }
+          }
+          // eslint-disable-next-line no-return-assign
+        })
+        .finally(() => (this.loading = false));
+    },
+    getZoneList() {
+      areaMgrApi.getList({ status: 1 }).then((res) => {
+        res = res.data;
+        if (res.isSuccess) {
+          this.zoneList = res.data;
+        }
+      });
+    },
+    cellClick(row, column) {
+      if (column["columnKey"] === "operation") {
+        return;
+      }
+      let flag = false;
+      this.selection.forEach((item) => {
+        if (item.id === row.id) {
+          flag = true;
+          this.$refs.table.toggleRowSelection(row);
+        }
+      });
 
-	      if (!flag) {
-	        this.$refs.table.toggleRowSelection(row, true)
-	      }
-	    }
-	  }
-	}
+      if (!flag) {
+        this.$refs.table.toggleRowSelection(row, true);
+      }
+    },
+  },
+};
 </script>
 <style type="text/css">
-	.dialogNoTop .el-dialog__body{
-		padding: 0;
-	}
+.dialogNoTop .el-dialog__body {
+  padding: 0;
+}
 </style>
 <style lang="scss" scoped>
-	.statusDiv{
-		color: white;
-		-moz-border-radius: 2px;
-		-webkit-border-radius: 2px;
-		border-radius: 2px;
-	}
+.statusDiv {
+  color: white;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+}
 </style>

imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/Index.vue

@@ -1,36 +1,73 @@
 <template>
   <div class="app-container">
-		<!-- 搜索模块 -->
+    <!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
-    		<span>{{$t("resource.searchForm.name")}}：</span>
-    		<el-input v-model="queryParams.model.name" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("resource.searchForm.no")}}：</span>
-    		<el-input v-model="queryParams.model.code" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-      <span style="margin-left: 15px;">
-	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
-	        {{ $t("table.search") }}
-	      </el-button>
-	      <el-button plain type="warning" icon="el-icon-refresh" size="medium" @click="reset">
-	        {{ $t("table.reset") }}
-	      </el-button>
+      <span>
+        <span>{{ $t("resource.table.resours.zoneName") }}：</span>
+        <el-select
+          v-model="queryParams.model.zoneId"
+          placeholder="请选择"
+          style="width: 20%"
+        >
+          <el-option
+            v-for="(item, index) in zoneList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </span>
+      <span style="margin-left: 15px">
+        <span>{{ $t("resource.searchForm.name") }}：</span>
+        <el-input
+          v-model="queryParams.model.name"
+          :placeholder="$t('common.pleaseEnter')"
+          style="width: 150px"
+          size="medium"
+        />
+      </span>
+      <span style="margin-left: 15px">
+        <span>{{ $t("resource.searchForm.no") }}：</span>
+        <el-input
+          v-model="queryParams.model.code"
+          :placeholder="$t('common.pleaseEnter')"
+          style="width: 150px"
+          size="medium"
+        />
+      </span>
+      <span style="margin-left: 15px">
+        <el-button
+          plain
+          type="primary"
+          icon="el-icon-search"
+          size="medium"
+          @click="search"
+        >
+          {{ $t("table.search") }}
+        </el-button>
+        <el-button
+          plain
+          type="warning"
+          icon="el-icon-refresh"
+          size="medium"
+          @click="reset"
+        >
+          {{ $t("table.reset") }}
+        </el-button>
       </span>
     </div>
 
     <!-- 功能按钮 -->
     <el-row class="filter-container">
-    	<el-col>
-    		<!--<el-button type="primary" icon="el-icon-s-tools" size="medium">{{ $t("resource.buttons.setBtn") }}</el-button>-->
-	      <!--<el-button type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
+      <el-col>
+        <!--<el-button type="primary" icon="el-icon-s-tools" size="medium">{{ $t("resource.buttons.setBtn") }}</el-button>-->
+        <!--<el-button type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
 	        {{ $t("table.delete") }}
 	      </el-button>-->
-    	</el-col>
+      </el-col>
     </el-row>
 
-		<!-- 列表数据 -->
+    <!-- 列表数据 -->
     <el-table
       :key="tableKey"
       ref="table"
@@ -39,68 +76,171 @@
       border
       fit
       row-key="id"
-      style="width: 100%;"
+      style="width: 100%"
       highlight-current-row
-    	@current-change="handleCurrentChange"
+      @current-change="handleCurrentChange"
     >
-    	<el-table-column :label='$t("common.serialNo")' width="55px" align="center">
-	      <template slot-scope="scope">
-	        <div>
-	          {{scope.$index+(queryParams.current - 1) * queryParams.size + 1}}
-	        </div>
-	      </template>
+      <el-table-column
+        :label="$t('common.serialNo')"
+        width="55px"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <div>
+            {{
+              scope.$index + (queryParams.current - 1) * queryParams.size + 1
+            }}
+          </div>
+        </template>
       </el-table-column>
-      <el-table-column prop="pic" :label='$t("resource.table.resours.pic")' align="center" width="150px">
-      	<template slot-scope="{ row }">
-      		<div v-if="row.pic" class="demo-image__preview">
-					  <el-image
-					    style="width: 100px; height: 60px"
-					    :src="row.pic"
-					    :preview-src-list="row.srcList">
-					  </el-image>
-					</div>
-					<span v-else>{{$t("common.noData")}}</span>
-      	</template>
+      <el-table-column
+        prop="pic"
+        :label="$t('resource.table.resours.pic')"
+        align="center"
+        width="150px"
+      >
+        <template slot-scope="{ row }">
+          <div v-if="row.pic" class="demo-image__preview">
+            <el-image
+              style="width: 100px; height: 60px"
+              :src="row.pic"
+              :preview-src-list="row.srcList"
+            >
+            </el-image>
+          </div>
+          <span v-else>{{ $t("common.noData") }}</span>
+        </template>
       </el-table-column>
-      <el-table-column prop="name" :label='$t("resource.table.resours.name")' :show-overflow-tooltip="true" width="180px"></el-table-column>
-      <el-table-column prop="code" :label='$t("resource.table.resours.no")' :show-overflow-tooltip="true" width="100px"></el-table-column>
-      <el-table-column prop="brand" :label='$t("resource.table.resours.brand")' width="100px"></el-table-column>
-      <el-table-column prop="specification" :label='$t("resource.table.resours.specification")'></el-table-column>
+      <el-table-column
+        prop="name"
+        :label="$t('resource.table.resours.name')"
+        :show-overflow-tooltip="true"
+        width="180px"
+      ></el-table-column>
+      <el-table-column
+        prop="code"
+        :label="$t('resource.table.resours.no')"
+        :show-overflow-tooltip="true"
+        width="100px"
+      ></el-table-column>
+      <el-table-column
+        prop="brand"
+        :label="$t('resource.table.resours.brand')"
+        width="100px"
+      ></el-table-column>
+      <el-table-column
+        prop="specification"
+        :label="$t('resource.table.resours.specification')"
+      ></el-table-column>
 
-	  <el-table-column prop="capitalNo" :label='$t("resource.table.resours.capitalNo")'></el-table-column>
-	  <el-table-column prop="capitalName" :label='$t("resource.table.resours.capitalName")'></el-table-column>
-	  <el-table-column prop="capitalType" :label='$t("resource.table.resours.capitalType")'></el-table-column>
-	  <el-table-column prop="modeSpecification" :label='$t("resource.table.resours.modeSpecification")'></el-table-column>
-	  <el-table-column prop="capitalPrice" :label='$t("resource.table.resours.capitalPrice")'></el-table-column>
-	  <el-table-column prop="productionDate" :label='$t("resource.table.resours.productionDate")'></el-table-column>
-      <el-table-column prop="productionNo" :label='$t("resource.table.resours.productionNo")'></el-table-column>
-	  <el-table-column prop="manufacturer" :label='$t("resource.table.resours.manufacturer")'></el-table-column>
+      <el-table-column
+        prop="capitalNo"
+        :label="$t('resource.table.resours.capitalNo')"
+      ></el-table-column>
+      <el-table-column
+        prop="capitalName"
+        :label="$t('resource.table.resours.capitalName')"
+      ></el-table-column>
+      <el-table-column
+        prop="capitalType"
+        :label="$t('resource.table.resours.capitalType')"
+      ></el-table-column>
+      <el-table-column
+        prop="modeSpecification"
+        :label="$t('resource.table.resours.modeSpecification')"
+      ></el-table-column>
+      <el-table-column
+        prop="capitalPrice"
+        :label="$t('resource.table.resours.capitalPrice')"
+      ></el-table-column>
+      <el-table-column
+        prop="productionDate"
+        :label="$t('resource.table.resours.productionDate')"
+      ></el-table-column>
+      <el-table-column
+        prop="productionNo"
+        :label="$t('resource.table.resours.productionNo')"
+      ></el-table-column>
+      <el-table-column
+        prop="manufacturer"
+        :label="$t('resource.table.resours.manufacturer')"
+      ></el-table-column>
 
-	  <el-table-column prop="model" :label='$t("resource.table.resours.model")'></el-table-column>
-      <el-table-column prop="category.data" :label='$t("resource.table.resours.category")' width="100px"></el-table-column>
-      <el-table-column prop="zoneName" :label='$t("resource.table.resours.zoneName")' width="180px"></el-table-column>
-      <el-table-column prop="positionCount" :label='$t("resource.table.resours.nums")' width="120px"></el-table-column>
-      <el-table-column prop="cncProgram" :label='$t("resource.table.resours.isProgram")' width="110px" align="center">
-      	<template slot-scope="{ row }">
-      		<el-tag :type="row.cncProgram == '1' ? 'success' : 'info'">
-      			{{row.cncProgram == '1' ? $t("common.yes") : $t("common.no")}}
-      		</el-tag>
-      	</template>
+      <el-table-column
+        prop="model"
+        :label="$t('resource.table.resours.model')"
+      ></el-table-column>
+      <el-table-column
+        prop="category.data"
+        :label="$t('resource.table.resours.category')"
+        width="100px"
+      ></el-table-column>
+      <el-table-column
+        prop="zoneName"
+        :label="$t('resource.table.resours.zoneName')"
+        width="180px"
+      ></el-table-column>
+      <el-table-column
+        prop="positionCount"
+        :label="$t('resource.table.resours.nums')"
+        width="120px"
+      ></el-table-column>
+      <el-table-column
+        prop="cncProgram"
+        :label="$t('resource.table.resours.isProgram')"
+        width="110px"
+        align="center"
+      >
+        <template slot-scope="{ row }">
+          <el-tag :type="row.cncProgram == '1' ? 'success' : 'info'">
+            {{ row.cncProgram == "1" ? $t("common.yes") : $t("common.no") }}
+          </el-tag>
+        </template>
       </el-table-column>
-      <el-table-column prop="linkStatus" :label='$t("resource.table.resours.linkStatus")' width="180px" align="center">
-      	<template slot-scope="{ row }">
-      		<div class="statusDiv" :style="'background:'+ row.linkStatus.background">{{row.linkStatus.text}}</div>
-      	</template>
+      <el-table-column
+        prop="linkStatus"
+        :label="$t('resource.table.resours.linkStatus')"
+        width="180px"
+        align="center"
+      >
+        <template slot-scope="{ row }">
+          <div
+            class="statusDiv"
+            :style="'background:' + row.linkStatus.background"
+          >
+            {{ row.linkStatus.text }}
+          </div>
+        </template>
       </el-table-column>
-      <el-table-column prop="controlStatus" :label='$t("resource.table.resours.controlStatus")' width="180px" align="center">
-      	<template slot-scope="{ row }">
-      		<div class="statusDiv" :style="'background:'+ row.controlStatus.background">{{row.controlStatus.text}}</div>
-      	</template>
+      <el-table-column
+        prop="controlStatus"
+        :label="$t('resource.table.resours.controlStatus')"
+        width="180px"
+        align="center"
+      >
+        <template slot-scope="{ row }">
+          <div
+            class="statusDiv"
+            :style="'background:' + row.controlStatus.background"
+          >
+            {{ row.controlStatus.text }}
+          </div>
+        </template>
       </el-table-column>
-      <el-table-column prop="productionStatus" :label='$t("resource.table.resours.productionStatus")' width="180px" align="center">
-      	<template slot-scope="{ row }">
-      		<div class="statusDiv" :style="'background:'+ row.productionStatus.background">{{row.productionStatus.text}}</div>
-      	</template>
+      <el-table-column
+        prop="productionStatus"
+        :label="$t('resource.table.resours.productionStatus')"
+        width="180px"
+        align="center"
+      >
+        <template slot-scope="{ row }">
+          <div
+            class="statusDiv"
+            :style="'background:' + row.productionStatus.background"
+          >
+            {{ row.productionStatus.text }}
+          </div>
+        </template>
       </el-table-column>
       <el-table-column
         :label="$t('table.operation')"
@@ -110,47 +250,73 @@
         width="180px"
       >
         <template slot-scope="{ row }">
-        	<!--<el-tooltip class="item" content="查看详情" effect="dark" placement="top-start">
+          <!--<el-tooltip class="item" content="查看详情" effect="dark" placement="top-start">
 	          <i
 	            class="el-icon-view table-operation"
 	            style="color: #87d068;"
 	            @click="view(row)"
 	          />
           </el-tooltip>-->
-          <el-tooltip class="item" :content='$t("resource.buttons.work")' effect="dark" placement="top-start">
-	          <i
-	            class="el-icon-location-information table-operation"
-	            style="color: #2db7f5;"
-	            @click="equipment(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.work')"
+            effect="dark"
+            placement="top-start"
+          >
+            <i
+              class="el-icon-location-information table-operation"
+              style="color: #2db7f5"
+              @click="equipment(row)"
+            />
           </el-tooltip>
-          <el-tooltip class="item" :content='$t("resource.buttons.setting")' effect="dark" placement="top-start">
-	          <i
-	            class="el-icon-setting table-operation"
-	            style="color: #2db7f5;"
-	            @click="edit(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.setting')"
+            effect="dark"
+            placement="top-start"
+          >
+            <i
+              class="el-icon-setting table-operation"
+              style="color: #2db7f5"
+              @click="edit(row)"
+            />
           </el-tooltip>
-          <el-tooltip class="item" :content='$t("resource.buttons.hardware")' effect="dark" placement="top-start">
-	          <i
-	            class="el-icon-s-help table-operation"
-	            style="color: #2db7f5;"
-	            @click="editHardware(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.hardware')"
+            effect="dark"
+            placement="top-start"
+          >
+            <i
+              class="el-icon-s-help table-operation"
+              style="color: #2db7f5"
+              @click="editHardware(row)"
+            />
           </el-tooltip>
-		  <el-tooltip class="item" :content='$t("resource.buttons.autoCode")' effect="dark" placement="top-start" v-if="row.isAutoCode=='1'">
-	          <i
-	            class="el-icon-place table-operation"
-	            style="color: #2db7f5;"
-	            @click="autoCode(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.autoCode')"
+            effect="dark"
+            placement="top-start"
+            v-if="row.isAutoCode == '1'"
+          >
+            <i
+              class="el-icon-place table-operation"
+              style="color: #2db7f5"
+              @click="autoCode(row)"
+            />
           </el-tooltip>
-          <el-tooltip class="item" :content='$t("resource.buttons.detailConf")' effect="dark" placement="top-start">
-	          <i
-	            class="el-icon-guide table-operation"
-	            style="color: #f50;"
-	            @click="detailConf(row)"
-	          />
+          <el-tooltip
+            class="item"
+            :content="$t('resource.buttons.detailConf')"
+            effect="dark"
+            placement="top-start"
+          >
+            <i
+              class="el-icon-guide table-operation"
+              style="color: #f50"
+              @click="detailConf(row)"
+            />
           </el-tooltip>
         </template>
       </el-table-column>
@@ -182,7 +348,7 @@
       @close="editHardwareClose"
       @success="editHardwareSuccess"
     />
-	<!-- 生产资源资料  -->
+    <!-- 生产资源资料  -->
     <detailConf
       ref="detailConf"
       :dialog-visible="dialogDetailConf.isVisible"
@@ -191,16 +357,19 @@
       @success="editDetailConfSuccess"
     />
 
-	<el-dialog
-		  :title='$t("resource.buttons.autoCode")'
-		  :visible.sync="autoCodeVisible"
-		  width="80%"
-		  custom-class="dialogNoTop"
-		>
-			<!--【设备自动化节点配置】 -->
-		<autoCode :rowData="rowData" @close="editAutoCodeClose" @success="editAutoCodeSuccess" />
-
-	</el-dialog>
+    <el-dialog
+      :title="$t('resource.buttons.autoCode')"
+      :visible.sync="autoCodeVisible"
+      width="80%"
+      custom-class="dialogNoTop"
+    >
+      <!--【设备自动化节点配置】 -->
+      <autoCode
+        :rowData="rowData"
+        @close="editAutoCodeClose"
+        @success="editAutoCodeSuccess"
+      />
+    </el-dialog>
 
     <!-- 详情 -->
     <tenant-view
@@ -212,7 +381,7 @@
       v-el-drag-dialog
       :close-on-click-modal="false"
       :close-on-press-escape="true"
-      :title='$t("common.preview")'
+      :title="$t('common.preview')"
       width="80%"
       top="50px"
       :visible.sync="preview.isVisible"
@@ -223,186 +392,203 @@
     </el-dialog>
 
     <el-dialog
-		  :title='$t("resource.buttons.position")'
-		  :visible.sync="equipmentVisible"
-		  width="80%"
-		  custom-class="dialogNoTop"
-		>
-			<!--【	工作位置管理】 -->
-			<equipmentPosition :rowData="rowData" @close="editEquipmentClose" @success="editEquipmentSuccess" />
-
-		</el-dialog>
-
+      :title="$t('resource.buttons.position')"
+      :visible.sync="equipmentVisible"
+      width="80%"
+      custom-class="dialogNoTop"
+    >
+      <!--【	工作位置管理】 -->
+      <equipmentPosition
+        :rowData="rowData"
+        @close="editEquipmentClose"
+        @success="editEquipmentSuccess"
+      />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-	import Pagination from "@/components/Pagination"
-	import TenantEdit from "./components/Edit"
-	// 【硬件配置】
-	import Hardware from "./components/Hardware"
-	import AutoCode from "./components/AutoCode"
-	import DetailConf from "./components/DetailConf"
-	import TenantView from "./components/View"
-	// 【设备管理】-API
-	import equipmentMgrApi from "@/api/resourceProductMgr/equipmentMgr"
-	// 【工作位置管理】组件
-	import equipmentPosition from "../equipmentPosition/Index"
-	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
-	export default {
-	  name: "ResourcesMgr",
-	  directives: { elDragDialog },
-	  components: { Pagination, TenantEdit, Hardware, AutoCode, TenantView, DetailConf, equipmentMgrApi, equipmentPosition },
-	  props: {
-	  },
-	  data () {
-	    return {
-	    	currentRow: null, // 当前选中的行数据
-	    	equipmentVisible: false, // 设备管理
-			autoCodeVisible:false,  //节点配置
-	    	rowData: {}, // row数据,
-	    	audioStatus: [],
-	      dialog: {
-	        isVisible: false,
-	        title: ""
-	      },
-	      dialogHardware: {
-	        isVisible: false,
-	        title: ""
-	      },
-		  dialogDetailConf: {
-	        isVisible: false,
-	        title: ""
-	      },
-	      preview: {
-	        isVisible: false,
-	        context: ''
-	      },
-	      tenantViewVisible: false,
-	      tableKey: 0,
-	      queryParams: initQueryParams({}),
-	      selection: [],
-	      loading: false,
-	      tableData: {
-	        count: 0
-	      },
-	      dicts: {
-          NATION: {}
-        },
-	      enums: {
-	        TenantTypeEnum: {},
-	        TenantStatusEnum: {}
-	      }
-	    }
-	  },
-	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
-	  created() {
-	  	// 调用常量-审核状态
-	  	this.audioStatus = this.$constWKS.SHOWHIDE
-	  	// 加载【字典】
-	  	initDicts(['NATION'], this.dicts);
-	  	// 加载列表数据
-	  	this.fetch()
-		},
-	  computed: {
-	    currentUser () {
-	      return this.$store.state.account.user
-	    },
-	    nationList() {
-        return convertEnum(this.dicts.NATION)
-        }
-	  },
-	  mounted () {
-
-	  },
-	  methods: {
-	  	// table的当前行值变化后
-	  	handleCurrentChange(val) {
-	  		// 设置当前行
-		    this.currentRow = val;
-		  },
-	  	// 【设备管理】按钮-事件
-	  	equipment(row){
-	  		this.rowData = row
-	  		this.equipmentVisible = true
-	  	},
-		// 【节点配置】按钮-事件
-		autoCode(row){
-	  		this.rowData = row
-	  		this.autoCodeVisible = true
-	  	},
-	  	editEquipmentClose(){
-	  		this.equipmentVisible = false
-	  	},
-	  	editEquipmentSuccess(data){
-	  		this.search()
-	  	},
-	    viewClose () {
-	      this.tenantViewVisible = false
-	    },
-	    editClose () {
-	      this.dialog.isVisible = false
-	    },
-	    editSuccess () {
-	      this.search()
-	    },
-		detailConf(row){
-			this.$refs.detailConf.type = 'edit'
-			this.$refs.detailConf.setTenant(row, this.dicts)
-            this.dialogDetailConf.isVisible = true
-		},
-	    // 【硬件配置】-确定
-	    editHardwareSuccess(){
-	    	this.search()
-	    },
-	    // 【硬件配置】-取消
-	    editHardwareClose (){
-	    	this.dialogHardware.isVisible = false
-	    },
-		editAutoCodeClose (){
-	    	this.autoCodeVisible = false
-	    },
-		editAutoCodeSuccess(){
-	    	this.search()
-	    },
-		editDetailConfClose (){
-	    	this.dialogDetailConf.isVisible = false
-	    },
-		editDetailConfSuccess(){
-	    	this.search()
-	    },
-	    onSelectChange (selection) {
-	      this.selection = selection
-	    },
-	    search () {
-	      this.fetch({
-	        ...this.queryParams
-	      })
-	    },
-	    reset () {
-	      this.queryParams = initQueryParams({})
-	      this.$refs.table.clearSort()
-	      this.$refs.table.clearFilter()
-	      this.search()
-	    },
-	    add () {
-	      this.$refs.edit.type = "add"
-	      this.$refs.edit.setTenant(false, this.dicts)
-	      this.dialog.title = this.$t("common.add")
-	      this.dialog.isVisible = true
-	    },
-	    singleDelete (row) {
-	      this.$refs.table.clearSelection()
-	      this.$refs.table.toggleRowSelection(row, true)
-	      // 调用单个删除API
-      	this.remove(row)
-      	// 如果是多选删除API
-      	// this.batchDelete()
-	    },
-	    batchDelete () {
-	      /*if (!this.selection.length) {
+import Pagination from "@/components/Pagination";
+import TenantEdit from "./components/Edit";
+// 【硬件配置】
+import Hardware from "./components/Hardware";
+import AutoCode from "./components/AutoCode";
+import DetailConf from "./components/DetailConf";
+import TenantView from "./components/View";
+// 【设备管理】-API
+import equipmentMgrApi from "@/api/resourceProductMgr/equipmentMgr";
+  //【所属产线】-API
+import areaMgrApi from "@/api/resourceProductMgr/areaMgr"
+// 【工作位置管理】组件
+import equipmentPosition from "../equipmentPosition/Index";
+import elDragDialog from "@/directive/el-drag-dialog";
+import {
+  downloadFile,
+  initEnums,
+  initDicts,
+  initQueryParams,
+} from "@/utils/commons";
+import axios from "axios";
+export default {
+  name: "ResourcesMgr",
+  directives: { elDragDialog },
+  components: {
+    Pagination,
+    TenantEdit,
+    Hardware,
+    AutoCode,
+    TenantView,
+    DetailConf,
+    equipmentMgrApi,
+    equipmentPosition,
+  },
+  props: {},
+  data() {
+    return {
+      currentRow: null, // 当前选中的行数据
+      equipmentVisible: false, // 设备管理
+      autoCodeVisible: false, //节点配置
+      rowData: {}, // row数据,
+      audioStatus: [],
+      zoneList: [],
+      dialog: {
+        isVisible: false,
+        title: "",
+      },
+      dialogHardware: {
+        isVisible: false,
+        title: "",
+      },
+      dialogDetailConf: {
+        isVisible: false,
+        title: "",
+      },
+      preview: {
+        isVisible: false,
+        context: "",
+      },
+      tenantViewVisible: false,
+      tableKey: 0,
+      queryParams: initQueryParams({}),
+      selection: [],
+      loading: false,
+      tableData: {
+        count: 0,
+      },
+      dicts: {
+        NATION: {},
+      },
+      enums: {
+        TenantTypeEnum: {},
+        TenantStatusEnum: {},
+      },
+    };
+  },
+  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+  created() {
+    // 调用常量-审核状态
+    this.audioStatus = this.$constWKS.SHOWHIDE;
+    // 加载【字典】
+    initDicts(["NATION"], this.dicts);
+    // 加载列表数据
+    this.fetch();
+    this.getZoneList();
+  },
+  computed: {
+    currentUser() {
+      return this.$store.state.account.user;
+    },
+    nationList() {
+      return convertEnum(this.dicts.NATION);
+    },
+  },
+  mounted() {},
+  methods: {
+    // table的当前行值变化后
+    handleCurrentChange(val) {
+      // 设置当前行
+      this.currentRow = val;
+    },
+    // 【设备管理】按钮-事件
+    equipment(row) {
+      this.rowData = row;
+      this.equipmentVisible = true;
+    },
+    // 【节点配置】按钮-事件
+    autoCode(row) {
+      this.rowData = row;
+      this.autoCodeVisible = true;
+    },
+    editEquipmentClose() {
+      this.equipmentVisible = false;
+    },
+    editEquipmentSuccess(data) {
+      this.search();
+    },
+    viewClose() {
+      this.tenantViewVisible = false;
+    },
+    editClose() {
+      this.dialog.isVisible = false;
+    },
+    editSuccess() {
+      this.search();
+    },
+    detailConf(row) {
+      this.$refs.detailConf.type = "edit";
+      this.$refs.detailConf.setTenant(row, this.dicts);
+      this.dialogDetailConf.isVisible = true;
+    },
+    // 【硬件配置】-确定
+    editHardwareSuccess() {
+      this.search();
+    },
+    // 【硬件配置】-取消
+    editHardwareClose() {
+      this.dialogHardware.isVisible = false;
+    },
+    editAutoCodeClose() {
+      this.autoCodeVisible = false;
+    },
+    editAutoCodeSuccess() {
+      this.search();
+    },
+    editDetailConfClose() {
+      this.dialogDetailConf.isVisible = false;
+    },
+    editDetailConfSuccess() {
+      this.search();
+    },
+    onSelectChange(selection) {
+      this.selection = selection;
+    },
+    search() {
+      this.fetch({
+        ...this.queryParams,
+      });
+    },
+    reset() {
+      this.queryParams = initQueryParams({});
+      this.$refs.table.clearSort();
+      this.$refs.table.clearFilter();
+      this.search();
+    },
+    add() {
+      this.$refs.edit.type = "add";
+      this.$refs.edit.setTenant(false, this.dicts);
+      this.dialog.title = this.$t("common.add");
+      this.dialog.isVisible = true;
+    },
+    singleDelete(row) {
+      this.$refs.table.clearSelection();
+      this.$refs.table.toggleRowSelection(row, true);
+      // 调用单个删除API
+      this.remove(row);
+      // 如果是多选删除API
+      // this.batchDelete()
+    },
+    batchDelete() {
+      /*if (!this.selection.length) {
 	        this.$message({
 	          message: this.$t("tips.noDataSelected"),
 	          type: "warning"
@@ -418,179 +604,202 @@
 	        return
 	      }*/
 
-	     	if(!this.currentRow){
-	     		this.$message({
-	          message: this.$t("tips.noDataSelected"),
-	          type: "warning"
-	        })
-	        return
-	     	}
+      if (!this.currentRow) {
+        this.$message({
+          message: this.$t("tips.noDataSelected"),
+          type: "warning",
+        });
+        return;
+      }
 
-	      this.$confirm(this.$t("resource.tips.resourTips"), this.$t("common.tips"), {
-	      	distinguishCancelAndClose: true,
-	        confirmButtonText: this.$t("common.confirm"),
-	        cancelButtonText: this.$t("common.cancel"),
-	        type: "warning"
-	      }).then(() => {
-	      	/*const ids = []
+      this.$confirm(
+        this.$t("resource.tips.resourTips"),
+        this.$t("common.tips"),
+        {
+          distinguishCancelAndClose: true,
+          confirmButtonText: this.$t("common.confirm"),
+          cancelButtonText: this.$t("common.cancel"),
+          type: "warning",
+        }
+      )
+        .then(() => {
+          /*const ids = []
 		      this.selection.forEach(item => {
 		        ids.push(item.id)
 		      })
 		      // 如果是多选删除API
 		      this.delete(ids)*/
-		     	// 调用删除API
-    		 	this.remove(this.currentRow)
-	      }).catch(() => {})
-	    },
-	    clearSelections () {
-	      this.$refs.table.clearSelection()
-	    },
-	    delete (ids) {
-	      equipmentMgrApi.remove({ ids: ids }).then(response => {
-	        const res = response.data
-	        if (res.isSuccess) {
-	          this.$message({
-	            message: this.$t("tips.deleteSuccess"),
-	            type: "success"
-	          })
-	          // 查询列表
-	          this.search()
-	          // 清理已经删除的数据
-	          this.$refs.table.clearSelection()
-	        }
-	      })
-	    },
-	    // 【单体-删除】-函数
-	    remove(row) {
-	    	this.$confirm(this.$t("resource.tips.resourTips"), this.$t("common.tips"), {
-	      	distinguishCancelAndClose: true,
-	        confirmButtonText: this.$t("common.confirm"),
-	        cancelButtonText: this.$t("common.cancel"),
-	        type: "warning"
-	      }).then(() => {
-		    	equipmentMgrApi.removeMore(row).then(response => {
-		        const res = response.data
-		        if (res.isSuccess) {
-		          this.$message({
-		            message: this.$t("tips.deleteSuccess"),
-		            type: "success"
-		          })
-		          // 查询列表
-		          this.search()
-		          // 清理已经删除的数据
-	          	this.$refs.table.clearSelection()
-		        }
-		      })
-		    }).catch(() => {
-		    })
-	    },
-	    view (row) {
-	      this.$refs.view.setTenant(row)
-	      this.tenantViewVisible = true
-	    },
-	    // 【修改】表头上Btn-事件
-	    editOne() {
-	    	if (!this.selection.length) {
-	        this.$message({
-	          message: this.$t("tips.noDataSelected"),
-	          type: "warning"
-	        })
-	        return
-	      }
-	    	if (this.selection.length > 1) {
-	        this.$message({
-	          message: this.$t("tips.mustOne"),
-	          type: "warning"
-	        })
-	        return
-	      }
-	    	this.edit(this.selection[0]);
-	    },
-	    edit (row) {
-	      this.$refs.edit.setTenant(row, this.dicts)
-	      this.$refs.edit.type = "edit"
-	      this.dialog.title = this.$t("resource.common.peizhi")
-	      this.dialog.isVisible = true
-	    },
-
-	    // 【硬件配置】-事件
-	    editHardware (row) {
-	    	// 如果可以配置（agv、arm、machine）
-	    	let str = "agv,arm,machine,tuoban";
-	    	if(str.indexOf(row.category.key) > -1) {
-	    		this.$refs.hardware.setTenant(row)
-		      this.$refs.hardware.type = "edit"
-		      this.dialogHardware.title = this.$t("resource.buttons.hardware")
-		      this.dialogHardware.isVisible = true
-	    	} else {
-	    		this.$message({
-              message: this.$t('resource.tips.hardware'),
-              type: 'warning'
-            })
-	    	}
-	    },
-		editAutoCode (row) {
-	    	//
-	    	this.dialogAutoCode.isVisible = true
-	    },
+          // 调用删除API
+          this.remove(this.currentRow);
+        })
+        .catch(() => {});
+    },
+    clearSelections() {
+      this.$refs.table.clearSelection();
+    },
+    delete(ids) {
+      equipmentMgrApi.remove({ ids: ids }).then((response) => {
+        const res = response.data;
+        if (res.isSuccess) {
+          this.$message({
+            message: this.$t("tips.deleteSuccess"),
+            type: "success",
+          });
+          // 查询列表
+          this.search();
+          // 清理已经删除的数据
+          this.$refs.table.clearSelection();
+        }
+      });
+    },
+    // 【单体-删除】-函数
+    remove(row) {
+      this.$confirm(
+        this.$t("resource.tips.resourTips"),
+        this.$t("common.tips"),
+        {
+          distinguishCancelAndClose: true,
+          confirmButtonText: this.$t("common.confirm"),
+          cancelButtonText: this.$t("common.cancel"),
+          type: "warning",
+        }
+      )
+        .then(() => {
+          equipmentMgrApi.removeMore(row).then((response) => {
+            const res = response.data;
+            if (res.isSuccess) {
+              this.$message({
+                message: this.$t("tips.deleteSuccess"),
+                type: "success",
+              });
+              // 查询列表
+              this.search();
+              // 清理已经删除的数据
+              this.$refs.table.clearSelection();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    view(row) {
+      this.$refs.view.setTenant(row);
+      this.tenantViewVisible = true;
+    },
+    // 【修改】表头上Btn-事件
+    editOne() {
+      if (!this.selection.length) {
+        this.$message({
+          message: this.$t("tips.noDataSelected"),
+          type: "warning",
+        });
+        return;
+      }
+      if (this.selection.length > 1) {
+        this.$message({
+          message: this.$t("tips.mustOne"),
+          type: "warning",
+        });
+        return;
+      }
+      this.edit(this.selection[0]);
+    },
+    edit(row) {
+      this.$refs.edit.setTenant(row, this.dicts);
+      this.$refs.edit.type = "edit";
+      this.dialog.title = this.$t("resource.common.peizhi");
+      this.dialog.isVisible = true;
+    },
 
-	    fetch (params = {}) {
-	      this.loading = true
-	      if (this.queryParams.timeRange) {
-	        this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
-	        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]
-	      }
+    // 【硬件配置】-事件
+    editHardware(row) {
+      // 如果可以配置（agv、arm、machine）
+      let str = "agv,arm,machine,tuoban";
+      if (str.indexOf(row.category.key) > -1) {
+        this.$refs.hardware.setTenant(row);
+        this.$refs.hardware.type = "edit";
+        this.dialogHardware.title = this.$t("resource.buttons.hardware");
+        this.dialogHardware.isVisible = true;
+      } else {
+        this.$message({
+          message: this.$t("resource.tips.hardware"),
+          type: "warning",
+        });
+      }
+    },
+    editAutoCode(row) {
+      //
+      this.dialogAutoCode.isVisible = true;
+    },
 
-	      this.queryParams.current = params.current ? params.current : this.queryParams.current
-	      this.queryParams.size = params.size ? params.size : this.queryParams.size
-	      // 固定参数（采集的生产资源）
-	      this.queryParams.resourceStatus = "1"
-	      equipmentMgrApi.getPageList(this.queryParams).then(response => {
-	        const res = response.data
-	        if (res.isSuccess) {
-	          // 赋值
-	          this.tableData = res.data
-	          if(this.tableData.data && this.tableData.data.length > 0){
-	          	// 设置图片，放大属性
-	          	this.tableData.data.forEach((item, index) => {
-		        		// item.url = 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg';
-		        		item.srcList = [item.pic];
-		        	})
-	          }
-	        }
-	        // eslint-disable-next-line no-return-assign
-	      }).finally(() => this.loading = false)
+    fetch(params = {}) {
+      this.loading = true;
+      if (this.queryParams.timeRange) {
+        this.queryParams.map.createTime_st = this.queryParams.timeRange[0];
+        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1];
+      }
 
-	    },
-	    cellClick (row, column) {
-	      if (column['columnKey'] === "operation") {
-	        return
-	      }
-	      let flag = false
-	      this.selection.forEach((item) => {
-	        if (item.id === row.id) {
-	          flag = true
-	          this.$refs.table.toggleRowSelection(row)
-	        }
-	      })
+      this.queryParams.current = params.current
+        ? params.current
+        : this.queryParams.current;
+      this.queryParams.size = params.size ? params.size : this.queryParams.size;
+      // 固定参数（采集的生产资源）
+      this.queryParams.resourceStatus = "1";
+      equipmentMgrApi
+        .getPageList(this.queryParams)
+        .then((response) => {
+          const res = response.data;
+          if (res.isSuccess) {
+            // 赋值
+            this.tableData = res.data;
+            if (this.tableData.data && this.tableData.data.length > 0) {
+              // 设置图片，放大属性
+              this.tableData.data.forEach((item, index) => {
+                // item.url = 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg';
+                item.srcList = [item.pic];
+              });
+            }
+          }
+          // eslint-disable-next-line no-return-assign
+        })
+        .finally(() => (this.loading = false));
+    },
+    getZoneList() {
+      areaMgrApi.getList({ status: 1 }).then((res) => {
+        res = res.data;
+        if (res.isSuccess) {
+          this.zoneList = res.data;
+        }
+      });
+    },
+    cellClick(row, column) {
+      if (column["columnKey"] === "operation") {
+        return;
+      }
+      let flag = false;
+      this.selection.forEach((item) => {
+        if (item.id === row.id) {
+          flag = true;
+          this.$refs.table.toggleRowSelection(row);
+        }
+      });
 
-	      if (!flag) {
-	        this.$refs.table.toggleRowSelection(row, true)
-	      }
-	    }
-	  }
-	}
+      if (!flag) {
+        this.$refs.table.toggleRowSelection(row, true);
+      }
+    },
+  },
+};
 </script>
 <style type="text/css">
-	.dialogNoTop .el-dialog__body{
-		padding: 0;
-	}
+.dialogNoTop .el-dialog__body {
+  padding: 0;
+}
 </style>
 <style lang="scss" scoped>
-	.statusDiv{
-		color: white;
-		-moz-border-radius: 2px;
-		-webkit-border-radius: 2px;
-		border-radius: 2px;
-	}
+.statusDiv {
+  color: white;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+}
 </style>

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/PprogOrder.vue

@@ -275,7 +275,9 @@ export default {
 	      	if(this.type == 'view'){
 	      		this.queryParams.model.id = this.orderData.id
 	      	}else{
-	      		this.queryParams.model.taskBatchNo = this.orderData.taskBatchNo
+	      		this.queryParams.model.taskBatchNo = this.orderData.taskBatchNo;
+	      		// 最新需求
+	      		this.queryParams.model.planIds = this.orderData.planIds;
 	      	}
 	      	
 		  	planMgrApi.page(this.queryParams).then(response => {

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/PprogResource.vue

@@ -382,32 +382,38 @@ export default {
     },
     
     fetch (params = {}) {
-      this.loading = true
-      if (this.queryParams.timeRange) {
-        this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
-        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]
-      }
+      	this.loading = true
+      	if (this.queryParams.timeRange) {
+        	this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
+        	this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]
+      	}
 
-      this.queryParams.current = params.current ? params.current : this.queryParams.current
-      this.queryParams.size = params.size ? params.size : this.queryParams.size
-      // 根据订单的id，查询数据
-      this.queryParams.planId = this.tenant.id || '1499333016156110848';
+      	this.queryParams.current = params.current ? params.current : this.queryParams.current
+      	this.queryParams.size = params.size ? params.size : this.queryParams.size
+      	// 参数
+	  	if(this.type == 'view'){
+	  		// 根据订单的id，查询数据
+      		this.queryParams.planId = this.tenant.id;
+	  	}else{
+	  		// 最新需求
+	  		this.queryParams.planIds = this.orderData.planIds;
+	  	}
       
-      planMgrApi.scheduleTaskByResource(this.queryParams).then(response => {
-        const res = response.data
-        if (res.isSuccess) {
-        	/*if(res.data.data && res.data.data.length > 0) {
-        		res.data.data.forEach(item => {
-        			item.id = 'wks'+ Math.random();
-        		});
-        	}*/
-          	this.tableData = res.data;
-          	// console.log("生产资源的数据-表头1245678：",this.tableData);
-          	// this.tableData.data = [{},{},{},{},{},{},{},{},{},{}];
-            // this.titleData = res.data.titleList;
-        }
-        // eslint-disable-next-line no-return-assign
-      }).finally(() => this.loading = false)
+      	planMgrApi.scheduleTaskByResource(this.queryParams).then(response => {
+	        const res = response.data
+	        if (res.isSuccess) {
+	        	/*if(res.data.data && res.data.data.length > 0) {
+	        		res.data.data.forEach(item => {
+	        			item.id = 'wks'+ Math.random();
+	        		});
+	        	}*/
+	          	this.tableData = res.data;
+	          	// console.log("生产资源的数据-表头1245678：",this.tableData);
+	          	// this.tableData.data = [{},{},{},{},{},{},{},{},{},{}];
+	            // this.titleData = res.data.titleList;
+	        }
+        	// eslint-disable-next-line no-return-assign
+      	}).finally(() => this.loading = false)
      
     }
   }

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/PprogTask.vue

@@ -336,7 +336,9 @@ export default {
 	      	if(this.type == 'view'){
 	      		this.queryParams.model.planId = this.orderData.id
 	      	}else{
-	      		this.queryParams.taskBatchNo = this.tenant.taskBatchNo
+	      		this.queryParams.taskBatchNo = this.tenant.taskBatchNo;
+	      		// 最新需求
+	      		this.queryParams.planIds = this.orderData.planIds;
 	      	}
 	    	taskMgrApi.scheduleTaskpageList(this.queryParams).then(res => {
 	    		res = res.data