Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/tranManagement/tranManagementthirdpartnarReceiving.vue

@@ -87,6 +87,9 @@
                 maxlength="20"
                 size="small"
               /></ws-form-item>
+              <el-form-item label="装车日期" prop="createDate" >
+              <ws-input disabled v-model="item.createDate" placeholder="请输入装车日期" maxlength="20" size="small" />
+            </el-form-item>
                <ws-form-item label="卸车净重（吨）" span="1" prop="unloadNetWeight">
               <ws-input
                 :disabled="item.disabled"

src/views/warehousenew/warehousingOrder.vue

@@ -36,7 +36,7 @@
         </div>
       </template>
       <template slot="right">
-        <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按货源查找" clearable
+        <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按货源或合同编号查找" clearable
           maxlength="300" type="input"></ws-input>
         <ws-button class="find" type="primary" @click="lookUp()">
           <img width="16" height="16" style="