更新
This commit is contained in:
		
							
								
								
									
										5
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -11053,6 +11053,11 @@
 | 
			
		||||
        "minimist": "^1.2.5"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "moment": {
 | 
			
		||||
      "version": "2.29.4",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
 | 
			
		||||
      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
 | 
			
		||||
    },
 | 
			
		||||
    "mousetrap": {
 | 
			
		||||
      "version": "1.6.5",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz",
 | 
			
		||||
 
 | 
			
		||||
@@ -22,6 +22,7 @@
 | 
			
		||||
    "element-ui": "^2.15.7",
 | 
			
		||||
    "js-cookie": "^2.2.1",
 | 
			
		||||
    "lodash": "^4.17.19",
 | 
			
		||||
    "moment": "^2.29.4",
 | 
			
		||||
    "qs": "^6.9.4",
 | 
			
		||||
    "quill": "^1.3.7",
 | 
			
		||||
    "sass": "^1.26.5",
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-08-22 14:57:50
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-06-20 16:49:12
 | 
			
		||||
 * @LastEditTime: 2023-06-27 15:48:06
 | 
			
		||||
 * @Description: 
 | 
			
		||||
-->
 | 
			
		||||
<!DOCTYPE html>
 | 
			
		||||
 
 | 
			
		||||
@@ -7,6 +7,7 @@
 | 
			
		||||
 * @Description:
 | 
			
		||||
 */
 | 
			
		||||
import i18n from "@/i18n";
 | 
			
		||||
import moment from 'moment'
 | 
			
		||||
 | 
			
		||||
const table = {
 | 
			
		||||
  status: {
 | 
			
		||||
@@ -33,6 +34,14 @@ const table = {
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function timeFormatter(timeObj) {
 | 
			
		||||
  if (timeObj) {
 | 
			
		||||
    return moment(timeObj).format('YYYY-MM-DD HH:mm:ss')
 | 
			
		||||
  } else {
 | 
			
		||||
    return '-'
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export default function(dictTable) {
 | 
			
		||||
  return function(val) {
 | 
			
		||||
    return table?.[dictTable]?.[val]
 | 
			
		||||
 
 | 
			
		||||
@@ -16,24 +16,33 @@ t.add = 'add'
 | 
			
		||||
t.delete = 'delete'
 | 
			
		||||
t.edit = 'edit'
 | 
			
		||||
t.detail = 'detail'
 | 
			
		||||
t.change = 'change status'
 | 
			
		||||
t.deleteBatch = 'deleteBatch'
 | 
			
		||||
t.update = 'update'
 | 
			
		||||
t.query = 'query'
 | 
			
		||||
t.register = 'register'
 | 
			
		||||
t.export = 'export'
 | 
			
		||||
t.handle = 'handle'
 | 
			
		||||
t.confirm = 'confirm'
 | 
			
		||||
t.cancel = 'cancel'
 | 
			
		||||
t.save = 'save'
 | 
			
		||||
t.clear = 'clear'
 | 
			
		||||
t.logout = 'logout'
 | 
			
		||||
t.manage = 'manage'
 | 
			
		||||
t.createDate = 'createDate'
 | 
			
		||||
t.keyword = 'keyword:'
 | 
			
		||||
t.choose = 'choose'
 | 
			
		||||
t.close = 'close'
 | 
			
		||||
t.submit = 'submit'
 | 
			
		||||
t.billing = 'billing'
 | 
			
		||||
 | 
			
		||||
t.index = 'index'
 | 
			
		||||
t.placeholder = {}
 | 
			
		||||
t.placeholder.name = 'Please enter name'
 | 
			
		||||
t.placeholder.code = 'Please enter code'
 | 
			
		||||
t.placeholder.sampleSize = 'Please enter sample size'
 | 
			
		||||
t.placeholder.first = "Please enter "
 | 
			
		||||
t.placeholder.second = "Please select "
 | 
			
		||||
t.placeholder.name = 'Please enter name '
 | 
			
		||||
t.placeholder.code = 'Please enter code '
 | 
			
		||||
t.placeholder.sampleSize = 'Please enter sample size '
 | 
			
		||||
 | 
			
		||||
t.prompt = {}
 | 
			
		||||
t.prompt.title = 'Tips'
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2023-02-28 14:21:52
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-02-28 14:24:19
 | 
			
		||||
 * @LastEditTime: 2023-06-27 09:56:26
 | 
			
		||||
 * @Description: 
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
@@ -10,18 +10,94 @@ export default {
 | 
			
		||||
    name: 'name',
 | 
			
		||||
    code: 'code',
 | 
			
		||||
    type: 'type',
 | 
			
		||||
    procedureType: 'procedure type',
 | 
			
		||||
    address: 'address',
 | 
			
		||||
    descs: 'description',
 | 
			
		||||
    status: 'status',
 | 
			
		||||
    site: 'site',
 | 
			
		||||
    machine: 'machine',
 | 
			
		||||
    machineList: 'machine list',
 | 
			
		||||
    bindMachine: 'bind machine',
 | 
			
		||||
    bindMachineList: 'bind machine list',
 | 
			
		||||
    specs: 'specs',
 | 
			
		||||
    drawing: 'drawing',
 | 
			
		||||
    productType: 'product type',
 | 
			
		||||
    inspectionStandard: 'standard',
 | 
			
		||||
    inspectionStage: 'stage',
 | 
			
		||||
    productName: 'product name',
 | 
			
		||||
    platformGroup: 'site grouping',
 | 
			
		||||
    measureType: 'measure type',
 | 
			
		||||
    sampleSize: 'sample size',
 | 
			
		||||
    createTime: 'create time',
 | 
			
		||||
    basicInfo: 'basic info',
 | 
			
		||||
    processFlow: 'process flow',
 | 
			
		||||
    productFeatures: 'product features',
 | 
			
		||||
    features: 'features',
 | 
			
		||||
    featuresInfo: 'features Info',
 | 
			
		||||
    controlFeatures: 'control features',
 | 
			
		||||
    back: 'back',
 | 
			
		||||
    next: 'next',
 | 
			
		||||
    featuresType: 'features type',
 | 
			
		||||
    defectLevel: 'defect level',
 | 
			
		||||
    measureTool: 'measure tool',
 | 
			
		||||
    analyzeGraphics: 'analyze graphics',
 | 
			
		||||
    sampleRate: 'sample rate',
 | 
			
		||||
    sampleQuantity: 'sample quantity',
 | 
			
		||||
    unit: 'unit',
 | 
			
		||||
    decimalPlaces: 'decimal places',
 | 
			
		||||
    controlMatrix: 'control matrix',
 | 
			
		||||
    propertyList: 'property list',
 | 
			
		||||
    proDesc: 'This product is not configured with product features or processes, and process control features cannot be assigned temporarily',
 | 
			
		||||
    history: 'history',
 | 
			
		||||
    twoTip: 'Select a process and add it to the table',
 | 
			
		||||
    processName: 'process name',
 | 
			
		||||
    processCode: 'process code',
 | 
			
		||||
    tableMode: 'table mode',
 | 
			
		||||
    graphicsMode: 'graphics mode',
 | 
			
		||||
    parentType: 'parent type',
 | 
			
		||||
    toolTip: 'difference parameter',
 | 
			
		||||
    unitType: 'unit type',
 | 
			
		||||
    meanControlChart: 'mean control chart',
 | 
			
		||||
    controlLimitFactor: 'control limit factor',
 | 
			
		||||
    centerlineFactor: 'centerline factor',
 | 
			
		||||
    standardDeviationControlChart: 'standard deviation control chart',
 | 
			
		||||
    rangeControlChart: 'range control chart',
 | 
			
		||||
    monitoringGraphOne: 'monitoring graph One',
 | 
			
		||||
    inspectionTime: 'inspection time',
 | 
			
		||||
    startTime: 'start time',
 | 
			
		||||
    endTime: 'end time',
 | 
			
		||||
    inspectionSite: 'inspection site',
 | 
			
		||||
    inspectionType: 'inspection type',
 | 
			
		||||
    product: 'product',
 | 
			
		||||
    procedure: 'procedure',
 | 
			
		||||
    batch: 'batch',
 | 
			
		||||
    inspectionNum: 'inspectionNum',
 | 
			
		||||
    orderNumber: 'order Num',
 | 
			
		||||
    grouping: 'grouping',
 | 
			
		||||
    Year: 'Year',
 | 
			
		||||
    Month: 'Month',
 | 
			
		||||
    Day: 'Day',
 | 
			
		||||
    rawData: 'raw data',
 | 
			
		||||
    configurationAnalysisPlan: 'analysis plan',
 | 
			
		||||
    noData: 'No Data',
 | 
			
		||||
    meanValue: 'mean value',
 | 
			
		||||
    rangeValue: 'range value',
 | 
			
		||||
    StdDeviation: 'Std. Deviation',
 | 
			
		||||
    singleValue: 'single value',
 | 
			
		||||
    movingRangeValue: 'moving range value',
 | 
			
		||||
    AddSampleGroup: 'Add sample group',
 | 
			
		||||
    recordQuantity: 'record quantity',
 | 
			
		||||
    MaxValue: 'Max',
 | 
			
		||||
    miniValue: 'Mini',
 | 
			
		||||
    meanValue: 'Mean',
 | 
			
		||||
    inspectionResults: 'inspection results',
 | 
			
		||||
    defectValue: 'defect value',
 | 
			
		||||
    inspectionInfo: 'inspection Info',
 | 
			
		||||
    billingTime: 'billing time',
 | 
			
		||||
    groupSample: 'group sample',
 | 
			
		||||
    poorValue: 'poor value',
 | 
			
		||||
    classes: 'classes',
 | 
			
		||||
    producer: 'producer',
 | 
			
		||||
    inspector: 'inspector',
 | 
			
		||||
    selectAnalysisPlan: 'select Analysis Plan',
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -13,22 +13,30 @@ t.add = '新增'
 | 
			
		||||
t.delete = '删除'
 | 
			
		||||
t.edit = '编辑'
 | 
			
		||||
t.detail = '详情'
 | 
			
		||||
t.change = '改变状态'
 | 
			
		||||
t.deleteBatch = '删除'
 | 
			
		||||
t.update = '修改'
 | 
			
		||||
t.query = '查询'
 | 
			
		||||
t.register = '登记'
 | 
			
		||||
t.export = '导出'
 | 
			
		||||
t.handle = '操作'
 | 
			
		||||
t.confirm = '确定'
 | 
			
		||||
t.cancel = '取消'
 | 
			
		||||
t.save = '保存'
 | 
			
		||||
t.clear = '清除'
 | 
			
		||||
t.logout = '退出'
 | 
			
		||||
t.manage = '处理'
 | 
			
		||||
t.createDate = '创建时间'
 | 
			
		||||
t.keyword = '关键字:'
 | 
			
		||||
t.choose = '请选择'
 | 
			
		||||
t.close = '关闭'
 | 
			
		||||
t.submit = '提交'
 | 
			
		||||
t.billing = '开单'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
t.index = '序号'
 | 
			
		||||
t.placeholder = {}
 | 
			
		||||
t.placeholder.first = "请输入"
 | 
			
		||||
t.placeholder.second = "请选择"
 | 
			
		||||
t.placeholder.name = '请输入名称'
 | 
			
		||||
t.placeholder.code = '请输入编码'
 | 
			
		||||
t.placeholder.sampleSize = '请输入样本大小'
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2023-02-28 14:21:52
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-06-21 13:56:25
 | 
			
		||||
 * @LastEditTime: 2023-06-27 10:17:20
 | 
			
		||||
 * @Description: 
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
@@ -10,18 +10,94 @@ export default {
 | 
			
		||||
    name: '名称',
 | 
			
		||||
    code: '编码',
 | 
			
		||||
    type: '类型',
 | 
			
		||||
    procedureType: '工序类型',
 | 
			
		||||
    address: '联系地址',
 | 
			
		||||
    descs: '描述',
 | 
			
		||||
    status: '状态',
 | 
			
		||||
    site: '站点',
 | 
			
		||||
    machine: '机台',
 | 
			
		||||
    machineList: '总机台列表',
 | 
			
		||||
    bindMachine: '绑定机台',
 | 
			
		||||
    bindMachineList: '绑定机台列表',
 | 
			
		||||
    specs: '规格',
 | 
			
		||||
    drawing: '图纸',
 | 
			
		||||
    productType: '产品类型',
 | 
			
		||||
    inspectionStandard: '检验标准',
 | 
			
		||||
    inspectionStage: '检验阶段',
 | 
			
		||||
    productName: '产品名称',
 | 
			
		||||
    platformGroup: '站点分组',
 | 
			
		||||
    measureType: '测量类型',
 | 
			
		||||
    sampleSize: '样本大小',
 | 
			
		||||
    createTime: '添加时间',
 | 
			
		||||
    basicInfo: '基础信息',
 | 
			
		||||
    processFlow: '工艺流程',
 | 
			
		||||
    productFeatures: '产品特性',
 | 
			
		||||
    features: '特性',
 | 
			
		||||
    featuresInfo: '特性信息',
 | 
			
		||||
    controlFeatures: '控制特性',
 | 
			
		||||
    back: '上一步',
 | 
			
		||||
    next: '下一步',
 | 
			
		||||
    featuresType: '特性类型',
 | 
			
		||||
    defectLevel: '缺陷等级',
 | 
			
		||||
    measureTool: '量具',
 | 
			
		||||
    analyzeGraphics: '分析图形',
 | 
			
		||||
    sampleRate: '抽样频率',
 | 
			
		||||
    sampleQuantity: '抽样频率',
 | 
			
		||||
    unit: '单位',
 | 
			
		||||
    decimalPlaces: '小数位数',
 | 
			
		||||
    controlMatrix: '控制矩阵',
 | 
			
		||||
    propertyList: '特性列表',
 | 
			
		||||
    proDesc: '该产品没有配置产品特性或工序,暂时不能分配过程控制特性',
 | 
			
		||||
    history: '历史记录',
 | 
			
		||||
    twoTip: '选择工序,新增到表格',
 | 
			
		||||
    processName: '工序名称',
 | 
			
		||||
    processCode: '工序编码',
 | 
			
		||||
    tableMode: '表格模式',
 | 
			
		||||
    graphicsMode: '图形模式',
 | 
			
		||||
    parentType: '父类型',
 | 
			
		||||
    toolTip: '台差参数',
 | 
			
		||||
    unitType: '单位分类',
 | 
			
		||||
    meanControlChart: '均值管制图',
 | 
			
		||||
    controlLimitFactor: '控制限系数',
 | 
			
		||||
    centerlineFactor: '中线系数',
 | 
			
		||||
    standardDeviationControlChart: '标准差管制图',
 | 
			
		||||
    rangeControlChart: '极差管制图',
 | 
			
		||||
    monitoringGraphOne: '监控图形一',
 | 
			
		||||
    inspectionTime: '检验时间',
 | 
			
		||||
    startTime: '开始日期',
 | 
			
		||||
    endTime: '结束日期',
 | 
			
		||||
    inspectionSite: '检验站点',
 | 
			
		||||
    inspectionType: '检验类型',
 | 
			
		||||
    product: '产品',
 | 
			
		||||
    procedure: '工序',
 | 
			
		||||
    batch: '批次号',
 | 
			
		||||
    inspectionNum: '检验单号',
 | 
			
		||||
    orderNumber: '订单号',
 | 
			
		||||
    grouping: '分组',
 | 
			
		||||
    Year: '年',
 | 
			
		||||
    Month: '月',
 | 
			
		||||
    Day: '日',
 | 
			
		||||
    rawData: '原始数据',
 | 
			
		||||
    configurationAnalysisPlan: '配置分析方案',
 | 
			
		||||
    noData: '无数据',
 | 
			
		||||
    meanValue: '均值数值',
 | 
			
		||||
    rangeValue: '极差数值',
 | 
			
		||||
    StdDeviation: '标准差数值',
 | 
			
		||||
    singleValue: '单值数值',
 | 
			
		||||
    movingRangeValue: '移动极差数值',
 | 
			
		||||
    AddSampleGroup: '添加样本组',
 | 
			
		||||
    recordQuantity: '记录数量',
 | 
			
		||||
    MaxValue: '最大值',
 | 
			
		||||
    miniValue: '最小值',
 | 
			
		||||
    meanValue: '均值',
 | 
			
		||||
    inspectionResults: '检验结果',
 | 
			
		||||
    defectValue: '缺陷数量',
 | 
			
		||||
    inspectionInfo: '检验信息',
 | 
			
		||||
    billingTime: '开单时间',
 | 
			
		||||
    groupSample: '分组样本数',
 | 
			
		||||
    poorValue: '不良数量',
 | 
			
		||||
    classes: '班次',
 | 
			
		||||
    producer: '生产人',
 | 
			
		||||
    inspector: '检验人',
 | 
			
		||||
    selectAnalysisPlan: '选择分析判读方案',
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-09-15 10:22:53
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-01-09 14:20:16
 | 
			
		||||
 * @LastEditTime: 2023-06-27 14:50:51
 | 
			
		||||
 * @Description: C图
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -34,7 +34,7 @@
 | 
			
		||||
      </el-col>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <el-row :gutter="6" v-else>
 | 
			
		||||
      <el-empty description="无数据"></el-empty>
 | 
			
		||||
      <el-empty :description="$t('module.basicData.noData')"></el-empty>
 | 
			
		||||
    </el-row>
 | 
			
		||||
  </el-card>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -34,7 +34,7 @@
 | 
			
		||||
      </el-col>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <el-row :gutter="6" v-else>
 | 
			
		||||
      <el-empty description="无数据"></el-empty>
 | 
			
		||||
      <el-empty :description="$t('module.basicData.noData')"></el-empty>
 | 
			
		||||
    </el-row>
 | 
			
		||||
  </el-card>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -34,7 +34,7 @@
 | 
			
		||||
      </el-col>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <el-row :gutter="6" v-else>
 | 
			
		||||
      <el-empty description="无数据"></el-empty>
 | 
			
		||||
      <el-empty :description="$t('module.basicData.noData')"></el-empty>
 | 
			
		||||
    </el-row>
 | 
			
		||||
  </el-card>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -34,7 +34,7 @@
 | 
			
		||||
      </el-col>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <el-row :gutter="6" v-else>
 | 
			
		||||
      <el-empty description="无数据"></el-empty>
 | 
			
		||||
      <el-empty :description="$t('module.basicData.noData')"></el-empty>
 | 
			
		||||
    </el-row>
 | 
			
		||||
  </el-card>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-09-15 10:23:42
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-01-09 14:26:17
 | 
			
		||||
 * @LastEditTime: 2023-06-27 14:57:36
 | 
			
		||||
 * @Description: 单值-移动极差 控制图
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -43,7 +43,7 @@
 | 
			
		||||
            {{ item.name }}<span style="float:right">{{ parseFloat(item.value).toFixed(4) }}</span>
 | 
			
		||||
          </div>
 | 
			
		||||
          <el-collapse>
 | 
			
		||||
            <el-collapse-item title="单值数值" name="0">
 | 
			
		||||
            <el-collapse-item :title="$t('module.basicData.singleValue')" name="0">
 | 
			
		||||
              <div
 | 
			
		||||
                v-for="(val, key, index) in this.dataList.xbarCL"
 | 
			
		||||
                :key="index + 'xbar'"
 | 
			
		||||
@@ -55,7 +55,7 @@
 | 
			
		||||
                }}</span>
 | 
			
		||||
              </div>
 | 
			
		||||
            </el-collapse-item>
 | 
			
		||||
            <el-collapse-item title="移动极差数值" name="1">
 | 
			
		||||
            <el-collapse-item :title="$t('module.basicData.movingRangeValue')" name="1">
 | 
			
		||||
              <div
 | 
			
		||||
                v-for="(val, key, index) in this.dataList.rcl"
 | 
			
		||||
                :key="index + 'rcl'"
 | 
			
		||||
@@ -75,7 +75,7 @@
 | 
			
		||||
      </el-col>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <el-row :gutter="6" v-else>
 | 
			
		||||
      <el-empty description="无数据"></el-empty>
 | 
			
		||||
      <el-empty :description="$t('module.basicData.noData')"></el-empty>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <!-- 原始数据 -->
 | 
			
		||||
    <raw-data
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-09-15 10:22:12
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-01-09 14:18:18
 | 
			
		||||
 * @LastEditTime: 2023-06-27 14:54:21
 | 
			
		||||
 * @Description: 均值极差控制图
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -43,7 +43,7 @@
 | 
			
		||||
            {{ item.name }}<span style="float:right">{{ parseFloat(item.value).toFixed(4) }}</span>
 | 
			
		||||
          </div>
 | 
			
		||||
          <el-collapse>
 | 
			
		||||
            <el-collapse-item title="均值数值" name="0">
 | 
			
		||||
            <el-collapse-item :title="$t('module.basicData.meanValue')" name="0">
 | 
			
		||||
              <div
 | 
			
		||||
                v-for="(val, key, index) in this.dataList.xbarCL"
 | 
			
		||||
                :key="index + 'xbar'"
 | 
			
		||||
@@ -55,7 +55,7 @@
 | 
			
		||||
                }}</span>
 | 
			
		||||
              </div>
 | 
			
		||||
            </el-collapse-item>
 | 
			
		||||
            <el-collapse-item title="极差数值" name="1">
 | 
			
		||||
            <el-collapse-item :title="$t('module.basicData.rangeValue')" name="1">
 | 
			
		||||
              <div
 | 
			
		||||
                v-for="(val, key, index) in this.dataList.rcl"
 | 
			
		||||
                :key="index + 'rcl'"
 | 
			
		||||
@@ -75,7 +75,7 @@
 | 
			
		||||
      </el-col>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <el-row :gutter="6" v-else>
 | 
			
		||||
      <el-empty description="无数据"></el-empty>
 | 
			
		||||
      <el-empty :description="$t('module.basicData.noData')"></el-empty>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <!-- 原始数据 -->
 | 
			
		||||
    <raw-data
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-09-15 10:22:53
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-01-09 14:21:51
 | 
			
		||||
 * @LastEditTime: 2023-06-27 14:56:12
 | 
			
		||||
 * @Description: 均值标准差控制图
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -43,7 +43,7 @@
 | 
			
		||||
            {{ item.name }}<span style="float:right">{{ parseFloat(item.value).toFixed(4) }}</span>
 | 
			
		||||
          </div>
 | 
			
		||||
          <el-collapse>
 | 
			
		||||
            <el-collapse-item title="均值数值" name="0">
 | 
			
		||||
            <el-collapse-item :title="$t('module.basicData.meanValue')" name="0">
 | 
			
		||||
              <div
 | 
			
		||||
                v-for="(val, key, index) in this.dataList.xbarCL"
 | 
			
		||||
                :key="index + 'xbar'"
 | 
			
		||||
@@ -55,7 +55,7 @@
 | 
			
		||||
                }}</span>
 | 
			
		||||
              </div>
 | 
			
		||||
            </el-collapse-item>
 | 
			
		||||
            <el-collapse-item title="标准差数值" name="1">
 | 
			
		||||
            <el-collapse-item :title="$t('module.basicData.StdDeviation')" name="1">
 | 
			
		||||
              <div
 | 
			
		||||
                v-for="(val, key, index) in this.dataList.scl"
 | 
			
		||||
                :key="index + 'scl'"
 | 
			
		||||
@@ -75,7 +75,7 @@
 | 
			
		||||
      </el-col>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <el-row :gutter="6" v-else>
 | 
			
		||||
      <el-empty description="无数据"></el-empty>
 | 
			
		||||
      <el-empty :description="$t('module.basicData.noData')"></el-empty>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <!-- 原始数据 -->
 | 
			
		||||
    <raw-data
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-06-21 13:31:02
 | 
			
		||||
 * @LastEditTime: 2023-06-27 15:03:21
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -10,10 +10,10 @@
 | 
			
		||||
    <div style="margin-left:20px">
 | 
			
		||||
      <el-button size="small" type="primary" @click="addSample()">
 | 
			
		||||
        <svg class="icon-svg"><use xlink:href="#icon-新建"></use></svg>
 | 
			
		||||
        添加样本组
 | 
			
		||||
        {{ $t('module.basicData.AddSampleGroup')}}
 | 
			
		||||
      </el-button>
 | 
			
		||||
      <el-button size="small" type="primary" @click="Submit()">
 | 
			
		||||
        提交
 | 
			
		||||
        {{ $t('submit')}}
 | 
			
		||||
      </el-button>
 | 
			
		||||
    </div>
 | 
			
		||||
    <el-table
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2022-12-28 09:45:02
 | 
			
		||||
 * @LastEditTime: 2023-06-27 15:09:36
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -17,11 +17,11 @@
 | 
			
		||||
    v-loading="dataListLoading"
 | 
			
		||||
    style="width: 100%;"
 | 
			
		||||
  >
 | 
			
		||||
    <el-table-column type="index" header-align="center" align="center" label="序号" width="50">
 | 
			
		||||
    <el-table-column type="index" header-align="center" align="center" :label='$t("index")' width="50">
 | 
			
		||||
    </el-table-column>
 | 
			
		||||
    <el-table-column prop="workingProcedureName" align="center" label="工序"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="name" align="center" label="特性"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="defectLevel" align="center" label="缺陷等级">
 | 
			
		||||
    <el-table-column prop="workingProcedureName" align="center" :label="$t('module.basicData.procedure')"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="name" align="center" :label="$t('module.basicData.features')"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="defectLevel" align="center" :label="$t('module.basicData.defectLevel')">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <span>{{
 | 
			
		||||
            { 1: '致命缺陷',2: '严重缺陷',3: '轻微缺陷' }[
 | 
			
		||||
@@ -29,7 +29,7 @@
 | 
			
		||||
            ]
 | 
			
		||||
          }}</span>
 | 
			
		||||
        </template> </el-table-column>
 | 
			
		||||
    <el-table-column prop="type" align="center" label="特性类型"> 
 | 
			
		||||
    <el-table-column prop="type" align="center" :label="$t('module.basicData.featuresType')"> 
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <span>{{
 | 
			
		||||
            { 1: "计量型", 2: "计数型"}[
 | 
			
		||||
@@ -37,16 +37,16 @@
 | 
			
		||||
            ]
 | 
			
		||||
          }}</span>
 | 
			
		||||
        </template></el-table-column>
 | 
			
		||||
    <el-table-column prop="measureToolName" align="center" label="量具"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="measureToolName" align="center" :label="$t('module.basicData.measureTool')"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="usl" align="center" label="USL"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="sl" align="center" label="SL"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="lsl" align="center" label="LSL"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black1" align="center" label="记录数量"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black2" align="center" label="最大值"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black3" align="center" label="最小值"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black4" align="center" label="均值"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black5" align="center" label="检验结果"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black6" align="center" label="缺陷数量"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black1" align="center" :label="$t('module.basicData.recordQuantity')"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black2" align="center" :label="$t('module.basicData.MaxValue')"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black3" align="center" :label="$t('module.basicData.miniValue')"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black4" align="center" :label="$t('module.basicData.meanValue')"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black5" align="center" :label="$t('module.basicData.inspectionResults')"> </el-table-column>
 | 
			
		||||
    <el-table-column prop="black6" align="center" :label="$t('module.basicData.defectValue')"> </el-table-column>
 | 
			
		||||
  </el-table>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -2,18 +2,18 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-20 10:57:44
 | 
			
		||||
 * @LastEditTime: 2023-06-27 16:05:14
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-drawer :visible.sync="visible" size="90%" class="drawerClass" :before-close="handleClose">
 | 
			
		||||
    <template slot="title">
 | 
			
		||||
      <h3 class="titleStyle">{{ !dataForm.id ? "登记" : "修改" }}</h3>
 | 
			
		||||
      <h3 class="titleStyle">{{ !dataForm.id ? $t('register') : $t('update') }}</h3>
 | 
			
		||||
    </template>
 | 
			
		||||
    <el-collapse value="1" @change="handleChange">
 | 
			
		||||
      <el-collapse-item name="1">
 | 
			
		||||
        <template slot="title">
 | 
			
		||||
          <h3 style="margin-left:20px">检验信息</h3>
 | 
			
		||||
          <h3 style="margin-left:20px">{{$t('module.basicData.inspectionInfo')}}</h3>
 | 
			
		||||
        </template>
 | 
			
		||||
        <el-row :gutter="6">
 | 
			
		||||
          <el-form
 | 
			
		||||
@@ -22,43 +22,50 @@
 | 
			
		||||
            ref="dataForm"
 | 
			
		||||
            :disabled="!dataForm.id ? false : true"
 | 
			
		||||
            @keyup.enter.native="dataFormSubmit()"
 | 
			
		||||
            label-width="100px"
 | 
			
		||||
            label-width="120px"
 | 
			
		||||
          >
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="检验站点" prop="inspectionSite">
 | 
			
		||||
                <el-input v-model="dataForm.inspectionSite" placeholder="检验站点"></el-input>
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.inspectionSite')" prop="">
 | 
			
		||||
                <el-input 
 | 
			
		||||
                v-model="dataForm.inspectionSite" 
 | 
			
		||||
                  :placeholder="$t('placeholder.first')+$t('module.basicData.inspectionSite')"
 | 
			
		||||
                ></el-input>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="开单时间" prop="createTime">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.billingTime')" prop="createTime">
 | 
			
		||||
                <el-date-picker
 | 
			
		||||
                  v-model="dataForm.createTime"
 | 
			
		||||
                  type="datetime"
 | 
			
		||||
                  readonly
 | 
			
		||||
                  format="yyyy-MM-dd hh:mm:ss"
 | 
			
		||||
                  value-format="yyyy-MM-dd hh:mm:ss"
 | 
			
		||||
                  placeholder="选择日期时间"
 | 
			
		||||
                  :placeholder="$t('placeholder.second')"
 | 
			
		||||
                  :style="{ width: '100%' }"
 | 
			
		||||
                >
 | 
			
		||||
                </el-date-picker>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="订单号" prop="orderNumber">
 | 
			
		||||
                <el-input v-model="dataForm.orderNumber" placeholder="订单号"></el-input>
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.orderNumber')" prop="orderNumber">
 | 
			
		||||
                <el-input v-model="dataForm.orderNumber" 
 | 
			
		||||
                  :placeholder="$t('placeholder.first')+$t('module.basicData.orderNumber')"
 | 
			
		||||
                ></el-input>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="批次号" prop="batchNumber">
 | 
			
		||||
                <el-input v-model="dataForm.batchNumber" placeholder="批次号"></el-input>
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.batch')" prop="batchNumber">
 | 
			
		||||
                <el-input v-model="dataForm.batchNumber" 
 | 
			
		||||
                  :placeholder="$t('placeholder.first')+$t('module.basicData.batch')"
 | 
			
		||||
                ></el-input>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="产品" prop="productId">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.product')" prop="productId">
 | 
			
		||||
                <el-select
 | 
			
		||||
                  v-model="dataForm.productId"
 | 
			
		||||
                  @change="getWorkingprocedureByProductId"
 | 
			
		||||
                  placeholder="请选择产品"
 | 
			
		||||
                  :placeholder="$t('placeholder.second')+$t('module.basicData.product')"
 | 
			
		||||
                  filterable
 | 
			
		||||
                  clearable
 | 
			
		||||
                  :style="{ width: '100%' }"
 | 
			
		||||
@@ -74,13 +81,13 @@
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="检验阶段" prop="inspectionStage">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.inspectionStage')" prop="inspectionStage">
 | 
			
		||||
                <el-select
 | 
			
		||||
                  v-model="dataForm.inspectionStage"
 | 
			
		||||
                  :style="{ width: '100%' }"
 | 
			
		||||
                  @change="$forceUpdate()"
 | 
			
		||||
                  clearable
 | 
			
		||||
                  placeholder="请选择检验阶段"
 | 
			
		||||
                  :placeholder="$t('placeholder.second')+$t('module.basicData.inspectionStage')"
 | 
			
		||||
                >
 | 
			
		||||
                  <el-option
 | 
			
		||||
                    v-for="item in inspectionStageArr"
 | 
			
		||||
@@ -93,11 +100,11 @@
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="工序" prop="workingProcedureId">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.procedure')" prop="workingProcedureId">
 | 
			
		||||
                <el-select
 | 
			
		||||
                  v-model="dataForm.workingProcedureId"
 | 
			
		||||
                  @change="$forceUpdate()"
 | 
			
		||||
                  placeholder="请选择工序"
 | 
			
		||||
                  :placeholder="$t('placeholder.second')+$t('module.basicData.procedure')"
 | 
			
		||||
                  filterable
 | 
			
		||||
                  clearable
 | 
			
		||||
                  :style="{ width: '100%' }"
 | 
			
		||||
@@ -113,10 +120,10 @@
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="机台号" prop="machineId">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.machine')" prop="machineId">
 | 
			
		||||
                <el-select
 | 
			
		||||
                  v-model="dataForm.machineId"
 | 
			
		||||
                  placeholder="请选择机台号"
 | 
			
		||||
                  :placeholder="$t('placeholder.second')+$t('module.basicData.machine')"
 | 
			
		||||
                  filterable
 | 
			
		||||
                  clearable
 | 
			
		||||
                  :style="{ width: '100%' }"
 | 
			
		||||
@@ -132,46 +139,46 @@
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="分组样本数" prop="numberOfGroupedSamples">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.groupSample')" prop="numberOfGroupedSamples">
 | 
			
		||||
                <el-input
 | 
			
		||||
                  v-model="dataForm.numberOfGroupedSamples"
 | 
			
		||||
                  placeholder="分组样本数"
 | 
			
		||||
                  :placeholder="$t('placeholder.first')+$t('module.basicData.groupSample')"
 | 
			
		||||
                  disabled
 | 
			
		||||
                ></el-input>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="样本大小" prop="numberOfSamples">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.sampleSize')" prop="numberOfSamples">
 | 
			
		||||
                <el-input
 | 
			
		||||
                  v-model="dataForm.numberOfSamples"
 | 
			
		||||
                  placeholder="样本大小"
 | 
			
		||||
                  :placeholder="$t('placeholder.first')+$t('module.basicData.sampleSize')"
 | 
			
		||||
                  disabled
 | 
			
		||||
                ></el-input>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="缺陷数量" prop="numberOfDefects">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.defectValue')" prop="numberOfDefects">
 | 
			
		||||
                <el-input
 | 
			
		||||
                  v-model="dataForm.numberOfDefects"
 | 
			
		||||
                  placeholder="缺陷数量"
 | 
			
		||||
                  :placeholder="$t('placeholder.first')+$t('module.basicData.defectValue')"
 | 
			
		||||
                  disabled
 | 
			
		||||
                ></el-input>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="不良数量" prop="defectiveQuantity">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.poorValue')" prop="defectiveQuantity">
 | 
			
		||||
                <el-input
 | 
			
		||||
                  v-model="dataForm.defectiveQuantity"
 | 
			
		||||
                  placeholder="不良数量"
 | 
			
		||||
                  :placeholder="$t('placeholder.first')+$t('module.basicData.poorValue')"
 | 
			
		||||
                  disabled
 | 
			
		||||
                ></el-input>
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="班次" prop="shiftId">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.classes')" prop="shiftId">
 | 
			
		||||
                <el-select
 | 
			
		||||
                  v-model="dataForm.shiftId"
 | 
			
		||||
                  placeholder="请选择班次"
 | 
			
		||||
                  :placeholder="$t('placeholder.second')+$t('module.basicData.classes')"
 | 
			
		||||
                  filterable
 | 
			
		||||
                  clearable
 | 
			
		||||
                  :style="{ width: '100%' }"
 | 
			
		||||
@@ -187,11 +194,11 @@
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="生产人" prop="producer">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.producer')" prop="producer">
 | 
			
		||||
                <el-select
 | 
			
		||||
                  :style="{ width: '100%' }"
 | 
			
		||||
                  v-model="dataForm.producer"
 | 
			
		||||
                  placeholder="请选择生产人"
 | 
			
		||||
                  :placeholder="$t('placeholder.second')+$t('module.basicData.producer')"
 | 
			
		||||
                >
 | 
			
		||||
                  <el-option
 | 
			
		||||
                    v-for="item in optionArr.arr3"
 | 
			
		||||
@@ -204,11 +211,11 @@
 | 
			
		||||
              </el-form-item>
 | 
			
		||||
            </el-col>
 | 
			
		||||
            <el-col :span="6">
 | 
			
		||||
              <el-form-item label="检验人" prop="inspector">
 | 
			
		||||
              <el-form-item :label="$t('module.basicData.inspector')" prop="inspector">
 | 
			
		||||
                <el-select
 | 
			
		||||
                  :style="{ width: '100%' }"
 | 
			
		||||
                  v-model="dataForm.inspector"
 | 
			
		||||
                  placeholder="请选择检验人"
 | 
			
		||||
                  :placeholder="$t('placeholder.second')+$t('module.basicData.inspector')"
 | 
			
		||||
                >
 | 
			
		||||
                  <el-option
 | 
			
		||||
                    v-for="item in optionArr.arr3"
 | 
			
		||||
@@ -224,14 +231,14 @@
 | 
			
		||||
        </el-row>
 | 
			
		||||
        <el-row v-if="!dataForm.id">
 | 
			
		||||
          <span style="margin-left:20px">
 | 
			
		||||
            <el-button size="medium" type="primary" @click="dataFormSubmit()">开单</el-button>
 | 
			
		||||
            <el-button size="medium" @click="visible = false">关闭</el-button>
 | 
			
		||||
            <el-button size="medium" type="primary" @click="dataFormSubmit()">{{ $t('billing')}}</el-button>
 | 
			
		||||
            <el-button size="medium" @click="visible = false">{{ $t('close')}}</el-button>
 | 
			
		||||
          </span>
 | 
			
		||||
        </el-row>
 | 
			
		||||
      </el-collapse-item>
 | 
			
		||||
      <el-collapse-item name="2" v-if="dataForm.id">
 | 
			
		||||
        <template slot="title">
 | 
			
		||||
          <h3 style="margin-left:20px">特性信息</h3>
 | 
			
		||||
          <h3 style="margin-left:20px">{{$t('module.basicData.featuresInfo')}}</h3>
 | 
			
		||||
        </template>
 | 
			
		||||
        <features-table
 | 
			
		||||
          v-if="featuresTableVisible"
 | 
			
		||||
@@ -242,7 +249,7 @@
 | 
			
		||||
      </el-collapse-item>
 | 
			
		||||
    </el-collapse>
 | 
			
		||||
    <div v-if="dataForm.id">
 | 
			
		||||
      <el-divider content-position="left"><h3 style="font-size:15px">详情</h3></el-divider>
 | 
			
		||||
      <el-divider content-position="left"><h3 style="font-size:15px">{{ $t('detail') }}</h3></el-divider>
 | 
			
		||||
      <detail-table
 | 
			
		||||
        v-loading="detailLoading"
 | 
			
		||||
        :inspectionSheetId="dataForm.id"
 | 
			
		||||
 
 | 
			
		||||
@@ -2,11 +2,11 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2022-12-16 09:28:44
 | 
			
		||||
 * @LastEditTime: 2023-06-27 15:28:09
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-dialog title="选择分析判读方案" :visible.sync="visible">
 | 
			
		||||
  <el-dialog :title="$t('module.basicData.selectAnalysisPlan')" :visible.sync="visible">
 | 
			
		||||
    <el-checkbox-group v-model="checkList">
 | 
			
		||||
      <el-checkbox
 | 
			
		||||
        style="width:100%;font-size:20px;margin:8px 5px"
 | 
			
		||||
@@ -29,8 +29,8 @@
 | 
			
		||||
      </el-checkbox>
 | 
			
		||||
    </el-checkbox-group>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="visible = false">取消</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 | 
			
		||||
      <el-button @click="visible = false">{{$t('cancel')}}</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">{{$t('confirm')}}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
  </el-dialog>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,11 +2,11 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-01-09 15:48:09
 | 
			
		||||
 * @LastEditTime: 2023-06-27 15:29:15
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-dialog title="原始数据" :visible.sync="visible">
 | 
			
		||||
  <el-dialog :title="$t('module.basicData.rawData')" :visible.sync="visible">
 | 
			
		||||
    <el-table
 | 
			
		||||
      :data="dataList"
 | 
			
		||||
      :stripe="true"
 | 
			
		||||
@@ -19,9 +19,9 @@
 | 
			
		||||
      v-loading="dataListLoading"
 | 
			
		||||
      style="width: 100%;"
 | 
			
		||||
    >
 | 
			
		||||
      <el-table-column type="index" header-align="center" align="center" label="序号" width="50">
 | 
			
		||||
      <el-table-column type="index" header-align="center" align="center" :label='$t("index")' width="50">
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="data" align="center" label="原始数据">
 | 
			
		||||
      <el-table-column prop="data" align="center" :label="$t('module.basicData.rawData')">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <span>{{ lineIndex === 2 ? scope.row.x : scope.row.data.toString() }}</span>
 | 
			
		||||
        </template>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,44 +2,44 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-09-15 10:44:29
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-06-21 16:27:24
 | 
			
		||||
 * @LastEditTime: 2023-06-27 16:07:58
 | 
			
		||||
 * @Description: 
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-card shadow="never" class="aui-card--fill">
 | 
			
		||||
    <el-row :gutter="6" style="background-color:#e6f7ff;padding-top:10px;margin-bottom:0">
 | 
			
		||||
      <el-form ref="dataForm" :model="dataForm" :rules="rules" size="small" label-width="80px">
 | 
			
		||||
      <el-form ref="dataForm" :model="dataForm" :rules="rules" size="small" label-width="120px">
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="检验时间" prop="time">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.inspectionTime')" prop="time">
 | 
			
		||||
            <el-date-picker
 | 
			
		||||
              type="daterange"
 | 
			
		||||
              v-model="time"
 | 
			
		||||
              format="yyyy-MM-dd"
 | 
			
		||||
              value-format="yyyy-MM-dd"
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
              start-placeholder="开始日期"
 | 
			
		||||
              end-placeholder="结束日期"
 | 
			
		||||
              :start-placeholder="$t('module.basicData.startTime')"
 | 
			
		||||
              :end-placeholder="$t('module.basicData.endTime')"
 | 
			
		||||
              range-separator="-"
 | 
			
		||||
              clearable
 | 
			
		||||
            ></el-date-picker>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="检验站点" prop="inspectionSite">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.inspectionSite')" prop="inspectionSite">
 | 
			
		||||
            <el-input
 | 
			
		||||
              size="small"
 | 
			
		||||
              v-model="dataForm.inspectionSite"
 | 
			
		||||
              clearable
 | 
			
		||||
              placeholder="请输入检验站点"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.inspectionSite')"
 | 
			
		||||
            />
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="产品" prop="productId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.product')" prop="productId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.productId"
 | 
			
		||||
              @change="getWorkingprocedureByProductId"
 | 
			
		||||
              placeholder="请选择产品"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.product')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
@@ -55,10 +55,10 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="工序" prop="workingProcedureId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.procedure')" prop="workingProcedureId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.workingProcedureId"
 | 
			
		||||
              placeholder="请选择工序"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.procedure')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              @change="$forceUpdate()"
 | 
			
		||||
@@ -75,10 +75,10 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="机台号" prop="machineId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.machine')" prop="machineId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.machineId"
 | 
			
		||||
              placeholder="请选择机台号"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.machine')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
@@ -94,27 +94,31 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="批次号" prop="batchNumber">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.batch')" prop="batchNumber">
 | 
			
		||||
            <el-input
 | 
			
		||||
              size="small"
 | 
			
		||||
              v-model="dataForm.batchNumber"
 | 
			
		||||
              clearable
 | 
			
		||||
              placeholder="请输入批次号"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.batch')"
 | 
			
		||||
            />
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="检验单号" prop="id">
 | 
			
		||||
            <el-input size="small" v-model="dataForm.id" clearable placeholder="请输入检验单号" />
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.inspectionNum')" prop="id">
 | 
			
		||||
            <el-input 
 | 
			
		||||
            size="small" 
 | 
			
		||||
            v-model="dataForm.id" 
 | 
			
		||||
            clearable 
 | 
			
		||||
            :placeholder="$t('placeholder.first')+$t('module.basicData.inspectionNum')" />
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="订单号" prop="orderNumber">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.orderNumber')" prop="orderNumber">
 | 
			
		||||
            <el-input
 | 
			
		||||
              size="small"
 | 
			
		||||
              v-model="dataForm.orderNumber"
 | 
			
		||||
              clearable
 | 
			
		||||
              placeholder="请输入订单号"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.orderNumber')"
 | 
			
		||||
            />
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
@@ -122,17 +126,17 @@
 | 
			
		||||
          <el-form-item style="float:right;padding-right:20px">
 | 
			
		||||
            <el-button size="small" @click="getDataList()">
 | 
			
		||||
              <svg class="icon-svg"><use xlink:href="#icon-sousuo"></use></svg>
 | 
			
		||||
              查询
 | 
			
		||||
              {{ $t('query')}}
 | 
			
		||||
            </el-button>
 | 
			
		||||
            <el-button size="small" type="primary" @click="addOrUpdateHandle()">
 | 
			
		||||
              <svg class="icon-svg"><use xlink:href="#icon-新建"></use></svg>
 | 
			
		||||
              登记
 | 
			
		||||
              {{ $t('register')}}
 | 
			
		||||
            </el-button>
 | 
			
		||||
            <el-button size="small" type="primary" @click="exportHandle('通用作业')">
 | 
			
		||||
              <svg class="icon-svg">
 | 
			
		||||
                <use xlink:href="#导出"></use>
 | 
			
		||||
              </svg>
 | 
			
		||||
              导出
 | 
			
		||||
              {{ $t('export')}}
 | 
			
		||||
            </el-button>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
@@ -172,25 +176,26 @@
 | 
			
		||||
import basicPage from "@/mixins/basic-page";
 | 
			
		||||
import AddOrUpdate from './components/generalOperation-add'
 | 
			
		||||
import basicFilter from "@/filters/basic-filter";
 | 
			
		||||
import { timeFormatter } from "@/filters/basic-filter"
 | 
			
		||||
import i18n from "@/i18n";
 | 
			
		||||
 | 
			
		||||
const tableProps = [
 | 
			
		||||
  {
 | 
			
		||||
    prop: "id",
 | 
			
		||||
    label: "检验单号",
 | 
			
		||||
    label: i18n.t("module.basicData.inspectionNum"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "batchNumber",
 | 
			
		||||
    label: "批次号",
 | 
			
		||||
    label: i18n.t("module.basicData.batch"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "inspectionStage",
 | 
			
		||||
    label: "检验阶段",
 | 
			
		||||
    label: i18n.t("module.basicData.inspectionStage"),
 | 
			
		||||
    filter: basicFilter("inspectionStage"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "productName",
 | 
			
		||||
    label: "产品名称",
 | 
			
		||||
    label: i18n.t("module.basicData.productName"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "machineName",
 | 
			
		||||
@@ -198,27 +203,28 @@ const tableProps = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "workingProcedureName",
 | 
			
		||||
    label: "工序",
 | 
			
		||||
    label: i18n.t("module.basicData.procedure"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "createTime",
 | 
			
		||||
    label: "检验时间",
 | 
			
		||||
    label: i18n.t("module.basicData.inspectionTime"),
 | 
			
		||||
    filter: timeFormatter,
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "shiftName",
 | 
			
		||||
    label: "班次",
 | 
			
		||||
    label: i18n.t("module.basicData.classes"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "numberOfSamples",
 | 
			
		||||
    label: "抽样数量",
 | 
			
		||||
    label: i18n.t("module.basicData.sampleQuantity"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "numberOfDefects",
 | 
			
		||||
    label: "缺陷数量",
 | 
			
		||||
    label: i18n.t("module.basicData.defectValue"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "defectiveQuantity",
 | 
			
		||||
    label: "不良数量",
 | 
			
		||||
    label: i18n.t("module.basicData.poorValue"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: "remark",
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-09-15 10:44:29
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-01-09 14:10:26
 | 
			
		||||
 * @LastEditTime: 2023-06-27 16:03:40
 | 
			
		||||
 * @Description: 
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -11,16 +11,16 @@
 | 
			
		||||
      :gutter="6"
 | 
			
		||||
      style="background-color:#e6f7ff;margin:-20px;padding-top:10px;margin-bottom:0"
 | 
			
		||||
    >
 | 
			
		||||
      <el-form ref="dataForm" :model="dataForm" :rules="rules" size="small" label-width="80px">
 | 
			
		||||
      <el-form ref="dataForm" :model="dataForm" :rules="rules" size="small" label-width="120px">
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="检验时间" prop="time">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.inspectionTime')" prop="time">
 | 
			
		||||
            <el-date-picker
 | 
			
		||||
              type="daterange"
 | 
			
		||||
              v-model="dataForm.time"
 | 
			
		||||
              format="yyyy-MM-dd"
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
              start-placeholder="开始日期"
 | 
			
		||||
              end-placeholder="结束日期"
 | 
			
		||||
              :start-placeholder="$t('module.basicData.startTime')"
 | 
			
		||||
              :end-placeholder="$t('module.basicData.endTime')"
 | 
			
		||||
              range-separator="-"
 | 
			
		||||
              clearable
 | 
			
		||||
            ></el-date-picker>
 | 
			
		||||
@@ -46,10 +46,10 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="产品" prop="productId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.product')" prop="productId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.productId"
 | 
			
		||||
              placeholder="请选择产品"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.product')"
 | 
			
		||||
              @change="getWorkingprocedureByProductId"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
@@ -66,11 +66,11 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="检验类型" prop="inspectionStage">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.inspectionType')" prop="inspectionStage">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.inspectionStage"
 | 
			
		||||
              @change="getFeaturesList()"
 | 
			
		||||
              placeholder="请选择检验类型"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.inspectionType')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
@@ -85,11 +85,11 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="工序" prop="workingProcedureId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.procedure')" prop="workingProcedureId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.workingProcedureId"
 | 
			
		||||
              @change="$forceUpdate(), getFeaturesList()"
 | 
			
		||||
              placeholder="请选择工序"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.procedure')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
@@ -105,10 +105,10 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6">
 | 
			
		||||
          <el-form-item label="特性" prop="productFeaturesId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.features')" prop="productFeaturesId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="dataForm.productFeaturesId"
 | 
			
		||||
              placeholder="请选择特性"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.features')"
 | 
			
		||||
              filterable
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
@@ -124,20 +124,20 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6" v-if="!groupTypeShow">
 | 
			
		||||
          <el-form-item label="样本大小" prop="sampleSize">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.sampleSize')" prop="sampleSize">
 | 
			
		||||
            <el-input-number
 | 
			
		||||
              v-model="dataForm.sampleSize"
 | 
			
		||||
              placeholder="样本大小"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.sampleSize')"
 | 
			
		||||
              :step="1"
 | 
			
		||||
            ></el-input-number>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="6" v-if="groupTypeShow">
 | 
			
		||||
          <el-form-item label="分组" prop="groupType">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.grouping')" prop="groupType">
 | 
			
		||||
            <el-radio-group v-model="dataForm.groupType">
 | 
			
		||||
              <el-radio :label="1">年</el-radio>
 | 
			
		||||
              <el-radio :label="2">月</el-radio>
 | 
			
		||||
              <el-radio :label="3">日</el-radio>
 | 
			
		||||
              <el-radio :label="1">{{ $t('Year') }}</el-radio>
 | 
			
		||||
              <el-radio :label="2">{{ $t('Month') }}</el-radio>
 | 
			
		||||
              <el-radio :label="3">{{ $t('Day') }}</el-radio>
 | 
			
		||||
            </el-radio-group>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
@@ -145,21 +145,21 @@
 | 
			
		||||
          <el-form-item>
 | 
			
		||||
            <el-button size="small" @click="getDataList()">
 | 
			
		||||
              <svg class="icon-svg"><use xlink:href="#icon-sousuo"></use></svg>
 | 
			
		||||
              查询
 | 
			
		||||
              {{ $t('query')}}
 | 
			
		||||
            </el-button>
 | 
			
		||||
            <el-button v-if="showRaw" size="small" type="primary" @click="rawData()">
 | 
			
		||||
              <svg class="icon-svg"><use xlink:href="#历史记录"></use></svg>
 | 
			
		||||
              原始数据
 | 
			
		||||
              {{ $t('rawData')}}
 | 
			
		||||
            </el-button>
 | 
			
		||||
            <el-button size="small" type="primary" @click="exportHandle()">
 | 
			
		||||
              <svg class="icon-svg">
 | 
			
		||||
                <use xlink:href="#导出"></use>
 | 
			
		||||
              </svg>
 | 
			
		||||
              导出
 | 
			
		||||
              {{ $t('export')}}
 | 
			
		||||
            </el-button>
 | 
			
		||||
            <el-button v-if="!groupTypeShow" size="small" type="primary" @click="showScheme()">
 | 
			
		||||
              <svg class="icon-svg"><use xlink:href="#方案管理"></use></svg>
 | 
			
		||||
              配置分析方案
 | 
			
		||||
              {{ $t('configurationAnalysisPlan')}}
 | 
			
		||||
            </el-button>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-06-21 16:26:26
 | 
			
		||||
 * @LastEditTime: 2023-06-27 13:46:29
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -22,24 +22,24 @@
 | 
			
		||||
        :rules="dataRule"
 | 
			
		||||
        ref="dataForm"
 | 
			
		||||
        @keyup.enter.native="dataFormSubmit()"
 | 
			
		||||
        label-width="80px"
 | 
			
		||||
        label-width="120px"
 | 
			
		||||
      >
 | 
			
		||||
        <el-col :span="12">
 | 
			
		||||
          <el-form-item label="编码" prop="code">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
            <el-input
 | 
			
		||||
              v-model="dataForm.code"
 | 
			
		||||
              oninput="value=value.replace(/[^\d]/g,'')"
 | 
			
		||||
              placeholder="编码"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.code')"
 | 
			
		||||
            ></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="12">
 | 
			
		||||
          <el-form-item label="名称" prop="name">
 | 
			
		||||
            <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
            <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="24">
 | 
			
		||||
          <el-divider content-position="left">监控图形一</el-divider>
 | 
			
		||||
          <el-divider content-position="left">{{ $t('module.basicData.monitoringGraphOne') }}</el-divider>
 | 
			
		||||
          <el-checkbox-group v-model="checkList">
 | 
			
		||||
            <el-checkbox
 | 
			
		||||
              style="width:100%;font-size:20px;margin:8px 5px"
 | 
			
		||||
@@ -67,8 +67,8 @@
 | 
			
		||||
      </el-form>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="visible = false">取消</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 | 
			
		||||
      <el-button @click="visible = false">{{$t('cancel')}}</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">{{$t('confirm')}}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
  </el-dialog>
 | 
			
		||||
  </div>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-12-01 14:52:41
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-06-21 16:32:15
 | 
			
		||||
 * @LastEditTime: 2023-06-27 13:44:40
 | 
			
		||||
 * @Description: 
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -13,7 +13,7 @@
 | 
			
		||||
      @keyup.enter.native="getDataList()"
 | 
			
		||||
    >
 | 
			
		||||
    <span class="blue-block"></span>
 | 
			
		||||
      <el-form-item :label="$t('sampleSize')">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.sampleSize')">
 | 
			
		||||
        <el-input size="small" type="number" v-model="dataForm.name" :placeholder="$t('placeholder.sampleSize')" clearable />
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item>
 | 
			
		||||
@@ -32,28 +32,28 @@
 | 
			
		||||
      v-loading="dataListLoading"
 | 
			
		||||
      style="width: 100%;"
 | 
			
		||||
    >
 | 
			
		||||
      <el-table-column align="center" prop="name" label="样本大小" fixed="left"> </el-table-column>
 | 
			
		||||
      <el-table-column align="center" label="均值管制图">
 | 
			
		||||
        <el-table-column align="center" label="控制限系数">
 | 
			
		||||
      <el-table-column align="center" prop="name" :label="$t('module.basicData.sampleSize')" fixed="left"> </el-table-column>
 | 
			
		||||
      <el-table-column align="center" :label="$t('module.basicData.meanControlChart')">
 | 
			
		||||
        <el-table-column align="center" :label="$t('module.basicData.controlLimitFactor')">
 | 
			
		||||
          <el-table-column align="center" prop="A" label="A"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="A1" label="A1"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="A2" label="A2"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="A3" label="A3"> </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column align="center" label="中线系数">
 | 
			
		||||
        <el-table-column align="center" label="控制限系数">
 | 
			
		||||
      <el-table-column align="center" :label="$t('module.basicData.centerlineFactor')">
 | 
			
		||||
        <el-table-column align="center" :label="$t('module.basicData.controlLimitFactor')">
 | 
			
		||||
          <el-table-column align="center" prop="m3" label="m3"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="m3A2" label="m3A2"> </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column align="center" label="标准差管制图">
 | 
			
		||||
        <el-table-column align="center" label="中线系数">
 | 
			
		||||
      <el-table-column align="center" :label="$t('module.basicData.standardDeviationControlChart')">
 | 
			
		||||
        <el-table-column align="center" :label="$t('module.basicData.centerlineFactor')">
 | 
			
		||||
          <el-table-column align="center" prop="C2" label="C2"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="C4" label="C4"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="1/C4" label="1/C4"> </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
        <el-table-column align="center" label="控制限系数">
 | 
			
		||||
        <el-table-column align="center" :label="$t('module.basicData.controlLimitFactor')">
 | 
			
		||||
          <el-table-column align="center" prop="B1" label="B1"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="B2" label="B2"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="B3" label="B3"> </el-table-column>
 | 
			
		||||
@@ -62,13 +62,13 @@
 | 
			
		||||
          <el-table-column align="center" prop="B6" label="B6"> </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column align="center" label="极差管制图">
 | 
			
		||||
        <el-table-column align="center" label="中线系数">
 | 
			
		||||
      <el-table-column align="center" :label="$t('module.basicData.rangeControlChart')">
 | 
			
		||||
        <el-table-column align="center" :label="$t('module.basicData.centerlineFactor')">
 | 
			
		||||
          <el-table-column align="center" prop="d2" label="d2"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="1/d2" label="1/d2"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="d3" label="d3"> </el-table-column>
 | 
			
		||||
        </el-table-column>
 | 
			
		||||
        <el-table-column align="center" label="控制限系数">
 | 
			
		||||
        <el-table-column align="center" :label="$t('module.basicData.controlLimitFactor')">
 | 
			
		||||
          <el-table-column align="center" prop="D1" label="D1"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="D2" label="D2"> </el-table-column>
 | 
			
		||||
          <el-table-column align="center" prop="D3" label="D3"> </el-table-column>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 14:14:37
 | 
			
		||||
 * @LastEditTime: 2023-06-27 15:59:30
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -11,24 +11,24 @@
 | 
			
		||||
      :rules="dataRule"
 | 
			
		||||
      ref="dataForm"
 | 
			
		||||
      @keyup.enter.native="dataFormSubmit()"
 | 
			
		||||
      label-width="80px"
 | 
			
		||||
      label-width="120px"
 | 
			
		||||
    >
 | 
			
		||||
      <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="描述" prop="descs">
 | 
			
		||||
        <el-input v-model="dataForm.descs" placeholder="描述"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.descs')" prop="descs">
 | 
			
		||||
        <el-input v-model="dataForm.descs" :placeholder="$t('placeholder.first')+$t('module.basicData.descs')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="联系地址" prop="address">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.address')" prop="address">
 | 
			
		||||
        <el-input
 | 
			
		||||
          v-model="dataForm.address"
 | 
			
		||||
          placeholder="联系地址"
 | 
			
		||||
          :placeholder="$t('placeholder.first')+$t('module.basicData.address')"
 | 
			
		||||
        ></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="类型" prop="type">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.type')" prop="type">
 | 
			
		||||
        <el-radio-group v-model="dataForm.type">
 | 
			
		||||
          <el-radio label="1">内部工厂</el-radio>
 | 
			
		||||
          <el-radio label="2">供应商</el-radio>
 | 
			
		||||
 
 | 
			
		||||
@@ -6,18 +6,18 @@
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
 | 
			
		||||
      <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="站点" prop="platformId">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.site')" prop="platformId">
 | 
			
		||||
        <el-select
 | 
			
		||||
          v-model="dataForm.platformId"
 | 
			
		||||
          filterable
 | 
			
		||||
          placeholder="请选择站点"
 | 
			
		||||
          :placeholder="$t('placeholder.first')+$t('module.basicData.site')"
 | 
			
		||||
        >
 | 
			
		||||
          <el-option
 | 
			
		||||
            v-for="item in urlOptions.optionArr.arr0"
 | 
			
		||||
@@ -28,8 +28,8 @@
 | 
			
		||||
          </el-option>
 | 
			
		||||
        </el-select>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="描述" prop="remark">
 | 
			
		||||
        <el-input v-model="dataForm.remark" placeholder="描述"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.descs')" prop="remark">
 | 
			
		||||
        <el-input v-model="dataForm.remark" :placeholder="$t('placeholder.first')+$t('module.basicData.descs')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
    </el-form>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -11,16 +11,16 @@
 | 
			
		||||
    :rules="dataRule"
 | 
			
		||||
    ref="dataForm"
 | 
			
		||||
    @keyup.enter.native="dataFormSubmit()"
 | 
			
		||||
    label-width="80px"
 | 
			
		||||
    label-width="120px"
 | 
			
		||||
  >
 | 
			
		||||
    <el-form-item label="编码" prop="code">
 | 
			
		||||
      <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
    <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
      <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
    </el-form-item>
 | 
			
		||||
    <el-form-item label="名称" prop="name">
 | 
			
		||||
      <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
    <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
      <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
    </el-form-item>
 | 
			
		||||
    <el-form-item label="工序类型" prop="workingProcedureTypeId">
 | 
			
		||||
      <el-select v-model="dataForm.workingProcedureTypeId" filterable placeholder="请选择工序类型">
 | 
			
		||||
    <el-form-item :label="$t('module.basicData.procedureType')" prop="workingProcedureTypeId">
 | 
			
		||||
      <el-select v-model="dataForm.workingProcedureTypeId" filterable :placeholder="$t('placeholder.first')+$t('module.basicData.procedureType')">
 | 
			
		||||
        <el-option
 | 
			
		||||
          v-for="item in urlOptions.optionArr.arr0"
 | 
			
		||||
          :key="item.id"
 | 
			
		||||
 
 | 
			
		||||
@@ -2,14 +2,14 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-01-03 11:35:26
 | 
			
		||||
 * @LastEditTime: 2023-06-27 15:57:01
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-dialog title="绑定机台" :visible.sync="visible">
 | 
			
		||||
  <el-dialog :title="$t('module.basicData.bindMachine')" :visible.sync="visible">
 | 
			
		||||
    <el-transfer
 | 
			
		||||
      v-model="machineArr"
 | 
			
		||||
      :titles="['总机台列表', '绑定机台列表']"
 | 
			
		||||
      :titles="[$t('module.basicData.machineList'), $t('module.basicData.bindMachineList')]"
 | 
			
		||||
      :props="{
 | 
			
		||||
        key: 'id',
 | 
			
		||||
        label: 'name',
 | 
			
		||||
@@ -17,8 +17,8 @@
 | 
			
		||||
      :data="platArr"
 | 
			
		||||
    ></el-transfer>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="visible = false">取消</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">保存</el-button>
 | 
			
		||||
      <el-button @click="visible = false">{{$t('cancel')}}</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">{{$t('save')}}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
  </el-dialog>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -55,7 +55,7 @@
 | 
			
		||||
          <i class="el-icon-close" @click="closeEditForm"></i>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div v-if="editTitle === '编辑节点'" class="form-main">
 | 
			
		||||
          <el-form ref="nodeForm" :model="form" label-width="80px" size="mini">
 | 
			
		||||
          <el-form ref="nodeForm" :model="form" label-width="120px" size="mini">
 | 
			
		||||
            <el-form-item label="节点文本">
 | 
			
		||||
              <el-input
 | 
			
		||||
                v-model="form.labelText"
 | 
			
		||||
@@ -106,7 +106,7 @@
 | 
			
		||||
          </el-form>
 | 
			
		||||
        </div>
 | 
			
		||||
        <!-- <div v-if="editTitle === '编辑连线'" class="form-main">
 | 
			
		||||
          <el-form ref="edgeForm" :model="form" label-width="80px" size="mini">
 | 
			
		||||
          <el-form ref="edgeForm" :model="form" label-width="120px" size="mini">
 | 
			
		||||
            <el-form-item label="标签内容">
 | 
			
		||||
              <el-input
 | 
			
		||||
                v-model="form.label"
 | 
			
		||||
 
 | 
			
		||||
@@ -6,12 +6,12 @@
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
 | 
			
		||||
      <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
    </el-form>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 15:25:32
 | 
			
		||||
 * @LastEditTime: 2023-06-26 15:07:04
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -14,16 +14,16 @@
 | 
			
		||||
  >
 | 
			
		||||
      <template #title>
 | 
			
		||||
        <slot name="title">
 | 
			
		||||
          <div class="titleStyle">{{ !productId ? '新增' : '修改' }}</div>
 | 
			
		||||
          <div class="titleStyle">{{ !productId ? $t('add') : $t('update') }}</div>
 | 
			
		||||
        </slot>
 | 
			
		||||
      </template>
 | 
			
		||||
    <el-card class="box-card">
 | 
			
		||||
      <div slot="header" class="clearfix">
 | 
			
		||||
        <el-steps :active="active" align-center finish-status="success" process-status="finish">
 | 
			
		||||
          <el-step title="基础信息"></el-step>
 | 
			
		||||
          <el-step title="工艺流程"></el-step>
 | 
			
		||||
          <el-step title="产品特性"></el-step>
 | 
			
		||||
          <el-step title="控制特性"></el-step>
 | 
			
		||||
          <el-step :title="$t('module.basicData.basicInfo')"></el-step>
 | 
			
		||||
          <el-step :title="$t('module.basicData.processFlow')"></el-step>
 | 
			
		||||
          <el-step :title="$t('module.basicData.productFeatures')"></el-step>
 | 
			
		||||
          <el-step :title="$t('module.basicData.controlFeatures')"></el-step>
 | 
			
		||||
        </el-steps>
 | 
			
		||||
      </div>
 | 
			
		||||
      <div>
 | 
			
		||||
@@ -57,10 +57,10 @@
 | 
			
		||||
      </div>
 | 
			
		||||
    </el-card>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="cancle">取消</el-button>
 | 
			
		||||
      <el-button @click="preStep" v-show="active > 0" :disabled="submitBtn">上一步</el-button>
 | 
			
		||||
      <el-button @click="cancle">{{$t('cancel')}}</el-button>
 | 
			
		||||
      <el-button @click="preStep" v-show="active > 0" :disabled="submitBtn">{{$t('back')}}</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()" :loading="submitBtn">{{
 | 
			
		||||
        active >= 3 ? "确定" : "下一步"
 | 
			
		||||
        active >= 3 ? $t('confirm') : $t('next')
 | 
			
		||||
      }}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
  </el-dialog>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 15:45:39
 | 
			
		||||
 * @LastEditTime: 2023-06-26 17:00:17
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -14,7 +14,7 @@
 | 
			
		||||
  >
 | 
			
		||||
      <template #title>
 | 
			
		||||
        <slot name="title">
 | 
			
		||||
          <div class="titleStyle">{{ !fourDataForm.id ? '新增' : '修改' }}</div>
 | 
			
		||||
          <div class="titleStyle">{{ !fourDataForm.id ? $t('add') : $t('update') }}</div>
 | 
			
		||||
        </slot>
 | 
			
		||||
      </template>
 | 
			
		||||
    <el-row :gutter="10">
 | 
			
		||||
@@ -23,25 +23,25 @@
 | 
			
		||||
        :rules="dataRule"
 | 
			
		||||
        ref="fourDataForm"
 | 
			
		||||
        @keyup.enter.native="dataFormSubmit()"
 | 
			
		||||
        label-width="80px"
 | 
			
		||||
        label-width="120px"
 | 
			
		||||
      >
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="编码" prop="code">
 | 
			
		||||
            <el-input v-model="fourDataForm.code" placeholder="编码" readonly></el-input>
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
            <el-input v-model="fourDataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')" readonly></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="名称" prop="name">
 | 
			
		||||
            <el-input v-model="fourDataForm.name" placeholder="名称" readonly></el-input>
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
            <el-input v-model="fourDataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')" readonly></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="特性类型" prop="type">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.featuresType')" prop="type">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="fourDataForm.type"
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
              readonly
 | 
			
		||||
              placeholder="请选择特性类型"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.featuresType')"
 | 
			
		||||
            >
 | 
			
		||||
              <el-option
 | 
			
		||||
                v-for="item in typeArr"
 | 
			
		||||
@@ -54,12 +54,12 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="缺陷等级" prop="defectLevel">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.defectLevel')" prop="defectLevel">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="fourDataForm.defectLevel"
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
              filterable
 | 
			
		||||
              placeholder="请选择缺陷等级"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.defectLevel')"
 | 
			
		||||
            >
 | 
			
		||||
              <el-option
 | 
			
		||||
                v-for="item in defectLevelArr"
 | 
			
		||||
@@ -72,10 +72,10 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="量具" prop="measureToolId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.measureTool')" prop="measureToolId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="fourDataForm.measureToolId"
 | 
			
		||||
              placeholder="请选择单位"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.measureTool')"
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
            >
 | 
			
		||||
@@ -94,7 +94,7 @@
 | 
			
		||||
              v-model="fourDataForm.isSpc"
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
              readonly
 | 
			
		||||
              placeholder="请选择是否SPC"
 | 
			
		||||
              placeholder="SPC"
 | 
			
		||||
            >
 | 
			
		||||
              <el-option
 | 
			
		||||
                v-for="item in SPCArr"
 | 
			
		||||
@@ -107,11 +107,11 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="分析图形" prop="controlGraphId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.analyzeGraphics')" prop="controlGraphId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              :disabled="fourDataForm.type === 2"
 | 
			
		||||
              v-model="fourDataForm.controlGraphId"
 | 
			
		||||
              placeholder="请选择分析图形"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.analyzeGraphics')"
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
            >
 | 
			
		||||
@@ -125,24 +125,24 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="样本大小" prop="sampleSize">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.sampleSize')" prop="sampleSize">
 | 
			
		||||
            <el-input-number
 | 
			
		||||
              :disabled="fourDataForm.type === 2"
 | 
			
		||||
              v-model="fourDataForm.sampleSize"
 | 
			
		||||
              placeholder="样本大小"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.sampleSize')"
 | 
			
		||||
            ></el-input-number>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="抽样频率" prop="samplingFrequency">
 | 
			
		||||
            <el-input v-model="fourDataForm.samplingFrequency" placeholder="抽样频率"></el-input>
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.sampleRate')" prop="samplingFrequency">
 | 
			
		||||
            <el-input v-model="fourDataForm.samplingFrequency" :placeholder="$t('placeholder.first')+$t('module.basicData.sampleRate')"></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="单位" prop="unitId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.unit')" prop="unitId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="fourDataForm.unitId"
 | 
			
		||||
              placeholder="请选择单位"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.measureTool')"
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
            >
 | 
			
		||||
@@ -156,17 +156,17 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="小数位数" prop="decimalPlaces">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.decimalPlaces')" prop="decimalPlaces">
 | 
			
		||||
            <el-input-number
 | 
			
		||||
              :disabled="fourDataForm.type === 2"
 | 
			
		||||
              v-model="fourDataForm.decimalPlaces"
 | 
			
		||||
              placeholder="小数位数"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.decimalPlaces')"
 | 
			
		||||
            ></el-input-number>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="规格" prop="specifications">
 | 
			
		||||
            <el-input v-model="fourDataForm.specifications" placeholder="规格"></el-input>
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.specs')" prop="specifications">
 | 
			
		||||
            <el-input v-model="fourDataForm.specifications" :placeholder="$t('placeholder.first')+$t('module.basicData.specs')"></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
@@ -197,33 +197,33 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="目标CPK" prop="targetCpk">
 | 
			
		||||
          <el-form-item label="CPK" prop="targetCpk">
 | 
			
		||||
            <el-input-number
 | 
			
		||||
              :disabled="fourDataForm.type === 2"
 | 
			
		||||
              v-model="fourDataForm.targetCpk"
 | 
			
		||||
              placeholder="目标CPK"
 | 
			
		||||
              placeholder="CPK"
 | 
			
		||||
            ></el-input-number>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="目标PPK" prop="targetPpk">
 | 
			
		||||
          <el-form-item label="PPK" prop="targetPpk">
 | 
			
		||||
            <el-input-number
 | 
			
		||||
              :disabled="fourDataForm.type === 2"
 | 
			
		||||
              v-model="fourDataForm.targetPpk"
 | 
			
		||||
              placeholder="目标PPK"
 | 
			
		||||
              placeholder="PPK"
 | 
			
		||||
            ></el-input-number>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="备注" prop="remark">
 | 
			
		||||
            <el-input v-model="fourDataForm.remark" placeholder="备注"></el-input>
 | 
			
		||||
          <el-form-item :label="$t('params.remark')" prop="remark">
 | 
			
		||||
            <el-input v-model="fourDataForm.remark" :placeholder="$t('placeholder.first')+$t('params.remark')"></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
      </el-form>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="fourVisible = false">取消</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 | 
			
		||||
      <el-button @click="fourVisible = false">{{$t('cancel')}}</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">{{$t('confirm')}}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
  </el-dialog>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 15:44:28
 | 
			
		||||
 * @LastEditTime: 2023-06-27 09:47:10
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -14,11 +14,12 @@
 | 
			
		||||
          element-loading-text="保存中"
 | 
			
		||||
          element-loading-spinner="el-icon-loading"
 | 
			
		||||
          element-loading-background="rgba(0, 0, 0, 0.8)"
 | 
			
		||||
          label="控制矩阵"
 | 
			
		||||
          :label="$t('module.basicData.controlMatrix')"
 | 
			
		||||
          name="控制矩阵"
 | 
			
		||||
        >
 | 
			
		||||
          <el-button style="float:right" size="small" type="primary" @click="deleteFeatures()">
 | 
			
		||||
            <svg class="icon-svg"><use xlink:href="#icon-新建"></use></svg>
 | 
			
		||||
            保存
 | 
			
		||||
            {{ $t('save') }}
 | 
			
		||||
          </el-button>
 | 
			
		||||
          <el-table
 | 
			
		||||
            :data="productFeaturesList"
 | 
			
		||||
@@ -44,7 +45,7 @@
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
          </el-table>
 | 
			
		||||
        </el-tab-pane>
 | 
			
		||||
        <el-tab-pane label="特性列表" align="center">
 | 
			
		||||
        <el-tab-pane :label="$t('module.basicData.propertyList')" name="特性列表" align="center">
 | 
			
		||||
          <el-table
 | 
			
		||||
            :data="dataList"
 | 
			
		||||
            :header-cell-style="{
 | 
			
		||||
@@ -57,18 +58,18 @@
 | 
			
		||||
              type="index"
 | 
			
		||||
              header-align="center"
 | 
			
		||||
              align="center"
 | 
			
		||||
              label="序号"
 | 
			
		||||
              :label='$t("index")'
 | 
			
		||||
              width="50"
 | 
			
		||||
            >
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
            <el-table-column prop="code" align="center" label="编号"> </el-table-column>
 | 
			
		||||
            <el-table-column prop="name" align="center" label="名称"></el-table-column>
 | 
			
		||||
            <el-table-column prop="type" align="center" label="特性类型">
 | 
			
		||||
            <el-table-column prop="code" align="center" :label='$t("params.paramCode")'> </el-table-column>
 | 
			
		||||
            <el-table-column prop="name" align="center" :label="$t('module.basicData.name')"></el-table-column>
 | 
			
		||||
            <el-table-column prop="type" align="center" :label="$t('module.basicData.featuresType')">
 | 
			
		||||
              <template slot-scope="scope">
 | 
			
		||||
                <span>{{ scope.row.type === 2 ? "计数" : "计量" }}</span>
 | 
			
		||||
              </template>
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
            <el-table-column prop="defectLevel" align="center" label="缺陷等级">
 | 
			
		||||
            <el-table-column prop="defectLevel" align="center" :label="$t('module.basicData.defectLevel')">
 | 
			
		||||
              <template slot-scope="scope">
 | 
			
		||||
                <span>{{
 | 
			
		||||
                  scope.row.defectLevel === 1
 | 
			
		||||
@@ -79,7 +80,7 @@
 | 
			
		||||
                }}</span>
 | 
			
		||||
              </template>
 | 
			
		||||
            </el-table-column>
 | 
			
		||||
            <el-table-column prop="measureToolName" align="center" label="量具"></el-table-column>
 | 
			
		||||
            <el-table-column prop="measureToolName" align="center" :label="$t('module.basicData.measureTool')"></el-table-column>
 | 
			
		||||
            <el-table-column prop="isSpc" align="center" label="SPC">
 | 
			
		||||
              <template slot-scope="scope">
 | 
			
		||||
                <span>{{ scope.row.isSpc === 1 ? "是" : "否" }}</span>
 | 
			
		||||
@@ -88,23 +89,23 @@
 | 
			
		||||
            <el-table-column
 | 
			
		||||
              prop="controlGraphName"
 | 
			
		||||
              align="center"
 | 
			
		||||
              label="分析图形"
 | 
			
		||||
              :label="$t('module.basicData.analyzeGraphics')"
 | 
			
		||||
            ></el-table-column>
 | 
			
		||||
            <el-table-column prop="sampleSize" align="center" label="样本大小"></el-table-column>
 | 
			
		||||
            <el-table-column prop="sampleSize" align="center" :label="$t('module.basicData.sampleSize')"></el-table-column>
 | 
			
		||||
            <el-table-column
 | 
			
		||||
              prop="samplingFrequency"
 | 
			
		||||
              align="center"
 | 
			
		||||
              label="抽样频率"
 | 
			
		||||
              :label="$t('module.basicData.sampleRate')"
 | 
			
		||||
            ></el-table-column>
 | 
			
		||||
            <el-table-column prop="unitName" align="center" label="单位"></el-table-column>
 | 
			
		||||
            <el-table-column prop="decimalPlaces" align="center" label="小数位数"></el-table-column>
 | 
			
		||||
            <el-table-column prop="specifications" align="center" label="规格"></el-table-column>
 | 
			
		||||
            <el-table-column prop="unitName" align="center" :label="$t('module.basicData.unit')"></el-table-column>
 | 
			
		||||
            <el-table-column prop="decimalPlaces" align="center" :label="$t('module.basicData.decimalPlaces')"></el-table-column>
 | 
			
		||||
            <el-table-column prop="specifications" align="center" :label="$t('module.basicData.specs')"></el-table-column>
 | 
			
		||||
            <el-table-column prop="lsl" align="center" label="LSL"></el-table-column>
 | 
			
		||||
            <el-table-column prop="sl" align="center" label="SL"></el-table-column>
 | 
			
		||||
            <el-table-column prop="usl" align="center" label="USL"></el-table-column>
 | 
			
		||||
            <el-table-column prop="targetCpk" align="center" label="目标CPK"></el-table-column>
 | 
			
		||||
            <el-table-column prop="targetPpk" align="center" label="目标PPK"></el-table-column>
 | 
			
		||||
            <el-table-column prop="remark" align="center" label="备注"></el-table-column>
 | 
			
		||||
            <el-table-column prop="targetCpk" align="center" label="CPK"></el-table-column>
 | 
			
		||||
            <el-table-column prop="targetPpk" align="center" label="PPK"></el-table-column>
 | 
			
		||||
            <el-table-column prop="remark" align="center" :label="$t('params.remark')"></el-table-column>
 | 
			
		||||
            <el-table-column
 | 
			
		||||
              fixed="right"
 | 
			
		||||
              header-align="center"
 | 
			
		||||
@@ -135,7 +136,7 @@
 | 
			
		||||
    </div>
 | 
			
		||||
    <el-empty
 | 
			
		||||
      v-else
 | 
			
		||||
      description="该产品没有配置产品特性或工序,暂时不能分配过程控制特性"
 | 
			
		||||
      :description="$t('module.basicData.proDesc')"
 | 
			
		||||
    ></el-empty>
 | 
			
		||||
    <four-add-or-update
 | 
			
		||||
      v-if="fourAddOrUpdateVisible"
 | 
			
		||||
@@ -228,7 +229,7 @@ export default {
 | 
			
		||||
        });
 | 
			
		||||
    },
 | 
			
		||||
    tabClick(val) {
 | 
			
		||||
      if (val.label === "特性列表") {
 | 
			
		||||
      if (val.name === "特性列表") {
 | 
			
		||||
        this.getFourDataList();
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
 
 | 
			
		||||
@@ -2,14 +2,14 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 15:43:27
 | 
			
		||||
 * @LastEditTime: 2023-06-27 09:50:10
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-dialog :visible.sync="hisVisible" append-to-body class="baseDialog">
 | 
			
		||||
    <template #title>
 | 
			
		||||
      <slot name="title">
 | 
			
		||||
        <div class="titleStyle">历史记录</div>
 | 
			
		||||
        <div class="titleStyle">{{ $t('module.basicData.history') }}</div>
 | 
			
		||||
      </slot>
 | 
			
		||||
    </template>
 | 
			
		||||
    <el-table
 | 
			
		||||
@@ -20,16 +20,16 @@
 | 
			
		||||
      }"
 | 
			
		||||
      style="width: 100%;"
 | 
			
		||||
    >
 | 
			
		||||
      <el-table-column type="index" header-align="center" align="center" label="序号" width="50">
 | 
			
		||||
      <el-table-column type="index" header-align="center" align="center" :label='$t("index")' width="50">
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="code" align="center" label="编号"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="name" align="center" label="名称"></el-table-column>
 | 
			
		||||
      <el-table-column prop="type" align="center" label="特性类型">
 | 
			
		||||
      <el-table-column prop="code" align="center" :label='$t("params.paramCode")'> </el-table-column>
 | 
			
		||||
      <el-table-column prop="name" align="center" :label="$t('module.basicData.name')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="type" align="center" :label="$t('module.basicData.featuresType')">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <span>{{ scope.row.type === 2 ? "计数" : "计量" }}</span>
 | 
			
		||||
        </template>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="defectLevel" align="center" label="缺陷等级">
 | 
			
		||||
      <el-table-column prop="defectLevel" align="center" :label="$t('module.basicData.defectLevel')">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <span>{{
 | 
			
		||||
            scope.row.defectLevel === 1
 | 
			
		||||
@@ -40,27 +40,27 @@
 | 
			
		||||
          }}</span>
 | 
			
		||||
        </template>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="measureToolName" align="center" label="量具"></el-table-column>
 | 
			
		||||
      <el-table-column prop="measureToolName" align="center" :label="$t('module.basicData.measureTool')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="isSpc" align="center" label="SPC">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <span>{{ scope.row.isSpc === 1 ? "是" : "否" }}</span>
 | 
			
		||||
        </template>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="controlGraphName" align="center" label="分析图形"></el-table-column>
 | 
			
		||||
      <el-table-column prop="sampleSize" align="center" label="样本大小"></el-table-column>
 | 
			
		||||
      <el-table-column prop="samplingFrequency" align="center" label="抽样频率"></el-table-column>
 | 
			
		||||
      <el-table-column prop="unitName" align="center" label="单位"></el-table-column>
 | 
			
		||||
      <el-table-column prop="decimalPlaces" align="center" label="小数位数"></el-table-column>
 | 
			
		||||
      <el-table-column prop="specifications" align="center" label="规格"></el-table-column>
 | 
			
		||||
      <el-table-column prop="controlGraphName" align="center" :label="$t('module.basicData.analyzeGraphics')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="sampleSize" align="center" :label="$t('module.basicData.sampleSize')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="samplingFrequency" align="center" :label="$t('module.basicData.sampleRate')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="unitName" align="center" :label="$t('module.basicData.unit')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="decimalPlaces" align="center" :label="$t('module.basicData.decimalPlaces')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="specifications" align="center" :label="$t('module.basicData.specs')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="lsl" align="center" label="LSL"></el-table-column>
 | 
			
		||||
      <el-table-column prop="sl" align="center" label="SL"></el-table-column>
 | 
			
		||||
      <el-table-column prop="usl" align="center" label="USL"></el-table-column>
 | 
			
		||||
      <el-table-column prop="targetCpk" align="center" label="目标CPK"></el-table-column>
 | 
			
		||||
      <el-table-column prop="targetPpk" align="center" label="目标PPK"></el-table-column>
 | 
			
		||||
      <el-table-column prop="remark" align="center" label="备注"></el-table-column>
 | 
			
		||||
      <el-table-column prop="targetCpk" align="center" label="CPK"></el-table-column>
 | 
			
		||||
      <el-table-column prop="targetPpk" align="center" label="PPK"></el-table-column>
 | 
			
		||||
      <el-table-column prop="remark" align="center" :label="$t('params.remark')"></el-table-column>
 | 
			
		||||
    </el-table>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="hisVisible = false">关闭</el-button>
 | 
			
		||||
      <el-button @click="hisVisible = false">{{ $t('close') }}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
  </el-dialog>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -9,40 +9,40 @@
 | 
			
		||||
  <el-row :gutter="10">
 | 
			
		||||
    <el-form ref="dataForm" :model="dataForm" :rules="rules" size="medium" label-width="110px">
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
          <el-input
 | 
			
		||||
            v-model="dataForm.code"
 | 
			
		||||
            placeholder="请输入编码"
 | 
			
		||||
            :placeholder="$t('placeholder.first')+$t('module.basicData.code')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          ></el-input>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
          <el-input
 | 
			
		||||
            v-model="dataForm.name"
 | 
			
		||||
            placeholder="请输入名称"
 | 
			
		||||
            :placeholder="$t('placeholder.first')+$t('module.basicData.name')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          ></el-input>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="规格" prop="specifications">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.specs')" prop="specifications">
 | 
			
		||||
          <el-input
 | 
			
		||||
            v-model="dataForm.specifications"
 | 
			
		||||
            placeholder="请输入规格"
 | 
			
		||||
            :placeholder="$t('placeholder.first')+$t('module.basicData.specs')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          ></el-input>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="图纸" prop="drawing">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.drawing')" prop="drawing">
 | 
			
		||||
          <el-input
 | 
			
		||||
            v-model="dataForm.drawing"
 | 
			
		||||
            placeholder="请输入图纸"
 | 
			
		||||
            :placeholder="$t('placeholder.first')+$t('module.basicData.drawing')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          >
 | 
			
		||||
@@ -50,20 +50,20 @@
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="描述" prop="descs">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.descs')" prop="descs">
 | 
			
		||||
          <el-input
 | 
			
		||||
            v-model="dataForm.descs"
 | 
			
		||||
            placeholder="请输入描述"
 | 
			
		||||
            :placeholder="$t('placeholder.first')+$t('module.basicData.descs')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          ></el-input>
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="备注" prop="remark">
 | 
			
		||||
        <el-form-item :label="$t('params.remark')" prop="remark">
 | 
			
		||||
          <el-input
 | 
			
		||||
            v-model="dataForm.remark"
 | 
			
		||||
            placeholder="请输入备注"
 | 
			
		||||
            :placeholder="$t('placeholder.first')+$t('params.remark')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          >
 | 
			
		||||
@@ -71,10 +71,10 @@
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="产品类型" prop="productTypeId">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.productType')" prop="productTypeId">
 | 
			
		||||
          <el-select
 | 
			
		||||
            v-model="dataForm.productTypeId"
 | 
			
		||||
            placeholder="请选择产品类型"
 | 
			
		||||
            :placeholder="$t('placeholder.second')+$t('module.basicData.productType')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          >
 | 
			
		||||
@@ -88,10 +88,10 @@
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="单位" prop="unitId">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.unit')" prop="unitId">
 | 
			
		||||
          <el-select
 | 
			
		||||
            v-model="dataForm.unitId"
 | 
			
		||||
            placeholder="请选择单位"
 | 
			
		||||
            :placeholder="$t('placeholder.second')+$t('module.basicData.measureTool')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          >
 | 
			
		||||
@@ -105,10 +105,10 @@
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col :span="8">
 | 
			
		||||
        <el-form-item label="检验标准" prop="inspectionStandard">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.inspectionStandard')" prop="inspectionStandard">
 | 
			
		||||
          <el-input
 | 
			
		||||
            v-model="dataForm.inspectionStandard"
 | 
			
		||||
            placeholder="请输入检验标准"
 | 
			
		||||
            :placeholder="$t('placeholder.first')+$t('module.basicData.inspectionStandard')"
 | 
			
		||||
            clearable
 | 
			
		||||
            :style="{ width: '100%' }"
 | 
			
		||||
          >
 | 
			
		||||
@@ -116,7 +116,7 @@
 | 
			
		||||
        </el-form-item>
 | 
			
		||||
      </el-col>
 | 
			
		||||
      <el-col>
 | 
			
		||||
        <el-form-item label="检验阶段" prop="inspectionStageArr">
 | 
			
		||||
        <el-form-item :label="$t('module.basicData.inspectionStage')" prop="inspectionStageArr">
 | 
			
		||||
          <el-checkbox-group v-model="dataForm.inspectionStageArr"
 | 
			
		||||
              @change="$forceUpdate()" size="medium">
 | 
			
		||||
            <el-checkbox
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 15:40:38
 | 
			
		||||
 * @LastEditTime: 2023-06-27 09:57:24
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -14,7 +14,7 @@
 | 
			
		||||
  >
 | 
			
		||||
      <template #title>
 | 
			
		||||
        <slot name="title">
 | 
			
		||||
          <div class="titleStyle">{{ !threeDataForm.id ? '新增' : '修改' }}</div>
 | 
			
		||||
          <div class="titleStyle">{{ !threeDataForm.id ? $t('add') : $t('update') }}</div>
 | 
			
		||||
        </slot>
 | 
			
		||||
      </template>
 | 
			
		||||
    <el-row :gutter="10">
 | 
			
		||||
@@ -23,26 +23,26 @@
 | 
			
		||||
        :rules="dataRule"
 | 
			
		||||
        ref="threeDataForm"
 | 
			
		||||
        @keyup.enter.native="dataFormSubmit()"
 | 
			
		||||
        label-width="80px"
 | 
			
		||||
        label-width="120px"
 | 
			
		||||
      >
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="编码" prop="code">
 | 
			
		||||
            <el-input v-model="threeDataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
            <el-input v-model="threeDataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="名称" prop="name">
 | 
			
		||||
            <el-input v-model="threeDataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
            <el-input v-model="threeDataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="特性类型" prop="type">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.featuresType')" prop="type">
 | 
			
		||||
            <el-select
 | 
			
		||||
              v-model="threeDataForm.type"
 | 
			
		||||
              @change="numIsblack"
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
              filterable
 | 
			
		||||
              placeholder="请选择特性类型"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.featuresType')"
 | 
			
		||||
            >
 | 
			
		||||
              <el-option
 | 
			
		||||
                v-for="item in typeArr"
 | 
			
		||||
@@ -55,13 +55,13 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="缺陷等级" prop="defectLevel">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.defectLevel')" prop="defectLevel">
 | 
			
		||||
            <el-select
 | 
			
		||||
              :disabled="threeDataForm.type === 2"
 | 
			
		||||
              v-model="threeDataForm.defectLevel"
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
              filterable
 | 
			
		||||
              placeholder="请选择缺陷等级"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.defectLevel')"
 | 
			
		||||
            >
 | 
			
		||||
              <el-option
 | 
			
		||||
                v-for="item in defectLevelArr"
 | 
			
		||||
@@ -74,11 +74,11 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="量具" prop="measureToolId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.measureTool')" prop="measureToolId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              :disabled="threeDataForm.type === 2"
 | 
			
		||||
              v-model="threeDataForm.measureToolId"
 | 
			
		||||
              placeholder="请选择单位"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.measureTool')"
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
            >
 | 
			
		||||
@@ -92,11 +92,11 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="单位" prop="unitId">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.unit')" prop="unitId">
 | 
			
		||||
            <el-select
 | 
			
		||||
              :disabled="threeDataForm.type === 2"
 | 
			
		||||
              v-model="threeDataForm.unitId"
 | 
			
		||||
              placeholder="请选择单位"
 | 
			
		||||
              :placeholder="$t('placeholder.second')+$t('module.basicData.measureTool')"
 | 
			
		||||
              clearable
 | 
			
		||||
              :style="{ width: '100%' }"
 | 
			
		||||
            >
 | 
			
		||||
@@ -110,11 +110,11 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="规格" prop="specifications">
 | 
			
		||||
          <el-form-item :label="$t('module.basicData.specs')" prop="specifications">
 | 
			
		||||
            <el-input
 | 
			
		||||
              :disabled="threeDataForm.type === 2"
 | 
			
		||||
              v-model="threeDataForm.specifications"
 | 
			
		||||
              placeholder="规格"
 | 
			
		||||
              :placeholder="$t('placeholder.first')+$t('module.basicData.specs')"
 | 
			
		||||
            ></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
@@ -146,15 +146,15 @@
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
        <el-col :span="8">
 | 
			
		||||
          <el-form-item label="备注" prop="remark">
 | 
			
		||||
            <el-input v-model="threeDataForm.remark" placeholder="备注"></el-input>
 | 
			
		||||
          <el-form-item :label="$t('params.remark')" prop="remark">
 | 
			
		||||
            <el-input v-model="threeDataForm.remark" :placeholder="$t('placeholder.first')+$t('params.remark')"></el-input>
 | 
			
		||||
          </el-form-item>
 | 
			
		||||
        </el-col>
 | 
			
		||||
      </el-form>
 | 
			
		||||
    </el-row>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="threeVisible = false">取消</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 | 
			
		||||
      <el-button @click="threeVisible = false">{{$t('cancel')}}</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">{{$t('confirm')}}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
  </el-dialog>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -21,16 +21,16 @@
 | 
			
		||||
      v-loading="dataListLoading"
 | 
			
		||||
      style="width: 100%;"
 | 
			
		||||
    >
 | 
			
		||||
      <el-table-column type="index" header-align="center" align="center" label="序号" width="50">
 | 
			
		||||
      <el-table-column type="index" header-align="center" align="center" :label='$t("index")' width="50">
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="code" align="center" label="编号"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="name" align="center" label="名称"></el-table-column>
 | 
			
		||||
      <el-table-column prop="type" align="center" label="特性类型">
 | 
			
		||||
      <el-table-column prop="code" align="center" :label='$t("params.paramCode")'> </el-table-column>
 | 
			
		||||
      <el-table-column prop="name" align="center" :label="$t('module.basicData.name')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="type" align="center" :label="$t('module.basicData.featuresType')">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <span>{{ scope.row.type === 2 ? "计数" : "计量" }}</span>
 | 
			
		||||
        </template>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="defectLevel" align="center" label="缺陷等级">
 | 
			
		||||
      <el-table-column prop="defectLevel" align="center" :label="$t('module.basicData.defectLevel')">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <span>{{
 | 
			
		||||
            scope.row.defectLevel === 1
 | 
			
		||||
@@ -41,13 +41,13 @@
 | 
			
		||||
          }}</span>
 | 
			
		||||
        </template>
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="measureToolName" align="center" label="量具"></el-table-column>
 | 
			
		||||
      <el-table-column prop="unitName" align="center" label="单位"></el-table-column>
 | 
			
		||||
      <el-table-column prop="specifications" align="center" label="规格"></el-table-column>
 | 
			
		||||
      <el-table-column prop="measureToolName" align="center" :label="$t('module.basicData.measureTool')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="unitName" align="center" :label="$t('module.basicData.unit')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="specifications" align="center" :label="$t('module.basicData.specs')"></el-table-column>
 | 
			
		||||
      <el-table-column prop="lsl" align="center" label="LSL"></el-table-column>
 | 
			
		||||
      <el-table-column prop="sl" align="center" label="SL"></el-table-column>
 | 
			
		||||
      <el-table-column prop="usl" align="center" label="USL"></el-table-column>
 | 
			
		||||
      <el-table-column prop="remark" align="center" label="备注"></el-table-column>
 | 
			
		||||
      <el-table-column prop="remark" align="center" :label="$t('params.remark')"></el-table-column>
 | 
			
		||||
      <el-table-column fixed="right" header-align="center" align="center" width="150" :label="$t('handle')">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
 | 
			
		||||
 
 | 
			
		||||
@@ -2,20 +2,20 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 15:29:25
 | 
			
		||||
 * @LastEditTime: 2023-06-27 10:02:01
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <div class="baseTable">
 | 
			
		||||
    <div style="margin-bottom:20px">
 | 
			
		||||
      <el-tooltip content="选择工序,新增到表格" placement="top">
 | 
			
		||||
      <el-tooltip :content="$t('module.basicData.twoTip')" placement="top">
 | 
			
		||||
        <el-select
 | 
			
		||||
          size="small"
 | 
			
		||||
          v-model="processId"
 | 
			
		||||
          @change="addProcess"
 | 
			
		||||
          clearable
 | 
			
		||||
          filterable
 | 
			
		||||
          placeholder="请选择"
 | 
			
		||||
          :placeholder="$t('placeholder.second')"
 | 
			
		||||
        >
 | 
			
		||||
          <el-option v-for="item in processArr" :key="item.id" :label="item.name" :value="item.id">
 | 
			
		||||
          </el-option>
 | 
			
		||||
@@ -31,10 +31,10 @@
 | 
			
		||||
      v-loading="dataListLoading"
 | 
			
		||||
      style="width: 100%;"
 | 
			
		||||
    >
 | 
			
		||||
      <el-table-column type="index" header-align="center" align="center" label="序号" width="50">
 | 
			
		||||
      <el-table-column type="index" header-align="center" align="center" :label='$t("index")' width="50">
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="workingProcedureName" align="center" label="工序名称"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="workingProcedureCode" align="center" label="工序编码"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="workingProcedureName" align="center" :label="$t('module.basicData.processName')"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="workingProcedureCode" align="center" :label="$t('module.basicData.processCode')"> </el-table-column>
 | 
			
		||||
      <el-table-column fixed="right" header-align="center" align="center" width="150" :label="$t('handle')">
 | 
			
		||||
        <template slot-scope="scope">
 | 
			
		||||
          <el-button
 | 
			
		||||
 
 | 
			
		||||
@@ -2,19 +2,19 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-08-22 15:53:16
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2022-09-08 14:28:56
 | 
			
		||||
 * @LastEditTime: 2023-06-27 10:06:34
 | 
			
		||||
 * @Description: 
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-tabs @tab-click="tabClick">
 | 
			
		||||
    <el-tab-pane label="表格模式">
 | 
			
		||||
    <el-tab-pane :label="$t('module.basicData.tableMode')" name="表格模式">
 | 
			
		||||
      <two-step-table
 | 
			
		||||
        v-show="twoStepVisible"
 | 
			
		||||
        ref="twoStepRef"
 | 
			
		||||
        :product-id="productId"
 | 
			
		||||
      ></two-step-table>
 | 
			
		||||
    </el-tab-pane>
 | 
			
		||||
    <el-tab-pane label="图形模式">
 | 
			
		||||
    <el-tab-pane :label="$t('module.basicData.graphicsMode')" name="图形模式">
 | 
			
		||||
      <process-flow-graph
 | 
			
		||||
        v-show="graphVisible"
 | 
			
		||||
        ref="graphRef"
 | 
			
		||||
@@ -59,8 +59,8 @@ export default {
 | 
			
		||||
      });
 | 
			
		||||
    },
 | 
			
		||||
    tabClick(val) {
 | 
			
		||||
      this.paneName = val.label;
 | 
			
		||||
      if (val.label === "图形模式") {
 | 
			
		||||
      this.paneName = val.name;
 | 
			
		||||
      if (val.name === "图形模式") {
 | 
			
		||||
        this.twoStepVisible = false;
 | 
			
		||||
        this.graphVisible = true;
 | 
			
		||||
        this.$nextTick(() => {
 | 
			
		||||
 
 | 
			
		||||
@@ -6,12 +6,12 @@
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
 | 
			
		||||
      <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
    </el-form>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,19 +2,19 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 14:34:08
 | 
			
		||||
 * @LastEditTime: 2023-06-27 10:09:48
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
 | 
			
		||||
      <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="站点分组" prop="platformGroup">
 | 
			
		||||
        <el-input v-model="dataForm.platformGroup" placeholder="站点分组"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.platformGroup')" prop="platformGroup">
 | 
			
		||||
        <el-input v-model="dataForm.platformGroup" :placeholder="$t('placeholder.first')+$t('module.basicData.platformGroup')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
    </el-form>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,22 +2,22 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2021-11-18 14:16:25
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-04-10 14:39:41
 | 
			
		||||
 * @LastEditTime: 2023-06-27 10:12:13
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
 | 
			
		||||
      <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="测量类型" prop="type">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.measureType')" prop="type">
 | 
			
		||||
        <el-select
 | 
			
		||||
          v-model="dataForm.type"
 | 
			
		||||
          filterable
 | 
			
		||||
          placeholder="请选择测量类型"
 | 
			
		||||
          :placeholder="$t('placeholder.second')+$t('module.basicData.measureType')"
 | 
			
		||||
        >
 | 
			
		||||
          <el-option
 | 
			
		||||
            v-for="item in typeArr"
 | 
			
		||||
@@ -28,11 +28,11 @@
 | 
			
		||||
          </el-option>
 | 
			
		||||
        </el-select>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="父类型" prop="parentType">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.parentType')" prop="parentType">
 | 
			
		||||
        <el-select
 | 
			
		||||
          v-model="dataForm.parentType"
 | 
			
		||||
          filterable
 | 
			
		||||
          placeholder="请选择父类型"
 | 
			
		||||
          :placeholder="$t('placeholder.second')+$t('module.basicData.parentType')"
 | 
			
		||||
        >
 | 
			
		||||
          <el-option
 | 
			
		||||
            v-for="item in parentTypeArr"
 | 
			
		||||
 
 | 
			
		||||
@@ -7,19 +7,19 @@
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-dialog
 | 
			
		||||
    :title="!dataForm.id ? '新增' : '修改'"
 | 
			
		||||
    :title="!dataForm.id ? $t('add') : $t('update')"
 | 
			
		||||
    :close-on-click-modal="false"
 | 
			
		||||
    :visible.sync="visible"
 | 
			
		||||
    append-to-body>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
 | 
			
		||||
      <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="小数位数" prop="num">
 | 
			
		||||
        <el-input-number :step='1' v-model="dataForm.num" placeholder="小数位数"></el-input-number>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.decimalPlaces')" prop="num">
 | 
			
		||||
        <el-input-number :step='1' v-model="dataForm.num" :placeholder="$t('placeholder.first')+$t('module.basicData.decimalPlaces')"></el-input-number>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="USL" prop="USL">
 | 
			
		||||
        <el-input-number :step='1' v-model="dataForm.USL" placeholder="USL"></el-input-number>
 | 
			
		||||
@@ -32,8 +32,8 @@
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
    </el-form>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="visible = false">取消</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 | 
			
		||||
      <el-button @click="visible = false">{{$t('cancel')}}</el-button>
 | 
			
		||||
      <el-button type="primary" @click="dataFormSubmit()">{{$t('confirm')}}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
  </el-dialog>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
  <el-dialog
 | 
			
		||||
    title="台差参数"
 | 
			
		||||
    :title="$t('module.basicData.toolTip')"
 | 
			
		||||
    :close-on-click-modal="false"
 | 
			
		||||
    :visible.sync="visible"
 | 
			
		||||
  >
 | 
			
		||||
@@ -26,13 +26,13 @@
 | 
			
		||||
        type="index"
 | 
			
		||||
        header-align="center"
 | 
			
		||||
        align="center"
 | 
			
		||||
        label="序号"
 | 
			
		||||
        :label='$t("index")'
 | 
			
		||||
        width="50"
 | 
			
		||||
      >
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
      <el-table-column prop="name" align="center" label="名称"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="code" align="center" label="编码"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="num" align="center" label="小数位数"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="name" align="center" :label="$t('module.basicData.name')"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="code" align="center" :label="$t('module.basicData.code')"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="num" align="center" :label="$t('module.basicData.decimalPlaces')"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="USL" align="center" label="USL"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="SL" align="center" label="SL"> </el-table-column>
 | 
			
		||||
      <el-table-column prop="LSL" align="center" label="LSL"> </el-table-column>
 | 
			
		||||
@@ -77,8 +77,8 @@
 | 
			
		||||
      </el-table-column>
 | 
			
		||||
    </el-table>
 | 
			
		||||
    <span slot="footer" class="dialog-footer">
 | 
			
		||||
      <el-button @click="visible = false">取消</el-button>
 | 
			
		||||
      <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
 | 
			
		||||
      <el-button @click="visible = false">{{$t('cancel')}}</el-button>
 | 
			
		||||
      <el-button type="primary" @click="addOrUpdateHandle()">{{$t('add')}}</el-button>
 | 
			
		||||
    </span>
 | 
			
		||||
    <add-or-update
 | 
			
		||||
      v-if="addOrUpdateVisible"
 | 
			
		||||
 
 | 
			
		||||
@@ -6,18 +6,18 @@
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
 | 
			
		||||
      <el-form-item label="编码" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" placeholder="编码"></el-input>
 | 
			
		||||
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.code')" prop="code">
 | 
			
		||||
        <el-input v-model="dataForm.code" :placeholder="$t('placeholder.first')+$t('module.basicData.code')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="名称" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" placeholder="名称"></el-input>
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.name')" prop="name">
 | 
			
		||||
        <el-input v-model="dataForm.name" :placeholder="$t('placeholder.first')+$t('module.basicData.name')"></el-input>
 | 
			
		||||
      </el-form-item>
 | 
			
		||||
      <el-form-item label="单位分类" prop="type">
 | 
			
		||||
      <el-form-item :label="$t('module.basicData.unitType')" prop="type">
 | 
			
		||||
        <el-select
 | 
			
		||||
          v-model="dataForm.type"
 | 
			
		||||
          filterable
 | 
			
		||||
          placeholder="请选择单位分类"
 | 
			
		||||
          :placeholder="$t('placeholder.second')+$t('module.basicData.unitType')"
 | 
			
		||||
        >
 | 
			
		||||
          <el-option
 | 
			
		||||
            v-for="item in typeArr"
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="150"
 | 
			
		||||
          :width="180"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -82,7 +82,7 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="150"
 | 
			
		||||
          :width="180"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -77,7 +77,7 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="220"
 | 
			
		||||
          :width="288"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -83,11 +83,11 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "Machine",
 | 
			
		||||
    btnName: "绑定机台",
 | 
			
		||||
    btnName: i18n.t("module.basicData.bindMachine"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -28,7 +28,7 @@
 | 
			
		||||
          <i class="el-icon-close" @click="closeEditForm"></i>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div v-if="editTitle === '编辑节点'" class="form-main">
 | 
			
		||||
          <el-form ref="nodeForm" :model="form" label-width="80px">
 | 
			
		||||
          <el-form ref="nodeForm" :model="form" label-width="120px">
 | 
			
		||||
            <el-form-item label="节点文本">
 | 
			
		||||
              <el-input
 | 
			
		||||
                v-model="form.labelText"
 | 
			
		||||
@@ -78,7 +78,7 @@
 | 
			
		||||
          </el-form>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div v-if="editTitle === '编辑连线'" class="form-main">
 | 
			
		||||
          <el-form ref="edgeForm" :model="form" label-width="80px">
 | 
			
		||||
          <el-form ref="edgeForm" :model="form" label-width="120px">
 | 
			
		||||
            <el-form-item label="标签内容">
 | 
			
		||||
              <el-input
 | 
			
		||||
                v-model="form.label"
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="150"
 | 
			
		||||
          :width="180"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -69,7 +69,7 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="150"
 | 
			
		||||
          :width="180"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -95,7 +95,7 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 * @Author: zwq
 | 
			
		||||
 * @Date: 2022-08-22 15:53:16
 | 
			
		||||
 * @LastEditors: zwq
 | 
			
		||||
 * @LastEditTime: 2023-02-17 11:00:02
 | 
			
		||||
 * @LastEditTime: 2023-06-25 17:00:44
 | 
			
		||||
 * @Description: 
 | 
			
		||||
-->
 | 
			
		||||
<template>
 | 
			
		||||
@@ -18,7 +18,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="150"
 | 
			
		||||
          :width="180"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -76,7 +76,7 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="150"
 | 
			
		||||
          :width="180"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -74,7 +74,7 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="180"
 | 
			
		||||
          :width="208"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -78,7 +78,7 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
export default {
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
        <method-btn
 | 
			
		||||
          v-if="tableBtn.length"
 | 
			
		||||
          slot="handleBtn"
 | 
			
		||||
          :width="150"
 | 
			
		||||
          :width="180"
 | 
			
		||||
          :label="$t('handle')"
 | 
			
		||||
          :method-list="tableBtn"
 | 
			
		||||
          @clickBtn="handleClick"
 | 
			
		||||
@@ -74,7 +74,7 @@ const tableBtn = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    type: "change",
 | 
			
		||||
    btnName: "改变状态",
 | 
			
		||||
    btnName: i18n.t("change"),
 | 
			
		||||
  },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user