解决冲突问题

src/api/school-center/salesListAPI.js

 import {postAction,getAotion,downFilePost} from '@/api/manage'
 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 deleteOrder = (params) => postAction(prefix + "/salesList/deleteOrder" , params);
-
 // 下载放号上传模板
 let downloadTemplateFH = (params) => downFilePost(prefix + "/salesList/downloadTemplateFH" , 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);
 

src/api/school-center/uploadVerify/studentCardVerifyAPI.js

+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
+}

src/api/school-center/uploadVerify/studentdwkVerifyKpiAPI.js

+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
+}

src/api/school-center/exchangeCouponAPI.js → src/api/school-center/yxtManager/exchangeCouponAPI.js

 import {postAction,downFilePost} from '@/api/manage'
 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 downloadMoBan = (params) => downFilePost(prefix + "/yxtCoupon/downloadMoBan" , params);
 let yxtCouponList = (params) => postAction(prefix + "/yxtCoupon/list" , params);
@@ -12,8 +9,6 @@ let yxtCouponInsert = (params) => postAction(prefix + "/yxtCoupon/insert" , para
 let yxtCouponUpdate = (params) => postAction(prefix + "/yxtCoupon/update",params);
 
 export {
-    initSubstName,
-    getSchoolNames,
     uploadExcel,
     downloadMoBan,
     yxtCouponList,

src/api/school-center/yxtOrderAPI.js → src/api/school-center/yxtManager/yxtOrderAPI.js

 import {postAction,downFilePost} from '@/api/manage'
 const prefix = '/manager/ciop';
 
-// 楼长KPI管理
 //获取县分下拉列表
 let initSubstName = (params) => postAction(prefix + "/ysmUser/initSubstName" , params);
 //获取学校下拉列表

src/views/school-center/activity/activityIntegral.vue

@@ -84,7 +84,7 @@
 
 <script>
     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 moment from "moment";
     export default {

src/views/school-center/activity/activityList.vue

@@ -120,7 +120,7 @@
 
 <script>
     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';
     export default {
         name: "activity",

src/views/school-center/bill/billRecord.vue

@@ -124,7 +124,7 @@
         getList,
         deleteBill,getSubstList,getSchoolList,
         downloadTemplate,exportList
-    } from "@/api/school-center/billAPI"
+    } from "../../../api/school-center/bill/billAPI"
     import {cloneObject,exportFile} from '@/utils/util';
     import ImportBtn from "../../../components/sysmanage/ImportBtn";
 

src/views/school-center/bill/billStatis.vue

@@ -45,7 +45,7 @@
     import STable from '@/components/table';
     import {
         getStatisList,exportStatisList
-    } from "@/api/school-center/billAPI";
+    } from "../../../api/school-center/bill/billAPI";
     import {cloneObject,exportFile} from '@/utils/util';
 
     export default {

src/views/school-center/bill/billStatisManager.vue

@@ -36,7 +36,7 @@
     import STable from '@/components/table';
     import {
         getStatisManagerList,exportStatisManagerList
-    } from "@/api/school-center/billAPI";
+    } from "../../../api/school-center/bill/billAPI";
     import {cloneObject,exportFile} from '@/utils/util';
 
     export default {

src/views/school-center/bill/billStatisSchool.vue

@@ -53,7 +53,7 @@
     import STable from '@/components/table';
     import {
         getStatisList,exportStatisList,getSubstList,getSchoolList
-    } from "@/api/school-center/billAPI";
+    } from "../../../api/school-center/bill/billAPI";
     import {cloneObject,exportFile} from '@/utils/util';
 
     export default {

src/views/school-center/bill/billStatisSubst.vue

@@ -42,7 +42,7 @@
     import STable from '@/components/table';
     import {
         getStatisList,exportStatisList,getSubstList
-    } from "@/api/school-center/billAPI";
+    } from "../../../api/school-center/bill/billAPI";
     import {cloneObject,exportFile} from '@/utils/util';
 
     export default {

src/views/school-center/louZhang/louZhangKPI.vue

@@ -188,7 +188,7 @@
     import {
         lzKpiList, lzKpiDelete, lzKpiInsert, lzKpiUpdate,
         getSchoolNames, initSubstName, uploadExcel, downloadMoBan
-    } from "../../../api/school-center/louZhangManagerAPI"
+    } from "../../../api/school-center/louZhang/louZhangManagerAPI"
     import {cloneObject, exportFile} from '@/utils/util';
     import Vue from 'vue';
     import {DatetimePicker} from 'vant';

src/views/school-center/louZhang/lzSalary.vue

@@ -180,13 +180,13 @@
     import {
         lzSalaryList, lzSalaryDelete, lzSalaryInsert, lzSalaryUpdate,
         getSchoolNames, initSubstName, uploadExcel, downloadMoBan
-    } from "../../../api/school-center/lzSalaryManagerAPI"
+    } from "../../../api/school-center/louZhang/lzSalaryManagerAPI"
     import {cloneObject, exportFile} from '@/utils/util';
     import Vue from 'vue';
     import {DatetimePicker} from 'vant';
     import moment from "moment";
     import ConstantActivity from "@/constant/ConstantActivity";
