|
|
@@ -5,16 +5,14 @@
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@click="handleAudit"
|
|
|
- v-hasPermi="['bmProject:project:examine']"
|
|
|
- >提交</el-button
|
|
|
- >
|
|
|
+ v-hasPermi="['projectConstruction:construction:add']"
|
|
|
+ >提交</el-button>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@click="submitCtion"
|
|
|
v-hasPermi="['projectConstruction:construction:add']"
|
|
|
v-if="tab == 0 || tab == 3"
|
|
|
- >暂存</el-button
|
|
|
- >
|
|
|
+ >暂存</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button type="primary" @click="handleUpdatex">取消</el-button>
|
|
|
@@ -67,14 +65,14 @@
|
|
|
<span>*</span>
|
|
|
<span>合同约定开工时间:</span>
|
|
|
</p>
|
|
|
- <p>{{ timeList.orderBeginTime }}</p>
|
|
|
+ <p>{{ queryParamstwr.orderBeginTime }}</p>
|
|
|
</div>
|
|
|
<div class="nstruction_navne">
|
|
|
<p>
|
|
|
<span>*</span>
|
|
|
<span> 合同约定竣工时间:</span>
|
|
|
</p>
|
|
|
- <p>{{ timeList.orderEndTime }}</p>
|
|
|
+ <p>{{ queryParamstwr.orderEndTime }}</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="naue_tab">
|
|
|
@@ -661,7 +659,7 @@
|
|
|
<el-form-item label="图片" prop="photo">
|
|
|
<el-upload
|
|
|
class="upload-demo"
|
|
|
- ref="uploadty"
|
|
|
+ ref="upload"
|
|
|
:action="defaultSettings.urls + process+'/common/upload'"
|
|
|
:on-preview="handlePreviewther"
|
|
|
:on-remove="handleRemovether"
|
|
|
@@ -681,7 +679,7 @@
|
|
|
size="small"
|
|
|
type="success"
|
|
|
:disabled = "disfal"
|
|
|
- @click="submitUploadthers"
|
|
|
+ @click="submitUploadther"
|
|
|
>上传到服务器</el-button
|
|
|
>
|
|
|
<div slot="tip" class="el-upload__tip">
|
|
|
@@ -707,7 +705,6 @@ import {
|
|
|
listConfigfunding,
|
|
|
listConfigarrival,
|
|
|
listConfigintegration,
|
|
|
- listConfigintegrationsr,
|
|
|
getConfig,
|
|
|
delConfig,
|
|
|
delConfigther,
|
|
|
@@ -859,11 +856,6 @@ export default {
|
|
|
queryFormhye: {},
|
|
|
udgment: 0, //项目入统判断是新增 还是修改 新增0 修改1
|
|
|
udgmentList: [],
|
|
|
- hfeiteka:false,//判断新增点击
|
|
|
- ixndgh:false,
|
|
|
- nbjieug:false,
|
|
|
- remou:[],
|
|
|
- timeList:{}
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -880,7 +872,6 @@ export default {
|
|
|
console.log(this.bmjdeu);
|
|
|
this.getList();
|
|
|
this.getListtoi();
|
|
|
- this.getListsever()
|
|
|
// this.getListther()
|
|
|
// this.getListfour()
|
|
|
// this.getListfive()
|
|
|
@@ -962,21 +953,7 @@ export default {
|
|
|
},
|
|
|
handleChange(file, fileList){
|
|
|
console.log(file, fileList)
|
|
|
- if(fileList.length > 1){
|
|
|
- // this.imagese = []
|
|
|
- this.ixndgh = true
|
|
|
- this.hfeiteka = true
|
|
|
- }else{
|
|
|
- // this.imagese = []
|
|
|
- this.ixndgh = false
|
|
|
- this.hfeiteka = false
|
|
|
- }
|
|
|
- console.log(986)
|
|
|
},
|
|
|
- clearFiles () {
|
|
|
- console.log(123)
|
|
|
- this.$refs['uploadty'].clearFiles();
|
|
|
- },
|
|
|
beforeAvatarUpload(file) {
|
|
|
console.log(file);
|
|
|
},
|
|
|
@@ -1040,22 +1017,13 @@ export default {
|
|
|
);
|
|
|
},
|
|
|
beforeRemovetwo(file, fileList) {
|
|
|
- // return this.$confirm(`确定移除 ${file.name}？`);
|
|
|
+ return this.$confirm(`确定移除 ${file.name}？`);
|
|
|
},
|
|
|
submitUploadther() {
|
|
|
this.$refs.upload.submit();
|
|
|
},
|
|
|
- submitUploadthers(){
|
|
|
- this.$refs.uploadty.submit();
|
|
|
- },
|
|
|
handleRemovether(file, fileList) {
|
|
|
- console.log(file, fileList);
|
|
|
- if(fileList.length > 1){
|
|
|
- this.nbjieug = true
|
|
|
- }else{
|
|
|
- this.nbjieug = false
|
|
|
- }
|
|
|
- console.log(6554)
|
|
|
+ // console.log(file, fileList);
|
|
|
},
|
|
|
handlePreviewther(file) {
|
|
|
console.log(file, 45);
|
|
|
@@ -1064,13 +1032,6 @@ export default {
|
|
|
handleSuccther(response, file, fileList) {
|
|
|
// let imges = []
|
|
|
|
|
|
- // if( this.hfeiteka == false ){
|
|
|
- // this.imagese = []
|
|
|
- // console.log(this.imagese,9876)
|
|
|
- // }
|
|
|
- // if(!this.ixndgh){
|
|
|
- // this.imagese = []
|
|
|
- // }
|
|
|
this.imagese.push(file.response.url);
|
|
|
console.log(this.imagese.join(","), 345);
|
|
|
if (this.numhu == 0) {
|
|
|
@@ -1078,11 +1039,10 @@ export default {
|
|
|
} else if (this.numhu == 1) {
|
|
|
this.formtwo.photo = this.imagese.join(",");
|
|
|
} else if (this.numhu == 2) {
|
|
|
- this.formther.photo = ''
|
|
|
this.formther.photo = this.imagese.join(",");
|
|
|
}
|
|
|
|
|
|
- console.log(this.imagese,34567);
|
|
|
+ console.log(this.form.photo);
|
|
|
if (file.response.code == 200) {
|
|
|
this.msgSuccess("上传成功");
|
|
|
}
|
|
|
@@ -1193,7 +1153,6 @@ export default {
|
|
|
this.configLisfour.filter((route) => {
|
|
|
if (route.photo !== null) {
|
|
|
let poku = [];
|
|
|
- this.imagese = []
|
|
|
poku = route.photo.split(",");
|
|
|
route.photo = route.photo.split(",");
|
|
|
route.phototwo = route.photo[0];
|
|
|
@@ -1244,20 +1203,6 @@ export default {
|
|
|
this.loading = false;
|
|
|
});
|
|
|
},
|
|
|
- //合同约定时间查看接口
|
|
|
- getListsever() {
|
|
|
- this.loading = true;
|
|
|
- listConfigintegrationsr(this.bmProjectId).then((response) => {
|
|
|
- // this.fileListthertwo = [];
|
|
|
- if (response.data !== undefined) {
|
|
|
- this.timeList = response.data;
|
|
|
- } else {
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- this.loading = false;
|
|
|
- });
|
|
|
- },
|
|
|
// 参数系统内置字典翻译
|
|
|
typeFormat(row, column) {
|
|
|
return this.selectDictLabel(this.typeOptions, row.configType);
|
|
|
@@ -1267,7 +1212,6 @@ export default {
|
|
|
this.open = false;
|
|
|
this.opentwo = false;
|
|
|
this.openther = false;
|
|
|
- this.hfeiteka = false
|
|
|
this.reset();
|
|
|
},
|
|
|
// 表单重置
|
|
|
@@ -1283,27 +1227,16 @@ export default {
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
resettwo() {
|
|
|
- this.formtwo = {
|
|
|
+ this.form = {
|
|
|
// configId: undefined,
|
|
|
// configName: undefined,
|
|
|
// configKey: undefined,
|
|
|
// configValue: undefined,
|
|
|
// configType: "Y",
|
|
|
- photo: undefined
|
|
|
+ // remark: undefined
|
|
|
};
|
|
|
this.resetForm("formtwo");
|
|
|
},
|
|
|
- resetther() {
|
|
|
- this.formther = {
|
|
|
- // configId: undefined,
|
|
|
- // configName: undefined,
|
|
|
- // configKey: undefined,
|
|
|
- // configValue: undefined,
|
|
|
- // configType: "Y",
|
|
|
- photo: undefined
|
|
|
- };
|
|
|
- this.resetForm("formther");
|
|
|
- },
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNum = 1;
|
|
|
@@ -1319,14 +1252,10 @@ export default {
|
|
|
handleAdd(index) {
|
|
|
this.numhu = index;
|
|
|
this.reset();
|
|
|
-
|
|
|
- // this.hfeiteka = true
|
|
|
this.fileListtherrt = []
|
|
|
if (this.numhu == 0) {
|
|
|
this.open = true;
|
|
|
} else if (this.numhu == 2) {
|
|
|
- this.formther.photo = ''
|
|
|
- this.resetther()
|
|
|
this.openther = true;
|
|
|
}
|
|
|
|
|
|
@@ -1365,11 +1294,9 @@ export default {
|
|
|
this.msgSuccess("请上传照片");
|
|
|
return false
|
|
|
}
|
|
|
- this.imagese = []
|
|
|
addConfigther(this.form).then((response) => {
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
- this.hfeiteka = false
|
|
|
this.getListtoi();
|
|
|
});
|
|
|
}
|
|
|
@@ -1385,11 +1312,9 @@ export default {
|
|
|
this.msgSuccess("请上传照片");
|
|
|
return false
|
|
|
}
|
|
|
- this.imagese = []
|
|
|
addConfigfour(this.formtwo).then((response) => {
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.opentwo = false;
|
|
|
- this.hfeiteka = false
|
|
|
this.getListther();
|
|
|
});
|
|
|
}
|
|
|
@@ -1410,12 +1335,9 @@ export default {
|
|
|
this.msgSuccess("请上传照片");
|
|
|
return false
|
|
|
}
|
|
|
- this.imagese = []
|
|
|
addConfigfiv(this.formther).then((response) => {
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.openther = false;
|
|
|
- this.hfeiteka = false
|
|
|
- // this.clearFiles()
|
|
|
this.getListfour();
|
|
|
this.getListfive()
|
|
|
});
|
|
|
@@ -1647,7 +1569,6 @@ export default {
|
|
|
this.numhu = index;
|
|
|
this.fileListtherrt = []
|
|
|
this.opentwo = true;
|
|
|
- this.hfeiteka = true
|
|
|
this.titletwo = "添加参数";
|
|
|
},
|
|
|
//取消
|
sr