DeXun/klp-oa
10
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-05-12 10:11:38 +08:00
parent e7d7f86f40 a36d874652
commit 203633cd02
4 changed files with 122 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
klp-ui/src/views/wms/coil/do/correct.vue
View File

@@ -94,55 +94,6 @@
</el-table-column>
</KLPTable>
<!-- <coil-card v-for="(item, index) in materialCoilList" :key="item.coilId || index" :coil="item"
:card-style="getBorderStyle(item)">
<template slot="header">
<el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{
getTypeLabel(item) }}</el-tag>
<span class="material-type">{{ item.materialType || '原料' }}</span>
<i class="el-icon-view param-icon" @click="handlePreviewLabel(item)" title="查看标签"></i>
<i class="el-icon-time param-icon" @click="handleTrace(item)" title="追溯"></i>
</template>
<template slot="body">
<div class="info-list">
<div class="info-item">
<span class="info-label">入场：</span>
<span class="info-value" :title="item.enterCoilNo">{{ item.enterCoilNo || '—' }}</span>
</div>
<div class="info-item">
<span class="info-label">厂家：</span>
<span class="info-value" :title="item.supplierCoilNo">{{ item.supplierCoilNo || '—' }}</span>
</div>
<div class="info-item">
<span class="info-label">库位：</span>
<span class="info-value" :title="item.warehouseName">{{ item.warehouseName || '—' }}</span>
</div>
<div class="info-item">
<span class="info-label">规格：</span>
<span class="info-value" :title="item.specification">{{ item.specification || '—'
}}</span>
</div>
<div class="info-item">
<span class="info-label">重量：</span>
<span class="info-value">{{ item.netWeight || '—' }}t</span>
</div>
</div>
<el-button v-if="item.dataType == 1 && item.status == 0"
style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
size="mini" @click="handleRestoreMaterial(item)" :loading="item.cancelling"
class="action-btn">回滚</el-button>
<el-button v-if="item.dataType == 10 && item.status == 0"
style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
size="mini" @click="handleForceInMaterial(item)" :loading="item.cancelling"
class="action-btn">强制入库</el-button>
</template>
<template slot="footer">
<el-button type="primary" icon="el-icon-check" size="mini" @click="handleCorrectMaterial(item)"
:loading="item.picking" class="action-btn">修正</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(item)"
:loading="item.picking" class="action-btn">删除</el-button>
</template>
</coil-card> -->
</div>
<!-- 分页 -->
@@ -315,6 +266,8 @@
<el-dialog title="钢卷追溯" :visible.sync="traceOpen" width="90%" append-to-body>
<coil-trace-result v-loading="traceLoading" :trace-result="traceResult"></coil-trace-result>
</el-dialog>
<label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
</div>
</template>
@@ -612,6 +565,16 @@ export default {
path: '/wms/coil/' + row.coilId,
});
},
// 打印标签
handlePrintLabel(row) {
this.labelRender.data = {
...row,
updateTime: row.updateTime?.split(' ')[0] || '',
};
this.$nextTick(() => {
this.$refs.labelRender.printLabel();
})
},
/** 新增按钮操作 */
handleAdd() {
this.reset();

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

@@ -61,9 +61,8 @@
size="mini" icon="el-icon-view" @click="handlePreviewLabel(scope.row)" title="预览标签">预览</el-button>
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
size="mini" icon="el-icon-printer" @click="handlePrintLabel(scope.row)" title="打印标签">打印</el-button>
<el-button size="mini" type="default" style="margin-left: 0px; padding: 4px !important;" icon="el-icon-view" @click="handleNumberCoilClick(scope.row)">
数字钢卷
</el-button>
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
size="mini" icon="el-icon-printer" @click="handleNumberCoilClick(scope.row)" title="数字钢卷">数字钢卷</el-button>
<el-button type="warning" icon="el-icon-time" size="mini" @click="handleTrace(scope.row)"
:loading="scope.row.picking" class="action-btn">追溯</el-button>
@@ -80,57 +79,7 @@
:loading="scope.row.cancelling" class="action-btn">强制入库</el-button>
</template>
</el-table-column>
</KLPTable>
<!-- <div v-if="materialCoilList.length === 0" class="empty-state">
<i class="el-icon-box"></i>
<p>未找到钢卷数据</p>
</div>
<coil-card v-for="(item, index) in materialCoilList" :key="item.coilId || index" :coil="item"
:card-style="getBorderStyle(item)">
<template slot="header">
<el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{
getTypeLabel(item) }}</el-tag>
<span class="material-type">{{ item.materialType || '原料' }}</span>
<i class="el-icon-view param-icon" @click="handlePreviewLabel(item)" title="查看标签"></i>
<i class="el-icon-time param-icon" @click="handleTrace(item)" title="追溯"></i>
</template>
<template slot="body">
<div class="info-list">
<div class="info-item">
<span class="info-label">入场：</span>
<span class="info-value" :title="item.enterCoilNo">{{ item.enterCoilNo || '—' }}</span>
</div>
<div class="info-item">
<span class="info-label">厂家：</span>
<span class="info-value" :title="item.supplierCoilNo">{{ item.supplierCoilNo || '—' }}</span>
</div>
<div class="info-item">
<span class="info-label">库位：</span>
<span class="info-value" :title="item.warehouseName">{{ item.warehouseName || '—' }}</span>
</div>
<div class="info-item">
<span class="info-label">规格：</span>
<span class="info-value" :title="item.specification">{{ item.specification || '—'
}}</span>
</div>
<div class="info-item">
<span class="info-label">重量：</span>
<span class="info-value">{{ item.netWeight || '—' }}t</span>
</div>
</div>
<el-button v-if="item.dataType == 1 && item.status == 0"
style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh" size="mini"
@click="handleRestoreMaterial(item)" :loading="item.cancelling" class="action-btn">回滚</el-button>
<el-button v-if="item.dataType == 10 && item.status == 0"
style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh" size="mini"
@click="handleForceInMaterial(item)" :loading="item.cancelling" class="action-btn">强制入库</el-button>
</template>
<template slot="footer">
<el-button type="primary" icon="el-icon-check" size="mini" @click="handleCorrectMaterial(item)"
:loading="item.picking" class="action-btn">修正</el-button>
</template>
</coil-card> -->
</div>
</div>
@@ -275,6 +224,8 @@
<label-render :content="labelRender.data" :labelType="labelRender.type" />
</el-dialog>
<label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
<!-- 钢卷修正对话框 -->
<el-dialog :title="title" :visible.sync="correctVisible" width="600px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -603,12 +554,6 @@ export default {
}
return '物品类型';
},
// 进入数字钢卷页面
handleNumberCoilClick(row) {
this.$router.push({
path: '/wms/coil/' + row.coilId,
});
},
// 分条操作列表（100-199）
splitTypes() {
if (!this.dict.type.action_type) return [];
@@ -648,6 +593,25 @@ export default {
})
},
// 打印标签
handlePrintLabel(row) {
this.labelRender.data = {
...row,
updateTime: row.updateTime?.split(' ')[0] || '',
};
this.$nextTick(() => {
this.$refs.labelRender.printLabel();
})
},
// 进入数字钢卷页面
handleNumberCoilClick(row) {
console.log(row)
this.$router.push({
path: '/wms/coil/' + row.coilId,
});
},
// 处理材料类型变化
handleMaterialTypeChange(value) {
// 清空物品选择
@@ -663,6 +627,7 @@ export default {
/** 预览标签 */
handlePreviewLabel(row) {
console.log(row)
this.labelRender.visible = true;
const type = getCoilTagPrintType(row);
this.labelRender.type = type;

2
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -609,7 +609,7 @@
</el-dialog>
<!-- 钢卷暂存单据管理 -->
<el-card class="box-card" style="margin-top: 20px;" :body-style="{ padding: '20px' }">
<el-card v-if="moreColumn" class="box-card" style="margin-top: 20px;" :body-style="{ padding: '20px' }">
<div slot="header" class="clearfix">
<span>钢卷暂存单据管理</span>
<el-button style="float: right; padding: 3px 0" type="text" @click="createTempOrder">创建暂存单据</el-button>

107
klp-ui/src/views/wms/processSpec/index.vue
View File

@@ -3,25 +3,29 @@
<!-- 头部 -->
<div class="page-header">
<span class="page-title">规程版本管理</span>
<el-button
type="primary"
size="small"
icon="el-icon-plus"
style="margin-left:auto"
@click="openSpecDialog()"
>新建规程</el-button>
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left:auto"
@click="openSpecDialog()">新建规程</el-button>
</div>
<div>
<el-form>
<el-form-item label="规程类型">
<dict-select @change="loadSpecs" renderType="radio" v-model="queryParams.specType"
dict-type="wms_process_spec_type" :kisv="false" :editable="true"></dict-select>
</el-form-item>
<el-form-item label="产线">
<dict-select @change="loadSpecs" renderType="radio" v-model="queryParams.lineId"
dict-type="wms_process_spec_line" :kisv="false" :editable="true"></dict-select>
</el-form-item>
</el-form>
</div>
<!-- 规程列表 -->
<div class="section-wrapper">
<div class="section-title">规程列表</div>
<el-table
:data="specList"
size="small"
highlight-current-row
@row-click="onSpecRowClick"
:row-class-name="tableRowClassName"
>
<el-table :data="specList" size="small" highlight-current-row @row-click="onSpecRowClick"
:row-class-name="tableRowClassName">
<el-table-column label="规程编码" prop="specCode" width="150" />
<el-table-column label="规程名称" prop="specName" />
<el-table-column label="创建时间" prop="createTime" width="180" />
@@ -32,36 +36,25 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="loadSpecs" />
</div>
<!-- 版本列表 -->
<div class="section-wrapper" v-if="currentSpec">
<div class="section-wrapper" v-if="currentSpec" v-loading="versionLoading">
<div class="section-title">
版本列表 - {{ currentSpec.specName }}
<el-button
type="primary"
size="mini"
icon="el-icon-plus"
@click="openVersionDialog()"
>新建版本</el-button>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="openVersionDialog()">新建版本</el-button>
</div>
<el-table
:data="versionList"
size="small"
highlight-current-row
@row-click="onVersionRowClick"
>
<el-table :data="versionList" size="small" highlight-current-row @row-click="onVersionRowClick">
<el-table-column label="版本号" prop="versionCode" />
<el-table-column label="状态" prop="status" />
<el-table-column label="创建时间" prop="createTime" />
<el-table-column label="生效" align="center">
<template slot-scope="{ row }">
<el-switch
:value="row.isActive === 1"
active-color="#5F7BA0"
@click.native.stop
@change="handleActiveChange(row, $event)"
/>
<el-switch :value="row.isActive === 1" active-color="#5F7BA0" @click.native.stop
@change="handleActiveChange(row, $event)" />
</template>
</el-table-column>
<el-table-column label="操作" align="right">
@@ -142,6 +135,15 @@ export default {
versionLoading: false,
statusOptions: ['DRAFT', 'PUBLISHED', 'OBSOLETE'],
// 分页相关
total: 0,
queryParams: {
pageNum: 1,
pageSize: 10,
specType: '',
lineId: ''
},
// 规程相关
specOpen: false,
specTitle: '',
@@ -175,10 +177,15 @@ export default {
// 加载规程列表
loadSpecs() {
this.pageLoading = true
listProcessSpec({ pageNum: 1, pageSize: 500 }).then(res => {
listProcessSpec(this.queryParams).then(res => {
this.total = res.total || 0
this.specList = res.rows || []
if (this.specList.length > 0 && !this.currentSpec) {
this.selectSpec(this.specList[0])
} else {
this.currentSpec = null
this.currentSpecId = null
this.versionList = []
}
}).catch(e => console.error(e)).finally(() => { this.pageLoading = false })
},
@@ -370,23 +377,43 @@ export default {
background: #5F7BA0 !important;
border-color: #5F7BA0 !important;
}
::v-deep .el-button--primary:hover,
::v-deep .el-button--primary:focus { background: #4d6a8e !important; border-color: #4d6a8e !important; }
::v-deep .el-button--primary:active { background: #4a6585 !important; border-color: #4a6585 !important; }
::v-deep .el-button--primary.is-disabled { opacity: .5; }
::v-deep .el-button--primary:focus {
background: #4d6a8e !important;
border-color: #4d6a8e !important;
}
::v-deep .el-button--primary:active {
background: #4a6585 !important;
border-color: #4a6585 !important;
}
::v-deep .el-button--primary.is-disabled {
opacity: .5;
}
::v-deep .el-button:not(.el-button--primary):not(.el-button--text):not(.el-button--danger) {
color: #606266 !important;
background: #fff !important;
border-color: #dcdfe6 !important;
}
::v-deep .el-button:not(.el-button--primary):not(.el-button--text):not(.el-button--danger):hover {
color: #5F7BA0 !important;
border-color: #5F7BA0 !important;
}
::v-deep .el-button--text { background: transparent !important; border-color: transparent !important; }
::v-deep .el-button--text.btn-danger { color: #f56c6c !important; }
::v-deep .el-button--text {
background: transparent !important;
border-color: transparent !important;
}
.btn-danger { color: #f56c6c; }
::v-deep .el-button--text.btn-danger {
color: #f56c6c !important;
}
.btn-danger {
color: #f56c6c;
}
</style>