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

src/views/houseSelfCollect/inspectInfoLook.vue

@@ -116,10 +116,10 @@
               <ws-input type="number" style="padding-right:30px" @mousewheel.native.prevent
                 v-model="inspect.buckleMiscellaneous" @input="waterContentChange" placeholder="请输入扣杂" maxlength="100"
                 size="small" :disabled="disabled" />
-              <ws-input v-if='types==4' type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous"
+              <!-- <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous"
                 placeholder="请输入扣杂" maxlength="100" size="small" />
               <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous"
-                placeholder="未复检" maxlength="100" size="small" disabled />
+                placeholder="未复检" maxlength="100" size="small" disabled /> -->
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
               <ws-select v-model="inspect.type" disabled @change="typeChange">

src/views/outboundManagement/weighingManagementNew.vue

@@ -9,10 +9,10 @@
 			</template>
 			<!-- <template slot="left"> </template> -->
 			<template slot="right">
-				<ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType">
-				<ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
+				<el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType">
+				<el-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
 					style="color: #8890b1" />
-				</ws-select>
+				</el-select>
 				<!-- <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找"
 				clearable maxlength="500" type="input">
 				</ws-input>

src/views/warehousenew/warehouseManagementList.vue

@@ -66,6 +66,7 @@
     <div class="position">
       <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">当期储量</span></div>
       <ws-button type="primary" @click="handleAdd()" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.add`" style="margin-left:20px">添加</ws-button>
+      <!-- <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="handleEdit()">查看</ws-button> -->
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.edit` " @click="handleEdit()">编辑</ws-button>
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.delete`" @click="handleDelete()">删除</ws-button>
       <ws-button v-hasPermission=" `warehouseManagement.warehouse.warehouseInfo.view`" @click="record()">记录</ws-button>