diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index ff793b9..7ff16d4 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -59,6 +59,14 @@
@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+
+
+
{{ row[col.prop] }}
@@ -80,6 +88,7 @@
@update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
:orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
+
{{ row[col.bodySubKey] }}
@@ -181,6 +190,14 @@ export default {
// this.initHeaderSelectValues();
},
methods: {
+ // 点击事件
+ handleClickable(col, rowIndex, colIndex) {
+ console.log("clickable",rowIndex,colIndex, col)
+ if (this.templateFillType !== 'actFill') {
+ return
+ }
+ this.$emit("clickable", col,rowIndex)
+ },
isShowAddRos() {
if(!this.showAddRow) {
return false;
@@ -369,6 +386,7 @@ export default {
precision: currentItem[col.bodyPrecisionKey] || col.precision || 0,
copyFrom: col.copyFrom || "",
compareTo: col.bodyCompareTo, // 添加 compareTo 字段
+ type: col.bodyType || "input",
};
if (col.bodyDisabled) {
item.disabled = col.bodyDisabled;
@@ -631,4 +649,10 @@ export default {
padding: 20px 0;
margin-top: 20px;
}
+.flex1 {
+ flex: 1;
+}
+.flex{
+ display: flex;
+}
\ No newline at end of file
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 6bc490e..e266c53 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -839,7 +839,7 @@ export default {
cursor: pointer;
width: auto;
// margin-left: 10px;
- min-width: 100px;
+ min-width: 178px;
height: 28px;
border-radius: 4px;
border: 1px solid #4ea2ff;
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 7a89429..d5f0568 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
@@ -23,8 +23,9 @@
@blur="onHandleTableBlur"
:ref="`tableRef`"
:columns="tableStepColumns"
- :formData="formData.tableData"
+ :formData="formData"
:prefixKey = "`table`"
+ @clickable="handleClickable"
fieldItemLabel = "这个是什么"
>
@@ -249,6 +250,10 @@ export default {
}
},
methods: {
+ //点击表格单元格
+ handleClickable(col, rowIndex, colIndex) {
+ console.log("clickable",rowIndex,colIndex, col)
+ },
//获取目标溶液编号
async getCode(){
const result = await getLatestSn({
@@ -260,10 +265,10 @@ export default {
},
//获取已填写的表单数据
getFilledFormData(){
- return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"])
+ return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "tableRef","stepRef", "remarkRef"])
},
async getFormData() {
- let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]);
+ let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
//生成resource
let tmpResource = []
debugger
diff --git a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
index 6bb9bfe..6447ab8 100644
--- a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
+++ b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
@@ -21,7 +21,7 @@ export const getSWYPFXFFXYPZBBTableConfig = ($this) => {
{
label: '实际溶液',
prop: 'sjry',
- bodyType: 'input',
+ bodyType: 'clickable',
bodyFillType: 'actFill',
width: 280
},