Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/App.vue

@@ -62,6 +62,9 @@ export default {
   height: 100%;
   overflow: hidden;
 }
+.el-table{
+overflow:visible !important;
+}
 .flex {
   display: flex;
 }
@@ -104,4 +107,14 @@ input[type='number'] {
       background: #f9FAFC!important;
       color: #8890B1!important;
     }
+    .el-table__body tr:hover>td {
+		background-color: #E8ECF6 !important;
+  }
+  .el-submenu__title:hover {
+  background-color: #5473E8!important;
+}
+.el-menu-item:hover {
+  outline: 0;
+  background-color: #5473E8!important;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -54,7 +54,7 @@
 					</el-form-item>
 					<!-- 合同编号 -->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
-						<el-select @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号"
+						<el-select filterable @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号"
 							class="typeselect">
 							<el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
 								:value="item.contractNo"></el-option>

src/views/warehouse/warehouseManagementGross.vue

@@ -449,7 +449,7 @@
                   size="small"
                 />
                 <el-select
-                  v-if="carstatus && options2.length > 0"
+                  v-if="options2.length > 0"
                   filterable
                   :filter-method="dataFilter2"
                   v-model="deptBudgetList.carNo"