diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js
index a94bb0f..b12c7d5 100644
--- a/src/lang/en/template/dl.js
+++ b/src/lang/en/template/dl.js
@@ -1,6 +1,24 @@
//毒理
export default {
dl001: {},
+ dl007: {
+ sydd: 'Test Location',
+ yqsyxx: 'Instrument Usage Information',
+ yqbh: 'Instrument Number',
+ yqmc: 'Instrument Name',
+ yqxh: 'Instrument Model',
+ xccsjzjdrq: 'Next Test/Calibration/Verification Date',
+ czxx: 'Operation Information',
+ qxbd: 'Previous Form',
+ pykssj: 'Cultivation Start Time',
+ pyjssj: 'Cultivation End Time',
+ jsButton: 'End',
+ bz: 'Remarks'
+ },
+ dl008: {
+ cxqk: 'Imaging Status',
+ wrqk: 'Contamination Status'
+ },
dl020: {
swdljlbxx: '毒理记录表信息',
xbxx:'细胞信息',
diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js
index a94bb0f..f6f3b46 100644
--- a/src/lang/zh/template/dl.js
+++ b/src/lang/zh/template/dl.js
@@ -1,6 +1,24 @@
//毒理
export default {
dl001: {},
+ dl007: {
+ sydd: '试验地点',
+ yqsyxx: '仪器使用信息',
+ yqbh: '仪器编号',
+ yqmc: '仪器名称',
+ yqxh: '仪器型号',
+ xccsjzjdrq: '下次测试/校准/检定日期',
+ czxx: '操作信息',
+ qxbd: '前序表单',
+ pykssj: '培养开始时间',
+ pyjssj: '培养结束时间',
+ jsButton: '结束',
+ bz: '备注'
+ },
+ dl008: {
+ cxqk: '成像情况',
+ wrqk: '污染情况'
+ },
dl020: {
swdljlbxx: '毒理记录表信息',
xbxx:'细胞信息',
diff --git a/src/views/business/comps/template/comps/dl/DL007.vue b/src/views/business/comps/template/comps/dl/DL007.vue
index c3533cf..39f6dfd 100644
--- a/src/views/business/comps/template/comps/dl/DL007.vue
+++ b/src/views/business/comps/template/comps/dl/DL007.vue
@@ -11,15 +11,15 @@
-
+
onRegentSubmit(e)"
:showOperation="fillType === 'actFill'"
:showAddRow="fillType === 'actFill'"
@@ -37,18 +37,19 @@
@@ -68,6 +69,14 @@ import Step from '@/components/Template/Step'
import templateMixin from '../../mixins/templateMixin'
import moment from 'moment'
+const refConf = {
+ base: 'baseInfoRef',
+ yqsy: 'yqsyTableRef',
+ czInfo: 'czInfoRef',
+ remark: 'remarkRef'
+}
+const refNames = Object.values(refConf)
+
export default {
name: 'DL007',
components: {
@@ -125,13 +134,13 @@ export default {
},
{
type: 'conditionItem',
- label: '试验地点',
+ label: 'template.dl.dl007.sydd',
config: {
sydd: {
span: 1,
- label: '试验地点',
+ label: 'template.dl.dl007.sydd',
type: 'select',
- options: this.getDictOptions('business_cctj'),
+ options: this.getDictOptions('business_sydd'),
fillType: 'actFill',
otherCode: 'syddOther'
}
@@ -139,15 +148,15 @@ export default {
},
{
type: 'cellItem',
- label: '操作时间',
+ label: 'template.common.configurationTime',
config: {
- kssj: {
- label: '开始时间',
+ startDate: {
+ label: 'template.common.startTime',
type: 'input',
disabled: true
},
- jssj: {
- label: '结束时间',
+ endDate: {
+ label: 'template.common.endTime',
type: 'input',
disabled: true
}
@@ -159,13 +168,13 @@ export default {
yqsyColumns() {
return [
{
- label: '仪器编号',
+ label: 'template.dl.dl007.yqbh',
prop: 'yqbh',
bodyType: 'yq',
bodyFillType: 'actFill'
},
{
- label: '仪器名称',
+ label: 'template.dl.dl007.yqmc',
prop: 'yqmc',
bodyType: 'input',
bodyDisabled: true,
@@ -173,7 +182,7 @@ export default {
disabled: true
},
{
- label: '仪器型号',
+ label: 'template.dl.dl007.yqxh',
prop: 'yqxh',
bodyType: 'input',
bodyDisabled: true,
@@ -181,7 +190,7 @@ export default {
disabled: true
},
{
- label: '下次测试/检准/检定日期',
+ label: 'template.dl.dl007.xccsjzjdrq',
prop: 'jzrq',
bodyType: 'input',
bodyDisabled: true,
@@ -198,23 +207,25 @@ export default {
type: 'cellItem',
config: {
qxbd: {
- label: 'template.yp.yp002.qxbd',
+ label: 'template.dl.dl007.qxbd',
type: 'qxbd',
fillType: 'actFill',
filledCodes: ['bdmc', 'bdbh']
},
pykssj: {
- label: '培养开始时间',
+ label: 'template.dl.dl007.pykssj',
+ fillType: 'actFill',
type: 'input',
disabled: true
},
pyjssj: {
+ label: 'template.dl.dl007.pyjssj',
type: 'input',
fillType: 'actFill',
maxlength: 200,
subType: 'button',
subKey: 'pyjssjButton',
- buttonName: '获取时间'
+ buttonName: 'template.dl.dl007.jsButton'
}
}
}
@@ -223,68 +234,46 @@ export default {
},
data() {
return {
- formData: {}
+ formData: {},
+ refConf
}
},
- mounted() {},
methods: {
// 删除表格行
deleteTableRow(rowIndex, refName) {
this.$refs[refName].deleteRow(rowIndex)
},
// 点击按钮
- handleClickButton(item, signData) {
+ handleClickButton(_item, signData) {
this.$refs.czInfoRef.updateFormData(
'pyjssj',
moment().format('YYYY/MM/DD HH:mm'),
{ isUpdateRecord: true, signData }
)
},
- //获取已填写的表单数据
+ // 获取已填写的表单数据
getFilledFormData() {
- const baseData = this.$refs.baseInfoRef.getFilledFormData()
- const swypyjData = this.$refs.swypyjInfoRef.getFilledFormData()
- const ypjsData = this.$refs.ypjsInfoRef.getFilledFormData()
- const remarkData = this.$refs.remarkRef.getFilledFormData()
-
- return {
- ...baseData,
- ...swypyjData,
- ...ypjsData,
- ...remarkData
- }
+ return this.getFilledFormDataByRefs(refNames)
},
- //获取填写完成的表单数据
+ // 获取填写完成的表单数据
async getFormData() {
- //先校验再获取值
- const validFlag = await this.validFields()
- if (!validFlag) {
- return false
- }
- let content = this.getFilledFormData()
- return content
+ return await this.validFormFields(refNames)
},
- //只做校验
+ // 只做校验
async validFields() {
- // 构建需要验证的引用数组
- let refsToValidate = [
- 'baseInfoRef',
- 'yqsyTableRef',
- 'czInfoRef',
- 'remarkRef'
- ]
- return await this.validFormFields(refsToValidate)
+ return await this.validFormFields(refNames)
},
getResource() {
- let content = this.getFilledFormData()
- //使用的试剂、仪器
- this.resourceTmp = []
- this.yqResourceTmp = []
+ const stepResource = this.$refs.yqsyTableRef.getStepResource()
+ // 使用的试剂、仪器
+ this.resourceTmp = stepResource.sjResource || []
+ this.yqResourceTmp = stepResource.yqResource || []
return this.resourceTmp
},
onRegentSubmit(e) {
- const { selectInfo, key, col, rowIndex, colIndex, rowData } = e
+ const { selectInfo, key, rowIndex } = e
const { row } = selectInfo
+
if (key === 'yqbh') {
const params = {
yqmc: row.mc,
@@ -293,11 +282,11 @@ export default {
}
this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
}
+ if (key === 'qxbd') {
+ this.$refs.czInfoRef.updateFormData('pykssj', row.startDate)
+ }
},
- // beforeReagentSubmit(val,val1,val2){
- // debugger
- // },
- //保存
+ // 保存
async onSave() {
const formData = this.getStepResource()
console.log(formData, 'formData')
diff --git a/src/views/business/comps/template/comps/dl/DL008.vue b/src/views/business/comps/template/comps/dl/DL008.vue
index 76121fb..ce9aaa2 100644
--- a/src/views/business/comps/template/comps/dl/DL008.vue
+++ b/src/views/business/comps/template/comps/dl/DL008.vue
@@ -1,16 +1,339 @@
-
+
+
+
+

{{ formData.bdmc
+ }}

+
+
+
+
+
+
+
onRegentSubmit(e)"
+ :showOperation="fillType === 'actFill'"
+ :showAddRow="fillType === 'actFill'"
+ :formData="formData"
+ :prefixKey="`yqsyTable`"
+ >
+
+ deleteTableRow(rowIndex, 'yqsyTableRef')"
+ >
+
+
+
+
+
+
+
onRegentSubmit(e)"
+ :showOperation="fillType === 'actFill'"
+ :formData="formData"
+ :prefixKey="`cxqkTable`"
+ >
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 331a3ce..ac3a54e 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -33,6 +33,8 @@ export default {
'business_lba_jg', // LBA006-结果
'business_cftj', // 存放条件
'business_yplx', // 样品类型
+ 'business_sydd', // 毒理-Ames实验地点
+ 'business_dl_ameswrqk', // 毒理-Ames污染情况
],
props: {
templateData: {