Merge remote-tracking branch 'origin/master'

src/api/school-center/salesOrderAPI.js

@@ -9,15 +9,11 @@ let getSchoolNames  = (params) => postAction(prefix + "/salesOrder/getSchoolName
 let getList = (params) => postAction(prefix + "/salesOrder/list" , params);
 let getList = (params) => postAction(prefix + "/salesOrder/list" , params);
 // 导出放号充值达标清单
 // 导出放号充值达标清单
 let exportOut= (params) => downFilePost(prefix + "/salesOrder/exportList" , params);
 let exportOut= (params) => downFilePost(prefix + "/salesOrder/exportList" , params);
-
 // 删除
 // 删除
 let deleteOrder = (params) => postAction(prefix + "/salesOrder/deleteOrder" , params);
 let deleteOrder = (params) => postAction(prefix + "/salesOrder/deleteOrder" , params);
-
 // 下载导入结果清单
 // 下载导入结果清单
 let downloadResult = (params) => downFilePost(prefix + "/salesOrder/exportResult" , params);
 let downloadResult = (params) => downFilePost(prefix + "/salesOrder/exportResult" , params);
 
 
-
-
 export {
 export {
     initSubstName,
     initSubstName,
     getSchoolNames,
     getSchoolNames,

src/api/school-center/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/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/views/poster/PosterList.vue

@@ -34,7 +34,7 @@
             </template>
             </template>
             <template slot="picture" slot-scope="text">
             <template slot="picture" slot-scope="text">
                    <img style="width: 20%" :src="apis + text" @click="imgClick(text)">
                    <img style="width: 20%" :src="apis + text" @click="imgClick(text)">
-              </template>
+            </template>
             <template slot="enable" slot-scope="text">
             <template slot="enable" slot-scope="text">
                     <span v-if="text == 0">不启用</span>
                     <span v-if="text == 0">不启用</span>
                     <span v-if="text == 1">启用</span>
                     <span v-if="text == 1">启用</span>

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

@@ -5,12 +5,12 @@
             <!-- 搜索区域 -->
             <!-- 搜索区域 -->
             <a-form layout="inline">
             <a-form layout="inline">
                 <a-row :gutter="24">
                 <a-row :gutter="24">
-                    <a-col :md="3" :sm="6">
+                    <a-col :md="4" :sm="6">
                         <a-form-item label="姓名">
                         <a-form-item label="姓名">
                             <a-input placeholder="姓名" v-model="queryParam.userName" style="width: 8rem;"></a-input>
                             <a-input placeholder="姓名" v-model="queryParam.userName" style="width: 8rem;"></a-input>
                         </a-form-item>
                         </a-form-item>
                     </a-col>
                     </a-col>
-                    <a-col :md="3" :sm="6">
+                    <a-col :md="4" :sm="6">
                         <a-form-item label="县分">
                         <a-form-item label="县分">
                             <a-select v-model="queryParam.substName" @change="getSchoolNames" style="width: 8rem;">
                             <a-select v-model="queryParam.substName" @change="getSchoolNames" style="width: 8rem;">
                                 <a-select-option key="">--全部--</a-select-option>
                                 <a-select-option key="">--全部--</a-select-option>

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

@@ -5,7 +5,7 @@
             <!-- 搜索区域 -->
             <!-- 搜索区域 -->
             <a-form layout="inline">
             <a-form layout="inline">
                 <a-row :gutter="24">
                 <a-row :gutter="24">
-                    <a-col :md="3" :sm="6">
+                    <a-col :md="4" :sm="6">
                         <a-form-item label="姓名">
                         <a-form-item label="姓名">
                             <a-input placeholder="姓名" v-model="queryParam.name" style="width: 8rem;"></a-input>
                             <a-input placeholder="姓名" v-model="queryParam.name" style="width: 8rem;"></a-input>
                         </a-form-item>
                         </a-form-item>

src/views/school-center/salesList/salesList.vue

@@ -162,7 +162,7 @@
     import ImportBtn from "../../../components/sysmanage/ImportBtn";
     import ImportBtn from "../../../components/sysmanage/ImportBtn";
 
 
     export default {
     export default {
-        name: "salesOrder",
+        name: "salesList",
         components: {
         components: {
             STable,ImportBtn
             STable,ImportBtn
         },
         },
@@ -361,7 +361,6 @@
             deleteOrder(id){
             deleteOrder(id){
                 let params = {};
                 let params = {};
                 params.id = id;
                 params.id = id;
-
                 deleteOrder(params).then(res => {
                 deleteOrder(params).then(res => {
                     if(res.state == "success"){
                     if(res.state == "success"){
                         this.$message.success(res.data ? res.data : '删除成功', 5)
                         this.$message.success(res.data ? res.data : '删除成功', 5)

src/views/school-center/wideband/product.vue

@@ -25,8 +25,7 @@
         </div>
         </div>
 
 
         <!--列表-->
         <!--列表-->
-        <s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling"
-                 :locale="emptyText">
+        <s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling" :locale="emptyText">
             <!--拦截器-->
             <!--拦截器-->
             <template slot="productLastUpdateTime" slot-scope="text">
             <template slot="productLastUpdateTime" slot-scope="text">
                 {{ text | dayjs}}
                 {{ text | dayjs}}
@@ -237,7 +236,8 @@
                         title: '操作',
                         title: '操作',
                         scopedSlots: {customRender: 'operation'},
                         scopedSlots: {customRender: 'operation'},
                         fixed: "right"
                         fixed: "right"
-                    }]
+                    }
+                ]
                 ,
                 ,
                 rowdata: parameter => {
                 rowdata: parameter => {
                     let params = {
                     let params = {