mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pc-MES-zngc' of gitee.com:tangziqi/ktg-mes-ui into master

Browse Source 
Signed-off-by: 打豆豆 <3346088772@qq.com>
This commit is contained in:
打豆豆 2024-02-21 05:56:16 +00:00 committed by Gitee
commit 05943bc41b
4 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/views/mes/dv/siteConfiguration/index.vue
View File

@ -107,24 +107,25 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column label="AGV站点编码" align="center" prop="siteCode" />
label="AGV站点编码" <!-- <el-table-column-->
width="120" <!-- label="AGV站点编码11"-->
align="center" <!-- width="120"-->
key="siteCode" <!-- align="center"-->
prop="siteCode" <!-- key="siteCode"-->
v-if="1" <!-- prop="siteCode"-->
> <!-- v-if="1"-->
<template slot-scope="scope"> <!-- >-->
<el-button <!-- <template slot-scope="scope">-->
size="mini" <!-- <el-button-->
type="text" <!-- size="mini"-->
@click="handleView(scope.row)" <!-- type="text"-->
v-hasPermi="['mes:dv:route']" <!-- @click="handleView(scope.row)"-->
>{{ scope.row.siteCode }}</el-button <!-- v-hasPermi="['mes:dv:route']"-->
> <!-- >{{ scope.row.siteCode }}</el-button-->
</template> <!-- >-->
</el-table-column> <!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="AGV站点名称" align="center" prop="siteName" /> <el-table-column label="AGV站点名称" align="center" prop="siteName" />
<el-table-column label="所属线路" align="center" prop="agvlineName" /> <el-table-column label="所属线路" align="center" prop="agvlineName" />
<el-table-column label="是否启用" align="center" prop="enableFlag"> <el-table-column label="是否启用" align="center" prop="enableFlag">

17
src/views/mes/pro/proroute/routeprocess.vue
View File

