From 93bb83a3376eb619a4a2673373f15849cd99337d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 十二月 2023 19:46:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
vue.config.js | 6 ++
src/views/quality/finishedProductInspection/index.vue | 2
src/views/basic/part/part-form.vue | 48 +++++++++++++-----------
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 21 ++++------
src/views/quality/processInspect/index.vue | 8 ++++
src/views/warehouse/stock/index.vue | 26 ++++++------
src/views/quality/processInspect/processInspect-form.vue | 6 +-
7 files changed, 64 insertions(+), 53 deletions(-)
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index f15bf51..72fb943 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -171,8 +171,8 @@
<el-input v-model="dataForm.specs" placeholder="瑙勬牸鍨嬪彿"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="妫�楠屽憳" prop="examiner">
+ <!-- <el-col :span="12"> -->
+ <!-- <el-form-item label="妫�楠屽憳" prop="examiner">
<el-select
v-model="dataForm.examiner"
placeholder="璇烽�夋嫨"
@@ -186,7 +186,7 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item label="妫�楠岃鍒�" prop="testRuleId">
<el-select
v-model="dataForm.testRuleId"
@@ -204,7 +204,7 @@
</el-option>
</el-select>
</el-form-item> -->
- </el-col>
+ <!-- </el-col> -->
<!-- <el-col :span="12">
<el-form-item label="鍥惧彿" prop="drawingNumber">
<el-input
@@ -266,8 +266,8 @@
</el-select>
</el-form-item>
</el-col> -->
- </el-row>
- <el-row>
+ <!-- </el-row>
+ <el-row> -->
<!-- <el-col :span="12">
<el-form-item label="鐢靛帇绛夌骇" prop="voltageLevel">
<el-input
@@ -275,13 +275,15 @@
placeholder="鐢靛帇绛夌骇"
></el-input> </el-form-item
></el-col> -->
- </el-row>
- <el-row>
+ <!-- </el-row>
+ <el-row> -->
<el-col :span="12"
><el-form-item label="閲嶉噺" prop="weight">
<el-input v-model="dataForm.weight" placeholder="閲嶉噺"></el-input>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="鐗堟湰鍙�" prop="engChgLevel">
<el-input
@@ -291,6 +293,20 @@
></el-input>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="闆朵欢灞炴��" prop="materialAttribute">
+ <el-select v-model="dataForm.materialAttribute" style="width: 100%">
+ <el-option
+ v-for="(item, index) in materialAttributeOptions"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
<!-- <el-col :span="12">
<el-form-item label="IFS鍚敤鎵规绠＄悊" prop="lotTrackingIfs">
<el-select
@@ -318,7 +334,7 @@
</el-select>
</el-form-item>
</el-col> -->
- </el-row>
+ <!-- </el-row> -->
<el-row>
<el-col :span="12">
<el-form-item
@@ -342,20 +358,8 @@
</el-form-item>
</el-col>
</el-row>
+ <!-- <el-row> -->
<el-row>
- <el-col :span="12">
- <el-form-item label="闆朵欢灞炴��" prop="materialAttribute">
- <el-select v-model="dataForm.materialAttribute" style="width: 100%">
- <el-option
- v-for="(item, index) in materialAttributeOptions"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="澶囨敞" prop="description">
<el-input
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index c43c355..7d3842e 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -26,27 +26,24 @@
<el-col :span="6">
<el-form-item label="璁㈠崟鍙凤細">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
- v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ v-model="processInspectVo.orderNumber" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎶ュ伐鍗曞彿锛�">
- <el-input disabled v-model="processInspectVo.productNo"
- placeholder="璇疯緭鍏ユ姤宸ュ崟鍙凤細" autocomplete="off" />
+ <el-input disabled v-model="processInspectVo.productNo" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瀹㈡埛鍚嶇О锛�">
- <el-input disabled v-model="processInspectVo.prname"
- placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
+ <el-input disabled v-model="processInspectVo.prname" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="宸ョ▼鍚嶇О锛�">
- <el-input disabled v-model="processInspectVo.sname"
- placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ <el-input disabled v-model="processInspectVo.sname" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -60,15 +57,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧缂栫爜锛�">
- <el-input disabled v-model="processInspectVo.mcode"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ <el-form-item label="浜у搧缂栧彿锛�">
+ <el-input disabled v-model="processInspectVo.mcode" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input disabled v-model="processInspectVo.specificationsModel"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
+ <el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
@@ -161,7 +156,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="inspectionValue">
+ <el-table-column prop="inspectionValue"
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index a009e25..b5a6c5a 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -127,7 +127,7 @@
{
minWidth: '120',
prop: 'materialCode',
- label: '浜у搧缂栫爜',
+ label: '浜у搧缂栧彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 8c7a8b7..bc7e979 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -73,6 +73,14 @@
},
{
minWidth: '120',
+ prop: 'materialCode',
+ label: '浜у搧缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
prop: 'material',
label: '浜у搧鍚嶇О',
isTrue: true,
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 0bbd0f0..31f055e 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -41,8 +41,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧缂栫爜锛�">
- <el-input disabled v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
+ <el-form-item label="浜у搧缂栧彿锛�">
+ <el-input disabled v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -50,7 +50,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input disabled v-model="processInspectVo.specs" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+ <el-input disabled v-model="processInspectVo.specs"
autocomplete="off" />
</el-form-item>
</el-col>
diff --git a/src/views/warehouse/stock/index.vue b/src/views/warehouse/stock/index.vue
index f6ccc46..9416a88 100644
--- a/src/views/warehouse/stock/index.vue
+++ b/src/views/warehouse/stock/index.vue
@@ -11,13 +11,13 @@
ref="warehouseStockTable"
>
<template #toolbar>
- <el-button
+ <!-- <el-button
v-if="permissions.warehouse_stock_scm"
@click="pushScm()"
type="primary"
style="margin-left:10px;"
>鎴愬搧鎺ㄩ�丼CM
- </el-button>
+ </el-button> -->
</template>
</ttable>
<!-- 鍒涘缓涓荤敓浜ц鍒� -->
@@ -65,7 +65,7 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/stock/upload'
},
prelang: 'operation',
@@ -161,7 +161,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
width: '100',
minWidth: '100',
prop: 'partBatchNo',
@@ -220,7 +220,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
width: '100',
minWidth: '100',
@@ -261,7 +261,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
width: '100',
minWidth: '100',
prop: 'reserveQuantity',
@@ -270,7 +270,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
width: '100',
minWidth: '120',
@@ -291,7 +291,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
width: '100',
minWidth: '120',
prop: 'sstockQuantity',
@@ -320,8 +320,8 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
- {
+ }, */
+ /* {
minWidth: '100',
prop: 'status',
label: '鐘舵��',
@@ -329,7 +329,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '100',
prop: 'ifsBatchNo',
@@ -350,7 +350,7 @@
}
],
toolbar: [
- {
+ /* {
text: '绉诲簱',
type: 'primary',
fun: this.moveStock
@@ -369,7 +369,7 @@
text: '鎴愬搧鏍囩2',
type: 'primary',
fun: this.warehousingSmalllPrint
- }
+ } */
]
},
addOrUpdateVisible: false,
diff --git a/vue.config.js b/vue.config.js
index 91b41a0..bc6b653 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,11 +2,15 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
+
+
+// const url = 'http://192.168.2.7:9999'
+const url = 'http://192.168.32.45: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