wilson
/
ccl-lnj-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

物料查询页面页面修改

master
wenkuan.shi 2 years ago
parent
eed6d3a16c
commit
e195f5f8b2
3 changed files with 142 additions and 143 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      src/views/modules/warehouse/location.vue
  2. 64
      src/views/modules/warehouse/stagingCode.vue
  3. 165
      src/views/modules/warehouse/warehouse.vue

56
src/views/modules/warehouse/location.vue
View File

@ -114,10 +114,10 @@
</el-pagination>
<!-- 新增和修改 -->
<el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-dialog title="新增库区" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工厂编码:" prop="site" :rules="rules.site">
<el-input v-model="modalData.site" style="width: 221px"></el-input>
<el-input v-model="modalData.site" style="width: 221px" :disabled="!isNew"></el-input>
</el-form-item>
<el-form-item label="库位编码:" prop="locationId" :rules="rules.locationId">
<el-input v-model="modalData.locationId" style="width: 221px"></el-input>
@ -125,16 +125,14 @@
<el-form-item label="库位名称:" prop="locationName" :rules="rules.locationName">
<el-input v-model="modalData.locationName" style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="仓位编码:">
<el-select v-model="modalData.warehouseId" placeholder="请选择" :rules="rules.warehouseId">
<el-form-item label="仓库编码:">
<el-select v-model="modalData.warehouseId" style="width: 221px" placeholder="请选择" :rules="rules.warehouseId">
<el-option
v-for="i in wareHouseList"
:key ="i.warehouseId"
:label="i.warehouseId"
:value="i.warehouseId">
</el-option>
<!-- <el-option label="是" value="Y"></el-option>-->
<!-- <el-option label="否" value="N"></el-option>-->
</el-select>
</el-form-item>
</el-form>
@ -154,9 +152,9 @@
<el-form-item :label="'库位描述'">
<el-input v-model="modalData.locationDescription" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'备注'">
<el-input v-model="modalData.remarks" style="width: 221px"></el-input>
</el-form-item>
<!-- <el-form-item :label="'备注'">-->
<!-- <el-input v-model="modalData.remarks" style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
@ -329,7 +327,7 @@ export default {
columnWidth: 145,
columnProp: 'active',
headerAlign: 'center',
align: "left",
align: "center",
columnLabel: '是否在用',
columnHidden: false,
columnImage: false,
@ -356,24 +354,24 @@ export default {
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001004,
serialNumber: '100001004TableRemarks',
tableId: "100001004Table",
tableName: "备注",
columnWidth: 150,
columnProp: 'remarks',
headerAlign: 'center',
align: "center",
columnLabel: '备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
// {
// userId: this.$store.state.user.name,
// functionId: 100001004,
// serialNumber: '100001004TableRemarks',
// tableId: "100001004Table",
// tableName: "备注",
// columnWidth: 150,
// columnProp: 'remarks',
// headerAlign: 'center',
// align: "center",
// columnLabel: '备注',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
{
userId: this.$store.state.user.name,
functionId: 100001004,
@ -516,7 +514,7 @@ export default {
addModal () {
this.modalData = {
flag: '1',
site: '',
site: this.$store.state.user.site,
creator: this.$store.state.user.name,
locationId: '',
locationName: '',

64
src/views/modules/warehouse/stagingCode.vue
View File

@ -81,14 +81,14 @@
<!-- 新增和修改 -->
<el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="阶段代码:" prop="site" >
<el-input v-model="modalData.phaseCode" style="width: 221px"></el-input>
<el-form-item label="阶段代码:" prop="site" :rules="rules.phaseCode">
<el-input v-model="modalData.phaseCode" style="width: 221px" ></el-input>
</el-form-item>
<el-form-item label="阶段描述:" prop="locationId" >
<el-input v-model="modalData.phaseDescription" style="width: 221px"></el-input>
<el-input v-model="modalData.phaseDescription" style="width: 221px" ></el-input>
</el-form-item>
<el-form-item label="标识码:" prop="locationName" >
<el-input v-model="modalData.identificationCode" style="width: 221px"></el-input>
<el-form-item label="标识码:" prop="locationName" :rules="rules.identificationCode" >
<el-input v-model="modalData.identificationCode" style="width: 221px" ></el-input>
</el-form-item>
</el-form>
@ -242,20 +242,20 @@ export default {
},
],
rules: {
// warehouseId:[
// {
// required: true,
// message: ' ',
// trigger: ['blur','change']
// }
// ],
// locationId:[
// {
// required: true,
// message: ' ',
// trigger: ['blur','change']
// }
// ],
phaseCode:[
{
required: true,
message: ' ',
trigger: ['blur','change']
}
],
identificationCode:[
{
required: true,
message: ' ',
trigger: ['blur','change']
}
],
// site:[
// {
// required: true,
@ -294,6 +294,16 @@ export default {
this.getDataList()
},
watch: {
modalData: {
deep: true,
handler: function (newV, oldV) {
this.modalData.phaseCode = this.modalData.phaseCode.toUpperCase()
this.modalData.identificationCode = this.modalData.identificationCode.toUpperCase()
}
}
},
methods: {
// 获取用户的bu
getSiteAndBuByUserName () {
@ -388,14 +398,14 @@ export default {
// 新增/修改方法
saveData () {
// if (this.modalData.site === '' || this.modalData.site == null) {
// this.$message.warning('请输入工厂编码！')
// return
// }
// if (this.modalData.warehouseId === '' || this.modalData.warehouseId == null) {
// this.$message.warning('请选择仓库编码！')
// return
// }
if (this.modalData.phaseCode === '' || this.modalData.phaseCode == null) {
this.$message.warning('请输入阶段代码！')
return
}
if (this.modalData.identificationCode === '' || this.modalData.identificationCode == null) {
this.$message.warning('请输入标识码！')
return
}
// if(this.modalData.locationName === ''|| this.modalData.locationName == null){
// this.$message.warning('请输入库位名称！')
// return

165
src/views/modules/warehouse/warehouse.vue
View File

@ -10,25 +10,15 @@
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<!-- <el-form-item :label="'BU'">-->
<!-- <el-select v-model="searchData.buDesc" placeholder="请选择" clearable style="width: 130px">-->
<!-- <el-option-->
<!-- v-for = "i in userBuList"-->
<!-- :key = "i.buNo"-->
<!-- :label = "i.buDesc"-->
<!-- :value = "i.buDesc">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item :label="'仓库编码:'">
<el-input v-model="searchData.warehouseId" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'工厂编号:'">
<el-input v-model="searchData.site" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'保管员:'">
<el-input v-model="searchData.keeper" clearable style="width: 120px"></el-input>
</el-form-item>
<!-- <el-form-item :label="'保管员:'">-->
<!-- <el-input v-model="searchData.keeper" clearable style="width: 120px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="是否为有效仓库:">
<el-select v-model="searchData.validStock" placeholder="请选择">
<el-option label="全部" value=""></el-option>
@ -102,12 +92,13 @@
</el-pagination>
<!-- 新增和修改 -->
<el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-dialog title="新增仓库" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工厂编码:" prop="site" :rules="rules.site">
<el-input v-model="modalData.site" style="width: 221px"></el-input>
<el-input v-model="modalData.site" style="width: 221px" :disabled="!isNew"></el-input>
</el-form-item>
<el-form-item label="仓库编码:" prop="warehouseId" :rules="rules.warehouseId">
<el-input v-model="modalData.warehouseId" style="width: 221px"></el-input>
</el-form-item>
@ -127,16 +118,16 @@
<el-input v-model="modalData.warehouseType" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'DB'">
<el-input v-model="modalData.warehouseTypeDB" style="width: 221px"></el-input>
</el-form-item>
<!-- <el-form-item :label="'DB'">-->
<!-- <el-input v-model="modalData.warehouseTypeDB" style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item :label="'管理员'">
<el-input v-model="modalData.keeper" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'公司编码'">
<el-input v-model="modalData.companyId" style="width: 221px"></el-input>
</el-form-item>
<!-- <el-form-item :label="'管理员'">-->
<!-- <el-input v-model="modalData.keeper" style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="'公司编码'">-->
<!-- <el-input v-model="modalData.companyId" style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item :label="'是否为有效仓库'">
<el-select v-model="modalData.validStock" placeholder="请选择" style="width: 221px">
<el-option label="是" value="Y"></el-option>
@ -202,7 +193,7 @@ export default {
modalFlag: false,
modalDisableFlag: false,
modalData: {
site: '',
site: this.$store.state.user.name,
warehouseId: '',
warehouseName: '',
active: '',
@ -223,7 +214,7 @@ export default {
serialNumber: '100001003TableSite',
tableId: "100001003Table",
tableName: "工厂编码",
columnWidth: 100,
columnWidth: 150,
columnProp: 'site',
headerAlign: 'center',
align: "center",
@ -241,7 +232,7 @@ export default {
serialNumber: '100001003TableWarehouseId',
tableId: "100001003Table",
tableName: "仓库编码",
columnWidth: 100,
columnWidth: 150,
columnProp: 'warehouseId',
headerAlign: 'center',
align: "center",
@ -277,7 +268,7 @@ export default {
serialNumber: '100001003TableActive',
tableId: "100001003Table",
tableName: "是否在使用",
columnWidth: 100,
columnWidth: 150,
columnProp: 'active',
headerAlign: 'center',
align: "center",
@ -307,67 +298,67 @@ export default {
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001003,
serialNumber: '100001003TableWarehouseTypeDB',
tableId: "100001003Table",
tableName: "DB",
columnWidth: 150,
columnProp: 'warehouseTypeDB',
headerAlign: 'center',
align: "left",
columnLabel: 'DB',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001003,
serialNumber: '100001003TableKeeper',
tableId: "100001003Table",
tableName: "管理员",
columnWidth: 100,
columnProp: 'keeper',
headerAlign: 'center',
align: "center",
columnLabel: '管理员',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 100001003,
serialNumber: '100001003TableCompanyId',
tableId: "100001003Table",
tableName: "公司编码",
columnWidth: 100,
columnProp: 'companyId',
headerAlign: 'center',
align: "center",
columnLabel: '公司编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
// {
// userId: this.$store.state.user.name,
// functionId: 100001003,
// serialNumber: '100001003TableWarehouseTypeDB',
// tableId: "100001003Table",
// tableName: "DB",
// columnWidth: 150,
// columnProp: 'warehouseTypeDB',
// headerAlign: 'center',
// align: "left",
// columnLabel: 'DB',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
// {
// userId: this.$store.state.user.name,
// functionId: 100001003,
// serialNumber: '100001003TableKeeper',
// tableId: "100001003Table",
// tableName: "管理员",
// columnWidth: 100,
// columnProp: 'keeper',
// headerAlign: 'center',
// align: "center",
// columnLabel: '管理员',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
// {
// userId: this.$store.state.user.name,
// functionId: 100001003,
// serialNumber: '100001003TableCompanyId',
// tableId: "100001003Table",
// tableName: "公司编码",
// columnWidth: 100,
// columnProp: 'companyId',
// headerAlign: 'center',
// align: "center",
// columnLabel: '公司编码',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
{
userId: this.$store.state.user.name,
functionId: 100001003,
serialNumber: '100001003TableValidStock',
tableId: "100001003Table",
tableName: "检验方法维护表",
columnWidth: 100,
columnWidth: 150,
columnProp: 'validStock',
headerAlign: 'center',
align: "center",
@ -403,7 +394,7 @@ export default {
serialNumber: '100001003TableCreateTime',
tableId: "100001003Table",
tableName: "创建时间",
columnWidth: 100,
columnWidth: 150,
columnProp: 'createTime',
headerAlign: 'center',
align: "center",
@ -421,7 +412,7 @@ export default {
serialNumber: '100001003TableCreator',
tableId: "100001003Table",
tableName: "创建人",
columnWidth: 80,
columnWidth: 150,
columnProp: 'creator',
headerAlign: 'center',
align: "center",
@ -523,7 +514,7 @@ export default {
addModal () {
this.modalData = {
flag: '1',
site: '',
site: this.$store.state.user.site,
creator: this.$store.state.user.name,
warehouseId: '',
warehouseName: '',

Write Preview
Loading…
Cancel
Save