修改bug

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

@@ -1,256 +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: '冻结' }],
-         	// [待处理、已处理]
-         	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;
-            }
-        }
-    }
-}
+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: '生产中',label: '生产中'},{ value: '离线', label: '离线'},{ value: '空闲', label: '空闲'},{ value: '报警', 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/lang/zh/cuttingTool.js

@@ -13,7 +13,7 @@ export default {
     // 列表搜索表单名称
     searchForm: {
       machineCuttingtool: {
-        resourceName: '资源名称',
+        resourceName: '生产资源名称',
         resourceStatus: '在线状态',
       },
       customizeCuttingtool: {

imcs-ui/src/lang/zh/runCenter.js

@@ -221,7 +221,7 @@ export default {
 				bomAlias: '产品代号',
 				name: '零件名称',
 				partsAlias: '零件代号',
-				partsNo: '零件编号',
+				partsNo: '零部件编号',
 				materialBrandName: '材料牌号',
 				version: '版本号',
 				remark: '备注',

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

@@ -1,462 +1,462 @@
-<template>
-  <div class="app-container">
-  	<!-- 搜索部分 -->
-    <div class="filter-container">
-    	<span>
-    		<span>{{$t("prepare.searchForm.parts_no")}}：</span>
-    		<el-input v-model="queryParams.model.partsNo" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("prepare.searchForm.bomAlias")}}：</span>
-    		<el-input v-model="queryParams.model.bomAlias" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("prepare.searchForm.parts_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("prepare.searchForm.partsAlias")}}：</span>
-    		<el-input v-model="queryParams.model.partsAlias" :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-suitcase" size="medium" v-has-permission="['technology:version']" @click="factoryMgr()">{{$t("prepare.buttons.edition")}}</el-button>
-    	</el-col>
-    </el-row>
-		
-		<!-- BOM产品列表 -->
-		<div class="bom">
-	    <el-table
-	      :key="tableKey"
-	      ref="table"
-	      v-loading="loading"
-	      :data="tableData.records"
-	      border
-	      fit
-	      row-key="id"
-	      highlight-current-row
-	      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-	      style="width: 100%;"
-	      @current-change="handleCurrentChange"
-	    >
-	      <!--<el-table-column v-for="item in tableData.titleList" :key="item.id" :prop="item.field" :label='item.text' :show-overflow-tooltip="true" width="180px"></el-table-column>-->
-	      <!-- 序号 -->
-	      <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="partsNo"
-          :label="$t(&quot;runCenter.table.orderSldPro.partsNo&quot;)"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="150px"
-        >
-          <template slot-scope="{ row }">
-            <span>{{ row.partsNo }}</span>
-          </template>
-        </el-table-column>
-        <!-- 产品代号 -->
-        <el-table-column
-          prop="bomAlias"
-          :label="$t(&quot;runCenter.table.orderSldPro.bomAlias&quot;)"
-          align="center"
-          :show-overflow-tooltip="true"
-          width="120px"
-        />
-        <!-- 零件名称 -->
-        <el-table-column
-          prop="name"
-          :label="$t(&quot;runCenter.table.orderSldPro.name&quot;)"
-          align="center"
-        />
-        <!-- 零件代号 -->
-        <el-table-column
-          prop="partsAlias"
-          :label="$t(&quot;runCenter.table.orderSldPro.partsAlias&quot;)"
-          align="center"
-          width="150px"
-        />
-        <!-- 版本号 -->
-        <el-table-column
-          prop="version"
-          :label="$t(&quot;runCenter.table.orderSldPro.version&quot;)"
-          align="center"
-          width="150px"
-        />
-        <!-- 备注 -->
-        <el-table-column
-          prop="remark"
-          :label="$t(&quot;runCenter.table.orderSldPro.remark&quot;)"
-          align="center"
-          width="150px"
-        />
-        <!-- 操作 -->
-	      <el-table-column
-	        :label="$t('table.operation')"
-	        fixed="right"
-	        align="center"
-	        column-key="operation"
-	        width="120px"
-	      >
-	        <template slot-scope="{ row }">
-	          <el-tooltip class="item" :content='$t("prepare.buttons.edition")' effect="dark" placement="top-start">
-		          <i
-		            class="el-icon-suitcase table-operation"
-		            style="color: #2db7f5;"
-		            @click="factoryRowMgr(row)"
-		          />
-	          </el-tooltip>
-	        </template>
-	      </el-table-column>
-	    </el-table>
-	    <pagination
-	      v-show="tableData.total > 0"
-	      :limit.sync="queryParams.size"
-	      :page.sync="queryParams.current"
-	      :total="Number(tableData.total)"
-	      @pagination="fetch"
-	    />
-		</div>
-    
-    <!-- 工艺列表及相关 -->
-    <div class="technology">
-    	<el-tabs type="border-card">
-			  <el-tab-pane :label='$t("prepare.common.tab1")'>
-			  	<!-- 工艺列表-->
-			  	<technology-table ref="technology"></technology-table>
-			  </el-tab-pane>
-			  <!--<el-tab-pane :label='$t("prepare.common.tab2")'>综合分析</el-tab-pane>
-			  <el-tab-pane :label='$t("prepare.common.tab3")'>数控程序</el-tab-pane>
-			  <el-tab-pane :label='$t("prepare.common.tab4")'>刀具</el-tab-pane>
-			  <el-tab-pane :label='$t("prepare.common.tab5")'>夹具</el-tab-pane>
-			  <el-tab-pane :label='$t("prepare.common.tab6")'>人员</el-tab-pane>
-			  <el-tab-pane :label='$t("prepare.common.tab7")'>设备</el-tab-pane>
-			  <el-tab-pane :label='$t("prepare.common.tab8")'>材料</el-tab-pane>-->
-			  
-			</el-tabs>
-    	
-    </div>
-    <el-dialog
-      v-el-drag-dialog
-      :close-on-click-modal="false"
-      :close-on-press-escape="true"
-      :title='$t("common.preview")'
-      width="80%"
-      top="50px"
-      :visible.sync="preview.isVisible"
-    >
-      <el-scrollbar>
-        <div v-html="preview.context" />
-      </el-scrollbar>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination"
-// 【工艺列表】-组件
-import TechnologyTable from "./components/TechnologyTable"
-// 【BOM管理】-API
-import bomMgrApi from "@/api/prepareProductMgr/bomMgr"
-import elDragDialog from '@/directive/el-drag-dialog'
-import { downloadFile, initEnums, initQueryParams } from '@/utils/commons'
-import axios from 'axios'
-export default {
-  name: "TechnologyMgr",
-  directives: { elDragDialog },
-  components: { Pagination, TechnologyTable },
-  data () {
-    return {
-    	qiyongStatus: [], //状态
-      dialog: {
-        isVisible: false,
-        title: ""
-      },
-      preview: {
-        isVisible: false,
-        context: ''
-      },
-      tenantViewVisible: false,
-      tableKey: 0,
-      queryParams: initQueryParams({}),
-      selection: [],
-      currentRow: null,  // 当前选择的行数据对象
-      loading: false,
-      tableData: {
-        total: 0
-      },
-      enums: {
-        TenantTypeEnum: {},
-        TenantStatusEnum: {}
-      }
-    }
-  },
-  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
-  created() {
-  	// 调用常量-初始化值
-  	this.qiyongStatus = this.$constWKS.STATUSLIST;
-	},
-	// 监听数据的变化
-  watch: {
-  	  $route(){
-  	  	if(this.$route.fullPath.indexOf("/prepareProductMgr/technologyMgr") > -1){
-  	  		// 查询列表数据
-      		this.fetch()
-  	  	}
-      }
-  },
-  computed: {
-    currentUser () {
-      return this.$store.state.account.user
-    }
-  },
-  mounted () {
-    this.fetch()
-  },
-  methods: {
-  	// 当表格的当前行发生变化的时候会触发该事件
-  	handleCurrentChange(val) {
-	    this.currentRow = val;
-	    // 动态给子组件赋值
-	    this.$refs.technology.processModeling = this.currentRow
-	    // 启用子组件的按钮
-	    this.$refs.technology.currBtn = false
-	    // 查询【工艺管理】列表数据
-      this.$refs.technology.getPageList({bomId: this.currentRow.id, bomVersionId: this.currentRow.id})
-	  },
-  	// 跳转【版本管理】-；列表上的Btn事件
-    factoryMgr() {
-    	if (!this.currentRow) {
-        this.$message({
-          message: "请至少选择一条数据！",
-          type: "warning"
-        })
-        return
-      }
-    	// 调用全局挂载的方法
-			this.$store.dispatch('tagsView/delView', this.$route).then(res => {
-				let obj = {
-					bomId: this.currentRow.id,
-					bomName: this.currentRow.name,
-					partsAlias: this.currentRow.partsAlias
-				}
-				this.$router.push({ path: '/prepareProductMgr/technologyVersion', query: obj}) //带参跳转
-			})
-      
-    },
-    // 跳转【版本管理-Row】-table的操作；
-    factoryRowMgr(row){
-    	// 调用全局挂载的方法
-			this.$store.dispatch('tagsView/delView', this.$route).then(res => {
-				this.$router.push({ path: '/prepareProductMgr/technologyVersion', query: {bomId: row.id, bomName: row.name, partsAlias: row.partsAlias}}) //带参跳转
-			})
-    },
-    // 【启用/冻结】按钮-事件
-    updateActiveStatus(status){
-    	if (!this.currentRow) {
-        this.$message({
-          message: this.$t("tips.noDataSelected"),
-          type: "warning"
-        })
-        return
-      }
-    	// 传值
-    	let obj = {};
-    	obj = this.currentRow
-    	obj.status = status;
-    	// 调用接口后的提示信息
-    	let msg = "冻结成功！";
-    	if(status == "1"){
-    		msg = "启用成功！";
-    	}
-    	bomMgrApi.updateActiveStatus(obj).then(response => {
-        if (response.status == 200) {
-          this.$message({
-            message: msg,
-            type: "success"
-          })
-          // 重新查询列表数据
-          this.search()
-        }
-      })
-    },
-    // 【冻结】-Table的Row操作事件
-    dongJieRow(row) {
-    	// 传值
-    	let obj = {};
-    	obj = row;
-    	obj.status = "0";
-    	bomMgrApi.updateActiveStatus(obj).then(response => {
-        if (response.status == 200) {
-          this.$message({
-            message: "冻结成功！",
-            type: "success"
-          })
-          // 重新查询列表数据
-          this.search()
-        }
-      })
-    },
-    viewClose () {
-      this.tenantViewVisible = false
-    },
-    editClose () {
-      this.dialog.isVisible = false
-    },
-    editSuccess () {
-      this.search()
-    },
-    onSelectChange (currentRow, oldCurrentRow) {
-    	// 先清除所有选择的数据
-    	this.$refs.table.clearSelection();
-    	// 把当前选择的行，设置checkbox
-    	this.$refs.table.toggleRowSelection(currentRow)
-    	// 赋值当前选中的行
-      this.currentRow = currentRow
-    },
-    search () {
-      this.fetch({
-        ...this.queryParams
-      })
-    },
-    reset () {
-      this.queryParams = initQueryParams({})
-      this.$refs.table.clearSort()
-      this.$refs.table.clearFilter()
-      this.search()
-    },
-    add () {
-    	if (!this.currentRow) {
-        this.$message({
-          message: this.$t("tips.noDataSelected"),
-          type: "warning"
-        })
-        return
-      }
-    	this.$refs.edit.tenant.parent_id = this.currentRow.id
-      this.$refs.edit.type = "add"
-      this.dialog.title = this.$t("common.add")
-      this.dialog.isVisible = true
-    },
-    singleDelete (row) {
-      this.$refs.table.clearSelection()
-      this.$refs.table.toggleRowSelection(row, true)
-      this.batchDelete()
-    },
-    batchDelete () {
-      if (!this.currentRow) {
-        this.$message({
-          message: this.$t("tips.noDataSelected"),
-          type: "warning"
-        })
-        return
-      }
-      this.$confirm(this.$t("prepare.tips.techTips"), this.$t("common.tips"), {
-      	distinguishCancelAndClose: true,
-        confirmButtonText: this.$t("common.confirm"),
-        cancelButtonText: this.$t("common.cancel"),
-        type: "warning"
-      }).then(() => {
-      	const ids = [this.currentRow.id]
-	      let contain = false
-	      this.delete(ids)
-      }).catch(() => {})
-    },
-    clearSelections () {
-      this.$refs.table.clearSelection()
-    },
-    delete (ids) {
-      bomMgrApi.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()
-        }
-      })
-    },
-    view (row) {
-      this.$refs.view.setTenant(row)
-      this.tenantViewVisible = true
-    },
-    // 【修改】表头上Btn-事件
-    editOne() {
-    	if (!this.currentRow) {
-        this.$message({
-          message: this.$t("tips.noDataSelected"),
-          type: "warning"
-        })
-        return
-      }
-    	// 查询数据
-    	bomMgrApi.get(this.currentRow).then(res => {
-    		res = res.data
-    		if(res.isSuccess){
-    			this.edit(res.data);
-    		}
-    	})
-    },
-    edit (row) {
-      if (row.readonly) {
-        this.$message({
-          message: this.$t("tips.systemData"),
-          type: "warning"
-        })
-        return
-      }
-      this.$refs.edit.setTenant(row)
-      this.$refs.edit.type = "edit"
-      this.dialog.title = this.$t("common.edit")
-      this.dialog.isVisible = true
-    },
-    fetch (params = {}) {
-      this.loading = true
-			
-			// 分页信息
-      this.queryParams.current = params.current ? params.current : this.queryParams.current
-      this.queryParams.size = params.size ? params.size : this.queryParams.size
-      
-      //必须传的参数--审核通过的，才能看到
-			this.queryParams.model.auditStatus = '2'
-			
-			// 测试数据，真实数据，请使用page
-      bomMgrApi.page(this.queryParams).then(response => {
-      	const res = response.data
-        // console.log("列表的数据：", res)
-        if (res.isSuccess) {
-        	// 总数
-        	this.tableData = res.data
-        	// 如果有数据，默认选中第一条数据
-        	if(this.tableData.records.length > 0){
-        		// 选择第一行数据
-        		this.$refs.table.setCurrentRow(this.tableData.records[0])
-        	}
-        }
-        // eslint-disable-next-line no-return-assign
-      }).finally(() => this.loading = false)
-    }
-  }
-}
-</script>
-<style lang="scss" scoped></style>
+<template>
+  <div class="app-container">
+  	<!-- 搜索部分 -->
+    <div class="filter-container">
+    	<span>
+    		<span>{{$t("prepare.searchForm.parts_no")}}：</span>
+    		<el-input v-model="queryParams.model.partsNo" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    	</span>
+    	<span style="margin-left: 15px;">
+    		<span>{{$t("prepare.searchForm.bomAlias")}}：</span>
+    		<el-input v-model="queryParams.model.bomAlias" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    	</span>
+    	<span style="margin-left: 15px;">
+    		<span>{{$t("prepare.searchForm.parts_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("prepare.searchForm.partsAlias")}}：</span>
+    		<el-input v-model="queryParams.model.partsAlias" :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-suitcase" size="medium" v-has-permission="['technology:version']" @click="factoryMgr()">{{$t("prepare.buttons.edition")}}</el-button>
+    	</el-col>
+    </el-row>
+
+		<!-- BOM产品列表 -->
+		<div class="bom">
+	    <el-table
+	      :key="tableKey"
+	      ref="table"
+	      v-loading="loading"
+	      :data="tableData.records"
+	      border
+	      fit
+	      row-key="id"
+	      highlight-current-row
+	      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+	      style="width: 100%;"
+	      @current-change="handleCurrentChange"
+	    >
+	      <!--<el-table-column v-for="item in tableData.titleList" :key="item.id" :prop="item.field" :label='item.text' :show-overflow-tooltip="true" width="180px"></el-table-column>-->
+	      <!-- 序号 -->
+	      <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="partsNo"
+          :label="$t(&quot;runCenter.table.orderSldPro.partsNo&quot;)"
+          align="center"
+          :show-overflow-tooltip="true"
+          width="150px"
+        >
+          <template slot-scope="{ row }">
+            <span>{{ row.partsNo }}</span>
+          </template>
+        </el-table-column>
+        <!-- 产品代号 -->
+        <el-table-column
+          prop="bomAlias"
+          :label="$t(&quot;runCenter.table.orderSldPro.bomAlias&quot;)"
+          align="center"
+          :show-overflow-tooltip="true"
+          width="120px"
+        />
+        <!-- 零件名称 -->
+        <el-table-column
+          prop="name"
+          :label="$t(&quot;runCenter.table.orderSldPro.name&quot;)"
+          align="center"
+        />
+        <!-- 零件代号 -->
+        <el-table-column
+          prop="partsAlias"
+          :label="$t(&quot;runCenter.table.orderSldPro.partsAlias&quot;)"
+          align="center"
+          width="150px"
+        />
+        <!-- 版本号 -->
+        <el-table-column
+          prop="version"
+          :label="$t(&quot;runCenter.table.orderSldPro.version&quot;)"
+          align="center"
+          width="150px"
+        />
+        <!-- 备注 -->
+        <el-table-column
+          prop="remark"
+          :label="$t(&quot;runCenter.table.orderSldPro.remark&quot;)"
+          align="center"
+          width="150px"
+        />
+        <!-- 操作 -->
+	      <el-table-column
+	        :label="$t('table.operation')"
+	        fixed="right"
+	        align="center"
+	        column-key="operation"
+	        width="120px"
+	      >
+	        <template slot-scope="{ row }">
+	          <el-tooltip class="item" :content='$t("prepare.buttons.edition")' effect="dark" placement="top-start">
+		          <i
+		            class="el-icon-suitcase table-operation"
+		            style="color: #2db7f5;"
+		            @click="factoryRowMgr(row)"
+		          />
+	          </el-tooltip>
+	        </template>
+	      </el-table-column>
+	    </el-table>
+	    <pagination
+	      v-show="tableData.total > 0"
+	      :limit.sync="queryParams.size"
+	      :page.sync="queryParams.current"
+	      :total="Number(tableData.total)"
+	      @pagination="fetch"
+	    />
+		</div>
+
+    <!-- 工艺列表及相关 -->
+    <div class="technology">
+    	<el-tabs type="border-card">
+			  <el-tab-pane :label='$t("prepare.common.tab1")'>
+			  	<!-- 工艺列表-->
+			  	<technology-table ref="technology"></technology-table>
+			  </el-tab-pane>
+			  <!--<el-tab-pane :label='$t("prepare.common.tab2")'>综合分析</el-tab-pane>
+			  <el-tab-pane :label='$t("prepare.common.tab3")'>数控程序</el-tab-pane>
+			  <el-tab-pane :label='$t("prepare.common.tab4")'>刀具</el-tab-pane>
+			  <el-tab-pane :label='$t("prepare.common.tab5")'>夹具</el-tab-pane>
+			  <el-tab-pane :label='$t("prepare.common.tab6")'>人员</el-tab-pane>
+			  <el-tab-pane :label='$t("prepare.common.tab7")'>设备</el-tab-pane>
+			  <el-tab-pane :label='$t("prepare.common.tab8")'>材料</el-tab-pane>-->
+
+			</el-tabs>
+
+    </div>
+    <el-dialog
+      v-el-drag-dialog
+      :close-on-click-modal="false"
+      :close-on-press-escape="true"
+      :title='$t("common.preview")'
+      width="80%"
+      top="50px"
+      :visible.sync="preview.isVisible"
+    >
+      <el-scrollbar>
+        <div v-html="preview.context" />
+      </el-scrollbar>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"
+// 【工艺列表】-组件
+import TechnologyTable from "./components/TechnologyTable"
+// 【BOM管理】-API
+import bomMgrApi from "@/api/prepareProductMgr/bomMgr"
+import elDragDialog from '@/directive/el-drag-dialog'
+import { downloadFile, initEnums, initQueryParams } from '@/utils/commons'
+import axios from 'axios'
+export default {
+  name: "TechnologyMgr",
+  directives: { elDragDialog },
+  components: { Pagination, TechnologyTable },
+  data () {
+    return {
+    	qiyongStatus: [], //状态
+      dialog: {
+        isVisible: false,
+        title: ""
+      },
+      preview: {
+        isVisible: false,
+        context: ''
+      },
+      tenantViewVisible: false,
+      tableKey: 0,
+      queryParams: initQueryParams({}),
+      selection: [],
+      currentRow: null,  // 当前选择的行数据对象
+      loading: false,
+      tableData: {
+        total: 0
+      },
+      enums: {
+        TenantTypeEnum: {},
+        TenantStatusEnum: {}
+      }
+    }
+  },
+  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+  created() {
+  	// 调用常量-初始化值
+  	this.qiyongStatus = this.$constWKS.STATUSLIST;
+	},
+	// 监听数据的变化
+  watch: {
+  	  $route(){
+  	  	if(this.$route.fullPath.indexOf("/prepareProductMgr/technologyMgr") > -1){
+  	  		// 查询列表数据
+      		this.fetch()
+  	  	}
+      }
+  },
+  computed: {
+    currentUser () {
+      return this.$store.state.account.user
+    }
+  },
+  mounted () {
+    this.fetch()
+  },
+  methods: {
+  	// 当表格的当前行发生变化的时候会触发该事件
+  	handleCurrentChange(val) {
+	    this.currentRow = val;
+	    // 动态给子组件赋值
+	    this.$refs.technology.processModeling = this.currentRow
+	    // 启用子组件的按钮
+	    this.$refs.technology.currBtn = false
+	    // 查询【工艺管理】列表数据
+      this.$refs.technology.getPageList({bomId: this.currentRow.id, bomVersionId: this.currentRow.id})
+	  },
+  	// 跳转【版本管理】-；列表上的Btn事件
+    factoryMgr() {
+    	if (!this.currentRow) {
+        this.$message({
+          message: "请至少选择一条数据！",
+          type: "warning"
+        })
+        return
+      }
+    	// 调用全局挂载的方法
+			this.$store.dispatch('tagsView/delView', this.$route).then(res => {
+				let obj = {
+					bomId: this.currentRow.id,
+					bomName: this.currentRow.name,
+					partsAlias: this.currentRow.partsAlias
+				}
+				this.$router.push({ path: '/prepareProductMgr/technologyVersion', query: obj}) //带参跳转
+			})
+
+    },
+    // 跳转【版本管理-Row】-table的操作；
+    factoryRowMgr(row){
+    	// 调用全局挂载的方法
+			this.$store.dispatch('tagsView/delView', this.$route).then(res => {
+				this.$router.push({ path: '/prepareProductMgr/technologyVersion', query: {bomId: row.id, bomName: row.name, partsAlias: row.partsAlias}}) //带参跳转
+			})
+    },
+    // 【启用/冻结】按钮-事件
+    updateActiveStatus(status){
+    	if (!this.currentRow) {
+        this.$message({
+          message: this.$t("tips.noDataSelected"),
+          type: "warning"
+        })
+        return
+      }
+    	// 传值
+    	let obj = {};
+    	obj = this.currentRow
+    	obj.status = status;
+    	// 调用接口后的提示信息
+    	let msg = "冻结成功！";
+    	if(status == "1"){
+    		msg = "启用成功！";
+    	}
+    	bomMgrApi.updateActiveStatus(obj).then(response => {
+        if (response.status == 200) {
+          this.$message({
+            message: msg,
+            type: "success"
+          })
+          // 重新查询列表数据
+          this.search()
+        }
+      })
+    },
+    // 【冻结】-Table的Row操作事件
+    dongJieRow(row) {
+    	// 传值
+    	let obj = {};
+    	obj = row;
+    	obj.status = "0";
+    	bomMgrApi.updateActiveStatus(obj).then(response => {
+        if (response.status == 200) {
+          this.$message({
+            message: "冻结成功！",
+            type: "success"
+          })
+          // 重新查询列表数据
+          this.search()
+        }
+      })
+    },
+    viewClose () {
+      this.tenantViewVisible = false
+    },
+    editClose () {
+      this.dialog.isVisible = false
+    },
+    editSuccess () {
+      this.search()
+    },
+    onSelectChange (currentRow, oldCurrentRow) {
+    	// 先清除所有选择的数据
+    	this.$refs.table.clearSelection();
+    	// 把当前选择的行，设置checkbox
+    	this.$refs.table.toggleRowSelection(currentRow)
+    	// 赋值当前选中的行
+      this.currentRow = currentRow
+    },
+    search () {
+      this.fetch({
+        ...this.queryParams
+      })
+    },
+    reset () {
+      this.queryParams = initQueryParams({})
+      this.$refs.table.clearSort()
+      this.$refs.table.clearFilter()
+      this.search()
+    },
+    add () {
+    	if (!this.currentRow) {
+        this.$message({
+          message: this.$t("tips.noDataSelected"),
+          type: "warning"
+        })
+        return
+      }
+    	this.$refs.edit.tenant.parent_id = this.currentRow.id
+      this.$refs.edit.type = "add"
+      this.dialog.title = this.$t("common.add")
+      this.dialog.isVisible = true
+    },
+    singleDelete (row) {
+      this.$refs.table.clearSelection()
+      this.$refs.table.toggleRowSelection(row, true)
+      this.batchDelete()
+    },
+    batchDelete () {
+      if (!this.currentRow) {
+        this.$message({
+          message: this.$t("tips.noDataSelected"),
+          type: "warning"
+        })
+        return
+      }
+      this.$confirm(this.$t("prepare.tips.techTips"), this.$t("common.tips"), {
+      	distinguishCancelAndClose: true,
+        confirmButtonText: this.$t("common.confirm"),
+        cancelButtonText: this.$t("common.cancel"),
+        type: "warning"
+      }).then(() => {
+      	const ids = [this.currentRow.id]
+	      let contain = false
+	      this.delete(ids)
+      }).catch(() => {})
+    },
+    clearSelections () {
+      this.$refs.table.clearSelection()
+    },
+    delete (ids) {
+      bomMgrApi.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()
+        }
+      })
+    },
+    view (row) {
+      this.$refs.view.setTenant(row)
+      this.tenantViewVisible = true
+    },
+    // 【修改】表头上Btn-事件
+    editOne() {
+    	if (!this.currentRow) {
+        this.$message({
+          message: this.$t("tips.noDataSelected"),
+          type: "warning"
+        })
+        return
+      }
+    	// 查询数据
+    	bomMgrApi.get(this.currentRow).then(res => {
+    		res = res.data
+    		if(res.isSuccess){
+    			this.edit(res.data);
+    		}
+    	})
+    },
+    edit (row) {
+      if (row.readonly) {
+        this.$message({
+          message: this.$t("tips.systemData"),
+          type: "warning"
+        })
+        return
+      }
+      this.$refs.edit.setTenant(row)
+      this.$refs.edit.type = "edit"
+      this.dialog.title = this.$t("common.edit")
+      this.dialog.isVisible = true
+    },
+    fetch (params = {}) {
+      this.loading = true
+
+			// 分页信息
+      this.queryParams.current = params.current ? params.current : this.queryParams.current
+      this.queryParams.size = params.size ? params.size : this.queryParams.size
+
+      //必须传的参数--审核通过的，才能看到
+			this.queryParams.model.auditStatus = '2'
+
+			// 测试数据，真实数据，请使用page
+      bomMgrApi.page(this.queryParams).then(response => {
+      	const res = response.data
+        // console.log("列表的数据：", res)
+        if (res.isSuccess) {
+        	// 总数
+        	this.tableData = res.data
+        	// 如果有数据，默认选中第一条数据
+        	if(this.tableData.records.length > 0){
+        		// 选择第一行数据
+        		this.$refs.table.setCurrentRow(this.tableData.records[0])
+        	}
+        }
+        // eslint-disable-next-line no-return-assign
+      }).finally(() => this.loading = false)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped></style>

imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/components/TechnologyEdit.vue

@@ -1,676 +1,676 @@
-<template>
-	<el-dialog
-  	:close-on-click-modal="false"
-  	:close-on-press-escape="false"
-  	:title="title"
-  	:append-to-body="true"
-  	:visible.sync="isVisible"
-  	width="90%"
-  	top="50px"
-  >
-    <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
-		<el-row :gutter="20">
-		  <el-col :span="4">
-		  	<el-table
-		      :key="100001"
-		      ref="table"
-		      v-loading="loading"
-		      :data="tableData.data"
-		      border
-		      fit
-		      :highlight-current-row="true"
-		      style="width: 100%;"
-		      @row-click="rowClick"
-		      @current-change="onSelectChange"
-		      header-row-class-name="technologTable"
-		    >
-		      <el-table-column prop="no" :label='$t("prepare.common.tcNo")' align="center" :show-overflow-tooltip="true"></el-table-column>
-		    </el-table>
-		  </el-col>
-		  <el-col :span="20">
-		  	<!-- 工序内容 -->
-		  	<div class="prossDiv">
-		  		<div class="title">{{$t("prepare.common.tcContent")}}</div>
-		  		<el-table
-		  			ref="tableProcess"
-			        :data="tableData2"
-			      	style="width: 100%"
-			      	header-row-class-name="technologTable"
-			    >
-			    	<!-- 工序编号 -->
-			      	<el-table-column prop="id" :label='$t("prepare.table.techno.name")' :show-overflow-tooltip="true"></el-table-column>
-			      	<!-- 动态表头 -->
-			      	<el-table-column v-for="item in tableData.titleList" :key="item.id" :prop="item.field" :label='item.text' :show-overflow-tooltip="true" width="180px"></el-table-column>
-			    </el-table>
-		  	</div>
-
-		  	<!-- 工序分析 -->
-		  	<div class="prossFenxi">
-		  		<div class="title">{{$t("prepare.common.tcFenxi")}}</div>
-		  		<div class="content">
-		  			<!-- 可执行设备（位置） -->
-		  			<equipment-form ref="equipment" @setProgram="setProgram"></equipment-form>
-
-		  			<!-- 所需原材料 -->
-		  			<!-- <material-form ref="material" :technology="currentRow"></material-form> -->
-
-		  			<!-- 夹具 -->
-		  			<tray-form ref="tray" :technology="currentRow" @clearProgram="clearProgram" @setProgram="setProgramByTray"></tray-form>
-
-		  			<!-- NC程序 -->
-		  			<program-form ref="program"></program-form>
-
-		  			<!-- 人工质检 -->
-		  			<!-- <quality-form ref="quality"></quality-form> -->
-
-		  			<!-- 机械手臂 -->
-					<!-- <robotarm-form ref="robotarm"></robotarm-form> -->
-					
-					<!-- 三坐标质检 -->
-					<div class="szb">
-						<!-- 按钮功能 -->
-				    	<div class="itemDiv">
-				    		<!-- 三坐标质检  -->
-							<span class="titleSmall">{{$t("prepare.common.szbName")}}</span>
-							<el-radio-group :disabled="type == 'view' ? true : false" v-model="tenant.threeDimensionalConf" style="margin-right: 15px;">
-							    <el-radio label="0">{{$t("prepare.common.idNeed.unneed")}}</el-radio>
-							    <el-radio label="1">{{$t("prepare.common.idNeed.need")}}</el-radio>
-							</el-radio-group>
-						</div>
-						
-						<!-- 输入框（需要） -->
-						<div v-if="tenant.threeDimensionalConf == '1'" class="szbInput">
-							<span>
-								<span>{{ $t("prepare.form.threeDimensionalPrograme") }}：</span>
-								<el-input v-model="tenant.threeDimensionalPrograme" :placeholder='$t("common.pleaseEnter")' style="width: 500px;"></el-input>
-							</span>
-						</div>
-					</div>
-					
-					<!-- 三坐标偏置点检测 -->
-					<div class="szbpzd">
-						<!-- 按钮功能 -->
-				    	<div class="itemDiv">
-				    		<!-- 三坐标偏置点检测  -->
-							<span class="titleSmall">{{$t("prepare.common.threeDimensionalDeviationConf")}}</span>
-							<el-radio-group :disabled="type == 'view' ? true : false" v-model="tenant.threeDimensionalDeviationConf" style="margin-right: 15px;">
-							    <el-radio label="0">{{$t("prepare.common.idNeed.unneed")}}</el-radio>
-							    <el-radio label="1">{{$t("prepare.common.idNeed.need")}}</el-radio>
-							</el-radio-group>
-						</div>
-						
-						<!-- 输入框（需要） -->
-						<div v-if="tenant.threeDimensionalDeviationConf == '1'" class="szbInput">
-							<span>
-								<span>{{ $t("prepare.form.threeDimensionalPrograme") }}：</span>
-								<el-input v-model="tenant.threeDimensionalDeviationPrograme" :placeholder='$t("common.pleaseEnter")' style="width: 500px;"></el-input>
-							</span>
-						</div>
-					</div>
-					
-					<!-- 工序抽检配置 -->
-					<div class="szbpzd">
-						<!-- 按钮功能 -->
-				    	<div class="itemDiv">
-				    		<!-- 工序抽检配置  -->
-							<span class="titleSmall">{{$t("prepare.common.randomCheckConf")}}</span>
-							<el-radio-group :disabled="type == 'view' ? true : false" v-model="tenant.randomCheckConf" style="margin-right: 15px;">
-							    <el-radio label="0">{{$t("prepare.common.idNeed.unneed")}}</el-radio>
-							    <el-radio label="1">{{$t("prepare.common.idNeed.need")}}</el-radio>
-							</el-radio-group>
-						</div>
-						
-						<!-- 输入框（需要） -->
-						<div v-if="tenant.randomCheckConf == '1'" class="szbInput">
-							<span>
-								<span>{{ $t("prepare.form.threeDimensionalPrograme") }}：</span>
-								<el-input v-model="tenant.randomCheckPrograme" :placeholder='$t("common.pleaseEnter")' style="width: 500px;"></el-input>
-							</span>
-						</div>
-					</div>
-
-		  		</div>
-		  	</div>
-		  </el-col>
-		</el-row>
-    </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.save') }}</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-
-// 【工艺管理】-API
-import technologyMgrApi from "@/api/prepareProductMgr/technologyMgr"
-// 【BOM管理】-API
-import bomMgrApi from "@/api/prepareProductMgr/bomMgr"
-// 【可执行设备（位置）】组件
-import EquipmentForm from "./equipmentForm/"
-// 【所需原材料】组件
-// import MaterialForm from "./materialForm/"
-// 【所需原材料】组件
-import TrayForm from "./trayForm/"
-// 【程序】组件
-import ProgramForm from "./programForm/"
-// 【人工质检】组件
-// import QualityForm from "./qualityForm/"
-// 【机械手臂】组件
-import RobotarmForm from "./robotarmForm/"
-// 【产品工艺版本管理】-API
-import technologyVersionApi from "@/api/prepareProductMgr/technologyVersion"
-
-export default {
-  name: 'TenantEdit',
-  components: {
-  	EquipmentForm,
-  	//MaterialForm,
-  	TrayForm,
-  	ProgramForm,
-  	RobotarmForm
-  	// QualityForm
-  },
-  props: {
-  	dialogVisible: {
-      type: Boolean,
-      default: false
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-    	type: 'add',
-    	isEnd: false,
-    	processModeling: null,
-    	loading: false,
-    	tableData: {
-    		count: 0,
-    		data: [],  // 内容
-    		titleList: []  // 工序表头
-    	},  // 【左-工序列表】数据
-    	currentRow: null, // 【左-工序列表】当前选择的行数据对象
-    	oldCurrentRow: {}, // 【左-工序列表】前一条选择的行数据对象
-
-    	tableData2: [], // 工序内容-数据
-    	processTitleList: [],
-
-    	commList: {key: 1}, // 动态的数据对象，比如表单中的select、cascader、radio、checkbox等需要数据的控件
-    	filedList: [], // 字段数据
-	    tenant: this.initTenant(),
-	    screenWidth: 0,
-	    width: this.initWidth(),
-	    confirmDisabled: false,
-	    dicts:{
-	        NATION: {}
-	    },
-	    roles: [],
-	    rules: {
-	    },
-	    
-	    // 三坐标质检-参数
-	    threeDimensionalConf: '0', // 默认不需要
-	    threeDimensionalPrograme: '', // 检测程序名
-	    // 三坐标偏置点检测
-	    threeDimensionalDeviationConf: '0',
-	    threeDimensionalDeviationPrograme: '',
-	    // 工序抽检配置
-	    randomCheckConf: '0',
-		randomCheckPrograme: '',	    
-    }
-  },
-  // 监听数据的变化
-	watch: {
-	},
-  	// 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
-  	created() {
-
-	},
-	computed: {
-		isVisible: {
-	      get () {
-	        return this.dialogVisible
-	      },
-	      set () {
-	        this.close()
-	        this.reset()
-	      }
-	    }
-	},
-  	// DOM已经加载
-    mounted () {
-	    window.onresize = () => {
-	      return (() => {
-	        this.width = this.initWidth()
-	      })()
-	    }
-  	},
-  methods: {
-  	// 判断是否禁用-【查看】的时候
-  	showRadio(){
-	   	return this.type == "view" ? true : false
-	},
-	
-  	add(){
-
-  	},
-  	//【左-工序列表】，当某一行被点击时会触发该事件
-  	rowClick(row, column, event){
-  		this.$confirm(this.$t("prepare.tips.saveTips"), this.$t("common.tips"), {
-	      	distinguishCancelAndClose: true,
-	        confirmButtonText: this.$t("common.confirm"),
-	        cancelButtonText: this.$t("common.cancel"),
-	        type: "warning"
-	    }).then(() => {    // 【确定】按钮-事件
-	    	// 切换的时候，保存
-	    	this.submitForm('change')
-	    	/*// 工序内容-数据
-	    	this.tableData2 = [row]
-	    	// 根据【工艺id】查询详情信息
-	    	this.getDetail(row.id)*/
-	    }).catch(() => {   // 【取消】按钮-事件
-	    	// 工序内容-数据
-	    	this.tableData2 = [row]
-	    	// 根据【工艺id】查询详情信息
-	    	this.getDetail(row.id)
-	    })
-  	},
-  	// 【左-工序列表】，Row当表格的当前行发生变化的时候会触发该事件
-  	onSelectChange (currentRow, oldCurrentRow) {
-  		console.log("当前Row数据：", currentRow, oldCurrentRow)
-    	//this.$refs.table.setCurrentRow(currentRow)
-    	// 赋值，上一次选中的行
-    	this.oldCurrentRow = oldCurrentRow
-    	// 赋值当前选中的行
-      	this.currentRow = currentRow
-    },
-    // 把【可执行设备（位置）】传来的【需要程序】的数据，赋值给子组件【程序-设备】
-    setProgram(arr) {
-    	let list = []
-    	arr.map(item => {
-    		// 【需要程序】的设备，才需要设置【程序】
-    		if(item.cncProgram == "1"){
-    			list.push(item)
-    		}
-    	})
-    	this.$refs.program.selectedEq = list
-    },
-    // 把【托盘夹具组】传来的【夹具组】的数据，赋值给子组件【程序-夹具组】
-    setProgramByTray(arr) {
-    	this.$refs.program.selectedTray = arr
-    },
-    // 通知【程序】，清空当前数据
-    clearProgram(){
-    	// console.log("需要清除，程序的数据")
-    	this.$refs.program.tableData = []
-    },
-    initTenant () {
-      return {
-      	// 三坐标质检-参数
-	    threeDimensionalConf: '0', // 默认不需要
-	    threeDimensionalPrograme: '', // 检测程序名
-	    // 三坐标偏置点检测
-	    threeDimensionalDeviationConf: '0',
-	    threeDimensionalDeviationPrograme: '',
-	    // 工序抽检配置
-	    randomCheckConf: '0',
-		randomCheckPrograme: '',	    
-      }
-    },
-    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, processModeling) {
-    	if(val){
-    		this.tenant = { ...val }
-    	}
-    	// 工艺版本信息
-    	this.processModeling = processModeling
-	    // 字典表
-	    this.dicts = dicts
-	    // 查查【工序列表】-左
-    	this.getProcessList()
-    },
-    close () {
-      this.$emit('close')
-    },
-    reset () {
-      // 先清除校验，再清除表单，不然有奇怪的bug
-      this.$refs.form.clearValidate()
-      this.$refs.form.resetFields()
-      this.tenant = this.initTenant()
-      // 清除【工序内容】
-      this.tableData2 = []
-      // 清除【可执行设备（位置）】
-      this.$refs.equipment.tableData = []
-      // 清除【所需原材料】
-      //this.$refs.material.radio = null
-      //this.$refs.material.tableData = []
-      // 清除【托盘夹具组】
-      this.$refs.tray.radio = null
-      this.$refs.tray.tableData = []
-      // 清除【程序】
-      this.$refs.program.radio = null
-      this.$refs.program.tableData = []
-    },
-    submitForm (isFlag) {
-    	// 工艺版本id
-    	this.tenant.id = this.currentRow.id
-    	// 如果是切换【工序】-左的时候保存
-    	if(isFlag == 'change'){
-    		console.log("不走这里阿？", isFlag)
-    		this.tenant.id = this.oldCurrentRow.id
-    	}
-    	// 获取【可执行设备（位置）】数据
-    	this.tenant.productionresourceList = this.$refs.equipment.tableData
-    	// 获取【所需原材料】数据
-    	//this.tenant.armMeterialConf = this.$refs.material.armMeterialConf ? '1' : '0'
-    	//this.tenant.meterialConf = this.$refs.material.radio
-    	//this.tenant.meterialList = this.$refs.material.tableData
-    	// 获取【托盘夹具组】数据
-    	this.tenant.armTrayConf = this.$refs.tray.armTrayConf ? '1' : '0'
-    	this.tenant.armFixtureConf = this.$refs.tray.armFixtureConf ? '1' : '0'
-    	this.tenant.trayConf = this.$refs.tray.radio
-    	this.tenant.procedureTrayList = this.$refs.tray.tableData
-    	// 获取【程序】数据
-    	this.tenant.programConf = this.$refs.program.radio
-    	this.tenant.programList = this.$refs.program.tableData
-    	// 获取【人工质检】数据
-    	//this.tenant.programTest = this.$refs.quality.radio
-    	//this.tenant.procedureTestList = this.$refs.quality.tableData
-    	// 方式
-    	//this.tenant.programTestWay = this.$refs.quality.programTestWay
-    	//this.tenant.directCuttingFlag = this.$refs.quality.directCuttingFlag
-    	//this.tenant.programTestPrograme = this.$refs.quality.programTestPrograme
-    	// 获取【机械手臂】数据
-    	//this.tenant.armConf = this.$refs.robotarm.radio
-    	// 如果是【需要】
-    	/*if(this.tenant.armConf == '2'){
-    		// 验证数据是否填写
-    		if(this.$refs.robotarm.submitForm()){
-    			this.tenant.procedureRobotArm = this.$refs.robotarm.submitForm()
-    		}else{
-    			this.$message({
-	              	message: "请填写【机械手臂】信息~",
-	              	type: 'warning'
-	            })
-	    		return false
-    		}
-    	}*/
-    	console.log("表单的数据：", this.tenant)
-    	// 工序内容-简单验证
-    	if(!this.tenant.id){
-    		this.$message({
-              message: "【工序内容】没有数据~",
-              type: 'warning'
-            })
-    		return false
-    	}
-    	// 可执行设备（位置）-简单验证
-    	/*if(this.tenant.productionresourceList.length <= 0){
-    		this.$message({
-              message: "【可执行设备（位置）】没有数据~",
-              type: 'warning'
-            })
-    		return false
-    	}*/
-    	// 所需原材料-简单验证
-    	/*if(this.tenant.meterialList.length <= 0){
-    		this.$message({
-              message: "【所需原材料】没有数据~",
-              type: 'warning'
-            })
-    		return false
-    	}*/
-    	// 托盘夹具组-简单验证
-    	/*if(this.tenant.procedureTrayList.length <= 0){
-    		this.$message({
-              message: "【托盘夹具组）】没有数据~",
-              type: 'warning'
-            })
-    		return false
-    	}*/
-    	// 程序-简单验证
-    	/*if(this.tenant.programList.length <= 0){
-    		this.$message({
-              message: "【程序）】没有数据~",
-              type: 'warning'
-            })
-    		return false
-    	}*/
-    	// return false
-      	this.$refs.form.validate((valid) => {
-	        if (valid) {
-	          this.confirmDisabled = true
-	          this.save(isFlag)
-	        } else {
-	          return false
-	        }
-      	})
-    },
-    save (isFlag) {
-      technologyVersionApi.saveProcessAnalysis(this.tenant)
-        .then((response) => {
-          const res = response.data
-          if (res.isSuccess) {
-          	// 关闭页面
-            // this.isVisible = false
-            this.$message({
-              message: this.$t('tips.optionSuccess'),
-              type: 'success'
-            })
-            // 通知列表
-	        this.$emit("success");
-	        // 如果是切换【工序】-左的保存
-	        if(isFlag == 'change'){
-		    	// 工序内容-数据
-		    	this.tableData2 = [this.currentRow]
-		    	// 根据【工艺id】查询详情信息
-		    	this.getDetail(this.currentRow.id)
-	        }
-          }
-        }).finally(() => {
-          this.confirmDisabled = false
-          return true
-        })
-    },
-    update () {
-      bomMgrApi.update(this.tenant)
-        .then((response) => {
-          const res = response.data
-          if (res.isSuccess) {
-            this.isVisible = false
-            this.$message({
-              message: this.$t('tips.optionSuccess'),
-              type: 'success'
-            })
-            // 通知列表
-	          this.$emit("success");
-	          // 通知列表-并关闭弹出框
-	          this.$emit("close");
-          }
-        }).finally(() => {
-          this.confirmDisabled = false
-          return true
-        })
-    },
-    // 查询【工序列表】-左
-    getProcessList (params = {}) {
-    	this.loading = true
-		// 参数 bomVersionId  、bomId
-		// 获取Bom产品的id
-		let obj = {
-			bizType: "0", // 0 : 是工艺版本的列表; 如果是1 的话，则是正式工艺的列表
-			bomId: this.processModeling.bomId,
-			bomVersionId: this.processModeling.id,
-			size: 1000
-		}
-      	technologyMgrApi.pageList(obj).then(response => {
-	      	const res = response.data
-	        console.log("【工序列表111】-左：", res)
-	        if (res.isSuccess) {
-	        	// 工序的数据
-	        	this.tableData = res.data
-	        	// 如果数据存在--默认选中第一条数据
-	        	if(this.tableData.data.length > 0){
-	        		// 把当前选择的行，设置checkbox
-	    			this.$refs.table.setCurrentRow(this.tableData.data[0])
-	    			// 初始化的时候，上一个数据也是本身
-	    			this.oldCurrentRow = this.tableData.data[0]
-	        		// 工序内容-数据
-	    			this.tableData2 = [this.tableData.data[0]]
-	    			// 根据【工艺id】查询详情信息
-	    			this.getDetail(this.tableData.data[0].id)
-	        	}
-	        }
-        // eslint-disable-next-line no-return-assign
-      	}).finally(() => this.loading = false)
-    },
-    // 根据【工艺id】查询详情信息
-    getDetail(id){
-    	technologyVersionApi.getProcessAnalysis({id}).then(res => {
-    		res = res.data
-    		if(res.isSuccess){
-    			console.log("详情信息：", res.data)
-
-    			// 给各个组件赋值
-    			// 获取【可执行设备（位置）】数据
-    			let eqList = this.setKeyList(res.data.productionresourceList)
-		    	this.$refs.equipment.setTableData(this.setKeyList(res.data.productionresourceList))
-		    	// 把【设备】的数据，给【程序】使用
-		    	// this.setProgram(eqList)
-		    	// 获取【所需原材料】数据
-		    	/*if(!!res.data.meterialConf){
-		    		this.$refs.material.radio = res.data.meterialConf
-		    	}*/
-		    	//this.$refs.material.armMeterialConf = res.data.armMeterialConf == '1' ? true : false
-		    	//this.$refs.material.tableData = this.setKeyList(res.data.meterialList)
-		    	// 获取【托盘夹具组】数据
-		    	if(!!res.data.trayConf){
-		    		this.$refs.tray.radio = res.data.trayConf
-		    	}
-		    	this.$refs.tray.armTrayConf = res.data.armTrayConf == '1' ? true : false
-	    		this.$refs.tray.armFixtureConf = res.data.armFixtureConf == '1' ? true : false
-		    	this.$refs.tray.setDataMustSpan(this.setKeyList(res.data.procedureTrayList, 'tray'))
-		    	// 获取【程序】数据
-		    	if(!!res.data.programConf){					
-		    		this.$refs.program.radio = res.data.programConf
-		    	}
-		    	this.$refs.program.tableData = this.setKeyList(res.data.programList)
-		    	// 赋值-三坐标系列				
-		    	this.tenant = {
-					threeDimensionalConf:  res.data.threeDimensionalConf==null? "0" : res.data.threeDimensionalConf,
-                    threeDimensionalPrograme: res.data.threeDimensionalPrograme==null? "": res.data.threeDimensionalPrograme,
-					threeDimensionalDeviationConf: res.data.threeDimensionalDeviationConf==null? "0" : res.data.threeDimensionalDeviationConf,
-	    			threeDimensionalDeviationPrograme: res.data.threeDimensionalDeviationPrograme==null? "":res.data.threeDimensionalDeviationPrograme,
-	    			// 工序抽检配置
-	    			randomCheckConf: res.data.randomCheckConf==null? "0" : res.data.randomCheckConf,
-	    			randomCheckPrograme: res.data.randomCheckPrograme==null? "" : res.data.randomCheckPrograme
-				};
-
-		    	// 获取【人工质检】数据
-		    	/*if(!!res.data.programTest){
-		    		this.$refs.quality.radio = res.data.programTest
-		    		// 方式
-		    		this.$refs.quality.programTestWay = res.data.programTestWay
-		    		this.$refs.quality.directCuttingFlag = res.data.directCuttingFlag
-		    		this.$refs.quality.programTestPrograme = res.data.programTestPrograme
-		    	}*/
-		    	// this.$refs.quality.tableData = this.setKeyList(res.data.procedureTestList)
-		    	// 获取【机械手臂】数据
-		    	/*this.$refs.robotarm.radio = res.data.armConf
-		    	if(res.data.armConf == '2'){
-		    		if(res.data.procedureRobotArm){
-		    			// this.$refs.robotarm.tenant = res.data.procedureRobotArm
-		    			this.$refs.robotarm.setTenant(res.data.procedureRobotArm)
-		    		}
-		    	}*/
-    		}
-    	})
-    },
-    // 赋值前处理-添加key数据健
-    setKeyList(list, flag){
-    	if(list && list.length > 0){
-    		let arr = []
-    		list.forEach(item => {
-    			// 添加唯一键
-	    		item.key = ''+ Math.random()
-	    		// 如果是托盘夹具的时候，组装分类
-	    		if(flag == 'tray'){
-	    			// 把【组序】和【优先级】改成字符串
-	    			//item.groupSort = ''+ item.groupSort
-	    			//item.groupPrority = ''+ item.groupPrority
-	    			// 给图片一个列表数据，jjImgList
-	    			item.jjImgList = []
-	    			if(!!item.armorPic){
-	    				item.jjImgList.push(item.armorPic)
-	    			}
-	    			// 添加类型
-	    			/*if(item.bizType == '1'){
-	    				item.category = {key: '03',data: '托盘'}
-	    			}else{
-	    				item.category = {key: '02',data: '夹具'}
-	    			}*/
-	    		}
-	    		arr.push(item)
-	    	})
-    		list = arr
-    	}else{
-    		list = []
-    	}
-    	return list
-    }
-  }
-}
-</script>
-<style lang="scss" scoped="">
-	.title{
-		position: relative;
-		padding-left: 20px;
-		padding-bottom: 5px;
-		border-bottom: 1px dotted #1890ff;
-	}
-	.title:before{
-		content: '';
-		position: absolute;
-		background: #1890ff;
-		width: 10px;
-		height: 70%;
-		left: 0;
-		top: 1px;
-	}
-	.prossFenxi{
-		margin-top: 15px;
-	}
-	.content{
-		margin-top: 10px;
-	}
-	.titleSmall{
-		position: relative;
-		padding-left: 10px;
-		margin-right: 15px;
-	}
-	.titleSmall:before{
-		content: '';
-		position: absolute;
-		background: #1890ff;
-		width: 5px;
-		height: 90%;
-		left: 0;
-		top: 1px;
-	}
-	.itemDiv{
-		margin: 10px 0;
-	}
-</style>
+<template>
+	<el-dialog
+  	:close-on-click-modal="false"
+  	:close-on-press-escape="false"
+  	:title="title"
+  	:append-to-body="true"
+  	:visible.sync="isVisible"
+  	width="90%"
+  	top="50px"
+  >
+    <el-form ref="form" :model="tenant" :rules="rules" label-position="right" label-width="130px">
+		<el-row :gutter="20">
+		  <el-col :span="4">
+		  	<el-table
+		      :key="100001"
+		      ref="table"
+		      v-loading="loading"
+		      :data="tableData.data"
+		      border
+		      fit
+		      :highlight-current-row="true"
+		      style="width: 100%;"
+		      @row-click="rowClick"
+		      @current-change="onSelectChange"
+		      header-row-class-name="technologTable"
+		    >
+		      <el-table-column prop="no" :label='$t("prepare.common.tcNo")' align="center" :show-overflow-tooltip="true"></el-table-column>
+		    </el-table>
+		  </el-col>
+		  <el-col :span="20">
+		  	<!-- 工序内容 -->
+		  	<div class="prossDiv">
+		  		<div class="title">{{$t("prepare.common.tcContent")}}</div>
+		  		<el-table
+		  			ref="tableProcess"
+			        :data="tableData2"
+			      	style="width: 100%"
+			      	header-row-class-name="technologTable"
+			    >
+			    	<!-- 工序编号 -->
+<!--			      	<el-table-column prop="id" :label='$t("prepare.table.techno.name")' :show-overflow-tooltip="true"></el-table-column>-->
+			      	<!-- 动态表头 -->
+			      	<el-table-column v-for="item in tableData.titleList" :key="item.id" :prop="item.field" :label='item.text' :show-overflow-tooltip="true" width="180px"></el-table-column>
+			    </el-table>
+		  	</div>
+
+		  	<!-- 工序分析 -->
+		  	<div class="prossFenxi">
+		  		<div class="title">{{$t("prepare.common.tcFenxi")}}</div>
+		  		<div class="content">
+		  			<!-- 可执行设备（位置） -->
+		  			<equipment-form ref="equipment" @setProgram="setProgram"></equipment-form>
+
+		  			<!-- 所需原材料 -->
+		  			<!-- <material-form ref="material" :technology="currentRow"></material-form> -->
+
+		  			<!-- 夹具 -->
+		  			<tray-form ref="tray" :technology="currentRow" @clearProgram="clearProgram" @setProgram="setProgramByTray"></tray-form>
+
+		  			<!-- NC程序 -->
+		  			<program-form ref="program"></program-form>
+
+		  			<!-- 人工质检 -->
+		  			<!-- <quality-form ref="quality"></quality-form> -->
+
+		  			<!-- 机械手臂 -->
+					<!-- <robotarm-form ref="robotarm"></robotarm-form> -->
+
+					<!-- 三坐标质检 -->
+					<div class="szb">
+						<!-- 按钮功能 -->
+				    	<div class="itemDiv">
+				    		<!-- 三坐标质检  -->
+							<span class="titleSmall">{{$t("prepare.common.szbName")}}</span>
+							<el-radio-group :disabled="type == 'view' ? true : false" v-model="tenant.threeDimensionalConf" style="margin-right: 15px;">
+							    <el-radio label="0">{{$t("prepare.common.idNeed.unneed")}}</el-radio>
+							    <el-radio label="1">{{$t("prepare.common.idNeed.need")}}</el-radio>
+							</el-radio-group>
+						</div>
+
+						<!-- 输入框（需要） -->
+						<div v-if="tenant.threeDimensionalConf == '1'" class="szbInput">
+							<span>
+								<span>{{ $t("prepare.form.threeDimensionalPrograme") }}：</span>
+								<el-input v-model="tenant.threeDimensionalPrograme" :placeholder='$t("common.pleaseEnter")' style="width: 500px;"></el-input>
+							</span>
+						</div>
+					</div>
+
+					<!-- 三坐标偏置点检测 -->
+					<div class="szbpzd">
+						<!-- 按钮功能 -->
+				    	<div class="itemDiv">
+				    		<!-- 三坐标偏置点检测  -->
+							<span class="titleSmall">{{$t("prepare.common.threeDimensionalDeviationConf")}}</span>
+							<el-radio-group :disabled="type == 'view' ? true : false" v-model="tenant.threeDimensionalDeviationConf" style="margin-right: 15px;">
+							    <el-radio label="0">{{$t("prepare.common.idNeed.unneed")}}</el-radio>
+							    <el-radio label="1">{{$t("prepare.common.idNeed.need")}}</el-radio>
+							</el-radio-group>
+						</div>
+
+						<!-- 输入框（需要） -->
+						<div v-if="tenant.threeDimensionalDeviationConf == '1'" class="szbInput">
+							<span>
+								<span>{{ $t("prepare.form.threeDimensionalPrograme") }}：</span>
+								<el-input v-model="tenant.threeDimensionalDeviationPrograme" :placeholder='$t("common.pleaseEnter")' style="width: 500px;"></el-input>
+							</span>
+						</div>
+					</div>
+
+					<!-- 工序抽检配置 -->
+					<div class="szbpzd">
+						<!-- 按钮功能 -->
+				    	<div class="itemDiv">
+				    		<!-- 工序抽检配置  -->
+							<span class="titleSmall">{{$t("prepare.common.randomCheckConf")}}</span>
+							<el-radio-group :disabled="type == 'view' ? true : false" v-model="tenant.randomCheckConf" style="margin-right: 15px;">
+							    <el-radio label="0">{{$t("prepare.common.idNeed.unneed")}}</el-radio>
+							    <el-radio label="1">{{$t("prepare.common.idNeed.need")}}</el-radio>
+							</el-radio-group>
+						</div>
+
+						<!-- 输入框（需要） -->
+						<div v-if="tenant.randomCheckConf == '1'" class="szbInput">
+							<span>
+								<span>{{ $t("prepare.form.threeDimensionalPrograme") }}：</span>
+								<el-input v-model="tenant.randomCheckPrograme" :placeholder='$t("common.pleaseEnter")' style="width: 500px;"></el-input>
+							</span>
+						</div>
+					</div>
+
+		  		</div>
+		  	</div>
+		  </el-col>
+		</el-row>
+    </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.save') }}</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+// 【工艺管理】-API
+import technologyMgrApi from "@/api/prepareProductMgr/technologyMgr"
+// 【BOM管理】-API
+import bomMgrApi from "@/api/prepareProductMgr/bomMgr"
+// 【可执行设备（位置）】组件
+import EquipmentForm from "./equipmentForm/"
+// 【所需原材料】组件
+// import MaterialForm from "./materialForm/"
+// 【所需原材料】组件
+import TrayForm from "./trayForm/"
+// 【程序】组件
+import ProgramForm from "./programForm/"
+// 【人工质检】组件
+// import QualityForm from "./qualityForm/"
+// 【机械手臂】组件
+import RobotarmForm from "./robotarmForm/"
+// 【产品工艺版本管理】-API
+import technologyVersionApi from "@/api/prepareProductMgr/technologyVersion"
+
+export default {
+  name: 'TenantEdit',
+  components: {
+  	EquipmentForm,
+  	//MaterialForm,
+  	TrayForm,
+  	ProgramForm,
+  	RobotarmForm
+  	// QualityForm
+  },
+  props: {
+  	dialogVisible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+    	type: 'add',
+    	isEnd: false,
+    	processModeling: null,
+    	loading: false,
+    	tableData: {
+    		count: 0,
+    		data: [],  // 内容
+    		titleList: []  // 工序表头
+    	},  // 【左-工序列表】数据
+    	currentRow: null, // 【左-工序列表】当前选择的行数据对象
+    	oldCurrentRow: {}, // 【左-工序列表】前一条选择的行数据对象
+
+    	tableData2: [], // 工序内容-数据
+    	processTitleList: [],
+
+    	commList: {key: 1}, // 动态的数据对象，比如表单中的select、cascader、radio、checkbox等需要数据的控件
+    	filedList: [], // 字段数据
+	    tenant: this.initTenant(),
+	    screenWidth: 0,
+	    width: this.initWidth(),
+	    confirmDisabled: false,
+	    dicts:{
+	        NATION: {}
+	    },
+	    roles: [],
+	    rules: {
+	    },
+
+	    // 三坐标质检-参数
+	    threeDimensionalConf: '0', // 默认不需要
+	    threeDimensionalPrograme: '', // 检测程序名
+	    // 三坐标偏置点检测
+	    threeDimensionalDeviationConf: '0',
+	    threeDimensionalDeviationPrograme: '',
+	    // 工序抽检配置
+	    randomCheckConf: '0',
+		randomCheckPrograme: '',
+    }
+  },
+  // 监听数据的变化
+	watch: {
+	},
+  	// 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
+  	created() {
+
+	},
+	computed: {
+		isVisible: {
+	      get () {
+	        return this.dialogVisible
+	      },
+	      set () {
+	        this.close()
+	        this.reset()
+	      }
+	    }
+	},
+  	// DOM已经加载
+    mounted () {
+	    window.onresize = () => {
+	      return (() => {
+	        this.width = this.initWidth()
+	      })()
+	    }
+  	},
+  methods: {
+  	// 判断是否禁用-【查看】的时候
+  	showRadio(){
+	   	return this.type == "view" ? true : false
+	},
+
+  	add(){
+
+  	},
+  	//【左-工序列表】，当某一行被点击时会触发该事件
+  	rowClick(row, column, event){
+  		this.$confirm(this.$t("prepare.tips.saveTips"), this.$t("common.tips"), {
+	      	distinguishCancelAndClose: true,
+	        confirmButtonText: this.$t("common.confirm"),
+	        cancelButtonText: this.$t("common.cancel"),
+	        type: "warning"
+	    }).then(() => {    // 【确定】按钮-事件
+	    	// 切换的时候，保存
+	    	this.submitForm('change')
+	    	/*// 工序内容-数据
+	    	this.tableData2 = [row]
+	    	// 根据【工艺id】查询详情信息
+	    	this.getDetail(row.id)*/
+	    }).catch(() => {   // 【取消】按钮-事件
+	    	// 工序内容-数据
+	    	this.tableData2 = [row]
+	    	// 根据【工艺id】查询详情信息
+	    	this.getDetail(row.id)
+	    })
+  	},
+  	// 【左-工序列表】，Row当表格的当前行发生变化的时候会触发该事件
+  	onSelectChange (currentRow, oldCurrentRow) {
+  		console.log("当前Row数据：", currentRow, oldCurrentRow)
+    	//this.$refs.table.setCurrentRow(currentRow)
+    	// 赋值，上一次选中的行
+    	this.oldCurrentRow = oldCurrentRow
+    	// 赋值当前选中的行
+      	this.currentRow = currentRow
+    },
+    // 把【可执行设备（位置）】传来的【需要程序】的数据，赋值给子组件【程序-设备】
+    setProgram(arr) {
+    	let list = []
+    	arr.map(item => {
+    		// 【需要程序】的设备，才需要设置【程序】
+    		if(item.cncProgram == "1"){
+    			list.push(item)
+    		}
+    	})
+    	this.$refs.program.selectedEq = list
+    },
+    // 把【托盘夹具组】传来的【夹具组】的数据，赋值给子组件【程序-夹具组】
+    setProgramByTray(arr) {
+    	this.$refs.program.selectedTray = arr
+    },
+    // 通知【程序】，清空当前数据
+    clearProgram(){
+    	// console.log("需要清除，程序的数据")
+    	this.$refs.program.tableData = []
+    },
+    initTenant () {
+      return {
+      	// 三坐标质检-参数
+	    threeDimensionalConf: '0', // 默认不需要
+	    threeDimensionalPrograme: '', // 检测程序名
+	    // 三坐标偏置点检测
+	    threeDimensionalDeviationConf: '0',
+	    threeDimensionalDeviationPrograme: '',
+	    // 工序抽检配置
+	    randomCheckConf: '0',
+		randomCheckPrograme: '',
+      }
+    },
+    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, processModeling) {
+    	if(val){
+    		this.tenant = { ...val }
+    	}
+    	// 工艺版本信息
+    	this.processModeling = processModeling
+	    // 字典表
+	    this.dicts = dicts
+	    // 查查【工序列表】-左
+    	this.getProcessList()
+    },
+    close () {
+      this.$emit('close')
+    },
+    reset () {
+      // 先清除校验，再清除表单，不然有奇怪的bug
+      this.$refs.form.clearValidate()
+      this.$refs.form.resetFields()
+      this.tenant = this.initTenant()
+      // 清除【工序内容】
+      this.tableData2 = []
+      // 清除【可执行设备（位置）】
+      this.$refs.equipment.tableData = []
+      // 清除【所需原材料】
+      //this.$refs.material.radio = null
+      //this.$refs.material.tableData = []
+      // 清除【托盘夹具组】
+      this.$refs.tray.radio = null
+      this.$refs.tray.tableData = []
+      // 清除【程序】
+      this.$refs.program.radio = null
+      this.$refs.program.tableData = []
+    },
+    submitForm (isFlag) {
+    	// 工艺版本id
+    	this.tenant.id = this.currentRow.id
+    	// 如果是切换【工序】-左的时候保存
+    	if(isFlag == 'change'){
+    		console.log("不走这里阿？", isFlag)
+    		this.tenant.id = this.oldCurrentRow.id
+    	}
+    	// 获取【可执行设备（位置）】数据
+    	this.tenant.productionresourceList = this.$refs.equipment.tableData
+    	// 获取【所需原材料】数据
+    	//this.tenant.armMeterialConf = this.$refs.material.armMeterialConf ? '1' : '0'
+    	//this.tenant.meterialConf = this.$refs.material.radio
+    	//this.tenant.meterialList = this.$refs.material.tableData
+    	// 获取【托盘夹具组】数据
+    	this.tenant.armTrayConf = this.$refs.tray.armTrayConf ? '1' : '0'
+    	this.tenant.armFixtureConf = this.$refs.tray.armFixtureConf ? '1' : '0'
+    	this.tenant.trayConf = this.$refs.tray.radio
+    	this.tenant.procedureTrayList = this.$refs.tray.tableData
+    	// 获取【程序】数据
+    	this.tenant.programConf = this.$refs.program.radio
+    	this.tenant.programList = this.$refs.program.tableData
+    	// 获取【人工质检】数据
+    	//this.tenant.programTest = this.$refs.quality.radio
+    	//this.tenant.procedureTestList = this.$refs.quality.tableData
+    	// 方式
+    	//this.tenant.programTestWay = this.$refs.quality.programTestWay
+    	//this.tenant.directCuttingFlag = this.$refs.quality.directCuttingFlag
+    	//this.tenant.programTestPrograme = this.$refs.quality.programTestPrograme
+    	// 获取【机械手臂】数据
+    	//this.tenant.armConf = this.$refs.robotarm.radio
+    	// 如果是【需要】
+    	/*if(this.tenant.armConf == '2'){
+    		// 验证数据是否填写
+    		if(this.$refs.robotarm.submitForm()){
+    			this.tenant.procedureRobotArm = this.$refs.robotarm.submitForm()
+    		}else{
+    			this.$message({
+	              	message: "请填写【机械手臂】信息~",
+	              	type: 'warning'
+	            })
+	    		return false
+    		}
+    	}*/
+    	console.log("表单的数据：", this.tenant)
+    	// 工序内容-简单验证
+    	if(!this.tenant.id){
+    		this.$message({
+              message: "【工序内容】没有数据~",
+              type: 'warning'
+            })
+    		return false
+    	}
+    	// 可执行设备（位置）-简单验证
+    	/*if(this.tenant.productionresourceList.length <= 0){
+    		this.$message({
+              message: "【可执行设备（位置）】没有数据~",
+              type: 'warning'
+            })
+    		return false
+    	}*/
+    	// 所需原材料-简单验证
+    	/*if(this.tenant.meterialList.length <= 0){
+    		this.$message({
+              message: "【所需原材料】没有数据~",
+              type: 'warning'
+            })
+    		return false
+    	}*/
+    	// 托盘夹具组-简单验证
+    	/*if(this.tenant.procedureTrayList.length <= 0){
+    		this.$message({
+              message: "【托盘夹具组）】没有数据~",
+              type: 'warning'
+            })
+    		return false
+    	}*/
+    	// 程序-简单验证
+    	/*if(this.tenant.programList.length <= 0){
+    		this.$message({
+              message: "【程序）】没有数据~",
+              type: 'warning'
+            })
+    		return false
+    	}*/
+    	// return false
+      	this.$refs.form.validate((valid) => {
+	        if (valid) {
+	          this.confirmDisabled = true
+	          this.save(isFlag)
+	        } else {
+	          return false
+	        }
+      	})
+    },
+    save (isFlag) {
+      technologyVersionApi.saveProcessAnalysis(this.tenant)
+        .then((response) => {
+          const res = response.data
+          if (res.isSuccess) {
+          	// 关闭页面
+            // this.isVisible = false
+            this.$message({
+              message: this.$t('tips.optionSuccess'),
+              type: 'success'
+            })
+            // 通知列表
+	        this.$emit("success");
+	        // 如果是切换【工序】-左的保存
+	        if(isFlag == 'change'){
+		    	// 工序内容-数据
+		    	this.tableData2 = [this.currentRow]
+		    	// 根据【工艺id】查询详情信息
+		    	this.getDetail(this.currentRow.id)
+	        }
+          }
+        }).finally(() => {
+          this.confirmDisabled = false
+          return true
+        })
+    },
+    update () {
+      bomMgrApi.update(this.tenant)
+        .then((response) => {
+          const res = response.data
+          if (res.isSuccess) {
+            this.isVisible = false
+            this.$message({
+              message: this.$t('tips.optionSuccess'),
+              type: 'success'
+            })
+            // 通知列表
+	          this.$emit("success");
+	          // 通知列表-并关闭弹出框
+	          this.$emit("close");
+          }
+        }).finally(() => {
+          this.confirmDisabled = false
+          return true
+        })
+    },
+    // 查询【工序列表】-左
+    getProcessList (params = {}) {
+    	this.loading = true
+		// 参数 bomVersionId  、bomId
+		// 获取Bom产品的id
+		let obj = {
+			bizType: "0", // 0 : 是工艺版本的列表; 如果是1 的话，则是正式工艺的列表
+			bomId: this.processModeling.bomId,
+			bomVersionId: this.processModeling.id,
+			size: 1000
+		}
+      	technologyMgrApi.pageList(obj).then(response => {
+	      	const res = response.data
+	        console.log("【工序列表111】-左：", res)
+	        if (res.isSuccess) {
+	        	// 工序的数据
+	        	this.tableData = res.data
+	        	// 如果数据存在--默认选中第一条数据
+	        	if(this.tableData.data.length > 0){
+	        		// 把当前选择的行，设置checkbox
+	    			this.$refs.table.setCurrentRow(this.tableData.data[0])
+	    			// 初始化的时候，上一个数据也是本身
+	    			this.oldCurrentRow = this.tableData.data[0]
+	        		// 工序内容-数据
+	    			this.tableData2 = [this.tableData.data[0]]
+	    			// 根据【工艺id】查询详情信息
+	    			this.getDetail(this.tableData.data[0].id)
+	        	}
+	        }
+        // eslint-disable-next-line no-return-assign
+      	}).finally(() => this.loading = false)
+    },
+    // 根据【工艺id】查询详情信息
+    getDetail(id){
+    	technologyVersionApi.getProcessAnalysis({id}).then(res => {
+    		res = res.data
+    		if(res.isSuccess){
+    			console.log("详情信息：", res.data)
+
+    			// 给各个组件赋值
+    			// 获取【可执行设备（位置）】数据
+    			let eqList = this.setKeyList(res.data.productionresourceList)
+		    	this.$refs.equipment.setTableData(this.setKeyList(res.data.productionresourceList))
+		    	// 把【设备】的数据，给【程序】使用
+		    	// this.setProgram(eqList)
+		    	// 获取【所需原材料】数据
+		    	/*if(!!res.data.meterialConf){
+		    		this.$refs.material.radio = res.data.meterialConf
+		    	}*/
+		    	//this.$refs.material.armMeterialConf = res.data.armMeterialConf == '1' ? true : false
+		    	//this.$refs.material.tableData = this.setKeyList(res.data.meterialList)
+		    	// 获取【托盘夹具组】数据
+		    	if(!!res.data.trayConf){
+		    		this.$refs.tray.radio = res.data.trayConf
+		    	}
+		    	this.$refs.tray.armTrayConf = res.data.armTrayConf == '1' ? true : false
+	    		this.$refs.tray.armFixtureConf = res.data.armFixtureConf == '1' ? true : false
+		    	this.$refs.tray.setDataMustSpan(this.setKeyList(res.data.procedureTrayList, 'tray'))
+		    	// 获取【程序】数据
+		    	if(!!res.data.programConf){
+		    		this.$refs.program.radio = res.data.programConf
+		    	}
+		    	this.$refs.program.tableData = this.setKeyList(res.data.programList)
+		    	// 赋值-三坐标系列
+		    	this.tenant = {
+					threeDimensionalConf:  res.data.threeDimensionalConf==null? "0" : res.data.threeDimensionalConf,
+                    threeDimensionalPrograme: res.data.threeDimensionalPrograme==null? "": res.data.threeDimensionalPrograme,
+					threeDimensionalDeviationConf: res.data.threeDimensionalDeviationConf==null? "0" : res.data.threeDimensionalDeviationConf,
+	    			threeDimensionalDeviationPrograme: res.data.threeDimensionalDeviationPrograme==null? "":res.data.threeDimensionalDeviationPrograme,
+	    			// 工序抽检配置
+	    			randomCheckConf: res.data.randomCheckConf==null? "0" : res.data.randomCheckConf,
+	    			randomCheckPrograme: res.data.randomCheckPrograme==null? "" : res.data.randomCheckPrograme
+				};
+
+		    	// 获取【人工质检】数据
+		    	/*if(!!res.data.programTest){
+		    		this.$refs.quality.radio = res.data.programTest
+		    		// 方式
+		    		this.$refs.quality.programTestWay = res.data.programTestWay
+		    		this.$refs.quality.directCuttingFlag = res.data.directCuttingFlag
+		    		this.$refs.quality.programTestPrograme = res.data.programTestPrograme
+		    	}*/
+		    	// this.$refs.quality.tableData = this.setKeyList(res.data.procedureTestList)
+		    	// 获取【机械手臂】数据
+		    	/*this.$refs.robotarm.radio = res.data.armConf
+		    	if(res.data.armConf == '2'){
+		    		if(res.data.procedureRobotArm){
+		    			// this.$refs.robotarm.tenant = res.data.procedureRobotArm
+		    			this.$refs.robotarm.setTenant(res.data.procedureRobotArm)
+		    		}
+		    	}*/
+    		}
+    	})
+    },
+    // 赋值前处理-添加key数据健
+    setKeyList(list, flag){
+    	if(list && list.length > 0){
+    		let arr = []
+    		list.forEach(item => {
+    			// 添加唯一键
+	    		item.key = ''+ Math.random()
+	    		// 如果是托盘夹具的时候，组装分类
+	    		if(flag == 'tray'){
+	    			// 把【组序】和【优先级】改成字符串
+	    			//item.groupSort = ''+ item.groupSort
+	    			//item.groupPrority = ''+ item.groupPrority
+	    			// 给图片一个列表数据，jjImgList
+	    			item.jjImgList = []
+	    			if(!!item.armorPic){
+	    				item.jjImgList.push(item.armorPic)
+	    			}
+	    			// 添加类型
+	    			/*if(item.bizType == '1'){
+	    				item.category = {key: '03',data: '托盘'}
+	    			}else{
+	    				item.category = {key: '02',data: '夹具'}
+	    			}*/
+	    		}
+	    		arr.push(item)
+	    	})
+    		list = arr
+    	}else{
+    		list = []
+    	}
+    	return list
+    }
+  }
+}
+</script>
+<style lang="scss" scoped="">
+	.title{
+		position: relative;
+		padding-left: 20px;
+		padding-bottom: 5px;
+		border-bottom: 1px dotted #1890ff;
+	}
+	.title:before{
+		content: '';
+		position: absolute;
+		background: #1890ff;
+		width: 10px;
+		height: 70%;
+		left: 0;
+		top: 1px;
+	}
+	.prossFenxi{
+		margin-top: 15px;
+	}
+	.content{
+		margin-top: 10px;
+	}
+	.titleSmall{
+		position: relative;
+		padding-left: 10px;
+		margin-right: 15px;
+	}
+	.titleSmall:before{
+		content: '';
+		position: absolute;
+		background: #1890ff;
+		width: 5px;
+		height: 90%;
+		left: 0;
+		top: 1px;
+	}
+	.itemDiv{
+		margin: 10px 0;
+	}
+</style>

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

@@ -8,7 +8,7 @@
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("resource.searchForm.linkStatus")}}：</span>
-    		<el-select v-model="queryParams.model.linkStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
+    		<el-select v-model="queryParams.model.productionStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
         	<el-option
 			      v-for="item in audioStatus"
 			      :key="item.value"
