|
|
@ -61,8 +61,8 @@ |
|
|
|
@close="handleClose"> |
|
|
|
@close="handleClose"> |
|
|
|
<avue-form :option="optionResult" |
|
|
|
<avue-form :option="optionResult" |
|
|
|
v-model="resultForm" |
|
|
|
v-model="resultForm" |
|
|
|
ref="resultForm" |
|
|
|
ref="resultForm"> |
|
|
|
:upload-after="uploadAfter"> |
|
|
|
<!-- :upload-after="uploadAfter">--> |
|
|
|
</avue-form> |
|
|
|
</avue-form> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button @click="resultBox = false">取 消</el-button> |
|
|
|
<el-button @click="resultBox = false">取 消</el-button> |
|
|
@ -95,6 +95,7 @@ |
|
|
|
import {auditing, reject} from "@/api/leger/equipmentledger"; |
|
|
|
import {auditing, reject} from "@/api/leger/equipmentledger"; |
|
|
|
import expUtil from "@/util/exportUtil"; |
|
|
|
import expUtil from "@/util/exportUtil"; |
|
|
|
import {getToken} from "@/util/auth"; |
|
|
|
import {getToken} from "@/util/auth"; |
|
|
|
|
|
|
|
import admin from "@/util/admin"; |
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
export default { |
|
|
|
data() { |
|
|
|
data() { |
|
|
@ -344,7 +345,7 @@ |
|
|
|
prop: "executeStartDate", |
|
|
|
prop: "executeStartDate", |
|
|
|
type: "datetime", |
|
|
|
type: "datetime", |
|
|
|
format: 'yyyy年MM月dd日 HH时mm分', |
|
|
|
format: 'yyyy年MM月dd日 HH时mm分', |
|
|
|
valueFormat: "yyyy/MM/dd HH:mm", |
|
|
|
valueFormat: "yyyy/MM/dd HH:mm:ss", |
|
|
|
span:22, |
|
|
|
span:22, |
|
|
|
labelWidth: 150, |
|
|
|
labelWidth: 150, |
|
|
|
rules: [{required: true, validator: validateStartTime, trigger: 'blur' }] |
|
|
|
rules: [{required: true, validator: validateStartTime, trigger: 'blur' }] |
|
|
@ -354,7 +355,7 @@ |
|
|
|
prop: "executeEndDate", |
|
|
|
prop: "executeEndDate", |
|
|
|
type: "datetime", |
|
|
|
type: "datetime", |
|
|
|
format: 'yyyy年MM月dd日 HH时mm分', |
|
|
|
format: 'yyyy年MM月dd日 HH时mm分', |
|
|
|
valueFormat: "yyyy/MM/dd HH:mm", |
|
|
|
valueFormat: "yyyy/MM/dd HH:mm:ss", |
|
|
|
span:22, |
|
|
|
span:22, |
|
|
|
labelWidth: 150, |
|
|
|
labelWidth: 150, |
|
|
|
row: true, |
|
|
|
row: true, |
|
|
@ -469,17 +470,20 @@ |
|
|
|
}, |
|
|
|
}, |
|
|
|
resultAdd(row) { |
|
|
|
resultAdd(row) { |
|
|
|
this.resultBox = true; |
|
|
|
this.resultBox = true; |
|
|
|
this.$refs.resultForm.resetFields(); |
|
|
|
|
|
|
|
this.currTaskNo = row.taskNo; |
|
|
|
setTimeout(() => { |
|
|
|
this.currStartDate = row.taskStartDate; |
|
|
|
this.$refs.resultForm.resetForm(); |
|
|
|
this.currEndDate = row.taskEndDate; |
|
|
|
this.currTaskNo = row.taskNo; |
|
|
|
|
|
|
|
this.currStartDate = row.taskStartDate; |
|
|
|
|
|
|
|
}, 100); |
|
|
|
}, |
|
|
|
}, |
|
|
|
submitResult(row, done, loading) { |
|
|
|
submitResult(row, done, loading) { |
|
|
|
this.resultForm.taskNo = this.currTaskNo; |
|
|
|
this.resultForm.taskNo = this.currTaskNo; |
|
|
|
const form = this.$refs.resultForm; |
|
|
|
this.$refs.resultForm.validate((valid, done, msg) => { |
|
|
|
form.validate((valid) => { |
|
|
|
|
|
|
|
if (valid) { |
|
|
|
if (valid) { |
|
|
|
|
|
|
|
done() |
|
|
|
add(this.resultForm).then(() => { |
|
|
|
add(this.resultForm).then(() => { |
|
|
|
|
|
|
|
this.$refs.resultForm.resetForm(); |
|
|
|
this.resultBox = false; |
|
|
|
this.resultBox = false; |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.$message({ |
|
|
|
this.$message({ |
|
|
|