diff --git a/src/api/business/gsp/gspFfjl.js b/src/api/business/gsp/gspFfjl.js index 38886e8..a0833bc 100644 --- a/src/api/business/gsp/gspFfjl.js +++ b/src/api/business/gsp/gspFfjl.js @@ -88,4 +88,12 @@ export function jq(data) { method: 'post', data: data }) +} + +export function statistics(query) { + return request({ + url: '/system/business/gspFfjl/statistics', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/api/business/gsp/gspRkjl.js b/src/api/business/gsp/gspRkjl.js index 16a100b..90292d8 100644 --- a/src/api/business/gsp/gspRkjl.js +++ b/src/api/business/gsp/gspRkjl.js @@ -104,4 +104,12 @@ export function jq(data) { method: 'post', data: data }) +} +//入库量统计 +export function sumRkl(query) { + return request({ + url: '/system/business/gspRkjl/sumRkl', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/lang/en/business/study/studyFormApply.js b/src/lang/en/business/study/studyFormApply.js index 6a690a0..758f653 100644 --- a/src/lang/en/business/study/studyFormApply.js +++ b/src/lang/en/business/study/studyFormApply.js @@ -65,4 +65,5 @@ export default { sywzmc: 'Study Material Name', xynd: 'Required Concentration', xysj: 'Required Time', + bdzt:'Status' } diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index fd76c40..294bddf 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -31,7 +31,7 @@ export default { bzyy: '备注原因', jcgj: '稽查轨迹', cjjl: '创建记录', - sfbl: '是否为补录', + sfbl: '是否补录', yes: '是', no: '否', tjjl: '提交记录', diff --git a/src/views/business/comps/template/comps/dl/DL007.vue b/src/views/business/comps/template/comps/dl/DL007.vue index 4b8e0a7..95d5173 100644 --- a/src/views/business/comps/template/comps/dl/DL007.vue +++ b/src/views/business/comps/template/comps/dl/DL007.vue @@ -280,17 +280,7 @@ export default { return await this.validFormFields(refNames) }, getResource() { - const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData() - const yqsyList = yqsyData?.stepTableFormData || [] - - // 从仪器使用信息表格中提取仪器资源 - this.yqResourceTmp = yqsyList - .filter((item) => item.yqbh) - .map((item) => ({ - bh: item.yqbh, - type: 'yq' - })) - + this.yqResourceTmp = [] this.resourceTmp = [] return this.resourceTmp }, diff --git a/src/views/business/comps/template/comps/dl/DL008.vue b/src/views/business/comps/template/comps/dl/DL008.vue index 4d658d1..0019082 100644 --- a/src/views/business/comps/template/comps/dl/DL008.vue +++ b/src/views/business/comps/template/comps/dl/DL008.vue @@ -439,17 +439,7 @@ export default { return await this.validFormFields(refNames) }, getResource() { - const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData() - const yqsyList = yqsyData?.stepTableFormData || [] - - // 从仪器使用信息表格中提取仪器资源 - this.yqResourceTmp = yqsyList - .filter((item) => item.yqbh) - .map((item) => ({ - bh: item.yqbh, - type: 'yq' - })) - + this.yqResourceTmp = [] this.resourceTmp = [] return this.resourceTmp }, diff --git a/src/views/business/comps/template/comps/dl/DL009.vue b/src/views/business/comps/template/comps/dl/DL009.vue index 86bd1b9..bcbbbc5 100644 --- a/src/views/business/comps/template/comps/dl/DL009.vue +++ b/src/views/business/comps/template/comps/dl/DL009.vue @@ -550,17 +550,7 @@ export default { return await this.validFormFields(refNames) }, getResource() { - const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData() - const yqsyList = yqsyData?.stepTableFormData || [] - - // 从仪器使用信息表格中提取仪器资源 - this.yqResourceTmp = yqsyList - .filter((item) => item.yqbh) - .map((item) => ({ - bh: item.yqbh, - type: 'yq' - })) - + this.yqResourceTmp = [] this.resourceTmp = [] return this.resourceTmp }, diff --git a/src/views/business/comps/template/comps/dl/DL010.vue b/src/views/business/comps/template/comps/dl/DL010.vue index 23553da..5115496 100644 --- a/src/views/business/comps/template/comps/dl/DL010.vue +++ b/src/views/business/comps/template/comps/dl/DL010.vue @@ -485,66 +485,10 @@ export default { return await this.validFormFields(refsToValidate) }, getResource() { - const sjxxStepResource = this.$refs.sjxxStepRef.getStepResource() - // 使用的试剂、仪器 - this.resourceTmp = sjxxStepResource.sjResource || [] - this.yqResourceTmp = sjxxStepResource.yqResource || [] - - // 获取采集信息表格数据 - const sjxxTableData = this.$refs.sjxxTableRef?.getFilledFormData() - const sjxxList = sjxxTableData?.stepTableFormData || [] - const headerSelectFields = sjxxTableData?.headerSelectFields || {} - - // 提取实际0.9%氯化钠注射液加入量和实际加入血清的数据 - // 转换为标准资源格式 - const sjxxResource = [] - - sjxxList.forEach((item) => { - // 实际0.9%氯化钠注射液加入量 - if (item.sjlhnzsjyjrl) { - sjxxResource.push({ - mc: '0.9%氯化钠注射液', // 名称 - bh: null, // 编号 - ph: null, // 批号 - nd: null, // 浓度 - nddw: null, // 浓度单位 - ndz: null, // 浓度值 - ly: null, // 来源 - sxrq: null, // 失效日期 - kc: null, // 库存 - kcdw: null, // 库存单位 - type: 1, // 类型：1表示使用的资源 - syl: item.sjlhnzsjyjrl, // 使用量 - syldw: headerSelectFields.sjlhnUnit || '', // 使用量单位 - yxzq: null, // 有效期 - yxzqdw: null // 有效期单位 - }) - } - - // 实际加入血清 - if (item.sjjrxq) { - sjxxResource.push({ - mc: '血清', // 名称 - bh: null, // 编号 - ph: null, // 批号 - nd: null, // 浓度 - nddw: null, // 浓度单位 - ndz: null, // 浓度值 - ly: null, // 来源 - sxrq: null, // 失效日期 - kc: null, // 库存 - kcdw: null, // 库存单位 - type: 1, // 类型：1表示使用的资源 - syl: item.sjjrxq, // 使用量 - syldw: headerSelectFields.sjjrxqUnit || '', // 使用量单位 - yxzq: null, // 有效期 - yxzqdw: null // 有效期单位 - }) - } - }) - - // 将采集信息数据添加到资源列表中 - return [...this.resourceTmp, ...sjxxResource] + const stepResource = this.$refs.sjxxStepRef.getStepResource() + this.resourceTmp = stepResource.sjResource || [] + this.yqResourceTmp = stepResource.yqResource || [] + return this.resourceTmp; }, onRegentSubmit(e) { // 预留方法，如果需要处理试剂提交事件可以在这里添加 diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue index 3e116c6..e41c302 100644 --- a/src/views/business/comps/template/comps/dl/DL011.vue +++ b/src/views/business/comps/template/comps/dl/DL011.vue @@ -8,24 +8,11 @@
- + - - + + @@ -35,13 +22,8 @@ $t('template.dl.dl011.bqdy') }}
- +
@@ -50,23 +32,13 @@
- +
- + @@ -82,6 +54,7 @@ import TableList from '@/components/Template/Table' import Step from '@/components/Template/Step' import templateMixin from '../../mixins/templateMixin' import moment from 'moment' +import { uniqeYqOne, uniqeResource } from "@/utils/calUnitTools"; const refConf = { base: 'baseInfoRef', @@ -297,6 +270,17 @@ export default { } }, methods: { + onTableRegentSubmit(data) { + if (data.key === 'xbdcbh') { + this.$refs.xbxxRef.updateFormData('xbdcbh_tj', data.selectInfo.row.tj) + this.$refs.xbxxRef.updateFormData('xbdcbh_dw', data.selectInfo.row.tjdw) + } + if (data.key === 'pyxbh') { + this.$refs.pyxxRef.updateFormData('pyxbh_mc', data.selectInfo.row.mc) + this.$refs.pyxxRef.updateFormData('pyxbh_xh', data.selectInfo.row.xh) + this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', data.selectInfo.row.jzrq) + } + }, // 处理培养信息中按钮点击事件 handlePyxxClickButton(_item, signData) { this.$refs.pyxxRef.updateFormData( @@ -322,49 +306,59 @@ export default { return await this.validFormFields(refNames) }, getResource() { + const content = this.getFilledFormData() + let tmpResource = [] + let tmpYq = [] + //生成细胞 + tmpResource.push({ + mc: content.xbmc, + bh: content.fshxbbh + content.fshxbbhCodeSn, + ph: '', + ndz: '', + nd: '', + nddw: '', + ly: 'ELN配制', + sxrq: null, + kc: content.fshxbsjtj, + kcdw: content.fshxbsjtjUnit, + syl: null, + type: null, //生成的时候传null + elnType: this.product, //生成的时候传 his.product + syldw: content.fshxbsjtjUnit, + yxzq: null, + yxzqdw: null, + }) + //使用细胞 + tmpResource.push({ + mc: null, + bh: content.xbdcbh, + ph: '', + ndz: '', + nd: '', + nddw: '', + ly: '', + sxrq: null, + kc: null, + kcdw: null, + syl: null, + type: 9, //使用的时候传对应的值 + elnType: null, //传null + syldw: content.xbdcbh_dw, + yxzq: null, + yxzqdw: null, + }) + //使用仪器 + tmpYq.push({ + mc: content.pyxbh_mc, + xh: content.pyxbh_xh, + bh: content.pyxbh, + jzrq: content.pyxbh_jzrq, + }) + //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - // 使用的试剂、仪器（来自复苏步骤） - this.resourceTmp = stepResource.sjResource || [] - this.yqResourceTmp = [...(stepResource.yqResource || [])] - - // 获取细胞信息 - const xbxxData = this.$refs.xbxxRef?.getFilledFormData() || {} - - // 如果选择了细胞冻存编号，添加到细胞细菌信息中 - if (xbxxData.xbdcbh) { - const xbInfo = xbxxData.selectInfo_xbdcbh || {} - // 细胞信息格式：不包含 type 字段（参考 StepFormPackage 中 xb 类型的处理） - this.xbxjTmp = [ - { - value: xbxxData.xbdcbh, - bh: xbInfo.bh || xbxxData.xbdcbh, - mc: xbInfo.mc || '', - xh: xbInfo.xh || '', - jzrq: xbInfo.jzrq || '' - } - ] - } else { - this.xbxjTmp = [] - } - - // 获取培养信息 - const pyxxData = this.$refs.pyxxRef?.getFilledFormData() || {} - - // 如果选择了培养箱编号，添加到仪器信息中 - if (pyxxData.pyxbh) { - const pyxInfo = pyxxData.selectInfo_pyxbh || {} - // 仪器信息格式：包含 type 字段（参考 StepFormPackage 中 yq 类型的处理） - this.yqResourceTmp.push({ - type: 'yq', - value: pyxxData.pyxbh, - bh: pyxInfo.bh || pyxxData.pyxbh, - mc: pyxInfo.mc || '', - xh: pyxInfo.xh || '', - jzrq: pyxInfo.jzrq || '' - }) - } - - return this.resourceTmp + this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || []) + this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || []) + return this.resourceTmp; }, onRegentSubmit(e) { // 预留方法，如果需要处理试剂提交事件可以在这里添加 @@ -391,6 +385,7 @@ export default { .print-btn { margin-bottom: 20px; } + .config-header-end { display: flex; justify-content: flex-end; diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue index 373c7fa..ef9bf15 100644 --- a/src/views/business/comps/template/comps/dl/DL012.vue +++ b/src/views/business/comps/template/comps/dl/DL012.vue @@ -8,35 +8,17 @@
- + - - + +
- +
@@ -45,23 +27,13 @@
- +
- +
@@ -77,6 +49,7 @@ import TableList from '@/components/Template/Table' import Step from '@/components/Template/Step' import templateMixin from '../../mixins/templateMixin' import moment from 'moment' +import { uniqeYqOne, uniqeResource } from "@/utils/calUnitTools"; const refConf = { base: 'baseInfoRef', @@ -339,6 +312,17 @@ export default { } }, methods: { + onTableRegentSubmit(data) { + if (data.key === 'xbzbqbh') { + this.$refs.xbxxRef.updateFormData('xbzbqbh_tj', data.selectInfo.row.tj) + this.$refs.xbxxRef.updateFormData('xbzbqbh_dw', data.selectInfo.row.tjdw) + } + if (data.key === 'pyxbh') { + this.$refs.pyxxRef.updateFormData('pyxbh_mc', data.selectInfo.row.mc) + this.$refs.pyxxRef.updateFormData('pyxbh_xh', data.selectInfo.row.xh) + this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', data.selectInfo.row.jzrq) + } + }, handleClickButton(e, signData) { console.log(e) const { subKey } = e || {} @@ -366,7 +350,7 @@ export default { async validFields() { return await this.validFormFields(refNames) }, - getResource() { + _getResource() { const stepResource = this.$refs.stepRef.getStepResource() // 使用的试剂、仪器（来自制备步骤） this.resourceTmp = stepResource.sjResource || [] @@ -411,6 +395,65 @@ export default { return this.resourceTmp }, + getResource() { + const content = this.getFilledFormData() + let tmpResource = [] + let tmpYq = [] + debugger + //生成细胞 + for (var i = 0; i < parseInt(content.zbxbs); i++) { + tmpResource.push({ + mc: content.xbmc, + bh: content['zbhxbbh_'+(i+1)] +content['zbhxbbhCodeSn_'+(i+1)], + ph: '', + ndz: '', + nd: '', + nddw: '', + ly: 'ELN配制', + sxrq: null, + kc: content.zbhxbsjtj, + kcdw: content.zbhxbsjtjUnit, + syl: null, + type: null, //生成的时候传null + elnType: this.product, //生成的时候传 his.product + syldw: content.zbhxbsjtjUnit, + yxzq: null, + yxzqdw: null, + }) + } + //使用细胞 + tmpResource.push({ + mc: null, + bh: content.xbzbqbh, + ph: '', + ndz: '', + nd: '', + nddw: '', + ly: '', + sxrq: null, + kc: null, + kcdw: null, + syl: null, + type: 9, //使用的时候传对应的值 + elnType: null, //传null + syldw: content.xbzbqbh_dw, + yxzq: null, + yxzqdw: null, + }) + //使用仪器 + tmpYq.push({ + mc: content.pyxbh_mc, + xh: content.pyxbh_xh, + bh: content.pyxbh, + jzrq: content.pyxbh_jzrq, + }) + //使用的试剂、仪器 + const stepResource = this.$refs.stepRef.getStepResource() + this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || []) + this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || []) + debugger + return this.resourceTmp; + }, onRegentSubmit(e) { // 预留方法，如果需要处理试剂提交事件可以在这里添加 }, @@ -430,6 +473,7 @@ export default { .print-btn { margin-bottom: 20px; } + .config-header-end { display: flex; justify-content: flex-end; diff --git a/src/views/business/comps/template/comps/dl/DL013.vue b/src/views/business/comps/template/comps/dl/DL013.vue index 6112df9..503c098 100644 --- a/src/views/business/comps/template/comps/dl/DL013.vue +++ b/src/views/business/comps/template/comps/dl/DL013.vue @@ -614,22 +614,7 @@ export default { return await this.validFormFields(refsToValidate) }, getResource() { - // 从仪器使用信息表格中获取仪器资源 - const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData() - const yqsyList = yqsyData?.stepTableFormData || [] - - // 从仪器使用信息表格中提取仪器资源 - this.yqResourceTmp = yqsyList - .filter((item) => item.yqbh) - .map((item) => ({ - type: 'yq', - value: item.yqbh, - bh: item.yqbh, - mc: item.yqmc, - xh: item.yqxh, - jzrq: item.xccsjzjdrq - })) - + this.yqResourceTmp = [] this.resourceTmp = [] return this.resourceTmp }, diff --git a/src/views/business/comps/template/comps/dl/DL015.vue b/src/views/business/comps/template/comps/dl/DL015.vue index 787c7ae..b15617a 100644 --- a/src/views/business/comps/template/comps/dl/DL015.vue +++ b/src/views/business/comps/template/comps/dl/DL015.vue @@ -327,43 +327,8 @@ export default { }, getResource() { const stepResource = this.$refs.stepRef.getStepResource() - const hyqkData = this.$refs.hyqkTableRef?.getFilledFormData() - const hyqkList = hyqkData?.stepTableFormData || [] - - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - // 从换液情况表格中提取悬液编号作为试剂资源 - // 用于去重的Set - const xybhSet = new Set() - const sjResourceFromHyqk = [] - - hyqkList.forEach((item) => { - if (item.xybh && !xybhSet.has(item.xybh)) { - xybhSet.add(item.xybh) - sjResourceFromHyqk.push({ - mc: '细胞悬液', - bh: item.xybh, - ph: null, - nd: null, - nddw: null, - ndz: null, - ly: null, - sxrq: null, - kc: null, - kcdw: null, - type: 1, - syl: item.pyybrl || null, - syldw: item.pyybrl ? 'mL' : null, - yxzq: null, - yxzqdw: null - }) - } - }) - - this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk] - return this.resourceTmp }, onRegentSubmit(e) { diff --git a/src/views/business/comps/template/comps/dl/DL016.vue b/src/views/business/comps/template/comps/dl/DL016.vue index ddfbebd..14e6045 100644 --- a/src/views/business/comps/template/comps/dl/DL016.vue +++ b/src/views/business/comps/template/comps/dl/DL016.vue @@ -267,21 +267,8 @@ export default { getResource() { //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || [] - // const tableList = hyqkData?.stepTableFormData || [] - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - const tableFromHyqk = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) - - this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk] - console.log('回显填写完成的表单数据==============',this.resourceTmp); return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL017.vue b/src/views/business/comps/template/comps/dl/DL017.vue index b517588..a5a0a5c 100644 --- a/src/views/business/comps/template/comps/dl/DL017.vue +++ b/src/views/business/comps/template/comps/dl/DL017.vue @@ -369,20 +369,8 @@ export default { getResource() { //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - const hyqkData = this.$refs.stepTableRef?.getFilledFormData() - const tableList = hyqkData?.stepTableFormData || [] - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - const sjResourceFromHyqk = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) - - this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk] return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue index 770704c..a7f91d3 100644 --- a/src/views/business/comps/template/comps/dl/DL018.vue +++ b/src/views/business/comps/template/comps/dl/DL018.vue @@ -331,22 +331,9 @@ export default { return content; }, getResource() { - //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || [] - - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - const tableFromHyqk = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) - - this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk] return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL019.vue b/src/views/business/comps/template/comps/dl/DL019.vue index b14cc43..56ad972 100644 --- a/src/views/business/comps/template/comps/dl/DL019.vue +++ b/src/views/business/comps/template/comps/dl/DL019.vue @@ -297,21 +297,8 @@ export default { getResource() { //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || [] - // const tableList = hyqkData?.stepTableFormData || [] - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - const tableFromHyqk = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) - - this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk] - console.log('回显填写完成的表单数据==============',this.resourceTmp); return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL021.vue b/src/views/business/comps/template/comps/dl/DL021.vue index 005054e..d91040f 100644 --- a/src/views/business/comps/template/comps/dl/DL021.vue +++ b/src/views/business/comps/template/comps/dl/DL021.vue @@ -187,6 +187,17 @@ export default { const { selectInfo, key, rowIndex } = e const { row } = selectInfo console.log('选择显微镜预留===',row) + + if (key == 'xwj') { + this.$refs.swypyjInfoRef.updateFormData('wxjmc', row.mc) + this.$refs.swypyjInfoRef.updateFormData('wxjxh', row.xh) + this.$refs.swypyjInfoRef.updateFormData('wxjjzrq', row.jzrq) + } + + + + + // if (key === 'yqbh' && this.$refs.yqsyTableRef) { // const params = { // yqmc: row.mc, @@ -273,10 +284,17 @@ export default { return content; }, getResource() { - //使用的试剂、仪器 - // stepRef不存在，直接返回空数组 + let content = this.getFilledFormData(); + let tmpYq = [] + tmpYq.push({ + mc: content.wxjmc, + xh: content.wxjxh, + bh: content.xwj, + jzrq: content.wxjjzrq, + }) + this.resourceTmp = [] - this.yqResourceTmp = [] + this.yqResourceTmp = tmpYq return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue index ada231e..4b716bc 100644 --- a/src/views/business/comps/template/comps/dl/DL023.vue +++ b/src/views/business/comps/template/comps/dl/DL023.vue @@ -47,9 +47,6 @@ import moment from 'moment' export default { name: "dl023", - dicts: [ - 'business_dl_xbmc',"business_sydd" - ], components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete }, mixins: [templateMixin], props: { @@ -166,9 +163,10 @@ export default { label: "template.dl.dl023.uvazsjl", type: "input", fillType: "actFill", - subType: "sj", + subType: "select", subKey: "subUvazsjl", subFillType: "actFill", + subOptions: this.getDictOptions('business_dl_uav'), maxlength: 20, }, zszsj: { @@ -187,6 +185,8 @@ export default { subType: 'button', subKey: 'zskssj', buttonName: 'template.dl.dl023.ksButton', + disabled:true, + subDisabled:false }, zsjssj: { label: 'template.dl.dl023.zsjssj', @@ -196,6 +196,8 @@ export default { subType: 'button', subKey: 'zsjssj', buttonName: 'template.dl.dl023.jsButton', + disabled:true, + subDisabled:false }, } } @@ -221,10 +223,7 @@ export default { onSelect(e) { const { key, value } = e if (key === "dwzshxbx") {//动物种属或细胞系 - this.otherOptions = value === '动物种属' ? this.getDictOptions('business_dl_xbmc') : [ - { label: "细胞系1", value: "细胞系1" }, - { label: "细胞系2", value: "细胞系2" }, - ] + this.otherOptions = value === '动物种属' ? this.getDictOptions('business_dl_dwzs') : this.getDictOptions('business_dl_xbx') } }, @@ -318,10 +317,22 @@ export default { return content; }, getResource() { - //使用的试剂、仪器 - // stepRef不存在，直接返回空数组 + let content = this.getFilledFormData(); + let tmpYq = [] + let table = content.stepTableFormData + if (table && table.length > 0) { + for (let i = 0; i < table.length; i++) { + let item = table[i] + tmpYq.push({ + mc: item.yqmc, + xh: item.yqxh, + bh: item.yqbh, + jzrq: item.xcrq, + }) + } + } + this.yqResourceTmp = tmpYq this.resourceTmp = [] - this.yqResourceTmp = [] return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL024.vue b/src/views/business/comps/template/comps/dl/DL024.vue index 2cc98b0..0b26114 100644 --- a/src/views/business/comps/template/comps/dl/DL024.vue +++ b/src/views/business/comps/template/comps/dl/DL024.vue @@ -9,7 +9,7 @@ - + @@ -261,14 +261,8 @@ export default { return content; }, getResource() { - const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || [] - // 从操作步骤中提取试剂和仪器资源 - this.resourceTmp = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) + this.resourceTmp = [] + this.yqResourceTmp = [] return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/yp/YP005.vue b/src/views/business/comps/template/comps/yp/YP005.vue index 580a870..82cb9c7 100644 --- a/src/views/business/comps/template/comps/yp/YP005.vue +++ b/src/views/business/comps/template/comps/yp/YP005.vue @@ -173,6 +173,8 @@ export default { bodySubKey:"startBtn", showBodySub:this.fillType === "actFill", width: 280, + bodyDisabled:true, + bodySubDisabled:false, }] }, }, diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index a6ffe10..4cb8141 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -61,10 +61,13 @@ export default { 'business_cjbw', // 制片部位 'business_qywz', // 取样位置 - 'business_lba_ptjhbzqx_zkpx', // lba005 - 'business_lba_ptjhfxyp', // lba007 - 'business_ada_kyktzkyp', // ada005 - 'business_ada_kyktffxyp', // ada007 + 'business_lba_ptjhbzqx_zkpx', // LBA-编号-配体结合分析标准曲线LBA005-质控平行 + 'business_lba_bqpx', //LBA-编号-配体结合分析标准曲线LBA005-标曲平行 + 'business_lba_ptjhfxyp', // LBA-编号-配体结合分析方法学样品制备表LBA007 + 'business_ada_kyktzkyp', // ADA-编号-抗药抗体质控样品配制记录表ADA005 + 'business_ada_kyktffxyp', // ADA-编号-抗药抗体方法学样品制备表ADA007 + 'business_dl_uav', // 毒理-紫外照射操作记录表-UVA-DL023 + 'business_pcr_fxffypzbb', //PCR-编号-分析方法学样品制备表 ], props: { templateData: { @@ -93,7 +96,7 @@ export default { id } = v if (v.resource) { - //type 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 + //type 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 9：细胞；11：细菌 //试验试剂信息 试剂 // this.resource = _.filter(JSON.parse(v.resource), function (o) { // return o.type == 1 || o.elnType == 1 diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index 12fc146..0c5983c 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -22,7 +22,7 @@ @change="userChange" /> - + - + - + @@ -61,7 +61,7 @@ - + @@ -85,26 +85,29 @@ v-hasPermi="['business:drugFormApply:xz']">{{ $t('page.business.study.studyFormApply.xzbd') }} - - {{ $t('form.search') }} - {{ $t('form.reset') }} - + + {{ $t('form.search') }} + {{ $t('form.reset') }} + - + - + - - - + + + - + @@ -396,7 +379,7 @@ export default { getList() { if (this.daterange != null && this.daterange.length > 0) { this.searchForm.startDate = this.daterange[0] - this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD'); + this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD'); } else { this.searchForm.startDate = '' this.searchForm.endDate = '' @@ -444,7 +427,7 @@ export default { detail(row) { this.showDetail = true this.$emit('showDetail', this.showDetail) - this.$refs.Xq.show(row, true,this.searchForm) + this.$refs.Xq.show(row, true, this.searchForm) }, audit(row) { this.showAudit = true diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue index 0e9d123..f3274c4 100644 --- a/src/views/business/form/nonTrial/comp/tbbdList.vue +++ b/src/views/business/form/nonTrial/comp/tbbdList.vue @@ -2,65 +2,43 @@
- - - - - - - - - - - - - - - - - - - -
- {{ $t('form.search') }} - {{ $t('form.reset') }} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('form.search') }} + {{ $t('form.reset') }} +
@@ -391,7 +369,7 @@ export default { getList() { if (this.daterange != null && this.daterange.length > 0) { this.searchForm.cjsjks = this.daterange[0] - this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD'); + this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD'); } else { this.searchForm.cjsjks = '' this.searchForm.cjsjjs = '' diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue index fe3662a..1f838fc 100644 --- a/src/views/business/form/nonTrial/comp/ytbdList.vue +++ b/src/views/business/form/nonTrial/comp/ytbdList.vue @@ -2,48 +2,31 @@
- - - - - - - - - - - - - - - - - - - - {{ $t('form.search') }} - {{ $t('form.reset') }} - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + {{ $t('form.search') }} + {{ $t('form.reset') }} +
@@ -113,11 +96,11 @@ @@ -265,7 +248,7 @@ export default { pageNum: 1, pageSize: 10, studyId: -1, - studyStatus:5, + studyStatus: 5, studySn: '', studyMc: '', bdbh: '', @@ -424,7 +407,7 @@ export default { getList() { if (this.daterange != null && this.daterange.length > 0) { this.searchForm.startDate = this.daterange[0] - this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD'); + this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD'); } else { this.searchForm.startDate = '' this.searchForm.endDate = '' @@ -481,7 +464,7 @@ export default { detail(row) { this.showDetail = true this.$emit('showDetail', this.showDetail) - this.$refs.Xq.show(row, true,this.searchForm) + this.$refs.Xq.show(row, true, this.searchForm) }, audit(row) { this.showAudit = true diff --git a/src/views/business/resource/gsp/comps/ffjlList.vue b/src/views/business/resource/gsp/comps/ffjlList.vue index 4524ff6..379a36d 100644 --- a/src/views/business/resource/gsp/comps/ffjlList.vue +++ b/src/views/business/resource/gsp/comps/ffjlList.vue @@ -7,22 +7,22 @@ - + - + - - + - + @@ -33,7 +33,7 @@ - + @@ -42,13 +42,13 @@ - + - + @@ -78,6 +78,14 @@ {{ $t('form.export') }} + +
+ {{ $t('page.business.resource.gsp.rkl') }}：{{ rkl }} + {{ $t('page.business.resource.gsp.ckl') }}：{{ ckl }} + {{ $t('page.business.resource.gsp.syl') }}：{{ syl }} +
+ + @@ -195,7 +203,7 @@