{
+ const {stepTableFormData = [],jyStepTableFormData = []} = item;
+ stepTableFormData.map((step,sIndex) => {
+ if(step.qybhCode){
+ flag = true;
+ }
+ this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{qybh:step.qybh})
+ codes.push({ pre: step.qybh, type: 1 ,id:`stepTableFormData_${step.qybh}_${index}_${sIndex}`,});
+
+ });
+ jyStepTableFormData.map((step,sIndex) => {
+ if(step.jybhCode){
+ flag = true;
+ }
+ codes.push({ pre: step.jybh, type: 1 ,id:`jyStepTableFormData_${step.jybh}_${index}_${sIndex}`,});
+ });
+
+ });
+ ecDataList.map((item,index) => {
+ const {stepTableFormData} = item;
+ stepTableFormData.map((step,sIndex) => {
+ if(step.jybhCode){
+ flag = true;
+ }
+ codes.push({ pre: step.jybh, type: 1 ,id:`ecStepTableFormData_${step.jybh}_${index}_${sIndex}`,});
+ });
+ });
+ if(flag){
+ return;
+ }
- console.log(this.formData,"fff")
+ const result = await this.getLatestSnArr(codes)
+ codes.map((item,index)=>{
+ item.sn = result[index]
+ })
+ ybsmDataList.map((item,index)=>{
+ const {stepTableFormData = [],jyStepTableFormData = []} = item;
+ stepTableFormData.map((step,sIndex) => {
+ const id = `stepTableFormData_${step.qybh}_${index}_${sIndex}`;
+ const o = codes.find((item) => item.id === id) ||{};
+ this.$refs[`ybsmTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{qybhCode:o.sn})
+ });
+ jyStepTableFormData.map((step,sIndex) => {
+ const id = `jyStepTableFormData_${step.jybh}_${index}_${sIndex}`;
+ const o = codes.find((item) => item.id === id) ||{};
+ this.$refs[`jyTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{jybhCode:o.sn})
+ });
+ })
+ ecDataList.map((item,index) => {
+ const {stepTableFormData} = item;
+ stepTableFormData.map((step,sIndex) => {
+ const id = `ecStepTableFormData_${step.jybh}_${index}_${sIndex}`;
+ const o = codes.find((item) => item.id === id) ||{};
+ this.$refs[`ecTableRef${index}`][0].updateDataSourceByRowIndex(sIndex,{jybhCode:o.sn})
+ });
+ })
+ this.justUpdateFilledFormData();
+
},
//获取文件blog
async handleBeforeDownload({ html2pdf, options, pdfContent }) {
diff --git a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
index 86d2e80..8b4c1aa 100644
--- a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
@@ -6,6 +6,7 @@
:studyFormId = "studyFormId"
:listApi="listApi"
:selectedCode="selectedCode"
+ :showYqButton="true"
@radioSelect="handleSelect"/>
diff --git a/src/views/business/comps/template/formConfig/formConfig.js b/src/views/business/comps/template/formConfig/formConfig.js
index 4190c0a..fe21de9 100644
--- a/src/views/business/comps/template/formConfig/formConfig.js
+++ b/src/views/business/comps/template/formConfig/formConfig.js
@@ -7,7 +7,7 @@ export const getSjSearchForm = () => {
bh: {
label: 'page.business.resource.sj.sjbh'
},
- studyName: {
+ studySn: {
label: 'page.business.resource.sj.sssy'
}
}
@@ -49,7 +49,7 @@ export const getXbSearchForm = () => {
bh: {
label: 'page.business.resource.sj.bh'
},
- studyMc: {
+ studySn: {
label: 'page.business.resource.sj.sssy'
}
}
@@ -86,7 +86,7 @@ export const getSjColumns = () => {
label: 'page.business.resource.sj.sxr'
},
{
- prop: 'studyName',
+ prop: 'studySn',
label: 'page.business.resource.sj.sssy'
}
]
@@ -179,7 +179,7 @@ export const getXbColumns = () => {
label: 'page.business.resource.sj.sxr'
},
{
- prop: 'studyName',
+ prop: 'studySn',
label: 'page.business.resource.sj.sssy'
}
]
@@ -281,7 +281,7 @@ export const getXjColumns = () => {
label: 'page.business.resource.sj.sxr'
},
{
- prop: 'studyName',
+ prop: 'studySn',
label: 'page.business.resource.sj.sssy'
}
]
@@ -295,7 +295,7 @@ export const getXjSearchForm = () => {
bh: {
label: 'page.business.resource.sj.bh'
},
- studyName: {
+ studySn: {
label: 'page.business.resource.sj.sssy'
}
}
diff --git a/src/views/business/comps/template/formConfig/gsp/gsp015.js b/src/views/business/comps/template/formConfig/gsp/gsp015.js
index 0925fac..2ea9c4a 100644
--- a/src/views/business/comps/template/formConfig/gsp/gsp015.js
+++ b/src/views/business/comps/template/formConfig/gsp/gsp015.js
@@ -88,10 +88,14 @@ export const getYbsmFormConfig = ($this) => {
disabled: true,
subType:"button",
subKey: "startButton",
+ subFillType: 'actFill',
+ subDisabled: false,
buttonName:"开始",
thirdType: 'button',
showSub:$this.fillType === 'actFill',
showThird:$this.fillType === 'actFill',
+ thirdDisabled: false,
+ thirdFillType: 'actFill',
thirdKey: 'endButton',
thirdButtonName:"结束",
},
@@ -118,15 +122,19 @@ export const getQyTableColumns = ($this) => {
width: 200,
bodyType: 'input',
bodyFillType: 'preFill',
- subBodyType:"span",
- subBodyKey: "qybhCode",
+ bodySubType:"span",
+ bodySubKey: "qybhCode",
},
{
label: '制剂编号',
prop: 'zjbh',
width: 200,
- bodyType: 'gsp',
- bodyFillType: 'actFill',
+ bodyType: 'input',
+ bodyFillType: 'preFill',
+ bodySubType: 'mix',
+ bodySubKey: "zjbhCode",
+ bodySubFillType: 'actFill',
+
},
{
label: '预设制剂浓度',
@@ -142,6 +150,7 @@ export const getQyTableColumns = ($this) => {
{
label: '实际制剂浓度',
prop: 'sjzjnd',
+ bodyDisabled: true,
width: 200,
headerSelectKey: 'sjzjnddw',
fillType: "preFill",
@@ -164,10 +173,10 @@ export const getQyTableColumns = ($this) => {
width: 180,
bodyType: 'select',
bodyOptions: $this.getDictOptions('business_qywz'),
- bodyFillType: 'actFill',
+ bodyFillType: 'preFill',
},
{
- label: '预设取样位置',
+ label: '实际取样位置',
prop: 'sjqywz',
width: 180,
bodyType: 'select',
@@ -211,20 +220,22 @@ export const getJyTableColumns = ($this) => {
width: 200,
bodyType: 'input',
bodyFillType: 'preFill',
- subBodyType:"span",
- subBodyKey: "jybhCode",
+ bodySubType:"span",
+ bodySubKey: "jybhCode",
},
{
label: '取样编号',
prop: 'qybh',
width: 200,
- bodyType: 'gsp',
+ bodyType: 'input',
+ bodyDisabled: true,
bodyFillType: 'actFill',
},
{
label: '取样浓度',
prop: 'qynd',
width: 200,
+ bodyDisabled: true,
headerSelectKey: 'qynddw',
fillType: "preFill",
headerOptions: $this.getDictOptions('business_nddw'),
@@ -235,6 +246,7 @@ export const getJyTableColumns = ($this) => {
label: '取样体积',
prop: 'qytj',
width: 200,
+ bodyDisabled: true,
headerSelectKey: 'qytjdw',
fillType: "preFill",
headerOptions: $this.getDictOptions('business_tjdw'),
diff --git a/src/views/business/resource/sj/comps/Xq.vue b/src/views/business/resource/sj/comps/Xq.vue
index 09e825a..797c7e1 100644
--- a/src/views/business/resource/sj/comps/Xq.vue
+++ b/src/views/business/resource/sj/comps/Xq.vue
@@ -94,7 +94,7 @@
{{ $t('page.business.resource.sj.bdsssy') }}
-
+
diff --git a/src/views/business/resource/sj/list.vue b/src/views/business/resource/sj/list.vue
index 2f94a12..86853e8 100644
--- a/src/views/business/resource/sj/list.vue
+++ b/src/views/business/resource/sj/list.vue
@@ -98,7 +98,7 @@
-
+
diff --git a/src/views/business/study/comp/wzlb/bacteriaList.vue b/src/views/business/study/comp/wzlb/bacteriaList.vue
index f5bfe5b..e54daef 100644
--- a/src/views/business/study/comp/wzlb/bacteriaList.vue
+++ b/src/views/business/study/comp/wzlb/bacteriaList.vue
@@ -20,8 +20,8 @@
:placeholder="$t('form.placeholderInput')" />
-
-
+
@@ -51,7 +51,7 @@
:show-overflow-tooltip="true" />
-
+
@@ -102,6 +102,7 @@ export default {
bh: null,
startDate: null,
endDate: null,
+ studySn: '',
},
}
},
diff --git a/src/views/business/study/comp/wzlb/cellList.vue b/src/views/business/study/comp/wzlb/cellList.vue
index 6a99a2d..6493039 100644
--- a/src/views/business/study/comp/wzlb/cellList.vue
+++ b/src/views/business/study/comp/wzlb/cellList.vue
@@ -20,8 +20,8 @@
:placeholder="$t('form.placeholderInput')" />
-
-
+
@@ -51,7 +51,7 @@
:show-overflow-tooltip="true" />
-
+
@@ -98,6 +98,7 @@ export default {
mc: null,
jyzt: null,
studyId: null,
+ studySn: '',
zjzt: null,
bh: null,
startDate: null,
diff --git a/src/views/index.vue b/src/views/index.vue
index 6c54570..7480814 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -195,21 +195,22 @@ export default {
display: flex;
flex-direction: row;
justify-content: space-between;
+ align-items: center;
border-bottom: 1px solid #eee;
margin-bottom: 10px;
padding-bottom: 5px;
font-size: 12px;
cursor: pointer;
.notice-title{
- flex-shrink: 0;
+ flex-grow: 1;
+ flex-wrap: wrap;
.notice-dot{
margin-right: 2px;
margin-top: 5px;
}
}
.notice-date{
- flex-grow: 1;
- text-align: right;
+ flex-shrink: 0;
}
}
}