子件入库增加和接口联调

dev-scheduling
zhangdi 1 month ago
parent e182b977e3
commit 934b5fe63d
  1. 36
      src/api/zhgd-work/childWarehousing.js
  2. 15
      src/router/views/index.js
  3. 10
      src/views/productionManagement/components/addQuantity.vue
  4. 6
      src/views/productionManagement/components/coatingMater/materialRequirements.vue
  5. 1
      src/views/productionManagement/sinTerWorkOrder/index.vue
  6. 9
      src/views/wel/components/quickAccess.vue
  7. 201
      src/views/zhgd-work/childWarehousing/index.vue

@ -0,0 +1,36 @@
import request from '@/axios';
// 查询流程卡号
export const pdaLoadCardNo = (cardNo) => {
return request({
url: `/blade-desk/pdaLoad/loadSubOrder/${cardNo}`,
method: 'get',
})
}
// 子件入库保存
export const pdaSaveSubOrder = (params) => {
return request({
url: '/blade-desk/pdaSave/saveSubOrder',
method: 'POST',
data: params
})
}
// 获取仓库列表 /stStorehouse/page
export const getStorehouseList = (params) => {
return request({
url: '/blade-wms/stStorehouse/page',
method: 'get',
params: params
})
}
// 获取库位列表 /stStorageLocation/list
export const getStorageLocationList = (params) => {
return request({
url: '/blade-wms/stStorageLocation/list',
method: 'get',
params: params
})
}

