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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-11-07 16:53:34 +08:00
parent 30f6c9ec14
commit 019f0bdd43
6 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue → lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue
View File

@@ -10,22 +10,24 @@
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
<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-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-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
<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-input v-show="false" v-model="form.stor_code" placeholder="仓库编码"/>
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称"/>
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
@@ -79,7 +81,7 @@
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -93,11 +95,13 @@
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"
value-format="yyyy-MM-dd" :disabled="crud.status.view > 0"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"
:disabled="crud.status.view > 0"/>
</el-form-item>
</el-form>
@@ -106,7 +110,7 @@
<span v-if="crud.status.cu > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<el-button
slot="left"
class="filter-item"
@@ -128,45 +132,51 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column key="1" type="index" label="序号" width="50" align="center" />
<el-table-column key="2" prop="work_status" label="状态" v-if="crud.status.add!==1" align="center" :formatter="bill_statusFormat" />
<el-table-column key="3" show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
<el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip />
<el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="100" show-overflow-tooltip />
<el-table-column key="6" prop="qty_unit_name" label="单位" align="center" />
<el-table-column key="7" prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
<el-table-column key="8" prop="ivt_level" label="库存等级" align="center" width="100px" :formatter="ivt_levelFormat" />
<el-table-column key="9" prop="is_active" label="是否可用" align="center" width="110px" :formatter="is_activeFormat" />
<el-table-column key="10" show-overflow-tooltip prop="qty" label="重量" :formatter="crud.formatNum3" width="120" align="center" />
<el-table-column key="11" show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
<el-table-column key="12" show-overflow-tooltip prop="turnout_sect_name" label="移出库区" />
<el-table-column key="13" show-overflow-tooltip prop="turnout_struct_code" label="移出货位" />
<el-table-column key="14" show-overflow-tooltip prop="turnin_sect_name" label="移入库区" />
<el-table-column key="1" type="index" label="序号" width="50" align="center"/>
<el-table-column v-if="crud.status.add!==1" key="2" prop="work_status" label="状态" align="center"
:formatter="bill_statusFormat"/>
<el-table-column key="3" show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center"/>
<el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip/>
<el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="100" show-overflow-tooltip/>
<el-table-column key="6" prop="qty_unit_name" label="单位" align="center"/>
<el-table-column key="7" prop="quality_scode" label="品质类型" align="center" width="110px"
:formatter="quality_scodeFormat"/>
<el-table-column key="10" show-overflow-tooltip prop="qty" label="重量" :formatter="crud.formatNum3" width="120"
align="center"/>
<el-table-column key="11" show-overflow-tooltip prop="storagevehicle_code" label="载具号"/>
<el-table-column key="12" show-overflow-tooltip prop="turnout_sect_name" label="移出库区"/>
<el-table-column key="13" show-overflow-tooltip prop="turnout_struct_code" label="移出货位"/>
<el-table-column key="14" show-overflow-tooltip prop="turnin_sect_name" label="移入库区"/>
<el-table-column key="15" show-overflow-tooltip prop="turnin_struct_code" label="移入货位" width="190" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.turnin_struct_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryStruct(scope.$index, scope.row)" />
<el-button slot="append" icon="el-icon-search" @click="queryStruct(scope.$index, scope.row)"/>
</el-input>
<span v-show="scope.row.edit">{{ scope.row.turnin_struct_code }}</span>
</template>
</el-table-column>
<el-table-column key="16" v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
<el-table-column v-if="crud.status.cu > 0" key="16" 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)" />
<el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button v-show="scope.row.edit" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">完成</el-button>
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"/>
<el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit"
@click="handleEdit(scope.$index, scope.row)">编辑
</el-button>
<el-button v-show="scope.row.edit" type="success" class="filter-item" size="mini" icon="el-icon-check"
@click="handleEdit(scope.$index, scope.row)">完成
</el-button>
</template>
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged" />
<AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged"/>
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged"/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/inStor/moveStor/handmovestor/AddDtl'
import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
import AddDtl from '@/views/wms/st/inStor/moveStor/AddDtl'
import handmovestor from '@/views/wms/st/inStor/moveStor/index'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import StructDiv from '@/views/wms/pub/StructDialog'
@@ -180,7 +190,7 @@ const defaultForm = {
detail_count: '0',
bill_type: '29',
remark: '',
biz_date: new Date().format('yyyy-MM-dd'),
biz_date: new Date(),
create_mode: '',
tableData: []
}
@@ -328,6 +338,7 @@ export default {
this.form.detail_count = this.form.tableData.length
},
structChanged(row) {
debugger
let structflag = false
for (let i = 0; i < this.form.tableData.length; i++) {
if ((this.form.tableData[i].turnin_struct_id === row.struct_id) || (this.form.tableData[i].turnout_struct_id === row.struct_id)) {
@@ -350,6 +361,7 @@ export default {
this.form.tableData.splice(i, 1, this.form.tableData[i]) // 通过splice 替换数据 触发视图更新
}
}
console.log(this.form.tableData)
},
handleEdit(index, row) {
// 判断是否可以关闭编辑状态
@@ -401,11 +413,13 @@ export default {
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
padding: 4px 4px;
}
.input-with-select {
.input-with-select {
background-color: #fff;
}
</style>

2
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/handmovestor/AddDtl.vue → lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue
View File

@@ -75,8 +75,6 @@
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" width="110px" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
<el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
<el-table-column prop="ivt_level" label="库存等级" align="center" width="100px" :formatter="ivt_levelFormat" />
<el-table-column prop="is_active" label="是否可用" align="center" width="110px" :formatter="is_activeFormat" />
<el-table-column show-overflow-tooltip prop="qty" label="重量" :formatter="crud.formatNum3" width="110px" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
</el-table>

0
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/handmovestor/handmovestor.js → lms/nladmin-ui/src/views/wms/st/inStor/moveStor/handmovestor.js
View File

4
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/handmovestor/index.vue → lms/nladmin-ui/src/views/wms/st/inStor/moveStor/index.vue
View File

@@ -191,13 +191,13 @@
</template>
<script>
import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
import handmovestor from '@/views/wms/st/inStor/moveStor/index'
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/st/inStor/moveStor/handmovestor/AddDialog'
import AddDialog from '@/views/wms/st/inStor/moveStor/AddDialog'
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
export default {