|
@@ -94,7 +94,8 @@
|
|
|
<span v-if="scope.row.payWay === 1">对公划款</span>
|
|
|
<span v-if="scope.row.payWay === 2">扫描支付</span>
|
|
|
<el-icon :size="15" style="color: #409eff; margin-left: 5px;cursor: pointer;"
|
|
|
- @click="changePayWay(scope.row)" v-if="(scope.row.status === 0 || scope.row.status === 1)&& tenant.versionId !== '4'">
|
|
|
+ @click="changePayWay(scope.row)"
|
|
|
+ v-if="(scope.row.status === 0 || scope.row.status === 1)&& tenant.versionId !== '4'">
|
|
|
<Edit />
|
|
|
</el-icon>
|
|
|
</div>
|
|
@@ -164,15 +165,15 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="划款方式:">
|
|
|
<div>
|
|
|
- {{
|
|
|
- form.payWay === 1
|
|
|
- ? '对公划款'
|
|
|
- : form.payWay === 2
|
|
|
- ? '扫描支付'
|
|
|
- : ''
|
|
|
+ {{
|
|
|
+ form.payWay === 1
|
|
|
+ ? '对公划款'
|
|
|
+ : form.payWay === 2
|
|
|
+ ? '扫描支付'
|
|
|
+ : ''
|
|
|
}}
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
@@ -289,8 +290,8 @@
|
|
|
<div>
|
|
|
<p>您确定要进行扣款吗?</p>
|
|
|
</div>
|
|
|
- <el-form :model="payWayFrom" ref="showConfirmFlagRef" size="small" label-width="100">
|
|
|
- <el-form-item label="划款方式:" prop="payWay">
|
|
|
+ <el-form :model="payWayFrom" ref="showConfirmFlagRef" size="small" label-width="100" :rules="rules">
|
|
|
+ <el-form-item label="划款方式:" prop="payWay" >
|
|
|
<el-select v-model="payWayFrom.payWay" placeholder="请选择扣款方式" :clearable="true">
|
|
|
<el-option label="对公划款" :value="1" />
|
|
|
<el-option label="扫描支付" :value="2" />
|
|
@@ -304,6 +305,9 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<el-dialog title="修改划款方式" v-model="changePayWayFlag" width="400px" append-to-body draggable>
|
|
|
<el-form :model="payWayFrom" ref="changePayWayFlagRef" size="small" label-width="100">
|
|
|
<el-form-item label="划款方式:" prop="payWay">
|
|
@@ -327,7 +331,7 @@
|
|
|
import {
|
|
|
listDeduction,
|
|
|
exportDeposition,
|
|
|
- saveDeduction,update
|
|
|
+ saveDeduction, update
|
|
|
} from "@/api/business/production/deduction";
|
|
|
import MergeTaxViewDialog from "./MergeTaxViewDialog";
|
|
|
import feedbackDialog from "./feedbackDialog";
|
|
@@ -360,6 +364,7 @@
|
|
|
const showViewer = ref(false);
|
|
|
const currentFileList = ref([]);
|
|
|
const payWayFrom = ref({
|
|
|
+ payWay: null,
|
|
|
});
|
|
|
const changePayWayFlag = ref(false);
|
|
|
const confirmRow = ref({});
|
|
@@ -416,7 +421,11 @@
|
|
|
noContract: 1,
|
|
|
principal: tenant.versionId !== '4' && !flag.value ? useUserStore().user.userId : null,
|
|
|
});
|
|
|
-
|
|
|
+ const rules = {
|
|
|
+ payWay: [
|
|
|
+ { required: true, message: '请选择扣款方式', trigger: 'change' },
|
|
|
+ ],
|
|
|
+ };
|
|
|
/*********************** 方法区 ****************************/
|
|
|
onActivated(() => {
|
|
|
// 你的逻辑
|
|
@@ -558,12 +567,12 @@
|
|
|
payWayFrom.value.id = row.id
|
|
|
payWayFrom.value.payWay = row.payWay
|
|
|
}
|
|
|
-function changePayWaySubmit(){
|
|
|
- update(payWayFrom.value).then(res=>{
|
|
|
- changePayWayFlag.value = false;
|
|
|
- getList();
|
|
|
- })
|
|
|
-}
|
|
|
+ function changePayWaySubmit() {
|
|
|
+ update(payWayFrom.value).then(res => {
|
|
|
+ changePayWayFlag.value = false;
|
|
|
+ getList();
|
|
|
+ })
|
|
|
+ }
|
|
|
/** 导出按钮操作 */
|
|
|
function handleExport() {
|
|
|
exportDeposition(queryParams.value);
|
|
@@ -737,12 +746,17 @@ function changePayWaySubmit(){
|
|
|
// });
|
|
|
}
|
|
|
function showConfirmSubmit() {
|
|
|
- confirmRow.value.status = 1;
|
|
|
- confirmRow.value.payWay = payWayFrom.value.payWay;
|
|
|
- saveDeduction(confirmRow.value).then((res) => {
|
|
|
- showConfirmFlag.value = false;
|
|
|
- getList();
|
|
|
+ proxy.$refs["showConfirmFlagRef"].validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ confirmRow.value.status = 1;
|
|
|
+ confirmRow.value.payWay = payWayFrom.value.payWay;
|
|
|
+ saveDeduction(confirmRow.value).then((res) => {
|
|
|
+ showConfirmFlag.value = false;
|
|
|
+ getList();
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
+
|
|
|
}
|
|
|
|
|
|
function applySuccess(row, status) {
|