From fc6ed7861e7771b16452f8e88a5c67d9b0d9c9c6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 14:10:35 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 84 +++------------------------
src/views/basic/location/index.vue | 4
src/views/common/rawMaterial-part.vue | 1
src/views/basic/location/location-form.vue | 23 ++++++-
src/views/common/qrCodeApp.vue | 14 ----
src/views/common/ztt-table.vue | 3
6 files changed, 32 insertions(+), 97 deletions(-)
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index dfb4f75..e102c95 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -194,7 +194,7 @@
optList: () => {
return this.getWarehouseLocGroupList()
}
- },
+ }/* ,
// ERP搴撲綅
{
minWidth: '200',
@@ -204,7 +204,7 @@
isTrue: false,
isSearch: true,
searchInfoType: 'text'
- }
+ } */
],
toolbar: [
{
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index 11c4657..26c0b1c 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -134,10 +134,23 @@
<el-row>
<el-col :span="12">
+ <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
+ <el-date-picker
+ readonly
+ style="width: 100%"
+ v-model="moment"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
<el-form-item
label="IFS搴撲綅"
prop="ifsLocationDesc"
- >
+ > -->
<!-- <el-select
v-model="dataForm.ifsLocation"
filterable
@@ -152,13 +165,13 @@
>
</el-option>
</el-select> -->
- <el-cascader
+ <!-- <el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
style="width:100%" filterable
></el-cascader>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="搴撲綅鐘舵��" prop="locStatus">
<el-switch
@@ -169,7 +182,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <!-- <el-row>
<el-col :span="12">
<el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
<el-date-picker
@@ -184,7 +197,7 @@
</el-form-item>
</el-col>
<el-col :span="12"> </el-col>
- </el-row>
+ </el-row> -->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index ef13928..8c297ac 100644
--- a/src/views/common/qrCodeApp.vue
+++ b/src/views/common/qrCodeApp.vue
@@ -39,12 +39,10 @@
},
//鍥炶皟鎵弿缁撴灉
onDecode(result) {
- console.log(result);
if (result !== "") {
this.result=result
this.$emit("ok",this.result)
this.cancelCode()
- // alert(result)
}
},
// 鐩告満鍙嶈浆
@@ -75,12 +73,7 @@
async onInit(promise) {
try {
const { capabilities } = await promise;
- console.log(
- "馃殌 ~ file: cameracomponent.vue:47 ~ onInit ~ capabilities",
- capabilities
- );
} catch (error) {
- // console.log()
this.$toast(error.name);
if (error.name === "NotAllowedError") {
this.error = "ERROR: 鎮ㄩ渶瑕佹巿浜堢浉鏈鸿闂潈闄�";
@@ -106,12 +99,7 @@
}
},
watch: {
- "result": {
- handler(newVal) {
- console.log('鎵弿鍊�' + newVal);
- },
- deep: true
- }
+
}
};
</script>
diff --git a/src/views/common/rawMaterial-part.vue b/src/views/common/rawMaterial-part.vue
index 83f7b8d..c8b36ab 100644
--- a/src/views/common/rawMaterial-part.vue
+++ b/src/views/common/rawMaterial-part.vue
@@ -65,7 +65,6 @@
return {
ajaxFun: chooseIFS,
innerVisible: false,
- listLoading: true,
currentRow: null,
multipleSelection: [],
uploadInfo: {
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 4865eee..bdb3592 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -942,8 +942,7 @@
}
},
getDataList(selectedId) {
- // this.dataListLoading = true
- this.dataListLoading = false
+ this.dataListLoading = true
var criteria = {}
criteria.dateTimeFilters = this.dateTimeFilters
criteria.multiSearchFilter = this.multiSearchFilter
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3855e80..3e5b25a 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -28,12 +28,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="code">
- <el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
- <!-- <el-button
- slot="append"
- icon="el-icon-search"
- :disabled="resultVal!=null && dataForm.id!=null"
- @click="queryCode()"></el-button> -->
+ <el-input v-model="dataForm.code" disabled>
<el-button
slot="append"
icon="el-icon-full-screen"
@@ -44,8 +39,9 @@
</el-col>
<el-col :span="6">
<el-form-item prop="name" label="鍘熸潗鏂欏悕绉�">
- <el-input v-model="dataForm.name" disabled >
- </el-input>
+ <el-tooltip class="item" effect="dark" :content="dataForm.name">
+ <el-input v-model="dataForm.name" disabled ></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -63,7 +59,9 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿" prop="specs">
- <el-input v-model="dataForm.specs" disabled></el-input>
+ <el-tooltip class="item" effect="dark" :content="dataForm.specs">
+ <el-input v-model="dataForm.specs" disabled></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -76,7 +74,9 @@
</el-col>
<el-col :span="6">
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplier">
+ <el-tooltip class="item" effect="dark" :content="dataForm.supplier" >
<el-input v-model="dataForm.supplier" disabled />
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -342,7 +342,7 @@
formTime: '',
message: '',
name: '',
- code: '88.118.1/A0498220',
+ code: '',
specs: '',
unit: '',
number: '',
@@ -428,72 +428,9 @@
},
// 鎵撳紑鐩告満
Turnonthecamera() {
- console.log("鎵ц");
this.qrcode = true
this.$refs.codeCompont.openCamera()
- // this.camera = 'rear'
},
- // 鎵爜缁撴灉鍥炶皟
- // onDecode(result) {
- // console.log(result)
- // this.turnCameraOff()
- // },
- // 鐩告満鍙嶈浆
- // switchCamera() {
- // switch (this.camera) {
- // case 'front':
- // this.camera = 'rear'
- // break
- // case 'rear':
- // this.camera = 'front'
- // break
- // default:
- // this.$toast('閿欒')
- // }
- // },
- // 鍏抽棴鐩告満
- // turnCameraOff() {
- // this.camera = 'off'
- // this.qrcode = false
- // },
- // 鎵撳紑鎵嬬數绛�
- // ClickFlash() {
- // switch (this.torchActive) {
- // case true:
- // this.torchActive = false
- // break
- // case false:
- // this.torchActive = true
- // break
- // default:
- // this.$toast('閿欒')
- // }
- // },
-
- // 妫�鏌ユ槸鍚﹁皟鐢ㄦ憚鍍忓ご
- // async onInit(promise) {
- // try {
- // await promise
- // } catch (error) {
- // if (error.name === 'StreamApiNotSupportedError') {
- // } else if (error.name === 'NotAllowedError') {
- // this.errorMessage = 'Hey! I need access to your camera'
- // } else if (error.name === 'NotFoundError') {
- // this.errorMessage = 'Do you even have a camera on your device?'
- // } else if (error.name === 'NotSupportedError') {
- // this.errorMessage =
- // 'Seems like this page is served in non-secure context (HTTPS, localhost or file://)'
- // } else if (error.name === 'NotReadableError') {
- // this.errorMessage =
- // "Couldn't access your camera. Is it already in use?"
- // } else if (error.name === 'OverconstrainedError') {
- // this.errorMessage =
- // "Constraints don't match any installed camera. Did you asked for the front camera although there is none?"
- // } else {
- // this.errorMessage = 'UNKNOWN ERROR: ' + error.message
- // }
- // }
- // },
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
@@ -759,7 +696,6 @@
for(var i=0;i<row.testValueList.length;i++){
let val = row.testValueList[i]
let reg = /^[0-9]*[1-9][0-9]*$/
- console.log(['鏄�','鍚�'].includes(val));
if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){
this.$message.error("璇疯緭鍏ユ暟瀛楁垨閫夋嫨鏄惁")
row.testValueList[i] = null
--
Gitblit v1.9.3