-    import {createSalary} from "../../../api/school-center/lzSalaryManagerAPI";
+    import {createSalary} from "../../../api/school-center/louZhang/lzSalaryManagerAPI";
 
     Vue.use(DatetimePicker);
 

src/views/school-center/louZhang/managerKpi.vue

@@ -108,7 +108,7 @@
 <script>
     import STable from '@/components/table';
     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 ConstantActivity from "@/constant/ConstantActivity";
     import Vue from 'vue';

src/views/school-center/louZhang/zjlSalary.vue

@@ -108,7 +108,7 @@
     import ImportBtn from "../../../components/sysmanage/ImportBtn";
     import {
         zjlSalaryList, zjlSalaryDelete, excelOut, downloadMoBan,createSalary
-    } from "@/api/school-center/zjlSalaryManagerAPI"
+    } from "../../../api/school-center/louZhang/zjlSalaryManagerAPI"
     import {cloneObject, exportFile} from '@/utils/util';
     import Vue from 'vue';
     import {DatetimePicker} from 'vant';

src/views/school-center/salesOrderLists/saleCensus.vue

@@ -156,7 +156,7 @@
 <script>
     import STable from '@/components/table';
     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 ImportBtn from "../../../components/sysmanage/ImportBtn";
     import Vue from 'vue';

src/views/school-center/salesOrderLists/salesOrder.vue

@@ -163,7 +163,7 @@
     import {
         getSchoolNames, initSubstName, getList, deleteOrder,
         downloadTemplateFH, downloadTemplateCZ, downloadResult, exportOut
-    } from "../../../api/school-center/salesOrderAPI";
+    } from "../../../api/school-center/salesOrderLists/salesOrderAPI";
     import {cloneObject,exportFile} from '@/utils/util';
     import ImportBtn from "../../../components/sysmanage/ImportBtn";
     import Vue from 'vue';

src/views/school-center/uploadVerify/studentCardVerify.vue

@@ -178,17 +178,17 @@
                 <a-form-item label="上传资料时间">{{Formtable.uploadDate | dayjs}}</a-form-item>
                 <br>
                 <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 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 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>
                 <br>
                 <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>
@@ -202,13 +202,12 @@
 <script>
     import STable from '@/components/table';
     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 ConstantActivity from "@/constant/ConstantActivity";
     import Vue from 'vue';
     import moment from "moment";
     import {DatetimePicker, Dialog} from 'vant';
-    import {queryById} from "../../../api/school-center/studentdwkVerifyKpiAPI";
     import { Image as VanImage } from 'vant';
 
     Vue.use(VanImage);
@@ -237,6 +236,7 @@
                     otherImgUrl2: '',
                     otherImgUrl3: '',
                 },
+                tempstate: '',
                 title: ConstantActivity.title,
                 queryParam: {
                     userName: '',
@@ -304,7 +304,7 @@
                 },
                 tempMode: ['month', 'month'],
                 apis: 'img/',
