From ed2342a8cadcd9519858ecd5d440fcba4d66a02d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 06 九月 2024 17:01:44 +0800
Subject: [PATCH] 电路检验版本选择
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 59 +++++++++++--------
src/components/do/b1-sample/detail.vue | 2
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 59 +++++++++++--------
src/components/do/b1-inspect-order-plan/Inspection.vue | 49 ++++++++++++++-
src/components/view/b1-inspect-order-plan.vue | 8 ++
src/assets/api/controller.js | 1
6 files changed, 122 insertions(+), 56 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 7d604ce..0c07042 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -211,6 +211,7 @@
write: "/insOrderPlan/write", // 濉啓娓╁害涓庢箍搴�
temCycle: "/insOrderPlan/temCycle", // 娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)
jumpTeam: "/insOrderPlan/jumpTeam", // 鎻掗槦
+ chooseVersion: "/insOrderPlan/chooseVersion", // 鐢佃矾妫�楠岀増鏈�
}
const systemLog = {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 9e9cf63..dd840df 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -282,7 +282,7 @@
<el-input clearable v-model="sampleProduct.length" disabled size="small" placeholder="璇疯緭鍏�" ></el-input>
</el-form-item>
<el-form-item label="璇曢獙鏍囧噯:">
- <span>{{ insOrder.testRequirements?insOrder.testRequirements:'-' }}</span>
+ <span>{{ currentSample.testRequirements?currentSample.testRequirements:'-' }}</span>
</el-form-item>
<el-form-item label="涓嬪彂鏃堕棿:">
<el-input clearable v-model="insOrder.sendTime" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
@@ -309,11 +309,11 @@
<el-radio-button :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
size="small">{{ item.templateName }}</el-radio-button>
</el-radio-group>
- <span style="margin-left: 20px;margin-right: 10px;">妯℃澘鐗堟湰:</span>
+ <!-- <span style="margin-left: 20px;margin-right: 10px;">妯℃澘鐗堟湰:</span>
<el-radio-group v-model="currentTableState" size="small">
<el-radio-button label="0" size="small">鐗堟湰涓�</el-radio-button>
<el-radio-button label="1" size="small">鐗堟湰浜�</el-radio-button>
- </el-radio-group>
+ </el-radio-group> -->
</div>
<div style="display: flex;align-items: center;">
<span v-if="casing.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�'"> 濂楃锛�</span>
@@ -913,6 +913,21 @@
<el-button type="primary" @click="submitDataGet()" :loading="getDataIndexLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <el-dialog
+ title="閫夋嫨鐢佃矾妫�楠屾ā鏉跨増鏈�"
+ :visible.sync="versionDialogVisible"
+ width="30%"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :show-close="false">
+ <el-radio-group v-model="currentTableState">
+ <el-radio :label="0">鐢佃皟-鐢佃矾妫�楠屽師濮嬭褰�</el-radio>
+ <el-radio :label="1">闈炵數璋�-鐢佃矾妫�楠屽師濮嬭褰�</el-radio>
+ </el-radio-group>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" :loading="versionLoading" @click="saveVersion">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -924,7 +939,7 @@
import CircuitParameters1 from './circuit-parameters1.vue'
import CircuitParameters2 from './circuit-parameters2.vue'
export default {
- props: ['sonLaboratory', 'orderId', 'state','inspectorList'],
+ props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId'],
components: {
ValueTable,
Circuit,
@@ -933,6 +948,8 @@
},
data() {
return {
+ versionLoading:false,
+ versionDialogVisible:false,
currentTableState:0,
sagData: [],
sagForm: {
@@ -1110,7 +1127,7 @@
getDataIndexLoading:false,
changeType:null,
getDataTypeId:'',
- getDataType:null
+ getDataType:null,
}
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
@@ -1137,6 +1154,7 @@
this.scrollInit()
this.getPower()
this.startWorker()
+ this.currentTableState = this.version
},
watch: {
// 鐩戝惉浠诲姟id锛岃幏鍙栦换鍔′俊鎭�
@@ -2365,6 +2383,10 @@
this.tableList = null;
this.tableList = [this.tableLists[0]]
this.currentTable = this.tableLists[0].templateId;
+ console.log(111,this.currentTable);
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐢佃矾璇曢獙')&&this.currentTableState!=0&&this.currentTableState!=1){
+ this.versionDialogVisible = true
+ }
// 澶勭悊椤甸潰鍒楄〃鏁版嵁
this.handleTableData()
}
@@ -3593,6 +3615,23 @@
async getCurrentItem(){
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ },
+ saveVersion(){
+ if(this.currentTableState!=0&&this.currentTableState!=1){
+ this.$message.error('璇烽�夋嫨鐗堟湰')
+ return
+ }
+ this.versionLoading = true;
+ this.$axios.post(this.$api.insOrderPlan.chooseVersion, {
+ orderStateId: this.orderStateId,
+ version: this.currentTableState
+ }).then(res => {
+ this.versionLoading = false;
+ if(res.code==201){
+ return
+ }
+ this.versionDialogVisible = false
+ })
}
}
}
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
index deb5f18..a39291f 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -35,7 +35,7 @@
</el-col>
<el-col :span="7">
<div style="display: flex;align-items: center;justify-content: flex-end;" class="btns">
- <el-button type="primary" size="small" @click="addList(allBandList)" :disabled="state>1">娣诲姞棰戞</el-button>
+ <el-button type="primary" size="small" @click="addList(allBandList,'棰戞')" :disabled="state>1">娣诲姞棰戞</el-button>
<el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'鍒犻櫎棰戞')" :disabled="state>1">鍒犻櫎棰戞</el-button>
<el-button type="primary" size="small" @click="addList(angleList)" :disabled="state>1">娣诲姞瑙掑害</el-button>
<el-button size="small" @click="deleteList(angleList.length-1,angleList)" :disabled="state>1">鍒犻櫎瑙掑害</el-button>
@@ -523,30 +523,7 @@
message: '涓嶈兘鍒犻櫎鏈�鍚庝竴涓簰璋�'
});
}else{
- if(list[index].frequency){
- this.$confirm(`鏄惁纭畾鍒犻櫎 ${list[index].often} 棰戠偣鏁版嵁?`, "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.$axios.post(this.$api.insOrderPlan.deleteInsContext2, {
- frequency:list[index].frequency,
- productId:list[index].id,
- often:list[index].often
- }).then(res => {
- if (res.code === 201) {
- this.$message.error('鍒犻櫎澶辫触')
- return
- }
- this.$message.success('宸插垹闄�')
- list.splice(index, 1)
- }).catch(err => {
- console.log(err)
- })
- }).catch(() => {})
- }else{
- list.splice(index, 1)
- }
+ list.splice(index, 1)
}
}else if(type=='鍒犻櫎棰戞'){
this.$confirm(`鏄惁纭畾鍒犻櫎 ${list[index].band} 棰戞鏁版嵁?`, "鎻愮ず", {
@@ -593,7 +570,39 @@
index = i;
}
})
+ obj.often = ''
+ obj.result = ''
+ let num0 = obj.value.length
+ let num1 = obj.value[0].length
+ delete obj.value
+ obj.value = []
+ for(let i = 0;i<num0;i++){
+ obj.value.push([])
+ for(let j = 0;j<num1;j++){
+ obj.value[i].push('')
+ }
+ }
list.splice(index+1, 0, obj)
+ }else if(type=='棰戞'){
+ let obj = JSON.parse(JSON.stringify(list[0]));
+ console.log(2222,obj)
+ obj.band = ''
+ obj.projectList.forEach(item=>{
+ item.often = ''
+ item.result = ''
+ item.frequency = ''
+ let num0 = item.value.length
+ let num1 = item.value[0].length
+ delete item.value
+ item.value = []
+ for(let i = 0;i<num0;i++){
+ item.value.push([])
+ for(let j = 0;j<num1;j++){
+ item.value[i].push('')
+ }
+ }
+ })
+ list.push(obj)
}else{
let obj = JSON.parse(JSON.stringify(list[0]));
list.push(obj)
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
index a6a66ba..e986eb7 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -35,7 +35,7 @@
</el-col>
<el-col :span="7">
<div style="display: flex;align-items: center;justify-content: flex-end;" class="btns">
- <el-button type="primary" size="small" @click="addList(allBandList)" :disabled="state>1">娣诲姞棰戞</el-button>
+ <el-button type="primary" size="small" @click="addList(allBandList,'棰戞')" :disabled="state>1">娣诲姞棰戞</el-button>
<el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'鍒犻櫎棰戞')" :disabled="state>1">鍒犻櫎棰戞</el-button>
<el-button type="primary" size="small" @click="addList(angleList)" v-if="!(state>1)&&intermodulationNum>0">娣诲姞瑙掑害</el-button>
<el-button size="small" @click="deleteList(angleList.length-1,angleList)" v-if="!(state>1)&&intermodulationNum>0">鍒犻櫎瑙掑害</el-button>
@@ -421,30 +421,7 @@
message: '涓嶈兘鍒犻櫎鏈�鍚庝竴涓簰璋�'
});
}else{
- if(list[index].frequency){
- this.$confirm(`鏄惁纭畾鍒犻櫎 ${list[index].often} 棰戠偣鏁版嵁?`, "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.$axios.post(this.$api.insOrderPlan.deleteInsContext2, {
- frequency:list[index].frequency,
- productId:list[index].id,
- often:list[index].often
- }).then(res => {
- if (res.code === 201) {
- this.$message.error('鍒犻櫎澶辫触')
- return
- }
- this.$message.success('宸插垹闄�')
- list.splice(index, 1)
- }).catch(err => {
- console.log(err)
- })
- }).catch(() => {})
- }else{
- list.splice(index, 1)
- }
+ list.splice(index, 1)
}
}else if(type=='鍒犻櫎棰戞'){
this.$confirm(`鏄惁纭畾鍒犻櫎 ${list[index].band} 棰戞鏁版嵁?`, "鎻愮ず", {
@@ -491,7 +468,39 @@
index = i;
}
})
+ obj.often = ''
+ obj.result = ''
+ let num0 = obj.value.length
+ let num1 = obj.value[0].length
+ delete obj.value
+ obj.value = []
+ for(let i = 0;i<num0;i++){
+ obj.value.push([])
+ for(let j = 0;j<num1;j++){
+ obj.value[i].push('')
+ }
+ }
list.splice(index+1, 0, obj)
+ }else if(type=='棰戞'){
+ let obj = JSON.parse(JSON.stringify(list[0]));
+ console.log(2222,obj)
+ obj.band = ''
+ obj.projectList.forEach(item=>{
+ item.often = ''
+ item.result = ''
+ item.frequency = ''
+ let num0 = item.value.length
+ let num1 = item.value[0].length
+ delete item.value
+ item.value = []
+ for(let i = 0;i<num0;i++){
+ item.value.push([])
+ for(let j = 0;j<num1;j++){
+ item.value[i].push('')
+ }
+ }
+ })
+ list.push(obj)
}else{
let obj = JSON.parse(JSON.stringify(list[0]));
list.push(obj)
diff --git a/src/components/do/b1-sample/detail.vue b/src/components/do/b1-sample/detail.vue
index f12f6a3..92e0658 100644
--- a/src/components/do/b1-sample/detail.vue
+++ b/src/components/do/b1-sample/detail.vue
@@ -66,6 +66,8 @@
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="100"
show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemSubclass" label="妫�楠屽瓙椤�" min-width="100"
+ show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip v-if="PROJECT=='瑁呭鐢电紗'"></el-table-column>
<el-table-column prop="sonLaboratory" label="绔欑偣" min-min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index e3d88d4..07192f3 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -298,7 +298,7 @@
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
<Add :active="activeFace" :currentId="currentId" :examine="examine"/>
</div>
- <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
+ <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version"/>
<el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
<div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
<ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
@@ -324,6 +324,8 @@
},
data() {
return {
+ orderStateId:null,
+ version:null,
examine: null,
inspectorList: [],//妫�楠屼汉鍛樺垪琛�
alone: false,
@@ -792,6 +794,8 @@
this.inspectorList = inspectorList
this.state = 1;
this.orderId = row.id
+ this.version = row.version
+ this.orderStateId = row.orderStateId
},
handleConnect(row){
this.orderId = row.id
@@ -841,6 +845,8 @@
handleReview(row){
this.state = 2;
this.orderId = row.id
+ this.version = row.version
+ this.orderStateId = row.orderStateId
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
--
Gitblit v1.9.3