@@ -539,7 +539,7 @@
 	          	//this.$refs.table.setCurrentRow(this.tableData.data[0]);  // 单选
 	          	//this.$refs.table.toggleRowSelection(this.tableData.data[0], true)  // 多选
 	          	// 加载【刀具列表】数据
-				console.log(this.tableData.data)  
+				console.log(this.tableData.data)
 	          	this.fetch2()
 	          }
 	        }

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

@@ -8,7 +8,7 @@
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("resource.searchForm.linkStatus")}}：</span>
-    		<el-select v-model="queryParams.model.status" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
+    		<el-select v-model="queryParams.model.productionStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
         	<el-option
 			      v-for="item in audioStatus"
 			      :key="item.value"
@@ -26,14 +26,14 @@
 	      </el-button>
       </span>
     </div>
-    
+
     <!-- 功能按钮 -->
     <el-row class="filter-container">
     	<el-col>
     		<el-button type="primary" icon="el-icon-connection" size="medium" @click="synchronousTool">{{$t("resource.buttons.tongbu")}}</el-button>
     	</el-col>
     </el-row>
-    
+
     <!-- 【设备】列表数据 -->
     <!-- 列表数据 -->
     <el-table
@@ -60,9 +60,9 @@
       <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 
+					  <el-image
 					    style="width: 100px; height: 60px"
