Commit 81a567ac by 彭祥礼

解决冲突问题

parent 03401ca0
import {postAction,getAotion,downFilePost} from '@/api/manage' import {postAction,getAotion,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
//获取县分下拉列表
let getSubstList = (params) => postAction(prefix + "/ysmUser/initSubstName" , params);
//获取学校下拉列表
let getSchoolList = (params) => postAction(prefix + "/ysmUser/getSchoolNames" , params);
// 获取活动列表 // 获取活动列表
let getList = (params) => postAction(prefix + "/salesList/list" , params); let getList = (params) => postAction(prefix + "/salesList/list" , params);
// 删除 // 删除
let deleteOrder = (params) => postAction(prefix + "/salesList/deleteOrder" , params); let deleteOrder = (params) => postAction(prefix + "/salesList/deleteOrder" , params);
// 下载放号上传模板 // 下载放号上传模板
let downloadTemplateFH = (params) => downFilePost(prefix + "/salesList/downloadTemplateFH" , params); let downloadTemplateFH = (params) => downFilePost(prefix + "/salesList/downloadTemplateFH" , params);
// 下载充值审核模板 // 下载充值审核模板
let downloadTemplateCZ = (params) => downFilePost(prefix + "/salesList/downloadTemplateCZ" , params); let downloadTemplateCZ = (params) => downFilePost(prefix + "/salesList/downloadTemplateCZ" , params);
// 获取县分下拉列表
let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params);
// 获取学校下拉列表
let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params);
// 下载导入结果清单 // 下载导入结果清单
let downloadResult = (params) => downFilePost(prefix + "/salesList/exportResult" , params); let downloadResult = (params) => downFilePost(prefix + "/salesList/exportResult" , params);
......
import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop';
// 楼长KPI管理
let excelOut = (params) => downFilePost(prefix + "/studentCardVerify/excelOut" , params);
let list = (params) => postAction(prefix + "/studentCardVerify/list" , params);
let update = (params) => postAction(prefix + "/studentCardVerify/update" , params);
let queryById = (params) => postAction(prefix + "/studentCardVerify/queryById" , params);
export {
excelOut,
list,
update,
queryById
}
import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop';
// 楼长KPI管理
let excelOut = (params) => downFilePost(prefix + "/studentDwkVerify/excelOut" , params);
let list = (params) => postAction(prefix + "/studentDwkVerify/list" , params);
let update = (params) => postAction(prefix + "/studentDwkVerify/update" , params);
let queryById = (params) => postAction(prefix + "/studentDwkVerify/queryById" , params);
export {
excelOut,
list,
update,
queryById
}
import {postAction,downFilePost} from '@/api/manage' import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
// 楼长KPI管理
let initSubstName = (params) => postAction(prefix + "/yxtCoupon/initSubstName" , params);
let getSchoolNames = (params) => postAction(prefix + "/yxtCoupon/getSchoolNames" , params);
let uploadExcel = (params) => downFilePost(prefix + "/yxtCoupon/excelOut" , params); let uploadExcel = (params) => downFilePost(prefix + "/yxtCoupon/excelOut" , params);
let downloadMoBan = (params) => downFilePost(prefix + "/yxtCoupon/downloadMoBan" , params); let downloadMoBan = (params) => downFilePost(prefix + "/yxtCoupon/downloadMoBan" , params);
let yxtCouponList = (params) => postAction(prefix + "/yxtCoupon/list" , params); let yxtCouponList = (params) => postAction(prefix + "/yxtCoupon/list" , params);
...@@ -12,8 +9,6 @@ let yxtCouponInsert = (params) => postAction(prefix + "/yxtCoupon/insert" , para ...@@ -12,8 +9,6 @@ let yxtCouponInsert = (params) => postAction(prefix + "/yxtCoupon/insert" , para
let yxtCouponUpdate = (params) => postAction(prefix + "/yxtCoupon/update",params); let yxtCouponUpdate = (params) => postAction(prefix + "/yxtCoupon/update",params);
export { export {
initSubstName,
getSchoolNames,
uploadExcel, uploadExcel,
downloadMoBan, downloadMoBan,
yxtCouponList, yxtCouponList,
......
import {postAction,downFilePost} from '@/api/manage' import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop'; const prefix = '/manager/ciop';
// 楼长KPI管理
//获取县分下拉列表 //获取县分下拉列表
let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params); let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params);
//获取学校下拉列表 //获取学校下拉列表
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import {getIntegralList,exportIntegral,download} from "@/api/school-center/activityIntegralAPI" import {getIntegralList,exportIntegral,download} from "../../../api/school-center/activity/activityIntegralAPI"
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
import moment from "moment"; import moment from "moment";
export default { export default {
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import {getList,addActivity,updateActivity,deleteActivity,uploadImg} from "@/api/school-center/activityAPI" import {getList,addActivity,updateActivity,deleteActivity,uploadImg} from "../../../api/school-center/activity/activityAPI"
import {cloneObject} from '@/utils/util'; import {cloneObject} from '@/utils/util';
export default { export default {
name: "activity", name: "activity",
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
getList, getList,
deleteBill,getSubstList,getSchoolList, deleteBill,getSubstList,getSchoolList,
downloadTemplate,exportList downloadTemplate,exportList
} from "@/api/school-center/billAPI" } from "../../../api/school-center/bill/billAPI"
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
import STable from '@/components/table'; import STable from '@/components/table';
import { import {
getStatisList,exportStatisList getStatisList,exportStatisList
} from "@/api/school-center/billAPI"; } from "../../../api/school-center/bill/billAPI";
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
export default { export default {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
import STable from '@/components/table'; import STable from '@/components/table';
import { import {
getStatisManagerList,exportStatisManagerList getStatisManagerList,exportStatisManagerList
} from "@/api/school-center/billAPI"; } from "../../../api/school-center/bill/billAPI";
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
export default { export default {
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
import STable from '@/components/table'; import STable from '@/components/table';
import { import {
getStatisList,exportStatisList,getSubstList,getSchoolList getStatisList,exportStatisList,getSubstList,getSchoolList
} from "@/api/school-center/billAPI"; } from "../../../api/school-center/bill/billAPI";
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
export default { export default {
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
import STable from '@/components/table'; import STable from '@/components/table';
import { import {
getStatisList,exportStatisList,getSubstList getStatisList,exportStatisList,getSubstList
} from "@/api/school-center/billAPI"; } from "../../../api/school-center/bill/billAPI";
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
export default { export default {
......
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
import { import {
lzKpiList, lzKpiDelete, lzKpiInsert, lzKpiUpdate, lzKpiList, lzKpiDelete, lzKpiInsert, lzKpiUpdate,
getSchoolNames, initSubstName, uploadExcel, downloadMoBan getSchoolNames, initSubstName, uploadExcel, downloadMoBan
} from "../../../api/school-center/louZhangManagerAPI" } from "../../../api/school-center/louZhang/louZhangManagerAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import Vue from 'vue'; import Vue from 'vue';
import {DatetimePicker} from 'vant'; import {DatetimePicker} from 'vant';
......
...@@ -180,13 +180,13 @@ ...@@ -180,13 +180,13 @@
import { import {
lzSalaryList, lzSalaryDelete, lzSalaryInsert, lzSalaryUpdate, lzSalaryList, lzSalaryDelete, lzSalaryInsert, lzSalaryUpdate,
getSchoolNames, initSubstName, uploadExcel, downloadMoBan getSchoolNames, initSubstName, uploadExcel, downloadMoBan
} from "../../../api/school-center/lzSalaryManagerAPI" } from "../../../api/school-center/louZhang/lzSalaryManagerAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import Vue from 'vue'; import Vue from 'vue';
import {DatetimePicker} from 'vant'; import {DatetimePicker} from 'vant';
import moment from "moment"; import moment from "moment";
import ConstantActivity from "@/constant/ConstantActivity"; import ConstantActivity from "@/constant/ConstantActivity";
import {createSalary} from "../../../api/school-center/lzSalaryManagerAPI"; import {createSalary} from "../../../api/school-center/louZhang/lzSalaryManagerAPI";
Vue.use(DatetimePicker); Vue.use(DatetimePicker);
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import { zjlKpiList, uploadExcel, downloadMoBan } from "@/api/school-center/managerKpiAPI" import { zjlKpiList, uploadExcel, downloadMoBan } from "../../../api/school-center/louZhang/managerKpiAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import ConstantActivity from "@/constant/ConstantActivity"; import ConstantActivity from "@/constant/ConstantActivity";
import Vue from 'vue'; import Vue from 'vue';
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import { import {
zjlSalaryList, zjlSalaryDelete, excelOut, downloadMoBan,createSalary zjlSalaryList, zjlSalaryDelete, excelOut, downloadMoBan,createSalary
} from "@/api/school-center/zjlSalaryManagerAPI" } from "../../../api/school-center/louZhang/zjlSalaryManagerAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import Vue from 'vue'; import Vue from 'vue';
import {DatetimePicker} from 'vant'; import {DatetimePicker} from 'vant';
......
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import {} from "@/api/school-center/salesOrder"; import {} from "@/api/school-center/salesOrder";
import {getSchoolNames, initSubstName, getList,exportOut} from "../../../api/school-center/salesCensusAPI"; import {getSchoolNames, initSubstName, getList,exportOut} from "../../../api/school-center/salesOrderLists/salesCensusAPI";
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import Vue from 'vue'; import Vue from 'vue';
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
import { import {
getSchoolNames, initSubstName, getList, deleteOrder, getSchoolNames, initSubstName, getList, deleteOrder,
downloadTemplateFH, downloadTemplateCZ, downloadResult, exportOut downloadTemplateFH, downloadTemplateCZ, downloadResult, exportOut
} from "../../../api/school-center/salesOrderAPI"; } from "../../../api/school-center/salesOrderLists/salesOrderAPI";
import {cloneObject,exportFile} from '@/utils/util'; import {cloneObject,exportFile} from '@/utils/util';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import Vue from 'vue'; import Vue from 'vue';
......
...@@ -178,17 +178,17 @@ ...@@ -178,17 +178,17 @@
<a-form-item label="上传资料时间">{{Formtable.uploadDate | dayjs}}</a-form-item> <a-form-item label="上传资料时间">{{Formtable.uploadDate | dayjs}}</a-form-item>
<br> <br>
<a-form-item label="上传图片1:"> <a-form-item label="上传图片1:">
<a v-show="Formtable.studentCardUrl != '' " href="javascript:void(0);" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')">点击查看</a> <van-image width="100" height="100" @click="imgClick(Formtable.studentCardUrl)" :src="apis + Formtable.studentCardUrl" />
</a-form-item> </a-form-item>
<a-form-item label="上传图片2"> <a-form-item label="上传图片2">
<a v-show="Formtable.otherImgUrl1 != '' " href="javascript:void(0);" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')">点击查看</a> <van-image width="100" height="100" @click="imgClick(Formtable.otherImgUrl1)" :src="apis + Formtable.otherImgUrl1" />
</a-form-item> </a-form-item>
<a-form-item label="上传图片3"> <a-form-item label="上传图片3">
<a v-show="Formtable.otherImgUrl2 != '' " href="javascript:void(0);" @click="imgClick('https://img.yzcdn.cn/vant/cat.jpeg')">点击查看</a> <van-image width="100" height="100" @click="imgClick(Formtable.otherImgUrl2)" :src="apis + Formtable.otherImgUrl2" />
</a-form-item> </a-form-item>
<br> <br>
<a-form-item label="是否审核通过"> <a-form-item label="是否审核通过">
<a-select v-model="Formtable.auditState" style="width: 8rem;"> <a-select v-model="tempstate" style="width: 8rem;">
<a-select-option key="是"></a-select-option> <a-select-option key="是"></a-select-option>
<a-select-option key="否"></a-select-option> <a-select-option key="否"></a-select-option>
<a-select-option key="无效">无效</a-select-option> <a-select-option key="无效">无效</a-select-option>
...@@ -202,13 +202,12 @@ ...@@ -202,13 +202,12 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import {list, excelOut,update} from "@/api/school-center/studentCardVerifyAPI" import {list, excelOut,update,queryById} from "../../../api/school-center/uploadVerify/studentCardVerifyAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import ConstantActivity from "@/constant/ConstantActivity"; import ConstantActivity from "@/constant/ConstantActivity";
import Vue from 'vue'; import Vue from 'vue';
import moment from "moment"; import moment from "moment";
import {DatetimePicker, Dialog} from 'vant'; import {DatetimePicker, Dialog} from 'vant';
import {queryById} from "../../../api/school-center/studentdwkVerifyKpiAPI";
import { Image as VanImage } from 'vant'; import { Image as VanImage } from 'vant';
Vue.use(VanImage); Vue.use(VanImage);
...@@ -237,6 +236,7 @@ ...@@ -237,6 +236,7 @@
otherImgUrl2: '', otherImgUrl2: '',
otherImgUrl3: '', otherImgUrl3: '',
}, },
tempstate: '',
title: ConstantActivity.title, title: ConstantActivity.title,
queryParam: { queryParam: {
userName: '', userName: '',
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
}, },
tempMode: ['month', 'month'], tempMode: ['month', 'month'],
apis: 'img/', apis: 'img/',
imgInfo: '', imgInfo: '',//require("../../../assets/img/previewAvatar.jpg"),
visiblepicture: false, visiblepicture: false,
selectedRowKeys: [], selectedRowKeys: [],
hasSelected: false, hasSelected: false,
...@@ -347,21 +347,15 @@ ...@@ -347,21 +347,15 @@
this.Formtable.otherImgUrl1 = res.data.otherImgUrl1 this.Formtable.otherImgUrl1 = res.data.otherImgUrl1
this.Formtable.otherImgUrl2 = res.data.otherImgUrl2 this.Formtable.otherImgUrl2 = res.data.otherImgUrl2
this.Formtable.otherImgUrl3 = res.data.otherImgUrl3 this.Formtable.otherImgUrl3 = res.data.otherImgUrl3
this.Formtable.auditState = '是' this.Formtable.auditState = res.data.auditState
if(res.data.auditState != 1){ if(res.data.auditState == 1 || res.data.auditState == 2){
Dialog.confirm({ this.tempstate = '是'
title: '提示', }else if(res.data.auditState == 3){
message: '已审核过,是否重新审核???', this.tempstate = '否'
}).then(() => { }else if(res.data.auditState == 4){
this.modifyvisible = true; this.tempstate = '无效'
}).catch(() => {
this.modifyvisible = false;
this.Formtable = [];
return;
});
}else{
this.modifyvisible = true;
} }
this.modifyvisible = true;
} }
}) })
}else{ }else{
...@@ -415,6 +409,27 @@ ...@@ -415,6 +409,27 @@
}, },
createfunctionOk() { createfunctionOk() {
this.selectedRowKeys = []
this.selectedRowKeys.push(this.Formtable.id);
if(this.tempstate == '是'){
this.Formtable.auditState = 2
}else if(this.tempstate == '否'){
this.Formtable.auditState == 3
}else if(this.tempstate == '无效'){
this.Formtable.auditState = 4
}
update({'ids': this.selectedRowKeys,'state':this.Formtable.auditState}).then(res => {
if (res.state !== 'success') {
this.$message.error("审核失败!", 5);
}else{
setTimeout(() => {
this.loading = false;
this.selectedRowKeys = [];
}, 1000);
this.hasSelected = true;
this.$refs.table.refresh({search: true})
}
})
this.modifyvisible=false this.modifyvisible=false
this.clearmodel(); this.clearmodel();
}, },
...@@ -423,9 +438,17 @@ ...@@ -423,9 +438,17 @@
this.clearmodel0(); this.clearmodel0();
}, },
clearmodel() { clearmodel() {
this.importTile = ""; this.Formtable.id = ''
this.zjlmoBan = false; this.Formtable.userName = ''
this.importUrl = ""; this.Formtable.orderPhone = ''
this.Formtable.linkPhone = ''
this.Formtable.uploadDate = ''
this.Formtable.auditDate = ''
this.Formtable.studentCardUrl = ''
this.Formtable.otherImgUrl1 = ''
this.Formtable.otherImgUrl2 = ''
this.Formtable.otherImgUrl3 = ''
this.Formtable.auditState == ''
}, },
search() { search() {
console.log("queryParam.month==================" + this.queryParam); console.log("queryParam.month==================" + this.queryParam);
......
...@@ -206,13 +206,13 @@ ...@@ -206,13 +206,13 @@
<script> <script>
import STable from '@/components/table'; import STable from '@/components/table';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import {list, excelOut,update} from "@/api/school-center/studentdwkVerifyKpiAPI" import {list, excelOut,update} from "../../../api/school-center/uploadVerify/studentdwkVerifyKpiAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import ConstantActivity from "@/constant/ConstantActivity"; import ConstantActivity from "@/constant/ConstantActivity";
import Vue from 'vue'; import Vue from 'vue';
import moment from "moment"; import moment from "moment";
import {DatetimePicker,Dialog} from 'vant'; import {DatetimePicker,Dialog} from 'vant';
import {queryById} from "../../../api/school-center/studentdwkVerifyKpiAPI"; import {queryById} from "../../../api/school-center/uploadVerify/studentdwkVerifyKpiAPI";
import { Image as VanImage } from 'vant'; import { Image as VanImage } from 'vant';
Vue.use(VanImage); Vue.use(VanImage);
......
...@@ -140,9 +140,8 @@ ...@@ -140,9 +140,8 @@
import STable from '@/components/table'; import STable from '@/components/table';
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import { import {
yxtCouponList, yxtCouponDelete, yxtCouponInsert, yxtCouponUpdate, yxtCouponList, yxtCouponDelete, yxtCouponInsert, yxtCouponUpdate,uploadExcel, downloadMoBan
getSchoolNames, initSubstName, uploadExcel, downloadMoBan } from "../../../api/school-center/yxtManager/exchangeCouponAPI"
} from "@/api/school-center/exchangeCouponAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import Vue from 'vue'; import Vue from 'vue';
import {DatetimePicker} from 'vant'; import {DatetimePicker} from 'vant';
...@@ -388,7 +387,7 @@ ...@@ -388,7 +387,7 @@
"password": '', "password": '',
"validityPeriod": '', "validityPeriod": '',
}) })
} },
}, },
mounted() { mounted() {
......
...@@ -179,13 +179,13 @@ ...@@ -179,13 +179,13 @@
import ImportBtn from "../../../components/sysmanage/ImportBtn"; import ImportBtn from "../../../components/sysmanage/ImportBtn";
import { import {
yxtOrderList, yxtOrderDelete, getSchoolNames, initSubstName, uploadExcel, downloadMoBan yxtOrderList, yxtOrderDelete, getSchoolNames, initSubstName, uploadExcel, downloadMoBan
} from "../../../api/school-center/yxtOrderAPI" } from "../../../api/school-center/yxtManager/yxtOrderAPI"
import {cloneObject, exportFile} from '@/utils/util'; import {cloneObject, exportFile} from '@/utils/util';
import Vue from 'vue'; import Vue from 'vue';
import {DatetimePicker} from 'vant'; import {DatetimePicker} from 'vant';
import moment from "moment"; import moment from "moment";
import ConstantActivity from "@/constant/ConstantActivity"; import ConstantActivity from "@/constant/ConstantActivity";
import {getYxtCard} from "../../../api/school-center/yxtOrderAPI"; import {getYxtCard} from "../../../api/school-center/yxtManager/yxtOrderAPI";
Vue.use(DatetimePicker); Vue.use(DatetimePicker);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment