feat:[模板管理][组件抽离ing]

src/components/Template/BaseInfoFormPcakge.vue

@@ -52,7 +52,7 @@
                         <div v-for="(sItem, key) in item.config" class="c-Item" :class="getSpanClass(sItem)"
                             :key="key">
                             <div class="form-title" v-if="sItem.label">{{ sItem.label }}</div>
-                            <div v-if="sItem.type === 'dateTime'">
+                            <div v-if="sItem.type === 'dateTime'" class="flex1">
                                 <HandleFormItem type="dateTime" :item="sItem" v-model="formFields[key]"
                                     @copy="onCopy(sItem, key)" />
                             </div>
@@ -78,7 +78,7 @@
                     <div v-for="(sItem, key) in item.config" class="c-Item flex item-center" :class="getSpanClass(sItem)"
                         :key="key">
                         <div class="step-form-title" v-if="sItem.label">{{ sItem.label }}</div>
-                        <div v-if="sItem.type === 'dateTime'">
+                        <div v-if="sItem.type === 'dateTime'" class="flex1">
                             <HandleFormItem type="dateTime" :item="sItem" v-model="formFields[key]"
                                 @copy="onCopy(sItem, key)" />
                         </div>
@@ -99,10 +99,12 @@
                             <HandleFormItem v-if="sItem.subType === 'select'" type="select" class="sub-select" :item="getSubItem(sItem)" v-model="formFields[sItem.subKey]" 
                             @copy="onCopy(sItem, key)" @change="onSelectChange(sItem.subKey, $event)" />
                             <div v-else-if="sItem.subType === 'span'">{{ formFields[sItem.subKey] }}</div>
-                            <div class="clickable" :class="getFillType(sItem.subFillType)" v-else-if = "sItem.subType ==='clickable'" @click="handleClickable(sItem,$event)">
+                            <HandleFormItem v-else-if="sItem.subType === 'clickable'" type="clickable" @clickable="handleClickable(sItem,$event)" class="sub-select" :item="getClickableItem(sItem)" :value="formFields[sItem.subKey]" 
+                            />
+                            <!-- <div class="clickable" :class="getFillType(sItem.subFillType)" v-else-if = "sItem.subType ==='clickable'" @click="handleClickable(sItem,$event)">
                                 <span v-if="formFields[sItem.subKey]">{{ formFields[sItem.subKey] }}</span>
                                 <span v-else class="default-placeholder-text">请选择</span>
-                            </div>
+                            </div> -->
                         </div>
                         <div v-else-if="sItem.type === 'inputNumber'" class="flex flex1">
                             <HandleFormItem type = "inputNumber" @blur="onBlur(key, $event)" class="flex1" :item="sItem" @input = "onInputNumberChange(key, $event)" :value = "formFields[key]" 
@@ -110,10 +112,12 @@
                             <HandleFormItem v-if="sItem.subType === 'select'" type="select" class="sub-select" :item="getSubItem(sItem)" v-model="formFields[sItem.subKey]" 
                             @copy="onCopy(sItem, key)" @change="onSelectChange(sItem.subKey, $event)" />
                             <div v-else-if="sItem.subType === 'span'">{{ formFields[sItem.subKey] }}</div>
-                            <div class="clickable" :class="getFillType(sItem.subFillType)" v-else-if = "sItem.subType ==='clickable'" @click="handleClickable(sItem,$event)">
+                              <HandleFormItem v-else-if="sItem.subType === 'clickable'" @clickable="handleClickable(sItem,$event)" type="clickable" class="sub-select" :item="getClickableItem(sItem)" :value="formFields[sItem.subKey]" 
+                            />
+                            <!-- <div class="clickable" :class="getFillType(sItem.subFillType)" v-else-if = "sItem.subType ==='clickable'" @click="handleClickable(sItem,$event)">
                                 <span v-if="formFields[sItem.subKey]">{{ formFields[sItem.subKey] }}</span>
                                 <span v-else class="default-placeholder-text">请选择</span>