@ -304,7 +304,8 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="Typefile"> <el-col :span="12">
<!-- <el-col :span="12" v-if="Typefile">-->
<el-form-item label="代码上传" prop=""> <el-form-item label="代码上传" prop="">
<el-upload <el-upload
ref="codeName" ref="codeName"
@ -470,7 +471,7 @@ export default {
lineName: "", lineName: "",
pointName: "", pointName: "",
TypeId: false, TypeId: false,
Typefile: false, // Typefile: false,
// 表单参数 // 表单参数
form: { form: {
originalName: "", originalName: "",
@ -567,12 +568,12 @@ export default {
handleNodeClick(data) { handleNodeClick(data) {
if (data.machineryTypeId == 229) { if (data.machineryTypeId == 229) {
this.TypeId = true; this.TypeId = true;
this.Typefile = false; // this.Typefile = false;
this.form.originalName = ""; this.form.originalName = "";
this.form.url = ""; this.form.url = "";
} else { } else {
this.TypeId = false; this.TypeId = false;
this.Typefile = true; // this.Typefile = true;
this.form.lineId = ""; this.form.lineId = "";
this.form.pointId = ""; this.form.pointId = "";
} }
@ -692,7 +693,7 @@ export default {
this.reset(); this.reset();
if (this.form.machineryTypeId == null) { if (this.form.machineryTypeId == null) {
this.TypeId = false; this.TypeId = false;
this.Typefile = false; // this.Typefile = false;
} }
this.open = true; this.open = true;
this.title = "添加工艺组成"; this.title = "添加工艺组成";
@ -712,14 +713,14 @@ export default {
}); });
if (row.machineryTypeId == null) { if (row.machineryTypeId == null) {
this.TypeId = false; this.TypeId = false;
this.Typefile = false; // this.Typefile = false;
} else { } else {
if (row.machineryTypeId == 229) { if (row.machineryTypeId == 229) {
this.TypeId = true; this.TypeId = true;
this.Typefile = false; // this.Typefile = false;
} else { } else {
this.TypeId = false; this.TypeId = false;
this.Typefile = true; // this.Typefile = true;
} }
} }
var name = {}; var name = {};

33
src/views/mes/pro/workorder/index.vue
View File

@ -162,7 +162,7 @@
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> <el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="计划数量" align="center" prop="quantity" /> <el-table-column label="计划数量" align="center" prop="quantity" />
<el-table-column label="调整数量" align="center" prop="quantityChanged" /> <el-table-column label="调整数量" align="center" prop="quantityChanged" />
<el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" />
<el-table-column label="批次号" align="center" width="100px" prop="batchCode" /> <el-table-column label="批次号" align="center" width="100px" prop="batchCode" />
<el-table-column label="客户编码" align="center" prop="clientCode" /> <el-table-column label="客户编码" align="center" prop="clientCode" />
<el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/> <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
@ -235,7 +235,7 @@
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'"> @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -243,11 +243,11 @@
<el-form-item label="工单名称" prop="workorderName"> <el-form-item label="工单名称" prop="workorderName">
<el-input v-model="form.workorderName" placeholder="请输入工单名称" /> <el-input v-model="form.workorderName" placeholder="请输入工单名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="来源类型" prop="orderSource"> <el-form-item label="来源类型" prop="orderSource">
<el-radio-group v-model="form.orderSource" disabled v-if="optType=='view'"> <el-radio-group v-model="form.orderSource" disabled v-if="optType=='view'">
<el-radio <el-radio
v-for="dict in dict.type.mes_workorder_sourcetype" v-for="dict in dict.type.mes_workorder_sourcetype"
@ -263,12 +263,12 @@
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="form.orderSource == 'ORDER'"> <el-col :span="8" v-if="form.orderSource == 'ORDER'">
<el-form-item label="订单编号" prop="sourceCode"> <el-form-item label="订单编号" prop="sourceCode">
<el-input v-model="form.sourceCode" placeholder="请输入订单编号" /> <el-input v-model="form.sourceCode" placeholder="请输入订单编号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled placeholder="请选择单据状态"> <el-select v-model="form.status" disabled placeholder="请选择单据状态">
@ -280,7 +280,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -307,7 +307,7 @@
<el-form-item label="产品名称" prop="productName"> <el-form-item label="产品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请选择产品" disabled/> <el-input v-model="form.productName" placeholder="请选择产品" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -319,7 +319,7 @@
<el-form-item label="单位" prop="unitOfMeasure"> <el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/> <el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -336,12 +336,12 @@
placeholder="请选择需求日期"> placeholder="请选择需求日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="批次号" prop="batchCode"> <el-form-item label="批次号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次号" /> <el-input v-model="form.batchCode" placeholder="请输入批次号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="form.orderSource == 'ORDER'"> <el-row v-if="form.orderSource == 'ORDER'">
<el-col :span="12"> <el-col :span="12">
@ -388,12 +388,12 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-tabs type="border-card" v-if="form.workorderId != null"> <el-tabs type="border-card" v-if="form.workorderId != null">
<el-tab-pane label="BOM组成"> <el-tab-pane label="BOM组成">
<Workorderbom ref="bomlist" :optType="optType" :workorder="form" @handleAddSub="handleSubAdd" ></Workorderbom> <Workorderbom ref="bomlist" :optType="optType" :workorder="form" @handleAddSub="handleSubAdd" ></Workorderbom>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物料需求"> <el-tab-pane label="物料需求">
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -652,6 +652,7 @@ export default {
} }
getWorkorder(row.workorderId).then(response => { getWorkorder(row.workorderId).then(response => {
this.form = response.data; this.form = response.data;
this.form.workorderType = 'SELF'
this.open = true; this.open = true;
this.title = "修改生产工单"; this.title = "修改生产工单";
this.optType="edit"; this.optType="edit";
@ -723,7 +724,7 @@ export default {
this.form.productCode = obj.itemCode; this.form.productCode = obj.itemCode;
this.form.productName = obj.itemName; this.form.productName = obj.itemName;
this.form.productSpc = obj.specification; this.form.productSpc = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure; this.form.unitOfMeasure = obj.unitOfMeasure;
} }
}, },
//客户选择弹出框 //客户选择弹出框

32
src/views/mes/wm/productrecpt/index.vue
View File

@ -58,7 +58,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:wm:productrecpt:edit']" v-hasPermi="['mes:productrecpt:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -69,7 +69,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:wm:productrecpt:remove']" v-hasPermi="['mes:productrecpt:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -110,7 +110,7 @@
icon="el-icon-video-play" icon="el-icon-video-play"
v-if="scope.row.status =='PREPARE'" v-if="scope.row.status =='PREPARE'"
@click="handleExecute(scope.row)" @click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:productrecpt:edit']" v-hasPermi="['mes:productrecpt:edit']"
>执行入库</el-button> >执行入库</el-button>
<el-button <el-button
size="mini" size="mini"
@ -118,7 +118,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="scope.row.status =='PREPARE'" v-if="scope.row.status =='PREPARE'"
v-hasPermi="['mes:wm:productrecpt:edit']" v-hasPermi="['mes:productrecpt:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
@ -126,12 +126,12 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-if="scope.row.status =='PREPARE'" v-if="scope.row.status =='PREPARE'"
v-hasPermi="['mes:wm:productrecpt:remove']" v-hasPermi="['mes:productrecpt:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -154,7 +154,7 @@
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'"> @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -188,7 +188,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
@ -197,13 +197,13 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider> <el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider>
<el-card shadow="always" v-if="form.recptId !=null" class="box-card"> <el-card shadow="always" v-if="form.recptId !=null" class="box-card">
<Productrecptline :recptId="form.recptId" :optType="optType" :workorderId="form.workorderId" :itemId="form.itemId"></Productrecptline> <Productrecptline :recptId="form.recptId" :optType="optType" :workorderId="form.workorderId" :itemId="form.itemId"></Productrecptline>
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button> <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button> <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -302,16 +302,16 @@ export default {
}); });
}, },
getWarehouseList(){ getWarehouseList(){
getTreeList().then( response =>{ getTreeList().then( response =>{
this.warehouseOptions = response.data; this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{ this.warehouseOptions.map(w =>{
w.children.map(l =>{ w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName'); let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr); l.children = JSON.parse(lstr);
}); });
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName'); let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr); w.children = JSON.parse(wstr);
}); });
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName'); let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -462,7 +462,7 @@ export default {
} }
}, },
//选择默认的仓库、库区、库位 //选择默认的仓库、库区、库位
handleWarehouseChanged(obj){ handleWarehouseChanged(obj){
if(obj !=null){ if(obj !=null){
this.form.warehouseId = obj[0]; this.form.warehouseId = obj[0];
this.form.locationId = obj[1]; this.form.locationId = obj[1];