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

config/dev.env.js

@@ -6,9 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   // BASE_API:'"http://localhost:9531"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/api/config.js

@@ -109,6 +109,16 @@ export function changeOrg(params) {
 
 
 
+export function generateLog(params) {
+  return request({
+    url: '/api/log/generate',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
 
 
 

src/api/patient.js

@@ -344,3 +344,22 @@ export function getAllData(id, page, limit) {
     params: params
   })
 }
+
+
+export function postExportPatients(params) {
+  return request({
+    url: '/api/patients/export',
+    method: 'Post',
+    data: params,
+  })
+}
+
+
+
+
+
+
+
+
+
+

src/api/schedule.js

@@ -86,3 +86,30 @@ export function getScheduleWeekDay(params) {
     params: params
   })
 }
+
+
+export function exportSchedule(params,date) {
+  return request({
+    url: '/api/schedule/export?date='+date,
+    method: 'Post',
+    data: params
+  })
+}
+
+
+export function initDate() {
+  return request({
+    url: '/api/excel_date/init',
+    method: 'Get',
+  })
+}
+
+
+export function exportScheduleTemplate(params) {
+  return request({
+    url: '/api/schedule_template/export',
+    method: 'Post',
+    data: params
+  })
+}
+

src/vendor/Export2Excel.js

@@ -1,6 +1,5 @@
 /* eslint-disable */
