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

src/views/houseSelfCollect/settlement.vue

@@ -242,6 +242,9 @@
             </ws-form-item>
             <ws-form-item label="人民币大写" span="1" prop="waterContent">
               <ws-input v-model="paymentList.capitalize" placeholder="请输入人民币大写" maxlength="100" disabled size="small" />
+            </ws-form-item>
+             <ws-form-item label="运费" span="1" prop="freight">
+              <ws-input v-model="paymentList.freight" placeholder="请输入运费" maxlength="20" :disabled="disabled" size="small" />
             </ws-form-item>
             <ws-form-item label="记事（选填）" span="1" prop="waterContent">
               <ws-input v-model="paymentList.remarks" placeholder="备注信息，不超过20个字" maxlength="20" :disabled="disabled"