|
|
@@ -24,13 +24,17 @@
|
|
|
审核处理<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="pleaseCheck"
|
|
|
- >请核数据</el-dropdown-item
|
|
|
- >
|
|
|
- <el-dropdown-item disabled>审核进度</el-dropdown-item>
|
|
|
- <el-dropdown-item disabled>撤销请核</el-dropdown-item>
|
|
|
+ <el-dropdown-item
|
|
|
+ :disabled="form.status > 0"
|
|
|
+ @click.native="pleaseCheck"
|
|
|
+ >请核数据
|
|
|
+ </el-dropdown-item>
|
|
|
+ <el-dropdown-item :disabled="!form.status || form.status == 0" @click.native="checkScheduleDialog = true,checkId = form.id">
|
|
|
+ 审核进度
|
|
|
+ </el-dropdown-item>
|
|
|
+ <el-dropdown-item @click.native="checkDialog = true;checkData = detailData.check;"
|
|
|
+ v-if="detailData.check">审批
|
|
|
+ </el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<el-dropdown style="margin-right: 8px;">
|
|
|
@@ -80,15 +84,16 @@
|
|
|
></crop-select>
|
|
|
</template>
|
|
|
<template slot="exchangeRate">
|
|
|
- <el-input
|
|
|
- size="mini"
|
|
|
- v-model="form.exchangeRate"
|
|
|
- oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
|
|
|
- @change="rateChange"
|
|
|
- placeholder="请输入 汇率"
|
|
|
- :disabled="detailData.status == 1"
|
|
|
- ><template slot="append">%</template></el-input
|
|
|
- >
|
|
|
+ <el-input
|
|
|
+ size="mini"
|
|
|
+ v-model="form.exchangeRate"
|
|
|
+ oninput="value=value.replace(/[^0-9.]/g,'').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
|
|
|
+ @change="rateChange"
|
|
|
+ placeholder="请输入 汇率"
|
|
|
+ :disabled="detailData.status == 1"
|
|
|
+ >
|
|
|
+ <template slot="append">%</template>
|
|
|
+ </el-input>
|
|
|
</template>
|
|
|
<template slot="orderNo">
|
|
|
<el-input
|
|
|
@@ -242,10 +247,10 @@
|
|
|
<div>
|
|
|
<trade-card title="银行信息">
|
|
|
<avue-form
|
|
|
- class="trading-form"
|
|
|
- ref="form"
|
|
|
- v-model="form"
|
|
|
- :option="bankOption"
|
|
|
+ class="trading-form"
|
|
|
+ ref="formTwo"
|
|
|
+ v-model="form"
|
|
|
+ :option="bankOption"
|
|
|
/>
|
|
|
</trade-card>
|
|
|
</div>
|
|
|
@@ -356,19 +361,42 @@
|
|
|
append-to-body>
|
|
|
<span>
|
|
|
<el-date-picker
|
|
|
- v-model="pickerValue"
|
|
|
- type="date"
|
|
|
- style="width: 100%;"
|
|
|
- size="small"
|
|
|
- value-format="yyyy-MM-dd HH:ss:mm"
|
|
|
- placeholder="选择日期">
|
|
|
+ v-model="pickerValue"
|
|
|
+ type="date"
|
|
|
+ style="width: 100%;"
|
|
|
+ size="small"
|
|
|
+ value-format="yyyy-MM-dd HH:ss:mm"
|
|
|
+ placeholder="选择日期">
|
|
|
</el-date-picker>
|
|
|
</span>
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="dialog = false;">取 消</el-button>
|
|
|
<el-button type="primary" @click="PSModification(fudaSatus)">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ append-to-body
|
|
|
+ title="审批进度"
|
|
|
+ class="el-dialogDeep"
|
|
|
+ :visible.sync="checkScheduleDialog"
|
|
|
+ width="40%"
|
|
|
+ v-if="checkScheduleDialog"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :destroy-on-close="true"
|
|
|
+ :close-on-press-escape="false"
|
|
|
+ v-dialog-drag
|
|
|
+ >
|
|
|
+ <check-schedule
|
|
|
+ :checkId="checkId"
|
|
|
+ :batchNo="batchNo"
|
|
|
+ @choceScheduleFun="choceScheduleFun"
|
|
|
+ ></check-schedule>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
+ <check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
|
|
|
+ </check>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -388,26 +416,29 @@ import {
|
|
|
} from "@/api/exportTrade/purchaseContract";
|
|
|
import _ from "lodash";
|
|
|
import reportDialog from "@/components/report-dialog/main";
|
|
|
-import { contrastObj, contrastList } from "@/util/contrastData";
|
|
|
+import {contrastObj, contrastList} from "@/util/contrastData";
|
|
|
import {
|
|
|
- isvalidatemobile,
|
|
|
- validatename,
|
|
|
- micrometerFormat,
|
|
|
- IntegerFormat
|
|
|
+ isvalidatemobile,
|
|
|
+ validatename,
|
|
|
+ micrometerFormat,
|
|
|
+ IntegerFormat
|
|
|
} from "@/util/validate";
|
|
|
import financialAccount from "@/components/finance/financialAccount";
|
|
|
import billApplication from "@/components/bill/billApplication";
|
|
|
import {dateFormat} from "@/util/date";
|
|
|
+import check from "@/components/check/check.vue";
|
|
|
+import checkSchedule from "@/components/check/checkSchedule.vue";
|
|
|
+
|
|
|
export default {
|
|
|
- name: "detailsPageEdit",
|
|
|
- watch:{
|
|
|
- dialog(newVla, oldVal) {
|
|
|
- if (newVla){
|
|
|
- this.pickerValue = dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- data() {
|
|
|
+ name: "detailsPageEdit",
|
|
|
+ watch: {
|
|
|
+ dialog(newVla, oldVal) {
|
|
|
+ if (newVla) {
|
|
|
+ this.pickerValue = dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ data() {
|
|
|
return {
|
|
|
pickerValue:dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
|
|
|
dialog:false,
|
|
|
@@ -653,17 +684,22 @@ export default {
|
|
|
orderItemIds: [],
|
|
|
itemtypeList: [],
|
|
|
goodsSelections: [],
|
|
|
- reData: null,
|
|
|
- oldform: {
|
|
|
- orderStatus: "录入"
|
|
|
- },
|
|
|
- olddata: [],
|
|
|
- oldorderFeesList: [],
|
|
|
- oldorderFilesList: [],
|
|
|
- subLoading: false,
|
|
|
- pageLoading: false,
|
|
|
- showBut: true,
|
|
|
- search: {}
|
|
|
+ reData: null,
|
|
|
+ oldform: {
|
|
|
+ orderStatus: "录入"
|
|
|
+ },
|
|
|
+ olddata: [],
|
|
|
+ oldorderFeesList: [],
|
|
|
+ oldorderFilesList: [],
|
|
|
+ subLoading: false,
|
|
|
+ pageLoading: false,
|
|
|
+ showBut: true,
|
|
|
+ search: {},
|
|
|
+ checkScheduleDialog: false,
|
|
|
+ checkId: '',
|
|
|
+ batchNo: '',
|
|
|
+ checkDialog: false,
|
|
|
+ checkData: {},
|
|
|
};
|
|
|
},
|
|
|
props: {
|
|
|
@@ -672,11 +708,12 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
components: {
|
|
|
- reportDialog,
|
|
|
- feeInfo,
|
|
|
- uploadFile,
|
|
|
- financialAccount,
|
|
|
- billApplication
|
|
|
+ checkSchedule, check,
|
|
|
+ reportDialog,
|
|
|
+ feeInfo,
|
|
|
+ uploadFile,
|
|
|
+ financialAccount,
|
|
|
+ billApplication
|
|
|
},
|
|
|
async created() {
|
|
|
if (this.detailData.id) {
|
|
|
@@ -714,16 +751,24 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- cellStyle() {
|
|
|
- return "padding:0;height:40px;";
|
|
|
- },
|
|
|
- copyDoc() {
|
|
|
- this.$emit("copyOrder", this.form.id);
|
|
|
- },
|
|
|
- PSModification(type){
|
|
|
- if (!this.pickerValue)return this.$message.error("请选择日期")
|
|
|
- const loading = this.$loading({
|
|
|
- lock: true,
|
|
|
+ //审核关闭
|
|
|
+ choceScheduleFun() {
|
|
|
+ this.checkScheduleDialog = false
|
|
|
+ },
|
|
|
+ //关闭审核
|
|
|
+ choceCheckFun() {
|
|
|
+ this.checkDialog = false;
|
|
|
+ },
|
|
|
+ cellStyle() {
|
|
|
+ return "padding:0;height:40px;";
|
|
|
+ },
|
|
|
+ copyDoc() {
|
|
|
+ this.$emit("copyOrder", this.form.id);
|
|
|
+ },
|
|
|
+ PSModification(type) {
|
|
|
+ if (!this.pickerValue) return this.$message.error("请选择日期")
|
|
|
+ const loading = this.$loading({
|
|
|
+ lock: true,
|
|
|
text: '操作中',
|
|
|
spinner: 'el-icon-loading',
|
|
|
background: 'rgba(255,255,255,0.7)'
|
caojunjie