|
@@ -6,16 +6,23 @@
|
|
|
type="primary"
|
|
|
@click="submitCtion"
|
|
|
v-hasPermi="['system:config:add']"
|
|
|
- >提交</el-button>
|
|
|
+ >暂存</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@click="handleUpdate"
|
|
|
v-hasPermi="['system:config:edit']"
|
|
|
- >暂存</el-button>
|
|
|
+ >取消</el-button>
|
|
|
</el-col>
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ <el-col :span="1.5" :offset="18">
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ @click="handleUpdate"
|
|
|
+ v-hasPermi="['system:config:edit']"
|
|
|
+ v-if="tab == 0"
|
|
|
+ >确认审核</el-button>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
|
|
|
<div class="nauer">
|
|
@@ -53,7 +60,7 @@
|
|
|
<el-upload
|
|
|
action="http://192.168.101.11:8080/common/upload"
|
|
|
:auto-upload="false"
|
|
|
- ref="upload"
|
|
|
+ ref="uploadone"
|
|
|
:before-upload="beforeAvatarUpload"
|
|
|
list-type="picture-card"
|
|
|
:on-preview="handlePictureCardPreview"
|
|
@@ -70,13 +77,13 @@
|
|
|
</div>
|
|
|
<!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div> -->
|
|
|
</el-upload>
|
|
|
- <div class="ijeut"><el-button style="margin-left: 10px; height: 32px;" size="small" type="primary" @click="submitUpload">开始上传</el-button></div>
|
|
|
+ <div class="ijeut"><el-button style="margin-left: 10px; height: 32px;" size="small" type="primary" @click="submitUploaduccpermit">开始上传</el-button></div>
|
|
|
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="是否开工建设:" prop="isConstruction">
|
|
|
- <el-select v-model="queryParams.isConstruction" placeholder="系统内置" clearable size="small" style="width: 458px">
|
|
|
+ <el-select v-model="queryParamstwr.isConstruction" placeholder="系统内置" clearable size="small" style="width: 458px">
|
|
|
<el-option
|
|
|
v-for="dict in typeOptions"
|
|
|
:key="dict.dictValue"
|
|
@@ -86,10 +93,10 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label=" 开工日期:">
|
|
|
- <el-date-picker type="date" placeholder="选择日期" v-model="queryParams.constructionStartdate" style="width: 335px"></el-date-picker>
|
|
|
+ <el-date-picker type="date" placeholder="选择日期" v-model="queryParamstwr.constructionStartdate" style="width: 335px"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="预计完工日期:">
|
|
|
- <el-date-picker type="date" placeholder="选择日期" v-model="queryParams.constructionEnddate" style="width: 335px"></el-date-picker>
|
|
|
+ <el-date-picker type="date" placeholder="选择日期" v-model="queryParamstwr.constructionEnddate" style="width: 335px"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="施工合同:" prop="configType" class="maget_ty">
|
|
|
<div class="forieu" style="width: 618px;">
|
|
@@ -97,7 +104,7 @@
|
|
|
<el-upload
|
|
|
action="http://192.168.101.11:8080/common/upload"
|
|
|
:auto-upload="false"
|
|
|
- ref="upload"
|
|
|
+ ref="uploadtwo"
|
|
|
:before-upload="beforeAvatarUpload"
|
|
|
list-type="picture-card"
|
|
|
:on-preview="handlePictureCardPreview"
|
|
@@ -114,7 +121,7 @@
|
|
|
</div>
|
|
|
<!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div> -->
|
|
|
</el-upload>
|
|
|
- <div class="ijeut"><el-button style="margin-left: 10px; height: 32px;" size="small" type="primary" @click="submitUpload">开始上传</el-button></div>
|
|
|
+ <div class="ijeut"><el-button style="margin-left: 10px; height: 32px;" size="small" type="primary" @click="submitUploaduccontract">开始上传</el-button></div>
|
|
|
|
|
|
</div>
|
|
|
</div>
|
|
@@ -159,8 +166,8 @@
|
|
|
<div class="demo-image__preview">
|
|
|
<el-image
|
|
|
style="width: 100px; height: 100px"
|
|
|
- :src="scope.row.photo"
|
|
|
- :preview-src-list="srcList">
|
|
|
+ :src="scope.row.phototwo"
|
|
|
+ :preview-src-list="scope.row.photo">
|
|
|
</el-image>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -196,19 +203,13 @@
|
|
|
<el-table-column label="照片" align="center" >
|
|
|
<!-- class-name="small-padding fixed-width" -->
|
|
|
<template slot-scope="scope" >
|
|
|
- <el-upload
|
|
|
- class="upload-demo"
|
|
|
- action="http://192.168.101.11:8080/common/upload"
|
|
|
- :on-preview="handlePreviewtwo"
|
|
|
- :on-remove="handleRemovetwo"
|
|
|
- :before-remove="beforeRemovetwo"
|
|
|
- multiple
|
|
|
- :limit="3"
|
|
|
- :on-exceed="handleExceedtwo"
|
|
|
- :file-list="scope.row.photo">
|
|
|
- <el-button size="small" type="primary">点击上传</el-button>
|
|
|
- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
|
|
|
- </el-upload>
|
|
|
+ <div class="demo-image__preview">
|
|
|
+ <el-image
|
|
|
+ style="width: 100px; height: 100px"
|
|
|
+ :src="scope.row.phototwo"
|
|
|
+ :preview-src-list="scope.row.photo">
|
|
|
+ </el-image>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" >
|
|
@@ -243,19 +244,13 @@
|
|
|
<el-table-column label="到资证明" align="center" prop="photo">
|
|
|
<!-- class-name="small-padding fixed-width" -->
|
|
|
<template slot-scope="scope" >
|
|
|
- <el-upload
|
|
|
- class="upload-demo"
|
|
|
- action="http://192.168.101.11:8080/common/upload"
|
|
|
- :on-preview="handlePreviewtwo"
|
|
|
- :on-remove="handleRemovetwo"
|
|
|
- :before-remove="beforeRemovetwo"
|
|
|
- multiple
|
|
|
- :limit="3"
|
|
|
- :on-exceed="handleExceedtwo"
|
|
|
- :file-list="scope.row.photo">
|
|
|
- <el-button size="small" type="primary">点击上传</el-button>
|
|
|
- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
|
|
|
- </el-upload>
|
|
|
+ <div class="demo-image__preview">
|
|
|
+ <el-image
|
|
|
+ style="width: 100px; height: 100px"
|
|
|
+ :src="scope.row.phototwo"
|
|
|
+ :preview-src-list="scope.row.photo">
|
|
|
+ </el-image>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" >
|
|
@@ -285,7 +280,7 @@
|
|
|
<el-form-item label=" 入统时间:">
|
|
|
<el-date-picker type="date" placeholder="选择日期" v-model="queryParamstheyr.statisticsDate" style="width: 335px"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="施工许可证:" prop="configType" class="maget_ty maget_tyty">
|
|
|
+ <el-form-item label="入统截图:" prop="configType" class="maget_ty maget_tyty">
|
|
|
<div class="forieu" style="width: 618px;">
|
|
|
<div class="bure burert">
|
|
|
<el-upload
|
|
@@ -296,7 +291,7 @@
|
|
|
list-type="picture-card"
|
|
|
:on-preview="handlePictureCardPreview"
|
|
|
:on-remove="handleRemove"
|
|
|
- :on-success="handleSucc"
|
|
|
+ :on-success="handleSuccntry"
|
|
|
:multiple="true"
|
|
|
:file-list="fileListthertwo">
|
|
|
<!-- <i slot="default" class="el-icon-plus"></i> -->
|
|
@@ -425,7 +420,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listConfig, listConfigfive, listConfigsix, listConfigserve, listConfigfunding, listConfigarrival, listConfigintegration, getConfig, delConfig, delConfigther, delConfigfour, delConfigfive, addConfig, addConfigther, addConfigfour, addConfigfiv, addConfigtherction, updateConfig, exportConfig, clearCache } from "@/api/system/config";
|
|
|
+import { listConfig, listConfigfive, listConfigsix, listConfigserve, listConfigfunding, listConfigarrival, listConfigintegration, getConfig, delConfig, delConfigther, delConfigfour, delConfigfive, addConfig, addConfigther, addConfigfour, addConfigfiv, addConfigtherction, addConfigsix, updateConfig, exportConfig, clearCache } from "@/api/system/config";
|
|
|
export default {
|
|
|
name: "Config",
|
|
|
data() {
|
|
@@ -505,7 +500,8 @@ export default {
|
|
|
//开工照片
|
|
|
onstruction:[],
|
|
|
permit:[],
|
|
|
- ontract:[]
|
|
|
+ ontract:[],
|
|
|
+ ntry:[]
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -514,10 +510,10 @@ export default {
|
|
|
console.log(this.bmjdeu)
|
|
|
this.getList();
|
|
|
this.getListtoi()
|
|
|
- this.getListther()
|
|
|
- this.getListfour()
|
|
|
- this.getListfive()
|
|
|
- this.getListsix()
|
|
|
+ // this.getListther()
|
|
|
+ // this.getListfour()
|
|
|
+ // this.getListfive()
|
|
|
+ // this.getListsix()
|
|
|
this.getDicts("sys_yes_no").then(response => {
|
|
|
this.typeOptions = response.data;
|
|
|
});
|
|
@@ -532,28 +528,48 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
methods: {
|
|
|
+ beforeAvatarUpload(file){
|
|
|
+ console.log(file)
|
|
|
+ },
|
|
|
submitUpload() {
|
|
|
this.$refs.upload.submit();
|
|
|
},
|
|
|
+ //施工许可证
|
|
|
+ submitUploaduccpermit(){
|
|
|
+ console.log(34)
|
|
|
+ this.$refs.uploadone.submit();
|
|
|
+ },
|
|
|
+ //施工合同
|
|
|
+ submitUploaduccontract(){
|
|
|
+ this.$refs.uploadtwo.submit();
|
|
|
+ },
|
|
|
handleRemove(file) {
|
|
|
console.log(file);
|
|
|
},
|
|
|
+ //开工合同
|
|
|
handleSucc(response, file, fileList){
|
|
|
console.log(file.response.url)
|
|
|
this.onstruction.push(file.response.url)
|
|
|
- this.queryParams.constructionPhoto = this.onstruction.join(',')
|
|
|
+ this.queryParamstwr.constructionPhoto = this.onstruction.join(',')
|
|
|
|
|
|
},
|
|
|
//施工许可证照片
|
|
|
handleSuccpermit(response, file, fileList){
|
|
|
console.log(file.response.url)
|
|
|
this.permit.push(file.response.url)
|
|
|
- this.queryParams.constructionCode = this.permit.join(',')
|
|
|
+ this.queryParamstwr.constructionCode = this.permit.join(',')
|
|
|
},
|
|
|
//施工合同
|
|
|
handleSuccontract(response, file, fileList){
|
|
|
+ // this.ontract = []
|
|
|
this.ontract.push(file.response.url)
|
|
|
- this.queryParams.constructionDoc = this.ontract.join(',')
|
|
|
+ this.queryParamstwr.constructionDoc = this.ontract.join(',')
|
|
|
+ },
|
|
|
+ // 入统截图
|
|
|
+ handleSuccntry(response, file, fileList){
|
|
|
+ // this.ontract = []
|
|
|
+ this.ntry.push(file.response.url)
|
|
|
+ this.queryParamstheyr.statisticsPhoto = this.ntry.join(',')
|
|
|
},
|
|
|
handlePictureCardPreview(file) {
|
|
|
this.dialogImageUrl = file.url;
|
|
@@ -609,10 +625,17 @@ export default {
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
listConfigfive(this.bmProjectId).then(response => {
|
|
|
+ this.queryParams = {}
|
|
|
+ this.fileListther = []
|
|
|
+ this.fileListfour = []
|
|
|
+ this.fileListfive = []
|
|
|
this.queryParams = response.data;
|
|
|
- this.fileListther.push({name:this.queryParams.constructionCode,url:this.queryParams.constructionCode})
|
|
|
- this.fileListfour.push({name:this.queryParams.constructionDoc,url:this.queryParams.constructionDoc})
|
|
|
- this.fileListfive.push({name:this.queryParams.constructionPhoto,url:this.queryParams.constructionPhoto})
|
|
|
+ if(response.data !== undefined){
|
|
|
+ this.fileListther.push({name:this.queryParams.constructionCode,url:this.queryParams.constructionCode})
|
|
|
+ this.fileListfour.push({name:this.queryParams.constructionDoc,url:this.queryParams.constructionDoc})
|
|
|
+ this.fileListfive.push({name:this.queryParams.constructionPhoto,url:this.queryParams.constructionPhoto})
|
|
|
+ }
|
|
|
+
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
}
|
|
@@ -627,12 +650,14 @@ export default {
|
|
|
if(route.photo !== null){
|
|
|
let poku = []
|
|
|
poku = route.photo.split(",")
|
|
|
- console.log(poku,98)
|
|
|
+ route.photo = route.photo.split(",")
|
|
|
+ route.phototwo = route.photo[0]
|
|
|
+ console.log(route.phototwo)
|
|
|
console.log( route.photo)
|
|
|
- route.photo = []
|
|
|
- for(var i = 0; i < poku.length; i++){
|
|
|
- route.photo.push({name:poku[i],ulr:poku[i]})
|
|
|
- }
|
|
|
+ // route.photo = []
|
|
|
+ // for(var i = 0; i < poku.length; i++){
|
|
|
+ // route.photo.push({name:poku[i],ulr:poku[i]})
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
})
|
|
@@ -649,13 +674,11 @@ export default {
|
|
|
this.configListher.filter(route => {
|
|
|
if(route.photo !== null){
|
|
|
let poku = []
|
|
|
- poku = route.photo.split(",")
|
|
|
- console.log(poku,98)
|
|
|
+ poku = route.photo.split(",")
|
|
|
+ route.photo = route.photo.split(",")
|
|
|
+ route.phototwo = route.photo[0]
|
|
|
+ console.log(route.phototwo)
|
|
|
console.log( route.photo)
|
|
|
- route.photo = []
|
|
|
- for(var i = 0; i < poku.length; i++){
|
|
|
- route.photo.push({name:poku[i],ulr:poku[i]})
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
})
|
|
@@ -672,13 +695,11 @@ export default {
|
|
|
this.configLisfour.filter(route => {
|
|
|
if(route.photo !== null){
|
|
|
let poku = []
|
|
|
- poku = route.photo.split(",")
|
|
|
- console.log(poku,98)
|
|
|
- console.log( route.photo)
|
|
|
- route.photo = []
|
|
|
- for(var i = 0; i < poku.length; i++){
|
|
|
- route.photo.push({name:poku[i],ulr:poku[i]})
|
|
|
- }
|
|
|
+ poku = route.photo.split(",")
|
|
|
+ route.photo = route.photo.split(",")
|
|
|
+ route.phototwo = route.photo[0]
|
|
|
+ console.log(route.phototwo)
|
|
|
+ console.log( route.photo)
|
|
|
}
|
|
|
|
|
|
})
|
|
@@ -691,7 +712,10 @@ export default {
|
|
|
getListfive() {
|
|
|
this.loading = true;
|
|
|
listConfigarrival(this.bmjdeu).then(response => {
|
|
|
- this.queryParamstheyr = response.data
|
|
|
+ if(response.data !== undefined){
|
|
|
+ this.queryParamstheyr = response.data
|
|
|
+ }
|
|
|
+
|
|
|
this.loading = false;
|
|
|
}
|
|
|
);
|
|
@@ -700,8 +724,12 @@ export default {
|
|
|
getListsix() {
|
|
|
this.loading = true;
|
|
|
listConfigintegration(this.bmProjectId).then(response => {
|
|
|
- this.queryParamstwo = response.data
|
|
|
- this.fileListthertwo.push({name:this.queryParamstwo.statisticsPhoto,url:this.queryParamstwo.statisticsPhoto})
|
|
|
+ this.fileListthertwo = []
|
|
|
+ if(response.data !== undefined){
|
|
|
+ this.queryParamstwo = response.data
|
|
|
+ this.fileListthertwo.push({name:this.queryParamstwo.statisticsPhoto,url:this.queryParamstwo.statisticsPhoto})
|
|
|
+ }
|
|
|
+
|
|
|
this.loading = false;
|
|
|
}
|
|
|
);
|
|
@@ -788,37 +816,21 @@ export default {
|
|
|
if(this.numhu == 0){
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
- // if (this.form.bmProjectId != undefined) {
|
|
|
- // updateConfig(this.form).then(response => {
|
|
|
- // this.msgSuccess("修改成功");
|
|
|
- // this.open = false;
|
|
|
- // this.getList();
|
|
|
- // });
|
|
|
- // } else {
|
|
|
addConfigther(this.form).then(response => {
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getListtoi();
|
|
|
});
|
|
|
- // }
|
|
|
}
|
|
|
});
|
|
|
}else if(this.numhu == 1){
|
|
|
this.$refs["formtwo"].validate(valid => {
|
|
|
if (valid) {
|
|
|
- // if (this.formtwo.bmProjectId != undefined) {
|
|
|
- // updateConfig(this.form).then(response => {
|
|
|
- // this.msgSuccess("修改成功");
|
|
|
- // this.open = false;
|
|
|
- // this.getList();
|
|
|
- // });
|
|
|
- // } else {
|
|
|
addConfigfour(this.formtwo).then(response => {
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.opentwo = false;
|
|
|
this.getListther();
|
|
|
});
|
|
|
- // }
|
|
|
}
|
|
|
});
|
|
|
}else if(this.numhu == 2){
|
|
@@ -826,20 +838,12 @@ export default {
|
|
|
this.$refs["formther"].validate(valid => {
|
|
|
if (valid) {
|
|
|
console.log('步骤5')
|
|
|
- // if (this.formther.bmProjectId != undefined) {
|
|
|
- // updateConfig(this.form).then(response => {
|
|
|
- // this.msgSuccess("修改成功");
|
|
|
- // this.open = false;
|
|
|
- // this.getList();
|
|
|
- // });
|
|
|
- // } else {
|
|
|
console.log('步骤4')
|
|
|
addConfigfiv(this.formther).then(response => {
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.openther = false;
|
|
|
this.getListfour();
|
|
|
});
|
|
|
- // }
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -848,10 +852,10 @@ export default {
|
|
|
//项目施工提交按钮
|
|
|
submitCtion(){
|
|
|
this.queryParamstwr.bmProjectId = this.bmProjectId
|
|
|
- // this.formtwo.bmProjectId = this.bmProjectId
|
|
|
+ this.queryParamstheyr.bmProjectId = this.bmProjectId
|
|
|
// this.formther.bmProjectId = this.bmProjectId
|
|
|
console.log(this.numhu)
|
|
|
- if(this.numhu == 0){
|
|
|
+ if(this.tab == 0){
|
|
|
this.$refs["queryForm"].validate(valid => {
|
|
|
if (valid) {
|
|
|
addConfigtherction(this.queryParamstwr).then(response => {
|
|
@@ -861,29 +865,16 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
- }else if(this.numhu == 1){
|
|
|
- this.$refs["formtwo"].validate(valid => {
|
|
|
+ }else if(this.tab == 3){
|
|
|
+ this.$refs["queryForm"].validate(valid => {
|
|
|
if (valid) {
|
|
|
- addConfigfour(this.formtwo).then(response => {
|
|
|
+ addConfigsix(this.queryParamstheyr).then(response => {
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.opentwo = false;
|
|
|
this.getListther();
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
- }else if(this.numhu == 2){
|
|
|
- console.log("步骤3")
|
|
|
- this.$refs["formther"].validate(valid => {
|
|
|
- if (valid) {
|
|
|
- console.log('步骤5')
|
|
|
- console.log('步骤4')
|
|
|
- addConfigfiv(this.formther).then(response => {
|
|
|
- this.msgSuccess("新增成功");
|
|
|
- this.openther = false;
|
|
|
- this.getListfour();
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
}
|
|
|
},
|
|
|
/** 开工照片删除按钮操作 */
|
|
@@ -950,6 +941,17 @@ export default {
|
|
|
//tab
|
|
|
tabClid(index){
|
|
|
this.tab = index
|
|
|
+ if(this.tab == 1){
|
|
|
+ this.getListther()
|
|
|
+ }else if(this.tab == 0){
|
|
|
+ this.getList();
|
|
|
+ this.getListtoi()
|
|
|
+ }else if(this.tab == 2){
|
|
|
+ this.getListfour()
|
|
|
+ this.getListfive()
|
|
|
+ }else if(this.tab == 3){
|
|
|
+ this.getListsix()
|
|
|
+ }
|
|
|
// this.$router.push('/tab');
|
|
|
},
|
|
|
quipment(index){
|