-
-
- {{ tagValue || '点击输入' }}
-
+
+
+
+
+
+
+
+ {{ tag.tagValue }}
+
+
+
+
+
-
@@ -242,23 +238,26 @@ export default {
},
data() {
let initialValue = this.value;
- let initialOtherValues = {},checkboxTagChecked = false,tagValue = '';
-
+ let initialOtherValues = {}, checkboxTagList = [];
+
// 如果是checkboxList类型且value是对象格式
if (this.type === 'checkboxList' && this.value && typeof this.value === 'object') {
initialValue = this.value.checkboxValues || [];
initialOtherValues = this.value.otherValues || {};
} else if (this.type === 'checkboxList' && !Array.isArray(this.value)) {
initialValue = [];
- }else if (this.type === 'checkboxTag' && this.value && typeof this.value === 'object') {
- checkboxTagChecked = this.value.checked || false;
- tagValue = this.value.tagValue || '';
- }
+ } else if (this.type === 'checkboxTag' && Array.isArray(this.value)) {
+ // checkboxTag类型,value是数组格式
+ checkboxTagList = this.value.map(tag => ({
+ checked: tag.checked,
+ tagValue: tag.tagValue || ''
+ }));
+ }
return {
inputValue: initialValue,
oldValue: initialValue, // 记录上一次的值
otherValues: initialOtherValues, // 存储checkboxList中otherCode对应的输入值
- oldOtherValues: {...initialOtherValues}, // 记录上一次的otherValues
+ oldOtherValues: { ...initialOtherValues }, // 记录上一次的otherValues
showModal: false, // 控制模态框显示
modificationRecords: [], // 存储修改记录
modalTimer: null, // 用于延迟隐藏模态框
@@ -268,9 +267,8 @@ export default {
replyContent: '', // 回复内容
visible: false,//是否显示弹窗
checkboxValue: this.getChecked(),//是否选中
- checkboxTagChecked: checkboxTagChecked, // checkboxTag类型的checkbox选中状态
- tagValue: tagValue, // checkboxTag类型的tag值
- isEditingTag: false, // 是否正在编辑tag
+ checkboxTagList: checkboxTagList, // checkboxTag类型的列表数据
+ oldCheckboxTagList: JSON.parse(JSON.stringify(checkboxTagList)), // 记录上一次的checkboxTagList
uuid: getuuid(), // 唯一标识符,用于EventBus事件匹配
regentType: ['sj', 'gsp', 'mix', 'xj', 'xb', 'gyzj', 'mjy', 'yq', 'jcb', 'qxbd'], //试剂/仪器/供试品等类型
selectRegentInfo: {},//选择的试剂/仪器/供试品等信息
@@ -281,18 +279,22 @@ export default {
},
pendingUploadFile: null, // 用于存储待上传的文件
pendingRemoveFile: null, // 用于存储待删除的文件
+ currentTagIndex:-1,//当前选中的checkboxTag索引
}
},
watch: {
value(newVal) {
- console.log(newVal,"newVal")
+ console.log(newVal, "newVal")
if (this.type === 'checkboxList' && newVal && typeof newVal === 'object') {
this.inputValue = newVal.checkboxValues || [];
this.otherValues = newVal.otherValues || {};
- } else if (this.type === 'checkboxTag' && newVal && typeof newVal === 'object') {
- this.checkboxTagChecked = newVal.checked || false;
- this.tagValue = newVal.tagValue || '';
- } else {
+ } else if (this.type === 'checkboxTag' && Array.isArray(newVal)) {
+ // checkboxTag类型,value是数组格式
+ this.checkboxTagList = newVal.map(tag => ({
+ checked: tag.checked,
+ tagValue: tag.tagValue || ''
+ }));
+ } else {
this.inputValue = this.type === 'checkboxList' && !Array.isArray(newVal) ? [] : newVal;
}
}
@@ -328,13 +330,13 @@ export default {
EventBus.$off("onMixReagentSubmit", this.onMixReagentSubmit)
},
methods: {
- getFlexClass(){
- const noFlexArr = ["radio","checkboxTag"]
+ getFlexClass() {
+ const noFlexArr = ["radio", "checkboxTag"]
return noFlexArr.includes(this.type) ? '' : 'flex1'
},
- getDecimalDigits(){
- const {precision} = this.item;
- if(!isNaN(precision)){
+ getDecimalDigits() {
+ const { precision } = this.item;
+ if (!isNaN(precision)) {
return precision
}
return 6
@@ -526,11 +528,11 @@ export default {
// 执行试剂提交的共同逻辑
executeReagentSubmit(data) {
this.inputValue = data.selectedId;
- const {filledCodes=[]} = this.item;
- console.log(filledCodes,"filledCodes")
- const {selectInfo,row} = data;
- if(filledCodes.length>0){
- this.inputValue = row[filledCodes[0]]+"("+row[filledCodes[1]]+")";
+ const { filledCodes = [] } = this.item;
+ console.log(filledCodes, "filledCodes")
+ const { selectInfo, row } = data;
+ if (filledCodes.length > 0) {
+ this.inputValue = row[filledCodes[0]] + "(" + row[filledCodes[1]] + ")";
}
this.selectRegentInfo = data;
EventBus.$emit("hideSelectMixReagentDialog");
@@ -654,7 +656,7 @@ export default {
preFill: "blue-border",//预填写的边框颜色
}
// 如果有错误状态,返回红色边框样式,覆盖原有的边框颜色
- if (this.error && this.type !== "attachment") {
+ if (this.error && this.type !== "attachment" && this.type !== "checkboxTag") {
return "error-border";
}
return typeObj[fillType] || ""
@@ -774,7 +776,7 @@ export default {
// 检查是否有被取消选中的checkbox
if (this.oldValue && Array.isArray(this.oldValue)) {
const uncheckedValues = this.oldValue.filter(oldVal => !this.inputValue.includes(oldVal));
-
+
// 清除被取消选中的checkbox对应的otherValues
if (uncheckedValues.length > 0) {
this.item.options.forEach(option => {
@@ -785,19 +787,19 @@ export default {
}
}
value = {
- checkboxValues: this.inputValue,
- otherValues: this.otherValues
- };
- if(val){
-
+ checkboxValues: this.inputValue,
+ otherValues: this.otherValues
+ };
+ if (val) {
+
this.onCommonHandleSaveRecord();
}
}
-
+
this.$emit('input', value);
this.$emit('change', value);
-
+
// 根据输入值判断是否显示错误状态
const isEmpty = this.isValueEmpty(value);
@@ -813,38 +815,32 @@ export default {
this.onInputChange();
},
// checkboxTag的checkbox变化处理
- onCheckboxTagChange() {
+ onCheckboxTagChange(tagIndex, e) {
+ this.currentTagIndex = tagIndex;
+ this.checkboxTagList[tagIndex].checked = e;
this.emitCheckboxTagValue();
+ this.onCommonHandleSaveRecord();
},
- // 点击tag区域
- onTagClick() {
- this.isEditingTag = true;
- this.$nextTick(() => {
- this.$refs.tagInput && this.$refs.tagInput.focus();
- });
- },
+
// tag输入框失去焦点
- onTagBlur() {
- this.isEditingTag = false;
+ onTagBlur(tagIndex) {
+ this.currentTagIndex = tagIndex;
+ const value = this.checkboxTagList[tagIndex].tagValue;
this.emitCheckboxTagValue();
- // 触发保存记录
- if (this.tagValue) {
- this.onCommonHandleSaveRecord(this.tagValue);
- }
+ this.onCommonHandleSaveRecord(value);
},
// 删除tag
- onDeleteTag() {
- this.tagValue = '';
+ onDeleteTag(tagIndex) {
+ this.currentTagIndex = tagIndex;
+ // 从列表中删除指定索引的tag
this.emitCheckboxTagValue();
- this.onCommonHandleSaveRecord('');
+ this.$emit("deleteTag", tagIndex);
},
// 发送checkboxTag的值
emitCheckboxTagValue() {
- const value = {
- checked: this.checkboxTagChecked,
- tagValue: this.tagValue
- };
- this.$emit('change', value);
+ // 发送整个数组
+ this.$emit('input', [...this.checkboxTagList]);
+ this.$emit('change', [...this.checkboxTagList]);
},
// 统一处理失去焦点事件
onBlur(e) {
@@ -921,19 +917,28 @@ export default {
this.$emit("change", this.inputValue);
return;
}
-
+
// 值发生了变化,需要弹出密码输入框
- const isSame = this.isEqual(this.oldValue, this.inputValue);
- let isOtherValuesSame = true;
+ let isSame = true, isOldValueEmpty = true;
// 如果是checkboxList类型,需要同时比较otherValues
if (this.type === 'checkboxList' && this.otherValues) {
- isOtherValuesSame = this.isEqual(this.oldOtherValues, this.otherValues);
- }
- console.log(this.oldValue, this.inputValue, isSame, isOtherValuesSame,this.otherValues,this.oldOtherValues,"是否需要记录修改记录")
- if (isSame && isOtherValuesSame) {
+ isSame = this.isEqual(this.oldOtherValues, this.otherValues);
+ isOldValueEmpty = this.isValueEmpty(this.oldOtherValues);
+ } else if (this.type === "checkboxTag") {
+ // checkboxTag类型,只比较当前tagIndex的数据
+ const currentTag = this.checkboxTagList[this.currentTagIndex];
+ const oldTag = this.oldCheckboxTagList[this.currentTagIndex] || {};
+ isSame = this.isEqual(oldTag.checked, currentTag.checked);
+ isOldValueEmpty = this.isValueEmpty(oldTag.checked);
+
+ }else{
+ isSame = this.isEqual(this.oldValue, this.inputValue)
+ isOldValueEmpty = this.isValueEmpty(this.oldValue);
+ }
+ if (isSame) {
return;
}
- if (!this.isValueEmpty(this.oldValue) && !(isSame && isOtherValuesSame) && this.templateFillType === "actFill") {
+ if (!isOldValueEmpty && !(isSame) && this.templateFillType === "actFill") {
// 通过EventBus触发电子签名弹窗
EventBus.$emit('showEditSignDialog', { uuid: this.uuid });
} else {//如果是第一次填写,不需要密码验证
@@ -946,11 +951,22 @@ export default {
// 用户点击取消,还原数据
let oldValue = this.oldValue;
if (this.type === 'checkboxList') {
- oldValue = {
+ oldValue = {
checkboxValues: oldValue.checkboxValues || oldValue,
otherValues: this.oldOtherValues
};
- }
+ } else if (this.type === "checkboxTag") {
+ // checkboxTag类型,只回退当前tagIndex的数据
+ if (this.currentTagIndex >= 0 && this.currentTagIndex < this.oldCheckboxTagList.length) {
+ const oldTag = this.oldCheckboxTagList[this.currentTagIndex];
+ this.checkboxTagList[this.currentTagIndex] = { ...oldTag };
+ oldValue = [...this.checkboxTagList];
+ } else {
+ // 如果没有指定tagIndex,回退整个数组
+ this.checkboxTagList = JSON.parse(JSON.stringify(this.oldCheckboxTagList));
+ oldValue = [...this.checkboxTagList];
+ }
+ }
this.inputValue = this.oldValue;
this.$emit('input', oldValue); // 触发 v-model 更新
// this.$emit("blur", this.oldValue);
@@ -961,18 +977,30 @@ export default {
},
//处理更新记录
- handleUpdateRecord(data,recordData) {
+ handleUpdateRecord(data, recordData) {
const baseInfo = this.getCommonRecordInfo();
- if (!this.oldValue && !this.inputValue) return;
- if(recordData){
+ if (!this.oldValue && !this.inputValue) {
+ return
+ }
+ if (recordData) {
this.oldValue = recordData.oldValue;
this.inputValue = recordData.inputValue;
}
+ let recordOldVlaue = this.oldValue, recordValue = this.inputValue, isModify = !!this.oldValue;
+ if (this.type === "checkboxTag") {
+ // checkboxTag类型,只记录当前tagIndex的数据变化
+ const oldTag = this.oldCheckboxTagList[this.currentTagIndex] || {};
+ const currentTag = this.checkboxTagList[this.currentTagIndex] || {};
+ recordOldVlaue = `${oldTag.tagValue || ''}:${oldTag.checked ? '勾选' : '未勾选'}`;
+ recordValue = `${currentTag.tagValue || ''}:${currentTag.checked ? '勾选' : '未勾选'}`;
+ isModify = oldTag.checked !== undefined
+
+ }
const record = {
...baseInfo,
- oldValue: this.oldValue,
- value: this.inputValue,
- title: this.oldValue ? "修改" : "提交",
+ oldValue: recordOldVlaue,
+ value: recordValue,
+ title: isModify ? "修改" : "提交",
time: moment().format("YYYY-MM-DD HH:mm:ss"),
}
if (data) {
@@ -984,11 +1012,19 @@ export default {
newRecord: [record],
resourceList: this.getZdxgjl(),
}
-
- // 更新oldValue和oldOtherValues
+
+ // 更新oldValue和oldOtherValues
if (this.type === 'checkboxList') {
this.oldValue = [...this.inputValue];
this.oldOtherValues = { ...this.otherValues };
+ } else if (this.type === "checkboxTag") {
+ // checkboxTag类型,只更新当前tagIndex的数据
+ if (this.currentTagIndex >= 0 && this.currentTagIndex < this.checkboxTagList.length) {
+ this.oldCheckboxTagList[this.currentTagIndex] = { ...this.checkboxTagList[this.currentTagIndex] };
+ } else {
+ // 如果没有指定tagIndex,更新整个数组
+ this.oldCheckboxTagList = JSON.parse(JSON.stringify(this.checkboxTagList));
+ }
}
let value = this.inputValue;
if (this.type === 'checkboxList') {
@@ -996,10 +1032,12 @@ export default {
checkboxValues: this.inputValue,
otherValues: this.otherValues
};
+ } else if (this.type === "checkboxTag") {
+ value = [...this.checkboxTagList];
}
- if(this.type === "button"){
- this.$emit('clickButton', this.item,this.inputValue,data);
- if(this.templateFillType === "preFill"){
+ if (this.type === "button") {
+ this.$emit('clickButton', this.item, this.inputValue, data);
+ if (this.templateFillType === "preFill") {
return;
}
}
@@ -1017,7 +1055,7 @@ export default {
}
this.$nextTick(() => {
EventBus.$emit('onModifyRecord', params,)
- console.log(params,"onModifyRecord")
+ console.log(params, "onModifyRecord")
if (this.regentType.includes(this.item.type)) {
this.$emit("onRegentSubmit", this.selectRegentInfo, this.inputValue);
}
@@ -1106,7 +1144,7 @@ export default {
isShowHandle() {
const { fillType } = this.item;
//只有当模板状态不是预填时,才显示操作按钮
- return this.templateFillType !== "preFill" && fillType === "actFill"&&this.type!=="button"
+ return this.templateFillType !== "preFill" && fillType === "actFill" && this.type !== "button"
},
//判断是否禁用
getDisabled() {
@@ -1582,15 +1620,17 @@ export default {
margin-right: 16px;
display: flex;
align-items: center;
+
&:not(:last-child) {
margin-bottom: 10px;
}
+
// display: inline-block;
-
+
.el-input {
width: 200px;
margin-left: 10px;
-
+
&.error-border {
.el-input__inner {
border-color: #ff5d5d !important;
@@ -1600,7 +1640,7 @@ export default {
}
}
-
+
}
.orange-border {
@@ -1612,6 +1652,7 @@ export default {
}
}
+
.el-checkbox {
&.is-checked {
.el-checkbox__label {
@@ -1624,6 +1665,7 @@ export default {
}
}
}
+
.el-radio {
&.is-checked {
.el-radio__label {
@@ -1646,16 +1688,15 @@ export default {
}
// checkboxTag样式
+.checkbox-tag-wrapper {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 10px;
+ padding: 8px;
+}
+
.checkbox-tag-container {
border-radius: 4px;
- // transition: all 0.3s;
- margin-bottom: 5px;
- margin-right: 5px;
-
- &.error-border {
- border-color: #ff5d5d !important;
- box-shadow: 0 0 6px #ffc3c3 !important;
- }
.checkbox-tag-item {
display: flex;
@@ -1664,6 +1705,7 @@ export default {
.tag-content {
cursor: pointer;
+ position: relative;
.tag-input {
width: 100px;
@@ -1678,15 +1720,14 @@ export default {
.delete-icon {
cursor: pointer;
color: #909399;
- font-size: 14px;
+ font-size: 12px;
padding: 2px;
border-radius: 50%;
- // transition: all 0.3s;
-
- &:hover {
- color: #ff5d5d;
- background-color: #f5f5f5;
- }
+ position: absolute;
+ top: 6px;
+ right: 5px;
+ color: red;
+ background-color: #f5f5f5;
}
}
}
diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js
index 1c6ab3a..4af3cb3 100644
--- a/src/components/Template/mixins/formPackageMixins.js
+++ b/src/components/Template/mixins/formPackageMixins.js
@@ -261,7 +261,6 @@ export default {
selectInfoKeys.forEach(key => {
result[key] = formData[key];
})
- console.log(config,"allConfig")
// 更新表单字段
this.formFields = result;
this.allFieldsConfig = config;
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 1483bad..7cdc64b 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -162,7 +162,15 @@ export default {
},
// 删除行
deleteRow(index) {
- this.$emit("deleteRow", index)
+ this.$emit("deleteRow", index);
+ setTimeout(() => {
+ const params = {
+ type: "fieldChanged",
+ newRecord: null,
+ resourceList: null,
+ }
+ EventBus.$emit('onModifyRecord', params,)
+ }, 30);
}
}
}
diff --git a/src/components/Template/operation/TableOpertaionDelete.vue b/src/components/Template/operation/TableOpertaionDelete.vue
index c9f6562..54b3401 100644
--- a/src/components/Template/operation/TableOpertaionDelete.vue
+++ b/src/components/Template/operation/TableOpertaionDelete.vue
@@ -10,6 +10,8 @@
+
diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL018.vue
@@ -0,0 +1,205 @@
+
+
+
+
+

{{ formData.bdmc }}

+
+
+
+
+
+
+
+
diff --git a/src/views/business/comps/template/comps/dl/DL019.vue b/src/views/business/comps/template/comps/dl/DL019.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL019.vue
@@ -0,0 +1,205 @@
+
+
+
+
+

{{ formData.bdmc }}

+
+
+
+
+
+
+
+
diff --git a/src/views/business/comps/template/comps/dl/DL020.vue b/src/views/business/comps/template/comps/dl/DL020.vue
index 083ab4d..02205f1 100644
--- a/src/views/business/comps/template/comps/dl/DL020.vue
+++ b/src/views/business/comps/template/comps/dl/DL020.vue
@@ -140,18 +140,18 @@ export default {
// this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
// },
//获取已填写的表单数据
- getFilledFormData() {
- const baseData = this.$refs.baseInfoRef.getFilledFormData();
- const swypyjData = this.$refs.swypyjInfoRef.getFilledFormData();
- const remarkData = this.$refs.remarkRef.getFilledFormData();
- const stepData = this.$refs.stepRef.getFilledFormData();
+ async getFilledFormData() {
+ let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"]);
+ return content;
+ // const baseData = this.$refs.baseInfoRef.getFilledFormData();
+ // const swypyjData = this.$refs.swypyjInfoRef.getFilledFormData();
+ // const remarkData = this.$refs.remarkRef.getFilledFormData();
- return {
- ...baseData,
- ...swypyjData,
- ...remarkData,
- ...stepData,
- }
+ // return {
+ // ...baseData,
+ // ...swypyjData,
+ // ...remarkData,
+ // }
},
//获取填写完成的表单数据
async getFormData() {
@@ -170,7 +170,7 @@ export default {
return await this.validFormFields(refsToValidate);
},
getResource() {
- let content = this.getFilledFormData();
+ // let content = this.getFilledFormData();
//使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp = stepResource.sjResource || []
diff --git a/src/views/business/comps/template/comps/dl/DL021.vue b/src/views/business/comps/template/comps/dl/DL021.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL021.vue
@@ -0,0 +1,205 @@
+
+
+
+
+

{{ formData.bdmc }}

+
+
+
+
+
+
+
+
diff --git a/src/views/business/comps/template/comps/dl/DL022.vue b/src/views/business/comps/template/comps/dl/DL022.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL022.vue
@@ -0,0 +1,205 @@
+
+
+
+
+

{{ formData.bdmc }}

+
+
+
+
+
+
+
+
diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL023.vue
@@ -0,0 +1,205 @@
+
+
+
+
+

{{ formData.bdmc }}

+
+
+
+
+
+
+
+
diff --git a/src/views/business/comps/template/comps/dl/DL024.vue b/src/views/business/comps/template/comps/dl/DL024.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL024.vue
@@ -0,0 +1,205 @@
+
+
+
+
+

{{ formData.bdmc }}

+
+
+
+
+
+
+
+
diff --git a/src/views/business/comps/template/comps/yp/YP003.vue b/src/views/business/comps/template/comps/yp/YP003.vue
index e40bb41..87a7963 100644
--- a/src/views/business/comps/template/comps/yp/YP003.vue
+++ b/src/views/business/comps/template/comps/yp/YP003.vue
@@ -17,9 +17,11 @@
:ref="`tableRef`"
:columns="tableColumns"
:formData="formData"
+ operationWidth = "80px"
:prefixKey = "`table`"
- fieldItemLabel = "template.common.operationSteps"
+ fieldItemLabel = "template.yp.yp003.ybxx"
@clickButton="handleClickButton"
+ @onCheckboxTagChange="onCheckboxTagChange"
:showOperation="fillType === 'preFill'"
>
@@ -159,7 +161,7 @@ export default {
prop: 'cyd',
bodyType: 'input',
bodyFillType: 'actFill',
- width: 280,
+ width: 100,
bodyMaxlength: 50,
},{
label: 'template.yp.yp003.dwbh',
@@ -170,14 +172,15 @@ export default {
bodySubFillType:"preFill",
bodySubButtonName:"template.common.importTemplate",
bodySubKey:"exportBtn",
- showBodySub:true,
+ showBodySub:this.fillType === "preFill",
width: 280,
},{
label: 'template.yp.yp003.ypsl',
prop: 'ypsl',
bodyType: 'input',
+ bodyDisabled: true,
bodyFillType: 'actFill',
- width: 280,
+ width: 80,
}]
},
},
@@ -234,15 +237,23 @@ export default {
const data = excelData.splice(1);
const tagData = data.map((item)=>{
return {
- checked:false,
+ checked:undefined,
tagValue:item[0],
}
})
this.$refs.tableRef.updateDataSourceByRowIndex(this.currentRowIndex,{dwbh:tagData});
+ this.$refs.tableRef.onErrorUpdate(this.currentRowIndex, 1, 'dwbh', false)
this.$refs.ImportExcelDialog.cancel()
+ setTimeout(() => {
+ this.justUpdateFilledFormData();
+ }, 100);
},
downloadExcelTemplate(arr){
this.exportExcel(arr)
+ },
+ onCheckboxTagChange(rowIndex,colIndex,data){
+ const num = data.filter((item)=>item.checked).length;
+ this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, {'ypsl':num})
}
}
};
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 1b857cf..6bf2fa5 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -6,6 +6,8 @@ import { sj_subpackage, sj_startConfiguration, sj_configurationCompleted } from
import {convertConcentration} from "@/utils/conConverter";//浓度单位转换
import {volumeConverter} from "@/utils/volConverter";//体积单位转换
import * as XLSX from 'xlsx'
+import { EventBus } from "@/utils/eventBus";
+
export default {
dicts: [
'business_pztj',
@@ -227,6 +229,15 @@ export default {
this.setTemplateData({})
},
methods: {
+ // 只是更新已填写的表单数据,不触发校验
+ justUpdateFilledFormData(){
+ const params = {
+ type: "fieldChanged",
+ newRecord: null,
+ resourceList: null,
+ }
+ EventBus.$emit('onModifyRecord', params,)
+ },
//试剂弹窗确认前
onBeforeReagentSubmit(data){
const {selectData, callback, key, formFields} = data;