Merge pull request 'master-dev' (#126) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/126

src/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue

@@ -25,11 +25,6 @@
                         <el-input v-model="form.writeoffAmount" clearable="" placeholder=""></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="4">
-                    <el-form-item :label="$t('收款人')" prop="recipient">
-                        <EmpNamePicker v-model="form.recipient" placeholder="请输入收款人"></EmpNamePicker>
-                    </el-form-item>
-                </el-col>
                 <el-col :span="4">
                     <el-form-item label="交易时间" prop="tradeDate">
                         <el-date-picker clearable v-model="form.tradeDate" type="date"
@@ -44,6 +39,27 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+            <template v-if="waitBatchDtlList.length > 0">
+            <el-row :gutter="20" style="display: flex;flex-wrap: wrap;">
+                <el-col :span="4">
+                  <el-form-item :label="$t('账单类型')" prop="settleType">
+                    <el-select v-model="form.settleType" placeholder="请选择账单类型" clearable="" disabled>
+                        <el-option label="现金账单" value="1"></el-option>
+                        <el-option label="月结账单" value="2"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                    <!--  1-现金 2-月结 -->
+                        <el-form-item :label="$t('缴款客户')" prop="recipient" v-if="form.settleType === '2'">
+                            <AllMonthpayAccountPicker v-model="form.recipient" @onChange="onMonthpayAccountSelect"></AllMonthpayAccountPicker>
+                        </el-form-item>
+                        <el-form-item :label="$t('缴款人')" prop="recipient" v-else>
+                            <EmpNamePicker :placeholder="$t('缴款人')" v-model="form.recipient"  ></EmpNamePicker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </template>
         </el-form>
         <div slot="toolbar">
             <el-row :gutter="10" class="mb8">
@@ -120,6 +136,8 @@
 import { uploadFile } from '@/api/common';
 import { queryByBillCodes, writeoffApply, getWriteoffApply, updateWriteoffApply } from "@/api/emis/emisSettleCancelAccount";
 import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 
 export default {
     name: "cancelAccountApplicationFormPanel",
@@ -141,7 +159,7 @@ export default {
             default: ''
         }
     },
-    components: {  uploadFile, EmpNamePicker },
+    components: {  uploadFile, EmpNamePicker, EmpNamePicker1, AllMonthpayAccountPicker },
     dicts: [ 'emis_payment_type', 'emis_settlebill_pay_type'],
     data() {
         return {
@@ -161,8 +179,9 @@ export default {
             // 总条数
             total: 0,
             // 新增/修改弹窗数据
-            form: {},
+            form: {
-
+                settleType: null,
+            },
             rules: {
                 picUrl: [
                     { required: true, message: "请上传图片", trigger: ["blur", "change"] },
@@ -174,7 +193,7 @@ export default {
                     { required: true, message: "销账金额不能为空", trigger: ["blur", "change"] },
                 ],
                 recipient: [
-                    { required: true, message: "收款人不能为空", trigger: ["blur", "change"] },
+                    { required: true, message: "缴款客户/缴款人不能为空", trigger: ["blur", "change"] },
                 ],
                 tradeDate: [
                     { required: true, message: "交易日期不能为空", trigger: ["blur", "change"] },
@@ -215,6 +234,17 @@ export default {
            
         };
     },
+    watch: {
+    //监听waitBatchDtlList变化
+     'waitBatchDtlList': {
+        handler(newVal, oldVal) {
+            if (newVal.length > 0) {
+                this.form.settleType = newVal.some(item => item.emisSettleBill.settleType === '2') ? '2' : '1';
+            }
+            }
+        },
+        deep: true
+     },  
     created() {
         this.initData();
     },
@@ -424,6 +454,11 @@ export default {
         dateTimeChange(value) {
             this.dateTimeRange = value;
         },
+        onMonthpayAccountSelect(account) {
+            if(account){
+                this.form.recipient = account.custName;
+            }
+        }
     }
 };
 </script>

src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue

@@ -69,6 +69,25 @@
       <!-- <el-table-column :label="$t('开票状态')" align="center" prop="batchNo" min-width="100" /> -->
       <el-table-column :label="$t('申请人')" align="center" prop="applyManName" min-width="130"
         :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('运费')" align="center" prop="emisWaybill.freight" min-width="100" >
+          <template slot-scope="scope">
+                <!-- 求和 -->
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0) }}
+          </template>
+      </el-table-column>   
+      <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleSubBill.recedMoney" min-width="100" >
+          <template slot-scope="scope">
+                <!-- 求和 -->
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0) }}
+          </template>
+      </el-table-column>   
+      <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="100" />
+      <el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
+          <template slot-scope="scope">
+                <!-- 求和 -->
+                {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight -item.emisSettleSubBill.recedMoney - item.applyMoney || 0), 0) }}
+          </template>
+      </el-table-column>   
       <el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">
       </el-table-column>
       <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">
@@ -91,7 +110,6 @@
       <el-table-column :label="$t('总部审核人姓名')" align="center" prop="headquartersConfirmManName" min-width="120" />
       <el-table-column :label="$t('总部驳回原因')" align="center" prop="headquartersRejectReason" min-width="110">
       </el-table-column>
-      <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="150" />
     </XdTable>
   </XdPageContainer>
 </template>

src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue

