DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-03-28 16:39:41 +08:00
parent c3f2f5ef83 8d6c3302a3
commit 086d01fa3f
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
klp-ui/src/views/wms/coil/do/correntAll.vue
View File

@@ -238,12 +238,15 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="操作类型" align="center" prop="actionType" width="160"> <el-table-column label="操作类型" align="center" prop="actionType" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.actionType === 401">入库/收货操作</span> <el-select @change="handleStatusChange(scope.row)" v-model="scope.row.actionType" placeholder="请选择操作类型" clearable filterable>
<span v-else-if="scope.row.actionType === 402">发货操作</span> <el-option label="入库/收货操作" :value="401" />
<span v-else-if="scope.row.actionType === 403">移库操作</span> <el-option label="发货操作" :value="402" />
<span v-else-if="scope.row.actionType === 404">通过库区编辑钢卷</span> <el-option label="移库操作" :value="403" />
<span v-else-if="scope.row.actionType === 405">钢卷打包</span> <el-option label="通过库区编辑钢卷" :value="404" />
<dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType"></dict-tag> <el-option label="钢卷打包" :value="405" />
<el-option v-for="item in dict.type.action_type" :key="item.value" :label="item.label"
:value="parseInt(item.value)" />
</el-select>
</template> </template>
</el-table-column> </el-table-column>
@@ -744,7 +747,7 @@ export default {
this.materialQueryParams.pageNum = 1; this.materialQueryParams.pageNum = 1;
this.searched = true; this.searched = true;
this.getMaterialCoil(); this.getMaterialCoil();
// 同时获取操作记录 // 同时获取操作记录
// if (this.materialCoilList.length > 0) { // if (this.materialCoilList.length > 0) {
// this.currentCoilId = this.materialCoilList[0].coilId; // this.currentCoilId = this.materialCoilList[0].coilId;

17
klp-ui/src/views/wms/coil/docorrent.vue
View File

@@ -53,12 +53,20 @@
<el-table-column label="操作类型" align="center" prop="actionType" width="160"> <el-table-column label="操作类型" align="center" prop="actionType" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.actionType === 401">入库/收货操作</span> <el-select @change="handleStatusChange(scope.row)" v-model="scope.row.actionType" placeholder="请选择操作类型" clearable filterable>
<el-option label="入库/收货操作" :value="401" />
<el-option label="发货操作" :value="402" />
<el-option label="移库操作" :value="403" />
<el-option label="通过库区编辑钢卷" :value="404" />
<el-option label="钢卷打包" :value="405" />
<el-option v-for="item in dict.type.action_type" :key="item.value" :label="item.label" :value="parseInt(item.value)" />
</el-select>
<!-- <span v-if="scope.row.actionType === 401">入库/收货操作</span>
<span v-else-if="scope.row.actionType === 402">发货操作</span> <span v-else-if="scope.row.actionType === 402">发货操作</span>
<span v-else-if="scope.row.actionType === 403">移库操作</span> <span v-else-if="scope.row.actionType === 403">移库操作</span>
<span v-else-if="scope.row.actionType === 404">通过库区编辑钢卷</span> <span v-else-if="scope.row.actionType === 404">通过库区编辑钢卷</span>
<span v-else-if="scope.row.actionType === 405">钢卷打包</span> <span v-else-if="scope.row.actionType === 405">钢卷打包</span>
<dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType"></dict-tag> <dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType"></dict-tag> -->
</template> </template>
</el-table-column> </el-table-column>
@@ -70,10 +78,6 @@
<el-option label="已完成" :value="2" /> <el-option label="已完成" :value="2" />
<el-option label="已取消" :value="3" /> <el-option label="已取消" :value="3" />
</el-select> </el-select>
<!-- <el-tag v-if="scope.row.actionStatus === 0" type="info" size="small">待处理</el-tag>
<el-tag v-else-if="scope.row.actionStatus === 1" type="warning" size="small">处理中</el-tag>
<el-tag v-else-if="scope.row.actionStatus === 2" type="success" size="small">已完成</el-tag>
<el-tag v-else-if="scope.row.actionStatus === 3" type="danger" size="small">已取消</el-tag> -->
</template> </template>
</el-table-column> </el-table-column>
@@ -108,7 +112,6 @@
<el-select @change="handleProcessTimeChange(scope.row)" v-model="scope.row.createBy" placeholder="请选择创建人" filterable> <el-select @change="handleProcessTimeChange(scope.row)" v-model="scope.row.createBy" placeholder="请选择创建人" filterable>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userName" /> <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userName" />
</el-select> </el-select>
<!-- <span>{{ scope.row.createByName }}</span> -->
</template> </template>
</el-table-column> </el-table-column>