diff --git a/src/api/workFile/index.js b/src/api/workFile/index.js index d26f070..8cef02a 100644 --- a/src/api/workFile/index.js +++ b/src/api/workFile/index.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -const getWorkFileList=(fileBelong)=> { +const getWorkFileList=(fileBelong,deptId)=> { return request({ - url: `bgscreen/workfile/getWorkFileList?fileBelong=${fileBelong}`, + url: `bgscreen/workfile/getWorkFileList?fileBelong=${fileBelong}&deptId=${deptId||0}`, method: 'get' }) } diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index de91382..f47e9ec 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -77,7 +77,9 @@ - + +
汇总
@@ -159,7 +161,9 @@
- + +
汇总
混泥土工程
@@ -352,6 +356,12 @@ export default { }); }, methods: { + doShowCheckDetectionDlg(){ + + }, + doShowMeasuredDlg(){ + + }, showMaterialSeal(it){ this.$refs.msDlg.showDialog(it); }, diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index d6ac524..520f79f 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -168,7 +168,7 @@ @click="fileNavChage(3)">子分公司
-
+
@@ -184,6 +184,10 @@ 查看详情
+
+ +
暂无数据
+
@@ -398,6 +402,9 @@ export default { this.getProjectSpecialView(); this.getDeptWorksList(); this.getProjectInsuranceList(); + if(this.fileNav==3){ + this.getWorkFileList(); + } }); }, @@ -428,7 +435,7 @@ export default { }, // 获取传达文件列表 getWorkFileList() { - this.$api.workFile.getWorkFileList(this.fileNav).then(d => { + this.$api.workFile.getWorkFileList(this.fileNav,this.fileNav==3?this.dept.id:0).then(d => { this.fileList = d.rows; let _title = "传达文件(" + this.fileList.length + ")"; this.fileTitle = _title; diff --git a/src/pages/quality/checkDetectionDlg.vue b/src/pages/quality/checkDetectionDlg.vue new file mode 100644 index 0000000..600d4fb --- /dev/null +++ b/src/pages/quality/checkDetectionDlg.vue @@ -0,0 +1,98 @@ + + + + + \ No newline at end of file diff --git a/src/pages/quality/measuredDlg.vue b/src/pages/quality/measuredDlg.vue new file mode 100644 index 0000000..afee935 --- /dev/null +++ b/src/pages/quality/measuredDlg.vue @@ -0,0 +1,98 @@ + + + + + \ No newline at end of file