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

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

src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue

@@ -195,6 +195,11 @@ import { data } from "jquery";
         required: false,
         default:false
       },
+      openSiteSelectTreeForm:{
+        type: [Boolean],
+        required: false,
+        default:true
+      },
     },
     data() {
       return {
@@ -338,7 +343,7 @@ import { data } from "jquery";
               // this.dataTree = this.handleTree(response.rows,'siteCode','province');
               // 设置选中的key
               this.$nextTick(() => {
-              if(this.selectSiteCodeStr != null){
+              if(this.selectSiteCodeStr != null && this.openSiteSelectTreeForm ){
                 this.$refs.tree.setCheckedKeys(this.checkList);
               }
             })

src/views/emis/emisCustomerUser/batchUpdateForm.vue

@@ -92,7 +92,7 @@
       </div>
 
       <el-dialog title="选择网点" :visible.sync="openSiteSelectTreeForm" width="40%" :destroy-on-close="true" v-dialogDrag append-to-body>
-        <EmisSiteSelectTreePicker  :selectSiteCode="form.bizSite" :selectSiteName="form.bizSiteName" @on-changed="onSelectSiteTreeCheckChange" ></EmisSiteSelectTreePicker>
+        <EmisSiteSelectTreePicker2 :readOnly="true" :openSiteSelectTreeForm="openSiteSelectTreeForm" :selectSiteCode="form.bizSite" :selectSiteName="form.bizSiteName" @on-changed="onSelectSiteTreeCheckChange" @on-cancel="onCancelSelectSiteTree"></EmisSiteSelectTreePicker2>
       </el-dialog>
 
   </div>
@@ -111,7 +111,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
-import EmisSiteSelectTreePicker from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue';
+import EmisSiteSelectTreePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue';
 import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
@@ -131,7 +131,7 @@ export default {
     CountryPicker,
     EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
     EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,
-    EmisSiteSelectTreePicker,
+    EmisSiteSelectTreePicker2,
     EmpNamePicker3,
     EmpNamePicker4,
   },
@@ -177,8 +177,10 @@ export default {
     },
     onSelectSiteTreeCheckChange(item){
         this.openSiteSelectTreeForm=false;
-        this.form.bizSiteName=item.selectSiteNameStr;
+        if(item!=null){
-        this.form.bizSite=item.selectSiteCodeStr;
+          this.form.bizSiteName=item.selectSiteNameStr;
+          this.form.bizSite=item.selectSiteCodeStr;
+        }
         // console.log(item)
     },
     // 取消按钮
@@ -274,6 +276,9 @@ export default {
         this.$modal.msgSuccess("无变动，无需修改");
       }
     },
+    onCancelSelectSiteTree(){
+      this.openSiteSelectTreeForm=false;
+    },
 
   }
 };

src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue

@@ -4,10 +4,10 @@
       <div class="tab-container">
         <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
           <el-tab-pane label="开票申请记录" name="billList" >
-            <CenterInvoiceRecordDealListPanel v-if="activeTab=='billList'"  ref="billList" @onSelect="onSelectApply"> </CenterInvoiceRecordDealListPanel>
+            <CenterInvoiceRecordDealListPanel key="billList" ref="billList" @onSelect="onSelectApply"> </CenterInvoiceRecordDealListPanel>
           </el-tab-pane>
           <el-tab-pane label="已开票" name="hasOpenBillList" >
-            <CenterInvoiceHasOpenPanel v-if="activeTab=='hasOpenBillList'" ref="hasOpenBillList" :invoiceStatus="2" @onSelect="onSelectApply" @onPayInputByInvoice="onPayInputByInvoice"> </CenterInvoiceHasOpenPanel>
+            <CenterInvoiceHasOpenPanel key="hasOpenBillList" ref="hasOpenBillList" :invoiceStatus="2" @onSelect="onSelectApply" @onPayInputByInvoice="onPayInputByInvoice"> </CenterInvoiceHasOpenPanel>
           </el-tab-pane>
 
           <el-tab-pane label="发票收款"  name="payRecordByInvoice" v-if="showPayRecordByInvoice">

src/views/emis/emisSettlePayRecord/index.vue

@@ -125,6 +125,17 @@
                   v-hasPermi="['emis:emisSettlePayRecord:export']"
                 >导出</el-button>
               </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleCustomExport"
+                  v-hasPermi="['emis:emisSettlePayRecord:customExport']"
+                >定制导出</el-button>
+              </el-col>
           </el-row>
       </div>
 
@@ -141,15 +152,15 @@
 
       <el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" width="170" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('流水号')" align="center" prop="payId" width="170" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('收款来源')" align="center" prop="settleType" width="80" >
+      <el-table-column :label="$t('支付类型')" align="center" prop="settleType" width="80" >
         <template slot-scope="scope">
               <el-tag type="success" v-if="scope.row.settleType == '1'">现金收款</el-tag>
               <el-tag type="success" v-if="scope.row.settleType == '2'">月结收款</el-tag>
-            </template>
+        </template>
       </el-table-column>
       <el-table-column :label="$t('缴款客户')" align="center" prop="payMan" width="150" :show-overflow-tooltip="true" />
       <!-- <el-table-column :label="$t('月结编号')" align="center" prop="payManCode" width="100" :show-overflow-tooltip="true"/> -->
-       <el-table-column :label="$t('支付类型')" align="center" prop="payType" width="150" >
+       <el-table-column :label="$t('收款来源')" align="center" prop="payType" width="150" >
           <template slot-scope="scope">
             <dict-tag  :options="dict.type.emis_settlebill_pay_type" :value="scope.row.payType"/>
           </template>
@@ -187,8 +198,11 @@
       <el-table-column label="登记人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="登记网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="登记时间" align="center" prop="createTime"  width="170"/>
-
+      <el-table-column label="账单编号" align="center" prop="settleBillNo"  width="100" :show-overflow-tooltip="true"/>
-
+      <el-table-column label="运单号" align="center" prop="billCodes"  width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="账单金额" align="center" prop="billAmount"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="开票金额" align="center" prop="invoiceAmount"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="开票状态" align="center" prop="invoiceStatus"  width="80" :show-overflow-tooltip="true"/>
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
@@ -806,6 +820,14 @@ export default {
     dateTimeChange(value){
         this.dateTimeRange=value;
     },
+    //定制导出
+    handleCustomExport(){
+      let settleBillNo = this.selectList[0].settleBillNo;
+      //获取选中
+      this.download('emis/emisSettlePayRecord/customExport', {
+        'settleBillNo':settleBillNo
+      }, `定制收款明细列表.xlsx`)
+    },
   }
 };
 </script>