suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓库问题修改

Browse Source
dev-scheduling
zhangdi 3 weeks ago
parent 80478e6fb6
commit e5b2c4316d
8 changed files with 179 additions and 94 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. 1
      src/views/basicData/components/addEditDialog.vue
  2. 4
      src/views/basicData/components/inventory.vue
  3. 6
      src/views/inboundOutboundManagement/components/addEditDialog.vue
  4. 2
      src/views/inboundOutboundManagement/otherReceiving.vue
  5. 42
      src/views/warehouseManagement/additionalPlan/components/addEditDialog.vue
  6. 47
      src/views/warehouseManagement/components/borrowDialog.vue
  7. 48
      src/views/warehouseManagement/teamRequest/components/addEditDialog.vue
  8. 123
      src/views/warehouseManagement/workwearPlan/index.vue

1
src/views/basicData/components/addEditDialog.vue
Unescape View File

@ -67,6 +67,7 @@
<el-form-item
:prop="`tableData[${scope.$index}].goodsCode`"
:rules="formRules.goodsCode"
style="margin-bottom: 1px;"
>
<jhSelect
v-model="scope.row.goodsCode"

4
src/views/basicData/components/inventory.vue
Unescape View File

@ -20,7 +20,8 @@
<el-button type="primary" @click="handleAdd">新增</el-button>
</template>
<template #goodsCode-form="{ type, disabled }">
<jhSelect
<span>
<jhSelect
@input="val => (form.goodsCode = val)"
:value="form.goodsCode"
placeholder="请搜索选择"
@ -38,6 +39,7 @@
@change="changeGoods"
:title="'修改'"
/>
</span>
</template>
</avue-crud>
<add-edit-dialog

6
src/views/inboundOutboundManagement/components/addEditDialog.vue
Unescape View File

