main
jinna 2 years ago
parent 1885c3e16f
commit 26bd12d911
  1. 6
      src/views/capital/productstoreList.vue
  2. 10
      src/views/oiling/task.vue
  3. 16
      src/views/purchasing/purchaseApply.vue

@ -1700,6 +1700,7 @@ export default {
type: "success", type: "success",
}); });
this.fileList.push({path:response.data.path,name:response.data.filename}); this.fileList.push({path:response.data.path,name:response.data.filename});
console.log('file ===>',this.fileList)
} else { } else {
this.$message({ this.$message({
message: "上传失败", message: "上传失败",
@ -2406,6 +2407,11 @@ export default {
if (this.rateRecords[i].id === row.companyId) { if (this.rateRecords[i].id === row.companyId) {
company = this.rateRecords[i].name; company = this.rateRecords[i].name;
} }
}
console.log('file edit ===============>',this.fileList)
if(this.fileList[0]){
row.attach = this.fileList[0].path
row.attachName = this.fileList[0].name
} }
let rows = { let rows = {
...row, ...row,

@ -709,8 +709,9 @@
<!-- {{ <!-- {{
projectForm.status == 0 ? "停用" : "启用" projectForm.status == 0 ? "停用" : "启用"
}} --> }} -->
<span v-if="projectForm.status === 1" style="color: #e56926">停用</span> <span v-if="projectForm.status === 0" style="color: #e56926">未保养</span>
<span v-if="projectForm.status === 0" style="color: #34c447">启用</span> <span v-if="projectForm.status === 1" style="color: #34c447">已保养</span>
<span v-if="projectForm.status === 2" style="color: #999">不保养</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="1" label="保养类型"> <el-descriptions-item span="1" label="保养类型">
{{projectForm.maintainType | maintainTypeName}} {{projectForm.maintainType | maintainTypeName}}
@ -891,6 +892,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.status == 1">已保养</div> <div v-if="scope.row.status == 1">已保养</div>
<div v-if="scope.row.status == 0">未保养</div> <div v-if="scope.row.status == 0">未保养</div>
<div v-if="scope.row.status == 2">不保养</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -1592,7 +1594,7 @@ export default {
if(this.addForm.orderList.length !== 0){ if(this.addForm.orderList.length !== 0){
this.addForm.orderList.forEach(row => { this.addForm.orderList.forEach(row => {
this.tableData.map((item,index) =>{ this.tableData.map((item,index) =>{
if(item.id == row.projectId){ if(item.id == row.id){
this.$nextTick(() =>{ this.$nextTick(() =>{
this.$refs.maintainTable.toggleRowSelection(this.tableData[index],true); this.$refs.maintainTable.toggleRowSelection(this.tableData[index],true);
}) })
@ -1693,8 +1695,8 @@ export default {
this.page[0].current = 1 this.page[0].current = 1
this.$nextTick(() =>{ this.$nextTick(() =>{
this.$refs.maintainTable.clearSelection(); this.$refs.maintainTable.clearSelection();
this.searchProject()
}) })
this.searchProject()
// getProList({current:1,size:200}).then(res =>{ // getProList({current:1,size:200}).then(res =>{
// this.tableData = res.data.data.records // this.tableData = res.data.data.records
// this.showProjectDialog = true; // this.showProjectDialog = true;

@ -1015,6 +1015,7 @@ export default {
if (valid) { if (valid) {
this.checkForm.attach = this.fileList.length >= 1 ? this.fileList[0].path : '' this.checkForm.attach = this.fileList.length >= 1 ? this.fileList[0].path : ''
this.checkForm.attachName = this.fileList.length >= 1 ? this.fileList[0].name : '' this.checkForm.attachName = this.fileList.length >= 1 ? this.fileList[0].name : ''
console.log('form ===>',this.checkForm)
saveCheck(this.checkForm).then(res =>{ saveCheck(this.checkForm).then(res =>{
console.log('submit ====>',res) console.log('submit ====>',res)
if(res.data.code == 200){ if(res.data.code == 200){
@ -1058,8 +1059,19 @@ export default {
} }
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
this.lineNum = ""; if(file.status == 'success'){
this.assetsFlag = false; if(file.response){
if(file.response.code == 200){
let arr = fileList.filter(item => item.path !== file.response.data.path)
this.fileList = arr
this.filesList = arr
}
}else{
let arr = fileList.filter(item => item.path !== file.path)
this.fileList = arr
this.filesList = arr
}
}
}, },
uploadSuccess(response, file, fileList) { uploadSuccess(response, file, fileList) {
if (response.code == 200) { if (response.code == 200) {

Loading…
Cancel
Save