Skip to content

J
jiedao-app-operator-master
Commit 1e41f77c authored by dcy's avatar dcy
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents ef265646 756b93ff
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 99 deletions
src/views/bpm/task/done.vue
View file @ 1e41f77c
......@@ -2,42 +2,51 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="流程编号" prop="processInstanceId">
<el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('任务名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入任务名称')" clearable @keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.name" :placeholder="$t('任务名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('流程分类')" prop="category">
<el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('业务编号')" prop="businessNo">
<el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item :label="$t('流程编号')" prop="name">
缺少字段
</el-form-item> -->
<!-- <el-form-item :label="$t('流程分类')" prop="name">
缺少字段
</el-form-item> -->
<el-form-item :label="$t('提交时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"/>
</el-form-item>
<!-- <el-form-item :label="$t('业务编号')" prop="name">
缺少字段
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item>
</el-form>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed />
<el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200" />
<!-- <el-table-column :label="$t('业务编号')" align="center" prop="" width="200" >
缺少字段
</el-table-column> -->
<el-table-column :label="$t('流程分类')" align="center" prop="category" width="200" />
<el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200" />
<el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed/>
<el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200"/>
<el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
<el-table-column :label="$t('流程分类')" align="center" prop="category" width="200">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
</template>
</el-table-column>
<el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200"/>
<!-- <el-table-column :label="$t('状态')" align="center" prop="" width="200" >
缺少字段
</el-table-column> -->
<el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120" />
<el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120"/>
<el-table-column :label="$t('结果')" align="center" prop="result">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
......@@ -56,7 +65,8 @@
<el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
v-hasPermi="['bpm:task:query']">{{$t('详情')}}</el-button>
v-hasPermi="['bpm:task:query']">{{ $t('详情') }}
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -73,8 +83,7 @@ import {getDate} from "@/utils/dateUtils";
export default {
name: "Done",
components: {
},
components: {},
data() {
return {
// 遮罩层
......@@ -126,7 +135,7 @@ export default {
},
/** 处理审批按钮 */
handleAudit(row) {
this.$router.push({ path: "/bpm/process-instance/detail", query: { id: row.processInstance.id}});
this.$router.push({path: "/bpm/process-instance/detail", query: {id: row.processInstance.id}});
},
}
};
......
src/views/bpm/task/todo.vue
View file @ 1e41f77c
......@@ -2,12 +2,13 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('流程名')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('请输入流程名')" clearable @keyup.enter.native="handleQuery"/>
<el-form-item label="流程编号" prop="processInstanceId">
<el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('任务名称')" prop="name">
<el-input v-model="queryParams.name" :placeholder="$t('任务名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!-- <el-form-item label="编号" prop="name">
缺少字段
</el-form-item> -->
<el-form-item :label="$t('流程分类')" prop="category">
<el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
......@@ -15,57 +16,63 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('业务编号')" prop="businessNo">
<el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
@keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('提交时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')"/>
type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
:end-placeholder="$t('结束日期')"/>
</el-form-item>
<el-form-item :label="$t('业务编号')" prop="businessNo">
<el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
</el-form-item>
</el-form>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('编号')" align="center" prop="id" width="320"/>
<el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="320"/>
<el-table-column :label="$t('任务编号')" align="center" prop="id" width="320"/>
<el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="320"/>
<el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
<el-table-column :label="$t('流程分类')" align="center" prop="category">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
</template>
</el-table-column>
<el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
<el-table-column :label="$t('当前审批节点')" align="center" prop="name"/>
<el-table-column :label="$t('状态')" align="center" prop="version" width="80">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.suspensionState === 1">{{$t('激活')}}</el-tag>
<el-tag type="warning" v-if="scope.row.suspensionState === 2">{{$t('挂起')}}</el-tag>
<el-tag type="success" v-if="scope.row.suspensionState === 1">{{ $t('激活') }}</el-tag>
<el-tag type="warning" v-if="scope.row.suspensionState === 2">{{ $t('挂起') }}</el-tag>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('结果')" align="center" prop="processInstance.startUserNickname">
缺少字段
</el-table-column> -->
<el-table-column :label="$t('结果')" align="center" prop="result">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
</template>
</el-table-column>
<el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</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.endTime) }}</span>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
v-hasPermi="['bpm:task:update']">{{$t('审批')}}
v-hasPermi="['bpm:task:update']">{{ $t('审批') }}
</el-button>
</template>
</el-table-column>
......
src/views/ecw/box/indexSea.vue
View file @ 1e41f77c
......@@ -124,7 +124,7 @@
<el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
<el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
<el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
<el-dropdown-item v-if="scope.row.ldStatus>42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.ldStatus<42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">
......
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @ 1e41f77c
......@@ -193,12 +193,24 @@
<el-option v-for="item in orderItems" :label="item.prodTitleEn" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="剩余箱数:">
{{shopForm.sum||0}}
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="剩余箱数:">
{{shopForm.sum||0}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="剩余数量(个):">
{{shopForm.quantity||0}}
</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>
<el-form-item label="放入数量(个):" prop="putQuantity">
<el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="备注信息:">
<el-input v-model="shopForm.remarks"></el-input>
</el-form-item>
......@@ -215,7 +227,7 @@
<script>
import {
getSplitList,
createSplit,
quantitycheck,
createSplitItem,
deleteSplitItem,
} from "@/api/ecw/orderHandle";
......@@ -329,18 +341,16 @@ 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;
if (orderSplitBackVOList && orderSplitBackVOList.length) {
// 取拆单项
this.splitData = orderSplitBackVOList.filter(
(item) => !item.isMaster
)[0];
}
// 取拆单项
this.splitData =
orderSplitBackVOList.filter((item) => !item.isMaster)?.[0] ?? {};
});
},
/* 查询拆单项 */
......@@ -350,16 +360,12 @@ export default {
orderId: this.currRow.orderId,
shipmentType: 1,
}).then((res) => {
console.log(res)
const { orderSplitBackVOList } = res.data;
if (orderSplitBackVOList && orderSplitBackVOList.length) {
this.orderItems = this.currRow.goodsList ?? [];
console.log(this.orderItems);
// 取拆单项
this.splitData = orderSplitBackVOList.filter(
(item) => !item.isMaster
)[0];
}
const { orderSplitBackVOList } = res.data; // 取拆单项
const list =
orderSplitBackVOList.filter((item) => !item.isMaster)?.[0] ?? {};
this.splitData.orderSplitItemBackVOList =
list.orderSplitItemBackVOList ?? [];
});
},
getOrderDetail() {
......@@ -414,20 +420,6 @@ export default {
leviteW,
}
);
/* "下单统计：" +
orderSum +
" 箱 " +
orderV +
" m³ " +
orderW +
" kg " +
" 入仓统计：" +
leviteSum +
" 箱 " +
leviteV +
" m³ " +
leviteW +
" kg"; */
return sums;
},
......@@ -457,20 +449,44 @@ export default {
this.shopOpen = true;
},
changeProdTitleZh() {
let list = [];
list = this.orderItems.filter((item) => item.id == this.shopForm.zhId);
this.shopForm.sum =
this.currRow.num - this.currRow.installNum - this.totalSplitNum();
this.shopForm.orderItemId = list[0].orderItemId;
this.shopForm.prodTitleEn = list[0].prodTitleEn;
const data = this.getSelectData("zhId");
this.shopForm.prodTitleEn = data.prodTitleEn;
},
changeProdTitleEn() {
const data = this.getSelectData("enId");
this.shopForm.prodTitleZh = data.prodTitleZh;
},
async getSelectData(key) {
let list = [];
list = this.orderItems.filter((item) => item.id == this.shopForm.enId);
list = this.orderItems.filter((item) => item.id == this.shopForm[key]);
this.shopForm.sum =
this.currRow.num - this.currRow.installNum - this.totalSplitNum();
this.shopForm.orderItemId = list[0].orderItemId;
this.shopForm.prodTitleZh = list[0].prodTitleZh;
const data = list[0];
this.shopForm.orderItemId = data.orderItemId;
this.shopForm.quantity = data.quantity;
this.shopForm.putQuantity = Decimal.div(
data.quantity,
this.shopForm.sum
).toFixed(0);
await quantitycheck({
seaFreightVolume: data.seaFreightVolume,
clearanceFreightVolume: data.clearanceFreightVolume,
}).then((res) => {
const { data } = res;
if (data) {
this.shopRules.putQuantity = [
{
required: true,
message: this.$t("请输入数量(个)"),
trigger: "change",
},
];
} else {
delete this.shopRules.putQuantity;
}
});
return data;
},
shopAdd() {
this.$refs["shopForm"].validate((valid) => {
......@@ -490,9 +506,14 @@ export default {
this.$message.error(this.$t("放入箱数不能为0"));
return;
}
if (this.shopForm.putQuantity === 0) {
this.$message.error(this.$t("放入数量(个)不能为0"));
return;
}
let params = {
num: this.shopForm.num,
quantity: this.shopForm.putQuantity,
orderItemId: this.shopForm.orderItemId,
orderSplitId: this.splitData.id,
remarks: this.shopForm.remarks,
......@@ -500,6 +521,7 @@ export default {
createSplitItem(params).then((res) => {
this.$message.success(this.$t("放入成功"));
this.querySplitGoods();
this.$refs["shopForm"].resetFields();
});
this.shopOpen = false;
}
......@@ -528,6 +550,7 @@ export default {
});
},
shopCancel() {
this.$refs["shopForm"].resetFields();
this.shopOpen = false;
this.shopForm = {};
},
......
src/views/ecw/deptTarget/myAchievement.vue
View file @ 1e41f77c
......@@ -12,12 +12,13 @@
:key="item.channelId"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('开始时间')" prop="beginStartTime">
<el-date-picker v-model="queryParams.beginStartTime" :placeholder="$t('请选择开始时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('结束时间')" prop="endStartTime">
<el-date-picker v-model="queryParams.endStartTime" :placeholder="$t('请选择结束时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<el-form-item>
<el-date-picker v-model="dateFilter" type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
<!-- <el-date-picker v-model="queryParams.beginStartTime" :placeholder="$t('请选择开始时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>-->
</el-form-item>
<!-- <el-form-item :label="$t('结束时间')" prop="endStartTime">-->
<!-- <el-date-picker v-model="queryParams.endStartTime" :placeholder="$t('请选择结束时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
</el-form-item>
......@@ -36,7 +37,7 @@
<dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="scope.row.offerStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('订单号')" align="center" prop="orderId"/>
<el-table-column :label="$t('订单号')" align="center" prop="orderNo"/>
<el-table-column :label="$t('发货人')" align="center" prop="consignorName"/>
<el-table-column :label="$t('唛头')" align="center" prop="marks"/>
<el-table-column :label="$t('是否控货')" align="center" prop="isCargoControl">
......@@ -93,6 +94,7 @@
tableList: [],
// 弹出层标题
title: "",
dateFilter:[],
detail: {
deptName: null,
targetType: null,
......@@ -214,6 +216,8 @@
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.queryParams.beginStartTime=this.dateFilter[0];
this.queryParams.endStartTime=this.dateFilter[1];
this.getList();
},
/** 重置按钮操作 */
......
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ 1e41f77c
......@@ -22,7 +22,7 @@
<span v-if="false">{{ form.brand ? brand : '无' }}</span>
<el-form-item required label="" prop="brand" label-width="0">
<el-select
v-model="form1.brand"
v-model="form.brand"
placeholder="可修改"
filterable
@change="handleBrandChange"
......
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