-require('script-loader!file-saver');
-require('script-loader!@/vendor/Blob');
+import { saveAs } from 'file-saver'
 import XLSX from 'xlsx'
 
 function generateArray(table) {
@@ -146,19 +145,35 @@ export function export_table_to_excel(id) {
 }
 
 export function export_json_to_excel({
+  multiHeader = [],
   header,
   data,
   filename,
-  autoWidth = true
+  merges = [],
+  autoWidth = true,
+  bookType = 'xlsx'
 } = {}) {
   /* original data */
   filename = filename || 'excel-list'
   data = [...data]
   data.unshift(header);
+
+  for (let i = multiHeader.length - 1; i > -1; i--) {
+    data.unshift(multiHeader[i])
+  }
+
   var ws_name = "SheetJS";
   var wb = new Workbook(),
     ws = sheet_from_array_of_arrays(data);
 
+  if (merges.length > 0) {
+    if (!ws['!merges']) ws['!merges'] = [];
+    merges.forEach(item => {
+      console.log(XLSX.utils.decode_range(item))
+      ws['!merges'].push(XLSX.utils.decode_range(item))
+    })
+  }
+
   if (autoWidth) {
     /*设置worksheet每列的最大宽度*/
     const colWidth = data.map(row => row.map(val => {
@@ -196,11 +211,11 @@ export function export_json_to_excel({
   wb.Sheets[ws_name] = ws;
 
   var wbout = XLSX.write(wb, {
-    bookType: 'xlsx',
+    bookType: bookType,
     bookSST: false,
     type: 'binary'
   });
   saveAs(new Blob([s2ab(wbout)], {
     type: "application/octet-stream"
-  }), filename + ".xlsx");
+  }), `${filename}.${bookType}`);
 }

src/xt_pages/components/UploadExcel/index.vue

@@ -0,0 +1,143 @@
+<template>
+  <div>
+    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">点击导入
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+        console.log("11111111")
+        this.excelData.header = header
+        this.excelData.results = results
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        document.getElementById('excel-upload-input').click()
+      },
+      handleClick(e) {
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        if (!rawFile) return
+        this.upload(rawFile)
+      },
+      upload(rawFile) {
+        this.$refs['excel-upload-input'].value = null // fix can't select the same excel
+
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+            const data = e.target.result
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+            const header = this.get_header_row(worksheet)
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+      },
+      isExcel(file) {
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-upload-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/data/printTemplate.vue

@@ -227,9 +227,7 @@ export default {
               // 同步
               // console.log(response.data.data.fileds)
               this.loading = false;
-              // store
-              //   .dispatch("updateAllFiledConfigList", response.data.data.fileds)
-              //   .then(() => {});
+               store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/user/components/PatientForm.vue

@@ -1382,6 +1382,7 @@ export default {
         return false;
       }
 
+      this.form.user_sys_before_count =  this.form.user_sys_before_count.toString()
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.formSubmit = false;

src/xt_pages/workforce/components/scheduleTemplateUploadExcel/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div>
+    <el-dialog
+      :visible.sync="msgTipVisible"
+      width="40%"
+    >
+      <span>如果导入成功,会将当前已有的排版模版会被全部清除,是否继续导入排版模版数据</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="msgTipVisible = false">取 消</el-button>
+    <el-button type="primary" @click="handleUpload()">确 定</el-button>
+  </span>
+    </el-dialog>
+    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    name: "scheduleTemplateUploadExcel",
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        msgTipVisible:false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+
+        console.log(header)
+        console.log(results)
+
+        this.excelData.header = header
+        this.excelData.results = results
+
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        this.msgTipVisible = false
+        console.log("1111111")
+        document.getElementById('excel-upload-input').click()
+      },
+      handleClick(e) {
+        console.log("1111")
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        console.log(rawFile)
+
+        if (!rawFile) return
+        this.upload(rawFile)
+      },
+      upload(rawFile) {
+        this.$refs['excel-upload-input'].value = null // fix can't select the same excel
+        console.log("12121212")
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+        console.log("2222222")
+
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+            const data = e.target.result
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+            const header = this.get_header_row(worksheet)
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+      },
+      isExcel(file) {
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-upload-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/workforce/components/scheduleUploadExcel/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div>
+    <el-dialog
+      :visible.sync="msgTipVisible"
+      width="40%"
+    >
+      <span>如果导入成功,会将当前已有的排版会被全部清除,是否继续导入排版数据</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="msgTipVisible = false">取 消</el-button>
+    <el-button type="primary" @click="handleUpload()">确 定</el-button>
+  </span>
+    </el-dialog>
+    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    name: "scheduleUploadExcel",
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        msgTipVisible:false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+
+        console.log(header)
+        console.log(results)
+
+        this.excelData.header = header
+        this.excelData.results = results
+
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        this.msgTipVisible = false
+        console.log("1111111")
+        document.getElementById('excel-upload-input').click()
+      },
+      handleClick(e) {
+        console.log("1111")
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        console.log(rawFile)
+
+        if (!rawFile) return
+        this.upload(rawFile)
+      },
+      upload(rawFile) {
+        this.$refs['excel-upload-input'].value = null // fix can't select the same excel
+        console.log("12121212")
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+        console.log("2222222")
+
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+            const data = e.target.result
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+            const header = this.get_header_row(worksheet)
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+      },
+      isExcel(file) {
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-upload-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/workforce/components/template_table.vue

@@ -11,7 +11,7 @@
                 </div>
             </el-col>
         </el-row>
-      
+
       <div id="table_data" >
         <el-table :height="tableContainHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table"   :data="opera_device_numbers" :span-method="spanMethod" row-class-name="table-row-new-class schedule-table-row" @cell-click="itemClick">
             <el-table-column label="分区" width="80" align="center" fixed style="width: 100px; background-color: red; display: block;">
@@ -61,7 +61,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column label="周三" width="215" align="center">
                 <el-table-column prop="3_1" label="上" width="70" align="center">
                     <template slot-scope="scope">
@@ -79,7 +79,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column label="周四" width="215" align="center">
                 <el-table-column prop="4_1" label="上" width="70" align="center">
                     <template slot-scope="scope">
@@ -97,7 +97,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column label="周五" width="215" align="center">
                 <el-table-column prop="5_1" label="上" width="70" align="center">
                     <template slot-scope="scope">
@@ -115,7 +115,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column label="周六" width="215" align="center">
                 <el-table-column prop="6_1" label="上" width="70" align="center">
                     <template slot-scope="scope">
@@ -151,7 +151,7 @@
                     </template>
                 </el-table-column>
             </el-table-column>
-            
+
             <el-table-column prop="total" label="总数" width="60" align="center" fixed="right">
                 <template slot-scope="scope">
                     {{ scope.row.total }}
@@ -159,7 +159,7 @@
             </el-table-column>
         </el-table>
       </div>
-      
+
         <schedule-selector-dialog ref="selector_dialog" :patients="patients" @did_selected="will_add_schedule_action" @did_cancel="cancel_schedule_action"></schedule-selector-dialog>
     </div>
 </template>
@@ -355,6 +355,8 @@ export default {
 
         maked_device_numbers.push(device)
       }
+
+      console.log(maked_device_numbers)
       return maked_device_numbers
     },
     spanMethod({ row, column, rowIndex, columnIndex }) {