Merge branch 'master' into ouqian

src/components/Template/HandleFormItem.vue

@@ -591,8 +591,8 @@ export default {
             this.inputValue = data.selectedId;
             const { filledCodes = [] } = this.item;
             console.log(filledCodes, "filledCodes")
-            const { selectInfo, row } = data;
-            if (filledCodes.length > 0) {
+            const { selectInfo, row,checkType } = data;
+            if (filledCodes.length > 0 && checkType !=="checkbox") {
                 this.inputValue = row[filledCodes[0]] + "(" + row[filledCodes[1]] + ")";
             }
             this.selectRegentInfo = data;
@@ -631,9 +631,11 @@ export default {
                 };
                 if (type === "mix") {
                     params.mixType = true;
-                } else if (item.qxbdType) {
+                } 
+                if (item.qxbdType) {
                     params.qxbdType = item.qxbdType;
-                } else if (item.checkType) {
+                } 
+                if (item.checkType) {
                     params.checkType = item.checkType;
                 }
             }

src/components/Template/mixins/formPackageMixins.js

@@ -67,6 +67,7 @@ export default {
         },
         getRegentItem(item, fieldCode = "type") {
             const type = item[fieldCode];
+            console.log(item, "type")
             return {
                 label: "",
                 type,

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

@@ -12,14 +12,14 @@
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <BaseInfoFormPackage fieldItemLabel="template.dl.dl016.xbxx" label="template.dl.dl016.xbxx"
-						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData" @onRegentSubmit="onRegentSubmit"
 						/>
 
           <LineLabel label="template.dl.dl016.qcxjjyqk" />
 					<CustomTable
 							@headerSelectChange="onHeaderSelectChange"
 							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-							@beforeSaveRecord = "beforeSaveRecord" @onRegentSubmit="(e) => onRegentSubmit"
+							@beforeSaveRecord = "beforeSaveRecord"
 							:showAddRow="false" :showOperation="false"
 							ref="qcxjjyqkTableRef" :columns="stepColumns" :formData="formData">
 						</CustomTable>

src/views/business/comps/template/comps/pcr/PCR008.vue

@@ -15,7 +15,7 @@
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
-							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
+							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" @onRegentSubmit="onRegentSubmit" />
 						<div v-if="fillType == 'preFill'">
 							<el-button type="danger" @click="onClickDelete">{{
 								$t('form.delete') }}</el-button>
@@ -177,7 +177,7 @@ export default {
 							type: 'qxbd',
 							fillType: 'preFill',
 							qxbdType: 'PCR007',
-							checkType: 'checkBox',
+							checkType: 'checkbox',
 							filledCodes: ['bdmc', 'bdbh'],
 						},
 						yjry: {
@@ -230,6 +230,9 @@ export default {
 		this.onHandleTableBlur()
 	},
 	methods: {
+		onRegentSubmit(data){
+			console.log(data,"回调")
+		},
 		onClickDelete() {
 			this.$modal.confirm(this.$t('form.confirmDelete')).then(() => {
 

src/views/business/comps/template/dialog/SelectMixReagentDialog.vue

@@ -188,16 +188,29 @@ export default {
                 ndz: (row.nd||"")+(row.nddw||""),
                 type: Number(this.selectType),
             }
-            if(this.qxbdType && row.templateSn !== this.qxbdType){
-                this.$message.error(`请选择正确前序表单`);
-                return
+            const {qxbdType,checkType} = this;
+            if(qxbdType){
+                if(checkType === "radio"&& row.templateSn !== qxbdType){
+                    this.$message.error(`请选择正确前序表单`);
+                    return
+                }
+                if(checkType === "checkbox" ){
+                    const isAllType = row.every((item)=>item.templateSn === qxbdType)
+                    if(!isAllType){
+                        this.$message.error(`请选择正确前序表单`);
+                        return
+                    }
+                }
+                
             }
             this.$emit('submit', selectedValue, row);
-            let callbackData = { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType };
+            let callbackData = { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType,checkType };
             if(this.checkType === "checkbox"){
                 callbackData = {
                     uuid: this.uuid,
                     selectedRows: row,
+                    selectedId:row.map((item)=>item.bdbh).join(","),
+                    checkType
                 }
             }
             // 触发eventBus事件