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

src/main.js

@@ -18,9 +18,9 @@ Vue.config.productionTip = false
 import AMap from 'vue-amap';
 Vue.use(AMap);
 import imgPreview from '@/components/imgPreview'
- 
 Vue.use(imgPreview)
-
+import echarts from "echarts";
+Vue.prototype.$echarts = echarts;
 import $ from 'jquery'
 // import Warehouse from './common.js'
 import Warehouse from './common.js'

src/views/contractManagement/purchaseContractAdd.vue

@@ -475,8 +475,6 @@
             goodsName: '',
           },
           contractProcessInfo: {},
-          sourceGoods: '',
-          placeDelivery: '',
           settlementWeightMethod: '1',
         },
         acceptanceCheck: {},

src/views/tradeServicesManagement/inOutRecord.vue

@@ -101,7 +101,7 @@
       <div>
         <el-input
           v-model="adjustment"
-          placeholder="输入申请金额"
+          placeholder=""
           size="small"
         ></el-input>
       </div>

src/views/warehouse/warehouseManagementRecord.vue

@@ -5,7 +5,7 @@
 				<h2 class="bg-left title">流转记录</h2>
 			</el-col>
 			<el-col :span="6" class="bg-right">
-				<el-button class="bg-bottom adjustment" type="primary" size="small" @click="iossrecord()"
+				<el-button class="bg-bottom" type="primary" size="small" @click="iossrecord()"
 					v-show="this.warehouseType != 2">盘损记录</el-button>
 				<el-button class="bg-bottom" type="primary" size="small" @click="returnWarehouse()">返回</el-button>
 			</el-col>