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

src/xt_pages/medicalScheduling/class.vue

@@ -87,7 +87,7 @@
                     v-model="form.timeone_start"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
@@ -107,7 +107,7 @@
                     v-model="form.timeone_end"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
@@ -123,7 +123,7 @@
                     v-model="form.timetwo_start"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
@@ -142,7 +142,7 @@
                     v-model="form.timetwo_end"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
@@ -193,7 +193,7 @@
                     v-model="form.timeone_start"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
@@ -213,7 +213,7 @@
                     v-model="form.timeone_end"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
@@ -229,7 +229,7 @@
                     v-model="form.timetwo_start"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">
@@ -248,7 +248,7 @@
                     v-model="form.timetwo_end"
                     :picker-options="{
                     start: '01:00',
-                    step: '00:15',
+                    step: '00:05',
                     end: '24:00'
                     }"
                     placeholder="选择时间">

src/xt_pages/stock/stockOutOrder.vue

@@ -207,8 +207,8 @@
         </div>
 
         <div class="filter-container" style="margin-top: 10px">
-        <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
-        <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
+         <!-- <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
+         <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button> -->
         </div>
 
 
@@ -259,8 +259,8 @@
                 <span>出库数量</span>
               </template>
               <template slot-scope="scope">
-                <!-- <span>{{scope.row.count}}</span> -->
-                <span>{{getOutStockCount(scope.row.good_id)}}</span>
+               <span v-if="scope.row.is_sys == 0">{{scope.row.count}}</span>
+               <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span>
               </template>
             </el-table-column>
             <el-table-column label="总价" min-width="20" align="center">
@@ -714,7 +714,7 @@ export default {
     
     //新增
     handleSearch(id,row){ 
-      console.log("row2233r5",row)
+      
       this.warehousingOutInfo.info = []
       this.warehousingOutInfo.warehousingOutData = []
       this.GetOrderDetailOne(id)

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -77,8 +77,8 @@
               <span>出库数量</span>
             </template>
             <template slot-scope="scope">
-              <!-- <span>{{scope.row.count}}</span> -->
-                <span>{{getOutStockCount(scope.row.good_id)}}</span>
+                <span v-if="scope.row.is_sys == 0">{{scope.row.count}}</span>
+                <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="总价" min-width="20" align="center">

src/xt_pages/workforce/appointment.vue

@@ -68,7 +68,7 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
         <div style="display:flex;align-items:center">
-          <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' :before-upload="beforeUpload"></schedule-upload-excel>
+          <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' ></schedule-upload-excel>
           <!-- <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
             导出模版
           </el-button> -->
@@ -209,6 +209,7 @@
         clen:7,
         nowYear: new Date().getFullYear(),
         schedule_week:0,
+
       }
     },
     components: {
@@ -218,6 +219,7 @@
       UploadExcel
     },
     methods: {
+
       generateTxt: function(log) {
         var content = ''
         var errlog = log.err_logs
@@ -524,6 +526,8 @@
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
 
           var data = []
+          console.log("33333",this.tableList)
+
          this.tableList.map(item=>{
            data.push(Object.values(item))
 
@@ -576,7 +580,8 @@
         return isShow
       },
        handleSuccess({ results, header }) {
-
+        console.log("results333333333333333333",results)
+        console.log("hearder2222222222222",header)
         let headers = []
         for (let key in results[0]) {
           headers.push(key)
@@ -801,14 +806,14 @@
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
 
-           console.log("sssssss")
+
 
             this.dialogVisible = true
             return
           }
         } else {
 
-          console.log("ssssssszzzzzzz")
+
 
           this.dialogVisible = true
           return
@@ -854,26 +859,21 @@
           }
         }
 
-         console.log(zones)
+
         for (let i = 0; i < zones.length; i++) {
-          console.log(zones[i])
-          console.log("err"+total_zones.includes(zones[i]))
+
 
           if (!total_zones.includes(zones[i])) {
             is_system_zone = false
           }
         }
 
-        console.log("totalzones",total_zones)
-        console.log("number:")
-        console.log("total",total_device_number)
-        console.log("23121212:")
-        console.log("devicenumber",deviceNumber)
+
 
 
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
-            console.log("number:11111")
+
             is_device_number = false
           }
         }
