diff --git a/src/api/project/project.js b/src/api/project/project.js
index 7a5791b..36c68dc 100644
--- a/src/api/project/project.js
+++ b/src/api/project/project.js
@@ -30,3 +30,4 @@ export const saveProjectContactList= data => createAPI(`/project/saveProjectCont
export const deleteProjectInfo= data => createAPI(`/project/deleteProjectInfo`,'post',data)
export const getProjectInfoPartList= data => createAPI(`/project/getProjectInfoPartList`,'post',data)
export const saveProjectPart= data => createAPI(`/project/saveProjectPart`,'post',data)
+export const deleteProjectPartWithId= data => createAPI(`/project/deleteProjectPartWithId`,'post',data)
diff --git a/src/views/demo/demo.vue b/src/views/demo/demo.vue
new file mode 100644
index 0000000..1c8e35b
--- /dev/null
+++ b/src/views/demo/demo.vue
@@ -0,0 +1,526 @@
+
+
+
+
+ 新增
+
+ {{ '导出' }}
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 物料类型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 项目类型
-
-
-
- 所属客户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 项目来源
-
-
-
- 优先级
-
-
-
-
-
-
-
-
-
- 项目经理
-
-
-
- 项目负责人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 项目权限
-
-
-
-
-
-
-
-
-
- 工厂编码
-
-
-
- 查询
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
- {{scope.row[item.columnProp]}}
- ![]()
-
-
-
-
-
-
-
-
-
+
+
+ 新增
+
+ {{ '导出' }}
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 物料类型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ '导出' }}
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ '导出' }}
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -14,7 +14,7 @@
-
+
@@ -78,11 +78,26 @@ export default {
fileRemark: '',
},
dataListLoading: false,
+ dataRole: {
+ fileType: [
+ {
+ required: true,
+ message: ' ',
+ trigger: 'change'
+ }
+ ],
+ },
}
},
methods: {
//初始化组件的参数
init(currentRow) {
+ if(currentRow.projectId==null||currentRow.projectId==''){
+ this.$alert('请选择项目！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false;
+ }
//初始化参数
this.pageData = JSON.parse(JSON.stringify(currentRow));
//打开页面
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index d3a4704..6c6dd3f 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -14,6 +14,20 @@
查询
新增
+
+ {{ '导出' }}
+
@@ -147,6 +161,20 @@
编辑
+
+ {{ '导出' }}
+
-
+
+
+
+
+
+
+
{
- if (index == this.columnList.length - 1) {
+ this.columnList1.forEach((item, index) => {
+ if (index == this.columnList1.length - 1) {
+ json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+ } else {
+ json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+ }
+ })
+ json += "}"
+ let s = eval("(" + json + ")")
+
+ return s
+ },
+ //导出excel
+ async createExportData2() {
+
+ return this.contactList;
+ },
+ startDownload2() {
+ // this.exportData = this.dataList
+
+ },
+ finishDownload2() {
+
+ },
+ fields2() {
+ let json = "{"
+ this.columnList2.forEach((item, index) => {
+ if (index == this.columnList2.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
@@ -941,6 +1011,7 @@
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
if(this.dataList1.length>0){
+ this.$refs.mainTable.setCurrentRow(this.dataList1[0]);
this.changeData(this.dataList1[0])
}
}
@@ -1015,6 +1086,12 @@
if (this.activeName == 'part') {
this.refreshPartTable();
}
+ if (this.activeName == 'quotation') {
+ this.refreshQuotationTable();
+ }
+ if (this.activeName == 'sample') {
+ this.refreshSampleTable();
+ }
},
refreshPartTable(){
let inData={
@@ -1024,6 +1101,26 @@
}
this.$refs.projectPart.init(inData)
},
+ refreshQuotationTable(){
+ let inData={
+ site: this.currentRow.site,
+ projectId: this.currentRow.projectId,
+ username:this.$store.state.user.name,
+ page: 1,
+ limit: 1000
+ }
+ this.$refs.projectQuotation.init(inData)
+ },
+ refreshSampleTable(){
+ let inData={
+ site: this.currentRow.site,
+ projectId: this.currentRow.projectId,
+ username:this.$store.state.user.name,
+ page: 1,
+ limit: 1000
+ }
+ this.$refs.sample.init(inData)
+ },
//刷新派设备文档的列表
getFileContentData() {
let currentData = {orderRef2: this.currentRow.projectId};
@@ -1165,6 +1262,12 @@
});
},
contactChooseModal(){
+ if(this.currentRow==null||this.currentRow==''){
+ this.$alert('请选择项目！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false;
+ }
let inData={
site:this.currentRow.site,
customerId:this.currentRow.customerId,