@@ -140,15 +135,19 @@ export default {
disabled: {
type:Boolean,
default:false,
+ },
+ superAdmin: {
+ type: Boolean,
+ default: false
}
},
- data(){
- return{
- height:320,
- loading:false,
- attributeDialog:true,
- copyAttributeList:[],
- attributeSaveDialog:false,
+ data () {
+ return {
+ height: 320,
+ loading: false,
+ attributeDialog: true,
+ copyAttributeList: [],
+ attributeSaveDialog: false,
productColumnList: [
{
userId: this.$store.state.user.name,
@@ -290,21 +289,22 @@ export default {
// fixed: '',
// },
],
- searchDataList:[],
- dataList:[],
- dataList2:[],
+ searchDataList: [],
+ dataList: [],
+ dataList2: [],
+ sp: this.$store.state.user.name,
}
},
- watch:{
- orderNo(newValue,oldValue){
- if (newValue){
- this.getProperties();
+ watch: {
+ orderNo (newValue, oldValue) {
+ if (newValue) {
+ this.getProperties()
}
},
},
methods:{
- refreshPropertiesModal(){
+ refreshPropertiesModal () {
this.$confirm(`是否刷新至最新模板界面,已填数据会更新到新模板中,若旧属性在新模板中被删除,该条数据会消失。`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -318,11 +318,11 @@ export default {
}
refreshPropertiesModal(params).then(({data}) => {
if (data && data.code === 0) {
- this.$message.success('操作成功');
- this.getProperties();
- this.attributeDialog = true;
+ this.$message.success('操作成功')
+ this.getProperties()
+ this.attributeDialog = true
} else {
- this.$message.warning(data.msg);
+ this.$message.warning(data.msg)
}
this.loading = false
}).catch((error) => {
@@ -331,7 +331,8 @@ export default {
})
})
},
- getProperties(){
+
+ getProperties () {
let params = {
site:this.$store.state.user.site,
partNo: this.orderNo,
@@ -340,39 +341,41 @@ export default {
}
getPropertiesListByPartAndCodeNo(params).then(({data})=>{
if (data && data.code === 0){
- this.dataList = data.rows;
- this.dataList2 = JSON.parse(JSON.stringify(data.rows));
+ this.dataList = data.rows
+ this.dataList2 = JSON.parse(JSON.stringify(data.rows))
for (let i = 0; i
{
this.$message.error(error)
})
},
- clickSave(){
- if(this.dataList.length==0){
+
+ clickSave () {
+ if (this.dataList.length === 0) {
return false
}
- if (!this.attributeDialog){
- this.updateTestPropertiesList();
- }else {
+ if (!this.attributeDialog) {
+ this.updateTestPropertiesList()
+ } else {
this.copyAttributeList = JSON.parse(JSON.stringify(this.dataList))
- this.attributeDialog = false;
+ this.attributeDialog = false
}
},
- updateTestPropertiesList(){
+
+ updateTestPropertiesList () {
this.loading = true
updatePropertiesList(this.copyAttributeList).then(({data})=>{
if (data && data.code === 0){
- this.$message.success('操作成功');
- this.getProperties();
- this.attributeDialog = true;
- }else {
- this.$message.warning(data.msg);
+ this.$message.success('操作成功')
+ this.getProperties()
+ this.attributeDialog = true
+ } else {
+ this.$message.warning(data.msg)
}
this.loading = false
}).catch((error)=>{
@@ -380,7 +383,8 @@ export default {
this.loading = false
})
},
- clickSaveBtn(){
+
+ clickSaveBtn () {
if (!this.attributeDialog) {
this.$message.warning('请保存更改!')
return
@@ -389,7 +393,8 @@ export default {
this.searchAttributeList({})
this.attributeSaveDialog = true;
},
- saveTestPropertiesItem(params){
+
+ saveTestPropertiesItem (params) {
let i = 0;
let arr = params.searchTableList.map(item=>{
item.partNo = this.orderNo;
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 50f26c8..1f9f25c 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -374,11 +374,13 @@
保存
关闭
-
-
+
+
同意
-
+
+
+
驳回
@@ -545,13 +547,15 @@
-
+
@@ -858,9 +862,11 @@ import BuSelect from "../base/BuSelect.vue";
import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue";
import FilterSearch from "../../common/filterSearch.vue";
import {testInformationSearchAny} from "../../../api/test/testInformation";
+import PriceCheckProperties from "../quotation/priceCheckProperties.vue";
export default {
components: {
+ PriceCheckProperties,
FilterSearch,
CustomerInfo,
BuSelect,
diff --git a/src/views/modules/quotation/priceCheckProperties.vue b/src/views/modules/quotation/priceCheckProperties.vue
index fb1ad63..a4dc48b 100644
--- a/src/views/modules/quotation/priceCheckProperties.vue
+++ b/src/views/modules/quotation/priceCheckProperties.vue
@@ -12,37 +12,47 @@ import TransferTable from "../common/transferTable.vue";
export default {
name: "priceCheckProperties",
components: {TransferTable},
- props:{
- dataList:{
+ props: {
+ dataList: {
type: Array,
default: ()=>[],
},
- quotationNo:{
- type:String,
+ quotationNo: {
+ type: String,
},
- columnList:{
+ columnList: {
type: Array,
default: ()=>[],
},
- height:{
- type:[Number,String],
- default:300
+ height: {
+ type: [Number,String],
+ default: 300
},
- disabled:{
- type:Boolean,
- default:false
+ disabled: {
+ type: Boolean,
+ default: false
+ },
+ approvalUsername: {
+ type: String,
+ },
+ quotationStatus: {
+ type: String,
+ },
+ superAdmin: {
+ type: Boolean,
+ default: false
}
},
- model:{
- prop:"dataList",
- event:"change"
+ model: {
+ prop: "dataList",
+ event: "change"
},
- data(){
- return{
- attributeSaveDialog:false,
- loading:false,
- attributeDialog:true,
- copyAttributeList:[],
+ data () {
+ return {
+ attributeSaveDialog: false,
+ loading: false,
+ attributeDialog: true,
+ copyAttributeList: [],
productColumnList: [
{
userId: this.$store.state.user.name,
@@ -184,7 +194,8 @@ export default {
// fixed: '',
// },
],
- searchDataList:[],
+ searchDataList: [],
+ sp: this.$store.state.user.name,
}
},
methods:{
@@ -310,11 +321,15 @@ export default {
-
- 新增
+
+
+ 新增
+
- {{ attributeDialog?'编辑':'保存' }}
+
+ {{ attributeDialog?'编辑':'保存' }}
+
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 96e68e4..c6b39cd 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -378,11 +378,13 @@
保存
关闭
-
-
+
+
同意
-
+
+
+
驳回
@@ -574,10 +576,19 @@
-
+
+
-
+
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index 68ed0ab..007e167 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -394,17 +394,17 @@
-
+
保存
-
关闭
-
-
+
+
同意
-
+
+
+
驳回
@@ -634,11 +634,18 @@
-
+
-
+
+
[],
},
- testNo:{
- type:String,
+ testNo: {
+ type: String,
},
- testNumber:{
- type:[String,Number],
+ testNumber: {
+ type: [String, Number],
},
- columnList:{
+ columnList: {
type: Array,
default: ()=>[],
},
- height:{
- type:[Number,String],
- default:300
+ height: {
+ type: [Number, String],
+ default: 300
},
- disabled:{
- type:Boolean,
- default:false
+ disabled: {
+ type: Boolean,
+ default: false
},
+ approvalUsername: {
+ type: String,
+ },
+ testStatus: {
+ type: String,
+ },
+ superAdmin: {
+ type: Boolean,
+ default: false
+ }
},
model:{
prop:"dataList",
@@ -119,6 +129,7 @@ export default {
},
],
searchDataList:[],
+ sp: this.$store.state.user.name,
}
},
methods:{
@@ -231,10 +242,14 @@ export default {
- 新增
+
+ 新增
+
- {{ attributeDialog?'编辑':'保存' }}
+
+ {{ attributeDialog?'编辑':'保存' }}
+
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 46ef9d6..48c77f7 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -109,7 +109,16 @@
-
+
+
-
+
@@ -300,19 +305,13 @@
{{ scope.row[item.columnProp] }}
-
![]()
+
-
-
+
-
+
@@ -329,8 +328,7 @@
-
+
@@ -346,22 +344,19 @@
-
+
-
+
-
+
@@ -374,11 +369,7 @@
-
+
@@ -387,8 +378,7 @@
-
+
@@ -405,39 +395,32 @@
-
+
报价员
-
+
TP
-
+
采购员
-
+
-
+
-
+
-
+
{{ scope.row[item.columnProp] }}
-
![]()
+
-
+
-
+
@@ -489,8 +466,7 @@
-
+
@@ -506,24 +482,20 @@
-
+
-
-
+
+
-
+
@@ -533,17 +505,19 @@