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

# Conflicts:
#	src/views/contractManagement/salesContractCost.vue

src/views/contractManagement/salesContractCost.vue

@@ -320,7 +320,7 @@
             this.contractNo=this.$route.query.contractNo
             this.searchTypeText=this.$route.query.contractNo+'('+this.$route.query.status+')'
             this.buyer=this.$route.query.buyer
-      getcontract({flag:0}).toPromise()
+      getcontract({flag:1}).toPromise()
           .then((response) => {
             this.contractList=response
             // this.contractId=response[0].id