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

bug修改

Browse Source
master
zhaoxiaolin 8 months ago
parent b3c0980cfc
commit 498cf34b5c
8 changed files with 90 additions and 55 deletions
Show Stats Download Patch File Download Diff File

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

@ -130,10 +130,14 @@
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
<el-table-column label="工单编码" align="center" prop="workorderCode" width="200" fixed/>
<el-table-column label="订单编码" align="center" prop="workorderCodeSap" width="200" fixed/>
<el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
<el-table-column label="产品名称" align="center" prop="productName" width="180" :show-overflow-tooltip="true"/>
<el-table-column label="工单编码" align="center" prop="workorderCode" width="150" fixed/>
<el-table-column label="订单编码" align="center" prop="workorderCodeSap" width="100" fixed
:formatter="orderCodeFormate"
/>
<el-table-column label="产品编号" align="center" prop="productCode" width="180"
:formatter="productCodeFormate"
/>
<el-table-column label="产品名称" align="center" prop="productName" width="300" :show-overflow-tooltip="true"/>
<el-table-column label="工单生产日期" align="center" prop="productDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
@ -247,12 +251,12 @@
<el-table-column
prop="materialCode"
label="料号"
width="170">
width="130" :formatter="productCodeFormate">
</el-table-column>
<el-table-column
prop="materialName"
label="物料描述"
width="240">
width="320">
</el-table-column>
<el-table-column
prop="unit"
@ -261,8 +265,8 @@
</el-table-column>
<el-table-column
prop="workorderCode"
width="120"
label="生产订单">
width="100"
label="生产订单" :formatter="orderCodeFormate">
</el-table-column>
<el-table-column
prop="quantity"
@ -416,6 +420,14 @@ export default {
this.getList();
},
methods: {
//产品编码格式化
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
//订单编码格式化
orderCodeFormate(row, column, cellValue){
return cellValue.slice(3,18); //返回值
},
// 打印
handlePrint(params) {
printJS({

8
src/views/mes/production/index.vue
Unescape Escape View File

@ -87,7 +87,8 @@
<el-table-column label="车间名称" align="center" prop="carName" />
<el-table-column label="机台编码" align="center" prop="machineCode" />
<el-table-column label="机台名称" align="center" prop="machineName" />
<el-table-column label="产品编码" align="center" prop="productCode" width="180" :show-overflow-tooltip="true"/>
<el-table-column label="产品编码" align="center" prop="productCode" width="180" :show-overflow-tooltip="true"
:formatter="productCodeFormate"/>
<el-table-column label="产品名称" align="center" prop="productName" width="200" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
<el-table-column label="派工数量" align="center" prop="quantity" />
@ -168,6 +169,11 @@ export default {
this.getList();
},
methods: {
//产品编码格式化
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
indexMethod(index){
return index+1 ;
},

9
src/views/mes/reportWork/index.vue
Unescape Escape View File

@ -172,7 +172,9 @@
>{{scope.row.workorderCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="sap工单编码" align="center" prop="workorderCodeSap" width="130"/>
<el-table-column label="订单编码" align="center" prop="workorderCodeSap" width="130"
:formatter="orderCodeFormate"
/>
<el-table-column label="产品编码" align="center" prop="productCode" width="130"
:formatter="productCodeFormate"
/>
@ -799,7 +801,10 @@ export default {
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
//订单编码格式化
orderCodeFormate(row, column, cellValue){
return cellValue.slice(3,18); //返回值
},
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0)

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

@ -54,17 +54,6 @@
>
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="订单类型" prop="status">-->
<!-- <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.product_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<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>
@ -72,17 +61,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="setUp"-->
<!-- v-hasPermi="['mes:pro:order:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@ -129,7 +107,9 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column width="150" label="订单号" align="center" prop="orderCode"/>
<el-table-column width="150" label="订单号" align="center" prop="orderCode"
:formatter="orderCodeFormate"
/>
<el-table-column width="130" label="物料号" align="center" prop="prodCode"
:formatter="productCodeFormate"
/>
@ -154,9 +134,6 @@
</el-table-column>
<el-table-column width="100" align="center" label="计划工厂编码" prop="planFactoryCode"/>
<el-table-column label="订单类型" align="center" prop="orderType">
<template slot-scope="scope">
<dict-tag :options="dict.type.order_type" :value="scope.row.orderType"/>
</template>
</el-table-column>
<el-table-column label="产品类型" align="center" prop="prodType">
<template slot-scope="scope">
@ -372,7 +349,9 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
<el-table-column width="150" label="订单编号" prop="orderCode"/>
<el-table-column width="150" label="订单编号" prop="orderCode"
:formatter="orderCodeFormate"
/>
<el-table-column width="380" label="产品名称" align="center" prop="prodDesc"/>
<el-table-column width="60" label="单位" align="center" prop="unit"/>
<el-table-column width="130" label="产品数量" align="center" prop="quantity"/>
@ -639,6 +618,10 @@ export default {
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
//订单编码格式化
orderCodeFormate(row, column, cellValue){
return cellValue.slice(3,18); //返回值
},
// 新增-校验车数
changeCarNum(num) {

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

@ -181,16 +181,22 @@
</el-table-column>
<el-table-column label="工单ID" align="center" prop="workorderId" v-if="false"/>
<el-table-column width="130" label="母订单新编码" align="center" prop="pworkorderCodeSap"/>
<el-table-column width="130" label="母订单新编码" align="center" prop="pworkorderCodeSap"
:formatter="orderCodeFormate"
/>
<el-table-column width="130" label="母产品编码" align="center" prop="pproductCode" :formatter="productCodeFormate"/>
<el-table-column width="300" label="母产品名称" align="center" prop="pproductName" :show-overflow-tooltip="true"/>
<el-table-column width="130" label="子工单编号" align="center" prop="workorderCode"/>
<el-table-column label="订单id" align="center" prop="orderId" v-if="false"/>
<el-table-column width="130" label="子订单旧编码" align="center" prop="orderCode"/>
<el-table-column width="130" label="子订单新编码" align="center" prop="workorderCodeSap"/>
<el-table-column width="130" label="子订单旧编码" align="center" prop="orderCode"
:formatter="orderCodeFormate"
/>
<el-table-column width="130" label="子订单新编码" align="center" prop="workorderCodeSap"
:formatter="orderCodeFormate"
/>
<el-table-column label="产品ID" align="center" prop="productId" v-if="false"/>
<el-table-column width="130" label="子产品编码" align="center" prop="productCode"
:formatter="productCodeFormate"
:formatter="productCodeFormate"
/>
<el-table-column width="300" label="子产品名称" align="center" prop="productName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="productSpc" v-if="false"/>
@ -822,7 +828,10 @@ export default {
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
//订单编码格式化
orderCodeFormate(row, column, cellValue){
return cellValue.slice(3,18); //返回值
},
// 新增-物料搜索
handleMaterielQuery() {
this.materielQueryParams.pageNum = 1;

15
src/views/quality/qcProduce/index.vue
Unescape Escape View File

@ -172,8 +172,10 @@
</el-table-column>
<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true" />
<el-table-column label="订单号" align="center" prop="orderNo" width="130"/>
<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="250" :show-overflow-tooltip="true" />
<el-table-column label="物料号" align="center" prop="materialCode" width="130"
:formatter="productCodeFormate"
/>
<el-table-column label="物料名称" align="center" prop="materialName" width="300" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="quality" />
<el-table-column label="抽样数量" align="center" prop="sampleQuality" />
<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/>
@ -484,9 +486,10 @@ export default {
batchList:[],
// 表单校验
rules: {
/**
incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" }
],
],**/
orderNo: [
{ required: true, message: "订单号不能为空", trigger: "blur" }
],
@ -524,6 +527,10 @@ export default {
this.handleDefectType();
},
methods: {
//产品编码格式化
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
/****/
//获取检验节点
getCheckTypes() {
@ -698,7 +705,7 @@ export default {
},
//工单选择确认
onSelectWorkOrder(obj) {
this.form.orderNo = obj.orderNo;
this.form.orderNo = obj.workorderCode;
this.form.materialName = obj.materialName;
this.form.materialCode = obj.materialCode;
this.form.quality = obj.quality;

13
src/views/quality/qcProduce/selectWorkOrder.vue
Unescape Escape View File

@ -25,10 +25,10 @@
</el-form>
<el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
<el-table-column width="50" align="center" type="selection"/>
<el-table-column label="订单号" align="left" prop="orderNo" width="120"/>
<el-table-column label="订单号" align="left" prop="orderNo" width="120" :formatter="orderCodeFormate"/>
<el-table-column label="订单状态" align="left" prop="status" width="90"/>
<el-table-column label="工单号" align="left" prop="workorderCode" width="130"/>
<el-table-column label="产品编码" align="left" prop="materialCode" width="180" />
<el-table-column label="产品编码" align="left" prop="materialCode" width="180" :formatter="productCodeFormate"/>
<el-table-column label="产品名称" align="left" prop="materialName" width="180"/>
<el-table-column label="排产数量" align="left" prop="quality" width="100" />
<el-table-column label="单位" align="left" prop="unit" width="80"/>
@ -95,7 +95,14 @@ export default {
},
methods: {
//产品编码格式化
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
//订单编码格式化
orderCodeFormate(row, column, cellValue){
return cellValue.slice(3,18); //返回值
},
/** 查询表格列表*/
getList() {
this.loading = true;

16
src/views/quality/qcProduceAnalysis/index.vue
Unescape Escape View File

@ -89,7 +89,9 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="单位编码" align="center" prop="supplierCode" width="80"/>
<el-table-column prop="supplierName" label="单位名称" width="100" align="center"/>
<el-table-column prop="orderNo" label="订单编码" width="160" align="center"/>
<el-table-column prop="orderNo" label="订单编码" width="130" align="center"
:formatter="orderCodeFormate"
/>
<el-table-column prop="incomeBatchNo" label="批次" width="220" align="center"/>
<el-table-column prop="materialName" label="产品名称"align="center" width="180" :show-overflow-tooltip="true"/>
<el-table-column prop="materialCode" label="产品编码" width="130" align="center"
@ -181,6 +183,14 @@ export default {
this.getList();
},
methods: {
//产品编码格式化
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
//订单编码格式化
orderCodeFormate(row, column, cellValue){
return cellValue.slice(3,18); //返回值
},
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0);
@ -314,10 +324,6 @@ export default {
}
});
},
//产品编码格式化
productCodeFormate(row, column, cellValue){
return cellValue.slice(7,18); //返回值
},
/** 报工详情按钮操作 */
handleDetail(row) {
this.reset();

Write Preview
Loading…
Cancel
Save