Merge branch 'master' of http://git.echepei.com/caojunjie/digital_transformation_ui

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -123,7 +123,7 @@ export default {
                         }],
                         overHidden: true,
                     },
-                    {
+/*                    {
                         label: "是否开票",
                         prop: "isInvoice",
                         width: 80,
@@ -136,7 +136,7 @@ export default {
                             value: 3
                         }],
                         overHidden: true,
-                    },
+                    },*/
                     /*
                                         {
                                             label: "发票号",

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -388,6 +388,7 @@
                         </el-form>
                     </el-card>
 
+<!--
                     <el-card style="margin-top: 10px">
                         <el-row>
                             <el-col :span="4">
@@ -414,23 +415,9 @@
                                     <span class="weightnum">{{ form.amountCrUsd || 0 }}元</span>
                                 </div>
                             </el-col>
-<!--                            <el-col :span="8">
-                                <div style="text-align: right">
-                                    &lt;!&ndash;<el-button  size="small" type="primary" style="margin-right: 8px"&ndash;&gt;
-                                    &lt;!&ndash;            :loading="saveLoading" >计算合计值&ndash;&gt;
-                                    &lt;!&ndash;</el-button>&ndash;&gt;
-                                    <el-button size="small" type="primary" style="margin-right: 8px"
-                                        :disabled="!form.id || editSave" :loading="saveLoading"
-                                        @click="ConfirmReceiptfun">批量签收
-                                    </el-button>
-                                    <el-button size="small" type="danger" style="margin-right: 8px"
-                                        :disabled="!form.id || editSave" :loading="saveLoading"
-                                        @click="RevokeReceiptfun">撤销签收
-                                    </el-button>
-                                </div>
-                            </el-col>-->
                         </el-row>
                     </el-card>
+-->
 
                     <el-card style="margin-top: 10px">
                         <finstlbillsitems :tableData="tableData" :form="form" :handleSelectionData="handleSelectionData"
@@ -446,19 +433,25 @@
                                     <el-button size="small" type="primary" style="margin-left: 10px"
                                         :disabled="editSave" :loading="saveLoading" @click="editHandle">一键编辑
                                     </el-button>
-                                    <el-button size="small" type="primary" style="margin-right: 8px"
+<!--                                    <el-button size="small" type="primary" style="margin-right: 8px"
                                         :disabled="editSave" :loading="saveLoading" @click="Confirminvoicefun">禁止开票
                                     </el-button>
                                     <el-button size="small" type="warning" style="margin-right: 8px"
                                         :disabled="editSave" :loading="saveLoading" @click="Notinvoicingfun">取消禁止开票
-                                    </el-button>
+                                    </el-button>-->
                                     <span style="font-size: 18px;font-weight: 600;margin-left: 10px;">
+                                        <span>总行数:</span>
                                         <span style="color: #67C23A;margin-right: 10px;">
                                             本币:{{ amountSubSum }}元
                                         </span>
                                         <span style="color: #E6A23C;">
                                             外币:{{ amountSubUsdSum }}元
                                         </span>
+
+                                        <span class="weightnum">应收本币:{{ form.amountDr || 0 }}元</span>
+                                        <span class="weightnum">应付本币:{{ form.amountCr || 0 }}元</span>
+                                        <span class="weightnum">应收外币:{{ form.amountDrUsd || 0 }}元</span>
+                                        <span class="weightnum">>应付外币:{{ form.amountCrUsd || 0 }}元</span>
                                     </span>
                                 </div>
                             </template>