Merge branch 'vue_statistics_branch' of http://git.shengws.com/csx/Vue_New into vue_statistics_branch

src/api/common/common.js

   })
 }
 
-export function getConfigurationList(params) {
+export function getConfigurationList(limit, page) {
+  const params = {
+    limit: limit,
+    page: page
+  }
   return request({
     url: 'com/api/getconfigurationlist',
     method: 'get',

src/xt_pages/qcd/statisticalConfiguration.vue

       <div class="configTable">
         <el-table :data="configuraData" border style="width: 100%">
           <el-table-column prop="date" label="检验检查大项" width="180">
-              <template slot-scope="scope">{{ scope.row.inspection_major }}</template>
+              <template slot-scope="scope">{{ scope.row.project_name }}</template>
           </el-table-column>
           <el-table-column prop="name" label="检查小项" width="180">
-             <template slot-scope="scope">{{ scope.row.inspection_minor }}</template>
+             <template slot-scope="scope">{{ scope.row.item_name }}</template>
           </el-table-column>
           <el-table-column prop="address" label="范围">
              <template slot-scope="scope">{{ scope.row.min_range }} - {{scope.row.large_range}}</template>
           </el-table-column>
            <el-table-column prop="address" label="单位">
-              <template slot-scope="scope">{{ scope.row.min_range }}</template>
+              <template slot-scope="scope">{{ scope.row.unit }}</template>
+            </el-table-column>
+            <el-table-column prop="address" label="排序">
+                <template slot-scope="scope">{{ scope.row.sort }}</template>
             </el-table-column>
-            <el-table-column prop="address" label="排序"></el-table-column>
           <el-table-column label="操作" width="180">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
             </template>
           </el-table-column>
         </el-table>
+
+          <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 20, 30, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;float: right"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
       </div>
 
       <el-dialog title="新增" :visible.sync="newDialog">
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
         large_range:[{required:true,message:"指控范围不能为空"}]
-      }
+      },
+      page:1,
+      limit:10,
+      total:0,
     };
   },
   methods: {
         }
       })
     },
+   handleSizeChange(limit) {
+     // this.listQuery.limit = limit;
+      this.getConfigurationList();
+    },
+    handleCurrentChange(page) {
+     // this.listQuery.page = page;
+      this.getConfigurationList();
+    },
     getConfigurationList(){
-      getConfigurationList().then(response=>{
+      getConfigurationList(this.limit,this.page).then(response=>{
         if(response.data.state === 1){
           var configurationlist = response.data.data.configurationlist
           console.log("列表",configurationlist)
           this.configuraData = configurationlist
+          var total = response.data.data.total
+          console.log("total",total)
         }
       })
     }

src/xt_pages/user/patients.vue

 <template>
   <div class="main-contain">
+
+    <el-dialog
+      title="提示"
+      :visible.sync="exportVisible"
+      width="40%"
+    >
+
+      <div>
+        您提交的患者名单已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
     <el-dialog
       title="提示"
       :visible.sync="dialogVisible"
         isIndeterminate: true,
         dialogVisible: false,
         exportLogVisible: false,
+        exportVisible:false,
         phoneVisible:false,
         idCardNoVisible:false,
         wechatbindimg: '',
                 return
               }
 
-
+              this.exportVisible = true
               let params = {
                 'patients': this.export_date
               }
               postExportPatients(params).then(
                 response => {
                   if (response.data.state === 1) {
+
                     this.getList()
                   } else {
                     this.$message.error(response.data.msg)

src/xt_pages/workforce/appointment.vue

 <template>
   <div class="main-contain">
+    <el-dialog
+      title="提示"
+      :visible.sync="exportVisible"
+      width="40%"
+    >
+
+      <div>
+        您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
     <el-dialog
       title="提示"
       :visible.sync="exportLogVisible"
         msgTipVisible: false,
         dialogVisible: false,
         isExistRepeatVisible: false,
+        exportVisible:false,
         exportLogVisible: false,
         theWeek: {
           lastWeek: 0,
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
 
             var date = day2.getFullYear() + '-' + month + '-' + day
+            this.exportVisible = true
+
             exportSchedule(params, date).then(response => {
               if (response.data.state == 0) {
                 return false

src/xt_pages/workforce/template.vue

 <template>
   <div class="main-contain">
+
+    <el-dialog
+      title="提示"
+      :visible.sync="exportVisible"
+      width="40%"
+    >
+
+      <div>
+        您提交的排班信息已上传成功，系统正在执行导入，请稍候点击当前页面右上角“下载日志”查看导入结果
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="exportVisible = false">取 消</el-button>
+    <el-button type="primary" @click="exportVisible = false">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
     <el-dialog
       title="提示"
       :visible.sync="exportLogVisible"
           class="filter-item"
           type="primary"
           size="small"
+          v-loading="generateLoading"
         >下载日志
         </el-button>
 
         downloadLoading: false,
         isExistRepeatVisible:false,
         exportLogVisible:false,
+        exportVisible:false,
         logs:[],
-
+        generateLoading:false,
 
         days:[],
         msgTipVisible: false,
         return '您导入的文档共' + log.total_num + '条患者数据' + '，' + '已成功导入' + log.success_num + '条，导入失败' + log.fail_num + '条,'
       },
       generateLog() {
+        this.generateLoading = true
         let params = {
           'log_type': 3
         }
         generateLog(params).then(
           response => {
             if (response.data.state === 1) {
+              this.generateLoading = false
+
               this.logs = response.data.data.logs
               this.exportLogVisible = true
             } else {
               this.$message.error(response.data.msg)
+              this.generateLoading = false
+
             }
           }
-        )
+        ).catch(error => {
+          this.generateLoading = false
+        })
 
       },
       getInitDate(){
             this.isExistRepeatVisible = true
             return
           } else {
+            this.exportVisible = true
             let params = {
               schedule: datas
             }
             day2.setTime(day2.getTime())
             var month = day2.getMonth() + 1 < 10 ? '0' + (day2.getMonth() + 1).toString() : (day2.getMonth() + 1).toString()
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
+
             exportScheduleTemplate(params).then(response => {
               if (response.data.state == 0) {
                 return false