|
|
@@ -904,70 +904,7 @@
|
|
|
<el-input v-model="form13.erpHzOMBaseUrl" label="请输入erpHzOMBaseUrl"></el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <!-- 代付管家 - 修改为支持多账户 -->
|
|
|
- <div v-if="form13.erpOpen == 1 && form13.erpType == 4">
|
|
|
- <el-form-item label="代付管家账户配置">
|
|
|
- <el-button type="primary" icon="el-icon-plus" @click="addDfAccount" style="margin-bottom: 10px;">
|
|
|
- 添加新账号
|
|
|
- </el-button>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <div v-for="(account, index) in form13.dfAccounts" :key="index"
|
|
|
- style="border: 1px solid #dcdfe6; padding: 20px; margin-bottom: 20px; border-radius: 4px;"
|
|
|
- >
|
|
|
- <div style="display: flex; justify-content: between; align-items: center; margin-bottom: 15px;">
|
|
|
- <div style="margin: 0; color: #409eff;">账户 {{ index + 1 }}</div>
|
|
|
- <el-button
|
|
|
- type="danger"
|
|
|
- icon="el-icon-delete"
|
|
|
- size="mini"
|
|
|
- @click="removeDfAccount(index)"
|
|
|
- v-if="form13.dfAccounts.length > 1"
|
|
|
- >
|
|
|
- 删除账户
|
|
|
- </el-button>
|
|
|
- </div>
|
|
|
-
|
|
|
- <el-form-item label="dfAppKey" :prop="`dfAccounts.${index}.dfAppKey`">
|
|
|
- <el-input v-model="account.dfAppKey" placeholder="请输入dfAppKey"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="dfAppsecret" :prop="`dfAccounts.${index}.dfAppsecret`">
|
|
|
- <el-input v-model="account.dfAppsecret" placeholder="请输入dfAppsecret"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="登录账号" :prop="`dfAccounts.${index}.loginAccount`">
|
|
|
- <el-input v-model="account.loginAccount" placeholder="登录账号"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="回调地址" :prop="`dfAccounts.${index}.callBackUrl`">
|
|
|
- <el-input v-model="account.callBackUrl" placeholder="回调地址"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="月结账号" :prop="`dfAccounts.${index}.monthlyCard`">
|
|
|
- <el-input v-model="account.monthlyCard" placeholder="月结账号"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="物流产品编码" :prop="`dfAccounts.${index}.expressProductCode`">
|
|
|
- <el-input v-model="account.expressProductCode"
|
|
|
- placeholder="物流产品编码:1-顺丰标快,2-顺丰标快(陆运),204-陆运微小件,231-陆运包裹,208-特惠专配,247-电商标快"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="寄件人姓名" :prop="`dfAccounts.${index}.senderName`">
|
|
|
- <el-input v-model="account.senderName" placeholder="寄件人姓名"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="寄件人手机" :prop="`dfAccounts.${index}.senderPhone`">
|
|
|
- <el-input v-model="account.senderPhone" placeholder="寄件人手机"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="寄件人省市区" prop="`cityIds`">
|
|
|
- <el-cascader
|
|
|
- ref="citySelect"
|
|
|
- v-model="account.cityIds"
|
|
|
- :options="citys"
|
|
|
- @change="handleCityChange(index)"
|
|
|
- >
|
|
|
- </el-cascader>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="寄件人详细地址" :prop="`dfAccounts.${index}.senderAddress`">
|
|
|
- <el-input v-model="account.senderAddress" placeholder="寄件人详细地址"></el-input>
|
|
|
- </el-form-item>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
+
|
|
|
|
|
|
|
|
|
<el-form-item label="erpWdAppKey" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdAppKey">
|
|
|
@@ -2575,56 +2512,13 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- handleCityChange(value) {
|
|
|
- // console.log(this.$refs.citySelect,this.$refs.citySelect[0])
|
|
|
- var nodes = this.$refs.citySelect[value].getCheckedNodes()
|
|
|
- // console.log(nodes[0])
|
|
|
- // this.account[value].cityIds=value.toString();
|
|
|
- this.form13.dfAccounts[value].senderProvince = nodes[0].pathLabels[0]
|
|
|
- this.form13.dfAccounts[value].senderCity = nodes[0].pathLabels[1]
|
|
|
- this.form13.dfAccounts[value].senderDistrict = nodes[0].pathLabels[2]
|
|
|
- },
|
|
|
- getCitys() {
|
|
|
- getCitys().then(res => {
|
|
|
- this.loading = false
|
|
|
- this.citys = res.data
|
|
|
- })
|
|
|
- },
|
|
|
+
|
|
|
getCompanyOptions() {
|
|
|
listCompany().then(response => {
|
|
|
this.companyOptions = response.rows
|
|
|
})
|
|
|
},
|
|
|
- // 添加代付管家账户
|
|
|
- addDfAccount() {
|
|
|
- this.form13.dfAccounts.push({
|
|
|
- dfAppKey: '',
|
|
|
- dfAppsecret: '',
|
|
|
- loginAccount: '',
|
|
|
- callBackUrl: '',
|
|
|
- monthlyCard: '',
|
|
|
- expressProductCode: '',
|
|
|
- senderName: '',
|
|
|
- senderPhone: '',
|
|
|
- cityIds: '',
|
|
|
- senderProvince: '',
|
|
|
- senderCity: '',
|
|
|
- senderDistrict: '',
|
|
|
- senderAddress: ''
|
|
|
- })
|
|
|
- },
|
|
|
- // 删除代付管家账户
|
|
|
- removeDfAccount(index) {
|
|
|
- this.$confirm('确认删除该账户?', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- cancelButtonText: '取消',
|
|
|
- type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- this.form13.dfAccounts.splice(index, 1)
|
|
|
- this.$message.success('删除成功')
|
|
|
- }).catch(() => {
|
|
|
- })
|
|
|
- },
|
|
|
+
|
|
|
handleSuccess(response, file) {
|
|
|
// 上传成功后的回调函数
|
|
|
this.myloading.close()
|
|
|
@@ -2784,17 +2678,9 @@ export default {
|
|
|
this.form12 = JSON.parse(response.data.configValue)
|
|
|
}
|
|
|
if (key == 'his.config') {
|
|
|
- this.getCitys()
|
|
|
this.getCompanyOptions()
|
|
|
this.form13 = JSON.parse(response.data.configValue)
|
|
|
- // 确保代付管家账户数组存在
|
|
|
- if (!this.form13.dfAccounts || !Array.isArray(this.form13.dfAccounts)) {
|
|
|
- this.form13.dfAccounts = []
|
|
|
- }
|
|
|
- // 如果没有账户,添加一个默认账户
|
|
|
- if (this.form13.dfAccounts.length === 0) {
|
|
|
- this.addDfAccount()
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
if (key == 'store.config') {
|
|
|
this.form17 = JSON.parse(response.data.configValue)
|