Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/administration/documentApproval.vue

@@ -173,7 +173,7 @@
            <q-space />
           <q-btn icon="close" flat round dense v-close-popup />
         </q-card-section>
-        <q-input  standout="bg-primary text-white" type="textarea" v-model="approvalMsg.LogContent" label="备注" />
+        <q-input  standout="bg-primary text-white" type="textarea" v-model="approvalMsg.LogContent" label="审核备注" />
          <q-card-actions align="right">
           <q-btn flat label="取消" size="sm" color="primary" v-close-popup />
           <q-btn  label="拒绝" size="sm" color="primary"  @click="saveApproval(2)"/>

src/pages/course/prepareclassDetails.vue

@@ -651,8 +651,9 @@
             this.plmsg.Comment = '';
             this.getUserComment()
             this.getCommentList()
-
-
+            if(this.data.TotalScore===0){
+                this.getList() 
+            }
           }
         })
       },

src/pages/user/billquery.vue

@@ -51,13 +51,26 @@
             <span class="ReceipTypeName">{{props.row.ReceiptTypeName}}</span>
           </q-td>
         </template>
+        <template v-slot:body-cell-AuditObj="props">
+          <q-td :props="props">
+            <template v-if="props.row.AuditObj&&props.row.AuditObj.AuditNode">
+              <span style="cursor:pointer;color:blue;">{{props.row.AuditObj.AuditNode}}
+                <q-tooltip :offset="[10, 10]">
+                  <template v-if="props.row.AuditObj.AuditManList"
+                    v-for="(sItem,sIndex) in props.row.AuditObj.AuditManList">
+                    <span>{{sItem.AuditManName}} 待审</span><br />
+                  </template>
+                </q-tooltip>
+              </span>
+            </template>
+          </q-td>
+        </template>
         <template v-slot:bottom>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
             :input="true" @input="changePage" />
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
-
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="查看"
               @click="showBillForm(props.row,1)" />
           </q-td>
@@ -115,6 +128,12 @@
             field: 'AuditStatusName',
             align: 'left'
           },
+          {
+            name: 'AuditObj',
+            label: '当前审核',
+            field: 'AuditObj',
+            align: 'left'
+          },
           {
             name: 'CreateByName',
             label: '创建人',