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

src/views/contractManagement/acquisitionContract.vue

@@ -146,10 +146,10 @@
         </template>
       </el-table-column>
       <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column width='120' prop="contractExpenditure" label="合同支出"> </el-table-column>
+      <el-table-column width='120' prop="contractExpenditure" label="粮款支出"> </el-table-column>
       <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
       
-      <el-table-column width='130' prop="mildewGrain" label="已付款（元）">
+      <!-- <el-table-column width='130' prop="mildewGrain" label="已付款（元）"> -->
       </el-table-column>
       <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
       <el-table-column width='130' prop="goodsNames" label="已开发票 （元）">

src/views/contractManagement/purchaseContract.vue

@@ -137,10 +137,10 @@
         </template>
       </el-table-column>
       <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column width='120' prop="contractExpenditure" label="合同支出"> </el-table-column>
+      <el-table-column width='120' prop="contractExpenditure" label="粮款支出"> </el-table-column>
       <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
 
-      <el-table-column width='130' prop="mildewGrain" label="已付款（元）">
+      <!-- <el-table-column width='130' prop="mildewGrain" label="已付款（元）"> -->
       </el-table-column>
       <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
       <el-table-column prop="statementUrl" label="结算单">

src/views/contractManagement/salesContract.vue

@@ -142,7 +142,7 @@
         </template>
       </el-table-column>
       <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column width='120' prop="contractRevenue" label="合同收入"> </el-table-column>
+      <el-table-column width='120' prop="contractRevenue" label="粮款收入"> </el-table-column>
       <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
       <el-table-column width='120' prop="mildewGrain" label="未回款（元）">
         <template slot-scope="scope">