aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-18 11:53:14 +08:00
parent b7059bbd1a
commit dda7288b64
11 changed files with 123 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
View File

@ -8,7 +8,7 @@
:remote-method="queryData"
v-model="svalue"
:placeholder="placeholder"
auto-complete="false"
:disabled="disabled"
no-data-text=""

15
src/views/emis/emisProblemType/index.vue
View File

@ -46,17 +46,17 @@
/>
</el-select>
</el-form-item>
</search-form>
<XdTable
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
v-loading="loading"
border stripe
size="mini"
:data="emisProblemTypeList"
@ -66,7 +66,8 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
:default-sort="{prop: 'orderNum', order: 'descending'}"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
@ -116,8 +117,8 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="类型编号" align="center" prop="id" min-width="100" />
<el-table-column label="类型名称" align="left" prop="typeName" min-width="160">

99
src/views/emis/emisSettleType/emisSettleTypeForm.vue
View File

@ -2,63 +2,62 @@
<div >
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-col :span="12">
<el-form-item label="类型编号" prop="settleType">
<el-input v-model="form.settleType" placeholder="请输入结算项类型" :disabled="form.id!=null" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
</el-col>
<el-col :span="12">
<el-form-item label="类型名称" prop="settleName">
<el-input v-model="form.settleName" placeholder="请输入结算项名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="统计名称" prop="statName">
<el-input v-model="form.statName" placeholder="请输入统计名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作方式" prop="blInc">
<el-select v-model="form.blInc" clearable filterable placeholder="" >
<el-option :key="1" label="加" :value="1" ></el-option>
<el-option :key="0" label="减" :value="0" ></el-option>
<el-form-item label="收支类型" prop="recPayType">
<el-select v-model="form.recPayType"
style="width:100%"
clearable filterable placeholder=""
>
<el-option :key="1" label="应收" value="1" ></el-option>
<el-option :key="2" label="应付" value="2" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="启用状态" prop="blValid">
<el-radio-group v-model="form.blValid">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
<el-form-item label="操作方式" prop="blInc">
<el-select v-model="form.blInc"
style="width:100%"
clearable filterable placeholder="" >
<el-option :key="1" label="加" value="1" ></el-option>
<el-option :key="2" label="减" value="2" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="明细录入是否启用" prop="blInput" label-width="150px">
<el-form-item label="是否允许开票" prop="blInvoice" label-width="150px">
<el-checkbox v-model="form.blInvoice"></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="明细录入是否启用" prop="blInput" label-width="170px">
<el-radio-group v-model="form.blInput">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收支类型" prop="recPayType">
<el-select v-model="form.recPayType" clearable filterable placeholder="" >
<el-option :key="1" label="应收" :value="1" ></el-option>
<el-option :key="0" label="应付" :value="0" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否允许开票" prop="blInvoice">
<el-checkbox v-model="form.blInvoice"></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否费用预提" prop="blEbsYt" label-width="150px">
<el-col :span="12">
<el-form-item label="是否费用预提" prop="blEbsYt" label-width="170px">
<el-radio-group v-model="form.blEbsYt">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
@ -66,7 +65,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="是否奖罚使用" prop="blReward" label-width="150px">
<el-radio-group v-model="form.blReward">
<el-radio :label="1">是</el-radio>
@ -74,10 +73,17 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="启用状态" prop="blValid">
<el-radio-group v-model="form.blValid">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-input v-model="form.remark" type="textarea" rows="2" placeholder="请输入备注" />
</el-form-item>
</el-col>
@ -229,39 +235,14 @@ export default {
});
} else {
addEmisSettleType(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess("新增成功");
this.$emit("on-changed");
});
}
}
});
},
// /** 转换菜单数据结构 */
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisSettleType(queryParams).then(response => {
// this.emisSettleTypeOptions = [];
// const rootItem = { idId: 0, emisSettleTypeName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisSettleTypeOptions.push(rootItem);
// if(this.parentId != undefined) {
// this.form.parentId = this.parentId;
// }
// });
// },
}
};
</script>

52
src/views/emis/emisSettleType/index.vue
View File

