diff --git a/src/lang/en/template/commonTemplate.js b/src/lang/en/template/commonTemplate.js
index b9c46ee..d2be78e 100644
--- a/src/lang/en/template/commonTemplate.js
+++ b/src/lang/en/template/commonTemplate.js
@@ -13,6 +13,8 @@ export default {
remark: 'Comments',
step: 'Step',
bqdy: 'Label Print',
+ dayji: 'Printer',
+ label: 'Label',
//平行配制,阶梯配制
xzpxpz:'新增平行配制',
diff --git a/src/lang/zh/template/commonTemplate.js b/src/lang/zh/template/commonTemplate.js
index 9f52319..16dead2 100644
--- a/src/lang/zh/template/commonTemplate.js
+++ b/src/lang/zh/template/commonTemplate.js
@@ -19,6 +19,8 @@ export default {
step: '步骤',
remark: '备注',
bqdy: '标签打印',
+ dayji: '打印机',
+ label: '标签',
//平行配制,阶梯配制
xzpxpz:'新增平行配制',
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index c47e528..ecb4cee 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -524,9 +524,6 @@ export default {
getResource() {
return this.$refs.templateComponent.getResource();
},
- getPrintResource() {
- return this.$refs.templateComponent.getPrintResource();
- },
getYqResource() {
return this.$refs.templateComponent.getYqResource();
},
diff --git a/src/views/business/comps/template/comps/gsp/GSP001.vue b/src/views/business/comps/template/comps/gsp/GSP001.vue
index 5f6e31c..b044c4c 100644
--- a/src/views/business/comps/template/comps/gsp/GSP001.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP001.vue
@@ -477,14 +477,6 @@ export default {
this.yqResourceTmp = stepResource.yqResource || []
return this.resourceTmp;
},
- //返回打印数据
- getPrintResource() {
- let content = this.getFilledFormData();
- let printResourceTmp = []
-
- this.printResourceTmp=printResourceTmp
- return this.printResourceTmp
- },
//获取步骤使用物资
getStepResource() {
const sjResource = [], yqResource = [];
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 3ddeee0..650905a 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -215,7 +215,6 @@ export default {
jcbList: [], //检测板信息
xbxj: [], //细胞细菌信息
- printResourceTmp:[],//标签打印list信息
resourceTmp: [], //试验试剂信息提交用
yqResourceTmp: [], //仪器信息提交用
jcbListTmp: [], //检测板信息提交用
@@ -387,9 +386,6 @@ export default {
getResource() {
return this.resourceTmp
},
- getPrintResource() {
- return this.printResourceTmp
- },
getYqResource() {
return this.yqResourceTmp
},
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index 36be48c..a757f97 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -28,7 +28,7 @@
{{ $t('page.business.study.studyFormFill.next') }}
- {{
+ {{
$t('template.common.bqdy')
}}
{{
@@ -430,6 +430,37 @@
{{ $t('form.cancel') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -451,6 +482,7 @@ export default {
data() {
return {
showIndex: 1,
+ printCheck: [],
form: {},
rules: {
bdmc: [{
@@ -476,12 +508,17 @@ export default {
openSave: false,
openTjsh: false,
openApprove: false,
+ openBqdy: false,
openYjcc: false,
formSave: {
qmyy: this.$t('page.business.study.studyFormFill.txbbc'),
remark: '',
qmrmm: '',
},
+ formBqdy: {
+ dyj: null,
+ printList: null
+ },
formApprove: {
id: null,
qmyy: this.$t('page.business.study.studyFormFill.txbtjjl'),
@@ -531,6 +568,18 @@ export default {
jcbList: [],
xbxj: [],
bdmbTitle: this.$t('page.business.form.bdmb'),
+ rulesBqdy: {
+ dyj: [{
+ required: true,
+ message: ' ',
+ trigger: 'blur'
+ }],
+ printList: [{
+ required: true,
+ message: ' ',
+ trigger: 'blur'
+ }]
+ },
rulesApprove: {
qmrmm: [{
required: true,
@@ -564,6 +613,7 @@ export default {
studyFormType: null,
ccwzlist: [],
selectedDeptId: null,
+ resourcePrint: []
}
},
computed: {
@@ -576,6 +626,13 @@ export default {
this.getCcwz()
},
methods: {
+ printCheckChange() {
+ if (this.printCheck && this.printCheck.length > 0) {
+ this.formBqdy.printList = this.printCheck.join(',')
+ } else {
+ this.formBqdy.printList = null
+ }
+ },
validForm() {
this.$refs["form"].validate(valid => {
if (valid) { }
@@ -823,13 +880,24 @@ export default {
that.cclistYj = []
that.addCcYj()
that.$refs.templateTable.getFilledFormData()
- let resource = that.$refs.templateTable.getPrintResource()
- if (resource.length > 0) {
-
+ that.resourcePrint = _.filter(that.$refs.templateTable.getResource(), function (item) { return item.type == null || item.elnType && item.elnType != '' })
+ if (that.resourcePrint.length > 0) {
+ that.formBqdy.dyj=null
+ that.formBqdy.printList=null
+ that.printCheck=[]
+ that.openBqdy = true
} else {
that.$modal.msgError("没有可打印的标签")
}
},
+ printbq() {
+ let that = this
+ this.$refs["formBqdy"].validate(valid => {
+ if (valid) {
+ that.$modal.msgError("todo")
+ }
+ })
+ },
async showTjsh(qmyy) {
let that = this
let content = await this.$refs.templateTable.getFormData()
@@ -1022,7 +1090,7 @@ export default {
this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
return
}
- if (that.cclistYj[i].cctj == '其他'&& that.cclistYj[i].cctjqt == '') {
+ if (that.cclistYj[i].cctj == '其他' && that.cclistYj[i].cctjqt == '') {
this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
return
}
@@ -1060,7 +1128,7 @@ export default {
this.$modal.msgError('第' + (i + 1) + "个处置,处置方式不能为空")
return
}
- if (that.czlist[i].czfs == '其他'&& that.czlist[i].czfsqt == '') {
+ if (that.czlist[i].czfs == '其他' && that.czlist[i].czfsqt == '') {
this.$modal.msgError('第' + (i + 1) + "个存储,处置方式不能为空")
return
}
@@ -1074,7 +1142,7 @@ export default {
this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
return
}
- if (that.cclist[i].cctj=='其他' && that.cclist[i].cctjqt == '') {
+ if (that.cclist[i].cctj == '其他' && that.cclist[i].cctjqt == '') {
this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
return
}