Commit a7479208 by zhouqian

Merge branch 'development-202206' into 'development-202206'

Development 202206

See merge request !14
parents 3c8726cb 144dfa51
......@@ -3,7 +3,7 @@ export default class Fec {
this.data = {
inr: "",
feeinr: "",
feepri: "",
feepri: "!",
objtyp: "",
objinr: "",
begdat: "",
......
......@@ -3,11 +3,12 @@
<c-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="收费条件类型" prop="feepri">
<c-input
v-model="model.feepri"
placeholder="请输入收费条件类型"
>
</c-input>
<c-select
v-model="model.feepri"
style="width: 100%"
placeholder="请选择收费类型"
:code="getCodesByKey('feepri')"
></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -66,7 +67,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="费用最小金额" prop="lowamt">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.lowamt"
placeholder="请输入费用最小金额"
>
......@@ -75,7 +76,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="费用最大金额" prop="higamt">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.higamt"
placeholder="请输入费用最大金额"
>
......@@ -93,7 +94,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="最大金额" prop="maxamt">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.maxamt"
placeholder="请输入最大金额"
>
......@@ -120,7 +121,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="最小金额" prop="minamt">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.minamt"
placeholder="请输入最小金额"
>
......@@ -129,7 +130,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="最小有效值" prop="minamttot">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.minamttot"
placeholder="请输入最小有效值"
>
......@@ -138,7 +139,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="预先结算金额" prop="amtsetall">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.amtsetall"
placeholder="请输入预先结算金额"
>
......@@ -156,7 +157,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="每份的费用金额" prop="untamt">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.untamt"
placeholder="请输入每份的费用金额"
>
......@@ -282,7 +283,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第二级最小费用" prop="permintr2">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permintr2"
placeholder="请输入第二级最小费用"
>
......@@ -309,7 +310,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第三级最小费用" prop="permintr3">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permintr3"
placeholder="请输入第三级最小费用"
>
......@@ -338,7 +339,7 @@
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="第四级最小费用" prop="permintr4">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permintr4"
placeholder="请输入第四级最小费用"
>
......@@ -365,7 +366,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第五级最小费用" prop="permintr5">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permintr5"
placeholder="请输入第五级最小费用"
>
......@@ -392,7 +393,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第六级最小费用" prop="permintr6">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permintr6"
placeholder="请输入第六级最小费用"
>
......@@ -419,7 +420,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第七级最小费用" prop="permintr7">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permintr7"
placeholder="请输入第七级最小费用"
>
......@@ -428,7 +429,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第二级起始金额" prop="amtbegtr2">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.amtbegtr2"
placeholder="请输入第二级起始金额"
>
......@@ -446,7 +447,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第三级起始金额" prop="amtbegtr3">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.amtbegtr3"
placeholder="请输入第三级起始金额"
>
......@@ -464,7 +465,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第四级起始金额" prop="amtbegtr4">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.amtbegtr4"
placeholder="请输入第四级起始金额"
>
......@@ -563,7 +564,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="基准金额" prop="basamt">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.basamt"
placeholder="请输入基准金额"
>
......@@ -572,7 +573,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第二级最大费用" prop="permaxtr2">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permaxtr2"
placeholder="请输入第二级最大费用"
>
......@@ -581,7 +582,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第三级最大费用" prop="permaxtr3">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permaxtr3"
placeholder="请输入第三级最大费用"
>
......@@ -590,7 +591,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第四级最大费用" prop="permaxtr4">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permaxtr4"
placeholder="请输入第四级最大费用"
>
......@@ -599,7 +600,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第五级最大费用" prop="permaxtr5">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permaxtr5"
placeholder="请输入第五级最大费用"
>
......@@ -608,7 +609,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第六级最大费用" prop="permaxtr6">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permaxtr6"
placeholder="请输入第六级最大费用"
>
......@@ -617,7 +618,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="第七级最大费用" prop="permaxtr7">
<c-input-currency
<c-input-currency class="input-currency-left"
v-model="model.permaxtr7"
placeholder="请输入第七级最大费用"
>
......@@ -667,12 +668,19 @@
</template>
<script>
import codes from "~/config/CodeTable";
export default {
name: "fec",
props: ["model"],
data() {
return {};
},
methods: {
getCodesByKey(key) {
return codes[key] ?? [];
},
},
};
</script>
......
......@@ -3,7 +3,7 @@
<c-page :title="title">
<el-form
ref="modelForm"
label-width="120px"
label-width="180px"
size="small"
label-position="right"
:model="model"
......
......@@ -177,7 +177,7 @@
<c-col :span="8" class="col-right">
<c-col :span="24">
<el-form-item label="默认语种" prop="uil">
<c-input v-model="adr.uil" placeholder="请输入默认语种"> </c-input>
<c-select v-model="adr.uil" placeholder="请选择默认语种" :code="getCodesByKey('gtxuil')"> </c-select>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -253,7 +253,7 @@
<script>
import { Pattern } from "./Adr.js";
import codes from "~/config/CodeTable";
export default {
name: "",
......@@ -262,7 +262,12 @@ export default {
return {
rules: Pattern,
};
}
},
methods: {
getCodesByKey(key) {
return codes[key] ?? [];
},
},
};
</script>
......
......@@ -151,6 +151,11 @@
</c-col>
</c-col>
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="默认语种" prop="uil">
<c-select v-model="model.uil" placeholder="请选择默认语种" :code="getCodesByKey('gtxuil')"> </c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址状态" prop="adrsta">
<c-input v-model="model.adrsta" placeholder="请输入地址状态"> </c-input>
......@@ -295,12 +300,18 @@
</template>
<script>
import codes from "~/config/CodeTable";
export default {
name: "",
props: ["model"],
data() {
return {};
},
methods: {
getCodesByKey(key) {
return codes[key] ?? [];
},
},
};
</script>
......
......@@ -8,7 +8,6 @@
v-model="model.codFee"
placeholder="请输入 费用代码"
style="width: 100%"
:code="getCodesByKey('fepfeecod')"
>
</c-input>
</el-form-item>
......@@ -30,7 +29,7 @@
</c-col>
<!-- bus.sector -->
<c-col :span="24" v-if="(this.model.feepri==`$`)" class="col-left">
<!-- <c-col :span="24" v-if="(this.model.feepri==`$`)" class="col-left">
<c-col :span="12">
<el-form-item label="sector" prop="objtyp">
<c-input
......@@ -41,10 +40,10 @@
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col> -->
<!-- entity -->
<c-col :span="24" v-if="(this.model.feepri==`*`)" class="col-left">
<!-- <c-col :span="24" v-if="(this.model.feepri==`*`)" class="col-left">
<c-col :span="12">
<el-form-item label="实体" prop="objtyp">
<c-input
......@@ -55,10 +54,10 @@
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col> -->
<!-- region -->
<c-col :span="24" v-if="(this.model.feepri==1)" class="col-left">
<!-- <c-col :span="24" v-if="(this.model.feepri==1)" class="col-left">
<c-col :span="12">
<el-form-item label="区域" prop="objtyp">
<c-input
......@@ -69,10 +68,10 @@
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col> -->
<!-- country -->
<c-col :span="24" v-if="(this.model.feepri==2)" class="col-left">
<!-- <c-col :span="24" v-if="(this.model.feepri==2)" class="col-left">
<c-col :span="12">
<el-form-item label="国家" prop="objtyp">
<c-input
......@@ -83,10 +82,10 @@
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col> -->
<!-- group -->
<c-col :span="24" v-if="(this.model.feepri==3)" class="col-left">
<!-- <c-col :span="24" v-if="(this.model.feepri==3)" class="col-left">
<c-col :span="12">
<el-form-item label="组" prop="objtyp">
<c-input
......@@ -97,10 +96,10 @@
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col> -->
<!-- party -->
<c-col :span="24" v-if="(this.model.feepri==4)" class="col-left">
<!-- <c-col :span="24" v-if="(this.model.feepri==4)" class="col-left">
<c-col :span="12">
<el-form-item label="当事人" prop="objtyp">
<c-input
......@@ -111,7 +110,7 @@
</c-input>
</el-form-item>
</c-col>
</c-col>
</c-col> -->
<c-col :span="24">
<c-col :span="12" style="text-align: left">
<el-button type="primary" size="small" @click="fecAdd">新增</el-button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment