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

src/views/houseSelfCollect/paymentManagement.vue

@@ -125,7 +125,7 @@
       </el-table-column>
       <el-table-column fixed class="table_td" prop="carNo" label="车牌号"></el-table-column>
       <el-table-column  class="table_td" prop="contractNo" label="合同号"></el-table-column>
-      <el-table-column class="table_td" v-if='warehouseName=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
+      <el-table-column class="table_td" v-show='warehouseName=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
         label="卸车过磅费（元）"></el-table-column>
       <el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
       <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
@@ -164,26 +164,26 @@
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="600">
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
-            <el-button v-if="
+            <el-button v-show="
                 (!scope.row.approveStatus ||scope.row.approveStatus == '待结算') &&
                 (scope.row.status == '待结算' || scope.row.status == '已驳回' )||scope.row.approveStatus&&scope.row.reverseFlag==1
               " @click="settlement(1, scope.row)">结算</el-button>
           </span>
           <el-button @click="settlement(2, scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.view`">查看
           </el-button>
-          <el-button v-if="scope.row.approveStatus&&scope.row.reverseFlag!=1" @click="settleaccounts(scope.row)"
+          <el-button v-show="scope.row.approveStatus&&scope.row.reverseFlag!=1" @click="settleaccounts(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.seet`">反结算
           </el-button>
-          <el-button v-if="
+          <el-button v-show="
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
             " @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">打印</el-button>
-          <el-button v-if="
+          <el-button v-show="
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
             " @click="print1(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">财务打印
           </el-button>
-          <el-button v-if="
+          <el-button v-show="
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
             " @click="print1(scope.row,2)" v-hasPermission="`acquisitionManagement.acquisitionPay.yeda`">业务打印
@@ -191,7 +191,7 @@
           <el-button @click="previewPayOrder(scope.row)" class="my-pre"
             v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">预览付款单
           </el-button>
-          <el-button type="danger" v-if="
+          <el-button type="danger" v-show="
               (!scope.row.approveStatus ||
                 scope.row.approveStatus == '待结算') &&
               scope.row.status == '待结算'
@@ -245,7 +245,7 @@
             <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
               <i class="el-icon-zoom-in"></i>
             </span>
-            <span v-if="!disabled" class="el-upload-list__item-delete" @click="_handleRemove(file)">
+            <span v-show="!disabled" class="el-upload-list__item-delete" @click="_handleRemove(file)">
               <i class="el-icon-delete"></i>
             </span>
           </span>
@@ -319,10 +319,10 @@
         <el-form-item label="开户支行" label-width="100px">
           {{ customerlist.bankDepositBranch }}
         </el-form-item>
-        <el-form-item label="收款人姓名" label-width="100px" v-if="customerlist.customerTypeFlag == '1'">
+        <el-form-item label="收款人姓名" label-width="100px" v-show="customerlist.customerTypeFlag == '1'">
           {{ customerlist.payeeName }}
         </el-form-item>
-        <el-form-item label="收款人身份证号" label-width="120px" v-if="customerlist.customerTypeFlag == '1'">
+        <el-form-item label="收款人身份证号" label-width="120px" v-show="customerlist.customerTypeFlag == '1'">
           {{ customerlist.payeeNumberCard }}
         </el-form-item>
         <el-form-item label="手机号" label-width="100px">
@@ -337,8 +337,8 @@
       </div>
     </el-dialog>
     <el-dialog width="50%" title="付款回执单" :visible.sync="isPreviewPayOrder" :close="paymentReceiptClose">
-      <div class="no-messege" v-if="!paymentReceipt">暂未上传付款回执单</div>
-      <el-image class="my-img" ref="myImg" v-if="paymentReceipt" :src="paymentReceipt"
+      <div class="no-messege" v-show="!paymentReceipt">暂未上传付款回执单</div>
+      <el-image class="my-img" ref="myImg" v-show="paymentReceipt" :src="paymentReceipt"
         :preview-src-list="[paymentReceipt]">
       </el-image>
     </el-dialog>