Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem

src/assets/css/list/inquire.less

@@ -87,6 +87,17 @@
           border-left: 1px solid #1969F9;
         }
       }
+
+      &.delbtn {
+        border: 1px solid #FC1F00;
+        background: #FFE7E3;
+        color: #FC1F00;
+
+        &:hover {
+          background: #FF715D;
+          color: #fff;
+        }
+      }
     }
   }
 

src/assets/css/list/inquire.min.css

@@ -75,6 +75,15 @@
 .store-con .btn-nav .dcg.xjk:hover {
   border-left: 1px solid #1969F9;
 }
+.store-con .btn-nav .dcg.delbtn {
+  border: 1px solid #FC1F00;
+  background: #FFE7E3;
+  color: #FC1F00;
+}
+.store-con .btn-nav .dcg.delbtn:hover {
+  background: #FF715D;
+  color: #fff;
+}
 .store-con .updatebox {
   position: relative;
 }

src/assets/css/list/inquire.min.css.map

-{"version":3,"sources":["inquire.less"],"names":[],"mappings":"AAAA;EACE,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAJF,UAME;EACE,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,UAXF,YAWG;EACC,mBAAA;;AAlBN,UAsBE;EACE,gBAAA;EACA,mBAAA;;AAxBJ,UAsBE,SAIE;EAEE,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AArCN,UAsBE,SAIE,QAaE;EACE,gBAAA;;AAGF,UArBJ,SAIE,QAiBG;EAEC,mBAAA;EACA,WAAA;;AA9CR,UAsBE,SA6BE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,iBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,UA1CJ,SA6BE,KAaG;EACC,mBAAA;EACA,eAAA;EACA,WAAA;;AAGF,UAhDJ,SA6BE,KAmBG;EACC,WAAA;EACA,gBAAA;;AAEA,UApDN,SA6BE,KAmBG,KAIE;EACC,mBAAA;EACA,cAAA;;AAIJ,UA1DJ,SA6BE,KA6BG;EACC,kBAAA;EACA,WAAA;EACA,8BAAA;;AAEA,UA/DN,SA6BE,KA6BG,IAKE;EACC,8BAAA;;AAtFV,UA4FE;EACE,kBAAA;;AA7FJ,UA4FE,WAGE;EACE,YAAA;EACA,WAAA;EAEA,kBAAA;EACA,QAAA;EACA,UAAA;;AArGN,UA4FE,WAGE,UAQE;EACE,WAAA;EACA,8BAAA;;AAzGR,UA4FE,WAGE,UAQE,WAIE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAlHV,UA4FE,WAGE,UAQE,WAeE;AAtHR,UA4FE,WAGE,UAQE,WAeqB;EACjB,wBAAA","file":"inquire.min.css"}
\ No newline at end of file
+{"version":3,"sources":["inquire.less"],"names":[],"mappings":"AAAA;EACE,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAJF,UAME;EACE,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,UAXF,YAWG;EACC,mBAAA;;AAlBN,UAsBE;EACE,gBAAA;EACA,mBAAA;;AAxBJ,UAsBE,SAIE;EAEE,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AArCN,UAsBE,SAIE,QAaE;EACE,gBAAA;;AAGF,UArBJ,SAIE,QAiBG;EAEC,mBAAA;EACA,WAAA;;AA9CR,UAsBE,SA6BE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,iBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,UA1CJ,SA6BE,KAaG;EACC,mBAAA;EACA,eAAA;EACA,WAAA;;AAGF,UAhDJ,SA6BE,KAmBG;EACC,WAAA;EACA,gBAAA;;AAEA,UApDN,SA6BE,KAmBG,KAIE;EACC,mBAAA;EACA,cAAA;;AAIJ,UA1DJ,SA6BE,KA6BG;EACC,kBAAA;EACA,WAAA;EACA,8BAAA;;AAEA,UA/DN,SA6BE,KA6BG,IAKE;EACC,8BAAA;;AAIJ,UApEJ,SA6BE,KAuCG;EACC,yBAAA;EACA,mBAAA;EACA,cAAA;;AAEA,UAzEN,SA6BE,KAuCG,OAKE;EACC,mBAAA;EACA,WAAA;;AAjGV,UAuGE;EACE,kBAAA;;AAxGJ,UAuGE,WAGE;EACE,YAAA;EACA,WAAA;EAEA,kBAAA;EACA,QAAA;EACA,UAAA;;AAhHN,UAuGE,WAGE,UAQE;EACE,WAAA;EACA,8BAAA;;AApHR,UAuGE,WAGE,UAQE,WAIE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AA7HV,UAuGE,WAGE,UAQE,WAeE;AAjIR,UAuGE,WAGE,UAQE,WAeqB;EACjB,wBAAA","file":"inquire.min.css"}
\ No newline at end of file

src/views/List/inquire.vue

@@ -17,7 +17,7 @@
                         <el-option label="区域二" value="beijing"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="更新日期">
+                <el-form-item label="询价日期">
                     <el-date-picker v-model="formInline.date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
                 </el-form-item>
                 <el-form-item>
@@ -25,18 +25,9 @@
                 </el-form-item>
             </el-form>
             <div class="btn-nav clr">
-                <div class="fl">
-                    <el-dropdown @command="handleCommand">
-                        <div class="update">修改&nbsp;|<i class="el-icon-arrow-down"></i></div>
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="1">修改库存</el-dropdown-item>
-                            <el-dropdown-item command="2">修改交期</el-dropdown-item>
-                        </el-dropdown-menu>
-                    </el-dropdown>
-                </div>
+                <div class="fl dcg">报价</div>
                 <div class="fl dcg">导出</div>
-                <div class="fl dcg heti">上架</div>
-                <div class="fl dcg heti xjk" @click="handleClose">下架</div>
+                <div class="fl dcg delbtn">删除</div>
             </div>
             <div class="data-box">
                 <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">