js

src/views/List/inquireDetail.vue

@@ -172,15 +172,9 @@
             </el-table-column>
             </el-table-column>
             <el-table-column fixed prop="goods_name" label="报价型号" width="200"></el-table-column>
             <el-table-column fixed prop="goods_name" label="报价型号" width="200"></el-table-column>
             <el-table-column fixed prop="brand_name" label="报价品牌" width="200"></el-table-column>
             <el-table-column fixed prop="brand_name" label="报价品牌" width="200"></el-table-column>
-<<<<<<< HEAD
             <el-table-column fixed prop="status" label="状态" width="100">
             <el-table-column fixed prop="status" label="状态" width="100">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span v-if="scope.row.status==1" class="f-green">比价中</span>
                 <span v-if="scope.row.status==1" class="f-green">比价中</span>
-=======
-            <el-table-column  label="状态" width="100">
-               <template slot-scope="scope" >
-                  <span v-if="scope.row.status==1" class="f-green">比价中</span>
->>>>>>> 1555165385e9ecdf25cc0c7a89d09c34be75a679
                 <span v-else-if="scope.row.status==2" class="f-yellow1">已选中</span>
                 <span v-else-if="scope.row.status==2" class="f-yellow1">已选中</span>
                 <span v-else-if="scope.row.status==3">已确认</span>
                 <span v-else-if="scope.row.status==3">已确认</span>
                 <span v-else-if="scope.row.status==4" class="f-green" >已成单</span>
                 <span v-else-if="scope.row.status==4" class="f-green" >已成单</span>