|
@@ -307,6 +307,25 @@
|
|
|
<el-form-item label="入账时间" prop="tuiMoneyTime">
|
|
|
<el-date-picker v-model="tuiMoneyTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="changeTime"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="ERP账户" prop="erpAccount" v-if="SFDFopen">
|
|
|
+ <el-select v-model="queryParams.erpAccount" placeholder="ERP账户" clearable size="small">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in erpAccountList"
|
|
|
+ :key="dict"
|
|
|
+ :label="dict"
|
|
|
+ :value="dict"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="ERP电话" prop="erpPhoneNumber" v-if="SFDFopen">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.erpPhoneNumber"
|
|
|
+ placeholder="ERP电话"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -951,9 +970,9 @@ export default {
|
|
|
this.getDicts("sys_store_pay_type").then(response => {
|
|
|
this.PayOptions = response.data;
|
|
|
});
|
|
|
- this.getDicts("sys_order_source").then(response => {
|
|
|
- this.sourceOptions = response.data;
|
|
|
- });
|
|
|
+ this.getDicts("sys_order_source").then(response => {
|
|
|
+ this.sourceOptions = response.data;
|
|
|
+ });
|
|
|
this.getDicts("sys_store_order_type").then(response => {
|
|
|
this.orderTypeOptions = response.data;
|
|
|
});
|
|
@@ -988,7 +1007,7 @@ export default {
|
|
|
this.getDicts("sys_store_order_delivery_status").then(response => {
|
|
|
this.deliveryStatusOptions = response.data;
|
|
|
});
|
|
|
-
|
|
|
+ this.getErpAccountList();
|
|
|
|
|
|
},
|
|
|
methods: {
|
|
@@ -1226,22 +1245,24 @@ export default {
|
|
|
this.erpAccountDialog.open = true;
|
|
|
this.erpAccountDialog.loading = true;
|
|
|
this.erpSettingType = 'set'
|
|
|
- this.getErpAccountList();
|
|
|
+ // this.getErpAccountList();
|
|
|
this.calculateOrderSummary();
|
|
|
},
|
|
|
- // 修改:显示ERP账户选择对话框
|
|
|
+ //显示ERP账户选择对话框
|
|
|
showErpAccountDialog() {
|
|
|
this.erpAccountDialog.open = true;
|
|
|
this.erpAccountDialog.loading = true;
|
|
|
this.erpSettingType = 'push'
|
|
|
- this.getErpAccountList();
|
|
|
+ // this.getErpAccountList();
|
|
|
this.calculateOrderSummary();
|
|
|
},
|
|
|
|
|
|
- // 新增:获取ERP账户列表
|
|
|
+ //获取ERP账户列表
|
|
|
async getErpAccountList() {
|
|
|
+ // getErpAccountList() {
|
|
|
try {
|
|
|
const response = await getErpAccount();
|
|
|
+ // const response = getErpAccount();
|
|
|
if (response.code === 200) {
|
|
|
this.erpAccountList = response.data || [];
|
|
|
} else {
|