From de411af0c3e5a760e38782c1a932836fa9bff7d9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 03 三月 2025 15:00:59 +0800
Subject: [PATCH] 路由调整
---
src/views/business/materialOrder/copperOrder.vue | 15 +
src/views/business/materialOrder/customsInspection.vue | 7
src/views/business/productOrder/components/add.vue | 462 ++++++++++++++++++++++++++-------------------------
src/views/business/inspectionTask/index.vue | 4
4 files changed, 256 insertions(+), 232 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 521864b..47597ee 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -573,11 +573,13 @@
this.inspectionTaskState = this.dictToValue(response.data);
});
this.refreshTable();
-
},
mounted() {
this.queryParams.userId = this.userId;
},
+ activated() {
+ this.refreshTable();
+ },
methods: {
getList() {
this.tableLoading = true;
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 1ca4a5f..12f55f1 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -617,12 +617,19 @@
mounted() {
this.active = this.$route.query.active
this.currentId = this.$route.query.currentId
- this.getUserNowInfo()
- this.selectStandardTreeList()
- this.selectStandardMethods()
- this.getInfo() // 鑾峰彇鏁版嵁
+ },
+ activated() {
+ if (this.active==1) {
+ this.getInfoRow();
+ }
},
methods: {
+ getInfoRow() {
+ this.getUserNowInfo()
+ this.selectStandardTreeList()
+ this.selectStandardMethods()
+ this.getInfo() // 鑾峰彇鏁版嵁
+ },
// 鎷嗗垎
handleSplitCountNum () {
this.sample.joinName = null
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 1f50604..b8c03af 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -639,6 +639,13 @@
this.currentId = this.$route.query.currentId
this.isReport = this.$route.query.isReport
this.customsInspection = this.$route.query.customsInspection
+ },
+ activated() {
+ if (this.active==1) {
+ this.getInfo();
+ }
+ },
+ getInfo() {
this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
this.getInfo() // 鑾峰彇鏁版嵁
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index d3e19c0..09deea7 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -566,235 +566,244 @@
AuxiliaryWireCore
},
dicts: ['check_type1', 'urgency_level', 'form_type', 'sample_status_list'],
- data() {
- return {
- active: '',
- tabIndex: '',
- currentId: '',
- sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
- editTable:[],
- template: null,
- templates: [],
- addObj: {
- entrustCode: null,
- custom: null,
- company: null,
- userId: null,
- type: '0',
- code: null,
- appointed: null,
- remark: null, // 澶囨敞
- remarkEn: null, // 澶囨敞鑻辨枃
- sample: null,
- factory: null,
- laboratory: null,
- sampleType: null,
- sampleNum: 1,
- unit: null,
- model: null,
- method: null,
- phone: null,
- processing: 1,
- isLeave: 0,
- orderType: null,
- send: 1,
- formType: '閫佹', // 鏉ユ牱鏂瑰紡
- sampleStatus: 'In good condition', // 鏍峰搧鐘舵��
- testQuantity: '', // 鏍峰搧鐘舵��
- production: null,
- productionEn: null,
- companyId: null,
- prepareUser:null, // 濮旀墭浜�
- prepareUserEn:null, // 濮旀墭浜鸿嫳鏂�
- prepareCode: '', // 濮旀墭浜哄伐鍙�
- quarterItemId: '',
- sampleView: '', // 鏍峰搧鍚嶇О锛堟姤鍛婂睍绀哄瓧娈碉級
- sampleViewEn: '', // 鏍峰搧鍚嶇О鑻辨枃锛堟姤鍛婂睍绀哄瓧娈碉級
- },
- addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
- orderType: [
- { required: true, message: '璇烽�夋嫨妫�楠岀被鍒�', trigger: 'change' }
- ],
- company: [
- { required: true, message: '璇烽�夋嫨濮旀墭鍗曚綅', trigger: 'change' }
- ],
- phone: [
- { required: true, message: '璇峰～鍐欒仈绯绘柟寮�', trigger: 'blur' }
- ],
- type: [
- { required: true, message: '璇烽�夋嫨绱ф�ョ▼搴�', trigger: 'change' }
- ],
- sample: [
- { required: true, message: '璇烽�夋嫨鏍峰搧鍚嶇О', trigger: 'change' }
- ],
- sampleNum: [
- { required: true, message: '璇峰～鍐欐牱鍝佹暟閲�', trigger: 'blur' }
- ],
- sampleStatus: [
- { required: true, message: '璇烽�夋嫨鏍峰搧鐘舵��', trigger: 'change' }
- ],
- formType: [
- { required: true, message: '璇烽�夋嫨鏉ユ牱鏂瑰紡', trigger: 'change' }
- ],
- testQuantity: [
- { required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur' }
- ],
- production: [
- { required: true, message: '璇峰～鍐欑敓浜у崟浣�', trigger: 'blur' }
- ],
- productionEn: [
- { required: true, message: '璇峰～鍐欑敓浜у崟浣岴N', trigger: 'blur' }
- ],
- },
- sample: {
- sampleCode: null,
- laboratory: null,
- factory: null,
- sampleType: null,
- sample: null,
- model: null,
- modelNum: null,
- sampleNum: 1,
- isLeave: 0,
- unit: null
- },
- type: [],
- selectUserDia: false,
- tableData1: [],
- tableLoading1: false,
- multipleSelection: [],
- column1: [
- {label: '瀹㈡埛鍚嶇О', prop: 'company'},
- {label: '瀹㈡埛鍗曚綅EN', prop: 'companyEn'},
- {label: '鍗曚綅鍦板潃', prop: 'address'},
- {label: '鍗曚綅鍦板潃EN', prop: 'addressEn'},
- {label: '鍗曚綅鐢佃瘽', prop: 'phone'},
- {label: '鍔犳�ラ搴�', prop: 'num'},
- {label: '瀹㈡埛缂栧彿', prop: 'code2'},
- {label: '宸ュ巶鍩�', prop: 'code'}
- ],
- page1: {
- total:0,
- size:10,
- current:1
- },
- selectStandardTree: false,
- search: null,
- list: [],
- selectStandardTreeLoading: false,
- selectTree: null,
- sampleViewEn: null,
- expandedKeys: [],
- sampleList: [],
- sampleIds: [],
- methodList: [],
- addSampleDia: false,
- count: 1,
- productList: [],
- productList0: [],
- bsm1DiaList: [],
- productIds: [],
- getProductLoad: false,
- saveLoad: false,
- templateDia: false,
- templateLoading: false,
- templateName: '',
- issuedDialogVisible: false,
- distributeData: {
- appointed: '',
- userId: '',
- sonLaboratory:''
- },
- personList: [],
- upLoad: false,
- models: [],
- methods: [],
- methodLoad: false,
- noDialogVisible: false,
- tell: '',
- noLoading: false,
- orderType: [],
- filters: [],
- formType: [],
- currentMethod: null,
- isAskOnlyRead: false,
- sampleId: null,
- bsmRow: null,
- bsm1: false,
- bsm1Val: null,
- bsm1DiaAll: false,
- cableConfigShow: false,
- auxiliaryShow: false,
- bsm3Dia: false,
- // total: 0,
- RTS: '',
- totalArr: [],
- addObj1: {},
+ data() {
+ return {
+ active: '',
+ tabIndex: '',
+ currentId: '',
+ sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
+ editTable:[],
+ template: null,
+ templates: [],
+ addObj: {
+ entrustCode: null,
+ custom: null,
+ company: null,
+ userId: null,
+ type: '0',
+ code: null,
+ appointed: null,
+ remark: null, // 澶囨敞
+ remarkEn: null, // 澶囨敞鑻辨枃
+ sample: null,
+ factory: null,
+ laboratory: null,
+ sampleType: null,
+ sampleNum: 1,
+ unit: null,
model: null,
- standardMethodListId: null,
- symbolList:['RTS'],
- inspectionItem:null,
- inspectionItemSubclass:null,
- methodS:null,
- isBsm2Val2:false,
- temperatureEngList: [],
- isShowInput: false,
- temId: '',
- sonLaboratoryList:[],
- selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
- quarterItemOptions: [], // 鏌ヨ瀛ｅ害淇℃伅
- specialStandardMethod: '',
- isSpecial: false,
- }
+ method: null,
+ phone: null,
+ processing: 1,
+ isLeave: 0,
+ orderType: null,
+ send: 1,
+ formType: '閫佹', // 鏉ユ牱鏂瑰紡
+ sampleStatus: 'In good condition', // 鏍峰搧鐘舵��
+ testQuantity: '', // 鏍峰搧鐘舵��
+ production: null,
+ productionEn: null,
+ companyId: null,
+ prepareUser:null, // 濮旀墭浜�
+ prepareUserEn:null, // 濮旀墭浜鸿嫳鏂�
+ prepareCode: '', // 濮旀墭浜哄伐鍙�
+ quarterItemId: '',
+ sampleView: '', // 鏍峰搧鍚嶇О锛堟姤鍛婂睍绀哄瓧娈碉級
+ sampleViewEn: '', // 鏍峰搧鍚嶇О鑻辨枃锛堟姤鍛婂睍绀哄瓧娈碉級
+ },
+ addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
+ orderType: [
+ { required: true, message: '璇烽�夋嫨妫�楠岀被鍒�', trigger: 'change' }
+ ],
+ company: [
+ { required: true, message: '璇烽�夋嫨濮旀墭鍗曚綅', trigger: 'change' }
+ ],
+ phone: [
+ { required: true, message: '璇峰～鍐欒仈绯绘柟寮�', trigger: 'blur' }
+ ],
+ type: [
+ { required: true, message: '璇烽�夋嫨绱ф�ョ▼搴�', trigger: 'change' }
+ ],
+ sample: [
+ { required: true, message: '璇烽�夋嫨鏍峰搧鍚嶇О', trigger: 'change' }
+ ],
+ sampleNum: [
+ { required: true, message: '璇峰～鍐欐牱鍝佹暟閲�', trigger: 'blur' }
+ ],
+ sampleStatus: [
+ { required: true, message: '璇烽�夋嫨鏍峰搧鐘舵��', trigger: 'change' }
+ ],
+ formType: [
+ { required: true, message: '璇烽�夋嫨鏉ユ牱鏂瑰紡', trigger: 'change' }
+ ],
+ testQuantity: [
+ { required: true, message: '璇峰～鍐欐娊妫�鏁伴噺', trigger: 'blur' }
+ ],
+ production: [
+ { required: true, message: '璇峰～鍐欑敓浜у崟浣�', trigger: 'blur' }
+ ],
+ productionEn: [
+ { required: true, message: '璇峰～鍐欑敓浜у崟浣岴N', trigger: 'blur' }
+ ],
+ },
+ sample: {
+ sampleCode: null,
+ laboratory: null,
+ factory: null,
+ sampleType: null,
+ sample: null,
+ model: null,
+ modelNum: null,
+ sampleNum: 1,
+ isLeave: 0,
+ unit: null
+ },
+ type: [],
+ selectUserDia: false,
+ tableData1: [],
+ tableLoading1: false,
+ multipleSelection: [],
+ column1: [
+ {label: '瀹㈡埛鍚嶇О', prop: 'company'},
+ {label: '瀹㈡埛鍗曚綅EN', prop: 'companyEn'},
+ {label: '鍗曚綅鍦板潃', prop: 'address'},
+ {label: '鍗曚綅鍦板潃EN', prop: 'addressEn'},
+ {label: '鍗曚綅鐢佃瘽', prop: 'phone'},
+ {label: '鍔犳�ラ搴�', prop: 'num'},
+ {label: '瀹㈡埛缂栧彿', prop: 'code2'},
+ {label: '宸ュ巶鍩�', prop: 'code'}
+ ],
+ page1: {
+ total:0,
+ size:10,
+ current:1
+ },
+ selectStandardTree: false,
+ search: null,
+ list: [],
+ selectStandardTreeLoading: false,
+ selectTree: null,
+ sampleViewEn: null,
+ expandedKeys: [],
+ sampleList: [],
+ sampleIds: [],
+ methodList: [],
+ addSampleDia: false,
+ count: 1,
+ productList: [],
+ productList0: [],
+ bsm1DiaList: [],
+ productIds: [],
+ getProductLoad: false,
+ saveLoad: false,
+ templateDia: false,
+ templateLoading: false,
+ templateName: '',
+ issuedDialogVisible: false,
+ distributeData: {
+ appointed: '',
+ userId: '',
+ sonLaboratory:''
+ },
+ personList: [],
+ upLoad: false,
+ models: [],
+ methods: [],
+ methodLoad: false,
+ noDialogVisible: false,
+ tell: '',
+ noLoading: false,
+ orderType: [],
+ filters: [],
+ formType: [],
+ currentMethod: null,
+ isAskOnlyRead: false,
+ sampleId: null,
+ bsmRow: null,
+ bsm1: false,
+ bsm1Val: null,
+ bsm1DiaAll: false,
+ cableConfigShow: false,
+ auxiliaryShow: false,
+ bsm3Dia: false,
+ // total: 0,
+ RTS: '',
+ totalArr: [],
+ addObj1: {},
+ model: null,
+ standardMethodListId: null,
+ symbolList:['RTS'],
+ inspectionItem:null,
+ inspectionItemSubclass:null,
+ methodS:null,
+ isBsm2Val2:false,
+ temperatureEngList: [],
+ isShowInput: false,
+ temId: '',
+ sonLaboratoryList:[],
+ selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
+ quarterItemOptions: [], // 鏌ヨ瀛ｅ害淇℃伅
+ specialStandardMethod: '',
+ isSpecial: false,
+ }
+ },
+ watch: {
+ sampleList() {
+ this.addObj.method = null
+ this.productList = []
},
- watch: {
- sampleList() {
- this.addObj.method = null
- this.productList = []
- },
- productList: {
- deep: true,
- handler(val) {
- if (val && val.length > 0) {
- let arr = [];
- val.forEach(item => {
- if (item.sonLaboratory && !arr.find(a => a.value == item.sonLaboratory)) {
- arr.push({
- text: item.sonLaboratory,
- value: item.sonLaboratory
- })
- }
- })
- this.filters = arr
- }
- }
- },
- sampleList: {
- deep: true,
- handler(val) {
- this.getTotal()
- }
- },
- 'addObj.sample'(val) {
- this.model = null
- this.standardMethodListId = null
- },
- 'addObj.sampleNum'(val) {
- this.model = null
- this.standardMethodListId = null
- },
- tabIndex(val){
- if(val==4&&this.active==2){
- this.isSpecial = true
- }else{
- this.isSpecial = false
+ productList: {
+ deep: true,
+ handler(val) {
+ if (val && val.length > 0) {
+ let arr = [];
+ val.forEach(item => {
+ if (item.sonLaboratory && !arr.find(a => a.value == item.sonLaboratory)) {
+ arr.push({
+ text: item.sonLaboratory,
+ value: item.sonLaboratory
+ })
+ }
+ })
+ this.filters = arr
}
}
},
- mounted() {
- this.active = this.$route.query.active
- this.tabIndex = this.$route.query.tabIndex
- this.currentId = this.$route.query.currentId
+ sampleList: {
+ deep: true,
+ handler(val) {
+ this.getTotal()
+ }
+ },
+ 'addObj.sample'(val) {
+ this.model = null
+ this.standardMethodListId = null
+ },
+ 'addObj.sampleNum'(val) {
+ this.model = null
+ this.standardMethodListId = null
+ },
+ tabIndex(val){
+ if(val==4&&this.active==2){
+ this.isSpecial = true
+ }else{
+ this.isSpecial = false
+ }
+ }
+ },
+ mounted() {
+ this.active = this.$route.query.active
+ this.tabIndex = this.$route.query.tabIndex
+ this.currentId = this.$route.query.currentId
+ this.getInfo()
+ },
+ activated() {
+ if (this.active==1) {
+ this.getInfo();
+ }
+ },
+ methods: {
+ getInfo() {
this.getUserNowData()
this.selectStandardTreeList()
this.getAuthorizedPerson();
@@ -829,12 +838,11 @@
this.isSpecial = false
}
},
- methods: {
- getPrepareUser () {
+ getPrepareUser () {
// this.addObj.prepareUser = JSON.parse(localStorage.getItem("user")).name;
// this.addObj.prepareUserEn = JSON.parse(localStorage.getItem("user")).nameEn
// this.addObj.prepareCode = JSON.parse(localStorage.getItem("user")).account
- },
+ },
// 缂栬緫瑕佹眰鍊艰〃鏍�
editSpecial () {
this.isSpecial = true
--
Gitblit v1.9.3