@ -291,7 +291,7 @@ export default {
goodsList: [],
rules: {
shId: [{ required: true, message: '请选择入库仓库', trigger: 'blur' }],
keeper: [{ required: true, message: '请选择入库人员', trigger: 'blur' }],
keeper: [{ required: false, message: '请选择入库人员', trigger: 'blur' }],
warehousingReason: [{ required: true, message: '请选择入库原因', trigger: 'blur' }],
},
warehouseList: [],
@ -353,6 +353,10 @@ export default {
this.tableData[index].goodsName = item.goodsName;
this.tableData[index].goodsId = item.id;
this.tableData[index].materialModel = item.materialModel;
this.tableData[index].printMark = item.printMark;
this.tableData[index].powderWeight = item.powderWeight;
this.tableData[index].materialNo = item.materialNo;
this.tableData[index].thickness = item.thickness;
}
// let tmp = this.goodsList.find(item => item.goodsCode == val);
// this.tableData[index].goodsName = tmp.goodsName;

2
src/views/inboundOutboundManagement/otherReceiving.vue
Unescape View File

@ -162,7 +162,7 @@ export default {
},
{
label: '质量编号',
prop: 'stovePiNo',
prop: 'checkCode',
span: 8,
overflow: true,
search: false,

42
src/views/warehouseManagement/additionalPlan/components/addEditDialog.vue
Unescape View File

@ -65,20 +65,36 @@
</div>
<el-table :data="form.tableData" style="width: 100%" @select="selectChange">
<el-table-column type="selection" width="55px"></el-table-column>
<el-table-column prop="boCode" label="MES采购单号" align="center">
<el-table-column prop="boCode" label="MES采购单号" align="center" width="120px">
<template #default="scope">
<span>{{ scope.row.boCode }}</span>
</template>
</el-table-column>
<el-table-column prop="goodsId" label="物料编号" align="center" width="200px">
<el-table-column prop="goodsId" label="物料编号" align="center" width="120px">
<template #header>
<span><i style="color:red">*</i>物料编号</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].goodsId`" :rules="formRules.goodsId">
<el-select style="margin-top:15px;" v-model="scope.row.goodsId" placeholder="请选择" @change="(val) => changeGoods(val,scope.$index)">
<el-form-item :prop="`tableData[${scope.$index}].goodsId`" :rules="formRules.goodsId" style="margin-bottom:0px">
<!-- <el-select style="margin-top:15px;" v-model="scope.row.goodsId" placeholder="请选择" @change="(val) => changeGoods(val,scope.$index)">
<el-option v-for="item in goodsList" :key="item.id" :label="item.goodsCode" :value="item.id"></el-option>
</el-select>
</el-select> -->
<jhSelect
v-model="scope.row.goodsId"
placeholder="请搜索选择"
api-url="/blade-wms/stGoods/list"
echo-api="/blade-wms/stGoods/list"
echoParamsKey="goodsCode"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="goodsCode"
value-key="id"
search-key="goodsCode"
:debounce-time="100"
@change="(val, item) => changeGoods(val, item, scope.row, scope.$index)"
/>
</el-form-item>
</template>
</el-table-column>
@ -91,7 +107,7 @@
<el-input v-model="scope.row.grade" placeholder="请输入内容"></el-input>
</template>
</el-table-column>
<el-table-column prop="buyQty" label="采购数量" align="center" width="230px">
<el-table-column prop="buyQty" label="采购数量" align="center" width="150px">
<template #header>
<span><i style="color:red">*</i>采购数量</span>
</template>
@ -103,13 +119,13 @@
</template>
</el-table-column>
<el-table-column prop="buyCycle" label="采购周期(天)" align="center" width="230px">
<el-table-column prop="buyCycle" label="采购周期(天)" align="center" width="150px">
<template #default="scope">
<el-input-number v-model="scope.row.buyCycle" controls-position="right" @change="handleChange"
:min="1"></el-input-number>
</template>
</el-table-column>
<el-table-column prop="planArea" label="计划区域" align="center">
<el-table-column prop="planArea" label="计划区域" align="center" width="150px">
<template #header>
<span><i style="color:red">*</i>计划区域</span>
</template>
@ -119,7 +135,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="memo" label="备注" align="center">
<el-table-column prop="memo" label="备注" align="center" width="150px">
<template #default="scope">
<el-input v-model="scope.row.memo" placeholder="请输入内容"></el-input>
</template>
@ -259,10 +275,10 @@ export default {
})
},
// 选择物料
changeGoods(val,index){
let tmp = this.goodsList.find(item => item.id == val)
console.log('tmp===========',tmp)
console.log('index===========',index)
changeGoods(val, tmp, row, index){
// let tmp = this.goodsList.find(item => item.id == val)
// console.log('tmp===========',tmp)
// console.log('index===========',index)
if(tmp){
this.form.tableData[index].partName = tmp.goodsName
this.form.tableData[index].specifications = tmp.specifications

47
src/views/warehouseManagement/components/borrowDialog.vue
Unescape View File

@ -47,9 +47,25 @@
<span><i style="color:red">*</i>物料编号</span>
</template> -->
<template #default="scope">
<el-select v-model="scope.row.goodsCode" placeholder="请选择" @change="(val) => changeGoods(val,scope.$index)">
<!-- <el-select v-model="scope.row.goodsCode" placeholder="请选择" @change="(val) => changeGoods(val,scope.$index)">
<el-option v-for="item in goodsList" :key="item.id" :label="item.goodsCode" :value="item.goodsCode"></el-option>
</el-select>
</el-select> -->
<jhSelect
v-model="scope.row.goodsCode"
placeholder="请搜索选择"
api-url="/blade-wms/stGoods/list"
echo-api="/blade-wms/stGoods/list"
echoParamsKey="goodsCode"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="goodsCode"
value-key="goodsCode"
search-key="goodsCode"
:debounce-time="100"
@change="(val, item) => changeGoods(val, item, scope.row, scope.$index)"
/>
</template>
</el-table-column>
<el-table-column prop="goodsName" label="物料名称" align="center"></el-table-column>
@ -171,19 +187,22 @@ export default {
return Array.from(seen.values());
},
// 切换物料
changeGoods(val,index){
let tmp = this.goodsList.find(item => item.goodsCode == val)
console.log('tmp--------',tmp)
this.tableData[index].goodsName = tmp.goodsName
this.tableData[index].goodsId = tmp.id
this.tableData[index].unitName = tmp.unitName
this.tableData[index].materialModel = tmp.materialModel
getWarehouseList({
changeGoods(val, tmp, row, index){
if (tmp != undefined) {
this.tableData[index].goodsName = tmp.goodsName
this.tableData[index].goodsId = tmp.id
this.tableData[index].unitName = tmp.unitName
this.tableData[index].materialModel = tmp.materialModel
getWarehouseList({
goodsCode:val
}).then(res =>{
console.log('res-----------',res)
this.tableData[index].shList = res.data.data
})
}).then(res =>{
console.log('res-----------',res)
this.tableData[index].shList = res.data.data
})
}
// let tmp = this.goodsList.find(item => item.goodsCode == val)
},
// 切换库房
changeWare(val,index){

48
src/views/warehouseManagement/teamRequest/components/addEditDialog.vue
Unescape View File

@ -62,12 +62,27 @@
<span><i style="color:red">*</i>物料编号</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.goodsCode" placeholder="请选择" style="width: 100%"
<!-- <el-select v-model="scope.row.goodsCode" placeholder="请选择" style="width: 100%"
@change="(val) => changeGoods(val,scope.$index)">
<el-option v-for="item in goodsList" :key="item.id" :label="item.goodsCode" :value="item.goodsCode"></el-option>
<!-- <el-option label="物料二" value="2">
</el-option> -->
</el-select>
</el-select> -->
<jhSelect
v-model="scope.row.goodsId"
placeholder="请搜索选择"
api-url="/blade-wms/stGoods/list"
echo-api="/blade-wms/stGoods/list"
echoParamsKey="goodsCode"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="goodsCode"
value-key="id"
search-key="goodsCode"
:debounce-time="100"
@change="(val, item) => changeGoods(val, item, scope.row, scope.$index)"
/>
</template>
</el-table-column>
<el-table-column prop="goodsName" label="物料名称" align="center"></el-table-column>
@ -170,14 +185,23 @@ export default {
this.getMaterialList()
},
methods: {
changeGoods(val,index){
let tmp = this.goodsList.find(item => item.goodsCode == val)
this.tableData[index].goodsName = tmp.goodsName
this.tableData[index].goodsId = tmp.id
this.tableData[index].materialModel = tmp.materialModel
this.tableData[index].specifications = tmp.specifications
this.tableData[index].currentQuantity = tmp.currentQuantity
this.tableData[index].avlQuantity = tmp.avlQuantity
changeGoods(val, item, row, index){
console.log(val, item, row, index);
if (item != undefined) {
this.tableData[index].goodsName = item.goodsName;
this.tableData[index].goodsId = item.id
this.tableData[index].specifications = item.specifications;
this.tableData[index].currentQuantity = item.currentQuantity
this.tableData[index].materialModel = item.materialModel;
this.tableData[index].avlQuantity = item.avlQuantity
}
// let tmp = this.goodsList.find(item => item.goodsCode == val)
// this.tableData[index].goodsName = tmp.goodsName
// this.tableData[index].goodsId = tmp.id
// this.tableData[index].materialModel = tmp.materialModel
// this.tableData[index].specifications = tmp.specifications
// this.tableData[index].currentQuantity = tmp.currentQuantity
// this.tableData[index].avlQuantity = tmp.avlQuantity
},
getMaterialList(){
getMaterialList().then(res => {

123
src/views/warehouseManagement/workwearPlan/index.vue
Unescape View File

@ -55,14 +55,30 @@
<span><i style="color: red">*</i>工装号</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.moCode" @change="val => changeMoData(val, scope.$index)">
<!-- <el-select v-model="scope.row.moCode" @change="val => changeMoData(val, scope.$index)">
<el-option
v-for="item in goodsList"
:key="item.id"
:label="item.goodsCode"
:value="item.goodsCode"
></el-option>
</el-select>
</el-select> -->
<jhSelect
v-model="scope.row.moCode"
placeholder="请搜索选择"
api-url="/blade-wms/stGoods/list"
echo-api="/blade-wms/stGoods/list"
echoParamsKey="goodsCode"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="goodsCode"
value-key="id"
search-key="goodsCode"
:debounce-time="100"
@change="(val, item) => changeMoData(val, item, scope.row, scope.$index)"
/>
</template>
</el-table-column>
<el-table-column align="center" label="工装名称" prop="moName"></el-table-column>
@ -122,9 +138,9 @@
<el-select v-model="scope.row.quaLevel">
<el-option
v-for="item in quaLevelList"
:key="item.id"
:key="item.name"
:label="item.name"
:value="item.id"
:value="item.name"
></el-option>
</el-select>
</template>
@ -288,36 +304,36 @@ export default {
},
],
},
{
label: '零件号',
prop: 'partCode',
search: true,
sortable: true,
overHidden: true,
width: 200,
rules: [
{
required: true,
message: '请输入零件号',
trigger: 'blur',
},
],
},
{
label: '零件名称',
prop: 'partName',
search: true,
sortable: true,
overHidden: true,
width: 200,
rules: [
{
required: true,
message: '请输入零件名称',
trigger: 'blur',
},
],
},
// {
// label: '零件号',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 200,
// rules: [
// {
// required: true,
// message: '请输入零件号',
// trigger: 'blur',
// },
// ],
// },
// {
// label: '零件名称',
// prop: 'partName',
// search: true,
// sortable: true,
// overHidden: true,
// width: 200,
// rules: [
// {
// required: true,
// message: '请输入零件名称',
// trigger: 'blur',
// },
// ],
// },
{
label: '计划类型',
prop: 'planTypeName',
@ -461,21 +477,21 @@ export default {
},
],
},
{
label: '创建人员',
prop: 'createMan',
search: false,
sortable: true,
overHidden: true,
width: 200,
rules: [
{
required: true,
message: '请输入建立人员',
trigger: 'blur',
},
],
},
// {
// label: '创建人员',
// prop: 'createMan',
// search: false,
// sortable: true,
// overHidden: true,
// width: 200,
// rules: [
// {
// required: true,
// message: '请输入建立人员',
// trigger: 'blur',
// },
// ],
// },
],
},
};
@ -630,9 +646,12 @@ export default {
}
});
},
changeMoData(val, index) {
let tmp = this.goodsList.find(item => item.goodsCode == val);
this.tableData[index].moName = tmp.goodsName;
changeMoData(val, tmp, row, index) {
// let tmp = this.goodsList.find(item => item.goodsCode == val);
if (tmp != undefined) {
this.tableData[index].moName = tmp.goodsName;
}
// this.tableData[index].moName = tmp.goodsName;
},
insertEvent() {
const record = { _select: false };

Write Preview
Loading…
Cancel
Save