From 9c966139d53290dfabf5392186ce443082e5511f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 09 十二月 2023 14:54:39 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/masterproductionschedule/index.vue | 8 ++--
src/views/plan/manufacturingorder/index.vue | 24 ++++++------
vue.config.js | 4 +-
src/views/plan/customerorder/index.vue | 2
src/views/quality/finishedProductInspection/index.vue | 14 +++++-
src/views/plan/manufacturingorder/productorder-form.vue | 30 +++++---------
src/views/plan/operationtask/index.vue | 12 +++---
7 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 47981a3..5949caa 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -690,7 +690,7 @@
// fun: this.packageExportHandle
// },
{
- text: '浣滃簾',
+ text: '鍒犻櫎',
type: 'text',
size: 'small',
fun: this.cancelHandle,
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index f1276ae..5fd6bdf 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -479,7 +479,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'printRequirement',
label: '鍗板瓧瑕佹眰',
@@ -496,7 +496,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
prop: 'scrapQty',
@@ -571,7 +571,7 @@
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'outerColor',
label: '澶栨姢棰滆壊',
@@ -589,7 +589,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
@@ -638,7 +638,7 @@
searchInfoType: 'datetimerange',
formatter: this.formatDutyDate
},
- {
+ /* {
minWidth: '120',
prop: 'bomConfirmStatus',
label: 'BOM鐘舵��',
@@ -700,7 +700,7 @@
}
return formatVal
}
- },
+ }, */
{
minWidth: '200',
prop: 'remark',
@@ -710,7 +710,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '100',
prop: 'oriIfsOrderNo',
label: '鍘烮FS璁㈠崟鍙�',
@@ -745,8 +745,8 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
- {
+ }, */
+ /* {
minWidth: '100',
prop: 'qtyApply',
label: '鐢宠鏁伴噺',
@@ -754,7 +754,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '140',
width: '120',
@@ -777,7 +777,7 @@
searchInfoType: 'datetimerange',
formatter: this.formatDutyDate
},
- {
+ /* {
minWidth: '120',
prop: 'ifsSync',
label: '璁㈠崟鍚屾ERP',
@@ -851,7 +851,7 @@
}
return formatVal
}
- },
+ }, */
{
minWidth: '100',
prop: 'factoryName',
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index d4fcf52..05becf2 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -89,6 +89,7 @@
<el-col :span="3">
<el-form-item label="瀹屾垚鏁伴噺" prop="qtyFinished">
<el-input-number
+ style= "width: 90%"
v-model="dataForm.qtyFinished"
placeholder=""
:controls="false"
@@ -107,7 +108,7 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="澶栨姢棰滆壊" prop="outerColor">
<el-input
readonly
@@ -124,10 +125,8 @@
placeholder=""
></el-input>
</el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="10">
- <el-col :span="6">
+ </el-col> -->
+ <el-col :span="6">
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="dataForm.remark" placeholder=""></el-input>
</el-form-item>
@@ -150,7 +149,8 @@
</el-select>
</el-form-item>
</el-col>
- <el-col
+ </el-row>
+ <!-- <el-col
:span="2"
v-if="permissions.plan_manufacturingorder_bom_sure"
>
@@ -175,8 +175,8 @@
<el-switch v-model="dataForm.standardConfirmStatus">
</el-switch>
</el-form-item>
- </el-col>
- <el-col :span="2">
+ </el-col> -->
+ <!-- <el-col :span="2">
<el-form-item
label="IFS杞﹂棿璁㈠崟鎺ユ敹鏃舵姤鍛婂伐搴�"
prop="isReportOperation"
@@ -185,7 +185,7 @@
<el-switch v-model="dataForm.isReportOperation" disabled>
</el-switch>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="2">
<el-form-item label="BOM纭">
<el-switch >
@@ -204,7 +204,7 @@
</el-switch>
</el-form-item>
</el-col> -->
- </el-row>
+
</div>
<div class="productorder-detail">
<el-card class="productorder-list">
@@ -226,15 +226,7 @@
<el-option
v-for="item in dataForm.routingList"
:key="item.id"
- :label="
- item.routingNo +
- '-' +
- item.bomTypeDb +
- '-' +
- item.alternativeNo +
- '-' +
- item.alternativeDesc
- "
+ :label="item.routingNo "
:value="item.id"
>
</el-option>
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index 97410ce..f996069 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -420,7 +420,7 @@
isSearch: false,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '140',
prop: 'outsourcingNumber',
label: '濮斿鏁伴噺',
@@ -428,7 +428,7 @@
isTrue: true,
isSearch: false,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '140',
prop: 'manufacturingQuantity',
@@ -552,7 +552,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }/* ,
{
minWidth: '140',
prop: 'outerColor',
@@ -588,7 +588,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- }
+ } */
],
toolbar: [],
operator: [
diff --git a/src/views/plan/operationtask/index.vue b/src/views/plan/operationtask/index.vue
index c4c89b8..89fba43 100644
--- a/src/views/plan/operationtask/index.vue
+++ b/src/views/plan/operationtask/index.vue
@@ -352,7 +352,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'splannedQuantity',
label: '璁″垝鏁伴噺2',
@@ -369,7 +369,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
prop: 'completedQuantity',
@@ -379,7 +379,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'discNum',
label: '鐩樻暟',
@@ -387,8 +387,8 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
- {
+ }, */
+ /* {
minWidth: '120',
prop: 'reelSpec',
label: '杞藉叿瑙勬牸',
@@ -396,7 +396,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
width: '130',
prop: 'ratio',
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index afa576e..696ffb0 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -85,7 +85,7 @@
{
minWidth: '120',
prop: 'orderNumber',
- label: '璁㈠崟鍙�',
+ label: '鎶ュ伐鍗曞彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
@@ -107,6 +107,14 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
+ },
+ {
+ minWidth: '120',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -172,11 +180,11 @@
},
],
toolbar: [
- {
+ /* {
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- },
+ }, */
{
text: '瀵煎嚭',
type: 'primary',
diff --git a/vue.config.js b/vue.config.js
index a25de9b..71b520b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,11 +2,11 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-// const url = 'http://192.168.2.7:9999'
+//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
-const url = 'http://localhost:9999'
+ const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3