Merge remote-tracking branch 'origin/zhairh' into busUser

wms_pzh
x_z 2 years ago
commit 0a26978d3a

@ -1436,6 +1436,55 @@ export const asyncRouterMap = [
authRule: ["invManage/invGoodsPlacement"] authRule: ["invManage/invGoodsPlacement"]
} }
}, },
{
path: "/invMaintenance",
component: Empty,
name: "库存养护",
icon: "",
meta: {
authRule: ["invMaintenance/manage"]
},
children: [
{
path: "/maintenanceOrder",
component: Empty,
name: "养护记录",
icon: "",
meta: {
authRule: ["invMaintenance/order"]
},
children: [
{
path: "maintenanceOrderNew",
component: invGoodsPlacement,
name: "新增养护记录",
icon: "",
meta: {
authRule: ["invMaintenance/orderNew"]
},
},
{
path: "maintenanceOrderAudit",
component: invGoodsPlacement,
name: "审核养护记录",
icon: "",
meta: {
authRule: ["invMaintenance/orderAudit"]
},
}
]
},
{
path: "maintenanceOrderCompleted",
component: invGoodsPlacement,
name: "养护记录查询",
icon: "",
meta: {
authRule: ["invMaintenance/orderCompleted"]
}
}
]
},
] ]
}, },
{ {

@ -531,7 +531,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10":"手动补单" "10":"手动补单",
"11": "仓库盘点"
}, },
busTypes: [], busTypes: [],
enableDept: false, enableDept: false,

@ -436,7 +436,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10":"手动补单" "10":"手动补单",
"11": "仓库盘点"
}, },
exportQuery: { exportQuery: {
orderId: "", orderId: "",

@ -333,7 +333,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单" "10": "手动补单",
"11": "仓库盘点"
}, },
storageList: [], storageList: [],
subInvList: [], subInvList: [],

@ -448,7 +448,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单" "10": "手动补单",
"11": "仓库盘点"
}, },
// //
unitquery: {key: "", page: 1, limit: 20}, unitquery: {key: "", page: 1, limit: 20},

@ -351,7 +351,8 @@ export default {
"6": "缺量补录单据", "6": "缺量补录单据",
"7": "UDI供应商平台", "7": "UDI供应商平台",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单" "10": "手动补单",
"11": "仓库盘点"
}, },
deleteData: { deleteData: {
id: "", id: "",

@ -22,6 +22,12 @@
width="500" width="500"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
width="120" width="120"

@ -116,8 +116,7 @@
<el-card> <el-card>
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderIdFk" width="180"></el-table-column> <el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180" <el-table-column label="批次号" prop="batchNo" width="180"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
@ -142,14 +141,6 @@
>详情 >详情
</el-button </el-button
> >
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.id)"
>删除
</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -400,6 +391,7 @@ export default {
this.codeQuery = { this.codeQuery = {
orderIdFk: row.orderIdFk, orderIdFk: row.orderIdFk,
productId: row.productId, productId: row.productId,
batchNo: row.batchNo,
edit: false edit: false
}; };
this.codesVisible = true; this.codesVisible = true;

@ -98,8 +98,7 @@
<el-card> <el-card>
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderIdFk" width="180"></el-table-column> <el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="180" <el-table-column label="批次号" prop="batchNo" width="180"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column> <el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
@ -371,6 +370,7 @@ export default {
this.codeQuery = { this.codeQuery = {
orderIdFk: row.orderIdFk, orderIdFk: row.orderIdFk,
productId: row.productId, productId: row.productId,
batchNo: row.batchNo,
edit: false edit: false
}; };
this.codesVisible = true; this.codesVisible = true;

Loading…
Cancel
Save