From dda7288b64b3dc686d17235f84cdb59454743481 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 18 Jun 2024 11:53:14 +0800 Subject: [PATCH] md --- .../EmisBaseTools/EmisSiteSimplePicker.vue | 2 +- src/views/emis/emisProblemType/index.vue | 15 +-- .../emisSettleType/emisSettleTypeForm.vue | 99 ++++++++----------- src/views/emis/emisSettleType/index.vue | 52 ++-------- src/views/emis/emisSmsSendRecord/index.vue | 1 - src/views/emis/emisUser/editForm.vue | 22 +++-- src/views/emis/emisUser/index.vue | 6 +- .../emis/emisWaybill/centerWaybillList.vue | 10 +- .../emis/emisWaybill/dispatchWaybillList.vue | 6 +- .../emis/emisWaybill/sendWaybillList.vue | 2 +- .../emisWaybillTransfer/waybillTransfer.vue | 88 ++++++++--------- 11 files changed, 123 insertions(+), 180 deletions(-) diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue index 5e49361a..1dfb5966 100644 --- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue @@ -8,7 +8,7 @@ :remote-method="queryData" v-model="svalue" :placeholder="placeholder" - auto-complete="false" + :disabled="disabled" no-data-text="" diff --git a/src/views/emis/emisProblemType/index.vue b/src/views/emis/emisProblemType/index.vue index 3698c592..87d646a7 100644 --- a/src/views/emis/emisProblemType/index.vue +++ b/src/views/emis/emisProblemType/index.vue @@ -46,17 +46,17 @@ /> - + - - + :default-sort="{prop: 'orderNum', order: 'descending'}" + >
@@ -116,8 +117,8 @@
- - + + diff --git a/src/views/emis/emisSettleType/emisSettleTypeForm.vue b/src/views/emis/emisSettleType/emisSettleTypeForm.vue index c8b89cd5..417e3aca 100644 --- a/src/views/emis/emisSettleType/emisSettleTypeForm.vue +++ b/src/views/emis/emisSettleType/emisSettleTypeForm.vue @@ -2,63 +2,62 @@
- + - + + + - + + - - - - + + + + - - - 启用 - 停用 - + + + + + - + + + + + + + 是 否 - - - - - - - - - - - - - - - - - + + 是 否 @@ -66,7 +65,7 @@ - + 是 @@ -74,10 +73,17 @@ - + + + + 启用 + 停用 + + + - + @@ -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; - // } - - // }); - // }, } }; diff --git a/src/views/emis/emisSettleType/index.vue b/src/views/emis/emisSettleType/index.vue index 8dd0aa3c..082eb61d 100644 --- a/src/views/emis/emisSettleType/index.vue +++ b/src/views/emis/emisSettleType/index.vue @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@
@@ -71,7 +72,7 @@ v-hasPermi="['emis:emisSettleType:edit']" >修改 - + - - + - - + + - + @@ -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 => { diff --git a/src/views/emis/emisUser/index.vue b/src/views/emis/emisUser/index.vue index 9f7b54d0..fb1c9e1a 100644 --- a/src/views/emis/emisUser/index.vue +++ b/src/views/emis/emisUser/index.vue @@ -260,7 +260,7 @@ - + @@ -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, diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index e785d716..636b8609 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -567,8 +567,8 @@ - - + + @@ -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', diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index 0e1a7b9c..6bfc26b9 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -561,7 +561,7 @@ - + @@ -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', diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index e67d6d75..a78aa347 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -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' diff --git a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue index 381b6a6b..2cf862a6 100644 --- a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue +++ b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue @@ -10,13 +10,6 @@ 订单号
- - - + + - - - - + + @@ -213,6 +197,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -223,32 +241,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +