diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
index 1faa99e..951e87c 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -358,7 +358,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -390,6 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +408,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -419,6 +423,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -432,7 +439,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
index a3b969d..ea98850 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -358,7 +358,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -390,6 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +408,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -419,6 +423,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -432,7 +439,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
index 93847d4..3633322 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
@@ -16,20 +16,20 @@
:formConfig="storageFormConfig" :formData="formData" />
-
@@ -116,7 +116,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -242,7 +242,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -346,7 +346,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -378,6 +378,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -395,6 +396,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -407,6 +411,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -420,7 +427,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
index 3e03a39..99ee007 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -358,7 +358,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -390,6 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +408,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -419,6 +423,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -432,7 +439,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
index c3b5625..3e30d44 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -358,7 +358,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -390,6 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +408,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -419,6 +423,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -432,7 +439,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
index 5140d4b..7a3ebf5 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
@@ -506,6 +506,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -523,6 +524,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -535,6 +539,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
index 29b3155..51e047e 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -313,7 +313,7 @@ export default {
bhCode: result.data[i],
})
}
-
+
const params = {
type: "fieldChanged",
newRecord: null,
@@ -358,8 +358,8 @@ export default {
})
}
}
-
-
+
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -391,6 +391,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -408,6 +409,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -420,6 +424,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -433,7 +440,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
index 35e0520..25d51d1 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -358,7 +358,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -390,6 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +408,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -419,6 +423,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -432,7 +439,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
index 9995f19..b05e6d5 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -358,7 +358,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -390,6 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +408,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -419,6 +423,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -432,7 +439,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
index 2c9a541..56fcd15 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -244,7 +244,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -358,7 +358,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -390,6 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +408,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -419,6 +423,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -432,7 +439,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
index 2c8531f..59b68c6 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
@@ -19,19 +19,19 @@
-
- deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
-
@@ -118,7 +118,7 @@ export default {
}
]
},
-
+
baseInfoFormConfig() {
return [
{
@@ -245,7 +245,7 @@ export default {
{ label: 'template.common.reagentCode', prop: "bh" },//编号
{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有
{ label: 'template.common.concentration', prop: "nd" },//浓度
- { label: 'template.common.source', prop: "source" },//来源
+ { label: 'template.common.source', prop: "source" },//来源
{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
],
yqsColumns: [
@@ -359,7 +359,7 @@ export default {
})
}
}
-
+
//使用的试剂
this.resourceTmp=tmpResource
return content;
@@ -391,6 +391,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -408,6 +409,9 @@ export default {
console.log("开始配置数据:"+JSON.stringify(val))
let postData = {
bh:val.rowData.bh+val.rowData.bhCode,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -420,6 +424,9 @@ export default {
console.log("完成配置数据:"+JSON.stringify(val))
let postData = {
mc:null,
+ studyId:this.formData.studyId,
+ studyFormId:this.formData.id,
+ deptId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -433,7 +440,7 @@ export default {
.finally(() => {
})
},
-
+
}
};
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 6f45954..9a5ec13 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -38,6 +38,7 @@ export default {
handler(v) {
if (v) {
const {
+ studySubjectId,
studyId,
studyMc,
studySn,
@@ -56,6 +57,7 @@ export default {
if (v.bdnr) {
this.formData = {
...JSON.parse(v.bdnr),
+ studySubjectId,
studyId,
studyMc,
studySn,
@@ -69,6 +71,7 @@ export default {
}
} else {
this.formData = {
+ studySubjectId,
studyId,
studyMc,
studySn,
diff --git a/vue.config.js b/vue.config.js
index bf3ddf1..56dd747 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[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,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''