From 73983f9d7f0e0dbc12b8f3ac3a39e4e15769db16 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期二, 07 十一月 2023 17:30:59 +0800
Subject: [PATCH] modified: src/api/quality/rawMaterial.js modified: src/views/quality/processInspect/processInspect-form.vue
---
npminstall-debug.log | 197 +++++++++++++++++++++++++++++++++++++++
src/api/quality/rawMaterial.js | 2
src/views/quality/processInspect/processInspect-form.vue | 42 ++++++++
3 files changed, 239 insertions(+), 2 deletions(-)
diff --git a/npminstall-debug.log b/npminstall-debug.log
new file mode 100644
index 0000000..811d4cd
--- /dev/null
+++ b/npminstall-debug.log
@@ -0,0 +1,197 @@
+{
+ root: 'D:\\WorkSpace\\mes-ocea-before',
+ registry: 'https://registry.npmmirror.com',
+ pkgs: [],
+ production: false,
+ cacheStrict: false,
+ cacheDir: 'C:\\Users\\86134\\.npminstall_tarball',
+ env: {
+ npm_config_registry: 'https://registry.npmmirror.com',
+ npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\86134\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com","-g","node-sass"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\86134\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com","-g","node-sass"]}',
+ npm_config_user_agent: 'npminstall/7.11.1 npm/? node/v14.18.3 win32 x64',
+ npm_config_cache: 'C:\\Users\\86134\\.npminstall_tarball',
+ NODE: 'D:\\WorkSpace\\nodejs\\node.exe',
+ npm_node_execpath: 'D:\\WorkSpace\\nodejs\\node.exe',
+ npm_execpath: 'C:\\Users\\86134\\AppData\\Roaming\\npm\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js',
+ npm_config_userconfig: 'C:\\Users\\86134\\.cnpmrc',
+ npm_config_disturl: 'https://cdn.npmmirror.com/binaries/node',
+ npm_config_r: 'https://registry.npmmirror.com',
+ COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
+ NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+ NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+ PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
+ CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
+ OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver',
+ CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
+ ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/',
+ ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/',
+ SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
+ SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
+ NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
+ PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+ PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+ PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
+ SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
+ SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
+ RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
+ RE2_DOWNLOAD_SKIP_PATH: 'true',
+ PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
+ npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
+ npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
+ npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
+ npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
+ npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs',
+ npm_rootpath: 'D:\\WorkSpace\\mes-ocea-before',
+ INIT_CWD: 'D:\\WorkSpace\\mes-ocea-before'
+ },
+ binaryMirrors: {
+ ENVS: {
+ COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com',
+ NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+ NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node',
+ PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs',
+ CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver',
+ OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver',
+ CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip',
+ ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/',
+ ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/',
+ SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass',
+ SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc',
+ NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v',
+ PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+ PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing',
+ PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright',
+ SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli',
+ SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl',
+ RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2',
+ RE2_DOWNLOAD_SKIP_PATH: 'true',
+ PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma',
+ npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3',
+ npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar',
+ npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp',
+ npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips',
+ npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs'
+ },
+ '@ali/s2': { host: 'https://cdn.npmmirror.com/binaries/looksgood-s2' },
+ sharp: { replaceHostFiles: [Array], replaceHostMap: [Object] },
+ '@tensorflow/tfjs-node': {
+ replaceHostFiles: [Array],
+ replaceHostRegExpMap: [Object],
+ replaceHostMap: [Object]
+ },
+ cypress: {
+ host: 'https://cdn.npmmirror.com/binaries/cypress',
+ newPlatforms: [Object]
+ },
+ 'utf-8-validate': {
+ host: 'https://cdn.npmmirror.com/binaries/utf-8-validate/v{version}'
+ },
+ xprofiler: {
+ remote_path: './xprofiler/v{version}/',
+ host: 'https://cdn.npmmirror.com/binaries'
+ },
+ leveldown: { host: 'https://cdn.npmmirror.com/binaries/leveldown/v{version}' },
+ couchbase: { host: 'https://cdn.npmmirror.com/binaries/couchbase/v{version}' },
+ gl: { host: 'https://cdn.npmmirror.com/binaries/gl/v{version}' },
+ sqlite3: {
+ host: 'https://cdn.npmmirror.com/binaries/sqlite3',
+ remote_path: 'v{version}'
+ },
+ '@journeyapps/sqlcipher': { host: 'https://cdn.npmmirror.com/binaries' },
+ grpc: {
+ host: 'https://cdn.npmmirror.com/binaries',
+ remote_path: '{name}/v{version}'
+ },
+ 'grpc-tools': { host: 'https://cdn.npmmirror.com/binaries' },
+ wrtc: {
+ host: 'https://cdn.npmmirror.com/binaries',
+ remote_path: '{name}/v{version}'
+ },
+ fsevents: { host: 'https://cdn.npmmirror.com/binaries/fsevents' },
+ nodejieba: { host: 'https://cdn.npmmirror.com/binaries/nodejieba' },
+ canvas: { host: 'https://cdn.npmmirror.com/binaries/canvas' },
+ 'skia-canvas': { host: 'https://cdn.npmmirror.com/binaries/skia-canvas' },
+ 'flow-bin': {
+ replaceHost: 'https://github.com/facebook/flow/releases/download/v',
+ host: 'https://cdn.npmmirror.com/binaries/flow/v'
+ },
+ 'jpegtran-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/jpegtran-bin'
+ },
+ 'cwebp-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/cwebp-bin'
+ },
+ 'zopflipng-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/zopflipng-bin'
+ },
+ 'optipng-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/optipng-bin'
+ },
+ mozjpeg: {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/mozjpeg-bin'
+ },
+ gifsicle: {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/gifsicle-bin'
+ },
+ 'pngquant-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/pngquant-bin',
+ replaceHostMap: [Object]
+ },
+ 'pngcrush-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/pngcrush-bin'
+ },
+ 'jpeg-recompress-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/jpeg-recompress-bin'
+ },
+ 'advpng-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/advpng-bin'
+ },
+ 'pngout-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/pngout-bin'
+ },
+ 'jpegoptim-bin': {
+ replaceHost: [Array],
+ host: 'https://cdn.npmmirror.com/binaries/jpegoptim-bin'
+ },
+ argon2: { host: 'https://cdn.npmmirror.com/binaries/argon2' },
+ 'ali-zeromq': { host: 'https://cdn.npmmirror.com/binaries/ali-zeromq' },
+ 'ali-usb_ctl': { host: 'https://cdn.npmmirror.com/binaries/ali-usb_ctl' },
+ 'gdal-async': { host: 'https://cdn.npmmirror.com/binaries/node-gdal-async' },
+ 'libpg-query': { host: 'https://cdn.npmmirror.com/binaries' }
+ },
+ forbiddenLicenses: null,
+ flatten: false,
+ proxy: undefined,
+ prune: false,
+ disableFallbackStore: false,
+ workspacesMap: Map(0) {},
+ enableWorkspace: false,
+ workspaceRoot: 'D:\\WorkSpace\\mes-ocea-before',
+ isWorkspaceRoot: true,
+ isWorkspacePackage: false,
+ offline: false,
+ strictSSL: true,
+ ignoreScripts: false,
+ foregroundScripts: false,
+ ignoreOptionalDependencies: false,
+ detail: true,
+ forceLinkLatest: false,
+ trace: false,
+ engineStrict: false,
+ registryOnly: false,
+ client: false,
+ autoFixVersion: [Function: autoFixVersion],
+ targetDir: null,
+ binDir: null
+}
\ No newline at end of file
diff --git a/src/api/quality/rawMaterial.js b/src/api/quality/rawMaterial.js
index a19ccb2..6985610 100644
--- a/src/api/quality/rawMaterial.js
+++ b/src/api/quality/rawMaterial.js
@@ -77,3 +77,5 @@
})
}
+
+
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index d486d2d..c3adbb9 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -113,11 +113,26 @@
<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>
+ :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
</el-select>
</div>
</template>
</el-table-column>
+ <el-table-column 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.inote"
+ placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ <span v-if="resultVal != null && processInspectVo.id!=null" v-text="scope.row.inote"></span>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+
+
+
<el-table-column label="缁撹" fixed="right" min-width="100">
<template slot-scope="scope">
<div v-if="scope.row.iname!=null">
@@ -218,6 +233,7 @@
this.init()
},
methods: {
+
submitSave(){
let pro = 0
console.log(this.inspectionItems);
@@ -288,6 +304,7 @@
let id = this.processInspectVo.id
if(id != null){
queryById(id).then(res=>{
+ console.log(res)
let result = res.data.data
this.processInspectVo.orderNumber = result.orderNumber
this.processInspectVo.materialCode = result.materialCode
@@ -300,6 +317,7 @@
result.children.forEach(item=>{
item.iid = Math.random()
if(item.children != undefined){
+
item.children.forEach(obj=>{
let arr = []
if(obj.userName){
@@ -309,6 +327,9 @@
arr = obj.inspectionValue.split(",")
}
obj.empiricalValueAddss = arr
+ if(obj.note){
+ snote=obj.inote
+ }
if(arr.length > this.empiricalValueAdd){
this.empiricalValueAdd = arr.length
}
@@ -316,6 +337,7 @@
}
})
this.inspectionItems = result.children
+ console.log(result.children)
this.inspectionResultForm = [{
materialCode: result.materialCode,
material: result.material,
@@ -330,15 +352,18 @@
getDeviceList(){
selectDevice(null).then(res=>{
this.deviceList = res.data.data
+ console.log(this.deviceList);
})
},
updateDevice(row,index){
+ console.log(row);
updateDeviceBypppId({equiomentId:row.eId,ppid:row.iId}).then(res=>{
this.inspectionItems.forEach(obj=>{
if(obj.children){
obj.children[index-1].inspectionValue = ''
obj.children[index-1].iresult = null
obj.children[index-1].empiricalValueAddss = []
+ obj.children[index-1].inote=''
}
})
}).catch(error=>{
@@ -357,6 +382,8 @@
this.technologyList = sample.children
},
changeState(row, index) {
+ console.log(row)
+
if (row.iid != null && row.iid != '') {
let str = ""
row.empiricalValueAddss.forEach(e => {
@@ -366,11 +393,19 @@
if (str === undefined || str === '' || str === null ) {
return
}
+
+ // if ( note === undefined || str === '' || str === null ) {
+ // return
+ // }
+
let obj = {
equiomentId: row.eId,
ppid: row.iid,
- inspectionValue: str
+ inspectionValue: str,
+ note:row.inote,
+
}
+
updateProcessInsProduct(obj).then(res=>{
if(res.data.code == 0){
this.$message.success("鏇存柊鎴愬姛")
@@ -394,6 +429,7 @@
if(item.children != undefined){
item.children.forEach(obj=>{
obj.empiricalValueAddss = []
+ // obj.note=[];
})
}
})
@@ -410,8 +446,10 @@
chooseMater({
orderNumber: this.processInspectVo.orderNumber
}).then(res => {
+
if (res.data.data != null) {
this.optionsSamplename = res.data.data.children
+
} else {
this.$message({
message: '娌℃湁璇ヨ鍗曞彿锛�',
--
Gitblit v1.9.3