From c787513ce9b21ba4d9d0273fdcba8a5d560dd092 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 十二月 2023 14:21:15 +0800
Subject: [PATCH] 修改
---
vue.config.js | 4 --
src/views/plan/manufacturingorder/productorder-form.vue | 2 +
src/views/quality/teststandard/index.vue | 2
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 4 ++
src/views/plan/operationtask/operationtask-form.vue | 49 ++++++++++++++----------
src/views/quality/processInspect/processInspect-form.vue | 4 ++
6 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index affcd01..2bf8212 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -65,6 +65,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="闆朵欢" prop="partId">
+ <el-tooltip class="item" effect="dark" :content="partStr" >
<el-input v-model="partStr" placeholder="" readonly>
<el-button
v-if="!this.dataForm.id"
@@ -73,6 +74,7 @@
@click="openRoutingDialog()"
></el-button>
</el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index 02fb8dc..99e8f1b 100644
--- a/src/views/plan/operationtask/operationtask-form.vue
+++ b/src/views/plan/operationtask/operationtask-form.vue
@@ -145,7 +145,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="10">
<el-form-item label="宸ヤ綔涓績" prop="workCenter">
<el-select v-model="dataForm.workCenter" :disabled="!editable" filterable placeholder="璇烽�夋嫨宸ヤ綔涓績"
style="width:100%" @change="changeWorkCenter">
@@ -153,6 +153,16 @@
:key="index">
</el-option>
</el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col :span="15">
+ <el-form-item label="璁″垝鏃堕棿" prop="localDateTimes">
+ <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
+ type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫"
+ value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -167,39 +177,36 @@
</el-col>
</el-row>
<el-row :gutter="10">
- <el-col :span="14">
- <el-form-item label="璁″垝鏃堕棿" prop="localDateTimes">
- <el-date-picker :class="tattimest ? 'sed' : ''" v-model="dataForm.localDateTimes"
- type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫"
- value-format="yyyy-MM-dd HH:mm:ss" @change="selectChangedplannedDate">
- </el-date-picker>
- </el-form-item>
- </el-col>
<el-col :span="10">
<el-form-item label="璁″垝鏁伴噺" prop="plannedQuantity">
<el-input v-model="dataForm.plannedQuantity" :disabled="!editable" placeholder="璁″垝鏁伴噺"
style="width:calc(100% - 30px)"></el-input>
<span>{{ dataForm.unit }}</span>
</el-form-item>
- </el-col></el-row>
- <el-row :gutter="10">
- <el-col :span="12">
- <el-form-item label="闆朵欢" prop="partName">
- <el-input v-model="dataForm.partName" placeholder="闆朵欢" disabled></el-input>
- </el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="dataForm.partNo" placeholder="闆朵欢鍙�" disabled></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
+ <el-col :span="10">
<el-form-item label="宸ュ崟鎵�闇�鏃堕棿" prop="taskTheoreticalTime">
<el-input v-model="dataForm.taskTheoreticalTime" placeholder="宸ュ崟鎵�闇�鏃堕棿"
style="width:calc(100% - 30px)"></el-input>
<span>min</span>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col :span="12">
+ <el-form-item label="闆朵欢" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
+ <el-input v-model="dataForm.partName" placeholder="闆朵欢" disabled></el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="闆朵欢鍙�" prop="partNo">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partNo" >
+ <el-input v-model="dataForm.partNo" placeholder="闆朵欢鍙�" disabled></el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="10">
<span style="float:right; margin-right:30px; margin-top: 55px">
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index a0a9cbd..dccb95c 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -48,12 +48,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧鍚嶇О锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
<el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
v-model="processInspectVo.material" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
<el-option v-for="(item,index) in optionsSamplename" :key="index" :label="item.material"
:value="item.materialCode">
</el-option>
</el-select>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -63,7 +65,9 @@
</el-col>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specificationsModel">
<el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 505338e..443d28e 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -31,6 +31,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧鍚嶇О锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
<el-select style="width: 100%" @change="changeOptionsSamplename"
:disabled="processInspectVo.id != null" v-model="processInspectVo.material"
size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
@@ -38,6 +39,7 @@
:label="item.material" :value="item.materialCode">
</el-option>
</el-select>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -50,8 +52,10 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
<el-input disabled v-model="processInspectVo.specs"
autocomplete="off" />
+ </el-tooltip>
</el-form-item>
</el-col>
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index a8481fb..120c1c0 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -321,7 +321,7 @@
isShowQuery: false,
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/testStandard/upload'
},
prelang: 'operation',
diff --git a/vue.config.js b/vue.config.js
index 6cc7723..bfdaf42 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,10 +4,6 @@
*/
-// 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.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
--
Gitblit v1.9.3