合并冲突

licp

2024-04-25 a24f5347bfd2331f8a4819b215f79555776534cd

 src/components/view/a5-laboratory-qualifications.vue

@@ -61,7 +61,7 @@
               </el-radio-group>
            </el-col>
            <el-col :span="12" style="text-align: right;" v-if="radio==0">
               <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">新增</el-button>
               <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">资质更新</el-button>
               <el-button size="medium" icon="el-icon-delete" @click="handleDel" v-if="delPower">删除</el-button>
            </el-col>
         </el-row>
@@ -149,7 +149,7 @@
      </div>
    <el-dialog title="资质更新" :visible.sync="qualificationsConnectVisible" width="400px">
         <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">资质名称：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>资质名称：</div>
        <div class="search_input">
          <el-select v-model="formData.name" placeholder="请选择" style="width: 100%;" size="small" clearable>
            <el-option
@@ -162,7 +162,7 @@
        </div>
      </div>
      <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">资质编码：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>资质编码：</div>
        <div class="search_input">
          <el-input
          size="small"
@@ -172,7 +172,7 @@
        </div>
      </div>
      <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">颁发机构：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>颁发机构：</div>
        <div class="search_input">
          <el-input
          size="small"
@@ -191,7 +191,7 @@
               v-model="formData.explanation"></el-input>
        </div>
      </div>
      <div class="search_thing" style="margin-bottom: 16px;">
      <!-- <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">首次颁发时间：</div>
        <div class="search_input">
          <el-date-picker style="width:100%" v-model="formData.firstTime"
@@ -216,9 +216,9 @@
          placeholder="选择日期">
               </el-date-picker>
        </div>
      </div>
      </div> -->
      <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">到期颁发时间：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>到期时间：</div>
        <div class="search_input">
          <el-date-picker style="width:100%" v-model="formData.expireTime"
          type="datetime"