diff --git a/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue b/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue
index ecfcb731..4bf32b9e 100644
--- a/src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue
+++ b/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);
}
})
diff --git a/src/views/emis/emisCustomerUser/batchUpdateForm.vue b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
index 7115f61e..db3bbbb7 100644
--- a/src/views/emis/emisCustomerUser/batchUpdateForm.vue
+++ b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
@@ -92,7 +92,7 @@
-
+
@@ -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;
- this.form.bizSite=item.selectSiteCodeStr;
+ if(item!=null){
+ 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;
+ },
}
};
diff --git a/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue b/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue
index d30a7adf..923cb1f8 100644
--- a/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue
+++ b/src/views/emis/emisSettleBill/CenterInvoiceRecordDeal.vue
@@ -4,10 +4,10 @@
-
+
-
+
diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index 887378f7..7f23dcd2 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -125,6 +125,17 @@
v-hasPermi="['emis:emisSettlePayRecord:export']"
>导出
+
+ 定制导出
+
@@ -141,15 +152,15 @@
-
+
现金收款
月结收款
-
+
-
+
@@ -187,8 +198,11 @@
-
-
+
+
+
+
+
@@ -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`)
+ },
}
};