From 47cf5518f0f61dbf8066c2273b9f77c2cd7b1751 Mon Sep 17 00:00:00 2001
From: YLouie <929705085@qq.com>
Date: 星期五, 19 九月 2025 17:56:03 +0800
Subject: [PATCH] 销售订单plm同步
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 322 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 285 insertions(+), 37 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 02135a1..dbbc3f5 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -104,6 +104,9 @@
<el-tab-pane label="妫�楠岄」鐩�">
<el-row>
<el-col v-if="resultVal==null" :span="24" class="inspectionProject_span" style="text-align: right;">
+ <el-button size="small"
+ type="primary"
+ @click="saveTable()">淇濆瓨</el-button>
<el-button size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
<el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</el-col>
@@ -131,7 +134,9 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
placement="top-start">
<el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ娴嬪��"
+ :id="`detectionValue${index}`+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, `detectionValue${index}`)"></el-input>
<span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
</el-tooltip>
</el-col>
@@ -176,7 +181,9 @@
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"
+ :id="`remark`+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, `remark`)"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
@@ -187,7 +194,8 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�" :id="`remark`+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, `remark`)"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
@@ -282,6 +290,54 @@
</el-table-column>
</el-table>
</el-tab-pane>
+ <el-tab-pane label="闄勪欢">
+ <el-table :data="configFileTableData" height="400px">
+ <el-table-column
+ prop="orderNumber"
+ align="center"
+ label="璁㈠崟鍙�"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column
+ prop="originalFileName"
+ align="center"
+ label="鍘熸枃浠跺悕"
+ width="200"
+ >
+ </el-table-column>
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
+ </el-table-column>
+ <el-table-column prop="createUser" align="center" label="涓婁紶浜�">
+ </el-table-column>
+ <el-table-column
+ prop="createTime"
+ align="center"
+ label="涓婁紶鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column prop="updateUser" align="center" label="鏇存柊浜�">
+ </el-table-column>
+ <el-table-column
+ prop="updateTime"
+ align="center"
+ label="鏇存柊鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column fixed="right" align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button
+ @click="downloadProcessConfigFiles(scope.row)"
+ type="text"
+ size="small"
+ >涓嬭浇</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
</el-tabs>
</div>
@@ -335,6 +391,7 @@
queryById,
updateDeviceById,
updateFinishedInsProduct,
+ updateFinishedInsProduct2,
updateFinishedInspectById,
selectDeviceAPI,
updateLocationIdById,
@@ -347,12 +404,15 @@
import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
import qrCodeApp from '@/views/common/qrCodeApp'
import { getStore } from '@/util/store'
+ import { getProcessConfigFile } from '@/api/plan/manufacturingorder'
+ import * as customerorder from '@/api/plan/customerorder'
export default {
components:{
qrCodeApp
},
data() {
return {
+ dataForm:null,
progrecessFileLoading: false,
processConfigFileTableData: [],
headers: {
@@ -404,9 +464,24 @@
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
+ configFileTableData:[],
+ keyfield:['inspectProject','project','unit','standard','remark'],
+ keyfield0:['detectionValue0']
}
},
watch: {
+ empiricalValueAdd(newVal){
+ if(newVal!=this.keyfield0.length){
+ if(newVal>this.keyfield0.length){
+ this.keyfield0 = []
+ for(let i=0;i<newVal;i++){
+ this.keyfield0.push('detectionValue'+i)
+ }
+ }else{
+ this.keyfield0.splice(this.keyfield0.length-1,1);
+ }
+ }
+ }
},
beforeUpdate(){
this.$nextTick(()=>{
@@ -427,6 +502,49 @@
this.init()
},
methods: {
+ getProcessConfigFile(){
+ getProcessConfigFile({
+ orderNumber: this.dataForm.orderNumber,
+ lineNumber: this.dataForm.customerNo
+ }).then((res)=>{
+ this.configFileTableData = res.data.data
+ })
+ },
+ downloadProcessConfigFiles(row){
+ customerorder.downloadProcessConfigFile(
+ row.fileName,
+ row.bucketName,
+ row.originalFileName
+ )
+ },
+ saveTable(){
+ let finishedInsProducts = [];
+ if(this.inspectionItems.length>0){
+ this.inspectionItems.forEach(item=>{
+ if(item.children!=null&&item.children.length>0){
+ item.children.forEach(item2=>{
+ let obj = {};
+ obj.id = item2.iid;
+ obj.note = item2.inote;
+ obj.required = item2.required;
+ obj.inspectionValue = item2.empiricalValueAddss.join(',');
+ obj.deviceId = item2.eId;
+ finishedInsProducts.push(obj);
+ })
+ }
+ })
+ }
+ if(finishedInsProducts.length>0){
+ updateFinishedInsProduct2(finishedInsProducts).then(res=>{
+ if(res.data.code == 0){
+ this.$message.success("鏇存柊鎴愬姛")
+ }else{
+ this.$message.error("鏇存柊澶辫触")
+ }
+ this.init()
+ })
+ }
+ },
delProcessConfigFile(row) {
this.$confirm('鏄惁鍒犻櫎璇ラ檮浠�', '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -521,22 +639,31 @@
result: this.inspectionResultForm[0].result
}
if (pro > 0) {
- this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- inputPattern: /^\d+$/,
- inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
- }).then(({ value }) => {
- obj.number = value
- updateFinishedInspectById(obj).then(res => {
- if(res.data.data.indexOf("鎴愬姛") > 0){
- this.$message.success("涓婃姤鎴愬姛");
- this.checkTestState()
- }else{
- this.$message.warning(res.data.data)
- }
- });
- }).catch(() => {});
+ obj.number = 1;
+ updateFinishedInspectById(obj).then(res => {
+ if(res.data.data.indexOf("鎴愬姛") > 0){
+ this.$message.success("涓婃姤鎴愬姛");
+ this.checkTestState()
+ }else{
+ this.$message.warning(res.data.data)
+ }
+ });
+ // this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // inputPattern: /^\d+$/,
+ // inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+ // }).then(({ value }) => {
+ // obj.number = value
+ // updateFinishedInspectById(obj).then(res => {
+ // if(res.data.data.indexOf("鎴愬姛") > 0){
+ // this.$message.success("涓婃姤鎴愬姛");
+ // this.checkTestState()
+ // }else{
+ // this.$message.warning(res.data.data)
+ // }
+ // });
+ // }).catch(() => {});
}else{
updateFinishedInspectById(obj).then(res => {
if(res.data.data.indexOf("鎴愬姛") > 0){
@@ -569,6 +696,7 @@
if(id != null){
queryById(id).then(res=>{
let result = res.data.data
+ this.dataForm = result
this.processInspectVo.finInsNo = result.finInsNo
this.processInspectVo.orderNumber = result.orderNumber
this.processInspectVo.mcode = result.materialCode
@@ -596,10 +724,14 @@
if(obj.inspectionValue){
arr = obj.inspectionValue.split(",")
}
- obj.empiricalValueAddss = arr
+ this.$set(obj,'empiricalValueAddss',arr)
+ // obj.empiricalValueAddss = arr
if(obj.note){
- snote=obj.inote
- }
+ // obj.inote=obj.note
+ this.$set(obj,'inote',obj.note)
+ }else{
+ this.$set(obj,'inote',null)
+ }
if(arr.length > this.empiricalValueAdd){
this.empiricalValueAdd = arr.length
}
@@ -629,6 +761,7 @@
userName: Array.from(new Set(userList)).join(","),
result: this.resultVal==null ? rVal : this.resultVal,
}]
+ this.getProcessConfigFile()
}).catch(error=>{
console.error(error)
})
@@ -677,20 +810,20 @@
if (str === undefined || str === '' || str === null ) {
return
}
- let obj = {
- deviceId: row.eId,
- fpid: row.iid,
- inspectionValue: str,
- note : row.inote
- }
- updateFinishedInsProduct(obj).then(res=>{
- if(res.data.code == 0){
- this.$message.success("鏇存柊鎴愬姛")
- }else{
- this.$message.error("鏇存柊澶辫触")
- }
- this.init()
- })
+ // let obj = {
+ // deviceId: row.eId,
+ // fpid: row.iid,
+ // inspectionValue: str,
+ // note : row.inote
+ // }
+ // updateFinishedInsProduct(obj).then(res=>{
+ // if(res.data.code == 0){
+ // this.$message.success("鏇存柊鎴愬姛")
+ // }else{
+ // this.$message.error("鏇存柊澶辫触")
+ // }
+ // this.init()
+ // })
}
},
addTestProject() {
@@ -763,7 +896,7 @@
arr.splice((arr.length-1),1)
let obj = {
devideId: i.eId,
- fpid: row.iid,
+ fpid: i.iid,
inspectionValue: arr.join(","),
note : i.inote
}
@@ -788,13 +921,128 @@
this.inspectionItems.forEach(i => {
i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
});
+ this.saveTable()
}
}
},
// 娣诲姞妫�楠屽�煎垪
clickAddInspectionColumn() {
this.empiricalValueAdd = this.empiricalValueAdd + 1;
+ },
+ moveFocus(event, index, key) {
+ console.log(key, index,key)
+ let keyfield = this.insertArrayAt(this.keyfield,0,this.keyfield0);
+ // enter閿�
+ // if (event.keyCode === 13) { // 鍥炶溅
+ // if (index === this.getLen() - 1 && key === keyfield[keyfield.length - 1]) { // 鏈�鍚庝竴琛屾渶鍚庝竴涓�
+ // console.log('鏈�鍚庝竴琛屾渶鍚庝竴涓棤娉曞洖杞�')
+ // return
+ // }
+ // this.$nextTick(() => {
+ // event.target.blur()
+ // })
+ // if (key === keyfield[keyfield.length - 1]) { // 褰撳墠琛屾渶鍚庝竴涓�,璺宠浆涓嬩竴琛岀涓�涓�
+
+ // } else { // 璺宠浆涓嬩竴涓�
+ // const nextkeyindex = keyfield.findIndex(k => k === key) + 1
+ // this.$nextTick(() => {
+ // document.getElementById(keyfield[nextkeyindex] + index).focus()
+ // })
+ // }
+ // }
+
+ // 鍚戜笂 =38
+ if (event.keyCode === 38) {
+ console.log('鍚戜笂')
+ if (index === 0) { // 绗竴琛�
+ console.log('绗竴琛屾棤娉曞悜涓�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ let i = 0;
+ while (true){
+ let dom = document.getElementById(key + (index - 1-i))
+ if(dom){
+ dom.focus()
+ return
+ }else if((index-1-i)==0){
+ return
+ }
+ i++
+ }
}
+
+ // 涓� = 40
+ if (event.keyCode === 40) {
+ console.log('鍚戜笅')
+ if (index === this.getLen() - 1) { // 鏈�鍚庝竴琛�
+ console.log('鏈�鍚庝竴琛屾棤娉曞悜涓�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ this.$nextTick(() => {
+ let i = 0;
+ while (true){
+ let dom = document.getElementById(key + (index + 1+i))
+ console.log(dom,key + (index + 1+i))
+ if(dom){
+ dom.focus()
+ return
+ }else if((index+1+i)==this.getLen() - 1){
+ return
+ }
+ i++
+ }
+ })
+ }
+
+ // 宸� = 37
+ if (event.keyCode === 37) {
+ console.log('鍚戝乏')
+ if (index === 0 && key === keyfield[0]) { // 绗竴琛岀涓�涓�
+ console.log('绗竴琛岀涓�涓棤娉曞悜宸�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ const prevkeyindex = keyfield.findIndex(k => k === key) - 1
+ this.$nextTick(() => {
+ let dom = document.getElementById(keyfield[prevkeyindex] + index)
+ if(dom){
+ dom.focus()
+ }
+ })
+ }
+
+ // 鍙� = 39
+ if (event.keyCode === 39) {
+ console.log('鍚戝彸')
+ if (index === this.getLen() - 1 && key === keyfield[keyfield.length - 1]) { // 鏈�鍚庝竴琛屾渶鍚庝竴涓�
+ console.log('鏈�鍚庝竴琛屾渶鍚庝竴涓棤娉曞悜鍙�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ const nextkeyindex = keyfield.findIndex(k => k === key) + 1
+ this.$nextTick(() => {
+ let dom = document.getElementById(keyfield[nextkeyindex] + index)
+ if(dom){
+ dom.focus()
+ }
+ })
+ }
+ },
+ insertArrayAt(arr1, index, arr2) {
+ return arr1.slice(0, index).concat(arr2, arr1.slice(index));
+ },
+ getLen(){
+ let arr = []
+ this.inspectionItems.forEach(item => {
+ arr.push(item)
+ item.children.forEach(child => {
+ arr.push(child)
+ })
+ })
+ return arr.length
+ }
},
}
</script>
--
Gitblit v1.9.3