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

src/api/schedule.js

     method:"get",
     params:params
   })
+}
+
+export function copyPatientSchedule(params){
+  return request({
+    url:"/api/schedule/copypatientschedules",
+    method:"Get",
+    params:params
+  })
 }

src/xt_pages/data/components/consumables.vue

               this.goodInfo.goodInfoDialog.formValue.good_unit =
                 response.data.data.goodInfo.good_unit
             }
-
+           
             if (response.data.data.goodInfo.manufacturer <= 0) {
               this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
             } else {
-              this.goodInfo.goodInfoDialog.formValue.manufacturer =
-                response.data.data.goodInfo.manufacturer
+              this.goodInfo.goodInfoDialog.formValue.manufacturer = response.data.data.goodInfo.manufacturer
+             
             }
 
             if (response.data.data.goodInfo.dealer <= 0) {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

             <td style="line-height:20px;" width="40">钠<br />浓<br />度<br /><span style="font-size:10px; !important">mmol/L</span></td>
             <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
             
-            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">ml</span></td>
+            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">℃</span></td>
             <td style="line-height:20px;" width="">病情变化及处理</td>
             <td style="line-height:20px;" width="60">签名</td>
           </tr>

src/xt_pages/medicalScheduling/index.vue

                 start_time:this.getTimestamp(this.weekDayArr[0]),
                 end_time:this.getTimestamp(this.weekDayArr[6])
             }
+           
             copyStaffSchedule(params).then(response=>{
                 if(response.data.state == 1){
                 var msg =  response.data.data.msg

src/xt_pages/stock/Dialog/goodInfoDailog.vue

               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
-              <!-- <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
+              <!-- <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择" filterable>
                 <el-option
-                  v-for="item,index in form.manufacturers"
+                  v-for="(item,index) in form.manufacturers"
                   :key="index"
                   :label="item.manufacturer_name"
                   :value="item.id">
                 </el-option>
               </el-select> -->
 
-               <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
+               <el-select v-model="form.manufacturer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
-                    v-for="item in manufacturerList"
-                    :key="item.id"
+                    v-for="(item,index) in form.manufacturers"
+                    :key="index"
                     :label="item.manufacturer_name"
                     :value="item.id">
                   </el-option>
         })
       },
       getValue: function() {
+        console.log("生产吃",this.form.manufacturer)
         const form = {}
         form['specification_name'] = this.form.specification_name
         form['good_unit'] = this.form.good_unit

src/xt_pages/stock/Dialog/stockInDialog.vue

             type="selection"
             width="55">
           </el-table-column>
+           <el-table-column
+            align="center"
+            label="耗材名称"
+            property="good_name"
+            style="word-break: keep-all;white-space:nowrap;"
+          ></el-table-column>
           <el-table-column
             align="center"
             label="规格名称"
         }
       },
        goodTypeTableChange: function(currentRow, oldCurrentRow) {
-        
+        console.log("currentRow2233333",currentRow)
         let keyName = ""
         var arr = []
         for(let i= 0;i<this.propForm.goods.length;i++){
         }
         this.currentGoodTypeId = parseInt(keyName)
         this.goodInfoTableData = arr[keyName]
+        
         for(let i=0;i<arr.length;i++){
           for(var key in arr[i]){
               this.goodInfo = arr[i][keyName]
               this.goodInfoTableData = arr[i][keyName]
           }
-         }
+        }
+        console.log("22222222哈哈哈哈哈哈哈哈哈",this.goodInfoTableData)
        },
       cancle: function(formName) {
         this.goodInfo = []
       changeGoodInfoTableData: function(val) {
       },
       changeAllGoodInfoTableData: function(selection) {
-        console.log("888878888888",this.propForm.goods)
+        console.log("888878888888",selection)
         var arr = []
         var id = 0
          for(let i=0;i<this.propForm.goods.length;i++){

src/xt_pages/stock/stockInOrderAdd.vue

                   style="width: 100%"
                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
-
+      
           <el-table-column align="center" width="200">
-
+            
             <template slot="header" slot-scope="scope">
               <span>耗材类型<span style="color: red">*</span></span>
             </template>
-
+     
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px;margin-left: 10px;margin-right: 10px">
                 <el-input placeholder="请输入耗材类型" v-model="scope.row.good_type_id"
             </template>
           </el-table-column>
           <el-table-column align="center" width="200">
+             <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
+            </template>
+            <template slot-scope="scope">
+               <el-input v-model="scope.row.good_name" :disabled="true"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            
             <template slot="header" slot-scope="scope">
               <span>规格名称<span style="color: red">*</span></span>
             </template>
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
               this.recordInfo.recordData[this.currentIndex].good_unit = val.selectedGoodInfo[i].good_unit
+              this.recordInfo.recordData[this.currentIndex].good_name = val.selectedGoodInfo[i].good_name
             } else {
               const tempForm = {}
               tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
               tempForm['good_unit'] = val.selectedGoodInfo[i].good_unit
+              tempForm['good_name'] = val.selectedGoodInfo[i].good_name
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
             for (let i = 0; i < response.data.data.info.length; i++) {
               this.recordInfo.recordData.push(response.data.data.info[i])
             }
+            console.log("333333333",this.recordInfo.recordData)
           }
         })
       }, getTime(val, temp) {

src/xt_pages/workforce/appointment.vue

           </el-button>
 
           <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>
-          <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
-          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板</el-button>
+          <el-button type="primary" size="small" @click="copySchedule">复制排班</el-button>
         </div>
     </div>
     <div class="app-container">
 
       <table-data :week-time="activeName" :partitions-prop="partitions" :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" @event1="changePartition" @event2="changeSchedule"></table-data>
+
+
+       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
+            <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
+                <el-form-item label="复制到 : " required  prop="copyWeek">
+                    <el-select v-model="form.copyWeek" placeholder="请选择">
+                        <el-option
+                        v-for="item in typeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="newVisible=false">取 消</el-button>
+                <el-button type="primary" @click="submitAction('form')">保 存</el-button>
+            </div>
+      </el-dialog>            
     </div>
   </div>
 </template>
   import moment from 'moment'
   import { parseTime } from '@/utils'
   import tableData from './components/tableData'
-  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList } from '@/api/schedule'
+  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList,copyPatientSchedule } from '@/api/schedule'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
   import ScheduleUploadExcel from './components/scheduleUploadExcel/index'
         partition_id:0,
         start_time:"",
         end_time:"",