@@ -12,14 +12,23 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-  <el-table-column type="selection" width="55" align="center" />
+            <el-table-column type="selection" width="55" align="center" />
             <el-table-column :label="$t('序号')" align="center" type="index" width="50" />
             <el-table-column :label="$t('运单号')" align="center" prop="emisWaybill.billCode" min-width="170" />
             <el-table-column :label="$t('运费')" align="center" prop="emisWaybill.freight" min-width="80"
-                :show-overflow-tooltip="true" />
+                :show-overflow-tooltip="true" >
+                <template slot-scope="scope">
+                  {{scope.row.emisWaybill.freight}}
+                </template>
+            </el-table-column>   
             <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleSubBill.recedMoney" min-width="100">
             </el-table-column>
-            <el-table-column :label="$t('收款金额')" align="center" prop="applyMoney" min-width="100">
+            <el-table-column :label="$t('本次销账金额')" align="center" prop="applyMoney" min-width="140">
+            </el-table-column>
+            <el-table-column :label="$t('未收金额 ')" align="center" prop="" min-width="100" >
+                <template slot-scope="scope">
+                  {{scope.row.emisWaybill.freight - scope.row.emisSettleSubBill.recedMoney - scope.row.applyMoney}}
+                </template>
             </el-table-column>
             <el-table-column :label="$t('寄件日期')" align="center" prop="emisWaybill.sendDate" min-width="170"
                 :show-overflow-tooltip="true" />
@@ -34,6 +43,21 @@
             <el-table-column :label="$t('产品类型')" align="center" prop="emisWaybill.productTypeName" min-width="100"></el-table-column>
             <el-table-column :label="$t('件数')" align="center" prop="emisWaybill.parcelQty" min-width="100"> </el-table-column>
             <el-table-column :label="$t('结算重量 ')" align="center" prop="emisWaybill.settlementWeight" min-width="100" />
+            <el-table-column :label="$t('收款状态 ')" align="center" prop="emisSettleBill.paymentStatus" min-width="100">
+                <template slot-scope="scope">
+                      <dict-tag :options="dict.type.emis_settlebill_pay_status" :value="scope.row.emisSettleBill.paymentStatus"/>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('开票状态 ')" align="center" prop="emisSettleBill.chargeStatus" min-width="100">
+                <template slot-scope="scope">
+                  <el-tag v-if="scope.row.emisSettleBill.openBillStatus=='0'" type="error">未开票</el-tag>
+                  <el-tag v-if="scope.row.emisSettleBill.openBillStatus=='1'" type="success">已开票</el-tag>
+                  <el-tag v-if="scope.row.emisSettleBill.openBillStatus=='2'" type="warning">部分开票</el-tag>
+                  <el-tag v-if="scope.row.emisSettleBill.openBillStatus=='3'" type="warning">不开票</el-tag>
+                  <el-tag v-if="scope.row.emisSettleBill.openBillStatus=='4'" type="success">已完成</el-tag>
+                </template>
+            </el-table-column>
+ 
     </el-table>
 
   </div>
@@ -57,7 +81,7 @@ export default {
     }
   },
   components: { elDateSimplePicker,PayRecordSubBillRelList },
-  dicts: ['emis_settlebill_pay_type','emis_payment_type'],
+  dicts: ['emis_settlebill_pay_type','emis_payment_type','emis_settlebill_pay_status',],
   data() {
     return {
       // 遮罩层

src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue

@@ -77,6 +77,25 @@
             <!-- <el-table-column :label="$t('开票状态')" align="center" prop="batchNo" min-width="100" /> -->
             <el-table-column :label="$t('申请人')" align="center" prop="applyManName" min-width="130"
                 :show-overflow-tooltip="true" />
+            <el-table-column :label="$t('运费')" align="center" prop="emisWaybill.freight" min-width="100" >
+                <template slot-scope="scope">
+                     <!-- 求和 -->
+                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight || 0), 0) }}
+                </template>
+            </el-table-column>   
+            <el-table-column :label="$t('已收金额')" align="center" prop="emisSettleSubBill.recedMoney" min-width="100" >
+                <template slot-scope="scope">
+                     <!-- 求和 -->
+                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.recedMoney || 0), 0) }}
+                </template>
+            </el-table-column>   
+            <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="100" />
+            <el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
+                <template slot-scope="scope">
+                     <!-- 求和 -->
+                      {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight -item.emisSettleSubBill.recedMoney - item.applyMoney || 0), 0) }}
+                </template>
+            </el-table-column>   
             <el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">
             </el-table-column>
             <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">
@@ -99,7 +118,6 @@
             <el-table-column :label="$t('总部审核人姓名')" align="center" prop="headquartersConfirmManName" min-width="120" />
             <el-table-column :label="$t('总部驳回原因')" align="center" prop="headquartersRejectReason" min-width="110">
             </el-table-column>
-            <el-table-column :label="$t('销账金额')" align="center" prop="writeoffAmount" min-width="100" />
         </XdTable>
     </XdPageContainer>
 </template>

src/views/emis/emisSettleBill/panel/CancelAccountDetail.vue

@@ -6,7 +6,7 @@
         <el-descriptions-item label="收款方式">
           <dict-tag :options="dict.type.emis_settlebill_pay_type" :value="settleBillItem.payType"/>
         </el-descriptions-item>
-        <el-descriptions-item label="销账金额">￥{{ settleBillItem.writeoffAmount }}</el-descriptions-item>
+        <el-descriptions-item label="销账总金额">￥{{ settleBillItem.writeoffAmount }}</el-descriptions-item>
         <el-descriptions-item label="收款人" :span="2" > {{ settleBillItem.recipient }}
         </el-descriptions-item>