From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期五, 22 三月 2024 17:58:58 +0800 Subject: [PATCH] 合并冲突 --- src/components/do/b1-ins-order/add.vue | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue index 5de1787..b57f729 100644 --- a/src/components/do/b1-ins-order/add.vue +++ b/src/components/do/b1-ins-order/add.vue @@ -417,9 +417,9 @@ <el-button type="primary" @click="onSample()" :loading="getProductLoad">纭� 瀹�</el-button> </span> </el-dialog> - <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="30%"> - <div class="body" style="height: 10vh;display: flex;align-items: center;" v-if="templateDia"> - <div class="search_label"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div> + <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="400px"> + <div class="body" style="display: flex;align-items: center;" v-if="templateDia"> + <div class="search_label" style="width: 90px;"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div> <div class="search_input"> <el-input size="small" clearable v-model="templateName"></el-input> </div> -- Gitblit v1.9.3