From e03f39a06c9f17ee0bf9a2b1fa24b7de0ea2e3d4 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 九月 2023 11:47:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/finishedProductInspectionUp.vue | 153 ++++++++++++++++++++++++++++++---------------------
1 files changed, 90 insertions(+), 63 deletions(-)
diff --git a/src/components/view/finishedProductInspectionUp.vue b/src/components/view/finishedProductInspectionUp.vue
index 7c421b3..63cdb1d 100644
--- a/src/components/view/finishedProductInspectionUp.vue
+++ b/src/components/view/finishedProductInspectionUp.vue
@@ -38,8 +38,8 @@
<el-row>
<el-col :span="7">
<el-form-item label="浜у搧鍚嶇О锛�">
- <el-select disabled @change="changeOptionsSamplename" style="width: 180px;" v-model="processInspectVo.material" size="small"
- placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-select disabled @change="changeOptionsSamplename" style="width: 180px;"
+ v-model="processInspectVo.material" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
<el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name"
:value="item.id + '-' + item.name">
</el-option>
@@ -68,14 +68,14 @@
</el-col>
<el-col :span="7">
<el-form-item label="鍗曚綅锛�">
- <el-input disabled style="width: 180px;" v-model="processInspectVo.unit" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
- autocomplete="off" />
+ <el-input disabled style="width: 180px;" v-model="processInspectVo.unit"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="鏁伴噺锛�">
- <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�"
- autocomplete="off" />
+ <el-input disabled style="width: 180px;" v-model="processInspectVo.quantity"
+ placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="3" style="display: flex;justify-content: end;">
@@ -88,7 +88,8 @@
<div class="inspectionProject">
<el-row>
<el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
- <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span" style="display: flex;justify-content: end;">
+ <el-col v-if="!isUpBtn" :span="12" class="inspectionProject_span"
+ style="display: flex;justify-content: end;">
<el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�楠屽�煎垪</el-button>
<el-button style="margin-right: 30px;" size="mini"
@click="clickAddInspectionColumn()">娣诲姞妫�楠屽�煎垪</el-button>
@@ -153,8 +154,9 @@
</template>
</el-table-column>
<el-table-column prop="operation" label="涓婃姤">
- <template slot-scope="scope">
- <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">涓婃姤</el-button>
+ <template slot-scope="scope">
+ <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary"
+ @click="escalation" size="small">涓婃姤</el-button>
<el-button v-else type="success" size="small">宸蹭笂鎶�</el-button>
</template>
</el-table-column>
@@ -162,22 +164,11 @@
</div>
<el-dialog title="璇烽�夋嫨璁惧" :visible.sync="centerDialogVisible" width="20%">
<div class="div_device_dialog">
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 6px;">
- </el-input>
- <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
- highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
- <div class="custom-tree-node" slot-scope="{ data }">
- <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
- }`
- "></i>
- {{ data.name }}</span>
- </div>
- </el-tree>
+ <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
+ </el-option>
+ </el-select>
</div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="centerDialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="clickNodeSure()">纭� 瀹�</el-button>
- </span>
</el-dialog>
</div>
</template>
@@ -224,7 +215,8 @@
qualityTraceability: null,
quantity: null,
specificationsModel: null,
- unit: null
+ unit: null,
+ technologyId: null
},
InspectioniD: null,
addInspectionform: [
@@ -267,7 +259,10 @@
children: "children",
label: "name"
},
- nodeData: "", // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
+ nodeData: {
+ id: 0,
+ name: null
+ }, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
clickSelectDevice: {
index: "", // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
rpId: "" // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
@@ -275,29 +270,29 @@
};
},
watch: {
- filterText(val) {
- this.$refs.tree.filter(val);
- }
+ // filterText(val) {
+ // this.$refs.tree.filter(val);
+ // }
},
mounted() {
- if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
- this.isUpBtn=true
+ if (this.rowInfo.result != null && this.rowInfo.result != '') {
+ this.isUpBtn = true
}
- this.processInspectVo.material=this.rowInfo.material
- this.processInspectVo.mcode=this.rowInfo.material_code
- this.processInspectVo.orderNumber=this.rowInfo.order_number
- this.processInspectVo.qualityTraceability=this.rowInfo.quality_traceability
- this.processInspectVo.specificationsModel=this.rowInfo.specifications_model
- this.processInspectVo.unit=this.rowInfo.unit
- this.processInspectVo.quantity=this.rowInfo.quantity
- this.processInspectVo.prname=this.rowInfo.customer_name
- this.processInspectVo.sname=this.rowInfo.project_name
- this.inspectionResultForm[0].id=this.rowInfo.material_code
- this.inspectionResultForm[0].name=this.rowInfo.material
- this.inspectionResultForm[0].conclusion=this.rowInfo.result
- this.detailId=this.rowInfo.id
+ this.processInspectVo.material = this.rowInfo.material
+ this.processInspectVo.mcode = this.rowInfo.material_code
+ this.processInspectVo.orderNumber = this.rowInfo.order_number
+ this.processInspectVo.qualityTraceability = this.rowInfo.quality_traceability
+ this.processInspectVo.specificationsModel = this.rowInfo.specifications_model
+ this.processInspectVo.unit = this.rowInfo.unit
+ this.processInspectVo.quantity = this.rowInfo.quantity
+ this.processInspectVo.prname = this.rowInfo.customer_name
+ this.processInspectVo.sname = this.rowInfo.project_name
+ this.inspectionResultForm[0].id = this.rowInfo.material_code
+ this.inspectionResultForm[0].name = this.rowInfo.material
+ this.inspectionResultForm[0].conclusion = this.rowInfo.result
+ this.detailId = this.rowInfo.id
this.getTableData()
- this.getOptions();
+ // this.getOptions();
},
methods: {
escalation() {
@@ -323,12 +318,12 @@
id: this.detailId
}).then(res => {
if (res.code == 200) {
- if(res.message==='椤圭洰鏈楠屽畬!'){
+ if (res.message === '椤圭洰鏈楠屽畬!') {
this.$message({
- message: res.message,
- type: 'warning'
- });
- return
+ message: res.message,
+ type: 'warning'
+ });
+ return
}
this.$message({
message: '涓婃姤鎴愬姛',
@@ -344,17 +339,17 @@
})
},
- changeOptionsSamplename(){
- let id=this.processInspectVo.material.split("-")[0]
- let sample=this.optionsSamplename.filter(o=>{
- return o.id==id
+ changeOptionsSamplename() {
+ let id = this.processInspectVo.material.split("-")[0]
+ let sample = this.optionsSamplename.filter(o => {
+ return o.id == id
})[0]
- this.processInspectVo.qualityTraceability=sample.qualityTraceability
- this.processInspectVo.mcode=sample.mcode
- this.processInspectVo.specificationsModel=sample.specifications
- this.processInspectVo.unit=sample.unit
+ this.processInspectVo.qualityTraceability = sample.qualityTraceability
+ this.processInspectVo.mcode = sample.mcode
+ this.processInspectVo.specificationsModel = sample.specifications
+ this.processInspectVo.unit = sample.unit
},
- comBack(){
+ comBack() {
this.$parent.comBackMain()
},
handleClick(row) {
@@ -384,8 +379,14 @@
return data.name.indexOf(value) !== -1;
},
// 鑾峰彇璁惧鏍戝唴瀹�
- getOptions() {
- this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
+ getOptions(row) {
+ this.$axios.get(this.$api.url.inspectionItemChooseDev, {
+ params: {
+ father: row.father,
+ name: row.name,
+ technologyId: this.processInspectVo.technologyId
+ }
+ }).then(res => {
this.materialOptions = res.data;
});
},
@@ -394,9 +395,15 @@
this.centerDialogVisible = true;
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
+ this.getOptions(scope.row);
},
// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
clickNodeSure() {
+ let select = this.materialOptions.filter(item => {
+ return item.id === this.filterText
+ })[0]
+ this.nodeData.id = select.id
+ this.nodeData.name = select.device
if (this.detailId == null) {
this.inspectionItems[
this.clickSelectDevice.index
@@ -419,8 +426,20 @@
}
},
changeState(row, index) {
- console.log(row);
if (row.did != null && row.did != '') {
+ let val = row.empiricalValueAddss.filter(item => {
+ return item != '' && item != null
+ })
+ let eq = val.filter(item => {
+ return /^[^><=]/.test(item)
+ })
+ if (eq.length > 0) {
+ this.$message({
+ message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ type: 'warning'
+ });
+ return
+ }
let str = ""
row.empiricalValueAddss.forEach(e => {
str += e + ","
@@ -496,7 +515,7 @@
// this.isAddProject = true
let val = JSON.parse(JSON.stringify(this.processInspectVo))
val.material = this.processInspectVo.material.split("-")[1]
- val.id=this.processInspectVo.material.split("-")[0]
+ val.id = this.processInspectVo.material.split("-")[0]
this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
headers: { "Content-Type": "application/json" }
}).then(res => {
@@ -514,6 +533,14 @@
})
},
getTableData() {
+ console.log(this.rowInfo);
+ this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
+ params: {
+ id: this.rowInfo.id
+ }
+ }).then(res => {
+ this.processInspectVo.technologyId = res.data[0].techId
+ })
this.$axios.get(this.$api.url.inspectionItemListUser, {
params: {
id: this.detailId,
--
Gitblit v1.9.3