@ -211,6 +211,21 @@ export default [
},
],
},
{
path: '/childWarehousing',
component: Layout,
redirect: '/childWarehousing/index',
children: [
{
path: 'index',
component: () => import(/* webpackChunkName: "page" */ '@/views/zhgd-work/childWarehousing/index.vue'),
name: '子件入库',
meta: {
i18n: 'info',
},
},
],
},
{
path: '/work/process/leave',

@ -10,7 +10,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="7">
<el-form-item label="" prop="dayRange">
<el-radio-group v-model="ruleForm.dayRange">
<el-radio :value="3">3</el-radio>
@ -20,7 +20,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" style="float: right;">
<el-col :span="1" style="float: left;">
<el-form-item label="" prop="">
<el-button @click="handleSearch" type="primary">查询</el-button>
</el-form-item>
@ -46,8 +46,8 @@
<el-table :data="tableData" :summary-method="getSummaries" show-summary>
<el-table-column type="index" width="70" label="序号"></el-table-column>
<el-table-column label="需求单号" prop="demandCode" align="center"></el-table-column>
<el-table-column label="物料编码" prop="plateGoodsCode" align="center"></el-table-column>
<el-table-column label="物料名称" prop="addValue" align="center" >
<el-table-column label="物料编码" prop="goodsCode" align="center"></el-table-column>
<el-table-column label="物料名称" prop="goodsName" align="center" >
</el-table-column>
<el-table-column label="镀层物料需求(克)" prop="goodsDemand" align="center" >
</el-table-column>
@ -92,7 +92,7 @@ export default {
addForm: {},
tableData: [],
ruleForm: {
dayRange: '3',
dayRange: 3,
wcId: ''
},
rules: {

@ -24,7 +24,8 @@
<template #menu-left="row">
<el-button type="primary" @click="handleAdd" v-if="permission.material_demand_declaration">需求申报</el-button>
<el-button type="primary" @click="handleApprove" v-if="permission.material_batch_audit">批量一级审核</el-button>
<el-button type="primary" @click="secondHandleApprove" v-if="permission.material_batch_audit">批量二级审核</el-button>
<el-button type="primary" @click="secondHandleApprove" v-if="permission.
second_material_batch_audit">批量二级审核</el-button>
</template>
<template #menu-right>
<el-button type="warning" @click="pendingReviewFn()" >待审核</el-button>
@ -34,7 +35,8 @@
<el-button type="text" @click="closeRow(row)" v-show="row.status != 10006 && (row.status == 10000 || row.status == 10005)" v-if="permission.material_close">关闭</el-button>
<el-button type="text" v-show="row.status == 10006 || row.status == 10000 || row.status == 10005" @click="deleteRow(row)" v-if="permission.material_del">删除</el-button>
<el-button type="text" v-show="row.status == 10000" @click="approveRow(row)" v-if="permission.material_audit">一级审核</el-button>
<el-button type="text" v-show="row.status == 10001" @click="approveRow(row)" v-if="permission.material_audit">二级审核</el-button>
<el-button type="text" v-show="row.status == 10001" @click="approveRow(row)" v-if="permission.
second_material_audit">二级审核</el-button>
</template>
</avue-crud>
<coating-add-dialog v-if="showDialog" :show-dialog="showDialog" @closeDialog="closeDialog"></coating-add-dialog>

@ -360,6 +360,7 @@ export default {
overHidden: true,
hide: true,
width: 150,
seachOrder:20,
},
{

@ -42,6 +42,14 @@
<img src="@/assets/rule.png" alt="" />
<span>工序检验</span>
</div>
<div
class="access_box_item"
@click="turnPage('/childWarehousing/index')"
v-if="permission.wel_childWarehousing"
>
<img src="@/assets/craft.png" alt="" />
<span>子件入库</span>
</div>
<div
class="access_box_item"
@ -113,6 +121,7 @@ export default {
{ name: '工序接收', url: 'plan', page: '/zhgd-work/taskCope' },
{ name: '工序报工', url: 'rule', page: '/workReport/index' },
{ name: '工序检验', url: 'product', page: '/workCheck/index' },
{ name: '子件入库', url: 'product', page: '/childWarehousing/index' },
{ name: '生产追溯维护', url: 'craft', page: '/retrospectDefend/index' },
{ name: '电子档案维护', url: 'quality', page: '/eleFilesEdit/index' },
],

@ -0,0 +1,201 @@
<template>
<div>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<el-form ref="form" :model="formData" :rules="rules" inline label-width="80px">
<el-row :gutter="12">
<el-col :span="6">
<el-form-item label="流程卡号" prop="cardNo" label-width="100px">
<el-input
ref="codeFocus"
v-model="formData.cardNo"
placeholder="请扫描流程卡"
@keyup.enter.native="codeKeyUp"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="仓库" prop="shId" label-width="60px">
<!-- <el-select
v-model="formData.shId"
filterable
placeholder="请选择仓库"
@change="storeHouse"
>
<el-option
v-for="item in storeHouseOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> -->
<jhSelect
v-model="formData.shId"
placeholder="请搜索选择"
api-url="/blade-wms/stStorehouse/page"
echo-api="/blade-wms/stStorehouse/page"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="shName"
value-key="id"
search-key="id"
:debounce-time="500"
@change="(val,item) => storeHouse(val,item)"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="库位" prop="cslId" label-width="60px">
<jhSelect
v-model="formData.cslId"
placeholder="请搜索选择"
api-url="/blade-wms/stStorageLocation/list"
echo-api="/blade-wms/stStorageLocation/list"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="specifications"
value-key="id"
search-key="id"
:debounce-time="500"
:disabled="!formData.shId"
:params="{ shId: formData.shId }"
@change="(val,item) => storeHouse(val,item)"
/>
<!-- <el-select
v-model="formData.cslId"
:disabled="!formData.shId"
filterable
placeholder="请选择库位"
>
<el-option
v-for="item in locationOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> -->
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="text item">
<el-descriptions
:column="3"
label-width="100px"
:content-style="{ 'min-width': '120px' }"
class="margin-top"
border
>
<el-descriptions-item>
<template #label> 流程卡号 </template>
{{ tableObj.cardNo }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 车间订单号 </template>
{{ tableObj.woCode }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 批次 </template>
{{ tableObj.batchNo }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 零件号 </template>
{{ tableObj.partCode }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 工序名称 </template>
{{ tableObj.ppsName }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 加工班组 </template>
{{ tableObj.tsName }}
</el-descriptions-item>
<el-descriptions-item>
<template #label> 数量 </template>
{{ tableObj.makeQty }}
</el-descriptions-item>
</el-descriptions>
</div>
<span style="text-align: center; display: block; margin: 20px 0px 10px 0px">
<el-button slot="right" type="primary" @click="onSubmit"> </el-button>
</span>
</el-card>
</div>
</template>
<script>
import { pdaLoadCardNo, pdaSaveSubOrder ,getStorageLocationList} from '@/api/zhgd-work/childWarehousing';
export default {
name: 'ChildWarehousing',
data() {
return {
formData: {
cardNo: null,
shId: null,
wpId: null,
cslId: null,
},
rules: {
cardNo: [
{
required: true,
message: '请输入卡号',
},
],
shId: [
{
required: true,
message: '请选择仓库',
},
],
cslId: [
{
required: true,
message: '请选择库位',
},
],
},
tableObj: {},
storeHouseOptions: [],
locationOptions: [],
};
},
mounted() {
},
methods: {
codeKeyUp() {
if (this.formData.cardNo) {
pdaLoadCardNo(this.formData.cardNo).then(res => {
this.tableObj = res.data.data;
this.formData.wpId = res.data.data.wpId;
});
}
},
onSubmit() {
this.$refs.form.validate(valid => {
if (valid) {
pdaSaveSubOrder(this.formData).then(res => {
this.$message.success('入库成功');
this.tableObj = {};
this.formData = {
cardNo: null,
shId: null,
wpId: null,
cslId: null,
};
});
}
});
},
},
};
</script>
Loading…
Cancel
Save