diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 9338540..03fe8f4 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -130,10 +130,14 @@
-
-
-
-
+
+
+
+
{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}
@@ -247,12 +251,12 @@
+ width="130" :formatter="productCodeFormate">
+ width="320">
+ width="100"
+ label="生产订单" :formatter="orderCodeFormate">
-
+
@@ -168,6 +169,11 @@ export default {
this.getList();
},
methods: {
+ //产品编码格式化
+ productCodeFormate(row, column, cellValue){
+ return cellValue.slice(7,18); //返回值
+ },
+
indexMethod(index){
return index+1 ;
},
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index c30f892..ef4a191 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -172,7 +172,9 @@
>{{scope.row.workorderCode}}
-
+
@@ -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)
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index 7802a74..20a9256 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -54,17 +54,6 @@
>
-
-
-
-
-
-
-
-
-
-
-
搜索
重置
@@ -72,17 +61,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -154,9 +134,6 @@
-
-
-
@@ -372,7 +349,9 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
-
+
@@ -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) {
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 3e8639d..ac810a1 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -181,16 +181,22 @@
-
+
-
-
+
+
@@ -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;
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index fb2cdb6..a72535b 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -172,8 +172,10 @@
-
-
+
+
@@ -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;
diff --git a/src/views/quality/qcProduce/selectWorkOrder.vue b/src/views/quality/qcProduce/selectWorkOrder.vue
index 162388a..6090c14 100644
--- a/src/views/quality/qcProduce/selectWorkOrder.vue
+++ b/src/views/quality/qcProduce/selectWorkOrder.vue
@@ -25,10 +25,10 @@
-
+
-
+
@@ -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;
diff --git a/src/views/quality/qcProduceAnalysis/index.vue b/src/views/quality/qcProduceAnalysis/index.vue
index bdfbfcb..68ae450 100644
--- a/src/views/quality/qcProduceAnalysis/index.vue
+++ b/src/views/quality/qcProduceAnalysis/index.vue
@@ -89,7 +89,9 @@
-
+