rev:表结构修改
This commit is contained in:
@@ -0,0 +1,199 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:visible.sync="dialogVisible"
|
||||
append-to-body
|
||||
fullscreen
|
||||
title="安全库存方案"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-card class="box-card" shadow="never">
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" disabled label-width="180px" size="mini">
|
||||
<el-form-item label="方案名称">
|
||||
<el-input v-model="form.alm_name" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库编码">
|
||||
<el-input v-model="form.stor_code" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="呆料天数">
|
||||
<el-input v-model="form.stay_days" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="报警通知类型">
|
||||
<el-input v-model="form.notice_type" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="描述">
|
||||
<el-input v-model="form.remark" type="textarea" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
|
||||
<span class="role-span">物料列表</span>
|
||||
<span class="crud-opts-right2">
|
||||
<!--左侧插槽-->
|
||||
<slot name="left" />
|
||||
<el-button
|
||||
slot="left"
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="queryDtl()"
|
||||
>
|
||||
添加物料
|
||||
</el-button>
|
||||
</span>
|
||||
|
||||
</div>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
:data="form.tableData"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
:highlight-current-row="true"
|
||||
border
|
||||
max-height="300"
|
||||
style="width: 100%;"
|
||||
>
|
||||
<el-table-column v-if="false" label="物料ID" prop="material_id" />
|
||||
<el-table-column label="物料编码" prop="material_code" />
|
||||
<el-table-column label="物料名称" prop="material_name" />
|
||||
<el-table-column label="物料规格" prop="material_spec" />
|
||||
<el-table-column label="物料型号" prop="material_model" />
|
||||
<el-table-column align="center" label="操作" width="160" fixed="right">
|
||||
<template scope="scope">
|
||||
<el-button
|
||||
type="danger"
|
||||
class="filter-item"
|
||||
size="mini"
|
||||
icon="el-icon-delete"
|
||||
@click.native.prevent="deleteRow(scope.$index, form.tableData)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
|
||||
<el-button type="primary" @click="submit">保 存</el-button>
|
||||
</span>
|
||||
<MaterialDtl ref="dtlRef" :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { crud } from '@crud/crud'
|
||||
import MaterialDtl from './MaterialDtl'
|
||||
import deferral_early from './deferral_early'
|
||||
|
||||
export default {
|
||||
name: 'EditDialog',
|
||||
components: { MaterialDtl },
|
||||
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
|
||||
mixins: [crud()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
bussConfig: {
|
||||
type: Object
|
||||
},
|
||||
openParam: {
|
||||
type: Object
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
form: {
|
||||
id: null,
|
||||
alm_name: null,
|
||||
stor_code: null,
|
||||
stay_days: null,
|
||||
notice_type: null,
|
||||
ext_json: null,
|
||||
is_used: null,
|
||||
remark: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
tableData: []
|
||||
},
|
||||
dtlShow: false,
|
||||
rules: {}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
setForm(row) {
|
||||
deferral_early.getDtl(row.id).then(res => {
|
||||
this.form.tableData = res
|
||||
})
|
||||
this.dialogVisible = true
|
||||
this.form.id = row.id
|
||||
this.form.alm_name = row.alm_name
|
||||
this.form.stor_code = row.stor_code
|
||||
this.form.safety_qty = row.safety_qty
|
||||
this.form.safety_day = row.safety_day
|
||||
this.form.expression = row.expression
|
||||
this.form.notice_type = row.notice_type
|
||||
this.form.ext_json = row.ext_json
|
||||
},
|
||||
open() {
|
||||
},
|
||||
close() {
|
||||
this.$emit('editChanged')
|
||||
},
|
||||
submit() {
|
||||
deferral_early.saveDtl(this.form).then(res => {
|
||||
this.$emit('editChanged')
|
||||
this.dialogVisible = false
|
||||
this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
})
|
||||
},
|
||||
async queryDtl() {
|
||||
this.$refs.dtlRef.setForm(this.form.tableData)
|
||||
this.dtlShow = true
|
||||
},
|
||||
deleteRow(index, rows) {
|
||||
rows.splice(index, 1)
|
||||
},
|
||||
tableChanged(rows) {
|
||||
const uniqueKey = 'material_id'
|
||||
const newDataMap = new Map(rows.map(row => [row[uniqueKey], row]))
|
||||
if (this.form.tableData.length > 0) {
|
||||
rows.forEach(row => {
|
||||
if (!this.form.tableData.some(dataRow => dataRow[uniqueKey] === row[uniqueKey])) {
|
||||
this.form.tableData.push(row)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.form.tableData = rows.slice() // 将 rows 中的数据复制到 tableData 中
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.crud-opts2 {
|
||||
padding: 0 0;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.crud-opts2 .crud-opts-right2 {
|
||||
margin-left: auto;
|
||||
padding: 4px 4px;
|
||||
}
|
||||
|
||||
.input-with-select {
|
||||
background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,164 @@
|
||||
<!--suppress ALL -->
|
||||
<template>
|
||||
<el-dialog
|
||||
title="物料信息"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
:show-close="false"
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-row>
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="80px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<el-form-item label="模糊查询">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
size="mini"
|
||||
placeholder="输入物料编码或名称"
|
||||
prefix-icon="el-icon-search"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
|
||||
</el-form>
|
||||
</el-row>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;"
|
||||
border
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
@select="select"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="material_code" label="物料编码" width="160" />
|
||||
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
|
||||
<el-table-column prop="material_spec" label="物料规格" width="140" />
|
||||
<el-table-column prop="material_model" label="物料型号" />
|
||||
<el-table-column prop="class_name" label="物料分类" width="140" />
|
||||
<el-table-column prop="unit_name" label="计量单位" />
|
||||
<el-table-column prop="net_weight" label="单重(g)" />
|
||||
<el-table-column prop="product_series_name" label="系列" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
|
||||
<el-button slot="left" type="primary" @click="submit">保存</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
|
||||
export default {
|
||||
name: 'AddDtl',
|
||||
components: { rrOperation, pagination },
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '物料信息', idField: 'material_id', url: 'api/bmMaterial',
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: false,
|
||||
del: false,
|
||||
reset: true,
|
||||
download: false
|
||||
}
|
||||
})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
openParam: {
|
||||
type: String
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
opendtlParam: '',
|
||||
rows: [],
|
||||
cacheRows: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue, oldValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
},
|
||||
openParam: {
|
||||
handler(newValue, oldValue) {
|
||||
this.opendtlParam = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
[CRUD.HOOK.afterRefresh]() {
|
||||
this.selectRows(this.cacheRows)
|
||||
},
|
||||
open() {
|
||||
this.crud.toQuery()
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
selectRows(rows) {
|
||||
const materialIds = rows.map(item => item.material_id)
|
||||
this.$nextTick(() => {
|
||||
this.crud.data.forEach(row => {
|
||||
if (materialIds.includes(row.material_id)) {
|
||||
this.$refs.table.toggleRowSelection(row, true)
|
||||
}
|
||||
})
|
||||
})
|
||||
this.crud.resetQuery(false)
|
||||
},
|
||||
setForm(rows) {
|
||||
this.cacheRows = rows
|
||||
this.selectRows(rows)
|
||||
},
|
||||
submit() {
|
||||
this.rows = this.$refs.table.selection
|
||||
if (this.rows.length <= 0) {
|
||||
this.$message('请先勾选物料信息')
|
||||
return
|
||||
}
|
||||
console.log(this.cacheRows)
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged', this.rows)
|
||||
},
|
||||
select(selections) {
|
||||
console.log('+++')
|
||||
console.log(selections)
|
||||
},
|
||||
handleSelectionChange(selections) {
|
||||
const unselectedRowsIds = this.cacheRows.flat().map(row => row.material_code).filter(material_code => !selections.map(row => row.material_code).includes(material_code))
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -38,7 +38,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudClassstandard from './formstruc'
|
||||
import crudClassstandard from './deferral_early'
|
||||
import CRUD, { crud } from '@crud/crud'
|
||||
import { download2 } from '@/api/data'
|
||||
import { downloadFile } from '@/utils'
|
||||
@@ -108,7 +108,6 @@ export default {
|
||||
this.$emit('tableChanged3', '')
|
||||
this.$emit('update:dialogShow', false)
|
||||
}).catch(err => {
|
||||
|
||||
const list = err.response.data.message
|
||||
download2('/api/produceWorkorder/download', list).then(result => {
|
||||
downloadFile(result, '错误信息汇总', 'xlsx')
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:visible.sync="dialogVisible"
|
||||
append-to-body
|
||||
fullscreen
|
||||
title="安全库存方案"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-card class="box-card" shadow="never">
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" disabled label-width="180px" size="mini">
|
||||
<el-form-item label="方案名称">
|
||||
<el-input v-model="form.alm_name" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库编码">
|
||||
<el-input v-model="form.stor_code" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="呆料天数">
|
||||
<el-input v-model="form.stay_days" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="报警通知类型">
|
||||
<el-input v-model="form.notice_type" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="描述">
|
||||
<el-input v-model="form.remark" type="textarea" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
|
||||
<span class="role-span">物料列表</span>
|
||||
<span class="crud-opts-right2">
|
||||
<!--左侧插槽-->
|
||||
<slot name="left" />
|
||||
</span>
|
||||
|
||||
</div>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
:data="form.tableData"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
:highlight-current-row="true"
|
||||
border
|
||||
max-height="300"
|
||||
style="width: 100%;"
|
||||
>
|
||||
<el-table-column v-if="false" label="物料ID" prop="material_id" />
|
||||
<el-table-column label="物料编码" prop="material_code" />
|
||||
<el-table-column label="物料名称" prop="material_name" />
|
||||
<el-table-column label="物料规格" prop="material_spec" />
|
||||
<el-table-column label="物料型号" prop="material_model" />
|
||||
</el-table>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { crud } from '@crud/crud'
|
||||
import deferral_early from './deferral_early'
|
||||
|
||||
export default {
|
||||
name: 'ViewDialog',
|
||||
components: {},
|
||||
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
|
||||
mixins: [crud()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
bussConfig: {
|
||||
type: Object
|
||||
},
|
||||
openParam: {
|
||||
type: Object
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
form: {
|
||||
id: null,
|
||||
alm_name: null,
|
||||
stor_code: null,
|
||||
stay_days: null,
|
||||
notice_type: null,
|
||||
ext_json: null,
|
||||
is_used: null,
|
||||
remark: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
tableData: []
|
||||
},
|
||||
rules: {}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
setForm(row) {
|
||||
deferral_early.getDtl(row.id).then(res => {
|
||||
this.form.tableData = res
|
||||
})
|
||||
this.dialogVisible = true
|
||||
this.form.id = row.id
|
||||
this.form.alm_name = row.alm_name
|
||||
this.form.stor_code = row.stor_code
|
||||
this.form.safety_qty = row.safety_qty
|
||||
this.form.safety_day = row.safety_day
|
||||
this.form.expression = row.expression
|
||||
this.form.notice_type = row.notice_type
|
||||
this.form.ext_json = row.ext_json
|
||||
},
|
||||
open() {
|
||||
},
|
||||
close() {
|
||||
this.$emit('AddChanged')
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.crud-opts2 {
|
||||
padding: 0 0;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.crud-opts2 .crud-opts-right2 {
|
||||
margin-left: auto;
|
||||
padding: 4px 4px;
|
||||
}
|
||||
|
||||
.input-with-select {
|
||||
background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,42 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/almEarlyDeferral',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/almEarlyDeferral/delete',
|
||||
method: 'get',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/almEarlyDeferral/update',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getDtl(id) {
|
||||
return request({
|
||||
url: 'api/almEarlyDeferral/dtl/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function saveDtl(data) {
|
||||
return request({
|
||||
url: 'api/almEarlyDeferral/saveDtl',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, getDtl, saveDtl }
|
||||
@@ -1,35 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/bmFormStruc',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/bmFormStruc/delete',
|
||||
method: 'get',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/bmFormStruc/update',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getTypes(params) {
|
||||
return request({
|
||||
url: 'api/bmFormStruc/getTypes',
|
||||
method: 'get',
|
||||
params
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, getTypes}
|
||||
@@ -11,21 +11,25 @@
|
||||
label-width="90px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<el-form-item label="表单类型">
|
||||
<el-form-item label="方案名称">
|
||||
<el-input v-model="query.search" style="width: 150px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库编码">
|
||||
<el-select
|
||||
v-model="query.form_type"
|
||||
v-model="query.stor_code"
|
||||
placeholder="请选择类型"
|
||||
clearable
|
||||
filterable
|
||||
size="mini"
|
||||
class="filter-item"
|
||||
style="width: 185px;">
|
||||
style="width: 185px;"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in form_types"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
v-for="item in storList"
|
||||
:key="item.stor_id"
|
||||
:label="item.stor_code"
|
||||
:value="item.stor_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<rrOperation :crud="crud" />
|
||||
@@ -33,6 +37,17 @@
|
||||
</div>
|
||||
<!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'-->
|
||||
<crudOperation :permission="permission">
|
||||
<el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
:disabled="crud.selections.length !== 1"
|
||||
icon="el-icon-s-data"
|
||||
size="mini"
|
||||
type="info"
|
||||
@click="edit(crud.selections[0])"
|
||||
>
|
||||
修改明细
|
||||
</el-button>
|
||||
</crudOperation>
|
||||
<!--表单组件-->
|
||||
<el-dialog
|
||||
@@ -42,92 +57,65 @@
|
||||
:title="crud.status.title"
|
||||
width="600px"
|
||||
>
|
||||
<el-form ref="form" :model="form" size="mini" label-width="80px">
|
||||
<el-form ref="form" :rules="rules" :model="form" size="mini" label-width="110px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="表单类型" prop="class_code">
|
||||
<el-input v-model="form.form_type" style="width: 120px;" />
|
||||
<el-col :span="12">
|
||||
<el-form-item label="方案名称" prop="alm_name">
|
||||
<el-input v-model="form.alm_name" style="width: 150px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="表单名称" prop="class_name">
|
||||
<el-input v-model="form.form_name" style="width: 120px;" />
|
||||
<el-col :span="12">
|
||||
<el-form-item label="仓库编码" prop="stor_code">
|
||||
<el-select v-model="form.stor_code" placeholder="请选择" style="width: 150px;">
|
||||
<el-option
|
||||
v-for="item in storList"
|
||||
:key="item.stor_id"
|
||||
:label="item.stor_code"
|
||||
:value="item.stor_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col >
|
||||
<el-form-item label="表单描述" prop="class_name">
|
||||
<el-input v-model="form.form_desc" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col >
|
||||
<el-form-item label="是否含有子表" prop="class_name">
|
||||
<el-radio-group v-model="form.has_child" style="width: 140px">
|
||||
<el-radio label=true>是</el-radio>
|
||||
<el-radio label=false>否</el-radio>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="通知类型" prop="notice_type">
|
||||
<el-radio-group v-model="form.notice_type" style="width: 150px">
|
||||
<el-radio label="1">站内信</el-radio>
|
||||
<el-radio label="2">微信</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col v-if="form.has_child">
|
||||
<el-select
|
||||
v-model="form.parent_id"
|
||||
placeholder="子表id"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in form_types"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业务表id映射" prop="class_desc">
|
||||
<el-input v-model="form.biz_id" style="width: 120px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业务表编码映射" prop="class_desc">
|
||||
<el-input v-model="form.biz_code" style="width: 120px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业务表时间映射" prop="class_desc">
|
||||
<el-input v-model="form.bus_data" style="width: 120px;" />
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否启用" prop="is_used">
|
||||
<el-radio-group v-model="form.is_used" style="width: 150px">
|
||||
<el-radio label="true">是</el-radio>
|
||||
<el-radio label="false">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业务表状态映射" prop="class_desc">
|
||||
<el-input v-model="form.biz_status" style="width: 120px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="物料id映射" prop="class_desc">
|
||||
<el-input v-model="form.material_id" style="width: 120px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="物料数量映射" prop="class_desc">
|
||||
<el-input v-model="form.qty" style="width: 120px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="物料批次映射" prop="class_desc">
|
||||
<el-input v-model="form.pcsn" style="width: 120px;" />
|
||||
<el-col :span="12">
|
||||
<el-form-item label="呆料天数" prop="stay_days">
|
||||
<el-input v-model="form.stay_days" style="width: 150px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="自定义映射" prop="ext_json">
|
||||
<el-input v-model="form.ext_json" type="textarea" style="width: 430px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" style="width: 430px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="自定义映射" prop="class_desc">
|
||||
<el-input type="textarea" v-model="form.form_param" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||
@@ -139,33 +127,31 @@
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
lazy
|
||||
:load="getClassDatas"
|
||||
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
||||
:data="crud.data"
|
||||
row-key="id"
|
||||
@select="crud.selectChange"
|
||||
@select-all="crud.selectAllChange"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column prop="form_type" label="表单类型" min-width="150"/>
|
||||
<el-table-column prop="form_name" label="表单名称" min-width="150"/>
|
||||
<el-table-column prop="form_desc" label="描述" min-width="150"/>
|
||||
<el-table-column prop="create_time" label="创建时间" min-width="150"/>
|
||||
<el-table-column prop="has_child" :formatter="booleanFormat" label="是否关联子表" />
|
||||
<el-table-column prop="parent_id" label="父表id" min-width="150"/>
|
||||
<el-table-column prop="biz_id" label="业务单据id映射" min-width="150"/>
|
||||
<el-table-column prop="biz_code" label="业务单据code映射" min-width="150"/>
|
||||
<el-table-column prop="biz_form_type" label="业务单据type映射" min-width="150"/>
|
||||
<el-table-column prop="biz_date" label="业务单据时间映射" min-width="150"/>
|
||||
<el-table-column prop="status" label="业务单据状态映射" min-width="150"/>
|
||||
<el-table-column prop="material_id" label="物料id映射" min-width="150"/>
|
||||
<el-table-column prop="qty" label="物料数量映射" min-width="150"/>
|
||||
<el-table-column prop="pcsn" label="物料批次映射" min-width="150" />
|
||||
<el-table-column show-overflow-tooltip prop="form_param" :formatter="jsonFormat" label="自定义字段映射" />
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="alm_name" label="安全库存方案" min-width="120" show-tooltip-when-overflow>
|
||||
<template slot-scope="scope">
|
||||
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.alm_name }}</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="stor_code" label="仓库编码" show-tooltip-when-overflow />
|
||||
<el-table-column prop="stay_days" label="呆料天数" min-width="120" show-tooltip-when-overflow />
|
||||
<el-table-column prop="notice_type" label="通知类型" show-tooltip-when-overflow />
|
||||
<el-table-column prop="ext_json" label="扩展信息" show-tooltip-when-overflow />
|
||||
<el-table-column prop="remark" label="描述" show-tooltip-when-overflow />
|
||||
<el-table-column prop="create_id" label="创建人" show-tooltip-when-overflow />
|
||||
<el-table-column prop="create_time" label="创建时间" show-tooltip-when-overflow />
|
||||
<el-table-column prop="is_used" :formatter="jsonFormat" label="是否启用" />
|
||||
<el-table-column
|
||||
label="操作"
|
||||
width="250px"
|
||||
align="center"
|
||||
fixed="right"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
@@ -176,58 +162,54 @@
|
||||
:disabled-dle="scope.row.is_modify === '0'"
|
||||
msg="确定删除吗,如果存在下级节点则一并删除,此操作不能撤销!"
|
||||
/>
|
||||
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="crud.toAddAndData(addSibling(scope.row))">新增同级</el-button>
|
||||
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus" @click="crud.toAddAndData(addChildren(scope.row))">新增子级</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>
|
||||
<ViewDialog ref="itemview" />
|
||||
<EditDialog ref="editDialog" :dialog-show.sync="editShow" @editChanged="crud.toQuery()" />
|
||||
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import formstruc from './formstruc'
|
||||
import deferral_early from './deferral_early'
|
||||
import CRUD, { crud, form, header, presenter } from '@crud/crud'
|
||||
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import ViewDialog from './ViewDialog'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import udOperation from '@crud/UD.operation'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import UploadDialog from './UploadDialog'
|
||||
import EditDialog from './EditDialog'
|
||||
import crudStorattr from '@/views/wms/base_manage/stor/storattr'
|
||||
|
||||
const defaultForm = {
|
||||
form_type: null,
|
||||
form_name: null,
|
||||
form_desc: null,
|
||||
create_time: null,
|
||||
create_id: null,
|
||||
biz_id: null,
|
||||
biz_code: null,
|
||||
biz_date: null,
|
||||
biz_status: null,
|
||||
material_id: null,
|
||||
qty: null,
|
||||
pcsn: null,
|
||||
form_param: null,
|
||||
has_child: false,
|
||||
parent_id: null
|
||||
id: null,
|
||||
alm_name: null,
|
||||
stor_code: null,
|
||||
stay_days: null,
|
||||
notice_type: null,
|
||||
ext_json: null,
|
||||
is_used: null,
|
||||
remark: null,
|
||||
create_name: null,
|
||||
create_time: null
|
||||
}
|
||||
export default {
|
||||
name: 'FormStruc',
|
||||
name: 'DeferralEarly',
|
||||
dicts: ['base_data'],
|
||||
components: {UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect },
|
||||
components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog, EditDialog },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '基础类别',
|
||||
url: 'api/bmFormStruc',
|
||||
title: '呆料预警',
|
||||
url: '/api/almEarlyDeferral',
|
||||
idField: 'id',
|
||||
sort: 'id,desc',
|
||||
crudMethod: { ...formstruc },
|
||||
crudMethod: { ...deferral_early },
|
||||
optShow: {
|
||||
add: true,
|
||||
reset: true
|
||||
@@ -238,18 +220,30 @@ export default {
|
||||
return {
|
||||
classes: [],
|
||||
uploadShow: false,
|
||||
form_types: [],
|
||||
permission: {}
|
||||
editShow: false,
|
||||
storList: [],
|
||||
permission: {},
|
||||
rules: {
|
||||
stor_code: [
|
||||
{ required: true, message: '仓库编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
stay_days: [
|
||||
{ required: true, message: '呆料天数不能为空', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getFormSelect() // 获取分类
|
||||
crudStorattr.getStor({}).then(res => {
|
||||
this.storList = res
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
getFormSelect() {
|
||||
formstruc.getTypes().then((res) => { // 获取分类名称,查询根据分类编码查找对应分支树
|
||||
this.form_types = res
|
||||
})
|
||||
|
||||
toView(row) {
|
||||
if (row !== null) {
|
||||
this.$refs.itemview.setForm(row)
|
||||
}
|
||||
},
|
||||
booleanFormat(row, index) {
|
||||
if (row.has_child) {
|
||||
@@ -263,6 +257,10 @@ export default {
|
||||
return JSON.stringify(row.form_param)
|
||||
}
|
||||
return ''
|
||||
},
|
||||
edit(row) {
|
||||
this.$refs.editDialog.setForm(row)
|
||||
this.editShow = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<template v-if="hideShowDialog" v-for="(col,index) in cols">
|
||||
<template v-for="(col,index) in cols" v-if="hideShowDialog">
|
||||
<el-form-item label="col.lable">
|
||||
<label slot="label">{{ col.lable }}:</label>
|
||||
<el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px"/>
|
||||
<el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px" />
|
||||
</el-form-item>
|
||||
</template>
|
||||
<rrOperation :crud="crud"/>
|
||||
<rrOperation :crud="crud" />
|
||||
</el-form>
|
||||
</div>
|
||||
<!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'-->
|
||||
@@ -71,8 +71,7 @@
|
||||
icon="el-icon-view"
|
||||
size="mini"
|
||||
@click="hideShow"
|
||||
>
|
||||
</el-button>
|
||||
/>
|
||||
</crudOperation>
|
||||
|
||||
<!--表格渲染-->
|
||||
@@ -82,23 +81,23 @@
|
||||
lazy
|
||||
:data="crud.data"
|
||||
>
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
|
||||
scope.row.code
|
||||
}}
|
||||
scope.row.code
|
||||
}}
|
||||
</el-link>
|
||||
<span v-else>{{ scope.row.code }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130"/>
|
||||
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
|
||||
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130" />
|
||||
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip />
|
||||
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
|
||||
<template slot-scope="scope">
|
||||
<template v-for="item in formStatus">
|
||||
@@ -106,13 +105,18 @@
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
|
||||
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in cols" :key="item.value"
|
||||
:label="item.lable">
|
||||
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="create_time" label="创建时间" />
|
||||
<el-table-column
|
||||
v-for="(item, index) in cols"
|
||||
:key="item.value"
|
||||
width="130"
|
||||
show-overflow-tooltip
|
||||
:label="item.lable"
|
||||
>
|
||||
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_time" label="创建时间"/>
|
||||
<el-table-column
|
||||
v-permission="['admin','Classstandard:edit','Classstandard:del']"
|
||||
label="操作"
|
||||
@@ -133,15 +137,15 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination/>
|
||||
<pagination />
|
||||
</div>
|
||||
<ViewDialog ref="viewDialog"/>
|
||||
<ViewDialog ref="viewDialog" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudFormData from './formData'
|
||||
import CRUD, {crud, form, header, presenter} from '@crud/crud'
|
||||
import CRUD, { crud, form, header, presenter } from '@crud/crud'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import udOperation from '@crud/UD.operation'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
@@ -151,7 +155,7 @@ import ViewDialog from './ViewDialog'
|
||||
|
||||
// import UploadDialog from './UploadDialog'
|
||||
|
||||
let defaultForm = {
|
||||
const defaultForm = {
|
||||
id: null,
|
||||
code: null,
|
||||
proc_inst_id: null,
|
||||
@@ -172,7 +176,7 @@ let defaultForm = {
|
||||
export default {
|
||||
name: 'FormData',
|
||||
dicts: ['base_data'],
|
||||
components: {pagination, crudOperation, rrOperation, udOperation, ViewDialog},
|
||||
components: { pagination, crudOperation, rrOperation, udOperation, ViewDialog },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
@@ -180,7 +184,7 @@ export default {
|
||||
url: 'api/pmFormData',
|
||||
idField: 'id',
|
||||
sort: 'id,desc',
|
||||
crudMethod: {...crudFormData},
|
||||
crudMethod: { ...crudFormData },
|
||||
optShow: {
|
||||
add: true,
|
||||
reset: true
|
||||
@@ -218,7 +222,6 @@ export default {
|
||||
created() {
|
||||
// 获取分类
|
||||
this.getFromTypes()
|
||||
|
||||
},
|
||||
mounted() {
|
||||
},
|
||||
@@ -228,7 +231,7 @@ export default {
|
||||
formstruc.getHeader(this.query.form_type).then(res => {
|
||||
this.cols = res
|
||||
res.forEach(a => {
|
||||
this.form.form_data[a.value,'']
|
||||
this.form.form_data[a.value, '']
|
||||
this.$set(this.query, 'form_query', {})
|
||||
})
|
||||
})
|
||||
@@ -247,7 +250,7 @@ export default {
|
||||
},
|
||||
hideShow() {
|
||||
if (this.hideShowDialog) {
|
||||
//this.$set(this.query, 'form_query', {})
|
||||
// this.$set(this.query, 'form_query', {})
|
||||
}
|
||||
this.hideShowDialog = !this.hideShowDialog
|
||||
},
|
||||
@@ -255,7 +258,7 @@ export default {
|
||||
if (row !== null) {
|
||||
this.$refs.viewDialog.setForm(row)
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
404
wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
Normal file
404
wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
Normal file
@@ -0,0 +1,404 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
:show-close="false"
|
||||
fullscreen
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
|
||||
<el-row v-show="crud.status.cu > 0" :gutter="20">
|
||||
<el-col :span="20" style="border: 1px solid white">
|
||||
<span />
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<span>
|
||||
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
|
||||
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
|
||||
</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
|
||||
<el-form-item label="单据号" prop="code">
|
||||
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="业务类型" prop="status">
|
||||
<el-select disabled
|
||||
v-model="form.bill_type"
|
||||
style="width: 100px; height: 35px;top: -5px;"
|
||||
placeholder="业务类型"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in statusEnum.IOBILL_TYPE_OUT"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据状态" prop="status">
|
||||
<el-input v-model="form.status" disabled placeholder="生成" clearable style="width: 150px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="源单类型" prop="source_form_type">
|
||||
<el-input v-model="form.source_form_type" disabled style="width: 150px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="源单id" prop="source_form_id">
|
||||
<el-input v-model="form.source_form_id" disabled style="width: 150px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="源单时间" prop="source_form_date">
|
||||
<el-input v-model="form.source_form_date" disabled style="width: 150px" />
|
||||
</el-form-item>
|
||||
<template v-for="(col,index) in cols">
|
||||
<el-form-item label="col.lable" prop="bill_code">
|
||||
<label slot="label">{{col.lable}}:</label>
|
||||
<el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 150px" />
|
||||
</el-form-item>
|
||||
</template>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<label slot="label">备 注:</label>
|
||||
<el-input v-model="form.remark" disabled style="width: 380px;" rows="2" type="textarea" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="crud-opts2">
|
||||
<span class="role-span">出库明细</span>
|
||||
<span class="crud-opts-right2">
|
||||
<!--左侧插槽-->
|
||||
<slot name="left"/>
|
||||
<el-button
|
||||
slot="left"
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="!divflag"
|
||||
@click="divVehicle()"
|
||||
>
|
||||
分配载具
|
||||
</el-button>
|
||||
<el-button
|
||||
slot="left"
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="divflag"
|
||||
@click="divCancel()"
|
||||
>
|
||||
取消分配
|
||||
</el-button>
|
||||
</span>
|
||||
</div>
|
||||
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
:data="tableData"
|
||||
style="width: 100%;"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
:highlight-current-row="true"
|
||||
@current-change="handleCurrentDtl"
|
||||
border
|
||||
>
|
||||
<el-table-column type="index" label="序号" width="55" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
|
||||
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
|
||||
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
|
||||
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
|
||||
<el-table-column show-overflow-tooltip prop="qty" label="数量" />
|
||||
<el-table-column show-overflow-tooltip prop="unit_id" label="单位" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" />
|
||||
<el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" width="160"/>
|
||||
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" />
|
||||
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" />
|
||||
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" >
|
||||
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
|
||||
</el-table>
|
||||
</el-card>
|
||||
<div class="crud-opts2">
|
||||
<span class="role-span">作业明细</span>
|
||||
</div>
|
||||
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table2"
|
||||
:data="tabledis"
|
||||
style="width: 100%;"
|
||||
max-height="300"
|
||||
size="mini"
|
||||
border
|
||||
:highlight-current-row="true"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
>
|
||||
<el-table-column show-overflow-tooltip prop="vehicle_code" label="托盘号" align="center" />
|
||||
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
|
||||
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
|
||||
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
|
||||
<el-table-column prop="pcsn" label="批次" align="center" width="150" />
|
||||
<el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
|
||||
<el-table-column min-width="120" show-overflow-tooltip prop="stor_code" label="仓库" align="center" />
|
||||
<el-table-column min-width="120" show-overflow-tooltip prop="struct_code" label="载具所在仓位" align="center" />
|
||||
<el-table-column prop="point_code1" label="任务起始位置" align="center" width="120"/>
|
||||
<el-table-column prop="point_code2" label="任务目的位置" align="center" width="120"/>
|
||||
<el-table-column prop="task_code" label="任务号" align="center" />
|
||||
<el-table-column prop="status" label="任务状态" align="center" :formatter="formatStatus"/>
|
||||
<el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/>
|
||||
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/>
|
||||
</el-table>
|
||||
</el-card>
|
||||
<el-dialog
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="dialogVehicle"
|
||||
title="载具分配"
|
||||
width="700px"
|
||||
>
|
||||
<el-form :model="vehicleform" size="mini" label-width="110px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料编码" prop="material_code">
|
||||
<el-input v-model="vehicleform.material_code" disabled style="width: 150px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料数量" prop="qty">
|
||||
<el-input v-model="vehicleform.qty" disabled style="width: 150px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
|
||||
<!--表格渲染-->
|
||||
<span class="crud-opts-right2">
|
||||
<!--左侧插槽-->
|
||||
<slot name="left" />
|
||||
<el-button
|
||||
slot="left"
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="addVehicledis"
|
||||
>
|
||||
新增一行
|
||||
</el-button>
|
||||
</span>
|
||||
<el-table
|
||||
ref="table2"
|
||||
:data="vehicledis"
|
||||
size="mini"
|
||||
border
|
||||
:highlight-current-row="true"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
>
|
||||
<el-table-column show-overflow-tooltip prop="vehicle_code" label="托盘号" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="vehicledis[scope.$index].vehicle_code" clearable />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column min-width="120" show-overflow-tooltip prop="qty" label="物料数量" align="center" >
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="vehicledis[scope.$index].qty" clearable />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="160" fixed="right">
|
||||
<template scope="scope">
|
||||
<el-button type="danger" size="mini" icon="el-icon-delete" @click="subRow(scope.$index, scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="16" style="border: 1px solid white">
|
||||
<span />
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-button icon="el-icon-check" size="mini" type="primary" @click="submitDialogVehicle">保存</el-button>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-button icon="el-icon-close" size="mini" type="info" @click="closeDialogVehicle">关闭</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-dialog>
|
||||
</el-dialog>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import CRUD, { crud } from '@crud/crud'
|
||||
import crudProduct from '@/views/wms/stor_manage/in/storinvin'
|
||||
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
|
||||
|
||||
|
||||
export default {
|
||||
name: 'TaskDialog',
|
||||
components: { },
|
||||
mixins: [crud()],
|
||||
dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'],
|
||||
statusEnums: [ 'IOBILL_TYPE_OUT','FORM_STATUS' ],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
openParam: {
|
||||
type: Array,
|
||||
default: () => {
|
||||
return []
|
||||
}
|
||||
},
|
||||
storId: {
|
||||
type: String,
|
||||
default: null
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
dialogVehicle: false,
|
||||
divflag: false,
|
||||
cols: [],
|
||||
dtlCols: [],
|
||||
tableData: [],
|
||||
tabledis: [],
|
||||
vehicledis: [],
|
||||
vehicleform:{},
|
||||
currentDtl: null,
|
||||
form: {
|
||||
id: '',
|
||||
code: '',
|
||||
bill_type: '',
|
||||
status: '',
|
||||
product_area: '',
|
||||
source_form_type: '',
|
||||
source_form_id: '',
|
||||
source_form_date: '',
|
||||
create_name: '',
|
||||
create_time: '',
|
||||
update_name: '',
|
||||
update_time: '',
|
||||
remark: '',
|
||||
form_data: {}
|
||||
},
|
||||
rules: {}
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue, oldValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
formstruc.getHeader('st_ivt_iostorinv').then(res => {
|
||||
this.cols = res
|
||||
})
|
||||
formstruc.getHeader('st_ivt_iostorinvdtl').then(res => {
|
||||
this.dtlCols = res
|
||||
})
|
||||
},
|
||||
setForm(row) {
|
||||
this.dialogVisible = true
|
||||
this.form = row
|
||||
this.currentDtl = null
|
||||
crudProduct.getIosInvDtl(row.id).then(res => {
|
||||
this.tableData = res
|
||||
})
|
||||
},
|
||||
addVehicledis(){
|
||||
this.vehicledis.push({ vehicle_code: '', qty: 0 })
|
||||
},
|
||||
subRow(index,row){
|
||||
this.vehicledis.slice(index,1)
|
||||
},
|
||||
handleCurrentDtl(row){
|
||||
this.currentDtl = row
|
||||
if (this.currentDtl.struct_code != null){
|
||||
this.divflag = false;
|
||||
}else {
|
||||
this.divflag = true;
|
||||
}
|
||||
},
|
||||
divVehicle() {
|
||||
if (!this.currentDtl) {
|
||||
this.crud.notify('请先选择一条分配明细!', CRUD.NOTIFICATION_TYPE.INFO)
|
||||
return
|
||||
}
|
||||
this.dialogVehicle = true
|
||||
this.vehicleform = this.currentDtl
|
||||
},
|
||||
divCancel() {
|
||||
if (!this.currentDtl) {
|
||||
this.crud.notify('请先选择一条分配明细!', CRUD.NOTIFICATION_TYPE.INFO)
|
||||
return
|
||||
}
|
||||
crudProduct.cancelDecision(this.currentDtl).then(res => {
|
||||
crudProduct.getIosInvDtl(this.form.id).then(res => {
|
||||
this.tableData = res
|
||||
})
|
||||
})
|
||||
this.tabledis = []
|
||||
},
|
||||
formatStatus(row) {
|
||||
return this.statusEnum.label.FORM_STATUS[row.status]
|
||||
},
|
||||
closeDialogVehicle(){
|
||||
this.dialogVehicle = false
|
||||
this.vehicledis = []
|
||||
this.vehicleform = {}
|
||||
},
|
||||
submitDialogVehicle(){
|
||||
this.vehicleform.item = this.vehicledis
|
||||
crudProduct.confirmvehicle(this.vehicleform).then(res => {
|
||||
this.crud.notify('载具分配成功!', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
this.dialogVehicle = false
|
||||
this.vehicledis = []
|
||||
this.vehicleform = {}
|
||||
this.setForm(this.form)
|
||||
})
|
||||
},
|
||||
close() {
|
||||
this.form.tableMater = []
|
||||
this.form.dtl_row = null
|
||||
this.form.bucketunique = null
|
||||
this.sectProp = null
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('AddChanged')
|
||||
this.crud.refresh()
|
||||
this.$refs['form2'].resetFields()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.crud-opts2 {
|
||||
padding: 0;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.crud-opts2 .el-dialog__title2 {
|
||||
line-height: 24px;
|
||||
font-size: 20px;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.crud-opts2 .role-span {
|
||||
padding: 10px 0px 10px 0px;
|
||||
}
|
||||
|
||||
.crud-opts2 .crud-opts-form {
|
||||
padding: 10px 0px 0px 20px;
|
||||
}
|
||||
|
||||
.input-with-select {
|
||||
background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
@@ -31,6 +31,13 @@ export function getTableColumnNames(params) {
|
||||
})
|
||||
}
|
||||
|
||||
export function getTableColumnNamesdata(params) {
|
||||
return request({
|
||||
url: 'api/externalFieldMapping/getTableColumnNamesdata/' + params,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function getAllTableName() {
|
||||
return request({
|
||||
url: 'api/externalFieldMapping/getAllTableName',
|
||||
@@ -68,6 +75,20 @@ export function updateRows(data) {
|
||||
})
|
||||
}
|
||||
|
||||
export function tableColumns(params) {
|
||||
return request({
|
||||
url: '/api/bmFormStruc/tableColumns/' + params,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
export function syncAnalyse(data) {
|
||||
return request({
|
||||
url: 'api/externalFieldMapping/syncAnalyse',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default {
|
||||
add,
|
||||
edit,
|
||||
@@ -75,7 +96,10 @@ export default {
|
||||
addRows,
|
||||
updateRows,
|
||||
getAllTableName,
|
||||
tableColumns,
|
||||
getTableColumnNames,
|
||||
getExistTableName,
|
||||
getTableColumnNamesFromMapping
|
||||
getTableColumnNamesFromMapping,
|
||||
syncAnalyse,
|
||||
getTableColumnNamesdata
|
||||
}
|
||||
|
||||
@@ -117,6 +117,38 @@
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
:close-on-click-modal="false"
|
||||
title="表单同步测试"
|
||||
:visible.sync="syncShow"
|
||||
width="800px"
|
||||
@close="syncAnalyseCannel"
|
||||
>
|
||||
<el-form ref="form" :model="syncForm" :rules="rules" size="mini" label-width="50px">
|
||||
<el-form-item label="表单:" prop="occupystruct_qty">
|
||||
<el-input v-model="syncForm.local_table_name" disabled :precision="0" style="width: 150px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="测试数据" prop="analyseData">
|
||||
<el-input v-model="syncForm.analyseData" type="textarea" :precision="0" style="width: 650px;" />
|
||||
</el-form-item> </el-form>
|
||||
<el-table
|
||||
v-if="AAA"
|
||||
ref="table1"
|
||||
v-loading="crud.loading"
|
||||
:data="receivedData"
|
||||
size="mini"
|
||||
style="width: 100%;"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
|
||||
<el-table-column v-for="(item, index) in dataList" :key="item.COLUMN_NAME" :label="item.COLUMN_COMMENT" width="160">
|
||||
<template slot-scope="scope">{{ scope.row[item.COLUMN_NAME] }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="syncAnalyseSubmit">同步解析</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
@@ -139,6 +171,7 @@
|
||||
{{ dict.label.external_system[scope.row.external_system] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="mapping_json" label="映射关系" show-overflow-tooltip />
|
||||
<el-table-column prop="last_update_name" label="更新人" />
|
||||
<el-table-column prop="last_update_time" label="更新时间" width="150" />
|
||||
@@ -148,6 +181,14 @@
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
<el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
type="text"
|
||||
@click="syncTest(scope.row)"
|
||||
>同步测试</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -168,6 +209,7 @@ import udOperation from '@crud/UD.operation.vue'
|
||||
import pagination from '@crud/Pagination.vue'
|
||||
import AddDialog from './AddDialog'
|
||||
import EditDialog from './EditDialog'
|
||||
import fieldMapping from './fieldMapping'
|
||||
|
||||
const defaultForm = {
|
||||
id: null,
|
||||
@@ -203,15 +245,21 @@ export default {
|
||||
return {
|
||||
tableNameList: [],
|
||||
fieldNameList: [],
|
||||
dataList: [],
|
||||
dataTypeList: [],
|
||||
syncForm: {},
|
||||
addShow: false,
|
||||
editShow: false,
|
||||
permission: {},
|
||||
receivedData: [],
|
||||
AAA: false,
|
||||
|
||||
rules: {
|
||||
position_code: [
|
||||
{ required: true, message: '缓存线位置编码不能为空', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
},
|
||||
syncShow: false
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@@ -241,11 +289,42 @@ export default {
|
||||
this.$refs.editRef.setForm(row)
|
||||
this.editShow = true
|
||||
},
|
||||
syncTest(row) {
|
||||
this.syncShow = true
|
||||
this.syncForm = row
|
||||
fieldMapping.getTableColumnNamesFromMapping(row.local_table_name).then(res => {
|
||||
this.viewMstCols = res.item
|
||||
if (res.dtl_item != null) {
|
||||
this.hasDtl = true
|
||||
this.viewDtlCols = res.dtl_item
|
||||
}
|
||||
})
|
||||
},
|
||||
syncAnalyseSubmit() {
|
||||
this.AAA = true
|
||||
console.log(this.syncForm)
|
||||
crudFieldMapping.getTableColumnNamesdata(this.syncForm.local_table_name).then(res => {
|
||||
this.dataList = res
|
||||
console.log(this.dataList)
|
||||
})
|
||||
fieldMapping.syncAnalyse(this.syncForm).then(res => {
|
||||
this.crud.notify('解析成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
this.receivedData = res
|
||||
})
|
||||
},
|
||||
querytable() {
|
||||
this.crud.toQuery()
|
||||
},
|
||||
querytable1() {
|
||||
this.crud.toQuery()
|
||||
},
|
||||
syncAnalyseCannel() {
|
||||
this.syncForm = {}
|
||||
this.viewMst = [],
|
||||
this.viewDtl = [],
|
||||
this.hasDtl = false,
|
||||
this.viewMstCols = {},
|
||||
this.viewDtlCols = {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user