-        export_type:0
+        export_type:0,
+        form:{
+          copyWeek:"",
+        },
+        newVisible:false,
+        typeOptions:[],
+        timeOptions:[],
+        copyWeek:'',
+        weekList: [],
+        currentFirstDate1: '',
+        rules: {
+           copyWeek: [{ required: true, message: "请选择复制时间段", trigger: "blur" }],
+         },
+        weekNum:'',
+        weekDayArr:[],
+        todayDate:'',
+        clen:7,
+        nowYear: new Date().getFullYear(),
+        schedule_week:0,
       }
     },
     components: {
               return cur
             }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
-            console.log("长度11111111111",tempObjArr[i][key].length)
-            console.log("长度22222222222",arr.length)
+           
             if (tempObjArr[i][key].length > arr.length) {    //比对原数组和去重后的原数组总数，不同的话则存在重复元素
               is_exist_repeat = true
             }
 
 
         if (headers.length > 65 || !is_system_zone || !is_device_number) {
-          console.log("ssssssszzzzzzzqqqqqqqq")
+         
 
           this.dialogVisible = true
           return
 
               console.log("end",end)
               var scheduleList = response.data.data.list
-              console.log("排班列表22222",scheduleList)
+             
               var week= []
               var nextWeek = []
               var lastWeek = []
       getTime(val) {
         return uParseTime(val, '{y}-{m}-{d}')
       },
+      
+      copySchedule(){
+        this.newVisible = true
+      },
 
+       getYearWeek(year,month,date){
+        /*
+            dateNow是当前日期
+            dateFirst是当年第一天
+            dataNumber是当前日期是今年第多少天
+            用dataNumber + 当前年的第一天的周差距的和在除以7就是本年第几周
+        */
+        let dateNow = new Date(year, parseInt(month) - 1, date);
+        let dateFirst = new Date(year, 0, 1);
+        let dataNumber = Math.round((dateNow.valueOf() - dateFirst.valueOf()) / 86400000);
+        return Math.ceil((dataNumber + ((dateFirst.getDay() + 1) - 1)) / 7);
+        },
+        getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
+      },
 
