From c09eeede806fb7ebd47434464fa6acbe3d29c3e3 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 13:32:11 +0800
Subject: [PATCH] s
---
package.json | 3 ++-
src/api/quality/rawMaterial.js | 2 +-
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 8 +++++---
src/views/common/ztt-table.vue | 2 +-
4 files changed, 9 insertions(+), 6 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/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 34cd401..5ba0a5e 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -110,11 +110,12 @@
<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>
@@ -323,7 +324,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