-					    :src="row.pic" 
+					    :src="row.pic"
 					    :preview-src-list="row.srcList">
 					  </el-image>
 					</div>
@@ -287,7 +287,7 @@
       }
 	  },
 	  mounted () {
-	    
+
 	  },
 	  methods: {
 	  	// 【同步刀具】按钮-事件
@@ -304,7 +304,7 @@
 	  			resourceIdList.push(item.id)
 	  		})
 	  		equipmentToolsMgrApi.synchronousTool({resourceIdList}).then(res => {
-	  			res = res.data 
+	  			res = res.data
 	  			// console.log("同步刀具】: ", res)
 	  			if(res.isSuccess){
 	  				this.$message({
@@ -369,7 +369,7 @@
 	        })
 	        return
 	      }
-	
+
 	      this.$confirm(this.$t("lineSide.tips.wareTips"), this.$t("common.tips"), {
 	      	distinguishCancelAndClose: true,
 	        confirmButtonText: this.$t("common.confirm"),
@@ -441,7 +441,7 @@
 	        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
 	      // 固定参数（采集的生产资源）
@@ -470,7 +470,7 @@
 	        }
 	        // eslint-disable-next-line no-return-assign
 	      }).finally(() => this.loading = false)
-	     
+
 	    },
 	    cellClick (row, column) {
 	      if (column['columnKey'] === "operation") {
@@ -496,10 +496,10 @@
 	        this.queryParams2.map.createTime_st = this.queryParams2.timeRange[0]
 	        this.queryParams2.map.createTime_ed = this.queryParams2.timeRange[1]
 	      }
-	
+
 	      this.queryParams2.current = params.current ? params.current : this.queryParams2.current
 	      this.queryParams2.size = params.size ? params.size : this.queryParams2.size
-	      
+
 	      // 传【设备】id数组
 	      let resourceIdList = []
 	      if(this.selection && this.selection.length > 0){
@@ -515,7 +515,7 @@
 	        }
 	        // eslint-disable-next-line no-return-assign
 	      }).finally(() => this.loading2 = false)
-	     
+
 	    },
 	    cellClick2 (row, column) {
 	      if (column['columnKey'] === "operation") {
@@ -528,7 +528,7 @@
 	          this.$refs.table2.toggleRowSelection(row)
 	        }
 	      })
-	
+
 	      if (!flag) {
 	        this.$refs.table2.toggleRowSelection(row, true)
 	      }