+        formatDate(date){
+            var year = date.getFullYear()+'.'
+            var month = (date.getMonth()+1)+'.';
+            var day = date.getDate();
+            return year+month+day
+        },
+        formatDateTwo(date){
+            var year = date.getFullYear()+'.'
+            var month = (date.getMonth()+1)+'.';
+            var day = date.getDate();
+            return year+month+day
+        },
+        addDate(date,n){
+            date.setDate(date.getDate()+n);
+            return date;
+        },
+            //
+        setDate(date){
+            var week = date.getDay()-1;
+            date = this.addDate(date,week*-1);
+            this.currentFirstDate = new Date(date);
+            this.currentDate = new Date(date)
+            for(var i = 0;i<this.clen; i++){
+                this.weekDayArr.push(this.formatDate(i==0 ? date : this.addDate(date,1)))
+            }
+        },
+       setDate1 (date) {
+            var week = date.getDay() - 1
+            date = this.addDate(date, week * -1)
+            this.currentDate = new Date(date)
+            let arr1 = []
+            for (var i = 0; i < this.clen; i++) {
+                arr1.push(this.formatDate(i == 0 ? date : this.addDate(date, 1)))
+            }
+            this.weekList.push(arr1)
+            let num = this.weekNum
+            this.currentFirstDate1 = num + 1
+        },
+        getTimestamp(time) { //把时间日期转成时间戳
+          return (new Date(time)).getTime() / 1000
+        },
+        submitAction(formName){
+            var label = ""
+            for(let i=0;i<this.timeOptions.length;i++){
+               if(this.form.copyWeek == this.timeOptions[i].value){
+                 label = this.timeOptions[i].label
+               }
+            }
+           var start = label.split('~')
+           var copy_startime = this.getTimestamp(start[0])
+           var copy_endtime = this.getTimestamp(start[1])
+
+            const params = {
+              start_time:this.getTimestamp(this.weekDayArr[0]),
+              end_time:this.getTimestamp(this.weekDayArr[6]),
+              copy_startime:copy_startime,
+              copy_endtime:copy_endtime,
+            }
+           console.log("parasm",params)
+        
+           this.$refs[formName].validate(valid=>{
+              if(valid){
+                copyPatientSchedule(params).then(response=>{
+                   if(response.data.state == 1){
+                     var msg = response.data.data.msg
+                     this.$message.success("复制成功")
+                     this.newVisible = false
+                   }else{
+                    this.$message.error("复制失败")
+                  }
+                })
+              }
+           })
+        },
     },
     created() {
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
 
       //获取三周排班数据
       this.getThreeWeekList()
+
+
+     let year = new Date().getFullYear()
+     let month = new Date().getMonth() + 1
+     let date = new Date().getDate()
+     this.weekNum = this.getYearWeek(year,month,date)
+     this.todayDate=this.formatDate(new Date())
+     this.setDate(new Date())
+
+     for (var i = 0; i <= 9; i++) {
+       this.setDate1(this.addDate(this.currentDate, 7))
+     }
+     let newNum = 0
+     for(let i = 0; i < this.weekList.length; i++){
+         if(this.weekNum + i + 1 <= 53){
+             let num = this.weekNum + i + 1
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
+             this.typeOptions.push({value:i,label:str})
+            let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
+            this.timeOptions.push({value:i,label:stt})
+        }else{
+
+            newNum++
+            let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + newNum + ')'
+            this.typeOptions.push({value:i,label:str})
+            let stt = this.weekList[i][0] +"~"+this.weekList[i][6]
+            this.timeOptions.push({value:i,label:stt})
+          }
+
+        }
+       
     }
   }
 </script>

src/xt_pages/workforce/components/tableData.vue

           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
           
-          console.log("中国4444444444444",this.scheduleZone)
+        
         
           var that = this;
           this.scheduleZone.forEach(function(zone, index) {