Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/writeoffbill/modules/order/index.vue

@@ -32,7 +32,7 @@
             {{'¥ '+ tool.formatAmount(scope.column.data.amount,2)}}
           </span>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
-          <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'">--</p>
+          <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation' && scope.column.columnname != 'amounts'" >--</p>
         </template>
         <template v-slot:opreation="scope">
           <el-button class="inline-16" type="text" size="mini" @click="save(scope.data)" v-if="currentItem.sa_writeoffbill_orderid == scope.data.sa_writeoffbill_orderid">保 存</el-button>