|
@@ -14,6 +14,11 @@
|
|
<el-input-number v-model="form1.payRate" ></el-input-number>
|
|
<el-input-number v-model="form1.payRate" ></el-input-number>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item label="默认自定义金额" prop="payAmount">
|
|
|
|
+ <el-tooltip class="item" effect="dark" content="货到付款默认自定义金额(元)" placement="top-end">
|
|
|
|
+ <el-input-number v-model="form1.payAmount" min="10" ></el-input-number>
|
|
|
|
+ </el-tooltip>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item label="待支付订单取消时间" prop="unPayTime">
|
|
<el-form-item label="待支付订单取消时间" prop="unPayTime">
|
|
<el-tooltip class="item" effect="dark" content="待支付订单取消时间(分钟)" placement="top-end">
|
|
<el-tooltip class="item" effect="dark" content="待支付订单取消时间(分钟)" placement="top-end">
|
|
<el-input-number v-model="form1.unPayTime" :min="1" ></el-input-number>
|
|
<el-input-number v-model="form1.unPayTime" :min="1" ></el-input-number>
|
|
@@ -543,6 +548,17 @@
|
|
<el-radio v-model="form13.erpType" label=2>旺店通</el-radio>
|
|
<el-radio v-model="form13.erpType" label=2>旺店通</el-radio>
|
|
<el-radio v-model="form13.erpType" label=3>金博</el-radio>
|
|
<el-radio v-model="form13.erpType" label=3>金博</el-radio>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item label="不推送erp的公司" v-if="form13.erpOpen == 1">
|
|
|
|
+ <el-select filterable v-model="form13.noErpCompany" placeholder="请选公司" multiple clearable size="small"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="item in companyOptions"
|
|
|
|
+ :key="item.companyId"
|
|
|
|
+ :label="item.companyName"
|
|
|
|
+ :value="item.companyId"
|
|
|
|
+ />
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item label="erpAppKey" v-if="form13.erpOpen == 1 && form13.erpType == 1 " prop="erpAppKey">
|
|
<el-form-item label="erpAppKey" v-if="form13.erpOpen == 1 && form13.erpType == 1 " prop="erpAppKey">
|
|
<el-input v-model="form13.erpAppKey" label="请输入erpAppKey"></el-input>
|
|
<el-input v-model="form13.erpAppKey" label="请输入erpAppKey"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -624,6 +640,7 @@
|
|
<script>
|
|
<script>
|
|
import Editor from '@/components/Editor/wang';
|
|
import Editor from '@/components/Editor/wang';
|
|
import { getConfigByKey,updateConfigByKey, clearCache } from "@/api/system/config";
|
|
import { getConfigByKey,updateConfigByKey, clearCache } from "@/api/system/config";
|
|
|
|
+import { listCompany } from "@/api/company/company";
|
|
import Material from '@/components/Material'
|
|
import Material from '@/components/Material'
|
|
export default {
|
|
export default {
|
|
name: "Config",
|
|
name: "Config",
|
|
@@ -641,6 +658,7 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ companyOptions:[],
|
|
uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
|
|
uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
|
|
videoAccept:"video/*",
|
|
videoAccept:"video/*",
|
|
sign:{
|
|
sign:{
|
|
@@ -728,6 +746,11 @@ export default {
|
|
this.getConfigByKey(this.activeName);
|
|
this.getConfigByKey(this.activeName);
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ getCompanyOptions() {
|
|
|
|
+ listCompany().then(response=>{
|
|
|
|
+ this.companyOptions = response.rows
|
|
|
|
+ })
|
|
|
|
+ },
|
|
handleSuccess(response, file) {
|
|
handleSuccess(response, file) {
|
|
// 上传成功后的回调函数
|
|
// 上传成功后的回调函数
|
|
this.myloading.close();
|
|
this.myloading.close();
|
|
@@ -847,6 +870,7 @@ export default {
|
|
|
|
|
|
}
|
|
}
|
|
else if(key == "erp.config"){
|
|
else if(key == "erp.config"){
|
|
|
|
+ this.getCompanyOptions();
|
|
this.configId=response.data.configId;
|
|
this.configId=response.data.configId;
|
|
this.configKey=response.data.configKey;
|
|
this.configKey=response.data.configKey;
|
|
if(response.data.configValue != null) {
|
|
if(response.data.configValue != null) {
|