diff --git a/package.json b/package.json index 14cabca..9504e6d 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "axios": "0.28.1", "clipboard": "2.0.8", "core-js": "3.37.1", - "crypto-js": "^4.2.0", "echarts": "5.4.0", "element-ui": "2.15.14", "file-saver": "2.0.5", @@ -63,6 +62,7 @@ "chalk": "4.1.0", "compression-webpack-plugin": "6.1.2", "connect": "3.6.6", + "crypto-js": "^4.2.0", "sass": "1.32.13", "sass-loader": "10.1.1", "script-ext-html-webpack-plugin": "2.1.5", diff --git a/src/components/Template/README.md b/src/components/Template/README.md index f04b265..b03face 100644 --- a/src/components/Template/README.md +++ b/src/components/Template/README.md @@ -5,24 +5,24 @@ { type: "conditionItem" | "cardItem" |"cellItem"| "step",//ui层面的区分,具体可以参考色谱第一个模板 config: { - storageCondition: {//当前表单的key值; - label: "存储条件",//当前表单的label值,有的表单可能没有; - type: "input"|"select"|"inputerNumber"|"textarea"|"dateTime"|"span"|"clickable",//当前表单的type值 - fillType: "preFill" |"actFill",//主要是边框的区分,preFill为预填(蓝色),actFill为实际填报(橙色); - options: this.getDictOptions("business_cctj"),//当前表单的type为select时,options为必填项,如:[{label:"",value:""}] - otherCode: "storageConditionOther",//当前表单可能会触发其他输入项,otherCode为其他输入项的key值; - span:2,//一行几列,默认2列,目前最多配置3列,如果有需要后续再调整; - maxlength:100,//当前表单的最大长度,默认50; - placeholder: "请输入存储条件",//当前表单的placeholder值,不填写时默认拼接请输入/请选择+label; - rows: 5,//当前表单的type为textarea时,默认5行; - disabled: true,//当前表单是否禁用,默认false; - multiple: true,//当前表单的type为select时,是否可以多选,默认false; - subType:“input”,//和type的类型是一样的,主要用于第二个表单的类型; - subKey:“subStorageCondition”,//第二个表单的key值 - subOptions:[],//第二个表单的type为select时,options为必填项,如:[{label:"",value:""}] - subFillType: "preFill" |"actFill",//第二个字段的边框区分,preFill为预填(蓝色),actFill为实际填报(橙色); - subPlaceholder: "请输入存储条件",//第二个表单的placeholder值,不填写时默认拼接请输入/请选择+label; - compareTo: "storageCondition",//需要比较的字段,字段不一样时背景标红; + storageCondition: {//当前表单的key值; + label: "存储条件",//当前表单的label值,有的表单可能没有; + type: "input"|"select"|"inputerNumber"|"textarea"|"dateTime"|"span"|"clickable",//当前表单的type值 + fillType: "preFill" |"actFill",//主要是边框的区分,preFill为预填(蓝色),actFill为实际填报(橙色); + options: this.getDictOptions("business_cctj"),//当前表单的type为select时,options为必填项,如:[{label:"",value:""}] + otherCode: "storageConditionOther",//当前表单可能会触发其他输入项,otherCode为其他输入项的key值; + span:2,//一行几列,默认2列,目前最多配置3列,如果有需要后续再调整; + maxlength:100,//当前表单的最大长度,默认50; + placeholder: "请输入存储条件",//当前表单的placeholder值,不填写时默认拼接请输入/请选择+label; + rows: 5,//当前表单的type为textarea时,默认5行; + disabled: true,//当前表单是否禁用,默认false; + multiple: true,//当前表单的type为select时,是否可以多选,默认false; + subType:“input”,//和type的类型是一样的,主要用于第二个表单的类型; + subKey:“subStorageCondition”,//第二个表单的key值 + subOptions:[],//第二个表单的type为select时,options为必填项,如:[{label:"",value:""}] + subFillType: "preFill" |"actFill",//第二个字段的边框区分,preFill为预填(蓝色),actFill为实际填报(橙色); + subPlaceholder: "请输入存储条件",//第二个表单的placeholder值,不填写时默认拼接请输入/请选择+label; + compareTo: "storageCondition",//需要比较的字段,字段不一样时背景标红; copyFrom:"storageCondition",//需要复制的字段,复制后会自动填充到当前表单; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue index fcbfcc1..452e233 100644 --- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue @@ -404,7 +404,6 @@ export default { selectReagentVisible: false, subSolutionVisible: false, currentSubKey: "",//当前点击的子项key - dataSource: [], stepTableDataSource: [], sysjColumns: [ { label: "试剂名称", prop: "reagentName" },