From 1560e2c7c8efaced9b4bbf1d0db7c014405d13a3 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 06 十一月 2023 15:44:37 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 12 +++---
package.json | 3 +
src/api/quality/rawMaterial.js | 2
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 42 ++++++++++++++++----
src/views/common/ztt-table.vue | 2
5 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/package.json b/package.json
index 6fea7ba..fd460e9 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,8 @@
"vue-quill-editor": "3.0.6",
"vue-router": "^3.0.2",
"vuedraggable": "^2.24.3",
- "vuex": "^3.0.1"
+ "vuex": "^3.0.1",
+ "xlsx-style": "^0.8.13"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~3.8.0",
diff --git a/src/api/quality/rawMaterial.js b/src/api/quality/rawMaterial.js
index a19ccb2..af1c32b 100644
--- a/src/api/quality/rawMaterial.js
+++ b/src/api/quality/rawMaterial.js
@@ -10,7 +10,7 @@
export function selectDevice() {
return request({
- url: '/mes/rawInsProduct/selectDevice',
+ url: '/mes/qualityFinishedInsProduct/scope',
method: 'get',
})
}
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 5750421..8b8083c 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -936,7 +936,7 @@
}
},
getDataList(selectedId) {
- this.dataListLoading = true
+ // this.dataListLoading = true
var criteria = {}
criteria.dateTimeFilters = this.dateTimeFilters
criteria.multiSearchFilter = this.multiSearchFilter
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 59fead3..f65ac9d 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -198,12 +198,12 @@
type: 'primary',
fun: this.addOrUpdateHandle
},
- {
- text: '鍚屾',
- type: 'primary',
- loading: false,
- fun: this.pullEquipFun
- }
+ // {
+ // text: '鍚屾',
+ // type: 'primary',
+ // loading: false,
+ // fun: this.pullEquipFun
+ // }
],
operator: [
{
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 34cd401..c5a4687 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -97,24 +97,39 @@
<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="妫�娴嬪��"
width="240" style="text-align: center;">
<template slot-scope="scope">
- <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
- class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
- placement="top-start">
- <el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
+ <el-col v-if="scope.row.itype === '1'">
+ <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
+ placement="top-start">
+ <el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
</el-tooltip>
+ </el-col>
+ <el-col v-else>
+ <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <span v-if="resultVal != null && processInspectVo.id != null"
+ v-text="scope.row.empiricalValueAddss[index]"></span>
+ </el-tooltip>
+ </el-col>
</template>
</el-table-column>
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="250">
<template slot-scope="scope">
<span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
<div v-else>
- <el-select style="width:100%" v-model="scope.row.eId"
+ <el-input v-model="scope.row.eId" v-if="scope.row.iname != null" placeholder="璇疯緭鍏ヨ澶囧彿"></el-input>
+ <!-- <el-select style="width:100%" v-model="scope.row.eId"
v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
<el-option v-for="(item,index) in deviceList"
:key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
- </el-select>
+ </el-select> -->
</div>
</template>
</el-table-column>
@@ -175,6 +190,13 @@
export default {
data() {
return {
+ dataVal: [{
+ label: '鏄�',
+ value: '鏄�'
+ }, {
+ label: '鍚�',
+ value: '鍚�'
+ }],
resultVal: null,
deviceList: [],
hasChildren: true,
@@ -220,6 +242,7 @@
this.init()
},
methods: {
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -323,7 +346,8 @@
},
getDeviceList(){
selectDevice(null).then(res=>{
- this.deviceList = res.data.data
+ // this.deviceList = res.data.data
+ console.log(res);
})
},
updateDevice(row,index){
--
Gitblit v1.9.3