解决代码冲突

src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

@@ -214,125 +214,6 @@
       </div>
     </el-dialog>
 
-<<<<<<< HEAD
-<!--    <el-dialog title="自定义搜索" :visible.sync="searchDialogVisible" width="1000px" top="5vh">
-      <el-form ref="form" inline label-width="120px">
-        <el-row :gutter="0">
-          <el-col :span="10">
-            <el-form-item label="自定义搜索名称">
-              <el-input v-model="searchTemplateName" placeholder="请输入自定义名称" style="width:80%">
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="2">
-            <el-button @click="addSearchTab(searchTemplateName)">添加</el-button>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-row :gutter="0">
-        <el-col :span="5">
-          <div class="searchDialogLeftStyle">
-            <el-tag v-for="tag in searchTemplates" :id="tag.Name" :key="tag.Name" closable
-              class="reporttag reportselect" :onclick="'clickmodeltypetag(' + tag.Name + ')'"
-              style="display:block;text-align:center;color:white;" @close="removeSearchTab(tag.Name)">
-              <i class="el-icon-caret-right" v-if="tag.Name == currentSearchTemplateName"></i>
-              {{tag.Name}}
-            </el-tag>
-          </div>
-        </el-col>
-        <el-col :span="19">
-          <div class="searchDialogRightStyle">
-            <el-form ref="form" inline label-width="0px">
-              <el-row style="margin-top:10px;">
-                <el-col :span="24" style="margin-left:10px;">{{">> "+currentSearchTemplateName}}</el-col>
-              </el-row>
-              <el-row style="margin-top:10px;margin-bottom:10px;">
-                <el-col class="line" :span="24" style="background-color:lightgrey; line-height: 2px;">&nbsp;</el-col>
-              </el-row>
-              <el-row :gutter="1">
-                <el-col :span="5">
-                  <el-select v-model="searchField" @change="changeSearchField()" placeholder="请选择"
-                    style="margin-left:5px;margin-right:5px;">
-                    <el-option v-for="item in searchcolumn" :key="item.field" :label="item.name" :value="item.filed">
-                    </el-option>
-                  </el-select>
-                </el-col>
-                <el-col :span="8">
-                  <el-input v-if="searchField == 'BarCode'" v-model="searchValue.BarCode" placeholder="请输入样本条码"
-                    style="margin-left:5px;display:inline-block;"></el-input>
-                  <el-input v-else-if="searchField == 'SampleCode'" v-model="searchValue.SampleCode"
-                    placeholder="请输入样本编码"></el-input>
-                  <el-input v-else-if="searchField == 'SourceName'" v-model="searchValue.SourceName"
-                    placeholder="请输入样本源名称"></el-input>
-                  <el-input v-else-if="searchField == 'InnerCode'" v-model="searchValue.InnerCode"
-                    placeholder="请输入样本内码"></el-input>
-                  <el-input v-else-if="searchField == 'Name'" v-model="searchValue.Name" placeholder="请输入名称"></el-input>
-                  <el-input v-else-if="searchField == 'CreateBy'" v-model="searchValue.CreateBy" placeholder="请输入录入人">
-                  </el-input>
-                  <el-input v-else-if="searchField == 'GroupName'" v-model="searchValue.GroupName"
-                    placeholder="请输入所属分组"></el-input>
-                  <el-date-picker v-else-if="searchField == 'ReceiveDate'" v-model="searchValue.CreateOn"
-                    type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                    style="width:100%"></el-date-picker>
-                  <el-select v-else-if="searchField == 'SampleTypeName'" v-model="searchValue.SampleType" clearable
-                    placeholder="请选择" @change="selsampletypeChange" style="width:100%">
-                    <el-option v-for="item in sampletypes" :key="item.Id" :label="item.Name" :value="item.Name">
-                    </el-option>
-                  </el-select>
-                  <el-date-picker v-else-if="searchField == 'ValidityDate'" v-model="searchValue.Validity"
-                    type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                    style="width:100%">
-                  </el-date-picker>
-                  <el-input v-else-if="searchField == 'Capacity'" v-model="searchValue.Capacity" placeholder="请输入容量">
-                  </el-input>
-                  <el-input v-else-if="searchField == 'Location'" v-model="searchValue.Location" placeholder=" 请输入存储位置">
-                  </el-input>
-                  <el-input v-else v-model="searchValue.Extension" placeholder=""
-                    style="margin-left:5px;display:inline-block;"></el-input>
-                </el-col>
-                <el-col :span="3">
-                  <el-select v-model="orAnd" placeholder="请选择" style="margin-left:15px;">
-                    <el-option v-for="item in orAndData" :key="item.value" :label="item.name" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-col>
-                <el-col :span="3">
-                  <el-button type="primary" size="middle" style="margin-left:5px;display:inline-block;"
-                    @click="addSearchField">添加</el-button>
-                </el-col>
-                <el-col :span="5">
-                  <el-button type="primary" size="middle" style="display:inline-block;"
-                    @click="saveAndSearchWithTemplate">查询</el-button>
-                  <el-button type="primary" size="middle" style="display:inline-block;" @click="saveSearchTemplate">保存
-                  </el-button>
-                </el-col>
-              </el-row>
-              <el-row style="margin-top:10px;">
-                <el-col class="line" :span="24" style="background-color:lightgrey; line-height: 2px;">&nbsp;</el-col>
-              </el-row>
-              <el-row>
-                <el-table :data="searchTableData" border style="width: 100%">
-                  <el-table-column prop="Name" label="检索名称" show-overflow-tooltip>
-                  </el-table-column>
-                  <el-table-column prop="Value" label="数值范围" width="300px" show-overflow-tooltip>
-                  </el-table-column>
-                  <el-table-column prop="Guanxi" label="查询关系" show-overflow-tooltip>
-                  </el-table-column>
-                  <el-table-column prop="Operate" label="操作" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                      <el-button @click="deleteSearchField(scope.row)" type="text" size="small">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </el-row>
-            </el-form>
-          </div>
-        </el-col>
-      </el-row>
-    </el-dialog>-->
-=======
->>>>>>> d569b8d166cfda79e6f095425552cbd0d6d0ab6b
-
     <!-- 自定义查询 -->
     <samplesearchdialog @close="closeDialog"
                         ref="samplesearchdialog"></samplesearchdialog>
@@ -917,7 +798,8 @@
             size: 200,
             template: command,
             isDelete: 0,
-            type: 'Sample'
+            type: 'Sample',
+            status: 'archived'
           }
           console.log(params)
           service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'SampleSearchByTemplate', params).then(res => {