diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 288c029..b9f1f61 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -2810,7 +2810,11 @@ export default {
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length)
if (localStorage.getItem('bomData') != undefined) {
- this.updateModal(this.dataList[0])
+ let data = JSON.parse(localStorage.getItem('bomData'))
+ if(data.engChgLevel&&data.engChgLevel!==''&&data.engChgLevel!==null){
+ this.updateModal(this.dataList[0])
+ }
+
}
}
this.queryLoading = false
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 9519999..1a1f1b2 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -2795,7 +2795,10 @@ export default {
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length)
if (localStorage.getItem('routeData') != undefined) {
- this.updateModal(this.dataList[0])
+ let data = JSON.parse(localStorage.getItem('routeData'))
+ if(data.routingRevision&&data.routingRevision!==''&&data.routingRevision!==null) {
+ this.updateModal(this.dataList[0])
+ }
}
}
this.queryLoading = false
diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index d264768..8710203 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -81,6 +81,11 @@
+
+
+
+
+
@@ -284,6 +289,7 @@
id: 0,
site:this.$store.state.user.site,
projectLevel:1,
+ customerProjectNo:'',
projectId:'',
projectTypeDb:'',
projectType:'',
@@ -533,6 +539,7 @@
projectDesc:'',
needDate:'',
priority:'',
+ customerProjectNo:'',
projectSource:'',
priorityDesc:'',
projectSourceDesc:'',
@@ -731,7 +738,6 @@
this.$refs.saveForm.validate((validate)=>{
if (validate){
this.dataForm.updateBy = this.$store.state.user.name
- console.log(this.dataForm)
saveProjectInfo(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 225d7f6..5c5a0f8 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -12,6 +12,9 @@
+
+
+
查询
新增
@@ -118,11 +121,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -424,6 +437,7 @@
projectId:'',
projectType:'',
projectOwnerName:'',
+ customerProjectNo:'',
userName:this.$store.state.user.name,
},
contactChooseFlag:false,
@@ -504,24 +518,24 @@
fixed: '',
columnWidth: 200
},
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table1Status',
- // tableId: "101002001Table1",
- // tableName: "项目信息主表",
- // columnProp: "status",
- // headerAlign: "center",
- // align: "left",
- // columnLabel: "项目状态",
- // columnHidden: false,
- // columnImage: false,
- // columnSortable: false,
- // sortLv: 0,
- // status: true,
- // fixed: '',
- // columnWidth: 100
- // },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 101002001,
+ serialNumber: '101002001Table1CustomerProjectNo',
+ tableId: "101002001Table1",
+ tableName: "项目信息主表",
+ columnProp: "customerProjectNo",
+ headerAlign: "center",
+ align: "left",
+ columnLabel: "客户项目料号",
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 4,
+ status: true,
+ fixed: '',
+ columnWidth: 120
+ },
{
userId: this.$store.state.user.name,
functionId: 101002001,
@@ -960,6 +974,8 @@
customerRemark:'',
remark:'',
userRoleName:'',
+ customerProjectNo:'',
+ finalCustomerName:'',
},
customerData:{
site: '',
diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue
index 21f1cb0..7b72389 100644
--- a/src/views/modules/project/projectPart/searchProjectPart.vue
+++ b/src/views/modules/project/projectPart/searchProjectPart.vue
@@ -114,19 +114,26 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
diff --git a/src/views/modules/quotation/sellForQuotation/customerInfo.vue b/src/views/modules/quotation/sellForQuotation/customerInfo.vue
index b074233..c2a587a 100644
--- a/src/views/modules/quotation/sellForQuotation/customerInfo.vue
+++ b/src/views/modules/quotation/sellForQuotation/customerInfo.vue
@@ -1,10 +1,10 @@
-
直接客户
+
-
+
@@ -46,51 +46,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{{ buttons.search || '查询' }}
@@ -324,7 +324,7 @@
-
+
@@ -673,6 +673,9 @@ import {
export default {
data() {
return {
+ searchData:{
+ userName:'',
+ },
saveCheckAll:'N',
accessSiteVisible: false,
projectRoleFlag: false,
@@ -1251,28 +1254,37 @@ export default {
this.setUp.reviewFlag = true
})
},
+ closeUpdateModel(){
+ this.addOrUpdateVisible=false;
+ },
// 获取数据列表
- getDataList: throttle(function () {
- this.dataListLoading = true
- this.$http({
- url: this.$http.adornUrl('/sys/user/list'),
- method: 'get',
- params: this.$http.adornParams({
- 'page': this.pageIndex,
- 'limit': this.pageSize,
- 'username': this.dataForm.userName
- })
- }).then(({data}) => {
- if (data && data.code === 0) {
- this.dataList = data.page.list
- this.totalPage = data.page.totalCount
- } else {
- this.dataList = []
- this.totalPage = 0
- }
- this.dataListLoading = false
- })
- }, 1000),
+ // getDataList: throttle(function () {
+ getDataList () {
+ this.selectUser={
+ username:'',
+ userDisplay:'',
+ }
+ this.dataListLoading = true
+ this.$http({
+ url: this.$http.adornUrl('/sys/user/list'),
+ method: 'get',
+ params: this.$http.adornParams({
+ 'page': this.pageIndex,
+ 'limit': this.pageSize,
+ 'username': this.searchData.userName
+ })
+ }).then(({data}) => {
+ if (data && data.code === 0) {
+ this.dataList = data.page.list
+ this.totalPage = data.page.totalCount
+ } else {
+ this.dataList = []
+ this.totalPage = 0
+ }
+ this.dataListLoading = false
+ })
+ },
+ // }, 1000),
// 每页数
sizeChangeHandle(val) {
this.pageSize = val