@ -29,7 +29,7 @@
<el-form-item :label="$t('操作方式')" prop="blInc">
<el-select v-model="queryParams.blInc" clearable filterable placeholder="" >
<el-option :key="1" label="加" :value="1" ></el-option>
<el-option :key="0" label="减" :value="0" ></el-option>
<el-option :key="2" label="减" :value="2" ></el-option>
</el-select>
</el-form-item>
</SearchForm>
@ -37,7 +37,7 @@
<XdTable v-loading="loading"
border stripe
size="small"
size="mini"
:data="emisSettleTypeList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
@ -45,6 +45,7 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
:default-sort="{prop: 'settleType', order: 'descending'}"
>
<div slot="toolbar">
@ -71,7 +72,7 @@
v-hasPermi="['emis:emisSettleType:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
@ -81,7 +82,7 @@
@click="handleDelete"
v-hasPermi="['emis:emisSettleType:remove']"
>删除</el-button>
</el-col>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="warning"
@ -96,50 +97,15 @@
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('类型编号')" align="center" prop="settleType" min-width="100" />
<el-table-column :label="$t('类型编号')" align="center" prop="settleType" min-width="120" :sort-orders="['descending','ascending']" sortable="custom" />
<el-table-column :label="$t('类型名称')" align="center" prop="settleName" min-width="100" />
<el-table-column :label="$t('统计名称')" align="center" prop="statName" min-width="100" />
<el-table-column label="操作方式" align="center" prop="blInc" min-width="100" >
<template slot-scope="scope">
<span v-if="scope.row.blInc==1" >加</span>
<span v-if="scope.row.blInc==0" >减</span>
<span v-if="scope.row.blInc==2" >减</span>
</template>
</el-table-column>
<!-- <el-table-column label="明细录入是否启用" align="center" prop="blInput" min-width="170" >
@ -169,7 +135,7 @@
<el-table-column label="收支类型" align="center" prop="recPayType" min-width="100" >
<template slot-scope="scope">
<span v-if="scope.row.recPayType==1" type="info">应收</span>
<span v-if="scope.row.recPayType==0" type="info">应付</span>
<span v-if="scope.row.recPayType==2" type="info">应付</span>
</template>
</el-table-column>
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true" />
@ -182,7 +148,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="60%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisSettleTypeForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleTypeForm>
</el-dialog>

1
src/views/emis/emisSmsSendRecord/index.vue
View File

@ -15,7 +15,6 @@
clearable
:rows="2"
/>
<!-- @keyup.enter.native="handleQuery" -->
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input

22
src/views/emis/emisUser/editForm.vue
View File

