Skip to content

J
jiedao-app-operator-master
Commit 095cfff5 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents ecf1b9ec 0294d4de
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 58 deletions
src/api/ecw/financial.js
View file @ 095cfff5
......@@ -109,7 +109,7 @@ export function getReceivableItemDetail(query) {
// 获取收款单明细
export function getInvoicingItem(query) {
return request({
url: '/ecw/receipt/getInvoicingItem',
url: '/ecw/receipt/getReceivableItemDetail',
method: 'get',
params: query
})
......
src/api/ecw/order.js
View file @ 095cfff5
......@@ -189,6 +189,15 @@ export function getWarehouseUpdateApprovalInfo(id) {
})
}
// 获取最近的入仓修改审批单详情-修改页面使用
export function getWarehouseLastUpdateApprovalInfo(params) {
return request({
url: '/order/order-warehouse-in/get-last-update-approval-info',
method: 'get',
params
})
}
// 入仓完成
export function orderWarehouseInFinish(data){
return request({
......@@ -457,4 +466,4 @@ export function updateApply(data){
method:'put',
data
})
}
\ No newline at end of file
}
src/utils/dict.js
View file @ 095cfff5
......@@ -198,6 +198,7 @@ export const DICT_TYPE = {
BOX_SHIPPING_PROCESS: 'shipping_process', // 海运出货流程
BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型
BOX_SHIPPING_NOTICE_TYPE: 'shipping_notice_type', // 出货通知类型
BOX_ORDER_SHIPMENT_STATE: 'order_shipment_state'
}
/**
......
src/views/ecw/bannerPop/index.vue
View file @ 095cfff5
......@@ -61,7 +61,7 @@
<span>{{ formatTime(scope.row.validateStart) }}~{{ formatTime(scope.row.validateEnd) }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span>{{ statusName(scope.row.status) }}</span>
......@@ -73,11 +73,11 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:banner-pop:update']">修改</el-button>
v-hasPermi="['ecw:banner-pop:update']">修改</el-button>
<el-button size="mini" type="text" @click="handleStatus(scope.row)"
v-hasPermi="['ecw:banner-pop:update']">{{scope.row.status == CommonStatusEnum.ENABLE ? '禁用' : '启用'}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
......@@ -101,16 +101,16 @@
<el-form-item label="有效期" prop="validateStart">
<el-date-picker v-model="form.validateStart" @change="startChange"
type="date"
placeholder="选择日期">
placeholder="选择日期" value-format="yyyy-MM-dd">
</el-date-picker>
~
<el-date-picker v-model="form.validateEnd"
type="date"
placeholder="选择日期">
placeholder="选择日期" value-format="yyyy-MM-dd">
</el-date-picker>
<span style="color:red;font-size:14px;">注意：留空则表示永久有效</span>
</el-form-item>
<el-form-item label="网页中文" prop="htmlWebZh">
<editor v-model="form.htmlWebZh" :min-height="150"/>
</el-form-item>
......@@ -216,7 +216,7 @@ export default {
}
}
},
},
computed: {
......@@ -291,7 +291,7 @@ export default {
/**开始日期变了 */
startChange(val) {
},
/** 搜索按钮操作 */
......
src/views/ecw/box/indexSea.vue
View file @ 095cfff5
......@@ -17,7 +17,7 @@
</el-form-item>
<el-form-item :label="$t('柜型')" prop="cabinetId">
<el-select v-model="queryParams.cabinetId" :placeholder="$t('请选择柜型')">
<el-option v-for="item in cabinetList" :label="$l(item, 'name')" :value="item.name" :key="item.id"></el-option>
<el-option v-for="item in cabinetList" :label="$l(item, 'name')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
......@@ -43,9 +43,9 @@
<el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<el-form-item :label="$t('状态')" prop="boxStatus">
<el-form-item :label="$t('状态')">
<el-select v-model="queryParams.boxStatus" :placeholder="$t('请选择状态')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_SHIPMENT_STATUS)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_ORDER_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
</el-select>
</el-form-item>
......@@ -432,7 +432,7 @@ export default {
case "editLadingBill":
const cabinetLabel = this.getCabinetName(row.cabinetId);
const title = this.$t('查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}`', {
const title = this.$t('查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}', {
selfNo: row.selfNo,
cubNo: row.cubNo,
cabinetLabel: cabinetLabel
......
src/views/ecw/box/ladingBill/index.vue
View file @ 095cfff5
......@@ -145,9 +145,10 @@ export default {
/* const title = `查看提单 ${this.shipmentObj.selfNo ?? ""} 柜号：${
this.shipmentObj.cubNo ?? ""
} 柜型：${cabinetLabel}`; */
const title = this.$t('查看提单 {selfNo} 柜号：{cubNo}', {
const title = this.$t('查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}', {
selfNo: this.shipmentObj.selfNo,
cubNo: this.shipmentObj.cubNo
cubNo: this.shipmentObj.cubNo,
cabinetLabel
})
this.$set(this.dialogCfg, "title", title);
},
......
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @ 095cfff5
......@@ -154,7 +154,7 @@
</template>
</el-table-column>
<el-table-column :label="$t('计划装柜')" align="center">
{{$t('无')}}
{{planCabinet}}
</el-table-column>
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
......@@ -196,7 +196,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="剩余箱数:">
{{shopForm.sum||0}}
{{shopForm.num||0}}
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -205,8 +205,8 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="放入箱数:" prop="num">
<el-input-number v-model="shopForm.num" controls-position="right" :min="0" :max="shopForm.sum"></el-input-number>
<el-form-item label="放入箱数:">
{{shopForm.num||0}}
</el-form-item>
<el-form-item label="放入数量(个):" prop="putQuantity">
<el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
......@@ -255,6 +255,7 @@ export default {
loading: false,
selectedUsers: [],
tradeCityList: [],
planCabinet: "",
shopOpen: false,
orderItems: [],
......@@ -275,9 +276,6 @@ export default {
trigger: "change",
},
],
num: [
{ required: true, message: this.$t("请输入箱数"), trigger: "change" },
],
},
queryParams: {
orderId: 0,
......@@ -286,6 +284,8 @@ export default {
};
},
created() {
const { shipmentObj } = this.$attrs;
this.planCabinet =`${shipmentObj.selfNo}-${this.currRow.sectionName}`
getTradeCityList().then((res) => (this.tradeCityList = res.data));
this.queryParams.orderId = this.currRow.orderId;
this.getOrderDetail();
......@@ -341,16 +341,14 @@ export default {
/* 打开拆单 */
getSplit() {
this.orderItems = this.currRow.goodsList ?? [];
console.log(this.orderItems);
const { shipmentObj } = this.$attrs;
splitList({
orderId: this.currRow.orderId,
shipmentId: shipmentObj.id,
}).then((res) => {
const orderSplitBackVOList = res.data;
const data = res.data;
// 取拆单项
this.splitData =
orderSplitBackVOList.filter((item) => !item.isMaster)?.[0] ?? {};
this.splitData = data.filter((item) => !item.isMaster)?.[0] ?? {};
});
},
/* 查询拆单项 */
......@@ -448,33 +446,34 @@ export default {
this.shopForm = {};
this.shopOpen = true;
},
changeProdTitleZh() {
const data = this.getSelectData("zhId");
this.shopForm.prodTitleEn = data.prodTitleEn;
async changeProdTitleZh() {
const data = await this.getSelectData("zhId");
this.shopForm.enId = data.id;
this.shopForm = { ...this.shopForm };
},
changeProdTitleEn() {
const data = this.getSelectData("enId");
this.shopForm.prodTitleZh = data.prodTitleZh;
async changeProdTitleEn() {
const data = await this.getSelectData("enId");
this.shopForm.zhId = data.id;
this.shopForm = { ...this.shopForm };
},
async getSelectData(key) {
let list = [];
list = this.orderItems.filter((item) => item.id == this.shopForm[key]);
this.shopForm.sum =
this.currRow.num - this.currRow.installNum - this.totalSplitNum();
this.shopForm.num = this.currRow.num - this.currRow.installNum;
const data = list[0];
this.shopForm.orderItemId = data.orderItemId;
this.shopForm.quantity = data.quantity;
this.shopForm.putQuantity = Decimal.div(
data.quantity,
this.shopForm.sum
this.shopForm.num
).toFixed(0);
await quantitycheck({
seaFreightVolume: data.seaFreightVolume,
clearanceFreightVolume: data.clearanceFreightVolume,
}).then((res) => {
const { data } = res;
if (data) {
if (res.data) {
this.shopRules.putQuantity = [
{
required: true,
......
src/views/ecw/box/shippingSea/utils.js
View file @ 095cfff5
......@@ -2,7 +2,7 @@ import dayjs from "dayjs";
import * as _BOX from "@/api/ecw/box";
import FileSaver from "file-saver";
import Decimal from "decimal.js";
import i18n from '@/i18n'
import i18n from "@/i18n";
/**
* 节点状态值
*
......@@ -1510,8 +1510,15 @@ function toReviewDetail(bpmProcessId) {
function downloadFile(funName, params, fileName, fileFormat) {
_BOX[funName](params).then((res) => {
let blob = new Blob([res], { type: `application/${fileFormat}` });
FileSaver.saveAs(blob, fileName);
try {
let jsonData = JSON.parse(res);
if (jsonData.code === 0) {
window.ElementUI.$message.success("操作成功");
}
} catch (error) {
let blob = new Blob([res], { type: `application/${fileFormat}` });
FileSaver.saveAs(blob, fileName);
}
});
}
......
src/views/ecw/customer/edit.vue
View file @ 095cfff5
......@@ -638,9 +638,7 @@ export default {
// this.getList();
const obj = { path: "/customer/customer" };
this.$tab.closeOpenPage(obj);
}).catch(e => {
this.$modal.msgError(e.msg || this.$t('添加客户失败，请联系管理员'))
});
})
return;
}
// 添加的提交
......@@ -650,9 +648,7 @@ export default {
// this.getList();
const obj = { path: "/customer/customer" };
this.$tab.closeOpenPage(obj);
}).catch(e => {
this.$modal.msgError(e.msg || this.$t('添加客户失败，请联系管理员'))
});
})
});
})
},
......
src/views/ecw/order/special/Discount.vue
View file @ 095cfff5
......@@ -18,7 +18,7 @@
<el-form-item :label="$t('是否预付')">
<dict-tag :type="DICT_TYPE.ECW_YESNO" :value="orderItem.isPayAdvance" />
</el-form-item>
<el-row v-if="!orderItem.charging">
<el-col :span="12">
<el-form-item :label="$t('旧运费')">
......@@ -45,15 +45,15 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item :label="$t('旧全包价')" v-if="orderItem.charging">
{{form.freight}} {{ currentMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
{{form.orgFreight}} {{ currentMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
</el-form-item>
<el-form-item :label="$t('新全包价')" style="width: 400px" prop="clearanceFreight" v-if="orderItem.charging">
<el-input v-model="form.freight" type="number" class="w-100" />
{{ currentMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
</el-form-item>
</el-form>
<div class="page-title">审批流程</div>
<work-flow xmlkey="special_apply" v-model="ccIdArr" />
......
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ 095cfff5
......@@ -343,13 +343,13 @@
</div>
<span slot="footer">
<template v-if="true">
<template v-if="!isEditing">
<el-button @click="opened = false">关 闭</el-button>
<el-button type="primary" @click="handleSubmit()">{{ edit ? '确认修改' : '提 交' }}</el-button>
</template>
<template v-else>
<el-button type="primary">审核中</el-button>
<el-button type="primary">取消审核</el-button>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + formId)">审核中</el-button>
<el-button type="primary" @click="handleCancelProcessInstance">取消审核</el-button>
<el-button @click="opened = false">返回</el-button>
</template>
<template v-else>
......@@ -363,10 +363,11 @@
<script>
import dictSelector from "@/components/DictSelector"
import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
import { orderWarehouseIn, orderWarehouseInUpdateApply } from '@/api/ecw/order'
import {getWarehouseLastUpdateApprovalInfo, orderWarehouseIn, orderWarehouseInUpdateApply} from '@/api/ecw/order'
import { getFeeTypeByOrderProduct, getProductBrankPage } from '@/api/ecw/productBrank'
import WorkFlow from "@/components/WorkFlow"
import ProductSelector from "@/components/ProductSelector"
import {cancelProcessInstance} from "@/api/bpm/processInstance"
export default {
name: 'editDialog',
......@@ -480,7 +481,12 @@ export default {
selectedUsers: undefined,
activeName: 'first'
activeName: 'first',
// 入仓修改正在审核中
isEditing: false,
// 审批业务id
formId: ''
};
},
......@@ -500,6 +506,15 @@ export default {
this.form.material = this.warehousing.material
this.form.brand = this.warehousing.brand?.toString() || ''
this.handleBrandChange(this.form.brand)
getWarehouseLastUpdateApprovalInfo({
orderItemId: this.warehousing.orderItemId,
orderId: this.warehousing.orderId
}).then(r => {
if (r.data && r.data.status === 1 && r.data.type === 1){
this.isEditing = true
this.formId = r.data.formId
}
})
} else {
this.$emit('update:visible', false)
}
......@@ -518,6 +533,20 @@ export default {
},
methods: {
handleCancelProcessInstance(){
this.$prompt('请输入取消原因？', "取消流程", {
type: 'warning',
confirmButtonText: "确定",
cancelButtonText: "取消",
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
inputErrorMessage: "取消原因不能为空",
}).then(({ value }) => {
cancelProcessInstance(this.formId, value).then(() => {
this.opened = false
this.$modal.msgSuccess("取消成功");
})
})
},
onProductChange(product){
this.form1.prodTitleZh = product.titleZh
this.form1.prodTitleEn = product.titleEn
......
src/views/member/user/underReview.vue
View file @ 095cfff5
......@@ -70,9 +70,9 @@
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<el-table-column :label="$t('提交审核时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<span>{{ parseTime(scope.row.identityAuditCreateTime) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
......
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