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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/views/basicData/components/addEditDialog.vue
  2. 2
      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. 29
      src/views/warehouseManagement/components/borrowDialog.vue
  7. 48
      src/views/warehouseManagement/teamRequest/components/addEditDialog.vue
  8. 121
      src/views/warehouseManagement/workwearPlan/index.vue

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

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

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

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

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

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

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

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

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

@ -65,20 +65,36 @@
</div> </div>
<el-table :data="form.tableData" style="width: 100%" @select="selectChange"> <el-table :data="form.tableData" style="width: 100%" @select="selectChange">
<el-table-column type="selection" width="55px"></el-table-column> <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"> <template #default="scope">
<span>{{ scope.row.boCode }}</span> <span>{{ scope.row.boCode }}</span>
</template> </template>
</el-table-column> </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> <template #header>
<span><i style="color:red">*</i>物料编号</span> <span><i style="color:red">*</i>物料编号</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].goodsId`" :rules="formRules.goodsId"> <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-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-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> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@ -91,7 +107,7 @@
<el-input v-model="scope.row.grade" placeholder="请输入内容"></el-input> <el-input v-model="scope.row.grade" placeholder="请输入内容"></el-input>
</template> </template>
</el-table-column> </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> <template #header>
<span><i style="color:red">*</i>采购数量</span> <span><i style="color:red">*</i>采购数量</span>
</template> </template>
@ -103,13 +119,13 @@
</template> </template>
</el-table-column> </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"> <template #default="scope">
<el-input-number v-model="scope.row.buyCycle" controls-position="right" @change="handleChange" <el-input-number v-model="scope.row.buyCycle" controls-position="right" @change="handleChange"
:min="1"></el-input-number> :min="1"></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="planArea" label="计划区域" align="center"> <el-table-column prop="planArea" label="计划区域" align="center" width="150px">
<template #header> <template #header>
<span><i style="color:red">*</i>计划区域</span> <span><i style="color:red">*</i>计划区域</span>
</template> </template>
@ -119,7 +135,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="memo" label="备注" align="center"> <el-table-column prop="memo" label="备注" align="center" width="150px">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.memo" placeholder="请输入内容"></el-input> <el-input v-model="scope.row.memo" placeholder="请输入内容"></el-input>
</template> </template>
@ -259,10 +275,10 @@ export default {
}) })
}, },
// 选择物料 // 选择物料
changeGoods(val,index){ changeGoods(val, tmp, row, index){
let tmp = this.goodsList.find(item => item.id == val) // let tmp = this.goodsList.find(item => item.id == val)
console.log('tmp===========',tmp) // console.log('tmp===========',tmp)
console.log('index===========',index) // console.log('index===========',index)
if(tmp){ if(tmp){
this.form.tableData[index].partName = tmp.goodsName this.form.tableData[index].partName = tmp.goodsName
this.form.tableData[index].specifications = tmp.specifications this.form.tableData[index].specifications = tmp.specifications

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

@ -47,9 +47,25 @@
<span><i style="color:red">*</i>物料编号</span> <span><i style="color:red">*</i>物料编号</span>
</template> --> </template> -->
<template #default="scope"> <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-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> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsName" label="物料名称" align="center"></el-table-column> <el-table-column prop="goodsName" label="物料名称" align="center"></el-table-column>
@ -171,9 +187,8 @@ export default {
return Array.from(seen.values()); return Array.from(seen.values());
}, },
// 切换物料 // 切换物料
changeGoods(val,index){ changeGoods(val, tmp, row, index){
let tmp = this.goodsList.find(item => item.goodsCode == val) if (tmp != undefined) {
console.log('tmp--------',tmp)
this.tableData[index].goodsName = tmp.goodsName this.tableData[index].goodsName = tmp.goodsName
this.tableData[index].goodsId = tmp.id this.tableData[index].goodsId = tmp.id
this.tableData[index].unitName = tmp.unitName this.tableData[index].unitName = tmp.unitName
@ -184,6 +199,10 @@ export default {
console.log('res-----------',res) console.log('res-----------',res)
this.tableData[index].shList = res.data.data this.tableData[index].shList = res.data.data
}) })
}
// let tmp = this.goodsList.find(item => item.goodsCode == val)
}, },
// 切换库房 // 切换库房
changeWare(val,index){ 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> <span><i style="color:red">*</i>物料编号</span>
</template> </template>
<template #default="scope"> <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)"> @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 v-for="item in goodsList" :key="item.id" :label="item.goodsCode" :value="item.goodsCode"></el-option>
<!-- <el-option label="物料二" value="2"> </el-select> -->
</el-option> --> <jhSelect
</el-select> 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> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsName" label="物料名称" align="center"></el-table-column> <el-table-column prop="goodsName" label="物料名称" align="center"></el-table-column>
@ -170,14 +185,23 @@ export default {
this.getMaterialList() this.getMaterialList()
}, },
methods: { methods: {
changeGoods(val,index){ changeGoods(val, item, row, index){
let tmp = this.goodsList.find(item => item.goodsCode == val) console.log(val, item, row, index);
this.tableData[index].goodsName = tmp.goodsName if (item != undefined) {
this.tableData[index].goodsId = tmp.id this.tableData[index].goodsName = item.goodsName;
this.tableData[index].materialModel = tmp.materialModel this.tableData[index].goodsId = item.id
this.tableData[index].specifications = tmp.specifications this.tableData[index].specifications = item.specifications;
this.tableData[index].currentQuantity = tmp.currentQuantity this.tableData[index].currentQuantity = item.currentQuantity
this.tableData[index].avlQuantity = tmp.avlQuantity 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(){
getMaterialList().then(res => { getMaterialList().then(res => {

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

@ -55,14 +55,30 @@
<span><i style="color: red">*</i>工装号</span> <span><i style="color: red">*</i>工装号</span>
</template> </template>
<template #default="scope"> <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 <el-option
v-for="item in goodsList" v-for="item in goodsList"
:key="item.id" :key="item.id"
:label="item.goodsCode" :label="item.goodsCode"
:value="item.goodsCode" :value="item.goodsCode"
></el-option> ></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> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工装名称" prop="moName"></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-select v-model="scope.row.quaLevel">
<el-option <el-option
v-for="item in quaLevelList" v-for="item in quaLevelList"
:key="item.id" :key="item.name"
:label="item.name" :label="item.name"
:value="item.id" :value="item.name"
></el-option> ></el-option>
</el-select> </el-select>
</template> </template>
@ -288,36 +304,36 @@ export default {
}, },
], ],
}, },
{ // {
label: '零件号', // label: '零件号',
prop: 'partCode', // prop: 'partCode',
search: true, // search: true,
sortable: true, // sortable: true,
overHidden: true, // overHidden: true,
width: 200, // width: 200,
rules: [ // rules: [
{ // {
required: true, // required: true,
message: '请输入零件号', // message: '请输入零件号',
trigger: 'blur', // trigger: 'blur',
}, // },
], // ],
}, // },
{ // {
label: '零件名称', // label: '零件名称',
prop: 'partName', // prop: 'partName',
search: true, // search: true,
sortable: true, // sortable: true,
overHidden: true, // overHidden: true,
width: 200, // width: 200,
rules: [ // rules: [
{ // {
required: true, // required: true,
message: '请输入零件名称', // message: '请输入零件名称',
trigger: 'blur', // trigger: 'blur',
}, // },
], // ],
}, // },
{ {
label: '计划类型', label: '计划类型',
prop: 'planTypeName', prop: 'planTypeName',
@ -461,21 +477,21 @@ export default {
}, },
], ],
}, },
{ // {
label: '创建人员', // label: '创建人员',
prop: 'createMan', // prop: 'createMan',
search: false, // search: false,
sortable: true, // sortable: true,
overHidden: true, // overHidden: true,
width: 200, // width: 200,
rules: [ // rules: [
{ // {
required: true, // required: true,
message: '请输入建立人员', // message: '请输入建立人员',
trigger: 'blur', // trigger: 'blur',
}, // },
], // ],
}, // },
], ],
}, },
}; };
@ -630,9 +646,12 @@ export default {
} }
}); });
}, },
changeMoData(val, index) { changeMoData(val, tmp, row, index) {
let tmp = this.goodsList.find(item => item.goodsCode == val); // let tmp = this.goodsList.find(item => item.goodsCode == val);
if (tmp != undefined) {
this.tableData[index].moName = tmp.goodsName; this.tableData[index].moName = tmp.goodsName;
}
// this.tableData[index].moName = tmp.goodsName;
}, },
insertEvent() { insertEvent() {
const record = { _select: false }; const record = { _select: false };

Write Preview
Loading…
Cancel
Save