From d98942fd0d8b9097e5a5ed4e4f2b3161a0174661 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 19:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 3
.gitignore | 3 +
src/views/equipment/metering/metering-form.vue | 86 +++++++++++-----------------
src/views/quality/finishedProductInspection/index.vue | 4 -
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 10 +-
src/views/quality/processInspect/processInspect-form.vue | 16 +++--
6 files changed, 52 insertions(+), 70 deletions(-)
diff --git a/.gitignore b/.gitignore
index 75713dd..8142978 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@
# Lock File
package-lock.json
yarn.lock
+
+# config.js
+vue.config.js
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 2fc95b7..ca38b67 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -24,44 +24,23 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏍″噯鏃堕棿" prop="createTime">
- <el-date-picker
- v-model="dataForm.createTime"
- align="right"
- type="date"
- placeholder="鏍″噯鏃堕棿"
- :picker-options="pickerOptions">
- </el-date-picker>
+ <el-date-picker
+ v-model="dataForm.createTime"
+ type="datetime"
+ placeholder="鏍″噯鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒版湡鏃堕棿" prop="updateTime">
+ <el-date-picker
+ v-model="dataForm.updateTime"
+ type="datetime"
+ placeholder="鏍″噯鍒版湡鏃堕棿">
+ </el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鏍″噯鍒版湡鏃堕棿" prop="updateTime">
- <el-date-picker
- v-model="dataForm.updateTime"
- align="right"
- type="date"
- placeholder="鏍″噯鍒版湡鏃堕棿"
- :picker-options="pickerOptions">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="12">
- <el-form-item label="绫诲瀷" prop="type">
- <el-select
- v-model="dataForm.type"
- filterable
- placeholder="璇烽�夋嫨"
- style="width:100%"
- >
- <el-option
- v-for="item in workshopList"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col> -->
+
<el-col :span="12">
<el-form-item label="璐ｄ换浜�" prop="createUser">
<el-input
@@ -79,7 +58,7 @@
></el-input>
</el-form-item>
</el-col>
-
+
<el-col :span="12">
<el-form-item label="璐ｄ换閮ㄩ棬" prop="responsibleDepartment">
<el-input
@@ -111,7 +90,7 @@
placeholder="妫�瀹�/鏍″噯"
></el-input>
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="12">
<el-form-item label="鍒嗙被" prop="classification">
<el-input
@@ -119,7 +98,7 @@
placeholder="鍒嗙被"
></el-input>
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="12">
<el-form-item label="瀹氱偣浣嶇疆" prop="fixedPointPosition">
<el-input
@@ -127,8 +106,8 @@
placeholder="瀹氱偣浣嶇疆"
></el-input>
</el-form-item>
- </el-col>
-
+ </el-col>
+
<!-- <el-col :span="12">
@@ -168,13 +147,10 @@
export default {
data() {
return {
-
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
- }
- },
-
+ },},
// options: regionData,
visible: false,
dataForm: {
@@ -191,17 +167,22 @@
manufactureDate: '',
installDate: '',
// state: '',
+ verification:'',
+ inspectionUnit:'',
specifications:'',
responsibleDepartment:'',
- // createUser:'',
+ classification:'',
+ createUser:'',
status:'',
-
-
+ updateTime:'',
+ createTime:'',
description: '',
value1: '',
+ certificate:'',
+ fixedPointPosition:'',
code: null,
// type: null,
- // status: null,
+ status: null,
supplier: null
},
dataRule: {
@@ -269,7 +250,7 @@
}
})
},
-
+
initFactorySelect() {
loadFactoryList().then((res) => {
this.factoryOptions = res.data
@@ -279,11 +260,11 @@
})
}
},
-
+
created() {
this.initFactorySelect()
this.getEquipmentState()
-
+
// remote('work_shop').then((response) => {
// if (response.data.code === 0) {
// this.workshopList = response.data.data
@@ -294,4 +275,3 @@
}
}
</script>
-
\ No newline at end of file
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index e806b33..e13c447 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -8,7 +8,7 @@
<h2 v-else>缂栬緫-浜у搧妫�楠屽崟</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="addTestProject" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
+ <el-button @click="addTestProject" type="primary" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
</div>
</div>
<div class="page-main">
@@ -154,7 +154,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, index)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
<!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
@@ -276,7 +276,7 @@
this.init()
},
methods: {
-
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -390,7 +390,7 @@
})
},
updateDevice(row,index){
- updateDeviceById({deviceId:row.eId,fpid:row.iId}).then(res=>{
+ updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{
this.inspectionItems.forEach(obj=>{
if(obj.children){
obj.children[index-1].inspectionValue = ''
@@ -425,7 +425,7 @@
return
}
let obj = {
- deviceId: row.eId,
+ equiomentId: row.eId,
fpid: row.iid,
inspectionValue: str,
note : row.inote
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index b1ee15b..3206e04 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -236,15 +236,13 @@
},
showPrint(row){
queryById(row.id).then(res=>{
- console.log(res);
- this.printFormData = res.data.data
+ this.printFormData = res.data.data
this.printDialogVisible = true
}).catch(error=>{
console.log(error);
})
},
exportExcel(){
- console.log("============");
let queryParam=this.$refs.finishedProduct.getQueryParam();
delete queryParam.criteria
console.log(queryParam);
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 2f5837d..6a85e93 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -400,15 +400,17 @@
})
},
updateDevice(row, index) {
+ let rowId=JSON.stringify(row.iid)
updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
this.inspectionItems.forEach(obj => {
- console.log(obj);
- if (obj.children) {
- obj.children[index - 1].inspectionValue = null
- obj.children[index - 1].iresult = null
- obj.children[index - 1].empiricalValueAddss = []
- obj.children[index-1].inote=''
- }
+ obj.children.forEach(c=>{
+ if(c.iid==rowId){
+ c.inspectionValue = null
+ c.iresult = null
+ c.empiricalValueAddss = []
+ c.inote=''
+ }
+ })
})
}).catch(error => {
console.log(error)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 2fdd2b7..3833aae 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -7,7 +7,7 @@
<h2 v-else>缂栬緫-鍘熸潗鏂欐楠�</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
+ <el-button type="primary" @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
@@ -358,7 +358,6 @@
},
// 纭鍥炶皟
selectPart(param, nodePart, index) {
- console.log(param)
if (typeof param !== 'undefined') {
this.dataForm.code = param.code
this.dataForm.name = param.name
--
Gitblit v1.9.3