@@ -903,7 +903,7 @@
               let obj = {}
 
               obj['name'] = results[i + 1][key].replace(/\s/g, '')
-              console.log("88888888",obj['name'])
+
               if (tempObj[key] == '上午') {
                 obj['schedule_type'] = 1
               } else if (tempObj[key] == '下午') {
@@ -919,8 +919,6 @@
               obj['row'] = this.getRow(key)
 
               tempObjTwo = obj
-
-              console.log("objtwo000000000000000000000",tempObjTwo)
             }
 
 
@@ -2316,15 +2314,15 @@
                     }
 
                   //周日上午
-                   if( nextWeek[j].schedule_week ==6&& nextWeek[j].schedule_type == 1){
+                   if( nextWeek[j].schedule_week ==7 && nextWeek[j].schedule_type == 1){
                         list[i].上午13 = nextWeek[j].name
                     }
                    //周日下午
-                    if( nextWeek[j].schedule_week ==6 && nextWeek[j].schedule_type == 2){
+                    if( nextWeek[j].schedule_week ==7 && nextWeek[j].schedule_type == 2){
                         list[i].下午13 = nextWeek[j].name
                     }
                    //周日晚上
-                   if( nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3){
+                   if( nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3){
                         list[i].晚上13  = nextWeek[j].name
                     }
                   }
@@ -2333,7 +2331,7 @@
               }
              }
 
-             console.log("lastWeek",lastWeek)
+             console.log("nextWeek",nextWeek)
 
              if(lastWeek.length > 0 ){
                for(let i=0;i<list.length;i++){

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

@@ -51,9 +51,6 @@
     methods: {
       generateDate({ header, results }) {
 
-        console.log(header)
-        console.log(results)
-
         this.excelData.header = header
         this.excelData.results = results
 
@@ -99,7 +96,7 @@
       },
       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
@@ -110,26 +107,26 @@
         }
       },
       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
-            console.log(data)
+            console.log("data",data)
 
             const fixedData = this.fixdata(data)
-            console.log(fixedData)
+            console.log("fixedData",fixedData)
 
             const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
-            console.log(workbook)
+            console.log("workBook",workbook)
 
             const firstSheetName = workbook.SheetNames[0]
-            console.log(firstSheetName)
+            console.log("firstSheetName",firstSheetName)
 
             const worksheet = workbook.Sheets[firstSheetName]
-            console.log(worksheet)
+            console.log("worksheet",worksheet)
 
 
 
@@ -151,6 +148,7 @@
         return o
       },
       get_header_row(sheet) {
+      
         if(sheet['!ref'] == undefined){
           this.loading = false
           return

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

@@ -38,8 +38,7 @@
     methods: {
       generateDate({ header, results }) {
 
-        console.log(header)
-        console.log(results)
+      
 
         this.excelData.header = header
         this.excelData.results = results
@@ -72,21 +71,21 @@
       },
       handleUpload() {
         this.msgTipVisible = false
-        console.log("1111111")
+       
         document.getElementById('excel-upload-input').click()
       },
       handleClick(e) {
-        console.log("1111")
+        console.log("333",e.target.files)
         const files = e.target.files
         const rawFile = files[0] // only use files[0]
-        console.log(rawFile)
-
-        if (!rawFile) return
+        console.log("rawFile333333333",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
@@ -97,18 +96,21 @@
         }
       },
       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
@@ -145,6 +147,7 @@
         return headers
       },
       isExcel(file) {
+        console.log("file",file)
         return /\.(xlsx|xls|csv)$/.test(file.name)
       }
     }

src/xt_pages/workforce/template.vue

@@ -357,7 +357,7 @@
         })
       },
       handleSuccess({ results, header }) {
-
+       
         let headers = []
         for (let key in results[0]) {
           headers.push(key)