|
|
@@ -15,11 +15,11 @@
|
|
|
</el-button>
|
|
|
<el-dropdown style="padding: 0 6px;line-height: 0">
|
|
|
<el-button type="primary" size="small" :loading="subLoading" :disabled="!form.id">
|
|
|
- 审批处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
+ 审核处理<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">审批数据</el-dropdown-item>
|
|
|
- <el-dropdown-item :disabled="form.status<1" @click.native="checkScheduleDialog = true">审批进度
|
|
|
+ <el-dropdown-item :disabled="form.status>0" @click.native="auditCheck">提交审核</el-dropdown-item>
|
|
|
+ <el-dropdown-item :disabled="form.status<1" @click.native="checkScheduleDialog = true">审核进度
|
|
|
</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
@@ -56,6 +56,10 @@
|
|
|
@click.stop="excelBox = true">导入
|
|
|
</el-button>
|
|
|
</template>
|
|
|
+ <template slot="headerSerial">
|
|
|
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addRow"
|
|
|
+ :disabled="detailData.status == 1" circle></el-button>
|
|
|
+ </template>
|
|
|
<template slot="oneCode" slot-scope="{ row, index }">
|
|
|
<el-popover placement="right" width="160" trigger="click">
|
|
|
<el-image style="width: 160px; height: 80px" :src="row.oneCode" :fit="fit"></el-image>
|
|
|
@@ -77,13 +81,25 @@
|
|
|
style="width:100%" placeholder="请输入"></el-input-number>
|
|
|
</template>
|
|
|
<template slot="menu" slot-scope="{ row, index }">
|
|
|
- <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
|
|
|
- :disabled="disabled || detailData.status == 1">{{ row.$cellEdit ? "保存" : "编辑" }}</el-button>
|
|
|
- <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
|
|
|
- :disabled="detailData.status == 1">删除</el-button>
|
|
|
- <el-button size="small" icon="el-icon-printer" type="text" @click="rowPrint(row, index)"
|
|
|
- :disabled="!row.id">
|
|
|
- 打印</el-button>
|
|
|
+ <div style="display:flex;justify-content: center;">
|
|
|
+ <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
|
|
|
+ :disabled="disabled || detailData.status == 1">{{ row.$cellEdit ? "保存" : "编辑" }}</el-button>
|
|
|
+ <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
|
|
|
+ :disabled="detailData.status == 1">删除</el-button>
|
|
|
+ <el-button size="small" icon="el-icon-printer" type="text" @click="rowPrint(row, index)"
|
|
|
+ :disabled="!row.id">
|
|
|
+ 打印</el-button>
|
|
|
+ <div style="display:flex;flex-direction: column;justify-content: center;margin-left: 10px;">
|
|
|
+ <el-tooltip effect="dark" content="向上移动" placement="top">
|
|
|
+ <i v-if="index != 0" :disabled="detailData.status == 1" class="el-icon-arrow-up"
|
|
|
+ @click="moveUp(row, index)" style="color:#409EFF;"></i>
|
|
|
+ </el-tooltip>
|
|
|
+ <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i v-if="index != (itemsVOList.length - 1)"
|
|
|
+ :disabled="detailData.status == 1" class="el-icon-arrow-down" @click="moveDown(row, index)"
|
|
|
+ style="color:#409EFF;"></i></el-tooltip>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</trade-card>
|
|
|
@@ -92,14 +108,14 @@
|
|
|
:inCropId="true" :tabShow="3" @beforeFinance="beforeFinance" :delType="2" :billingShow="false" />
|
|
|
<upload-file ref="uploadFile" title="合同附件" :disabled="detailData.status == 1" :orderFilesList="orderFilesList"
|
|
|
delUrl="" />
|
|
|
- <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
|
|
|
+ <el-dialog append-to-body title="审核进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
|
|
|
:close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
<check-schedule :checkId="form.id" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
|
|
|
</check-schedule>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
<el-dialog title="导入" append-to-body :close-on-click-modal="false" :visible.sync="excelBox" width="555px">
|
|
|
- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
|
|
|
+ <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter" :upload-error="uploadError">
|
|
|
<template slot="excelTemplate">
|
|
|
<el-button type="primary" @click="getTemplate">
|
|
|
点击下载<i class="el-icon-download el-icon--right"></i>
|
|
|
@@ -125,8 +141,8 @@ export default {
|
|
|
name: "detailsPageEdit",
|
|
|
data() {
|
|
|
return {
|
|
|
- subLoading:false,
|
|
|
- buttonLoading:false,
|
|
|
+ subLoading: false,
|
|
|
+ buttonLoading: false,
|
|
|
form: {},
|
|
|
excelBox: false,
|
|
|
excelOption: {
|
|
|
@@ -234,7 +250,7 @@ export default {
|
|
|
span: 6
|
|
|
},
|
|
|
{
|
|
|
- label: "审批状态",
|
|
|
+ label: "审核状态",
|
|
|
prop: "status",
|
|
|
type: "select",
|
|
|
dataType: 'number',
|
|
|
@@ -351,7 +367,7 @@ export default {
|
|
|
this.$refs["form"].validate((valid, done) => {
|
|
|
done();
|
|
|
if (valid) {
|
|
|
- this.itemsVOList.push({ $cellEdit: true });
|
|
|
+ this.itemsVOList.push({ $cellEdit: true, unit: '1' });
|
|
|
this.getStorage()
|
|
|
} else {
|
|
|
return false;
|
|
|
@@ -424,7 +440,7 @@ export default {
|
|
|
}
|
|
|
let orderFeesList = this.$refs.feeInfo.submitData();
|
|
|
this.subLoading = true;
|
|
|
- this.buttonLoading=false;
|
|
|
+ this.buttonLoading = false;
|
|
|
let data = {
|
|
|
...this.form,
|
|
|
billType: 'RK',
|
|
|
@@ -467,7 +483,7 @@ export default {
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
}).then(() => {
|
|
|
- this.$confirm("确定审批此订单?", {
|
|
|
+ this.$confirm("确定审核此订单?", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
@@ -493,7 +509,7 @@ export default {
|
|
|
})
|
|
|
})
|
|
|
} else {
|
|
|
- this.$confirm("确定审批此订单?", {
|
|
|
+ this.$confirm("确定审核此订单?", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
@@ -535,11 +551,14 @@ export default {
|
|
|
window.open(`/api/trade-purchase/woodHarvestingCloud/export-template?${this.website.tokenHeader}=${getToken()}`)
|
|
|
},
|
|
|
uploadAfter(res, done, loading, column) {
|
|
|
- res.forEach(item => this.itemsVOList.push({
|
|
|
- ...item,
|
|
|
- $cellEdit: true
|
|
|
- }))
|
|
|
- this.excelBox = false
|
|
|
+ if (res instanceof Array) {
|
|
|
+ res.forEach(item => this.itemsVOList.push({
|
|
|
+ ...item,
|
|
|
+ $cellEdit: true
|
|
|
+ }))
|
|
|
+ this.excelBox = false
|
|
|
+ }
|
|
|
+ loading()
|
|
|
done();
|
|
|
},
|
|
|
//返回列表
|
|
|
@@ -585,6 +604,12 @@ export default {
|
|
|
this.$refs.crud.$refs.dialogColumn.columnBox = false;
|
|
|
}
|
|
|
},
|
|
|
+ moveUp(row, index) {
|
|
|
+ this.itemsVOList[index] = this.itemsVOList.splice(index - 1, 1, row)[0]
|
|
|
+ },
|
|
|
+ moveDown(row, index) {
|
|
|
+ this.itemsVOList[index] = this.itemsVOList.splice(index + 1, 1, row)[0]
|
|
|
+ },
|
|
|
async resetColumn() {
|
|
|
this.tableOption = tableOption;
|
|
|
const inSave = await this.delColumnData(
|
qukaidi