Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/mch/mch-manage/mch-rule-config-form.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog :title="form.id ? '编辑' : '新增'" width="30%" v-model="visible" :close-on-click-modal="false" draggable>
+	<el-dialog :title="form.id ? '编辑' : '新增'" width="50%" v-model="visible" :close-on-click-modal="false" draggable>
 		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
@@ -7,9 +7,14 @@
 						<select-mch-rule v-model="form.rulePriceConfigId" />
 					</el-form-item>
 				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="源商户" prop="sourceMchId">
+						<select-mch v-model="form.sourceMchId" :apiParams="{ types: '1' }" />
+					</el-form-item>
+				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="目标商户" prop="tragetDeptId">
-						<select-mch v-model="form.tragetDeptId" />
+						<select-mch v-model="form.tragetDeptId" :apiParams="{ types: '1' }" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -46,6 +51,7 @@ const form = reactive({
 
 // 定义校验规则
 const dataRules = ref({
+	sourceMchId: [{ required: true, message: "请选择源商户", trigger: "blur" }],
 	tragetDeptId: [{ required: true, message: "请选择目标商户", trigger: "blur" }],
 	rulePriceConfigId: [{ required: true, message: "请选择规则", trigger: "blur" }],
 })