diff --git a/src/api/base/site.js b/src/api/base/site.js
index bceb170..ef4b076 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -25,6 +25,7 @@ export const deletePartFamily = data => createAPI(`/base/deletePartFamily`,'post
//------------会计单位信息----------------
// 获取停机原因
export const getCompanyInformation = data => createAPI(`/base/getCompanyInformation`,'post',data)
+export const queryCompanyInformation = data => createAPI(`/base/queryCompanyInformation`,'post',data)
// 保存修改停机原因
export const saveCompanyInformation = data => createAPI(`/base/saveCompanyInformation`,'post',data)
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index 9e985f9..7ff7dc9 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -15,7 +15,7 @@
关闭其它标签页
关闭全部标签页
刷新当前标签页
-
+ 筛选条件
{
+ if (data && data.code === 0){
+ this.dataList = data.rows
+ }
+ })
+ },
addModal(){
this.modelData={};
this.modelData.add=0;
@@ -672,6 +682,9 @@
this.getButtonAuthData();
this.getTableUserColumn()
+ },
+ activated() {
+ // this.$store.commit("sift/commitSearchFunction",this.queryData)
}
}
diff --git a/src/views/modules/base/factoryInformation.vue b/src/views/modules/base/factoryInformation.vue
index dbf4f56..58992e7 100644
--- a/src/views/modules/base/factoryInformation.vue
+++ b/src/views/modules/base/factoryInformation.vue
@@ -1012,6 +1012,7 @@ export default {
this.$message.error(error)
})
},
+
},
created() {
this.getMultiLanguageList()//刷新按钮
@@ -1019,6 +1020,7 @@ export default {
//获取按钮的权限
this.getButtonAuthData();
this.getTableUserColumn()
+ this.$store.commit("sift/commitSearchFunction",this.getSiteDataDemo)
},
}
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 304f46e..db9f997 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -56,23 +56,12 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -252,7 +241,6 @@
-
Approver
@@ -260,7 +248,6 @@
-
DelegateAccess
@@ -2641,28 +2628,12 @@ export default {
this.$refs.modalForm.validate((valid) => {
if (!valid) {
- this.validateDataValue()
+ // this.validateDataValue()
} else {
if (this.projectPartListSelections.length <= 0) {
this.$message.warning('请选择项目料号')
return
}
- if(this.modalData.trackerName==''||this.modalData.trackerName==null){
- this.$message.warning('请选择CS')
- return
- }
- if(this.modalData.engineerName==''||this.modalData.engineerName==null){
- this.$message.warning('请选择NPI工程师')
- return
- }
- if(this.modalData.approverName==''||this.modalData.approverName==null){
- this.$message.warning('请选择Approver')
- return
- }
- if(this.delegateAccessName==''||this.delegateAccessName==null){
- this.$message.warning('请选择DelegateAccess')
- return
- }
this.confirmProjectPart();
// 将选中的 人员信息添加到请求
this.modalData.delegateAccessList = this.selectionDelegateAccess
@@ -2725,11 +2696,11 @@ export default {
return
}
if (this.modalData.tracker === '' || this.modalData.tracker == null) {
- this.$message.warning('请选择跟单员编码！')
+ this.$message.warning('请选择CS编码！')
return
}
if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
- this.$message.warning('请选择跟单员名称！')
+ this.$message.warning('请选择CS名称！')
return
}
if (this.modalData.projectId === '' || this.modalData.projectId == null) {
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 4d9c2e7..5f1e71f 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -59,21 +59,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index e194f36..fc81ff9 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -307,41 +307,48 @@
@close="closeQuotationNoDialog"
@open="openQuotationNoDialog"
:close-on-click-modal="false"
+ width="1200px"
:visible.sync="quotationNoDialogFlag" v-drag>
+ size="mini">
-
+
-
+
-
+
-
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
查询
@@ -354,7 +361,8 @@
-
+
+
@@ -791,6 +799,7 @@ export default {
quotationNo: "",//单号
quotationBatchNo: "",//批次号
quotationItemNo: '',//序号
+ quotationStatus: "",//状态
partName:'',//物料描述
testPartNo:'',//物料编码
site: this.$store.state.user.site,//工厂编号
@@ -1240,6 +1249,7 @@ export default {
quotationNo: "",//单号
quotationBatchNo: "",//批次号
quotationItemNo: '',//序号
+ quotationStatus: '',
partName:'',//物料描述
testPartNo:'',//物料编码
site: this.$store.state.user.site,//工厂编号
diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue
index 6e93a0d..dd54506 100644
--- a/src/views/modules/quotation/toBeQuoted.vue
+++ b/src/views/modules/quotation/toBeQuoted.vue
@@ -75,7 +75,8 @@
-
+
+
@@ -180,7 +181,7 @@ export default {
trackerName: '',
testPartNo: '',
partName: '',
- quotationStatus: '下达',
+ quotationStatus: '已完成',
quotationResultStatus: '',
startDate: '',
endDate: '',