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

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

@@ -399,7 +399,7 @@ export default {
logOperation.downloadData().then(result => {
// debugger
downloadFile(result, '导出数据', 'xlsx')
});
})
},
clearParam() {
queryParam = {

4
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">

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

@@ -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"

7
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" />

25
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">
@@ -208,10 +209,14 @@
</el-table-column>
<el-table-column label="操作">
<template scope="scope">
<el-button v-if="scope.row.result==false && scope.row.url" type="danger"
<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>
size="mini"
icon="el-icon-position"
@click.native.prevent="syncMes(scope.row)"
>同步</el-button>
</template>
</el-table-column>
</el-table>
@@ -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,
@@ -793,7 +798,7 @@ export default {
crudPastivtquery.subRecord(data).then(res => {
if (res) {
this.dtlVisible = true
this.childrenList = res;
this.childrenList = res
}
})
},
@@ -802,12 +807,12 @@ export default {
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))
},

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

@@ -110,8 +110,13 @@
</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;" />
@@ -164,8 +169,14 @@
</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
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="点位状态">

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

@@ -328,10 +328,14 @@
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>-->
<el-table-column prop="vehicle_code" label="载具编码"
<el-table-column
prop="vehicle_code"
label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
/>
<el-table-column prop="material_code" label="物料批次"
<el-table-column
prop="material_code"
label="物料批次"
:min-width="flexWidth('material_code',crud.data,'物料批次')"
/>
<el-table-column prop="vehicle_qty" label="载具数量" />

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

@@ -318,26 +318,25 @@ 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 }) {

2
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>

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

@@ -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,11 +174,11 @@
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>
@@ -225,7 +225,7 @@
<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>
@@ -233,15 +233,13 @@
<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>
@@ -250,11 +248,11 @@
<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="制作日期-新">
@@ -263,36 +261,36 @@
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">

4
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"

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

@@ -134,7 +134,7 @@
</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>
@@ -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">

2
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"
/>

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

@@ -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>