From d174dac9d956ca50b7b59e5e3fb051325d5a86e7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 三月 2025 16:58:17 +0800
Subject: [PATCH] 工时管理修改
---
src/views/business/materialOrder/customsInspection.vue | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 0135441..07b4342 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -172,6 +172,7 @@
<el-table ref="sampleTable" :data="sampleList"
class="el-table sampleTable"
highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
max-height="400px"
tooltip-effect="dark"
@selection-change="selectSample" @row-click="rowClick">
@@ -235,7 +236,7 @@
</el-table-column>
<el-table-column align="center" label="寰呮椤规暟閲�" prop="quantity" width="105">
<template slot-scope="scope">
- <el-select v-model="scope.row.quantity" :disabled="active>1|| scope.$index !== 0 || sampleList.length > 1" clearable
+ <el-select v-model="scope.row.quantity" disabled clearable
size="small">
<el-option v-for="item in quantityList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
@@ -247,6 +248,7 @@
class="el-table"
max-height="400px"
style="margin-bottom: 10px;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
tooltip-effect="dark"
@select="selectOne"
@selection-change="selectProduct"
@@ -354,6 +356,7 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
:show-close="false" :visible.sync="bsm3Dia"
title="鍖洪棿鍊煎～鍐�" width="800px">
<el-table :data="editTable" height="80vh" style="width: 100%">
@@ -388,7 +391,7 @@
width="32%">
<span>{{ dialogMessage }}</span>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="goBack()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="dialogVisible= false,closeOpenPage()">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog
@@ -451,10 +454,6 @@
dicts: ['check_type', 'urgency_level'],
components: {},
props: {
- isReport: {
- type: Number,
- default: () => null
- }
},
data() {
return {
@@ -462,6 +461,7 @@
orderType: '',
active: 0,
currentId: 0,
+ isReport: '',
editTable:[], // 鍖洪棿鐗规畩鍊煎～鍐�
template: null,
saveLoad: false, // 淇濆瓨鎸夐挳loading
@@ -636,11 +636,23 @@
this.standardMethodListId = null
}
},
- mounted() {
+ created() {
this.active = this.$route.query.active
this.orderType = this.$route.query.orderType
this.currentId = this.$route.query.currentId
+ this.isReport = this.$route.query.isReport
this.customsInspection = this.$route.query.customsInspection
+ this.getInfo();
+ },
+ activated() {
+ this.active = this.$route.query.active
+ this.orderType = this.$route.query.orderType
+ this.currentId = this.$route.query.currentId
+ this.isReport = this.$route.query.isReport
+ this.customsInspection = this.$route.query.customsInspection
+ this.getInfo();
+ },
+ getInfo() {
this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
this.getInfo() // 鑾峰彇鏁版嵁
@@ -698,7 +710,7 @@
orderId = this.dataIndex === 0 ? this.customsInspection.enterOrderId : this.customsInspection.quarterOrderId
} else if (!this.customsInspection.enterOrderId && !this.customsInspection.quarterOrderId) {
this.isShowTab = false
- orderId = this.isReport === 1 ? this.customsInspection.insOrderId : this.customsInspection.id
+ orderId = this.isReport == 1 ? this.customsInspection.insOrderId : this.customsInspection.id
}
// 鏌ョ湅
// 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
@@ -756,7 +768,6 @@
this.$set(this.addObj, 'buyUnitMeas', this.customsInspection.buyUnitMeas)
this.$set(this.addObj, 'updateBatchNo', this.customsInspection.updateBatchNo)
this.$set(this.addObj, 'partDetail', this.customsInspection.partDesc)
- console.log('this.orderType----', this.orderType)
if (this.orderType == 1) {
this.$set(this.addObj, 'orderType', 'Quarterly inspection')
}
@@ -896,10 +907,6 @@
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
return
}
- if (!this.sampleList.every(m => m.quantity)) {
- this.$message.error('璇烽�夋嫨寰呮椤规暟閲�')
- return
- }
const sampleList = this.HaveJson(this.sampleList)
sampleList.forEach(item => {
item.insProduct = this.productList
@@ -1017,10 +1024,9 @@
}),
}).then(res => {
this.noNeedCheckLoad = false
- if (res.code == 201) return
this.noNeedCheckDia = false
this.$message.success('宸叉彁浜�')
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.noNeedCheckLoad = false
})
@@ -1069,10 +1075,9 @@
}),
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.saveLoad = false
})
@@ -1835,9 +1840,16 @@
return row[property] === value;
},
goBack () {
- const obj = { path: "/business/materialOrder" };
- this.$tab.closeOpenPage(obj);
- }
+ if (this.active == 1) {
+ this.$router.go(-1)
+ } else {
+ this.closeOpenPage()
+ }
+ },
+ closeOpenPage() {
+ this.$router.go(-1)
+ this.$tab.closeOpenPage()
+ },
}
}
</script>
--
Gitblit v1.9.3