aike/emis-oms-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-11-28 17:42:34 +08:00
parent c1b52e8a69
commit 69c74095a6
6 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/oms/emisGoods.js
View File

@ -17,6 +17,14 @@ export function listSimpleEmisGoods(query) {
})
}
export function listMyGoodsSimple(query) {
return request({
url: '/oms2c/emisGoods/listMyGoodsSimple',
method: 'get',
params: query
})
}
// 查询货物信息详细

10
src/api/oms/emisWaybill.js
View File

@ -175,3 +175,13 @@ export function delEmisWaybill(id) {
method: 'delete'
})
}
// 取消运单
export function cancelOrder(data) {
return request({
url: '/oms2c/emisWaybill/cancelOrder',
method: 'post',
data: data
})
}

20
src/api/system/user.js
View File

@ -38,12 +38,12 @@ export function getNewEmpCode(ownerSiteCode) {
}
// 查询用户详细
export function getUser(userId) {
export function getUser(id) {
return request({
url: '/system/user/' + parseStrEmpty(userId),
method: 'get'
url: '/system/user/getInfo',
method: 'get',
params:{id:parseStrEmpty(id)}
})
}
@ -74,9 +74,9 @@ export function delUser(userId) {
}
// 用户密码重置
export function resetUserPwd(userId, password) {
export function resetUserPwd(userName, password) {
const data = {
userId,
userName,
password
}
return request({
@ -87,9 +87,9 @@ export function resetUserPwd(userId, password) {
}
// 用户状态修改
export function changeUserStatus(userId, status) {
export function changeUserStatus(id, status) {
const data = {
userId,
id,
status
}
return request({
@ -148,9 +148,9 @@ export function uploadAvatar(data) {
}
// 查询授权角色
export function getAuthRole(userId) {
export function getAuthRole(id) {
return request({
url: '/system/user/authRole/' + userId,
url: '/system/user/authRole/' + id,
method: 'get'
})
}

4
src/views/oms/EmisBaseTools/TakeEmpPicker.vue
View File

@ -205,7 +205,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
this.loading = true;
this.queryParams.searchValue = val;
this.queryParams.userId = key;
this.queryParams.empCode = key;
listBindSalesmen(this.queryParams).then(response => {
this.loading = false;
@ -219,7 +219,7 @@ import { listBindSalesmen } from "@/api/oms/emisStaff";
}
if(!this.isInputing ){
let selectItem = response.rows.find(item => item.userId == this.svalue);
let selectItem = response.rows.find(item => item.empCode == this.svalue);
if(selectItem){
this.slable = selectItem.empName;
}

21
src/views/oms/emisWaybill/OrderRecord.vue
View File

@ -144,7 +144,7 @@
</el-col>
<el-col :span="18">
<el-form-item :label="$t('目的国')" prop="sender.country">
<el-form-item :label="$t('目的国')" prop="reciever.country">
<country-picker2 v-model="form.reciever.country" @onChange="handleCalcDestSite" ></country-picker2>
</el-form-item>
</el-col>
@ -472,7 +472,7 @@
<el-input v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
<el-table-column prop="price" label="货值(USD)" align="center" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.price" size="mini" placeholder=""></el-input>
</template>
@ -483,8 +483,6 @@
</template>
</el-table-column> -->
<el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
@ -495,11 +493,6 @@
<el-input v-model="scope.row.brand" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<!-- <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
</template>
</el-table-column> -->
<el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
@ -527,7 +520,13 @@
</template>
</el-table-column> -->
<!-- <el-table-column prop="length" :label="$t('长(cm)')" align="center" width="80">
<el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="length" :label="$t('长(cm)')" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.length" size="mini" placeholder=""></el-input>
</template>
@ -541,7 +540,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.height" size="mini" placeholder=""></el-input>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column :label="$t('操作')" align="left" min-width="50">

21
src/views/oms/emisWaybill/SendOrderbillList.vue
View File

@ -240,7 +240,7 @@
size="mini"
icon="el-icon-cancel"
:disabled="single"
@click="handleUpdate"
@click="handleCancel"
>取消订单</el-button>
</el-col>
@ -525,7 +525,7 @@
<script>
import 'element-ui/lib/theme-chalk/display.css';
import { listEmisWaybill,getQueryStatInfoMap } from "@/api/oms/emisWaybill";
import { listEmisWaybill,getQueryStatInfoMap,cancelOrder } from "@/api/oms/emisWaybill";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
@ -842,6 +842,23 @@ export default {
// this.billCode=row.billCode;
this.openView=true;
},
handleCancel(row){
this.$prompt('请输入取消原因', "操作确认", {
confirmButtonText: "确定",
cancelButtonText: "取消",
closeOnClickModal: false,
inputPattern: /^.{1,30}$/,
inputErrorMessage: "取消原因长度必须介于 1 和 30 之间"
}).then(({ value }) => {
let item0=this.selectionList[0];
cancelOrder({orderSn:item0.orderSn,orderRemark:value}).then(response => {
this.$modal.msgSuccess("操作成功" );
this.getList();
});
}).catch(() => {});
},
handleUpdate(row) {
this.$router.push({ path: '/orderMgnt/OrderRecord', query: { action:"modify",billCode: this.billCode }})
},