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

提交

Browse Source
This commit is contained in:
ls
2025-12-15 08:51:20 +08:00
parent 8565db7179
commit 21717f533f
44 changed files with 324 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lms/nladmin-ui/src/views/loki/view/index.vue
View File

@@ -34,22 +34,22 @@
</el-select>
</el-form-item>
<el-form-item label="接口">
<el-select
v-model="requestMethod"
clearable
filterable
style="width: 150px; height: 35px;top: 0px;"
placeholder="接口"
>
<el-option
v-for="item in interfaces"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-select
v-model="requestMethod"
clearable
filterable
style="width: 150px; height: 35px;top: 0px;"
placeholder="接口"
>
<el-option
v-for="item in interfaces"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item >
<el-form-item>
<el-input
v-model="requestMethod"
size="mini"
@@ -97,7 +97,7 @@
/>
</el-form-item>
<el-form-item v-show="showOptions" label="时间段">
<el-select v-model="timeZoneValue" clearable filterable placeholder="请选择标签" size="mini" @change="queryData">
<el-select v-model="timeZoneValue" clearable filterable placeholder="请选择标签" size="mini" @change="queryData">
<el-option
v-for="item in timeZoneOptions"
:key="item.index"
@@ -397,9 +397,9 @@ export default {
},
downloadData() {
logOperation.downloadData().then(result => {
//debugger
// debugger
downloadFile(result, '导出数据', 'xlsx')
});
})
},
clearParam() {
queryParam = {

8
lms/nladmin-ui/src/views/system/dept/index.vue
View File

@@ -66,8 +66,8 @@
v-model="form.is_used"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value = 'true'
inactive-valu='false'
active-value="true"
inactive-valu="false"
/>
</el-form-item>
<el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级部门" prop="pid">
@@ -90,7 +90,7 @@
<el-table
ref="table"
v-loading="crud.loading"
:default-sort = "{prop: 'dept_sort', order: 'ascending'}"
:default-sort="{prop: 'dept_sort', order: 'ascending'}"
lazy
:load="getDeptDatas"
:tree-props="{children: 'children', hasChildren: 'has_children'}"
@@ -267,7 +267,7 @@ export default {
// 改变状态
changeEnabled(data, val) {
const satus = this.enabledTypeOptions.find(item => { return item.key == data.is_used })
//debugger
// debugger
this.$confirm('此操作将 "' + satus.display_name + '" ' + data.name + '部门, 是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

44
lms/nladmin-ui/src/views/wms/agvrush/devicestatus/index.vue
View File

@@ -51,11 +51,11 @@
/>
</el-select>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -68,12 +68,12 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="设备编码" prop="device_code">
<el-input v-model="form.device_code" style="width: 200px;"/>
<el-input v-model="form.device_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备名称" prop="device_name">
<el-input v-model="form.device_name" style="width: 200px;"/>
<el-input v-model="form.device_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -137,8 +137,14 @@
</el-col>
<el-col :span="8">
<el-form-item label="联系人" prop="upload_user">
<el-select v-model="form.upload_user" placeholder="请选择" filterable multiple clearable
style="width: 200px">
<el-select
v-model="form.upload_user"
placeholder="请选择"
filterable
multiple
clearable
style="width: 200px"
>
<el-option
v-for="item in userList"
:key="item.username"
@@ -167,16 +173,16 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip width="150px"/>
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip width="150px"/>
<el-table-column prop="product_area" label="区域" show-overflow-tooltip/>
<el-table-column prop="device_type" label="设备类型" :formatter="typeFormatter" show-overflow-tooltip/>
<el-table-column prop="mode" label="工作状态" :formatter="modeFormatter" show-overflow-tooltip/>
<el-table-column prop="mode_update_time" label="工作状态变更时间" show-overflow-tooltip width="150px"/>
<el-table-column prop="error" label="故障状态" :formatter="erroFormatter" show-overflow-tooltip/>
<el-table-column prop="error_msg" label="故障信息" width="180px" show-overflow-tooltip/>
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip/>
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip/>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip width="150px" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip width="150px" />
<el-table-column prop="product_area" label="区域" show-overflow-tooltip />
<el-table-column prop="device_type" label="设备类型" :formatter="typeFormatter" show-overflow-tooltip />
<el-table-column prop="mode" label="工作状态" :formatter="modeFormatter" show-overflow-tooltip />
<el-table-column prop="mode_update_time" label="工作状态变更时间" show-overflow-tooltip width="150px" />
<el-table-column prop="error" label="故障状态" :formatter="erroFormatter" show-overflow-tooltip />
<el-table-column prop="error_msg" label="故障信息" width="180px" show-overflow-tooltip />
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip />
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip />
<el-table-column label="是否上报" align="center" prop="upload_flag">
<template slot-scope="scope">
<el-switch
@@ -189,7 +195,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="upload_user" label="负责人" width="150px" show-overflow-tooltip/>
<el-table-column prop="upload_user" label="负责人" width="150px" show-overflow-tooltip />
<el-table-column
v-permission="['admin','customerbase:edit','customerbase:del']"
label="操作"
@@ -206,7 +212,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>
@@ -275,7 +281,7 @@ export default {
},
[CRUD.HOOK.afterToCU](crud, form) {
this.getUserList()
//debugger
// debugger
if (form.upload_user && form.upload_user !== '') {
form.upload_user = form.upload_user.split(',')
} else {

9
lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue
View File

@@ -20,13 +20,14 @@
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand">
@change="hand"
>
<el-option
v-for="item in classNames"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />
@@ -386,7 +387,7 @@ export default {
}
const dafult = this.$el.getElementsByClassName('dafult')
for (let a = 0; a < dafult.length; a++) {
//debugger
// debugger
dafult[a].click()
}
}

43
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -187,7 +187,8 @@
>
<!--表格渲染-->
<el-table
:data="childrenList">
:data="childrenList"
>
<el-table-column prop="container_name" label="子卷号" show-overflow-tooltip width="210px" />
<el-table-column prop="spec" label="步序" show-overflow-tooltip width="120">
<template slot-scope="scope">
@@ -199,8 +200,8 @@
{{ scope.row.result.toString() }}
</template>
</el-table-column>
<el-table-column prop="param" label="执行参数" show-overflow-tooltip width="150"/>
<el-table-column prop="msg" label="备注" show-overflow-tooltip width="150"/>
<el-table-column prop="param" label="执行参数" show-overflow-tooltip width="150" />
<el-table-column prop="msg" label="备注" show-overflow-tooltip width="150" />
<el-table-column prop="create_time" label="创建时间">
<template slot-scope="scope">
{{ new Date(scope.row.create_time).toLocaleString() }}
@@ -208,17 +209,21 @@
</el-table-column>
<el-table-column label="操作">
<template scope="scope">
<el-button v-if="scope.row.result==false && scope.row.url" type="danger"
class="filter-item"
size="mini" icon="el-icon-position"
@click.native.prevent="syncMes(scope.row)">同步</el-button>
<el-button
v-if="scope.row.result==false && scope.row.url"
type="danger"
class="filter-item"
size="mini"
icon="el-icon-position"
@click.native.prevent="syncMes(scope.row)"
>同步</el-button>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<span slot="footer" class="dialog-footer">
<el-button @click="dtlVisible = false">取 消</el-button>
</span>
<el-button @click="dtlVisible = false">取 消</el-button>
</span>
</el-dialog>
<el-dialog
:close-on-click-modal="false"
@@ -489,7 +494,7 @@
:min-width="flexWidth('container_name',crud.data,'子卷号')"
>
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row.container_name)">{{ scope.row.container_name }}</el-link>
<el-link type="warning" @click="toView(scope.row.container_name)">{{ scope.row.container_name }}</el-link>
</template>
</el-table-column>
<el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
@@ -641,9 +646,9 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import crudUserStor from "@/views/wms/basedata/st/userStor/userStor";
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import crudPastivtquery from '@/views/wms/stat/pastivt/pastivtquery'
import { format } from 'date-fns';
import { format } from 'date-fns'
const defaultForm = {
workorder_id: null,
@@ -791,23 +796,23 @@ export default {
},
toView(data) {
crudPastivtquery.subRecord(data).then(res => {
if (res){
if (res) {
this.dtlVisible = true
this.childrenList = res;
this.childrenList = res
}
})
},
async syncMes(row) {
const url = 'http://10.1.3.36:8081/'+row.url
const url = 'http://10.1.3.36:8081/' + row.url
const response = await fetch(url, {
method: 'POST', // *GET, POST, PUT, DELETE, etc.
headers: {
'Content-Type': 'application/json',
'Content-Type': 'application/json'
// 'Content-Type': 'application/x-www-form-urlencoded',
},
body: row.param // body 数据类型必须与“Content-Type”头匹配
});
const data = await response.json();
})
const data = await response.json()
window.alert(JSON.stringify(data))
},
@@ -845,7 +850,7 @@ export default {
if (this.currentRow !== null) {
this.showDtlLoading = true
download('/api/subpackagerelation/download', this.crud.query).then(result => {
//debugger
// debugger
downloadFile(result, '子卷包装', 'xlsx')
this.showDtlLoading = false
}).catch(() => {

2
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue
View File

@@ -361,7 +361,7 @@ export default {
return true
},
uploadMES() {
//debugger
// debugger
const _selectData = this.$refs.table.selection
if (_selectData.length !== 1) {
return this.crud.notify('请选择一个点位进行回传！', CRUD.NOTIFICATION_TYPE.INFO)

6
lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
View File

@@ -80,7 +80,7 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" disabled/>
<el-input v-model="form.point_code" style="width: 370px;" disabled />
</el-form-item>
<el-form-item label="生产区域">
<el-select
@@ -136,7 +136,7 @@
</el-select>
</el-form-item>
<el-form-item label="顺序号" prop="sort_seq">
<el-input v-model="form.sort_seq" style="width: 370px;" disabled/>
<el-input v-model="form.sort_seq" style="width: 370px;" disabled />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
@@ -267,7 +267,7 @@ export default {
return true
},
[CRUD.HOOK.beforeSubmit]() {
//debugger
// debugger
if (this.form.point_status !== '01' && !this.form.vehicle_code) {
this.crud.notify('请输入载具编码！', CRUD.NOTIFICATION_TYPE.INFO)
return false

57
lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
View File

@@ -92,7 +92,7 @@
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation :crud="crud"/>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -110,11 +110,16 @@
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="520px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="520px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;"/>
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-select
@@ -149,13 +154,13 @@
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;"/>
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="温度">
<el-input v-model="form.temperature" style="width: 370px;"/>
<el-input v-model="form.temperature" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0"/>
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -164,34 +169,40 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
@selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55"/>
<el-table-column prop="point_code" width="120px" show-overflow-tooltip label="点位编码"/>
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" width="120px" show-overflow-tooltip label="点位编码" />
<el-table-column prop="point_status" label="点位状态">
<template slot-scope="scope">
{{ dict.label.sch_hot_point_status[scope.row.point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip/>
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
<el-table-column prop="instorage_time" label="入箱时间" width="150px" show-overflow-tooltip/>
<el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="instorage_time" label="入箱时间" width="150px" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="temperature" label="温度"/>
<el-table-column prop="last_time" label="倒计时" width="120"/>
<el-table-column prop="group_name" label="组别"/>
<el-table-column prop="ext_code" label="外部编码" width="130"/>
<el-table-column prop="temperature" label="温度" />
<el-table-column prop="last_time" label="倒计时" width="120" />
<el-table-column prop="group_name" label="组别" />
<el-table-column prop="ext_code" label="外部编码" width="130" />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注"/>
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip/>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -203,9 +214,9 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<Dialog :dialog-show.sync="dialogShow" :open-param="openParam"/>
<Dialog :dialog-show.sync="dialogShow" :open-param="openParam" />
</div>
</template>
@@ -288,7 +299,7 @@ export default {
this.crud.toQuery()
},
uploadMES() {
//debugger
// debugger
const _selectData = this.$refs.table.selection
if (_selectData.length !== 1) {
return this.crud.notify('请选择一个点位进行回传！', CRUD.NOTIFICATION_TYPE.INFO)

28
lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/AddDialog.vue
View File

@@ -167,7 +167,7 @@
<span v-show="scope.row.edit">{{ scope.row.container_name }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :min-width="flexWidth('paper_tube_or_frp',crud.data,'管件类型')" prop="paper_tube_or_frp" label="管件类型" >
<el-table-column show-overflow-tooltip :min-width="flexWidth('paper_tube_or_frp',crud.data,'管件类型')" prop="paper_tube_or_frp" label="管件类型">
<template scope="scope">
<el-select
v-show="!scope.row.edit"
@@ -188,17 +188,17 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="paper_tube_material" label="纸筒物料编码" width="190px" >
<el-table-column prop="paper_tube_material" label="纸筒物料编码" width="190px">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.paper_tube_material" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" :disabled="tube_or_FRP1()" @click="queryMater(2,scope.$index, scope.row)" />
</el-input>
<!-- <span v-show="scope.row.edit">{{ scope.row.paper_tube_material }}</span>-->
<!-- <span v-show="scope.row.edit">{{ scope.row.paper_tube_material }}</span>-->
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="paper_tube_description" align="center" :min-width="flexWidth('paper_tube_description',crud.data,'纸筒物料描述')" label="纸筒物料描述" />
<el-table-column show-overflow-tooltip :min-width="flexWidth('paper_tube_model',crud.data,'纸筒规格')" prop="paper_tube_model" label="纸筒规格" />
<el-table-column show-overflow-tooltip width="190px" prop="frp_material" label="FRP管物料编码" >
<el-table-column show-overflow-tooltip width="190px" prop="frp_material" label="FRP管物料编码">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.frp_material" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" :disabled="tube_or_FRP2()" @click="queryMater(3,scope.$index, scope.row)" />
@@ -209,7 +209,7 @@
<el-table-column show-overflow-tooltip :min-width="flexWidth('frp_description',crud.data,'FRP管物料描述')" prop="frp_description" label="FRP管物料描述" />
<el-table-column show-overflow-tooltip :min-width="flexWidth('frp_model',crud.data,'FRP管规格')" prop="frp_model" label="FRP管规格" />
<el-table-column show-overflow-tooltip :min-width="flexWidth('qzz_size',crud.data,'气胀轴尺寸')" prop="qzz_size" label="气胀轴尺寸" />
<el-table-column show-overflow-tooltip :min-width="flexWidth('up_or_down',crud.data,'上轴下轴')" prop="up_or_down" label="上轴下轴" >
<el-table-column show-overflow-tooltip :min-width="flexWidth('up_or_down',crud.data,'上轴下轴')" prop="up_or_down" label="上轴下轴">
<template scope="scope">
<el-select
v-model="scope.row.up_or_down"
@@ -228,7 +228,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="left_or_right" label="左卷右卷" :min-width="flexWidth('left_or_right',crud.data,'左卷右卷')" >
<el-table-column show-overflow-tooltip prop="left_or_right" label="左卷右卷" :min-width="flexWidth('left_or_right',crud.data,'左卷右卷')">
<template scope="scope">
<el-select
v-model="scope.row.left_or_right"
@@ -247,7 +247,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="190px" prop="frp_material" label="木箱物料编码" >
<el-table-column show-overflow-tooltip width="190px" prop="frp_material" label="木箱物料编码">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.box_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater(4,scope.$index, scope.row)" />
@@ -280,16 +280,16 @@
<span v-show="scope.row.edit">{{ scope.row.split_weight }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="190px" prop="product_name" label="产品编码" >
<el-table-column show-overflow-tooltip width="190px" prop="product_name" label="产品编码">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.product_name" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater(1, scope.$index, scope.row)" />
</el-input>
<span v-show="scope.row.edit">{{ scope.row.product_name }}</span>
<el-input v-show="!scope.row.edit" v-model="scope.row.product_name" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater(1, scope.$index, scope.row)" />
</el-input>
<span v-show="scope.row.edit">{{ scope.row.product_name }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :min-width="flexWidth('description',crud.data,'产品描述')" prop="description" label="产品描述" />
<el-table-column show-overflow-tooltip width="190px" prop="costomer_code" label="客户编码" >
<el-table-column show-overflow-tooltip width="190px" prop="costomer_code" label="客户编码">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.costomer_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryCustomer(scope.$index, scope.row)" />
@@ -681,7 +681,7 @@ export default {
}
},
tableChanged(rows) {
//debugger
// debugger
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true

18
lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
View File

@@ -232,7 +232,7 @@ export default {
},
methods: {
handleSearch() {
//debugger
// debugger
this.multipleSelection = this.multipleSelection.filter(i => {
return this.$refs.dis_table.selection.includes(i)
})
@@ -315,7 +315,7 @@ export default {
},
// 表格1的行点击事件
handleRowClick(scope) {
//debugger
// debugger
// 按钮禁用
this.isButtonDisabled = !!(scope.status !== '99')
this.isButtonDisabled1 = scope.status === '99'
@@ -331,7 +331,7 @@ export default {
},
// 表格2的行点击事件
handleSelectionChange(selection) {
//debugger
// debugger
if (selection.length > 0) {
this.isButtonDisabled = !selection.every(item => item.status === '99')
this.isButtonDisabled1 = selection.some(item => item.status === '99')
@@ -346,7 +346,7 @@ export default {
this.previousSelection = selection
}
} else {
//debugger
// debugger
if (!this.searchText) {
this.cancelSelection = []
this.cancelSelection = [...this.currentSelection]
@@ -378,17 +378,17 @@ export default {
row.index = rowIndex
},
async tableChanged(row) {
//debugger
// debugger
this.form.tableMater = this.currentSelection
if (this.currentSelection.length > row.num) {
this.crud.notify('子卷数量超过木箱的最大装卷数！', CRUD.NOTIFICATION_TYPE.WARNING)
return
}
//debugger
// debugger
this.form.checked = row.material_code
this.form.sale_order_name = this.saleOrderName
await crudPackagerelation.updateEntityList(this.form)
//debugger
// debugger
const queryParam = { sale_order_name: this.saleOrderName, type: '0' }
const res = crudSubpackagerelation.queryContainerization(queryParam)
this.openParam = res.content
@@ -398,9 +398,9 @@ export default {
this.$emit('childEvent')
},
divStruct() {
//debugger
// debugger
if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) {
//debugger
// debugger
const weightList = this.currentSelection.filter(item => item.weight === '0' || item.weight === null)
if (weightList.length > 0) {
this.crud.notify('该子卷重量不能为空，请检查子卷的分切计划信息！', CRUD.NOTIFICATION_TYPE.WARNING)

4
lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
View File

@@ -214,7 +214,7 @@ export default {
this.$emit('update:dialogShow', false)
},
submit() {
//debugger
// debugger
this.rows = this.$refs.table.selection
if (this.rows.length <= 0) {
this.crud.notify('请选择木箱信息！', CRUD.NOTIFICATION_TYPE.WARNING)
@@ -224,7 +224,7 @@ export default {
this.dialogVisible1 = true
},
confirmSubmit() {
//debugger
// debugger
this.dialogVisible1 = false
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.checkrow)

6
lms/nladmin-ui/src/views/wms/pdm/sub/index.vue
View File

@@ -227,7 +227,7 @@ export default {
this.crud.toQuery()
},
async divOpen() {
//debugger
// debugger
this.saleOrderName = this.currentRow.sale_order_name
const queryParam = { sale_order_name: this.currentRow.sale_order_name, type: '0' }
const res = await crudSubpackagerelation.queryContainerization(queryParam)
@@ -235,7 +235,7 @@ export default {
// this.divShow = true
},
divOpen1() {
//debugger
// debugger
this.saleOrderName = this.currentRow.sale_order_name
const queryParam = { sale_order_name: this.currentRow.sale_order_name, type: '0' }
crudSubpackagerelation.queryContainerization(queryParam).then(res => {
@@ -284,7 +284,7 @@ export default {
if (this.currentRow !== null) {
crud.downloadLoading = true
download('/api/packagerelation/download', this.crud.query).then(result => {
//debugger
// debugger
downloadFile(result, '子卷包装', 'xlsx')
crud.downloadLoading = false
}).catch(() => {

2
lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
View File

@@ -112,7 +112,7 @@ export default {
})
},
open() {
//debugger
// debugger
this.query.region_id = this.openParam
this.crud.toQuery()
},

2
lms/nladmin-ui/src/views/wms/pub/PointDialog.vue
View File

@@ -115,7 +115,7 @@ export default {
})
},
open() {
//debugger
// debugger
this.query.region_id = this.openParam
this.crud.toQuery()
},

2
lms/nladmin-ui/src/views/wms/riku/rikustat/index.vue
View File

@@ -78,7 +78,7 @@ export default {
},
initStatus() {
autoWeb().then(res => {
//debugger
// debugger
this.oneList = res.one
this.twoList = res.two
this.threeList = res.three

60
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -134,7 +134,7 @@
@change="hand"
/>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
</div>
@@ -220,7 +220,7 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;"/>
<el-input v-model="form.point_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="所属区域" prop="region_id">
<el-select
@@ -237,10 +237,10 @@
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'" />
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
@@ -289,17 +289,17 @@
</el-select>
</el-form-item>
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;"/>
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="载具数量" prop="vehicle_qty">
<el-input-number v-model="form.vehicle_qty" :precision="0" :controls="false" :min="0" style="width: 370px;"/>
<el-input-number v-model="form.vehicle_qty" :precision="0" :controls="false" :min="0" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料批次" prop="material_code">
<el-input v-model="form.material_code" clearable style="width: 370px;"/>
<el-input v-model="form.material_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -316,34 +316,38 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="point_code" label="点位编码" sortable width="100"/>
<el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip/>
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_type_name" label="点位类型"/>
<el-table-column prop="point_status_name" label="点位状态"/>
<el-table-column prop="lock_type_name" label="锁定类型"/>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" sortable width="100" />
<el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_type_name" label="点位类型" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<!-- <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>-->
<el-table-column prop="vehicle_code" label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
<el-table-column
prop="vehicle_code"
label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
/>
<el-table-column prop="material_code" label="物料批次"
:min-width="flexWidth('material_code',crud.data,'物料批次')"
<el-table-column
prop="material_code"
label="物料批次"
:min-width="flexWidth('material_code',crud.data,'物料批次')"
/>
<el-table-column prop="vehicle_qty" label="载具数量"/>
<el-table-column prop="product_area" label="生产区域"/>
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ scope.row.is_used == '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改人"/>
<el-table-column prop="update_time" label="修改时间" width="150"/>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column
v-permission="[]"
label="操作"
@@ -360,7 +364,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>
@@ -473,7 +477,7 @@ export default {
if (this.currentRow !== null) {
crud.downloadLoading = true
download('/api/point/download', this.crud.query).then(result => {
//debugger
// debugger
downloadFile(result, '库存', 'xlsx')
crud.downloadLoading = false
}).catch(() => {
@@ -507,7 +511,7 @@ export default {
})
},
getPointStatusAndTypeList(id, flag) {
//debugger
// debugger
if (id) {
this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag)
@@ -517,7 +521,7 @@ export default {
}
},
getPointStatusList(id, flag) {
//debugger
// debugger
crudRegion.getPointStatusSelectById(id).then(res => {
if (flag === 1) {
this.pointStatusList = res

25
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -143,8 +143,8 @@
<el-table-column prop="task_group_id" label="关联任务" width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码1" width="130" show-overflow-tooltip />
<el-table-column prop="vehicle_code2" label="载具编码2" width="100" show-overflow-tooltip />
<el-table-column prop="request_param" label="请求参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
<el-table-column prop="response_param" label="响应参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
<el-table-column prop="request_param" label="请求参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip />
<el-table-column prop="response_param" label="响应参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip />
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" width="135" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" width="135" show-overflow-tooltip />
@@ -318,31 +318,30 @@ export default {
formatSignal(row, column) {
if (row.task_type === '010911') {
if (column.property === 'response_param') {
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送'
}
if (column.property === 'request_param') {
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送'
}
} else if (row.task_type === '010904') {
if (column.property === 'request_param') {
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送'
}
} else if (row.task_type === '010901') {
if (column.property === 'response_param') {
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送'
}
}
else if (row.task_type === '010905'||row.task_type === '010913') {
} else if (row.task_type === '010905' || row.task_type === '010913') {
if (column.property === 'response_param') {
return row.response_param === '1' ? '二次分配已分配' : '二次分配未分配';
return row.response_param === '1' ? '二次分配已分配' : '二次分配未分配'
}
}
return row[column.property];
return row[column.property]
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
//debugger
// debugger
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
@@ -357,11 +356,11 @@ export default {
}
},
hand(value) {
//debugger
// debugger
this.crud.toQuery()
},
handTaskStatus(value) {
//debugger
// debugger
if (value) {
this.query.task_status = this.task_status.toString()
}

6
lms/nladmin-ui/src/views/wms/sendout/outone/index3.vue
View File

@@ -85,7 +85,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible1 = false">取 消</el-button>
<el-button type="primary" @click="unlock" v-permission="permission.confirm" >解 绑</el-button>
<el-button v-permission="permission.confirm" type="primary" @click="unlock">解 绑</el-button>
</div>
</el-dialog>
</div>
@@ -203,7 +203,7 @@ export default {
})
// 右键单击事件
lf.on('node:contextmenu', (data, e) => {
//debugger
// debugger
let item = ''
item = this.allStructMsg.find((structMsg) => structMsg.id === data.data.id)
@@ -236,7 +236,7 @@ export default {
},
initStatus() { // 初始化数据
let resion = {}
//debugger
// debugger
resion = lf.getGraphData().nodes.map(item => ({ id: item.id, struct_id: item.properties.struct_id }))
getStructByCodesFs(resion).then(res => {
this.allStructMsg = res

2
lms/nladmin-ui/src/views/wms/sendout/outtwo/index.vue
View File

@@ -148,7 +148,7 @@ export default {
})
// 右键单击事件
lf.on('node:contextmenu', (data, e) => {
//debugger
// debugger
let item = ''
item = this.allStructMsg.find((structMsg) => structMsg.id === data.data.id)

2
lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
View File

@@ -348,7 +348,7 @@ export default {
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
////debugger
// //debugger
this.billtypelist = this.dict.ST_INV_OUT_TYPE
this.crud.query.createTime = [new Date().daysAgo(30), new Date()]
this.initQuery()

106
lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
View File

@@ -10,7 +10,7 @@
>
<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>
@@ -36,11 +36,11 @@
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-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>
@@ -94,7 +94,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>
@@ -131,13 +131,13 @@
<el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}" style="margin-top: 5px;">
<el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
<el-form-item label="销售订单及行号-新" prop="new_sale_order_name">
<el-input v-model="form.new_sale_order_name" :disabled="crud.status.view > 0" class="input-with-select"/>
<el-input v-model="form.new_sale_order_name" :disabled="crud.status.view > 0" class="input-with-select" />
</el-form-item>
<el-form-item label="客户编码-新" prop="new_sale_order_name">
<el-input v-model="form.new_customer_name" :disabled="crud.status.view > 0" class="input-with-select"/>
<el-input v-model="form.new_customer_name" :disabled="crud.status.view > 0" class="input-with-select" />
</el-form-item>
<el-form-item label="客户描述-新" prop="form.new_sale_order_name">
<el-input v-model="form.new_customer_description" :disabled="crud.status.view > 0" class="input-with-select"/>
<el-input v-model="form.new_customer_description" :disabled="crud.status.view > 0" class="input-with-select" />
</el-form-item>
<el-form-item label="交货日期-新" prop="demand_date">
<el-date-picker
@@ -145,8 +145,8 @@
:disabled="crud.status.view > 0"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
value-format="yyyy-MM-dd"
/>
</el-form-item>
<el-form-item label="制造日期-新" prop="date_of_fg_inbound">
<el-date-picker
@@ -154,8 +154,8 @@
:disabled="crud.status.view > 0"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
value-format="yyyy-MM-dd"
/>
</el-form-item>
<el-form-item label="更换外包装标签" prop="isreprintpackageboxlabel">
<el-switch
@@ -164,8 +164,8 @@
inactive-value="0"
active-color="#13ce66"
:disabled="crud.status.view > 0"
inactive-color="#ff4949">
</el-switch>
inactive-color="#ff4949"
/>
</el-form-item>
<el-form-item label="更换子卷标签" prop="isunpackbox">
<el-switch
@@ -174,18 +174,18 @@
inactive-value="0"
active-color="#13ce66"
:disabled="crud.status.view > 0"
inactive-color="#ff4949">
</el-switch>
inactive-color="#ff4949"
/>
</el-form-item>
</el-form>
<el-button class="filter-item" :disabled="crud.status.view > 0" @click="allSend()" size="medium" icon="el-icon-plus" style="float: right; padding: 3px 0" type="warning">一键填充</el-button>
<el-button class="filter-item" :disabled="crud.status.view > 0" size="medium" icon="el-icon-plus" style="float: right; padding: 3px 0" type="warning" @click="allSend()">一键填充</el-button>
</el-card>
<div class="crud-opts2">
<span class="role-span">变更明细</span>
<span v-if="crud.status.cu > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<slot name="left" />
<el-button
slot="left"
class="filter-item"
@@ -207,10 +207,10 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column key="1" type="index" label="序号" width="50" align="center"/>
<el-table-column key="3" prop="material_code" label="物料编码" width="150" align="center"/>
<el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="200"/>
<el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="150"/>
<el-table-column key="1" type="index" label="序号" width="50" align="center" />
<el-table-column key="3" prop="material_code" label="物料编码" width="150" align="center" />
<el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="200" />
<el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="150" />
<el-table-column
key="10"
prop="qty"
@@ -219,80 +219,78 @@
width="120"
align="center"
/>
<el-table-column key="11" show-overflow-tooltip prop="storagevehicle_code" label="木箱号"/>
<el-table-column key="12" prop="turnout_sect_name" label="库区"/>
<el-table-column key="14" prop="turnout_struct_code" show-overflow-tooltip label="货位"/>
<el-table-column key="15" width="150" prop="sale_order_name" show-overflow-tooltip label="销售订单行号-旧"/>
<el-table-column key="11" show-overflow-tooltip prop="storagevehicle_code" label="木箱号" />
<el-table-column key="12" prop="turnout_sect_name" label="库区" />
<el-table-column key="14" prop="turnout_struct_code" show-overflow-tooltip label="货位" />
<el-table-column key="15" width="150" prop="sale_order_name" show-overflow-tooltip label="销售订单行号-旧" />
<el-table-column key="16" width="150" prop="new_sale_order_name" label="销售订单行号-新">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.new_sale_order_name" @input="saleInput(form.tableData[scope.$index])" class="input-with-select"/>
<el-input v-show="!scope.row.edit" v-model="scope.row.new_sale_order_name" class="input-with-select" @input="saleInput(form.tableData[scope.$index])" />
<span v-show="scope.row.edit">{{ scope.row.new_sale_order_name }}</span>
</template>
</el-table-column>
<el-table-column key="17" width="150" prop="customer_name" label="客户编码-旧"/>
<el-table-column key="18" width="150" prop="customer_description" label="客户名称-旧"/>
<el-table-column key="17" width="150" prop="customer_name" label="客户编码-旧" />
<el-table-column key="18" width="150" prop="customer_description" label="客户名称-旧" />
<el-table-column key="19" width="150" prop="new_customer_name" label="客户编码-新">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.new_customer_name" @input="custInput(form.tableData[scope.$index])" class="input-with-select">
</el-input>
<el-input v-show="!scope.row.edit" v-model="scope.row.new_customer_name" class="input-with-select" @input="custInput(form.tableData[scope.$index])" />
<span v-show="scope.row.edit">{{ scope.row.new_customer_name }}</span>
</template>
</el-table-column>
<el-table-column key="20" width="150" prop="new_customer_description" label="客户名称-新">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.new_customer_description" @input="custNameInput(form.tableData[scope.$index])" class="input-with-select">
</el-input>
<el-input v-show="!scope.row.edit" v-model="scope.row.new_customer_description" class="input-with-select" @input="custNameInput(form.tableData[scope.$index])" />
<span v-show="scope.row.edit">{{ scope.row.new_customer_description }}</span>
</template>
</el-table-column>
<el-table-column key="21" width="300" prop="demand_date" label="交货日期-新" >
<el-table-column key="21" width="300" prop="demand_date" label="交货日期-新">
<template scope="scope">
<el-date-picker
v-model="scope.row.demand_date"
type="date"
@change="demandChange(form.tableData[scope.$index])"
:disabled="scope.row.edit"
placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
value-format="yyyy-MM-dd"
@change="demandChange(form.tableData[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column key="24" width="300" prop="date_of_fg_inbound" label="制作日期-新" >
<el-table-column key="24" width="300" prop="date_of_fg_inbound" label="制作日期-新">
<template scope="scope">
<el-date-picker
v-model="scope.row.date_of_fg_inbound"
type="date"
:disabled="scope.row.edit"
@change="inChange(form.tableData[scope.$index])"
placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
value-format="yyyy-MM-dd"
@change="inChange(form.tableData[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column key="22" width="150" prop="isreprintpackageboxlabel" label="更换外包装标签">
<template scope="scope">
<el-switch
:disabled="scope.row.edit"
v-model="scope.row.isreprintpackageboxlabel"
:disabled="scope.row.edit"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
@change="packageChange(form.tableData[scope.$index])"
inactive-color="#ff4949">
</el-switch>
/>
</template>
</el-table-column>
<el-table-column key="23" width="150" prop="isunpackbox" label="更换子卷标签">
<template scope="scope">
<el-switch
:disabled="scope.row.edit"
v-model="scope.row.isunpackbox"
:disabled="scope.row.edit"
active-value="1"
inactive-value="0"
@change="boxChange(form.tableData[scope.$index])"
active-color="#13ce66"
inactive-color="#ff4949">
</el-switch>
inactive-color="#ff4949"
@change="boxChange(form.tableData[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" key="25" align="center" label="操作" width="160" fixed="right">
@@ -325,8 +323,8 @@
</template>
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged"/>
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged"/>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged" />
</el-dialog>
</template>
@@ -420,7 +418,7 @@ export default {
})
},
[CRUD.HOOK.afterToView]() {
//debugger
// debugger
handmovestor.getOutBillDtl({ 'changeinv_id': this.form.changeinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
@@ -432,7 +430,7 @@ export default {
})
},
bill_statusFormat(row) {
//debugger
// debugger
return this.dict.label.work_status[row.work_status]
},
quality_scodeFormat(row) {
@@ -493,7 +491,7 @@ export default {
}
},
boxChange(val) {
//debugger
// debugger
for (let i = 0; i < this.form.tableData.length; i++) {
if (this.form.tableData[i].storagevehicle_code === val.storagevehicle_code) {
this.$set(this.form.tableData[i], 'isunpackbox', val.isunpackbox)
@@ -578,7 +576,7 @@ export default {
this.form.detail_count = this.form.tableData.length
},
structChanged(row) {
//debugger
// 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)) {

2
lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue
View File

@@ -313,7 +313,7 @@ export default {
this.dtlShow = true
},
tableChanged(rows) {
//debugger
// debugger
const tablemap = new Map()
rows.forEach((item) => {
if (this.form.tableData.length !== 0) {

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

@@ -69,8 +69,8 @@
>
<el-option
v-for="item in dict.ST_INV_TYPE_MV"
:disabled="item.value === '21' || item.value === '31'"
:key="item.value"
:disabled="item.value === '21' || item.value === '31'"
:label="item.label"
:value="item.value"
/>
@@ -152,8 +152,8 @@
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
v-if="form.bill_type !== '30'"
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
@@ -457,7 +457,7 @@ export default {
this.form.detail_count = this.form.tableData.length
},
structChanged(row) {
//debugger
// 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)) {

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

@@ -208,7 +208,7 @@ export default {
this.crud.toQuery()
},
submit() {
//debugger
// debugger
this.rows = this.$refs.table.selection
if (this.rows.length <= 0) {
this.$message('请先勾选物料')

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

@@ -345,7 +345,7 @@ export default {
},
taskOpen() {
this.loadingConfirm = true
//debugger
// debugger
const a = this.currentRow
handmovestor.handdown({ 'moveinv_id': this.currentRow.moveinv_id, 'bill_type': this.currentRow.bill_type }).then(res => {
this.querytable()

34
lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDialog.vue
View File

@@ -10,7 +10,7 @@
>
<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>
@@ -36,11 +36,11 @@
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-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="scrap_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.scrap_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
<el-input v-model="form.scrap_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 +79,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>
@@ -116,9 +116,9 @@
<el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}" style="margin-top: 5px;">
<el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
<el-form-item label="不合格品缺陷描述" prop="dtl_remark">
<el-input v-model="form.dtl_remark" :disabled="crud.status.view > 0" class="input-with-select"/>
<el-input v-model="form.dtl_remark" :disabled="crud.status.view > 0" class="input-with-select" />
</el-form-item>
<!-- <el-form-item label="不合格品来源" prop="fail_source">
<!-- <el-form-item label="不合格品来源" prop="fail_source">
<el-select
v-model="form.fail_source"
class="input-with-select"
@@ -134,14 +134,14 @@
</el-select>
</el-form-item>-->
</el-form>
<el-button class="filter-item" :disabled="crud.status.view > 0" @click="allSend()" size="medium" icon="el-icon-plus" style="float: right; padding: 3px 0" type="warning">填充</el-button>
<el-button class="filter-item" :disabled="crud.status.view > 0" size="medium" icon="el-icon-plus" style="float: right; padding: 3px 0" type="warning" @click="allSend()">填充</el-button>
</el-card>
<div class="crud-opts2">
<span class="role-span">不合格品明细</span>
<span v-if="crud.status.cu > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<slot name="left" />
<el-button
slot="left"
class="filter-item"
@@ -191,8 +191,8 @@
<el-select
v-model="scope.row.fail_source"
class="input-with-select"
@input="custNameInput2(form.tableData[scope.$index])"
:disabled="crud.status.view > 0"
@input="custNameInput2(form.tableData[scope.$index])"
>
<el-option
v-for="item in dict.FAIL_SOURCE"
@@ -205,12 +205,12 @@
</el-table-column>
<el-table-column key="8" width="150" prop="remark" label="不合格品缺陷描述">
<template scope="scope">
<el-input v-model="scope.row.remark" @input="custNameInput(form.tableData[scope.$index])" :disabled="crud.status.view > 0" class="input-with-select" />
<el-input v-model="scope.row.remark" :disabled="crud.status.view > 0" class="input-with-select" @input="custNameInput(form.tableData[scope.$index])" />
</template>
</el-table-column>
<el-table-column width="150" label="是否填充" v-if="crud.status.cu > 0">
<el-table-column v-if="crud.status.cu > 0" width="150" label="是否填充">
<template scope="scope">
<el-switch v-model="scope.row.is_used" @change="changeIsUsed(scope.row)" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" />
<el-switch v-model="scope.row.is_used" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" @change="changeIsUsed(scope.row)" />
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
@@ -225,9 +225,9 @@
</template>
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged"/>
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged"/>
<UploadDialog :dialog-show.sync="viewShow" :stor-id="paramViewShow" @tableChanged="tableChanged"/>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
<StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="structChanged" />
<UploadDialog :dialog-show.sync="viewShow" :stor-id="paramViewShow" @tableChanged="tableChanged" />
</el-dialog>
</template>
@@ -412,7 +412,7 @@ export default {
this.form.detail_count = this.form.tableData.length
},
structChanged(row) {
//debugger
// 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)) {

26
lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/CheckDialog.vue
View File

@@ -9,7 +9,7 @@
>
<el-row :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span/>
<span />
</el-col>
<el-col :span="4">
<span>
@@ -35,11 +35,11 @@
label-width="85px"
label-suffix=":"
>
<el-input v-show="false" v-model="rowMst.stor_code" placeholder="仓库编码"/>
<el-input v-show="false" v-model="rowMst.stor_name" placeholder="仓库名称"/>
<el-input v-show="false" v-model="rowMst.stor_code" placeholder="仓库编码" />
<el-input v-show="false" v-model="rowMst.stor_name" placeholder="仓库名称" />
<el-form-item label="单据号" prop="plan_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="rowMst.plan_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
<el-input v-model="rowMst.plan_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>
@@ -76,7 +76,7 @@
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="rowMst.detail_count" size="mini" disabled style="width: 210px"/>
<el-input v-model="rowMst.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>
@@ -115,7 +115,7 @@
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<slot name="left" />
<!-- <el-button
slot="left"
class="filter-item"
@@ -137,12 +137,12 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column key="1" type="selection" width="55"/>
<el-table-column key="2" type="index" label="序号" width="50" align="center"/>
<el-table-column key="3" prop="material_code" label="产品编码" width="150" align="center"/>
<el-table-column key="4" prop="material_name" label="产品名称" align="center"/>
<el-table-column key="5" prop="package_box_sn" label="箱号" align="center"/>
<el-table-column key="6" prop="pcsn" label="改切批次号" align="center"/>
<el-table-column key="1" type="selection" width="55" />
<el-table-column key="2" type="index" label="序号" width="50" align="center" />
<el-table-column key="3" prop="material_code" label="产品编码" width="150" align="center" />
<el-table-column key="4" prop="material_name" label="产品名称" align="center" />
<el-table-column key="5" prop="package_box_sn" label="箱号" align="center" />
<el-table-column key="6" prop="pcsn" label="改切批次号" align="center" />
<el-table-column
key="10"
prop="qty"
@@ -217,7 +217,7 @@ export default {
watch: {
dialogShow: {
handler(newValue) {
//debugger
// debugger
this.dialogVisible = newValue
}
}

22
lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/index.vue
View File

@@ -141,16 +141,16 @@
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.plan_code }}</el-link>
</template>
</el-table-column>
<el-table-column :formatter="stateFormat" prop="bill_status" label="单据状态" :min-width="flexWidth('bill_status',crud.data,'单据状态')"/>
<el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')"/>
<el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')"/>
<el-table-column label="明细数" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')"/>
<el-table-column label="总重量" prop="total_qty" :min-width="flexWidth('total_qty',crud.data,'总重量')"/>
<el-table-column prop="input_optname" label="创建人" :min-width="flexWidth('input_optname',crud.data,'创建人')"/>
<el-table-column prop="input_time" label="创建日期" :min-width="flexWidth('input_time',crud.data,'创建日期')"/>
<el-table-column prop="confirm_optname" label="确认人" :min-width="flexWidth('confirm_optname',crud.data,'确认人')"/>
<el-table-column prop="confirm_time" label="确认时间" :min-width="flexWidth('confirm_time',crud.data,'确认时间')"/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column :formatter="stateFormat" prop="bill_status" label="单据状态" :min-width="flexWidth('bill_status',crud.data,'单据状态')" />
<el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
<el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')" />
<el-table-column label="明细数" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')" />
<el-table-column label="总重量" prop="total_qty" :min-width="flexWidth('total_qty',crud.data,'总重量')" />
<el-table-column prop="input_optname" label="创建人" :min-width="flexWidth('input_optname',crud.data,'创建人')" />
<el-table-column prop="input_time" label="创建日期" :min-width="flexWidth('input_time',crud.data,'创建日期')" />
<el-table-column prop="confirm_optname" label="确认人" :min-width="flexWidth('confirm_optname',crud.data,'确认人')" />
<el-table-column prop="confirm_time" label="确认时间" :min-width="flexWidth('confirm_time',crud.data,'确认时间')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
</el-table>
<!--分页组件-->
<pagination />
@@ -302,7 +302,7 @@ export default {
})
},
auditPass() {
//debugger
// debugger
this.mstrow = this.currentRow
this.checkShow = true
},

6
lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
View File

@@ -56,8 +56,8 @@
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
:disabled="item.value === '0003'"
:key="item.value"
:disabled="item.value === '0003'"
:label="item.label"
:value="item.value"
/>
@@ -325,7 +325,7 @@ export default {
this.form.detail_count = this.form.tableData.length
},
deleteRow(index, rows) {
//debugger
// debugger
const package_box_sn = rows[index].package_box_sn
let len = rows.length
while (len--) {
@@ -341,7 +341,7 @@ export default {
}
},
tableChanged(rows) {
//debugger
// debugger
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
let same_mater = true

2
lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
View File

@@ -167,7 +167,7 @@ export default {
this.$emit('update:dialogShow', false)
},
submit() {
//debugger
// debugger
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection
crudRawAssist.queryBoxMater(this.rows).then(res => {

2
lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
View File

@@ -388,7 +388,7 @@ export default {
})
},
allDivStruct() {
//debugger
// debugger
if (!this.sect_id) {
this.crud.notify('请先选择虚拟库区区域！', CRUD.NOTIFICATION_TYPE.INFO)
return

6
lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
View File

@@ -64,7 +64,7 @@
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
type="primary"
@@ -104,7 +104,7 @@
>
标识完成
</el-button>
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
type="warning"
@@ -321,7 +321,7 @@ export default {
this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
return
}
//debugger
// debugger
if (this.dis_row.work_status !== '01') {
this.crud.notify('只能对状态为生成的任务进行修改！', CRUD.NOTIFICATION_TYPE.INFO)
return

2
lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -467,7 +467,7 @@ export default {
// 为了整箱出库
checkoutbill.queryBox(data).then(res => {
res.forEach((item) => {
////debugger
// //debugger
if (this.form.tableData.length !== 0) {
this.flagnow = false
for (let i = 0; i < this.form.tableData.length; i++) {

2
lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
View File

@@ -266,7 +266,7 @@ export default {
})
this.fullscreenLoading = true
this.queryrow.stor_id = this.rowmst.stor_id
//debugger
// debugger
checkoutbill.manualDiv({ 'row': this.queryrow, 'rows': rows, 'stor_id': this.rowmst.stor_id }).then(res => {
this.$emit('update:dialogShow', false)
this.$emit('StructIvtClosed')

4
lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
View File

@@ -82,7 +82,7 @@
>
标示完成
</el-button>
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
type="primary"
@@ -271,7 +271,7 @@ export default {
this.currentDis = {}
return
}
//debugger
// debugger
this.currentDis = current
if (current.task_status === '04') {
this.button1 = false

2
lms/nladmin-ui/src/views/wms/st/outbill/UploadDialog.vue
View File

@@ -95,7 +95,7 @@ export default {
this.file1 = file
},
submit() {
//debugger
// debugger
if (this.beforeAvatarUpload(this.file1)) {
this.fileList.name = this.file1.name
this.fileList.url = ''

12
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -349,7 +349,7 @@
<DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
<TaskDialog :dialog-show.sync="taskShow" :open-array="openParam" :rowmst="mstrow" @TaskChanged="querytable" />
<MoneyDialog :dialog-show.sync="openMoneyDialog" :open-param-money="openParamMoney" />
<UploadDialog :dialog-show.sync="uploadDialogShow" @tableChanged="tableChanged"/>
<UploadDialog :dialog-show.sync="uploadDialogShow" @tableChanged="tableChanged" />
</div>
</template>
@@ -542,7 +542,7 @@ export default {
},
divOpen() {
checkoutbill.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
//debugger
// debugger
this.openParam = res
this.storId = this.currentRow.stor_id
this.divShow = true
@@ -590,19 +590,19 @@ export default {
}
},
printExcel(jo) {
/*if (jo.bill_type !== '1004' && jo.bill_type !== '1009') {
/* if (jo.bill_type !== '1004' && jo.bill_type !== '1009') {
if (jo.shd_dtl_num === '') {
return this.crud.notify('客户为空！', CRUD.NOTIFICATION_TYPE.INFO)
}
}*/
/* if (jo.bill_type === '1004' || jo.bill_type === '1009') {
/* if (jo.bill_type === '1004' || jo.bill_type === '1009') {
jo.shd_dtl_num = 44
}*/
jo.shd_dtl_num = 44
checkoutbill.getDisNum({ 'iostorinv_id': jo.iostorinv_id }).then(res => {
const j = Math.ceil(res.num / jo.shd_dtl_num)
//debugger
// debugger
for (let i = 0; i < j; i++) {
download('/api/checkoutbill/downloadExcel', { 'iostorinv_id': jo.iostorinv_id, 'j': i, 'pageNum': j }).then(result => {
downloadFile(result, '发货单', 'xlsx')
@@ -628,7 +628,7 @@ export default {
}
crud.downloadLoading = true
download('/api/checkoutbill/download', this.crud.query).then(result => {
//debugger
// debugger
downloadFile(result, '发货', 'xlsx')
crud.downloadLoading = false
}).catch(() => {

2
lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
View File

@@ -281,7 +281,7 @@ export default {
}
},
charge() {
//debugger
// debugger
if (!this.currentRow) {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return

2
lms/nladmin-ui/src/views/wms/st/vehiclebill/PointDialog.vue
View File

@@ -175,7 +175,7 @@ export default {
this.crud.toQuery()
},
formatQty(row) {
//debugger
// debugger
if (row.vehicle_qty === '') {
return '0'
}

13
lms/nladmin-ui/src/views/wms/statistics/ioStorQuery/index.vue
View File

@@ -119,7 +119,7 @@
/>
</el-form-item>
<el-form-item label="子卷批次">
<!-- <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>-->
<!-- <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>-->
<el-input
v-model="query.pcsn"
size="mini"
@@ -129,7 +129,7 @@
/>
</el-form-item>
<el-form-item label="sap批次">
<!-- <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>-->
<!-- <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>-->
<el-input
v-model="query.sap_pcsn"
size="mini"
@@ -171,11 +171,10 @@
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
@change="crud.toQuery"
end-placeholder="结束日期"
:default-time="['08:00:00', '20:00:00']"
>
</el-date-picker>
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
@@ -273,7 +272,7 @@ export default {
props: {
// 每页数据条数
size: 20
},idField: 'iostorinv_id', url: 'api/inandoutreturn', crudMethod: { ...inandoutreturn },
}, idField: 'iostorinv_id', url: 'api/inandoutreturn', crudMethod: { ...inandoutreturn },
optShow: {
add: false,
edit: false,
@@ -314,7 +313,7 @@ export default {
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
//debugger
// debugger
this.billtypelist = this.dict.ST_INV_IN_TYPE
},
methods: {