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

rev:现场调试优化

Browse Source
This commit is contained in:
tuqiang
2025-09-25 14:41:06 +08:00
parent 36e3a06643
commit 57cec455e1
19 changed files with 120 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nladmin-ui/public/config.js
View File

@@ -1,9 +1,9 @@
window.g = {
dev: {
VUE_APP_BASE_API: 'http://192.168.217.2:8011'
VUE_APP_BASE_API: 'http://192.168.217.8:8010'
},
prod: {
VUE_APP_BASE_API: 'http://192.168.217.2:8011'
VUE_APP_BASE_API: 'http://192.168.217.8:8010'
}
}

4
nladmin-ui/src/store/modules/user.js
View File

@@ -28,10 +28,10 @@ const user = {
actions: {
// 登录
Login({ commit }, userInfo) {
const rememberMe = userInfo.rememberMe
// const rememberMe = userInfo.rememberMe
return new Promise((resolve, reject) => {
login(userInfo.username, userInfo.password, userInfo.code, userInfo.uuid).then(res => {
setToken(res.token, rememberMe)
// setToken(res.token, rememberMe)
commit('SET_TOKEN', res.token)
setUserInfo(res.user, commit)
// 第一次加载菜单时用到， 具体见 src 目录下的 permission.js

13
nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue
View File

@@ -24,6 +24,15 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料名称">
<el-input
v-model="query.material_type"
clearable
size="mini"
placeholder="物料类型"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
@@ -49,8 +58,8 @@
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="140" />
<el-table-column prop="material_name" label="物料名称" width="170" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="170" show-overflow-tooltip/>
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column prop="material_spec" label="物料规格" width="170" show-overflow-tooltip />
<el-table-column prop="material_type" label="物料类型" width="140" />
<el-table-column prop="measure_unit_id" label="单位编码" width="140" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="product_series_name" label="系列" />

23
nladmin-ui/src/views/wms/sch/materialRecord/index.vue
View File

@@ -26,9 +26,9 @@
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
<el-form ref="form" :model="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :rules="rules" size="mini" label-width="115px" label-suffix=":">
<el-form ref="form" :model="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :rules="rules" size="mini" label-width="115px" label-suffix=":">
<el-form-item label="区域编码" prop="region_code">
<el-select v-model="form.region_code" placeholder="请选择" style="width: 200px;">
<el-select v-model="form.region_code" placeholder="请选择" style="width: 200px;">
<el-option
v-for="item in regionList"
:key="item.region_code"
@@ -38,13 +38,16 @@
</el-select>
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="getMaterial()" />
</el-input>
<el-input v-model="form.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="getMaterial()" />
</el-input>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" disabled style="width: 200px;" />
</el-form-item>
<el-form-item label="物料类型" prop="material_type">
<el-input v-model="form.material_type" disabled style="width: 200px;" />
</el-form-item>
<el-form-item label="物料数量" prop="qty">
<el-input v-model="form.qty" style="width: 200px;" />
</el-form-item>
@@ -71,6 +74,7 @@
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="material_type" label="物料类型" :min-width="flexWidth('material_type',crud.data,'物料类型')" />
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip :min-width="flexWidth('qty',crud.data,'物料数量')" />
<el-table-column prop="measure_unit_id" label="计量单位" show-overflow-tooltip :min-width="flexWidth('measure_unit_id',crud.data,'计量单位')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
@@ -91,7 +95,7 @@
<pagination />
</div>
<ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
<MaterialDialog :dialog-show.sync="materialDialog" @materialChoose="tableChanged" />
<MaterialDialog :dialog-show.sync="materialDialog" @materialChoose="tableChanged" />
<!-- <WorkOrderDialog :dialog-show.sync="workOrderDialog" @tableChanged="tableChanged" />-->
</div>
</template>
@@ -111,6 +115,7 @@ const defaultForm = {
region_name: null,
material_code: null,
material_name: null,
material_type: null,
qty: null,
measure_unit_id: null,
remark: null,
@@ -148,6 +153,9 @@ export default {
],
material_name: [
{ required: true, message: '物料名称不能为空', trigger: 'blur' }
],
material_type: [
{ required: true, message: '物料类型不能为空', trigger: 'blur' }
]
},
workShopList: [],
@@ -226,15 +234,16 @@ export default {
}
},
tableChanged(row) {
debugger
this.form.material_name = row.material_name
this.form.material_code = row.material_code
this.form.material_type = row.material_type
},
clearMaterial() {
this.form.material_name = null
this.form.material_id = null
this.form.material_spec = null
this.form.material_code = null
this.form.material_type = null
},
setPointName(data) {
var point = this.pointList.find(item => item.point_code === data)