eln_TD
/
eln_web
9
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

fix:[模板管理][试剂操作]分装、开始配置、配置完成

lkf
HanLong 2 months ago
parent
28c68c75bf
commit
7d30967deb
13 changed files with 205 additions and 125 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +19
    -12
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
  2. +19
    -12
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
  3. +20
    -13
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
  4. +19
    -12
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
  5. +19
    -12
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
  6. +7
    -0
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
  7. +21
    -14
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
  8. +19
    -12
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
  9. +19
    -12
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
  10. +19
    -12
      src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
  11. +19
    -12
      src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
  12. +3
    -0
      src/views/business/comps/template/mixins/templateMixin.js
  13. +2
    -2
      vue.config.js

+ 19
- 12
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -358,7 +358,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -390,6 +390,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -407,6 +408,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -419,6 +423,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -432,7 +439,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 19
- 12
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -358,7 +358,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -390,6 +390,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -407,6 +408,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -419,6 +423,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -432,7 +439,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 20
- 13
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue View File

@ -16,20 +16,20 @@
:formConfig="storageFormConfig" :formData="formData" /> :formConfig="storageFormConfig" :formData="formData" />
<LineLabel label="template.common.operationSteps" /> <LineLabel label="template.common.operationSteps" />
<div class="template-form-item"> <div class="template-form-item">
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -49,7 +49,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -116,7 +116,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -242,7 +242,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -346,7 +346,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -378,6 +378,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -395,6 +396,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -407,6 +411,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -420,7 +427,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 19
- 12
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -358,7 +358,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -390,6 +390,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -407,6 +408,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -419,6 +423,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -432,7 +439,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 19
- 12
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -358,7 +358,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -390,6 +390,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -407,6 +408,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -419,6 +423,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -432,7 +439,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 7
- 0
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue View File

@ -506,6 +506,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -523,6 +524,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -535,6 +539,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,

+ 21
- 14
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -313,7 +313,7 @@ export default {
bhCode: result.data[i], bhCode: result.data[i],
}) })
} }
const params = { const params = {
type: "fieldChanged", type: "fieldChanged",
newRecord: null, newRecord: null,
@ -358,8 +358,8 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -391,6 +391,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -408,6 +409,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -420,6 +424,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -433,7 +440,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 19
- 12
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -358,7 +358,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -390,6 +390,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -407,6 +408,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -419,6 +423,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -432,7 +439,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 19
- 12
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -358,7 +358,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -390,6 +390,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -407,6 +408,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -419,6 +423,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -432,7 +439,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 19
- 12
src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -358,7 +358,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -390,6 +390,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -407,6 +408,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -419,6 +423,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -432,7 +439,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 19
- 12
src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue View File

@ -19,19 +19,19 @@
<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" <BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
:formData="formData" @clickable="handleJzClickable" /> :formData="formData" @clickable="handleJzClickable" />
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
<CustomTable
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
:formData="formData" :formData="formData"
:prefixKey = "`table`" :prefixKey = "`table`"
@clickable="handleClickable" @clickable="handleClickable"
fieldItemLabel = "template.common.operationSteps" fieldItemLabel = "template.common.operationSteps"
> >
<template slot="operation" slot-scope="{ row, rowIndex, columns }"> <template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion
:fillType="fillType"
:row="row"
<TableOpertaion
:fillType="fillType"
:row="row"
:rowIndex="rowIndex" :rowIndex="rowIndex"
:columns="columns" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)" @deleteRow="(rowIndex) => deleteRow(rowIndex)"
@ -51,7 +51,7 @@
</div> </div>
<!-- <button @click = "onSave">保存</button> --> <!-- <button @click = "onSave">保存</button> -->
<SelectReagentDialog
<SelectReagentDialog
@submit="onSelectReagentSubmit" @submit="onSelectReagentSubmit"
ref="selectReagentDialogRef" > ref="selectReagentDialogRef" >
</SelectReagentDialog> </SelectReagentDialog>
@ -118,7 +118,7 @@ export default {
} }
] ]
}, },
baseInfoFormConfig() { baseInfoFormConfig() {
return [ return [
{ {
@ -245,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号 { label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有 { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度 { label: 'template.common.concentration', prop: "nd" },//浓度
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
], ],
yqsColumns: [ yqsColumns: [
@ -359,7 +359,7 @@ export default {
}) })
} }
} }
//使用的试剂 //使用的试剂
this.resourceTmp=tmpResource this.resourceTmp=tmpResource
return content; return content;
@ -391,6 +391,7 @@ export default {
let postData = { let postData = {
studyId:this.formData.studyId, studyId:this.formData.studyId,
studyFormId:this.formData.id, studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh, bh:val.fzsj.mybh,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -408,6 +409,9 @@ export default {
console.log("开始配置数据："+JSON.stringify(val)) console.log("开始配置数据："+JSON.stringify(val))
let postData = { let postData = {
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
} }
console.log("开始配置提交数据："+JSON.stringify(postData)) console.log("开始配置提交数据："+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => { sj_startConfiguration(postData).then(() => {
@ -420,6 +424,9 @@ export default {
console.log("完成配置数据："+JSON.stringify(val)) console.log("完成配置数据："+JSON.stringify(val))
let postData = { let postData = {
mc:null, mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode, bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd, nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit, nddw:val.headerSelectFields.hhwzndUnit,
@ -433,7 +440,7 @@ export default {
.finally(() => { .finally(() => {
}) })
}, },
} }
}; };

+ 3
- 0
src/views/business/comps/template/mixins/templateMixin.js View File

@ -38,6 +38,7 @@ export default {
handler(v) { handler(v) {
if (v) { if (v) {
const { const {
studySubjectId,
studyId, studyId,
studyMc, studyMc,
studySn, studySn,
@ -56,6 +57,7 @@ export default {
if (v.bdnr) { if (v.bdnr) {
this.formData = { this.formData = {
...JSON.parse(v.bdnr), ...JSON.parse(v.bdnr),
studySubjectId,
studyId, studyId,
studyMc, studyMc,
studySn, studySn,
@ -69,6 +71,7 @@ export default {
} }
} else { } else {
this.formData = { this.formData = {
studySubjectId,
studyId, studyId,
studyMc, studyMc,
studySn, studySn,

+ 2
- 2
vue.config.js View File

@ -34,8 +34,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8080`,
target: `http://39.99.251.173:8080`,
target: `http://localhost:8080`,
// target: `http://39.99.251.173:8080`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''

Write Preview
Loading…
Cancel
Save