md
This commit is contained in:
parent
3e22d37390
commit
80d7943772
@ -62,7 +62,6 @@
|
||||
},
|
||||
watch: {
|
||||
value(newVal,oldVal) {
|
||||
console.log("country muti select picker==333==>",newVal);
|
||||
if(this.value){
|
||||
this.svalue=this.value.split(",");
|
||||
this.queryData(null,this.svalue.join(","));
|
||||
@ -70,7 +69,6 @@
|
||||
},
|
||||
},
|
||||
created() {
|
||||
console.log("country muti select picker==111==>",this.value);
|
||||
|
||||
if(this.value){
|
||||
this.optionItems=null;
|
||||
|
||||
@ -89,6 +89,10 @@
|
||||
},
|
||||
watch: {
|
||||
value(newVal,oldVal) {
|
||||
if(this.value){
|
||||
this.svalue=this.value.split(",");
|
||||
this.queryData(null,this.svalue.join(","));
|
||||
}
|
||||
// 逻辑 有初始值先查询初值
|
||||
// if(this.value!=null){
|
||||
// this.svalue=this.value;
|
||||
|
||||
@ -141,7 +141,7 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
|
||||
|
||||
|
||||
export default {
|
||||
name: "emisCommissionProfit",
|
||||
name: "EmisCommissionProfit",
|
||||
components: { elDateSimplePicker,emisCommissionProfitForm,PayeePicker },
|
||||
dicts: [
|
||||
],
|
||||
|
||||
@ -1,240 +0,0 @@
|
||||
<template>
|
||||
<div >
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="提成方案编码" prop="quoteCode">
|
||||
<el-input v-model="form.quoteCode" placeholder="请输入提成方案编码" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="提成方案名称" prop="quoteName">
|
||||
<el-input v-model="form.quoteName" placeholder="请输入提成方案名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="计算类型" prop="calcType">
|
||||
<el-input v-model="form.calcType" placeholder="请输入计算类型" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="岗位类型:emis_commission_post" prop="postType">
|
||||
<el-input v-model="form.postType" placeholder="请输入岗位类型:emis_commission_post" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="快递类型:emis_biz_shipping_method" prop="transType">
|
||||
<el-input v-model="form.transType" placeholder="请输入快递类型:emis_biz_shipping_method" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="启用状态" prop="blOpen">
|
||||
<el-input v-model="form.blOpen" placeholder="请输入启用状态" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="员工编号" prop="empCode">
|
||||
<el-input v-model="form.empCode" placeholder="请输入员工编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="员工名称" prop="empName">
|
||||
<el-input v-model="form.empName" placeholder="请输入员工名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="开始日期" prop="startDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.startDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择开始日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="结束日期" prop="endDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.endDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="优先级" prop="priorityLevel">
|
||||
<el-input v-model="form.priorityLevel" placeholder="请输入优先级" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="删除标志(0代表存在" prop="delFlag">
|
||||
<el-input v-model="form.delFlag" placeholder="请输入删除标志(0代表存在" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!--
|
||||
<el-form-item label="上级字典">
|
||||
<treeselect
|
||||
ref="tree"
|
||||
v-model="form.parentId"
|
||||
:options="emisCommissionQuoteOptions"
|
||||
:normalizer="normalizer"
|
||||
:default-expand-level="1"
|
||||
:show-count="true"
|
||||
placeholder="选择上级"
|
||||
/>
|
||||
</el-form-item>
|
||||
-->
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div style="text-align: center;margin-bottom: 10px;">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listEmisCommissionQuote, getEmisCommissionQuote, delEmisCommissionQuote, addEmisCommissionQuote, updateEmisCommissionQuote } from "@/api/emis/emisCommissionQuote";
|
||||
|
||||
export default {
|
||||
name: "emisCommissionQuoteForm",
|
||||
props:{
|
||||
quoteId:{
|
||||
type:Number
|
||||
}
|
||||
},
|
||||
components: { },
|
||||
dicts: [
|
||||
],
|
||||
data() {
|
||||
return {
|
||||
emisCommissionQuoteOptions: [],
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
quoteId: [
|
||||
{ required: true, message: "序号不能为空", trigger: "blur" }
|
||||
],
|
||||
delFlag: [
|
||||
{ required: true, message: "删除标志(0代表存在不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
"quoteId": {
|
||||
handler (newValue, oldValue) {
|
||||
this.quoteId = newValue;
|
||||
this.initData();
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.initData();
|
||||
},
|
||||
|
||||
methods: {
|
||||
initData() {
|
||||
|
||||
if(this.quoteId !=null) {
|
||||
this.loading = true;
|
||||
getEmisCommissionQuote(this.quoteId).then(response => {
|
||||
this.form = response.data;
|
||||
this.loading = false;
|
||||
});
|
||||
}else{
|
||||
this.reset();
|
||||
}
|
||||
// this.getTreeselect();
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.reset();
|
||||
this.$emit("on-cancel");
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
quoteId: null,
|
||||
quoteCode: null,
|
||||
quoteName: null,
|
||||
calcType: null,
|
||||
postType: null,
|
||||
transType: null,
|
||||
blOpen: null,
|
||||
empCode: null,
|
||||
empName: null,
|
||||
startDate: null,
|
||||
endDate: null,
|
||||
priorityLevel: null,
|
||||
remark: null,
|
||||
tenantId: null,
|
||||
delFlag: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
createSite: null,
|
||||
updateSite: null
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.quoteId != null) {
|
||||
updateEmisCommissionQuote(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.$emit("on-changed");
|
||||
});
|
||||
} else {
|
||||
addEmisCommissionQuote(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.$emit("on-changed");
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
// /** 转换菜单数据结构 */
|
||||
// normalizer(node) {
|
||||
// if (node.children && !node.children.length) {
|
||||
// delete node.children;
|
||||
// }
|
||||
// return {
|
||||
// id: node.quoteId,
|
||||
// label: node.quoteIdName,
|
||||
// children: node.children
|
||||
// };
|
||||
// },
|
||||
// /** 查询菜单下拉树结构 */
|
||||
// getTreeselect() {
|
||||
// const queryParams = {}
|
||||
// listEmisCommissionQuote(queryParams).then(response => {
|
||||
// this.emisCommissionQuoteOptions = [];
|
||||
// const rootItem = { quoteIdId: 0, emisCommissionQuoteName: '-', children: [] };
|
||||
// rootItem.children = this.handleTree(response.data, "quoteId");
|
||||
// this.emisCommissionQuoteOptions.push(rootItem);
|
||||
|
||||
// if(this.parentId != undefined) {
|
||||
// this.form.parentId = this.parentId;
|
||||
// }
|
||||
|
||||
// });
|
||||
// },
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -20,6 +20,11 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="寄件网点" prop="transLineCode">
|
||||
<EmisSiteMutiSelectPicker v-model="form.sendSiteCode" ></EmisSiteMutiSelectPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="线路" prop="transLineCode">
|
||||
<TransLineMultiplePicker v-model="form.transLineCode" isInitiated="true"></TransLineMultiplePicker>
|
||||
@ -229,6 +234,8 @@ import CountryMutiSelectPicker1 from '@/views/emis/EmisBaseTools/CountryMutiSele
|
||||
import TransLineMultiplePicker from '@/views/emis/EmisBaseTools/TransLineMultiplePicker.vue';
|
||||
import TransProductMultiplePicker from '@/views/emis/EmisBaseTools/TransProductMultiplePicker.vue';
|
||||
|
||||
import EmisSiteMutiSelectPicker from '@/views/emis/EmisBaseTools/EmisSiteMutiSelectPicker.vue';
|
||||
|
||||
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
|
||||
import EmisStaffSimpleListPicker from '@/views/emis/EmisBaseTools/EmisStaffSimpleListPicker.vue';
|
||||
import { listUser } from "@/api/system/user";
|
||||
@ -250,7 +257,7 @@ export default {
|
||||
}
|
||||
},
|
||||
components: {
|
||||
CountryMutiSelectPicker,CountryMutiSelectPicker1,EmisSiteSimplePicker,EcqExpressionPanel,
|
||||
EmisSiteMutiSelectPicker,CountryMutiSelectPicker,CountryMutiSelectPicker1,EmisSiteSimplePicker,EcqExpressionPanel,
|
||||
EmisStaffSimpleListPicker,TransLineMultiplePicker,TransProductMultiplePicker
|
||||
},
|
||||
dicts: ['emis_price_type','emis_fee_type','sys_currency_type',
|
||||
@ -265,7 +272,6 @@ export default {
|
||||
// 表单参数
|
||||
form: {},
|
||||
impEmpListStr:null,
|
||||
isCopy:false,
|
||||
// 表单校验
|
||||
rules: {
|
||||
quoteName: [
|
||||
@ -412,6 +418,7 @@ export default {
|
||||
calcType: null,
|
||||
postType: null,
|
||||
transType: null,
|
||||
sendSiteCode:null,
|
||||
transTypeIdArr:null,
|
||||
blOpen: null,
|
||||
empCode: null,
|
||||
|
||||
@ -217,6 +217,12 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="100" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.sendSiteName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('岗位类型')" align="center" prop="postType" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/>
|
||||
@ -250,7 +256,7 @@
|
||||
|
||||
</XdTable>
|
||||
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="90%" :destroy-on-close="true" v-dialogDrag append-to-body :close-on-click-modal="false">
|
||||
<emisCommissionQuoteForm :quoteId="currentId" :isCopy="isCopy" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCommissionQuoteForm>
|
||||
</el-dialog>
|
||||
|
||||
@ -261,11 +267,10 @@
|
||||
<script>
|
||||
import { listEmisCommissionQuote, getEmisCommissionQuote, delEmisCommissionQuote, addEmisCommissionQuote, updateEmisCommissionQuote } from "@/api/emis/emisCommissionQuote";
|
||||
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
|
||||
// import emisCommissionQuoteView from '@/views/emis/emisCommissionQuote/emisCommissionQuoteView';
|
||||
import emisCommissionQuoteForm from '@/views/emis/emisCommissionQuote/emisCommissionQuoteForm';
|
||||
|
||||
export default {
|
||||
name: "emisCommissionQuote",
|
||||
name: "EmisCommissionQuote",
|
||||
components: { elDateSimplePicker,emisCommissionQuoteForm },
|
||||
dicts: ['emis_price_type','emis_fee_type','sys_currency_type',
|
||||
'emis_commission_post','emis_biz_shipping_method','emis_commission_fee_type'],
|
||||
|
||||
@ -177,7 +177,7 @@
|
||||
|
||||
</XdTable>
|
||||
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body :close-on-click-modal="false">
|
||||
<emisCustomerInvoiceInfoForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCustomerInvoiceInfoForm>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user