diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue index 7c09f51..6ded5ec 100644 --- a/src/components/Template/BaseInfoFormPackage.vue +++ b/src/components/Template/BaseInfoFormPackage.vue @@ -451,7 +451,7 @@ export default { fillType: sItem.subFillType || sItem.fillType }; if(sItem.hasOwnProperty("subDisabled")){ - o.disabled = sItem.disabled; + o.disabled = sItem.subDisabled; } return { ...sItem, diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index 0a16432..8ed469f 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -224,6 +224,11 @@ :value="row[col.bodySubKey]" @clickButton="(e, data) => handleClickButton(e, data, col.bodySubKey, rowIndex, colIndex)" /> +
{{ modificationRecords.length - 1 == index ? "提交" : "修改" }}
-
原值:{{ record.oldValue }}
-
修改值:{{ record.value }}
+
+ 原值: +
+
+
+ 修改值: +
+
备注:{{ record.reason }}
@@ -1287,8 +1293,11 @@ export default { }else if(this.type === "attachment"){ const attList = JSON.parse(recordValue); const oldAttList = JSON.parse(recordOldVlaue || "[]"); - recordValue = attList.map(item => item.name).join(";"); - recordOldVlaue = oldAttList.map(item => item.name).join(";"); + const urlList = attList.map(item => { + return `${item.name}` + }); + recordValue = urlList.join("、"); + recordOldVlaue = oldAttList.map(item => `${item.name}`).join("、"); } const record = { ...baseInfo, diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index 50a2a02..a4bcf9a 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -52,9 +52,6 @@ import DMYPPZJLB from "./comps/gsp/DMYPPZJLB.vue"; // PCR //PCR001-使用SP001 -import PCR002 from "./comps/pcr/PCR002.vue"; -import PCR003 from "./comps/pcr/PCR003.vue"; -import PCR004 from "./comps/pcr/PCR004.vue"; import PCR005 from "./comps/pcr/PCR005.vue"; import PCR007 from "./comps/pcr/PCR007.vue"; import PCR008 from "./comps/pcr/PCR008.vue"; @@ -140,7 +137,7 @@ export default { //色谱 SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,SP0021, // PCR - PCR002, PCR003, PCR004, PCR005,PCR007, PCR008, PCR009,PCR010, PCR011, PCR012, + PCR005,PCR007, PCR008, PCR009,PCR010, PCR011, PCR012, //LBA LBA002, LBA003,