root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:出库入规则优化

Browse Source
This commit is contained in:
zhangzq
2024-09-01 14:12:34 +08:00
parent b7cb6172f3
commit 594291ebbd
1 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue
View File

@@ -131,29 +131,29 @@
<el-dialog <el-dialog
:close-on-click-modal="false" :close-on-click-modal="false"
title="表单同步测试" title="表单同步测试"
:visible.sync=syncShow :visible.sync="syncShow"
width="800px" width="800px"
@close="syncAnalyseCannel" @close="syncAnalyseCannel"
> >
<el-form ref="form" :model="syncForm" :rules="rules" size="mini" label-width="50px"> <el-form ref="form" :model="syncForm" :rules="rules" size="mini" label-width="50px">
<el-row :gutter="40" class="panel-group"> <el-row :gutter="40" class="panel-group">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="表单:" prop="occupystruct_qty"> <el-form-item label="表单:" prop="occupystruct_qty">
<el-input disabled v-model="syncForm.form_name" :precision="0" style="width: 150px;" /> <el-input v-model="syncForm.form_name" disabled :precision="0" style="width: 150px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="存储:" prop="needSave"> <el-form-item label="存储:" prop="needSave">
<el-switch <el-switch
v-model="syncForm.needSave" v-model="syncForm.needSave"
active-color="#13ce66" active-color="#13ce66"
inactive-color="#ff4949"> inactive-color="#ff4949"
</el-switch> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="测试数据" prop="analyseData"> <el-form-item label="测试数据" prop="analyseData">
<el-input type="textarea" v-model="syncForm.analyseData" :precision="0" style="width: 650px;" /> <el-input v-model="syncForm.analyseData" type="textarea" :precision="0" style="width: 650px;" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div v-if="viewMst.length >0"> <div v-if="viewMst.length >0">
@@ -180,41 +180,41 @@
<el-table-column min-width="120" show-overflow-tooltip prop="qty" label="数量" align="center" /> <el-table-column min-width="120" show-overflow-tooltip prop="qty" label="数量" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="载具" align="center" /> <el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="载具" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="status" label="单据状态" align="center" /> <el-table-column min-width="120" show-overflow-tooltip prop="status" label="单据状态" align="center" />
<el-table-column min-width="120" show-overflow-tooltip v-for="(item, index) in viewMstCols" :key="item.value" :label="item.lable" > <el-table-column v-for="(item, index) in viewMstCols" :key="item.value" min-width="120" show-overflow-tooltip :label="item.lable">
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template> <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<div v-if="hasDtl"> <!-- <div v-if="hasDtl">-->
<div class="crud-opts2"> <!-- <div class="crud-opts2">-->
<span class="role-span2">明细数据</span> <!-- <span class="role-span2">明细数据</span>-->
</div> <!-- </div>-->
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}"> <!-- <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">-->
<!--表格渲染--> <!-- &lt;!&ndash;表格渲染&ndash;&gt;-->
<el-table <!-- <el-table-->
ref="table" <!-- ref="table"-->
:data="viewDtl" <!-- :data="viewDtl"-->
style="width: 100%;" <!-- style="width: 100%;"-->
max-height="300" <!-- max-height="300"-->
size="mini" <!-- size="mini"-->
border <!-- border-->
:highlight-current-row="true" <!-- :highlight-current-row="true"-->
:header-cell-style="{background:'#f5f7fa',color:'#606266'}" <!-- :header-cell-style="{background:'#f5f7fa',color:'#606266'}"-->
> <!-- >-->
<el-table-column min-width="120" show-overflow-tooltip prop="id" label="id" align="center" /> <!-- <el-table-column min-width="120" show-overflow-tooltip prop="id" label="id" align="center" />-->
<el-table-column min-width="120" show-overflow-tooltip prop="code" label="单据编码" align="center" /> <!-- <el-table-column min-width="120" show-overflow-tooltip prop="code" label="单据编码" align="center" />-->
<el-table-column min-width="120" show-overflow-tooltip prop="biz_code" label="业务单" align="center" /> <!-- <el-table-column min-width="120" show-overflow-tooltip prop="biz_code" label="业务单" align="center" />-->
<el-table-column min-width="120" show-overflow-tooltip prop="material_id" label="物料id" align="center" /> <!-- <el-table-column min-width="120" show-overflow-tooltip prop="material_id" label="物料id" align="center" />-->
<el-table-column min-width="120" show-overflow-tooltip prop="pcsn" label="批次" align="center" /> <!-- <el-table-column min-width="120" show-overflow-tooltip prop="pcsn" label="批次" align="center" />-->
<el-table-column min-width="120" show-overflow-tooltip prop="qty" label="数量" align="center" /> <!-- <el-table-column min-width="120" show-overflow-tooltip prop="qty" label="数量" align="center" />-->
<el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="载具" align="center" /> <!-- <el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="载具" align="center" />-->
<el-table-column min-width="120" show-overflow-tooltip prop="status" label="单据状态" align="center" /> <!-- <el-table-column min-width="120" show-overflow-tooltip prop="status" label="单据状态" align="center" />-->
<el-table-column min-width="120" show-overflow-tooltip v-for="(item, index) in viewDtlCols" :key="item.value" :label="item.lable" > <!-- <el-table-column min-width="120" show-overflow-tooltip v-for="(item, index) in viewDtlCols" :key="item.value" :label="item.lable" >-->
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template> <!-- <template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> <!-- </el-table>-->
</el-card> <!-- </el-card>-->
</div> <!-- </div>-->
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button :loading="crud.cu === 2" type="primary" @click="syncAnalyseSubmit">同步解析</el-button> <el-button :loading="crud.cu === 2" type="primary" @click="syncAnalyseSubmit">同步解析</el-button>
@@ -232,7 +232,7 @@
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="form_name" label="表单名称" width="150" /> <el-table-column prop="form_name" label="表单名称" width="150" />
<el-table-column prop="form_type" label="表单类型" width="150" /> <el-table-column prop="form_type" label="表单类型" width="150" />
<el-table-column prop="sync_type" label="同步类型" width="150" > <el-table-column prop="sync_type" label="同步类型" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ dict.label.sync_type[scope.row.sync_type] }} {{ dict.label.sync_type[scope.row.sync_type] }}
</template> </template>
@@ -248,14 +248,13 @@
:data="scope.row" :data="scope.row"
:permission="permission" :permission="permission"
style="display: inline" style="display: inline"
/> />
<el-button <el-button
slot="right"
class="filter-item" class="filter-item"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
type="text" type="text"
slot="right"
@click="syncTest(scope.row)" @click="syncTest(scope.row)"
>同步测试</el-button> >同步测试</el-button>
@@ -271,7 +270,7 @@
</template> </template>
<script> <script>
import crudFormMapping, {syncData} from './formMapping' import crudFormMapping, { syncData } from './formMapping'
import CRUD, { crud, form, header, presenter } from '@crud/crud' import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation.vue' import rrOperation from '@crud/RR.operation.vue'
import crudOperation from '@crud/CRUD.operation.vue' import crudOperation from '@crud/CRUD.operation.vue'
@@ -279,7 +278,7 @@ import udOperation from '@crud/UD.operation.vue'
import pagination from '@crud/Pagination.vue' import pagination from '@crud/Pagination.vue'
import AddDialog from './AddDialog' import AddDialog from './AddDialog'
import EditDialog from './EditDialog' import EditDialog from './EditDialog'
import crudNotice from "../../../system/notice/api/notice"; import crudNotice from '../../../system/notice/api/notice'
const defaultForm = { const defaultForm = {
id: null, id: null,
@@ -373,29 +372,27 @@ export default {
querytable1() { querytable1() {
this.crud.toQuery() this.crud.toQuery()
}, },
syncTest(row){ syncTest(row) {
this.syncShow = true this.syncShow = true
this.syncForm = row this.syncForm = row
crudFormMapping.tableColumns(row.form_type).then(res => { crudFormMapping.tableColumns(row.form_type).then(res => {
this.viewMstCols = res.item this.viewMstCols = res.item
if (res.dtl_item != null){ if (res.dtl_item != null) {
this.hasDtl = true this.hasDtl = true
this.viewDtlCols = res.dtl_item this.viewDtlCols = res.dtl_item
} }
}) })
}, },
syncAnalyseSubmit(){ syncAnalyseSubmit() {
this.viewMst=[] this.viewMst = []
this.viewDtl = []
crudFormMapping.syncAnalyse(this.syncForm).then(res => { crudFormMapping.syncAnalyse(this.syncForm).then(res => {
this.crud.notify('解析成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.notify('解析成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
for (let i = 0; i < res.content.length; i++) { for (let i = 0; i < res.content.length; i++) {
if (i==0){this.viewMst.push(res.content[i])} this.viewMst.push(res.content[i])
else {this.viewDtl.push(res.content[i])} }
}
}) })
}, },
syncAnalyseCannel(){ syncAnalyseCannel() {
this.syncForm = {} this.syncForm = {}
this.viewMst = [], this.viewMst = [],
this.viewDtl = [], this.viewDtl = [],