Skip to content

P
pt-tobacco-lims-web
Commit 55e6a51f by wangweidong
Options

demo完善

parent 385f2f5a
Showing with 365 additions and 347 deletions
pages/consume/lms-consume-purchase-order/DrugSampleProductEdit.vue
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/consume/lms-consume-purchase-order/tabs/ConsumePurchaseOrder.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
......
pages/consume/lms-consume-purchase-order/tabs/DrugProductSampleHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
pcTimeEnd: '' pcTimeEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/drug-register/material/otherContractEdit.vue
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/drug-register/material/tabs/otherContract.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
{ type: '', id: '', name: '提交' } { type: '', id: '', name: '提交' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ title: '状态', key: 'status', status: true, width: 120 }, { title: '状态', key: 'status', status: true, width: 120 },
{ title: '物品名称', key: 'name', width: 120 }, { title: '物品名称', key: 'name', width: 120 },
......
pages/drug-register/material/tabs/otherContractHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
pcTimeEnd: '' pcTimeEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/drug-register/product/DrugSampleProductEdit.vue
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/drug-register/product/tabs/DrugSampleProduct.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本编号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="牌号:"> <Form-item class="search-item" label="牌号:">
<Input v-model="formObj.name" placeholder="请输入牌号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入牌号" clearable @on-enter="_formSearch" />
......
pages/drug-register/stable/SampleStableEdit.vue
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/drug-register/stable/tabs/SampleStable.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
{ type: '', id: '', name: '提交' } { type: '', id: '', name: '提交' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ title: '状态', key: 'status', status: true, width: 120 }, { title: '状态', key: 'status', status: true, width: 120 },
{ title: '物品名称', key: 'name', width: 120 }, { title: '物品名称', key: 'name', width: 120 },
......
pages/drug-register/stable/tabs/SampleStableHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
inspectionEnd: '' inspectionEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/drug-report-check/tabs/historyTask.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="物品名称:">
<Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" />
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-report-check/tabs/reportCheck.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-report-consult/DrugReportConsult.vue
...@@ -12,20 +12,17 @@ ...@@ -12,20 +12,17 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="牌号:">
<Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入牌号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物品编号:"> <Form-item class="search-item" label="生产日期:">
<Input name="code" placeholder="请输入物品编号" clearable @on-enter="_formSearch" />
</Form-item>
<Form-item class="search-item" label="请检时间:">
<Date-picker <Date-picker
ref="pcTime" ref="pcTime"
type="datetimerange" type="datetimerange"
placeholder="报检时间" placeholder="生产日期"
style="width: 100%;" style="width: 100%;"
:editable="false" :editable="false"
transfer transfer
...@@ -37,9 +34,7 @@ ...@@ -37,9 +34,7 @@
<!--<Form-item class="search-item" label="报检单位:">--> <!--<Form-item class="search-item" label="报检单位:">-->
<!--<Input name="declarationInspection" placeholder="请输入报检单位" clearable @on-enter="_formSearch" />--> <!--<Input name="declarationInspection" placeholder="请输入报检单位" clearable @on-enter="_formSearch" />-->
<!--</Form-item>--> <!--</Form-item>-->
<Form-item class="search-item" label="送样人:">
<Input name="sender" placeholder="请输入送样人" clearable @on-enter="_formSearch" />
</Form-item>
<Form-item class="search-item" label="样品接收人:"> <Form-item class="search-item" label="样品接收人:">
<Input name="receiver" placeholder="请输入样品接收人" clearable @on-enter="_formSearch" /> <Input name="receiver" placeholder="请输入样品接收人" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
...@@ -135,13 +130,13 @@ export default { ...@@ -135,13 +130,13 @@ export default {
], ],
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
align: 'center' align: 'center'
}, },
{ title: '物品名称', key: 'name', width: 200, align: 'center' }, { title: '牌号', key: 'name', width: 200, align: 'center' },
{ {
title: '样品接收时间', title: '样品接收时间',
key: 'receiveTime', key: 'receiveTime',
...@@ -153,20 +148,12 @@ export default { ...@@ -153,20 +148,12 @@ export default {
key: 'receiver', key: 'receiver',
align: 'center' align: 'center'
}, },
{ title: '物品编号', key: 'code', width: 200, align: 'center' }, { title: '价类', key: 'category', width: 150, align: 'center' },
{ title: '检测类型', key: 'category', width: 150, align: 'center' },
{ {
title: '请检时间', title: '生产日期',
key: 'pcTime', key: 'pcTime',
align: 'center', align: 'center',
datetime: true datetime: true
},
{ title: '送样人', key: 'sender', align: 'center' },
{
key: 'sendTime',
title: '送样人接收时间',
align: 'center',
datetime: true
} }
], ],
getPage: {}, getPage: {},
......
pages/drug-report-issue/tabs/historyTask.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="物品名称:">
<Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" />
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-report-issue/tabs/reportIssue.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-report-make/createReport.vue
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
style="width: 100%" style="width: 100%"
:default-sort="{prop: 'date', order: 'descending'}" :default-sort="{prop: 'date', order: 'descending'}"
> >
<el-table-column prop="sampleCode" label="样本号" sortable /> <el-table-column prop="sampleCode" label="样本编号" sortable />
<el-table-column prop="name" label="物料名称" sortable /> <el-table-column prop="name" label="物料名称" sortable />
<el-table-column prop="reportSn" label="报告编号" sortable> <el-table-column prop="reportSn" label="报告编号" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
......
pages/drug-report-make/tabs/historyTask.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="物品名称:">
<Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" />
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-report-make/tabs/reportMake.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-sample-keep/preparationManageEdit.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
填写存放信息 填写存放信息
</p> </p>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="70"> <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="70">
<Form-item label="存储期限" prop="timeLimit"> <Form-item label="存储期限（天）" prop="timeLimit">
<!--<Date-picker--> <!--<Date-picker-->
<!--v-model="formObj.timeLimit"--> <!--v-model="formObj.timeLimit"-->
<!--type="date"--> <!--type="date"-->
...@@ -15,8 +15,10 @@ ...@@ -15,8 +15,10 @@
<!--@on-change="_sampleDeliveryTimeChange"--> <!--@on-change="_sampleDeliveryTimeChange"-->
<!--/>--> <!--/>-->
<Input <Input
type="number"
v-model="formObj.timeLimit" v-model="formObj.timeLimit"
name="timeLimit" name="timeLimit"
@keydown.native="channelInputLimit"
placeholder="请输入存储期限" placeholder="请输入存储期限"
clearable clearable
/> />
...@@ -29,6 +31,26 @@ ...@@ -29,6 +31,26 @@
clearable clearable
/> />
</Form-item> </Form-item>
<Form-item label="留样数量" prop="quantity">
<Input
type="number"
@keydown.native="channelInputLimit"
v-model="formObj.quantity"
name="quantity"
placeholder="请输入留样数量"
clearable
/>
</Form-item>
<Form-item label="单位" prop="unit">
<Input
v-model="formObj.unit"
name="unit"
placeholder="请输入留样数量单位"
clearable
/>
</Form-item>
</Form> </Form>
<div slot="footer"> <div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" /> <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
...@@ -41,6 +63,8 @@ ...@@ -41,6 +63,8 @@
import { drugSampleKeep } from '../../api' import { drugSampleKeep } from '../../api'
const defVal = { const defVal = {
timeLimit: '', timeLimit: '',
quantity: '',
unit: '',
storageLocation: '#01' storageLocation: '#01'
} }
export default { export default {
...@@ -84,6 +108,15 @@ export default { ...@@ -84,6 +108,15 @@ export default {
break break
} }
}, },
channelInputLimit(e) {
const key = e.key
// 不允许输入'e'和'.'
if (key === 'e' || key === '.') {
e.returnValue = false
return false
}
return true
},
_ok() { _ok() {
this.$refs.formObj.validate(valid => { this.$refs.formObj.validate(valid => {
if (valid) { if (valid) {
......
pages/drug-sample-keep/tabs/preparationManage.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -43,10 +43,12 @@ ...@@ -43,10 +43,12 @@
</Button> </Button>
</Form-item> </Form-item>
</Form> </Form>
<Col span="24"> <Col span="24" />
<btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" /> <!-- <btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />-->
<el-button style="margin: 2px" type="primary" @click="_saveEdit">填写留样信息</el-button>
<el-button style="margin: 2px" type="primary" @click="_preDeal">处理</el-button>
</Col> </Col>
<Col span="24"> <Col span="24" />
<element-table <element-table
ref="pageTable" ref="pageTable"
:page-columns="pageColumns" :page-columns="pageColumns"
...@@ -91,30 +93,33 @@ ...@@ -91,30 +93,33 @@
<span v-else-if="item.datetime"> <span v-else-if="item.datetime">
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }} {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
</span> </span>
<span v-else-if="item.key === 'ctime'">
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
</span>
<span v-else-if="item.key === 'sampleNum'" :class="scope.row.warning !== undefined?'font-jude':''"> <span v-else-if="item.key === 'sampleNum'" :class="scope.row.warning !== undefined?'font-jude':''">
{{ scope.row[item.key]? scope.row[item.key]:''}} {{ scope.row[item.key]? scope.row[item.key]:'' }}
</span> </span>
<span v-else> <span v-else>
{{ scope.row[item.key] }} {{ scope.row[item.key] }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- slot="col"--> <!-- slot="col"-->
<!-- label="操作"--> <!-- label="操作"-->
<!-- align="center"--> <!-- align="center"-->
<!-- :width="90"--> <!-- :width="90"-->
<!-- fixed="right"--> <!-- fixed="right"-->
<!-- >--> <!-- >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <icon-list--> <!-- <icon-list-->
<!-- :msg="editIndex !== scope.$index?iconMsg:iconMsgSave"--> <!-- :msg="editIndex !== scope.$index?iconMsg:iconMsgSave"-->
<!-- :row-data="scope.row"--> <!-- :row-data="scope.row"-->
<!-- :row-index="scope.$index"--> <!-- :row-index="scope.$index"-->
<!-- @on-result-change="_iconClick"--> <!-- @on-result-change="_iconClick"-->
<!-- />--> <!-- />-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
</element-table> </element-table>
</Col> </Col>
</Row> </Row>
...@@ -139,25 +144,25 @@ export default { ...@@ -139,25 +144,25 @@ export default {
return { return {
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 160, width: 120,
fixed: 'left', fixed: 'left',
align: 'center' align: 'center'
}, },
{ title: '牌号', key: 'name', width: 120, align: 'center' },
{ title: '价类', key: 'category', width: 120, align: 'center' },
{ {
title: '制备类型', title: '卷制标准版本号',
key: 'type', key: 'standard',
width: 160, width: 160,
align: 'center' align: 'center'
}, },
{ title: '物品名称', key: 'name', width: 160, align: 'center' }, { title: '机台', key: 'samplePoint', width: 110, align: 'center' },
{ title: '物品编号', key: 'code', width: 160, align: 'center' },
{ title: '检测类型', key: 'category', width: 160, align: 'center' },
{ {
title: '制备质量', title: '留样数量',
key: 'quantity', key: 'quantity',
width: 160, width: 120,
align: 'center' align: 'center'
}, },
{ {
...@@ -167,13 +172,12 @@ export default { ...@@ -167,13 +172,12 @@ export default {
align: 'center' align: 'center'
}, },
{ {
title: '制备时间', title: '开始留样时间',
key: 'keepTime', key: 'ctime',
width: 160, width: 120,
align: 'center', data: true,
datetime: true align: 'center'
}, },
// { title: '单位', key: 'unit', width: 160, align: 'center' },
{ {
title: '存储期限(天)', title: '存储期限(天)',
key: 'timeLimit', key: 'timeLimit',
......
pages/drug-sample-keep/tabs/preparationManageHistory.vue
...@@ -10,14 +10,11 @@ ...@@ -10,14 +10,11 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="牌号:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入牌号" clearable @on-enter="_formSearch" />
</Form-item>
<Form-item label="检测类型:" class="search-item" prop="type">
<Input name="category" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch"> <Button type="primary" @click="_formSearch">
...@@ -25,10 +22,10 @@ ...@@ -25,10 +22,10 @@
</Button> </Button>
</Form-item> </Form-item>
</Form> </Form>
<Col> <Col />
<!--<btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />--> <!--<btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />-->
</Col> </Col>
<Col> <Col />
<element-table <element-table
ref="pageTable" ref="pageTable"
:page-columns="pageColumns" :page-columns="pageColumns"
...@@ -74,39 +71,42 @@ export default { ...@@ -74,39 +71,42 @@ export default {
return { return {
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 160, width: 120,
fixed: 'left', fixed: 'left',
align: 'center' align: 'center'
}, },
{ title: '牌号', key: 'name', width: 120, align: 'center' },
{ title: '价类', key: 'category', width: 120, align: 'center' },
{ {
title: '制备类型', title: '卷制标准版本号',
key: 'type', key: 'standard',
width: 160, width: 160,
align: 'center' align: 'center'
}, },
{ title: '物料名称', key: 'name', width: 160, align: 'center' }, { title: '机台', key: 'samplePoint', width: 110, align: 'center' },
{ title: '物料编号', key: 'code', width: 160, align: 'center' },
{ title: '检测类型', key: 'category', width: 160, align: 'center' },
{ title: '状态', key: 'status', width: 160, align: 'center' },
{ title: '处理人', key: 'handler', width: 160, align: 'center' },
{ {
title: '处理时间', title: '留样数量',
key: 'handleTime', key: 'quantity',
width: 160, width: 120,
align: 'center', align: 'center'
datetime: true
}, },
{ {
title: '制备质量', title: '单位',
key: 'quantity', key: 'unit',
width: 160, width: 160,
align: 'center' align: 'center'
}, },
// { title: '单位', key: 'unit', width: 160, align: 'center' },
{ {
title: '存储期限', title: '开始留样时间',
key: 'ctime',
width: 120,
data: true,
align: 'center'
},
{
title: '存储期限(天)',
key: 'timeLimit', key: 'timeLimit',
width: 160, width: 160,
align: 'center' align: 'center'
...@@ -115,6 +115,14 @@ export default { ...@@ -115,6 +115,14 @@ export default {
title: '存储位置', title: '存储位置',
key: 'position', key: 'position',
align: 'center' align: 'center'
},
{ title: '处理人', key: 'handler', width: 160, align: 'center' },
{
title: '处理时间',
key: 'handleTime',
width: 160,
align: 'center',
datetime: true
} }
], ],
getPage: {}, getPage: {},
......
pages/drug-sample-make/Preparation.vue
...@@ -183,7 +183,7 @@ export default { ...@@ -183,7 +183,7 @@ export default {
iconMsg: [{ id: '', type: 'pt-a-trash', name: '删除' }], iconMsg: [{ id: '', type: 'pt-a-trash', name: '删除' }],
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 120, width: 120,
fixed: 'left', fixed: 'left',
......
pages/drug-sample-make/preparationDetail.vue
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<Row> <Row>
<Form id="preparation-detail-form" onsubmit="return false" class="search-form" inline :label-width="70"> <Form id="preparation-detail-form" onsubmit="return false" class="search-form" inline :label-width="70">
<label class="label-sign" /> <label class="label-sign" />
<!-- <Form-item class="search-item" label="样本号:">--> <!-- <Form-item class="search-item" label="样本编号:">-->
<!-- <Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" />--> <!-- <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />-->
<!-- </Form-item>--> <!-- </Form-item>-->
<!-- <Form-item class="search-item" label="物料名称:">--> <!-- <Form-item class="search-item" label="物料名称:">-->
<!-- <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />--> <!-- <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />-->
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
btn: [{ id: '', type: 'primary', name: '打印标签' }], btn: [{ id: '', type: 'primary', name: '打印标签' }],
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-sample-make/samplePreparationDetail.vue
...@@ -27,7 +27,7 @@ table { ...@@ -27,7 +27,7 @@ table {
<table class="tableClass"> <table class="tableClass">
<tbody> <tbody>
<tr> <tr>
<th>样本号</th> <th>样本编号</th>
<td>{{formObj.sampleCode?formObj.sampleCode:''}}</td> <td>{{formObj.sampleCode?formObj.sampleCode:''}}</td>
<th>检测类型</th> <th>检测类型</th>
<td>{{formObj.category?formObj.category:''}}</td> <td>{{formObj.category?formObj.category:''}}</td>
......
pages/drug-sample-make/tabs/samplePreparation.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
btn: [{ id: '', type: 'primary', name: '制备' }], btn: [{ id: '', type: 'primary', name: '制备' }],
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 150, width: 150,
fixed: 'left', fixed: 'left',
......
pages/drug-sample-make/tabs/samplePreparationRecord.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
return { return {
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-sample-receive/tabs/historyTask.vue
...@@ -10,17 +10,17 @@ ...@@ -10,17 +10,17 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="牌号:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入牌号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="请检时间:"> <Form-item class="search-item" label="生产日期:">
<Date-picker <Date-picker
ref="pcTime" ref="pcTime"
type="datetimerange" type="datetimerange"
placeholder="请检时间" placeholder="生产日期"
style="width: 100%;" style="width: 100%;"
transfer transfer
:editable="false" :editable="false"
...@@ -32,24 +32,6 @@ ...@@ -32,24 +32,6 @@
<!--<Form-item class="search-item" label="报检单位:">--> <!--<Form-item class="search-item" label="报检单位:">-->
<!--<Input name="declarationInspection" placeholder="请输入报检单位" clearable @on-enter="_formSearch" />--> <!--<Input name="declarationInspection" placeholder="请输入报检单位" clearable @on-enter="_formSearch" />-->
<!--</Form-item>--> <!--</Form-item>-->
<Form-item class="search-item" label="送样人:">
<Input name="sender" placeholder="请输入送样人" clearable @on-enter="_formSearch" />
</Form-item>
<Form-item class="search-item" label="送样时间:">
<Date-picker
ref="sendTime"
type="datetimerange"
placeholder="送样人接收时间"
style="width: 100%;"
transfer
:editable="false"
@on-change="_receiveTimeChange"
/>
<input type="hidden" name="sendTimeBegin">
<input type="hidden" name="sendTimeEnd">
</Form-item>
<Form-item class="search-item" label="接收时间:"> <Form-item class="search-item" label="接收时间:">
<Date-picker <Date-picker
...@@ -70,10 +52,10 @@ ...@@ -70,10 +52,10 @@
</Button> </Button>
</Form-item> </Form-item>
</Form> </Form>
<Col> <Col />
<!--<btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />--> <!--<btn-list :msg="btn" :open="searchOpen" show-search-btn="true" @on-result-change="_btnClick" />-->
</Col> </Col>
<Col> <Col />
<element-table <element-table
ref="pageTable" ref="pageTable"
:page-columns="pageColumns" :page-columns="pageColumns"
...@@ -95,7 +77,7 @@ ...@@ -95,7 +77,7 @@
> >
<template slot-scope="scope" @click.stop="_handleIndex(scope)"> <template slot-scope="scope" @click.stop="_handleIndex(scope)">
<span v-if="item.datetime"> <span v-if="item.datetime">
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }} {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
</span> </span>
<span v-else-if="item.key==='status'"> <span v-else-if="item.key==='status'">
{{ scope.row[item.key]?scope.row[item.key].display:'' }} {{ scope.row[item.key]?scope.row[item.key].display:'' }}
...@@ -140,32 +122,42 @@ export default { ...@@ -140,32 +122,42 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 140,
fixed: 'left', fixed: 'left',
align: 'center' align: 'center'
}, },
{ title: '物品名称', key: 'name', width: 200, align: 'center' }, { title: '牌号', key: 'name', width: 120, align: 'center' },
{
title: '卷制标准版本号',
key: 'standard',
width: 140,
align: 'center'
},
{ {
title: '接收人', title: '接收人',
key: 'receiver', key: 'receiver',
align: 'center' align: 'center',
width: 120
}, },
{ {
title: '接收时间', title: '接收时间',
key: 'receiveTime', key: 'receiveTime',
align: 'center', align: 'center',
datetime: true datetime: true,
width: 150
}, },
{ title: '物品编号', key: 'code', width: 200, align: 'center' }, { title: '价类', key: 'category', width: 140, align: 'center' },
{ title: '检测类型', key: 'category', width: 150, align: 'center' }, { title: '机台', key: 'samplePoint', width: 140, align: 'center' },
{ title: '班别', key: 'classBan', width: 130, align: 'center' },
{ {
title: '请检时间', title: '生产日期',
key: 'pcTime', key: 'pcTime',
align: 'center', align: 'center',
datetime: true datetime: true,
width: 150
} }
], ],
sendTime: '', sendTime: '',
...@@ -205,7 +197,6 @@ export default { ...@@ -205,7 +197,6 @@ export default {
$(this).val('') $(this).val('')
}) })
this.$refs.pcTime.handleClear() this.$refs.pcTime.handleClear()
this.$refs.sendTime.handleClear()
this.$refs.receiveTime.handleClear() this.$refs.receiveTime.handleClear()
}, },
_btnClick(msg, data) { _btnClick(msg, data) {
...@@ -268,10 +259,6 @@ export default { ...@@ -268,10 +259,6 @@ export default {
$('input[name="pcTimeBegin"]').val(data[0]) $('input[name="pcTimeBegin"]').val(data[0])
$('input[name="pcTimeEnd"]').val(data[1]) $('input[name="pcTimeEnd"]').val(data[1])
}, },
_receiveTimeChange(data) {
$('input[name="sendTimeBegin"]').val(data[0])
$('input[name="sendTimeEnd"]').val(data[1])
},
_labTimeChange(data) { _labTimeChange(data) {
$('input[name="receiveTimeBegin"]').val(data[0]) $('input[name="receiveTimeBegin"]').val(data[0])
$('input[name="receiveTimeEnd"]').val(data[1]) $('input[name="receiveTimeEnd"]').val(data[1])
......
pages/drug-sample-receive/tabs/labSampleReceive.vue
...@@ -10,17 +10,17 @@ ...@@ -10,17 +10,17 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="牌号:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入牌号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="报检时间:"> <Form-item class="search-item" label="生产日期:">
<Date-picker <Date-picker
ref="sampleTime" ref="sampleTime"
type="datetimerange" type="date"
placeholder="报检时间" placeholder="生产日期"
style="width: 100%;" style="width: 100%;"
:editable="false" :editable="false"
transfer transfer
...@@ -114,35 +114,35 @@ export default { ...@@ -114,35 +114,35 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 140,
fixed: 'left', fixed: 'left',
align: 'center' align: 'center'
}, },
{ title: '物料名称', key: 'name', width: 200, align: 'center' }, { title: '牌号', key: 'name', width: 130, align: 'center' },
{
title: '卷制标准版本号',
key: 'standard',
width: 180,
align: 'center'
},
{ title: '机台', key: 'samplePoint', width: 120, align: 'center' },
{ title: '班别', key: 'classBan', width: 120, align: 'center' },
{ {
title: '状态', title: '状态',
key: 'progress', key: 'progress',
width: 200, width: 120,
status: true, status: true,
align: 'center' align: 'center'
}, },
{ title: '价类', key: 'category', width: 120, align: 'center' },
{ {
title: '送样人接收时间', title: '生产日期',
key: 'sendTime',
align: 'center',
datetime: true
},
{ title: '检测类型', key: 'category', width: 200, align: 'center' },
{ title: '物品编号', key: 'code', width: 200, align: 'center' },
{
title: '请检时间',
key: 'pcTime', key: 'pcTime',
align: 'center', align: 'center',
datetime: true datetime: true
}, }
{ title: '送样人', key: 'sender', align: 'center' }
], ],
btn: [ btn: [
{ id: '', type: 'primary', name: '扫码接收' }, { id: '', type: 'primary', name: '扫码接收' },
......
pages/drug-sample-send/receiveScan.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</p> </p>
<div> <div>
<Form :label-width="80" onsubmit="return false"> <Form :label-width="80" onsubmit="return false">
<Form-item label="样本号" prop="num"> <Form-item label="样本编号" prop="num">
<Input <Input
ref="inputFocus" ref="inputFocus"
v-model="num" v-model="num"
......
pages/drug-sample-send/tabs/historyTask.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-sample-send/tabs/sendSamplerReceive.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/drug-test-allocate/tabs/ItemDispatchLeftList.vue
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
// { type: 'success', id: '', name: '自动分配' } // { type: 'success', id: '', name: '自动分配' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 120 }, { title: '样本编号', key: 'sampleCode', width: 120 },
{ title: '物品名称', key: 'name', width: 100 }, { title: '物品名称', key: 'name', width: 100 },
{ title: '物品编号', key: 'code', width: 100 }, { title: '物品编号', key: 'code', width: 100 },
{ title: '请检时间', key: 'pcTime', dateTime: true, width: 140 } { title: '请检时间', key: 'pcTime', dateTime: true, width: 140 }
......
pages/drug-test-allocate/tabs/ItemDispatchRightList.vue
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
btn: [{ type: 'success', id: '', name: '按人分配' }], btn: [{ type: 'success', id: '', name: '按人分配' }],
pageColumns: [ pageColumns: [
{ title: '检测项目', key: 'name', width: 150 }, { title: '检测项目', key: 'name', width: 150 },
{ title: '样本号', key: 'sampleCode', width: 150 }, { title: '样本编号', key: 'sampleCode', width: 150 },
{ title: '检测人', key: 'testers', width: 150 }, { title: '检测人', key: 'testers', width: 150 },
{ title: '业务类型', key: 'category', width: 150 }, { title: '业务类型', key: 'category', width: 150 },
{ title: '检测依据', key: 'code', width: 150 }, { title: '检测依据', key: 'code', width: 150 },
......
pages/drug-test-allocate/tabs/ItemLeftList.vue
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
searchOpen: true, searchOpen: true,
btn: [], btn: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 120 }, { title: '样本编号', key: 'sampleCode', width: 120 },
{ title: '物品名称', key: 'name', width: 100 }, { title: '物品名称', key: 'name', width: 100 },
{ title: '物品编号', key: 'code', width: 100 }, { title: '物品编号', key: 'code', width: 100 },
{ title: '请检时间', key: 'pcTime', dateTime: true, width: 140 } { title: '请检时间', key: 'pcTime', dateTime: true, width: 140 }
......
pages/drug-test-allocate/tabs/ItemRightList.vue
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
btn: [{ type: 'success', id: '', name: '按人分配' }], btn: [{ type: 'success', id: '', name: '按人分配' }],
pageColumns: [ pageColumns: [
{ title: '检测项目', key: 'name' }, { title: '检测项目', key: 'name' },
{ title: '样本号', key: 'sampleCode' }, { title: '样本编号', key: 'sampleCode' },
{ title: '业务类型', key: 'category' }, { title: '业务类型', key: 'category' },
{ title: '检测依据', key: 'code' }, { title: '检测依据', key: 'code' },
{ title: '检测依据名称', key: 'standardName' }, { title: '检测依据名称', key: 'standardName' },
......
pages/drug-test-audit/tabs/ItemLeftList.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="牌号:">
<Input v-model="formObj.name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入牌号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="样品编号:"> <Form-item class="search-item" label="样品编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch" />
...@@ -83,10 +83,10 @@ export default { ...@@ -83,10 +83,10 @@ export default {
// { type: 'success', id: '', name: '自动分配' } // { type: 'success', id: '', name: '自动分配' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 120 }, { title: '样本编号', key: 'sampleCode', width: 120 },
{ title: '物品名称', key: 'name', width: 100 }, { title: '牌号', key: 'name', width: 100 },
{ title: '物品编号', key: 'code', width: 100 }, { title: '机台', key: 'samplePoint', width: 100 },
{ title: '请检时间', key: 'pcTime', dateTime: true, width: 140 } { title: '生产日期', key: 'pcTime', dateTime: true, width: 140 }
], ],
getPage: {}, getPage: {},
iconMsg: [ iconMsg: [
......
pages/drug-test-audit/tabs/ItemRightList.vue
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
btn: [{ type: 'success', id: '', name: '按人分配' }], btn: [{ type: 'success', id: '', name: '按人分配' }],
pageColumns: [ pageColumns: [
{ title: '检测项目', key: 'name' }, { title: '检测项目', key: 'name' },
{ title: '样本号', key: 'sampleCode' }, { title: '样本编号', key: 'sampleCode' },
{ title: '业务类型', key: 'category' }, { title: '业务类型', key: 'category' },
{ title: '检测值', key: 'testValue', width: 120 }, { title: '检测值', key: 'testValue', width: 120 },
{ title: '缺陷', key: 'defects', width: 120 }, { title: '缺陷', key: 'defects', width: 120 },
......
pages/drug-test-audit/tabs/dataReviewHis.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="检测项目:"> <Form-item class="search-item" label="检测项目:">
<Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
}, },
selectIds: [], selectIds: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: true }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: true },
{ title: '检测项目', key: 'name', width: 120 }, { title: '检测项目', key: 'name', width: 120 },
{ title: '状态', key: 'status', width: 120, status: true }, { title: '状态', key: 'status', width: 120, status: true },
{ title: '检测结果', key: 'testValue', width: 120 }, { title: '检测结果', key: 'testValue', width: 120 },
......
pages/drug-test-check/tabs/ItemLeftList.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="牌号:">
<Input v-model="formObj.name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入牌号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="样品编号:"> <Form-item class="search-item" label="样品编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch" />
...@@ -83,10 +83,10 @@ export default { ...@@ -83,10 +83,10 @@ export default {
// { type: 'success', id: '', name: '自动分配' } // { type: 'success', id: '', name: '自动分配' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 120 }, { title: '样本编号', key: 'sampleCode', width: 120 },
{ title: '物品名称', key: 'name', width: 100 }, { title: '牌号', key: 'name', width: 100 },
{ title: '物品编号', key: 'code', width: 100 }, { title: '机台', key: 'samplePoint', width: 100 },
{ title: '请检时间', key: 'pcTime', dateTime: true, width: 140 } { title: '生产日期', key: 'pcTime', dateTime: true, width: 140 }
], ],
getPage: {}, getPage: {},
iconMsg: [ iconMsg: [
......
pages/drug-test-check/tabs/ItemRightList.vue
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
btn: [{ type: 'success', id: '', name: '按人分配' }], btn: [{ type: 'success', id: '', name: '按人分配' }],
pageColumns: [ pageColumns: [
{ title: '检测项目', key: 'name', width: 120 }, { title: '检测项目', key: 'name', width: 120 },
{ title: '样本号', key: 'sampleCode', width: 120 }, { title: '样本编号', key: 'sampleCode', width: 120 },
{ title: '检测值', key: 'testValue', width: 120 }, { title: '检测值', key: 'testValue', width: 120 },
{ title: '缺陷', key: 'defects', width: 120 }, { title: '缺陷', key: 'defects', width: 120 },
{ title: '业务类型', key: 'category', width: 120 }, { title: '业务类型', key: 'category', width: 120 },
......
pages/drug-test-check/tabs/dataReviewHis.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="检测项目:"> <Form-item class="search-item" label="检测项目:">
<Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
}, },
selectIds: [], selectIds: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: true }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: true },
{ title: '检测项目', key: 'name', width: 120 }, { title: '检测项目', key: 'name', width: 120 },
{ title: '状态', key: 'status', width: 120, status: true }, { title: '状态', key: 'status', width: 120, status: true },
{ title: '检测结果', key: 'testValue', width: 120 }, { title: '检测结果', key: 'testValue', width: 120 },
...@@ -134,7 +134,7 @@ export default { ...@@ -134,7 +134,7 @@ export default {
}, },
{ title: '是否填写原始记录', key: 'recordWriiten', width: 160 }, { title: '是否填写原始记录', key: 'recordWriiten', width: 160 },
{ title: '仪器设备', key: 'equipName', width: 160 }, { title: '仪器设备', key: 'equipName', width: 160 },
{ title: '检测类型', key: 'category', width: 150 }, { title: '价类', key: 'category', width: 150 },
{ title: '检测依据', key: 'standardCode', width: 160 }, { title: '检测依据', key: 'standardCode', width: 160 },
{ title: '检测依据名称', key: 'standardName', width: 200 }, { title: '检测依据名称', key: 'standardName', width: 200 },
{ title: '检测科室', key: 'groupName', width: 200 }, { title: '检测科室', key: 'groupName', width: 200 },
......
pages/drug-test-consult/dataTestConsult.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="检测项目:"> <Form-item class="search-item" label="检测项目:">
<Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
}, },
selectIds: [], selectIds: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: true }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: true },
{ title: '检测项目', key: 'name', width: 120 }, { title: '检测项目', key: 'name', width: 120 },
{ title: '状态', key: 'status', width: 120, status: true }, { title: '状态', key: 'status', width: 120, status: true },
{ title: '检测结果', key: 'testValue', width: 120 }, { title: '检测结果', key: 'testValue', width: 120 },
......
pages/drug-test-input/dataEntryIndex.vue
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<el-tab-pane label="数据录入" name="entry"> <el-tab-pane label="数据录入" name="entry">
<dataEntry ref="entryTabs" /> <dataEntry ref="entryTabs" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待检任务" name="wait"> <!-- <el-tab-pane label="待检任务" name="wait">-->
<taskWait ref="waitTabs" /> <!-- <taskWait ref="waitTabs" />-->
</el-tab-pane> <!-- </el-tab-pane>-->
<el-tab-pane label="历史任务" name="his"> <el-tab-pane label="历史任务" name="his">
<taskHis ref="hisTabs" /> <taskHis ref="hisTabs" />
</el-tab-pane> </el-tab-pane>
...@@ -18,11 +18,10 @@ ...@@ -18,11 +18,10 @@
</div> </div>
</template> </template>
<script> <script>
import taskWait from './tabs/taskWait'
import dataEntry from './tabs/dataEntry' import dataEntry from './tabs/dataEntry'
import taskHis from './tabs/taskHis' import taskHis from './tabs/taskHis'
export default { export default {
components: { dataEntry, taskWait, taskHis }, components: { dataEntry, taskHis },
data() { data() {
return { return {
activeName: 'entry' activeName: 'entry'
......
pages/drug-test-input/tabs/taskHis.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.sampleName" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleName" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -107,8 +107,8 @@ export default { ...@@ -107,8 +107,8 @@ export default {
selectIds: [], selectIds: [],
selectData: [], selectData: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: true }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: true },
{ title: '物料名称', key: 'sampleName', width: 120 }, { title: '牌号', key: 'sampleName', width: 120 },
{ title: '检测项目', key: 'name', width: 120 }, { title: '检测项目', key: 'name', width: 120 },
{ {
title: '状态', title: '状态',
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
width: 140, width: 140,
singleJudge: true singleJudge: true
}, },
{ title: '检测类型', key: 'category', width: 150 }, { title: '价类', key: 'category', width: 150 },
{ title: '检测依据', key: 'code', width: 160 }, { title: '检测依据', key: 'code', width: 160 },
{ title: '检测依据名称', key: 'standardName', width: 200 }, { title: '检测依据名称', key: 'standardName', width: 200 },
{ title: '检测科室', key: 'groupName', width: 120 }, { title: '检测科室', key: 'groupName', width: 120 },
......
pages/drug-test-input/tabs/taskWait.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
}, },
selectIds: [], selectIds: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 200, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 200, fixed: 'left' },
{ title: '状态', key: 'status', width: 200, status: true }, { title: '状态', key: 'status', width: 200, status: true },
{ title: '物品名称', key: 'name', width: 200 }, { title: '物品名称', key: 'name', width: 200 },
{ title: '物品编码', key: 'code', width: 200 }, { title: '物品编码', key: 'code', width: 200 },
......
pages/env/env-item-input/data-entry/fillResult.vue
...@@ -207,7 +207,7 @@ export default { ...@@ -207,7 +207,7 @@ export default {
pageColumns: [ pageColumns: [
{ title: '检测项目', key: 'name', width: 120, fixed: true }, { title: '检测项目', key: 'name', width: 120, fixed: true },
{ title: '状态', key: 'progress', width: 120, status: true }, { title: '状态', key: 'progress', width: 120, status: true },
{ title: '样本号', key: 'sampleCode', width: 150 }, { title: '样本编号', key: 'sampleCode', width: 150 },
{ title: '检测结果', key: 'testValue', width: 160 }, { title: '检测结果', key: 'testValue', width: 160 },
{ title: '单位', key: 'unit', width: 100 }, { title: '单位', key: 'unit', width: 100 },
{ title: '是否系统判定', key: 'judged', width: 120, judged: true }, { title: '是否系统判定', key: 'judged', width: 120, judged: true },
......
pages/env/env-item-input/tabs/dataEntry.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -98,7 +98,7 @@ export default { ...@@ -98,7 +98,7 @@ export default {
], ],
selectIds: [], selectIds: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 160, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 160, fixed: 'left' },
{ title: '状态', key: 'progress', width: 140, status: true }, { title: '状态', key: 'progress', width: 140, status: true },
{ title: '点位名称', key: 'name', width: 140 }, { title: '点位名称', key: 'name', width: 140 },
{ title: '点位编码', key: 'code', width: 150 }, { title: '点位编码', key: 'code', width: 150 },
......
pages/env/env-item-input/tabs/taskHis.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.sampleName" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleName" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
selectIds: [], selectIds: [],
selectData: [], selectData: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: true }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: true },
{ title: '物料名称', key: 'sampleName', width: 120 }, { title: '物料名称', key: 'sampleName', width: 120 },
{ title: '检测项目', key: 'name', width: 120 }, { title: '检测项目', key: 'name', width: 120 },
{ {
......
pages/env/env-item-input/tabs/taskWait.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
}, },
selectIds: [], selectIds: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 200, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 200, fixed: 'left' },
{ title: '状态', key: 'status', width: 200, status: true }, { title: '状态', key: 'status', width: 200, status: true },
{ title: '物品名称', key: 'name', width: 200 }, { title: '物品名称', key: 'name', width: 200 },
{ title: '物品编码', key: 'code', width: 200 }, { title: '物品编码', key: 'code', width: 200 },
......
pages/env/env-plan-check/EnvPlanEdit.vue
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/env/env-plan-check/tabs/EnvPlanCheck.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -96,7 +96,7 @@ export default { ...@@ -96,7 +96,7 @@ export default {
{ type: 'primary', id: '', name: '驳回' } { type: 'primary', id: '', name: '驳回' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ title: '状态', key: 'status', status: true, width: 120 }, { title: '状态', key: 'status', status: true, width: 120 },
{ title: '点位名称', key: 'name', width: 120 }, { title: '点位名称', key: 'name', width: 120 },
......
pages/env/env-plan-check/tabs/EnvPlanCheckHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
inspectionEnd: '' inspectionEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/env/env-plan-execute/EnvPlanEdit.vue
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/env/env-plan-execute/tabs/EnvPlanExecute.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
{ type: 'success', id: '', name: '提交' } { type: 'success', id: '', name: '提交' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ title: '状态', key: 'status', status: true, width: 120 }, { title: '状态', key: 'status', status: true, width: 120 },
{ title: '点位名称', key: 'name', width: 120 }, { title: '点位名称', key: 'name', width: 120 },
......
pages/env/env-plan-execute/tabs/EnvPlanExecuteHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
inspectionEnd: '' inspectionEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/env/env-report-check/tabs/historyTask.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="物品名称:">
<Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" />
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/env/env-report-check/tabs/reportCheck.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/env/env-report-issue/tabs/historyTask.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="物品名称:">
<Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" />
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/env/env-report-issue/tabs/reportIssue.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/env/env-report-make/createReport.vue
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
style="width: 100%" style="width: 100%"
:default-sort="{prop: 'date', order: 'descending'}" :default-sort="{prop: 'date', order: 'descending'}"
> >
<el-table-column prop="sampleCode" label="样本号" sortable /> <el-table-column prop="sampleCode" label="样本编号" sortable />
<el-table-column prop="name" label="物料名称" sortable /> <el-table-column prop="name" label="物料名称" sortable />
<el-table-column prop="reportSn" label="报告编号" sortable> <el-table-column prop="reportSn" label="报告编号" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
......
pages/env/env-report-make/tabs/historyTask.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物品名称:"> <Form-item class="search-item" label="物品名称:">
<Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物品名称" clearable @on-enter="_formSearch" />
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/env/env-report-make/tabs/reportMake.vue
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input name="sampleNum" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input name="sampleNum" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input name="name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
name: '', name: '',
pageColumns: [ pageColumns: [
{ {
title: '样本号', title: '样本编号',
key: 'sampleCode', key: 'sampleCode',
width: 200, width: 200,
fixed: 'left', fixed: 'left',
......
pages/env/env-test-audit/tabs/ItemLeftList.vue
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
// { type: 'success', id: '', name: '自动分配' } // { type: 'success', id: '', name: '自动分配' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 120 }, { title: '样本编号', key: 'sampleCode', width: 120 },
{ title: '物品名称', key: 'name', width: 100 }, { title: '物品名称', key: 'name', width: 100 },
{ title: '物品编号', key: 'code', width: 100 }, { title: '物品编号', key: 'code', width: 100 },
{ title: '请检时间', key: 'pcTime', dateTime: true, width: 140 } { title: '请检时间', key: 'pcTime', dateTime: true, width: 140 }
......
pages/env/env-test-audit/tabs/ItemRightList.vue
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
btn: [{ type: 'success', id: '', name: '按人分配' }], btn: [{ type: 'success', id: '', name: '按人分配' }],
pageColumns: [ pageColumns: [
{ title: '检测项目', key: 'name' }, { title: '检测项目', key: 'name' },
{ title: '样本号', key: 'sampleCode' }, { title: '样本编号', key: 'sampleCode' },
{ title: '业务类型', key: 'category' }, { title: '业务类型', key: 'category' },
{ title: '检测依据', key: 'code' }, { title: '检测依据', key: 'code' },
{ title: '检测依据名称', key: 'standardName' }, { title: '检测依据名称', key: 'standardName' },
......
pages/env/env-test-audit/tabs/dataReviewHis.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="检测项目:"> <Form-item class="search-item" label="检测项目:">
<Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
}, },
selectIds: [], selectIds: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: true }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: true },
{ title: '检测项目', key: 'name', width: 120 }, { title: '检测项目', key: 'name', width: 120 },
{ title: '状态', key: 'status', width: 120, status: true }, { title: '状态', key: 'status', width: 120, status: true },
{ title: '检测结果', key: 'testValue', width: 120 }, { title: '检测结果', key: 'testValue', width: 120 },
......
pages/env/env-test-check/tabs/ItemLeftList.vue
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
// { type: 'success', id: '', name: '自动分配' } // { type: 'success', id: '', name: '自动分配' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 120 }, { title: '样本编号', key: 'sampleCode', width: 120 },
{ title: '物品名称', key: 'name', width: 100 }, { title: '物品名称', key: 'name', width: 100 },
{ title: '物品编号', key: 'code', width: 100 }, { title: '物品编号', key: 'code', width: 100 },
{ title: '请检时间', key: 'pcTime', dateTime: true, width: 140 } { title: '请检时间', key: 'pcTime', dateTime: true, width: 140 }
......
pages/env/env-test-check/tabs/ItemRightList.vue
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
btn: [{ type: 'success', id: '', name: '按人分配' }], btn: [{ type: 'success', id: '', name: '按人分配' }],
pageColumns: [ pageColumns: [
{ title: '检测项目', key: 'name' }, { title: '检测项目', key: 'name' },
{ title: '样本号', key: 'sampleCode' }, { title: '样本编号', key: 'sampleCode' },
{ title: '业务类型', key: 'category' }, { title: '业务类型', key: 'category' },
{ title: '检测依据', key: 'code' }, { title: '检测依据', key: 'code' },
{ title: '检测依据名称', key: 'standardName' }, { title: '检测依据名称', key: 'standardName' },
......
pages/env/env-test-check/tabs/dataReviewHis.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="检测项目:"> <Form-item class="search-item" label="检测项目:">
<Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
}, },
selectIds: [], selectIds: [],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: true }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: true },
{ title: '检测项目', key: 'name', width: 120 }, { title: '检测项目', key: 'name', width: 120 },
{ title: '状态', key: 'status', width: 120, status: true }, { title: '状态', key: 'status', width: 120, status: true },
{ title: '检测结果', key: 'testValue', width: 120 }, { title: '检测结果', key: 'testValue', width: 120 },
......
pages/env/env-test-plan/EnvPlanEdit.vue
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/env/env-test-plan/tabs/EnvPlan.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
{ type: '', id: '', name: '提交' } { type: '', id: '', name: '提交' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ title: '状态', key: 'status', status: true, width: 120 }, { title: '状态', key: 'status', status: true, width: 120 },
{ title: '点位名称', key: 'name', width: 120 }, { title: '点位名称', key: 'name', width: 120 },
......
pages/env/env-test-plan/tabs/EnvPlanHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
inspectionEnd: '' inspectionEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/env/env-test-stable-plan/EnvPlanEdit.vue
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/env/env-test-stable-plan/tabs/EnvPlan.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
{ type: '', id: '', name: '提交' } { type: '', id: '', name: '提交' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ title: '状态', key: 'status', status: true, width: 120 }, { title: '状态', key: 'status', status: true, width: 120 },
{ title: '点位名称', key: 'name', width: 120 }, { title: '点位名称', key: 'name', width: 120 },
......
pages/env/env-test-stable-plan/tabs/EnvPlanHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
inspectionEnd: '' inspectionEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/oos/oos-check/tabs/OosPlanCheck.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -102,7 +102,7 @@ export default { ...@@ -102,7 +102,7 @@ export default {
{ type: 'primary', id: '', name: '驳回' } { type: 'primary', id: '', name: '驳回' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ title: '不合格项目数量', key: 'noItemNum', width: 140, type: true }, { title: '不合格项目数量', key: 'noItemNum', width: 140, type: true },
{ title: '状态', key: 'oosStatus', status: true, width: 120 }, { title: '状态', key: 'oosStatus', status: true, width: 120 },
......
pages/oos/oos-check/tabs/OosPlanCheckHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
inspectionEnd: '' inspectionEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/oos/oos-execute/OosExecuteEdit.vue
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
data() { data() {
// const validateNumber = function(rule, value, callback) { // const validateNumber = function(rule, value, callback) {
// if (!value) { // if (!value) {
// return callback(new Error('样本号不能为空!')) // return callback(new Error('样本编号不能为空!'))
// } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) { // } else if (!/^[^\u4e00-\u9fa5]+$/.test(value)) {
// return callback(new Error('不能包含中文!')) // return callback(new Error('不能包含中文!'))
// } else { // } else {
......
pages/oos/oos-execute/tabs/OosExecute.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -106,9 +106,9 @@ export default { ...@@ -106,9 +106,9 @@ export default {
// { type: 'primary', id: '', name: '驳回' } // { type: 'primary', id: '', name: '驳回' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ {
title: '不合格样本号', title: '不合格样本编号',
key: 'recheckCode', key: 'recheckCode',
width: 150, width: 150,
fixed: 'left' fixed: 'left'
......
pages/oos/oos-execute/tabs/OosExecuteHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -100,9 +100,9 @@ export default { ...@@ -100,9 +100,9 @@ export default {
inspectionEnd: '' inspectionEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ {
title: '不合格样本号', title: '不合格样本编号',
key: 'recheckCode', key: 'recheckCode',
width: 150, width: 150,
fixed: 'left' fixed: 'left'
......
pages/oos/oos-register/RegisterAdvice.vue
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
登记处理意见 登记处理意见
</p> </p>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="110"> <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="110">
<Form-item label="样本号" prop="sampleCode"> <Form-item label="样本编号" prop="sampleCode">
<Input <Input
v-model="formObj.sampleCode" v-model="formObj.sampleCode"
name="sampleCode" name="sampleCode"
placeholder="请输入样本号" placeholder="请输入样本编号"
clearable clearable
disabled disabled
/> />
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
formObj: defVal, formObj: defVal,
ruleValidate: { ruleValidate: {
sampleCode: [ sampleCode: [
{ required: true, message: '样本号不能为空!', trigger: 'blur' } { required: true, message: '样本编号不能为空!', trigger: 'blur' }
], ],
describable: [ describable: [
{ {
......
pages/oos/oos-register/tabs/OosRegisterPlan.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -102,7 +102,7 @@ export default { ...@@ -102,7 +102,7 @@ export default {
{ type: '', id: '', name: '提交' } { type: '', id: '', name: '提交' }
], ],
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ title: '不合格项目数量', key: 'noItemNum', width: 140, type: true }, { title: '不合格项目数量', key: 'noItemNum', width: 140, type: true },
{ title: '状态', key: 'oosProgress', status: true, width: 120 }, { title: '状态', key: 'oosProgress', status: true, width: 120 },
......
pages/oos/oos-register/tabs/OosRegisterPlanHis.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
inspectionEnd: '' inspectionEnd: ''
}, },
pageColumns: [ pageColumns: [
{ title: '样本号', key: 'sampleCode', width: 150, fixed: 'left' }, { title: '样本编号', key: 'sampleCode', width: 150, fixed: 'left' },
{ title: '检测类型', key: 'category', width: 120, type: true }, { title: '检测类型', key: 'category', width: 120, type: true },
{ {
title: '状态', title: '状态',
......
pages/staff/staff_scheduling/tabs/StaffScheduleList.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
......
pages/staff/staff_status/tabs/StaffStatusList.vue
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
class="search-form" class="search-form"
> >
<label class="label-sign" /> <label class="label-sign" />
<Form-item class="search-item" label="样本号:"> <Form-item class="search-item" label="样本编号:">
<Input v-model="formObj.sampleCode" placeholder="请输入样本号" clearable @on-enter="_formSearch" /> <Input v-model="formObj.sampleCode" placeholder="请输入样本编号" clearable @on-enter="_formSearch" />
</Form-item> </Form-item>
<Form-item class="search-item" label="物料名称:"> <Form-item class="search-item" label="物料名称:">
<Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" /> <Input v-model="formObj.name" placeholder="请输入物料名称" clearable @on-enter="_formSearch" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment