Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
zhaoxiaolin 1 year ago
parent 78689380b9 d18c5d85e6
commit 3708df000d
11 changed files with 128 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
Dockerfile
Unescape Escape View File

@ -1,3 +1,3 @@
FROM nginx:1.20-alpine FROM 192.168.202.36:30002/library/nginx:1.20-alpine
COPY default.conf /etc/nginx/conf.d/default.conf COPY default.conf /etc/nginx/conf.d/default.conf
ADD dist /usr/share/nginx/html ADD dist /usr/share/nginx/html

27
push-op-ui.bat
Unescape Escape View File

@ -0,0 +1,27 @@
@echo off
echo --------------------------------自定义参数，启动前先修改--------------------------------------
set imageURI=192.168.202.36:30002/op-lanju/op-ui
::echo 获取当前日期字符串
for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
::echo 获取当前时间字符串
for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
::echo 如当前小时小于10，将空格替换为0
set T=%T: =0%
::echo 显示输出日期时间字符串
set imageVersion=%D%%T%
::输出发版信息
echo 镜像库地址:%imageURI%
echo 镜像版本:%imageVersion%
echo --------------------------------执行打包--------------------------------
call npm run build:prod
dir
echo --------------------------------docker login...-------------------------------
docker login 192.168.202.36:30002 -u deploy -p Deploy@2023
echo --------------------------------docker build...-------------------------------
docker build -t %imageURI%:%imageVersion% .
echo --------------------------------docker push...--------------------------------
docker push %imageURI%:%imageVersion%
@pause
::docker pull 192.168.3.157:8001/library/nginx:1.20-alpine

8
src/api/wms/equipment.js
Unescape Escape View File

@ -50,3 +50,11 @@ export function treeselect() {
method: 'get' method: 'get'
}) })
} }
// 查询设备类型
export function getEquipmentTypeList() {
return request({
url: '/wms/equipment/getEquipmentTypeList',
method: 'get'
});
}

51
src/views/mes/prepare/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="edit-el-form">
<el-form-item label="工单编码" prop="workorderCode"> <el-form-item label="工单编码" prop="workorderCode">
<el-input <el-input
v-model="queryParams.workorderCode" v-model="queryParams.workorderCode"
@ -9,14 +9,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="工单名称" prop="workorderName">
<el-input
v-model="queryParams.workorderName"
placeholder="请输入工单名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单编码" prop="orderCode"> <el-form-item label="订单编码" prop="orderCode">
<el-input <el-input
v-model="queryParams.orderCode" v-model="queryParams.orderCode"
@ -49,16 +41,29 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item label="工单生产日期" prop="productDate"> <el-form-item label="工单生产日期" prop="productDate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.productDate" v-model="queryParams.productDate"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择工单生产日期"> placeholder="请选择工单生产日期"
style="width:205px"
>
</el-date-picker> </el-date-picker>
</el-form-item> --> </el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择单据状态"
@change="$forceUpdate()"
clearable
style="width:205px"
@keyup.enter.native="handleQuery">
<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" >搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -123,11 +128,10 @@
<el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" align="center" :index="indexMethod" label="序号"/> <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
<el-table-column label="工单编码" align="center" prop="workorderCode" width="180"/> <el-table-column label="工单编码" align="center" prop="workorderCode" width="220" fixed/>
<el-table-column label="工单名称" align="center" prop="workorderName" width="180"/>
<!-- <el-table-column label="父工单" align="center" prop="parentOrder" /> --> <!-- <el-table-column label="父工单" align="center" prop="parentOrder" /> -->
<el-table-column label="订单编码" align="center" prop="orderCode" width="180"/> <el-table-column label="订单编码" align="center" prop="orderCode" width="220"/>
<el-table-column label="产品编号" align="center" prop="productCode" width="180"/> <el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
<!-- <el-table-column label="产品类型" align="center" prop="prodType" /> --> <!-- <el-table-column label="产品类型" align="center" prop="prodType" /> -->
<el-table-column label="产品名称" align="center" prop="productName" width="180"/> <el-table-column label="产品名称" align="center" prop="productName" width="180"/>
@ -138,7 +142,11 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="班次" align="center" prop="shiftId" /> --> <!-- <el-table-column label="班次" align="center" prop="shiftId" /> -->
<el-table-column label="单据状态" align="center" prop="status" /> <el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
{{ scope.row.status == "L0" ? "待确认" : "已确认" }}
</template>
</el-table-column>
<el-table-column label="物料编号" align="center" prop="materialCode" width="180"/> <el-table-column label="物料编号" align="center" prop="materialCode" width="180"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="250"/> <el-table-column label="物料名称" align="center" prop="materialName" width="250"/>
<el-table-column label="物料规格型号" align="center" prop="materialSpc" /> <el-table-column label="物料规格型号" align="center" prop="materialSpc" />
@ -384,6 +392,13 @@ export default {
attr4: null, attr4: null,
factoryCode: null factoryCode: null
}, },
options: [{
status: "L0",
label: '待确认'
}, {
status: "L1",
label: '已确认'
}],
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验

2
src/views/plan/order/index.vue
Unescape Escape View File

@ -134,7 +134,7 @@
<el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/> <el-table-column width="200" label="物料名称" align="center" prop="prodDesc"/>
<el-table-column width="90" label="订单数量" align="center" prop="quantity"/> <el-table-column width="90" label="订单数量" align="center" prop="quantity"/>
<el-table-column width="70" label="单位" align="center" prop="unit"/> <el-table-column width="70" label="单位" align="center" prop="unit"/>
<el-table-column label="任务清单" align="center" prop="workerOrder"/> <el-table-column label="任务清单" align="center" prop="workerOrder" width="100"/>
<el-table-column width="120" label="计划生产日期" align="center" prop="planProDate"> <el-table-column width="120" label="计划生产日期" align="center" prop="planProDate">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.planProDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.planProDate, '{y}-{m}-{d}') }}</span>

2
src/views/plan/workorder/index.vue
Unescape Escape View File

@ -170,7 +170,7 @@
<el-table-column width="120" label="已生产数量" align="center" prop="quantityProduced"/> <el-table-column width="120" label="已生产数量" align="center" prop="quantityProduced"/>
<el-table-column width="120" label="派工数量" align="center" prop="quantitySplit"/> <el-table-column width="120" label="派工数量" align="center" prop="quantitySplit"/>
<el-table-column width="150" label="工艺编码" align="center" prop="routeCode"/> <el-table-column width="150" label="工艺编码" align="center" prop="routeCode"/>
<el-table-column width="150" label="工艺名称" align="center" prop="routeName"/> <el-table-column width="200" label="工艺名称" align="center" prop="routeName" />
<!-- show-overflow-tooltip --> <!-- show-overflow-tooltip -->
<el-table-column width="300" label="产线设备" align="center" > <el-table-column width="300" label="产线设备" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">

8
src/views/wms/bom/index.vue
Unescape Escape View File

@ -63,7 +63,9 @@
<el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="bomList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="BOM单号" align="center" prop="bomCode" width="120"/> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" fixed/>
<el-table-column label="BOM单号" align="center" prop="bomCode" width="120" fixed/>
<el-table-column label="产品号" align="center" prop="productCode" width="120"/> <el-table-column label="产品号" align="center" prop="productCode" width="120"/>
<el-table-column label="产品名称" align="center" prop="productDescZh" width="350"/> <el-table-column label="产品名称" align="center" prop="productDescZh" width="350"/>
<el-table-column label="组件编码" align="center" prop="component" width="120"/> <el-table-column label="组件编码" align="center" prop="component" width="120"/>
@ -263,6 +265,10 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
// 生成表头序号
indexMethod(index){
return index+1 ;
},
/** 查询BOM管理 列表 */ /** 查询BOM管理 列表 */
getList() { getList() {
this.loading = true; this.loading = true;

2
src/views/wms/customer/index.vue
Unescape Escape View File

@ -72,7 +72,7 @@
<el-table v-loading="loading" :data="customerList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" />
<el-table-column label="客户编码" align="center" prop="clientCode" /> <el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" /> <el-table-column label="客户名称" align="center" prop="clientName" />
<el-table-column label="客户简介" align="center" prop="clientDes" /> <el-table-column label="客户简介" align="center" prop="clientDes" />

36
src/views/wms/equipment/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="设备编码" prop="equipmentCode"> <el-form-item label="设备编码" prop="equipmentCode">
<el-input <el-input
v-model="queryParams.equipmentCode" v-model="queryParams.equipmentCode"
@ -17,13 +17,16 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备类型编码" prop="equipmentTypeCode"> <el-form-item label="设备类型" prop="equipmentTypeCode">
<el-input <el-select
v-model="queryParams.equipmentTypeCode" v-model="queryParams.equipmentTypeCode"
placeholder="请输入设备类型编码" placeholder="请选择设备类型"
@change="$forceUpdate()"
clearable clearable
@keyup.enter.native="handleQuery" style="width:205px"
/> @keyup.enter.native="handleQuery">
<el-option v-for="item in equipmentTypeOption" :key="item.equipmentTypeCode" :label="item.equipmentTypeName" :value="item.equipmentTypeCode"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -85,7 +88,8 @@
width="90" width="90"
align="center" align="center"
:index="indexMethod" :index="indexMethod"
label="序号"> label="序号"
>
</el-table-column> </el-table-column>
<el-table-column label="设备编码" align="center" prop="equipmentCode"> <el-table-column label="设备编码" align="center" prop="equipmentCode">
<template slot-scope="scope"> <template slot-scope="scope">
@ -96,8 +100,8 @@
>{{scope.row.equipmentCode}}</el-button> >{{scope.row.equipmentCode}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备名称" align="center" prop="equipmentName" /> <el-table-column label="设备名称" align="center" prop="equipmentName" width="120"/>
<el-table-column label="规格型号" align="center" prop="equipmentSpec" /> <el-table-column label="规格型号" align="center" prop="equipmentSpec" width="120"/>
<el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="120" /> <el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="120" />
<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="120"/> <el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="120"/>
<el-table-column label="所属工作中心编码" align="center" prop="workshopCode" width="150"/> <el-table-column label="所属工作中心编码" align="center" prop="workshopCode" width="150"/>
@ -113,7 +117,7 @@
<el-table-column label="工段" align="center" prop="workshopSection" /> <el-table-column label="工段" align="center" prop="workshopSection" />
<el-table-column label="设备位置" align="center" prop="equipmentLocation" /> <el-table-column label="设备位置" align="center" prop="equipmentLocation" />
<el-table-column label="工时单价" align="center" prop="hourlyUnitPrice" /> <el-table-column label="工时单价" align="center" prop="hourlyUnitPrice" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -390,13 +394,14 @@
</template> </template>
<script> <script>
import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment} from "@/api/wms/equipment"; import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment,getEquipmentTypeList} from "@/api/wms/equipment";
import { getWorkCenterList,listFactory} from "@/api/wms/factory"; import { getWorkCenterList,listFactory} from "@/api/wms/factory";
export default { export default {
name: "Equipment", name: "Equipment",
dicts: ['sys_normal_disable', 'equ_type'], dicts: ['sys_normal_disable', 'equ_type'],
data() { data() {
return { return {
equipmentTypeOption:[],
workCenter:[], workCenter:[],
options1: [], options1: [],
value: '', value: '',
@ -465,8 +470,17 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.getEquipmentType();
}, },
methods: { methods: {
/** 查询设备分类 */
getEquipmentType() {
getEquipmentTypeList().then(response => {
console.log(response.rows);
this.equipmentTypeOption = response.rows;
console.log(this.treeData1);
});
},
selectWorkCenter(){ selectWorkCenter(){
this.form.workshopCode = this.form.workCenter; this.form.workshopCode = this.form.workCenter;
}, },

18
src/views/wms/factory/index.vue
Unescape Escape View File

@ -18,15 +18,15 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="启用状态" prop="status"> <el-form-item label="启用状态" prop="status">
<el-input <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="请输入启用状态(1/0)" placeholder="请选择启用状态"
@change="$forceUpdate()"
clearable clearable
@keyup.enter.native="handleQuery" style="width:205px"
/> @keyup.enter.native="handleQuery">
<!-- <el-select v-model="form.status" placeholder="请选择是否启用" @change="$forceUpdate()" clearable>
<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option> <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
</el-select> --> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -71,7 +71,7 @@
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column prop="status" label="是否启用" align="center" > <el-table-column prop="status" label="是否启用" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status == 1 ? "是" : "否" }} {{ scope.row.status == 1 ? "启用" : "停用" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -177,10 +177,10 @@ export default {
}, },
options: [{ options: [{
status: "1", status: "1",
label: '是' label: '启用'
}, { }, {
status: "0", status: "0",
label: '否' label: '停用'
}], }],
// 表单参数 // 表单参数
form: {}, form: {},

8
src/views/wms/supplier/index.vue
Unescape Escape View File

@ -193,9 +193,9 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键uuid" align="center" prop="supplierId" /> --> <!-- <el-table-column label="主键uuid" align="center" prop="supplierId" /> -->
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" ></el-table-column>
<el-table-column label="供应商代码" align="center" prop="supplierCode" width="100"/> <el-table-column label="供应商编码" align="center" prop="supplierCode" width="100" />
<el-table-column label="供应商名字" align="center" prop="zhDesc" width="100"/> <el-table-column label="供应商名字" align="center" prop="zhDesc" width="100" />
<el-table-column label="英文描述" align="center" prop="enDesc" /> <el-table-column label="英文描述" align="center" prop="enDesc" />
<el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/> <el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/>
<el-table-column label="账号" align="center" prop="accountNumber" width="100"/> <el-table-column label="账号" align="center" prop="accountNumber" width="100"/>
@ -219,7 +219,7 @@
<el-table-column label="税号" align="center" prop="userDefined2" width="200"/> <el-table-column label="税号" align="center" prop="userDefined2" width="200"/>
<!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" /> <!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" />
<el-table-column label="备注" align="center" prop="remark" /> --> <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"

Write Preview
Loading…
Cancel
Save