diff --git a/src/views/modules/auth/authInfo.vue b/src/views/modules/auth/authInfo.vue
index 829b1d8..45e9da3 100644
--- a/src/views/modules/auth/authInfo.vue
+++ b/src/views/modules/auth/authInfo.vue
@@ -77,7 +77,7 @@
草稿
- 已下达
+ 下达
已报价
{{ scope.row.status }}
@@ -357,6 +357,24 @@ export default {
fixed: '',
columnWidth: 100
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 190007,
+ serialNumber: '190007Table1AllAuthFlag',
+ tableId: '190007Table1',
+ tableName: '申请单信息表',
+ columnProp: 'allAuthFlag',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '审批状态',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100
+ },
{
userId: this.$store.state.user.name,
functionId: 190007,
@@ -701,7 +719,7 @@ export default {
this.authInfoDataList = data.rows
this.authInfoDataList.forEach(item => {
if (item.authTypeDb === 'G') {
- item.nameDesc = '审批组'
+ item.nameDesc = '审批组/'+item.authGroupId
} else {
item.nameDesc = '个人/'+item.authUserDisplay
}
diff --git a/src/views/modules/auth/authInquiry.vue b/src/views/modules/auth/authInquiry.vue
index 1bcf595..5fb979d 100644
--- a/src/views/modules/auth/authInquiry.vue
+++ b/src/views/modules/auth/authInquiry.vue
@@ -133,7 +133,7 @@
草稿
- 已下达
+ 下达
已报价
-
+
@@ -213,6 +213,7 @@ import {
import quotationUpload from "../quote/quotation_upload.vue";
import {updateAuthHist} from "../../../api/auth/auth";
import TpCost from "../quote/detail/tpCost.vue";
+import QuoteDetail from "../quote/detail/quoteDetail.vue";
export default {
computed: {
@@ -230,6 +231,7 @@ export default {
// },
},
components: {
+ QuoteDetail,
TpCost,
quotationUpload,
DictDataSelect,
@@ -782,7 +784,6 @@ export default {
*/
quoteClickRow(row) {
this.quoteCurrentRow = JSON.parse(JSON.stringify(row))
- this.quoteCurrentRow.id = row.quoteDetailId
},
/**
* 当前值发生变化的时候修改
@@ -793,7 +794,6 @@ export default {
// 判断是否是获取焦点的事件
if (row) {
this.quoteCurrentRow = JSON.parse(JSON.stringify(row))
- this.quoteCurrentRow.id = row.quoteDetailId
//刷新当前页表
this.refreshCurrentTabTable()
}
diff --git a/src/views/modules/inquiry/inquiryApplication.vue b/src/views/modules/inquiry/inquiryApplication.vue
index 8f3f64c..63b8573 100644
--- a/src/views/modules/inquiry/inquiryApplication.vue
+++ b/src/views/modules/inquiry/inquiryApplication.vue
@@ -136,7 +136,7 @@
草稿
- 已下达
+ 下达
已报价
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/modules/part/partCostInformation.vue b/src/views/modules/part/partCostInformation.vue
index e5614ed..c9df68d 100644
--- a/src/views/modules/part/partCostInformation.vue
+++ b/src/views/modules/part/partCostInformation.vue
@@ -161,7 +161,7 @@
-
+
下载文件模板
@@ -1062,7 +1062,7 @@ export default {
if (data.code === 0) {
this.$message.success(data.msg)
// 关闭窗口并刷新页面
- this.closeDialog()
+ this.closeUploadDialog()
} else {
this.$message.warning(data.msg)
}
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index 49c4bdd..faac0bb 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -29,6 +29,10 @@ export default {
type:[Number,String],
default:300
},
+ authFlag:{
+ type:Boolean,
+ default:false
+ }
},
data(){
return{
@@ -957,7 +961,7 @@ export default {
-
新增
+
新增
-
+
编辑
diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue
index 8f51893..0255154 100644
--- a/src/views/modules/quote/index.vue
+++ b/src/views/modules/quote/index.vue
@@ -823,7 +823,7 @@ export default {
-
+