-                            </div>
+                            </div> -->
                         </div>
                     </div>
                 </div>
@@ -193,6 +197,9 @@ export default {
             })
         },
         handleClickable(sItem,event){
+            if(this.fillType !== 'actFill'){
+                return
+            }
             this.$emit("clickable",sItem)
         },
         //根据span判断一行显示几列
@@ -211,6 +218,13 @@ export default {
                 maxlength: sItem.otherMaxlength || 50,
             }
         },
+        getClickableItem(sItem){
+            return {
+                label: "",
+                type: "clickable",
+                fillType: sItem.subFillType || sItem.fillType,
+            }
+        },
         getSubItem(sItem){
             return {
                 label: "",
@@ -278,6 +292,23 @@ export default {
             this.allFieldsConfig = config;
             console.log(config,"config")
         },
+        //判断是否禁用
+        getDisabled() {
+            const { item } = this;
+            const { fillType } = item;
+            if (item.hasOwnProperty("disabled")) {
+                return item.disabled
+            } else {
+                const { templateStatus } = this.$store.state.template;
+                if (fillType === "actFill") {//当模板状态是实际填写时，只有当fillType是actFill时才能填写
+                    return templateStatus !== "actFill"
+                } else if (fillType === "preFill") {//当模板状态是预填写时，只有当fillType是preFill才能填写
+                    return templateStatus !== "preFill"
+                } else {
+                    return true
+                }
+            }
+        },
         getFormData() {
             const { formFields, allFieldsConfig } = this;
             const { templateStatus } = this.$store.state.template;
@@ -443,6 +474,9 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
+    font-size: 14px;
+    font-weight: normal;
+    color: #606266;
 }
 
 .orange-border {

src/components/Template/CustomTable.vue

@@ -6,10 +6,12 @@
           :style="{ width: col.width ? col.width + 'px' : 'auto' }">
           <div class="header-cell-content">
             <div>{{ col.label }}</div>
-            <template v-if="col.headerSelectKey && col.headerOptions">
+            <template v-if="col.headerSelectKey && col.headerOptions&&showHeaderSelect">
               <HandleFormItem type="select" class="header-select"  :item="getHeaderItem(col)"
-                v-model="headerSelectFields[col.headerSelectKey]" @change="onHeaderSelectChange(index, $event)" />
+                v-model="headerSelectFields[col.headerSelectKey]" @change="onHeaderSelectChange(col, $event)" />
             </template>
+            <span v-else-if ="headerSelectFields[col.headerSelectKey]" class="fill-type-icon">({{ headerSelectFields[col.headerSelectKey] }})</span>
+
           </div>
 
         </div>
@@ -42,8 +44,8 @@
                 {{ row[col.prop] }}
               </template>
             </div>
-            <div class="m-l-5">
-              <template v-if="col.bodySubType === 'inputNumber' && col.showBodySub">
+            <div class="m-l-5" v-if="col.showBodySub">
+              <template v-if="col.bodySubType === 'inputNumber'">
                 <HandleFormItem type="inputNumber" @blur = "onSubBlur(rowIndex, col.bodySubKey, $event)"  @copy = "onCopy(rowIndex, col)"  :item="getBodySubItem(col)"
                   v-model="row[col.bodySubKey]" @change="onBodySubValueChange(rowIndex, colIndex, $event)" />
               </template>
@@ -53,6 +55,7 @@
             </div>
           </div>
         </div>
+        
         <!-- 默认操作栏 -->
         <div class="custom-table-cell body-cell" :style="{ width: '180px' }" v-if="showOperation">
           <div class="inner-table-cell">
@@ -61,6 +64,9 @@
         </div>
       </div>
     </div>
+    <div v-if = "localDataSource.length==0">
+      <div class="no-data">暂无数据</div>
+    </div>
   </div>
 </template>
 
@@ -72,6 +78,11 @@ export default {
     HandleFormItem
   },
   props: {
+    // 是否显示表头选择器
+    showHeaderSelect: {
+      type: Boolean,
+      default: true,
+    },
     // 是否显示操作栏
     showOperation: {
       type: Boolean,
@@ -218,9 +229,8 @@ export default {
       return false;
     },
     // 表头选择器变化
-    onHeaderSelectChange(colIndex, value) {
-      this.headerSelectValues[colIndex] = value;
-      this.$emit('header-select-change', colIndex, value);
+    onHeaderSelectChange(col, value) {
+      this.headerSelectFields[col.headerSelectKey] = value;
     },
     // 表体值变化
     onBodyValueChange(rowIndex, colIndex, value) {
@@ -280,6 +290,10 @@ export default {
       // 深拷贝数据以避免直接修改原始数据
       this.localDataSource = JSON.parse(JSON.stringify(dataSource || []));
     },
+    // 添加行
+    addRow(row) {
+      this.localDataSource.push(row);
+    },
     getDataSource(){
       return this.localDataSource;
     },
@@ -422,5 +436,9 @@ export default {
   width: 100px;
   margin-left: 5px;
 }
-
+.no-data{
+  text-align: center;
+  padding: 20px 0;
+  color: rgb(144, 147, 153)
+}
 </style>

src/components/Template/HandleFormItem.vue

@@ -2,30 +2,34 @@
     <div class="flex w-100">
         <div class="flex1 flex">
             <el-input v-if="type === 'input'" :maxlength="item.maxlength || 50" :disabled="getDisabled()"
-                :class="item.fillType | getFillType" @blur="onBlur"
+                :class="getFillTypeStyle()" @blur="onBlur"
                 :placeholder="item.placeholder ? item.placeholder : ('请输入' + item.label)" v-model="inputValue"
                 @input="onInputChange" @change="onInputChange" />
             <el-input v-else-if="type === 'textarea'" :maxlength="item.maxlength || 50" :disabled="getDisabled()"
-                :class="item.fillType | getFillType" type="textarea" show-word-limit resize="none" @blur="onBlur"
+                :class="getFillTypeStyle()" type="textarea" show-word-limit resize="none" @blur="onBlur"
                 :rows="item.rows || 3" :placeholder="item.placeholder ? item.placeholder : ('请输入' + item.label)"
                 v-model="inputValue" @input="onInputChange" @change="onInputChange" />
             <DecimalInput v-else-if="type === 'inputNumber'" @blur="onBlur" :maxlength="item.maxlength || 10"
                 class="flex1" :disabled="getDisabled()" :controls="item.controls || false" :min="item.min || 0"
                 :prepend = "item.prepend"
-                :decimalDigits="item.precision" :class="item.fillType | getFillType"
+                :decimalDigits="item.precision" :class="getFillTypeStyle()"
                 :placeholder="item.placeholder ? item.placeholder : ('请输入' + item.label)" v-model="inputValue"
                 @input="onInputChange" @change="onInputChange" />
             <el-select v-else-if="type === 'select'" class="flex1" :multiple="item.multiple"
-                :class="item.fillType | getFillType" v-model="inputValue" :disabled="getDisabled()"
+                :class="getFillTypeStyle()" v-model="inputValue" :disabled="getDisabled()"
                 :placeholder="item.placeholder ? item.placeholder : ('请选择' + item.label)" @change="onInputChange">
                 <el-option v-for="op in item.options" :key="op.value" :label="op.label" :value="op.value">
                 </el-option>
             </el-select>
-            <el-date-picker v-else-if="type === 'dateTime'" class="flex1" :class="item.fillType | getFillType"
+            <el-date-picker v-else-if="type === 'dateTime'" type="datetime" class="flex1" :class="getFillTypeStyle()"
                 v-model="inputValue" :disabled="getDisabled()" format="yyyy/MM/DD HH:mm:ss"
                 value-format="yyyy/MM/DD HH:mm:ss"
                 :placeholder="item.placeholder ? item.placeholder : ('请选择' + item.label)" @change="onInputChange">
             </el-date-picker>
+            <div class="clickable" :class="getFillTypeStyle() + (getDisabled()?' disabled':'')" v-else-if = "item.type ==='clickable'" @click="handleClickable(item,$event)">
+                <span v-if="value">{{ value }}</span>
+                <span v-else class="default-placeholder-text">请选择</span>
+            </div>
         </div>
         <!-- qc才能操作 -->
         <div class="handle-row" v-if="isShowHandle()">
@@ -79,17 +83,19 @@ export default {
         }
     },
     filters: {
-        getFillType(type) {
+        
+
+    },
+    methods: {
+        getFillTypeStyle(type) {
+            const {fillType} = this.item;
             const typeObj = {
                 actFill: "orange-border",//实际填写的边框颜色
                 green: "green-border",
                 preFill: "blue-border",//预填写的边框颜色
             }
-            return typeObj[type] || ""
+            return typeObj[fillType] || ""
         },
-
-    },
-    methods: {
         //获取question图标颜色
         getQuestionColor() {
             //gray 灰色 green 绿色 orange 橙色
@@ -101,6 +107,12 @@ export default {
             this.$emit('input', value);
             this.$emit('change', value);
         },
+        handleClickable(item,event){
+            if(item.fillType !== 'actFill'){
+                return
+            }
+            this.$emit("clickable",item)
+        },
         //判断是否显示复制按钮
         getIsShowCopyIcon() {
             const { copyFrom } = this.item;
@@ -186,7 +198,7 @@ export default {
 
 .orange-border {
 
-    input,
+    .el-input-group__prepend,input,
     textarea {
         border-color: #f9c588;
 
@@ -207,7 +219,7 @@ export default {
 
 .green-border {
 
-    input,
+    .el-input-group__prepend,input,
     textarea {
         border-color: green;
 
@@ -228,7 +240,7 @@ export default {
 
 .blue-border {
 
-    input,
+    .el-input-group__prepend,input,
     textarea {
         border-color: #4ea2ff;
 
@@ -246,4 +258,24 @@ export default {
     }
 
 }
+.clickable{
+    cursor: pointer;
+    width: auto;
+    margin-left: 10px;
+    min-width: 100px;
+    height: 28px;
+    border-radius: 4px;
+    border:1px solid #4ea2ff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 14px;
+    font-weight: normal;
+    color: #606266;
+    &.disabled{
+        cursor: not-allowed;
+        color: #c0c4cc;
+        background-color: #f5f7fa;
+    }
+}
 </style>

src/components/Template/Step.vue

@@ -81,8 +81,8 @@ export default {
   name: 'Step',
   props: {
     formData: {
-      type: Object,
-      default: () => ({stepData:[]})
+      type: Array,
+      default: () => []
     }
   },
   data() {
@@ -164,7 +164,7 @@ export default {
       },
       deep: true
     },
-    'formData.stepData': {
+    'formData': {
       handler(newVal) {
         console.log('newVal', newVal)
         if(!newVal || newVal.length === 0) return
@@ -174,7 +174,8 @@ export default {
           formData: step.formData || {}
         }))
       },
-      deep: true
+      deep: true,
+      immediate: true
     }
   },
   methods: {
@@ -233,7 +234,7 @@ export default {
           type: step.type,
           ...step.formData
         }))
-        resolve({stepData})
+        resolve(stepData)
       })
     },
     

src/lang/en/template/commonTemplate.js

@@ -52,5 +52,10 @@ export default {
   instrumentName: 'Instrument Name',
   instrumentModel: 'Instrument Model',
   instrumentCode: 'Instrument Number',
-  nextTestDate: 'Next Test/Calibration/Verification Date'
+  nextTestDate: 'Next Test/Calibration/Verification Date',
+  
+  // 试验物质配制计划列
+  administrationDoseOrGroup: 'Administration Dose or Group',
+  preparationConcentration: 'Preparation Concentration',
+  preparationVolume: 'Preparation Volume'
 }

src/lang/zh/template/commonTemplate.js

@@ -52,5 +52,10 @@ export default {
   instrumentName: '仪器名称',
   instrumentModel: '仪器型号',
   instrumentCode: '仪器编号',
-  nextTestDate: '下次测试/校准/检定日期'
+  nextTestDate: '下次测试/校准/检定日期',
+  
+  // 试验物质配制计划列
+  administrationDoseOrGroup: '给药剂量或组别',
+  preparationConcentration: '配制浓度',
+  preparationVolume: '配制体积'
 }

src/views/business/comps/template/TemplateTable.vue

@@ -13,11 +13,12 @@ import SP001 from './comps/sp/SP001';
 import SWYPFXRYPZB from "./comps/sp/SWYPFXRYPZB.vue";
 import SWYPFXCBYPZB from "./comps/sp/SWYPFXCBYPZB.vue";
 import SWYPBQGZYZBB from "./comps/sp/SWYPBQGZYZBB.vue";
+import SYWZPZJHB from "./comps/dl/SYWZPZJHB.vue";
 import Demo from "./comps/sp/Demo.vue";
 export default {
   name: "TemplateTable",
   components: { 
-    SP001,SWYPFXRYPZB ,Demo,SWYPFXCBYPZB,SWYPBQGZYZBB,
+    SP001,SWYPFXRYPZB ,Demo,SWYPFXCBYPZB,SWYPBQGZYZBB,SYWZPZJHB,
   },
   props: {
     sn: {
@@ -41,6 +42,7 @@ export default {
           'SP001': 'SWYPFXRYPZB',
           'SP002': 'SWYPFXCBYPZB',
           'SP003': 'SWYPBQGZYZBB',
+          'DL001': 'SYWZPZJHB',
           // 'SP001': 'Demo',
         }
       }

src/views/business/comps/template/comps/dl/SYWZPZJHB.vue

@@ -0,0 +1,240 @@
+<!-- 试验物质配制计划表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">试验物质配制计划表<img
+					src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPcakge label="试验基本信息" ref="baseInfoRef" :formConfig="baseInfoFormConfig"
+						:formData="formData" />
+					<LineLabel label="计划信息" />
+					<div class="template-form-item">
+						<BaseInfoFormPcakge  ref="stepFormPackageRef" :formConfig="stepFormConfig" @blur="onHandleBlur"
+							:formData="formData" />
+						<CustomTable @blur="onHandleTableBlur" :showHeaderSelect="fillType === 'actFill'" :showOperation="fillType === 'actFill'" ref="stepTableRef" :columns="stepColumns"
+							:formData="formData" >
+							<template slot="operation" slot-scope="{ row, rowIndex}">
+								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" @deleteRow="deleteRow"></TableOpertaion>
+							</template>
+						</CustomTable>
+						<div class="add-row">
+							<el-button type="primary" plain @click="addRow">添加行</el-button>
+						</div>
+					</div>
+					<BaseInfoFormPcakge label="特别说明" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+
+				</div>
+			</div>
+			<button @click="onSave">保存</button>
+		</div>
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPcakge from "@/components/Template/BaseInfoFormPcakge";
+import LineLabel from "@/components/Template/LineLabel";
+import templateMixin from "../../mixins/templateMixin";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
+
+export default {
+	name: "SYWZPZJHB",
+	components: { BaseInfoFormPcakge, LineLabel, CustomTable, TableOpertaion },		
+	mixins: [templateMixin],
+	props: {
+		value: {
+			type: {},
+			default: () => { },
+		},
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	watch: {
+		value: {
+			immediate: true,
+			handler(v) {
+
+			}
+		},
+		fillType: {
+			immediate: true,
+			handler(v) {
+				console.log(v,"fillType")
+			}
+		},
+	},
+	computed: {
+		
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: "请输入特别说明",
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: "试验名称",
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: "试验编号",
+							type: "input",
+							disabled: true,
+						},
+
+					}
+				},
+			]
+		},
+		// 操作步骤表单配置
+		stepFormConfig() {
+			return [
+				{
+					type: "step",
+					config: {
+						drawTime: {
+							label: "领取时间",
+							type: "dateTime",
+							fillType: "actFill",
+						},
+						analyzeTime: {
+							label: "分析时间",
+							type: "dateTime",
+							fillType: "actFill",
+						},
+						testSubstance: {
+							label: "试验物质",
+							type: "input",
+							fillType: "actFill",
+						},
+						configFrequency: {
+							label: "配置频率",
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				}
+			]
+		},
+		// 步骤表格列配置
+		stepColumns() {
+			return [
+				{
+					label: "给药剂量或组别", 
+					prop: "startSolutionCode",
+					width: 280,
+					bodyType: "input",
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+				},
+				{
+					label: "配制浓度", 
+					prop: "preparationConcentration",
+					width: 280,
+					headerSelectKey: "preparationConcentrationUnit",
+					fillType: "actFill",
+					headerOptions: this.$store.state.template.volumeOptions,
+					defaultValue: "mg",
+					bodyType: "inputNumber",
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+				},
+				{
+					label: "配制体积", 
+					prop: "preparationVolume",
+					width: 280,
+					headerSelectKey: "preparationVolumeUnit",
+					fillType: "actFill",
+					headerOptions: this.$store.state.template.volumeOptions,
+					bodyType: "inputNumber",
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			selectReagentVisible: false,
+			subSolutionVisible: false,
+			currentSubKey: "",//当前点击的子项key
+			dataSource: [],
+			stepTableDataSource: [],
+
+		};
+	},
+	mounted() {
+		this.formData = {
+				headerSelectFields: {
+					preparationVolumeUnit: "ml",
+					preparationConcentrationUnit: "ul",
+				
+				}
+			}
+	},
+	methods: {
+		
+		async getFormData() {
+			const baseData = await this.$refs.baseInfoRef.getFormData();
+			const stepFormData = await this.$refs.stepFormPackageRef.getFormData();
+			const stepTableFormData = await this.$refs.stepTableRef.getFormData();
+			const remarkData = await this.$refs.remarkRef.getFormData();
+			if(!stepTableFormData.stepTableFormData.length){
+				this.$message.error("请添加计划信息");
+				return;
+			}
+			return {
+				...baseData,
+				...stepFormData,
+				...remarkData,
+				...stepTableFormData
+			}
+		},
+		async onSave() {
+			const formData = await this.getFormData();
+			// const formData = await this.$refs.stepTableRef.getFormData();
+			console.log(formData, "formData")
+		},
+		// 添加行
+		addRow() {
+			this.$refs.stepTableRef.addRow({
+				startSolutionCode: "",
+				preparationConcentration: "",
+				preparationVolume: "",
+			})
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+.add-row{
+	display: flex;
+	justify-content: center;
+	margin-top: 20px;
+}
+</style>

src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue

@@ -23,7 +23,7 @@
 							</template>
 						</CustomTable>
 					</div>
-					<Step ref="stepRef" :formData="formData"></Step>
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
 					<BaseInfoFormPcakge label="备注" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 
 				</div>
@@ -120,12 +120,12 @@ export default {
 				{
 					type: "cardItem",
 					config: {
-						bdmc: {
+						studyMc: {
 							label: "试验名称",
 							type: "input",
 							disabled: true,
 						},
-						bdbh: {
+						studySn: {
 							label: "试验编号",
 							type: "input",
 							disabled: true,
@@ -477,9 +477,9 @@ export default {
 			const baseData = await this.$refs.baseInfoRef.getFormData();
 			const conditionData = await this.$refs.storageConditionRef.getFormData();
 			const stepFormData = await this.$refs.stepFormPackageRef.getFormData();
-			const stepDataFormData = await this.$refs.stepTableRef.getFormData();
+			const stepTableFormData = await this.$refs.stepTableRef.getFormData();
 			const stepData = await this.$refs.stepRef.getFormData();
-			if (!stepData.stepData.length) {
+			if (!stepData.length) {
 				this.$message.error("请添加步骤");
 				return;
 			}
@@ -487,10 +487,10 @@ export default {
 			return {
 				...baseData,
 				...conditionData,
-				...stepData,
-				stepData: stepFormData,
+				stepData,
+				...stepFormData,
 				...remarkData,
-				...stepDataFormData
+				...stepTableFormData
 			}
 		},
 		async onSave() {

src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue

@@ -17,7 +17,7 @@
 						<BaseInfoFormPcakge ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" />
 					</div>
-					<Step ref="stepRef" :formData="formData"></Step>
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
 					<BaseInfoFormPcakge label="备注" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 
 				</div>
@@ -99,12 +99,12 @@ export default {
 				{
 					type: "cardItem",
 					config: {
-						bdmc: {
+						studyMc: {
 							label: "试验名称",
 							type: "input",
 							disabled: true,
 						},
-						bdbh: {
+						studySn: {
 							label: "试验编号",
 							type: "input",
 							disabled: true,
@@ -261,7 +261,7 @@ export default {
 			const conditionData = await this.$refs.storageConditionRef.getFormData();
 			const stepFormData = await this.$refs.stepFormPackageRef.getFormData();
 			const stepData = await this.$refs.stepRef.getFormData();
-			if (!stepData.stepData.length) {
+			if (!stepData.length) {
 				this.$message.error("请添加步骤");
 				return;
 			}
@@ -269,8 +269,8 @@ export default {
 			return {
 				...baseData,
 				...conditionData,
-				...stepData,
-				stepData: stepFormData,
+				stepData,
+				...stepFormData,
 				...remarkData
 			}
 		},

src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue

@@ -18,7 +18,7 @@
 							@blur = "onHandleBlur"
 							:formData="formData" />
 					</div>
-					<Step ref="stepRef" :formData="formData"></Step>
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
 					<BaseInfoFormPcakge :label="$t('template.common.remark')" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 
 				</div>
@@ -35,7 +35,6 @@ import TableList from "@/components/Template/Table";
 import Step from "@/components/Template/Step";
 import templateMixin from "../../mixins/templateMixin";
 import CustomTable from '@/components/Template/CustomTable.vue';
-import moment from 'moment';
 
 export default {
 	name: "SWYPFXRYPZB",
@@ -100,12 +99,12 @@ export default {
 				{
 					type: "cardItem",
 					config: {
-						bdmc: {
+						studyMc: {
 							label: this.$t('template.common.testName'),
 							type: "input",
 							disabled: true,
 						},
-						bdbh: {
+						studySn: {
 							label: this.$t('template.common.testNumber'),
 							type: "input",
 							disabled: true,
@@ -275,7 +274,7 @@ export default {
 			const conditionData = await this.$refs.storageConditionRef.getFormData();
 			const stepFormData = await this.$refs.stepFormPackageRef.getFormData();
 			const stepData = await this.$refs.stepRef.getFormData();
-			if (!stepData.stepData.length) {
+			if (!stepData.length) {
 				this.$message.error(this.$t('template.common.addStepError'));
 				return;
 			}
@@ -283,8 +282,8 @@ export default {
 			return {
 				...baseData,
 				...conditionData,
-				...stepData,
-				stepData: stepFormData,
+				stepData,
+				...stepFormData,
 				...remarkData
 			}
 		},

src/views/business/comps/template/mixins/templateMixin.js

@@ -39,8 +39,8 @@ export default {
             ]
           )
         }, 1000);
-        this.setTemplateStatus("preFill");
-        // this.setTemplateStatus(this.fillType)
+        // this.setTemplateStatus("actFill");
+        this.setTemplateStatus(this.fillType)
    
   },
   unmounted() {
@@ -54,6 +54,9 @@ export default {
     setConditionOptions(options) {
       this.$store.commit('template/SET_CONDITION_OPTIONS', options)
     },
+    setTemplateData(data) {
+      this.$store.commit('template/SET_TEMPLATE_DATA', data)
+    },
     //统一处理删除行
     deleteRow(index) {
       this.$refs.stepTableRef.deleteRow(index);