@ -23,15 +23,17 @@
<el-col :span="8">
<el-form-item label="归属站点" prop="ownerSiteCode">
<EmisSiteSimplePicker v-if="form.userId == undefined" :placeholder="$t('服务网点')" v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange"></EmisSiteSimplePicker>
<EmisSiteSimplePicker v-else :placeholder="$t('服务网点')" v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange" disabled></EmisSiteSimplePicker>
<EmisSiteSimplePicker v-if="form.userId == undefined" :placeholder="$t('服务网点')" autocomplete="off"
auto-complete="new-password" v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange"></EmisSiteSimplePicker>
<EmisSiteSimplePicker v-else :placeholder="$t('服务网点')" autocomplete="off"
auto-complete="new-password" v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange" disabled></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" auto-complete="new-password" autocomplete="off" maxlength="20" show-password/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -307,12 +309,12 @@ export default {
},
created() {
this.initData();
this.getConfigKey("sys.user.initPassword").then(response => {
if(this.userId == null) {
this.initPassword = response.msg;
this.form.password = this.initPassword;
}
});
// this.getConfigKey("sys.user.initPassword").then(response => {
// if(this.userId == null) {
// this.initPassword = response.msg;
// this.form.password = this.initPassword;
// }
// });
},
methods: {
@ -326,7 +328,7 @@ export default {
this.roleOptions = response.roles;
this.open = true;
this.title = "添加用户";
this.form.password = this.initPassword;
// this.form.password = this.initPassword;
});
}else{
getUser(this.userId).then(response => {

6
src/views/emis/emisUser/index.vue
View File

@ -260,7 +260,7 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="60%" :destroy-on-close="true" v-dialogDrag append-to-body>
<sysUserForm :userId="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></SysUserForm>
<SysUserForm :userId="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></SysUserForm>
</el-dialog>
<!-- 用户导入对话框 -->
@ -305,7 +305,7 @@ import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import DeptmentTreePicker from '@/views/emis/EmisBaseTools/DeptmentTreePicker.vue';
import sysUserForm from '@/views/emis/emisUser/editForm';
import SysUserForm from '@/views/emis/emisUser/editForm';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import EmisSiteLeftTreePicker from '@/views/emis/EmisBaseTools/EmisSiteLeftTreePicker.vue';
@ -315,7 +315,7 @@ import CountryTreePicker from '@/views/emis/EmisBaseTools/CountryTreePicker.vue'
export default {
name: "User",
dicts: ['sys_normal_disable', 'sys_user_sex','emis_site_type','sys_biz_enable_status'],
components: { DeptmentTreePicker,CountryTreePicker,Treeselect,sysUserForm,EmisSiteSimplePicker,EmisSiteLeftTreePicker,CountryPicker },
components: { DeptmentTreePicker,CountryTreePicker,Treeselect,SysUserForm,EmisSiteSimplePicker,EmisSiteLeftTreePicker,CountryPicker },
data() {
return {
tableHeight: 200,

10
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -567,8 +567,8 @@
</XdTable>
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceDetail :billCode="currentTraceBillCode"></TraceDetail>
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
</el-dialog>
</XdPageContainer>
@ -586,11 +586,9 @@ import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
@ -605,7 +603,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceDetail from '@/views/emis/customerService/traceDetail.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
@ -630,7 +628,7 @@ export default {
EmisSiteSimplePicker2,
ProblemTypePicker,
TraceDetail
TraceWaybillDetailView
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',

6
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -561,7 +561,7 @@
</XdTable>
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceDetail :billCode="currentTraceBillCode"></TraceDetail>
<TraceWaybillDetailView :billCode="currentTraceBillCode"></TraceWaybillDetailView>
</el-dialog>
</XdPageContainer>
@ -596,7 +596,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import TraceDetail from '@/views/emis/customerService/traceDetail.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
@ -621,7 +621,7 @@ export default {
EmisSiteSimplePicker2,
ProblemTypePicker,
TraceDetail
TraceWaybillDetailView
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',

2
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -622,7 +622,7 @@ import TraceDetail from '@/views/emis/customerService/traceDetail.vue';
import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
import TraceWaybillDetailView from '@/views/emis/customerService//traceWaybillDetailView.vue';
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'

88
src/views/emis/emisWaybillTransfer/waybillTransfer.vue
View File

@ -10,13 +10,6 @@
<el-radio label="0">订单号</el-radio>
</el-radio-group>
</div>
<!-- <el-input
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
type="textarea"
rows="2"
/> -->
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
@ -180,22 +173,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('转单编号')" prop="transferBillCode" label-width="80px">
<el-input v-model="form.transferBillCode"></el-input>
<el-form-item :label="$t('重量')" prop="transferWeight" label-width="80px">
<el-input v-model="form.transferWeight" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('转单时间')" prop="transferDate" label-width="80px">
<!-- <CustomDatePicker v-model="form.transferDate"></CustomDatePicker> -->
<!-- <elDateSimplePicker v-model="form.transferDate"></elDateSimplePicker> -->
<el-date-picker
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="form.transferDate"
type="datetime"
placeholder="选择日"
style="width:100%"
></el-date-picker>
<el-form-item :label="$t('体积')" prop="transferVolume" label-width="80px">
<el-input v-model="form.transferVolume" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@ -213,6 +197,40 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('转单编号')" prop="transferBillCode" label-width="80px">
<el-input v-model="form.transferBillCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('目的城市')" prop="transferCity" label-width="80px">
<el-input v-model="form.transferCity"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('转单时间')" prop="transferDate" label-width="80px">
<!-- <CustomDatePicker v-model="form.transferDate"></CustomDatePicker> -->
<!-- <elDateSimplePicker v-model="form.transferDate"></elDateSimplePicker> -->
<el-date-picker
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="form.transferDate"
type="datetime"
placeholder="选择日"
style="width:100%"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('转件原因')" prop="transferResean" label-width="80px">
<el-input v-model="form.transferResean"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('转件费')" prop="transferFee" label-width="80px">
<el-input v-model="form.transferFee"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('联系人')" prop="linkMan" label-width="80px">
<el-input v-model="form.linkMan"></el-input>
@ -223,32 +241,10 @@
<el-input v-model="form.linkPhone"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('重量')" prop="transferWeight" label-width="80px">
<el-input v-model="form.transferWeight" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('体积')" prop="transferVolume" label-width="80px">
<el-input v-model="form.transferVolume" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('转件费')" prop="transferFee" label-width="80px">
<el-input v-model="form.transferFee"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('转件原因')" prop="transferResean" label-width="80px">
<el-input v-model="form.transferResean"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('目的城市')" prop="transferCity" label-width="80px">
<el-input v-model="form.transferCity"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="24">
<el-form-item :label="$t('备注')" prop="remark" label-width="80px">
<!-- <el-input v-model="form.remark"></el-input> -->
<el-input v-model="form.remark" rows="2" type="textarea" placeholder="请输入内容" />