Merge branch 'Inspection' into online

src/views/main/baseinfo/index.vue

@@ -40,9 +40,9 @@
       <el-col :xs="24" :sm="24" :md="12">
         <business :data="dataInfo"/>
       </el-col>
-      <!-- <el-col :xs="24" :sm="24" :md="24" :xl="10">
+      <el-col :xs="24" :sm="24" :md="24" :xl="12">
         <management :data="dataInfo"/>
-      </el-col> -->
+      </el-col>
       <el-col :xs="24" :sm="24" :md="12">
         <hrdata :data="dataInfo"/>
       </el-col>

src/views/main/baseinfo/management.vue

@@ -36,18 +36,16 @@ export default {
   computed: {
     items() {
       return {
-        SHOULD_INCOME_MONEY: this.data['SHOULD_INCOME_MONEY'] || {},
-        ANTICIPATED_INCOME_MONEY: this.data['ANTICIPATED_INCOME_MONEY'] || {},
-        SHOULD_EXPEND_MONEY: this.data['SHOULD_EXPEND_MONEY'] || {},
-        ANTICIPATED_EXPEND_MONEY: this.data['ANTICIPATED_EXPEND_MONEY'] || {},
-        REVENUE_MONEY: this.data['REVENUE_MONEY'] || {},
+        FINANCE_PAY: this.data['FINANCE_PAY'] || {},
+        FINANCE_BALANCE_AMOUNT: this.data['FINANCE_BALANCE_AMOUNT'] || {},
+        FINANCE_AMOUNT: this.data['FINANCE_AMOUNT'] || {},
       }
     },
     dataZoom() {
       return [
         {
           type: 'slider',
-          start: 80,
+          start: 50,
           end: 100
         }
       ]

src/views/musicInspection/index.vue

@@ -144,17 +144,17 @@
                 <el-table-column align="center"
                                 width="250px"
                                 label="操作">
-                    <template slot-scope="scope" v-if="scope.row.status != 0">
-                        <auth auths="inspectionItemPlanConclusion/getPlanConclusion">
+                    <template slot-scope="scope">
+                        <auth auths="inspectionItemPlanConclusion/getPlanConclusion" v-if="scope.row.status != 0">
                             <el-button type="text" @click="onLook(scope.row)">查看</el-button>
                         </auth>
-                        <auth auths="inspectionItemPlanConclusion/GPS-INFO">
+                        <auth auths="inspectionItemPlanConclusion/GPS-INFO" v-if="scope.row.status != 0">
                             <el-button type="text" @click="onGPS(scope.row)">GPS定位</el-button>
                         </auth>
-                        <auth auths="inspectionItemPlanConclusion/exportPlanConclusion">
+                        <auth auths="inspectionItemPlanConclusion/exportPlanConclusion" v-if="scope.row.status != 0">
                             <el-button type="text" @click="onExport(scope.row)">下载</el-button>
                         </auth>
-                        <auth auths="inspectionItemPlan/updateMemo" v-if="scope.row.conclusionStatus == 1 || scope.row.conclusionStatus == 0">
+                        <auth auths="inspectionItemPlan/updateMemo" v-if="scope.row.conclusionStatus == 1 || scope.row.status == 0">
                             <el-button type="text" @click="handleClick(scope.row)">处理方式</el-button>
                         </auth>
                     </template>
@@ -277,7 +277,6 @@ export default {
                     ...getTimes(createTimer, ["startTime", "endTime"]),
                 }
                 const res = await inspectionItemPlan(params)
-                console.log(res)
                 this.tableList = res.data.rows
                 this.pageInfo.total = res.data.total
             } catch(err) {}

src/views/recodeManager/modals/hand.vue

@@ -31,7 +31,7 @@ export default {
         if (valid) {
           try {
             await teacherAttendanceUpdate({
-              id: this.detail.id,
+              id: this.detail.teacherAttendanceId,
               ...this.quitForm
             })
             this.$emit('close')