From d2c182e7310c30a38ec6ce0d8a1d2ce00d51ac8f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 04 一月 2024 14:54:32 +0800
Subject: [PATCH] 细节调试
---
src/views/equipment/equipment/index.vue | 8 ++++----
vue.config.js | 4 ++--
src/views/plan/manufacturingorder/productorder-form.vue | 15 +++++++++------
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 8 +++-----
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 462fdcc..20afc4b 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -147,7 +147,7 @@
label: '浣嶇疆',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
},
// 閭
@@ -167,7 +167,7 @@
label: '渚涘簲鍟�',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
},
// 鍒堕�犲晢
@@ -177,7 +177,7 @@
label: '鍒堕�犲晢',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
},
// 鍨嬪彿瑙勬牸
@@ -187,7 +187,7 @@
label: '鍨嬪彿瑙勬牸',
sort: true,
isTrue: true,
- isSearch: false,
+ isSearch: true,
searchInfoType: 'text'
},
// 鍒堕�犳棩鏈�
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 2463791..6ff61e4 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -79,7 +79,7 @@
</el-col>
</el-row>
<el-row :gutter="10">
- <el-col :span="3">
+ <el-col :span="4">
<el-form-item label="闇�姹傛暟閲�" prop="qtyRequired">
<el-input
v-model="dataForm.qtyRequired"
@@ -88,7 +88,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="3">
+ <el-col :span="4">
<el-form-item label="瀹屾垚鏁伴噺" prop="qtyFinished">
<el-input-number
style= "width: 90%"
@@ -128,12 +128,15 @@
></el-input>
</el-form-item>
</el-col> -->
- <el-col :span="6">
+ <el-col :span="5">
<el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="dataForm.remark" placeholder=""></el-input>
+ <el-tooltip class="item" effect="dark" :content="dataForm.remark">
+ <el-input v-model="dataForm.remark" placeholder="">
+ </el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="5">
<el-form-item label="鍒堕�犲睘鎬�" prop="manufactureAttr">
<el-select
v-model="dataForm.manufactureAttr"
@@ -206,7 +209,7 @@
</el-switch>
</el-form-item>
</el-col> -->
-
+
</div>
<div class="productorder-detail">
<el-card class="productorder-list">
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 0ca060a..02dc40e 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -182,7 +182,7 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
@@ -303,7 +303,6 @@
documentId: null,
outBatchNo: null,
locName: null,
- productNo: null,
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
@@ -350,7 +349,7 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
console.log("row",row);
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
@@ -441,7 +440,6 @@
this.processInspectVo.documentId = result.documentId
this.processInspectVo.outBatchNo = result.outBatchNo
this.processInspectVo.locName = result.locName
- this.processInspectVo.productNo = result.productNo
let userList = []
result.children.forEach(item=>{
item.iid = Math.random()
@@ -628,7 +626,7 @@
updateFinishedInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
diff --git a/vue.config.js b/vue.config.js
index fc59c8d..b3ee465 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,9 +5,9 @@
// const url = 'http://192.168.2.7:9999'
-const url = 'https://ztms-mes.chinaztt.cn/'
+//const url = 'https://ztms-mes.chinaztt.cn/'
-// const url = 'http://localhost:9999'
+ const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3