-                imgInfo: '',
+                imgInfo: '',//require("../../../assets/img/previewAvatar.jpg"),
                 visiblepicture: false,
                 selectedRowKeys: [],
                 hasSelected: false,
@@ -347,21 +347,15 @@
                             this.Formtable.otherImgUrl1 = res.data.otherImgUrl1
                             this.Formtable.otherImgUrl2 = res.data.otherImgUrl2
                             this.Formtable.otherImgUrl3 = res.data.otherImgUrl3
-                            this.Formtable.auditState = '是'
-                            if(res.data.auditState != 1){
-                                Dialog.confirm({
-                                    title: '提示',
-                                    message: '已审核过，是否重新审核？？？',
-                                }).then(() => {
-                                    this.modifyvisible = true;
-                                }).catch(() => {
-                                    this.modifyvisible = false;
-                                    this.Formtable = [];
-                                    return;
-                                });
-                            }else{
-                                this.modifyvisible = true;
+                            this.Formtable.auditState = res.data.auditState
+                            if(res.data.auditState == 1 || res.data.auditState == 2){
+                                this.tempstate = '是'
+                            }else if(res.data.auditState == 3){
+                                this.tempstate = '否'
+                            }else if(res.data.auditState == 4){
+                                this.tempstate = '无效'
                             }
+                            this.modifyvisible = true;
                         }
                     })
                 }else{
@@ -415,6 +409,27 @@
 
             },
             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.clearmodel();
             },
@@ -423,9 +438,17 @@
                 this.clearmodel0();
             },
             clearmodel() {
-                this.importTile = "";
-                this.zjlmoBan = false;
-                this.importUrl = "";
+                this.Formtable.id = ''
+                this.Formtable.userName = ''
+                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() {
                 console.log("queryParam.month==================" + this.queryParam);

src/views/school-center/uploadVerify/studentdwkVerify.vue

@@ -206,13 +206,13 @@
 <script>
     import STable from '@/components/table';
     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 ConstantActivity from "@/constant/ConstantActivity";
     import Vue from 'vue';
     import moment from "moment";
     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';
 
     Vue.use(VanImage);

src/views/school-center/yxtManager/exchangeCoupon.vue

@@ -140,9 +140,8 @@
     import STable from '@/components/table';
     import ImportBtn from "../../../components/sysmanage/ImportBtn";
     import {
-        yxtCouponList, yxtCouponDelete, yxtCouponInsert, yxtCouponUpdate,
-        getSchoolNames, initSubstName, uploadExcel, downloadMoBan
-    } from "@/api/school-center/exchangeCouponAPI"
+        yxtCouponList, yxtCouponDelete, yxtCouponInsert, yxtCouponUpdate,uploadExcel, downloadMoBan
+    } from "../../../api/school-center/yxtManager/exchangeCouponAPI"
     import {cloneObject, exportFile} from '@/utils/util';
     import Vue from 'vue';
     import {DatetimePicker} from 'vant';
@@ -388,7 +387,7 @@
                     "password": '',
                     "validityPeriod": '',
                 })
-            }
+            },
         },
         mounted() {
 

src/views/school-center/yxtManager/yxtOrder.vue

@@ -179,13 +179,13 @@
     import ImportBtn from "../../../components/sysmanage/ImportBtn";
     import {
         yxtOrderList, yxtOrderDelete, getSchoolNames, initSubstName, uploadExcel, downloadMoBan
-    } from "../../../api/school-center/yxtOrderAPI"
+    } from "../../../api/school-center/yxtManager/yxtOrderAPI"
     import {cloneObject, exportFile} from '@/utils/util';
     import Vue from 'vue';
     import {DatetimePicker} from 'vant';
     import moment from "moment";
     import ConstantActivity from "@/constant/ConstantActivity";
-    import {getYxtCard} from "../../../api/school-center/yxtOrderAPI";
+    import {getYxtCard} from "../../../api/school-center/yxtManager/yxtOrderAPI";
 
     Vue.use(DatetimePicker);