Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/stock.js

   })
 }
 
-export function EditWarehouse(params, warehousing_time, id) {
+export function EditWarehouse(params, warehousing_time, id,type) {
   return request({
-    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id,
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type,
     method: 'post',
     data: params
   })
   })
 }
 
-export function editSalesReturnInfo(params, return_time, id) {
+export function editSalesReturnInfo(params, return_time, id,type) {
   return request({
-    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id,
+    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type,
     method: 'post',
     data: params
   })
   })
 }
 
-export function editWarehouseoutInfo(params, warehouse_out_time, id) {
+export function editWarehouseoutInfo(params, warehouse_out_time, id,type) {
   return request({
-    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id,
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type,
     method: 'post',
     data: params
   })
   })
 }
 
-export function editCancelStockInfo(params, cancel_stock_time, id) {
+export function editCancelStockInfo(params, cancel_stock_time, id,type) {
   return request({
-    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id,
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type,
     method: 'post',
     data: params
   })

src/icons/svg/dashboard.svg

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1509611822979" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10379" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M219.428571 658.285714q0-30.285714-21.428571-51.714285T146.285714 585.142857t-51.714285 21.428572T73.142857 658.285714t21.428572 51.714286T146.285714 731.428571t51.714286-21.428571T219.428571 658.285714z m109.714286-256q0-30.285714-21.428571-51.714285T256 329.142857t-51.714286 21.428572T182.857143 402.285714t21.428571 51.714286T256 475.428571t51.714286-21.428571T329.142857 402.285714z m244.571429 274.857143l57.714285-218.285714q3.428571-14.857143-4.285714-27.714286T605.142857 414.285714t-27.428571 3.714286-17.142857 22.571429l-57.714286 218.285714q-34.285714 2.857143-61.142857 24.857143t-36 56.285714q-11.428571 44 11.428571 83.428571t66.857143 50.857143 83.428571-11.428571 50.857143-66.857143q9.142857-34.285714-3.428571-66.857143t-41.142857-52z m377.142857-18.857143q0-30.285714-21.428572-51.714285T877.714286 585.142857t-51.714286 21.428572-21.428571 51.714285 21.428571 51.714286 51.714286 21.428571 51.714285-21.428571 21.428572-51.714286z m-365.714286-365.714285q0-30.285714-21.428571-51.714286T512 219.428571t-51.714286 21.428572T438.857143 292.571429t21.428571 51.714285T512 365.714286t51.714286-21.428572T585.142857 292.571429z m256 109.714285q0-30.285714-21.428571-51.714285T768 329.142857t-51.714286 21.428572T694.857143 402.285714t21.428571 51.714286T768 475.428571t51.714286-21.428571T841.142857 402.285714z m182.857143 256q0 149.142857-80.571429 276-10.857143 16.571429-30.857142 16.571429H111.428571q-20 0-30.857142-16.571429Q0 808 0 658.285714q0-104 40.571429-198.857143t109.142857-163.428571 163.428571-109.142857 198.857143-40.571429 198.857143 40.571429 163.428571 109.142857 109.142857 163.428571 40.571429 198.857143z" p-id="10380"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559126278025" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4738" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M553.86203002 156.61769104a59.43740844 59.43740844 0 0 0-79.86785887 0L151.037323 463.27838135a29.79286192 29.79286192 0 0 0 39.89685059 44.25361632l5.13542175-4.87586974V822.72082519a59.58572388 59.58572388 0 0 0 59.58572388 59.6598816h173.39927672v-179.3875122a41.95472718 41.95472718 0 0 1 41.97326661-42.01034547h81.59202576a41.95472718 41.95472718 0 0 1 41.97326659 42.01034547v179.3875122h177.51502992a59.58572388 59.58572388 0 0 0 59.6042633-59.6598816V506.56794739c13.2371521 11.97647094 32.01759338 11.06803894 43.03001403-1.20506286a29.79286192 29.79286192 0 0 0-2.15057372-42.08450318L553.86203002 156.63623047z" fill="#333333" p-id="4739"></path></svg>

src/icons/svg/sign.svg

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1558939526756" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9518" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M 879.646 245.609 v 599.999 h -728.57 V 245.609 h 728.57 m 0 -85.714 h -728.57 c -47.338 0 -85.716 38.377 -85.716 85.715 v 599.999 c 0 47.338 38.378 85.715 85.716 85.715 h 728.57 c 47.338 0 85.715 -38.377 85.715 -85.715 v -600 c -0.001 -47.338 -38.378 -85.714 -85.715 -85.714 Z" p-id="9519"></path><path d="M 482.506 755.331 h -0.021 c -16.541 0 -32.059 -6.495 -43.695 -18.276 L 306.62 603.377 c -16.637 -16.835 -16.479 -43.967 0.348 -60.613 c 16.822 -16.625 43.954 -16.479 60.609 0.343 l 114.93 116.248 l 220.668 -223.211 c 16.646 -16.813 43.778 -16.972 60.614 -0.348 c 16.826 16.646 16.98 43.778 0.347 60.614 L 526.2 737.076 c -11.644 11.778 -27.161 18.255 -43.694 18.255 Z M 707.145 318.818 c -23.669 0 -42.86 -19.187 -42.86 -42.855 V 104.532 c 0 -23.665 19.191 -42.855 42.86 -42.855 c 23.664 0 42.855 19.19 42.855 42.855 v 171.431 c 0 23.669 -19.191 42.855 -42.855 42.855 Z M 318.211 318.818 c -23.67 0 -42.855 -19.187 -42.855 -42.855 V 104.532 c 0 -23.665 19.186 -42.855 42.855 -42.855 c 23.668 0 42.855 19.19 42.855 42.855 v 171.431 c 0 23.669 -19.187 42.855 -42.855 42.855 Z" p-id="9520"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1509611822979" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10379" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M219.428571 658.285714q0-30.285714-21.428571-51.714285T146.285714 585.142857t-51.714285 21.428572T73.142857 658.285714t21.428572 51.714286T146.285714 731.428571t51.714286-21.428571T219.428571 658.285714z m109.714286-256q0-30.285714-21.428571-51.714285T256 329.142857t-51.714286 21.428572T182.857143 402.285714t21.428571 51.714286T256 475.428571t51.714286-21.428571T329.142857 402.285714z m244.571429 274.857143l57.714285-218.285714q3.428571-14.857143-4.285714-27.714286T605.142857 414.285714t-27.428571 3.714286-17.142857 22.571429l-57.714286 218.285714q-34.285714 2.857143-61.142857 24.857143t-36 56.285714q-11.428571 44 11.428571 83.428571t66.857143 50.857143 83.428571-11.428571 50.857143-66.857143q9.142857-34.285714-3.428571-66.857143t-41.142857-52z m377.142857-18.857143q0-30.285714-21.428572-51.714285T877.714286 585.142857t-51.714286 21.428572-21.428571 51.714285 21.428571 51.714286 51.714286 21.428571 51.714285-21.428571 21.428572-51.714286z m-365.714286-365.714285q0-30.285714-21.428571-51.714286T512 219.428571t-51.714286 21.428572T438.857143 292.571429t21.428571 51.714285T512 365.714286t51.714286-21.428572T585.142857 292.571429z m256 109.714285q0-30.285714-21.428571-51.714285T768 329.142857t-51.714286 21.428572T694.857143 402.285714t21.428571 51.714286T768 475.428571t51.714286-21.428571T841.142857 402.285714z m182.857143 256q0 149.142857-80.571429 276-10.857143 16.571429-30.857142 16.571429H111.428571q-20 0-30.857142-16.571429Q0 808 0 658.285714q0-104 40.571429-198.857143t109.142857-163.428571 163.428571-109.142857 198.857143-40.571429 198.857143 40.571429 163.428571 109.142857 109.142857 163.428571 40.571429 198.857143z" p-id="10380"></path></svg>

src/xt_pages/data/components/tableson.vue

 <template>
   <div class="">
     <div class="filter-container">
-      <el-button style="float: right;margin-right: 20px" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button style="float: right" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
 
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row

src/xt_pages/sign/index.vue

                       <span class="button"><el-button  @click="change()">修改</el-button></span>
                     </div>
                     <div class="border"></div>
-
-                    <el-row :gutter="20">
-                        <el-col :span="8">
-                            <el-form-item label="透前称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.weight_before" :disabled="disa" ></el-input>
-                            </el-form-item>
-                        </el-col> 
-                        <el-col :span="8">
-                            <el-form-item label="干体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.dry_weight" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="20">
-                        <el-col :span="4">
-                            <el-form-item label="体温(℃):" label-width="80px">
-                               <el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="脉搏(次/分):" label-width="90px">
-                                <el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="9">
-                            <el-form-item label="血压(mmHg):" label-width="100px">
-                                <el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                                <span> / </span>
-                                <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <div class="border"></div>                  
-                    <el-row :gutter="20">
-                        <el-col :span="8">
-                            <el-form-item label="透后称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_infor.weight_after"  :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="干体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.dry_weight" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
+                    <div style="margin-bottom:20px;color:rgb(96,96,96)">
+                    透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
+                    </div>
+                    <div style="margin-bottom:12px;color:rgb(96,96,96)">
+                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     脉搏(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
+                    </div>
+                    <div class="border"></div>  
+                    <div style="margin-bottom:20px;color:rgb(96,96,96)">
+                     透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    </div> 
+                    <div style="margin-bottom:12px;color:rgb(96,96,96)">
+                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      脉搏(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
+                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
+                    </div>               
+                    <!-- <el-row :gutter="20">
                     </el-row>
                     <el-row :gutter="20">
-                        <el-col :span="4">
-                            <el-form-item label="体温(℃):" label-width="80px">
-                                <el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
                         <el-col :span="5">
                             <el-form-item label="脉搏(次/分):" label-width="90px">
                                 <el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="9">
-                            <el-form-item label="血压(mmHg):" label-width="100px">
-                                <el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                                <span> / </span>
-                                <el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
+                    </el-row> -->
                     
                     <div class="border"></div>
                     <div v-if="show">
         diastolic_blood_pressure: ''
       },
       shiftOptions: [
-        { value: 0, label: '班次' },
+        { value: 0, label: '全部' },
         { value: 1, label: '上午' },
         { value: 2, label: '下午' },
         { value: 3, label: '晚上' }
         this.patients = []
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
+          console.log("排班数据是什么呢?")
+          console.log(this.patients)
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today
            
                     var sl = this.schedules.length
                     for(let j = 0; j < sl; j++){
                          if(this.schedules[j].type === this.patients[index].schedule.schedule_type){
-                              if(this.weigh_form.id > 0){
-                                  this.schedules[j].sign++
+                              // if(this.weigh_form.id>= 0){
+                              //     this.schedules[j].sign++
+                              // }
+                              if((signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0)||(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)){
+                                    this.schedules[j].sign++
                               }
                               if(signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0){
+                                   
                                    this.schedules[j].before++
                               }
                               if(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0){

src/xt_pages/stock/Dialog/goodInfoDailog.vue

       </el-row>
 
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="生产厂家" prop="dealer">
-            <el-select  v-model="form.manufacturer" placeholder="请选择">
-              <el-option
-                v-for="item in form.manufacturers"
-                :key="item.id"
-                :label="item.manufacturer_name"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="经销商" prop="manufacturer">
-            <el-select  v-model="form.dealer" placeholder="请选择">
-              <el-option
-                v-for="item in form.dealers"
-                :key="item.id"
-                :label="item.dealer_name"
-                :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
 
         <el-col :span="8">
           <el-form-item label="进货价" prop="buy_price">
             <el-input  type="number" v-model="form.buy_price"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row>
         <el-col :span="8">
           <el-form-item label="出货价" prop="sell_price">
             <el-input  type="number" v-model="form.sell_price"></el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="8">
           <el-form-item label="有效期预警天数" prop="expiry_date_warn_day_count">
             <el-input type="number" v-model="form.expiry_date_warn_day_count"></el-input>
           </el-form-item>
         </el-col>
 
+
+      </el-row>
+
+
+      <el-row>
+
         <el-col :span="8">
           <el-form-item label="库存预警数量" prop="stock_warn_count">
             <el-input  type="number" v-model="form.stock_warn_count"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
 
-      <el-row>
-       <el-col :span="16">
+
+        <el-col :span="16">
         <el-form-item label="是否可复用" prop="is_reuse">
             <el-radio v-model="form.is_reuse" label="1">可以</el-radio>
             <el-radio v-model="form.is_reuse" label="2">不可以</el-radio>

src/xt_pages/stock/cancelStockOrderEdit.vue

             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            editCancelStockInfo(params, this.return_time, this.$route.query.id).then(response => {
+            editCancelStockInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/detail/cancelStockDetail.vue

           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center" width="200">
             <template slot-scope="scope">
               {{scope.row.order_number}}
             </template>

src/xt_pages/stock/detail/salesReturnDetail.vue

   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
 
 
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
-              {{scope.row.order_number}}
+              {{scope.row.SalesReturn.order_number}}
             </template>
           </el-table-column>
 

src/xt_pages/stock/detail/stockInDetail.vue

   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
 
         >
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
               {{scope.row.warehousing_order}}
             </template>

src/xt_pages/stock/detail/stockOutDetail.vue

   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
 
 
 
-          <el-table-column label="单据编号" align="center">
+          <el-table-column label="单据编号" align="center"  width="200">
             <template slot-scope="scope">
               {{scope.row.warehouse_out_order_number}}
             </template>

src/xt_pages/stock/salesReturnEdit.vue

             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id).then(response => {
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/stockInOrderEdit.vue

             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id).then(response => {
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/stockOutOrderEdit.vue

             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id).then(response => {
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id,this.$route.query.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/user/courseOfDisease.vue

     <div class="position">
        <bread-crumb></bread-crumb>
     </div> -->
-    <div class="patient-container ">
+    <div class="patient-container">
         <patient-sidebar :id="patient_id" defaultActive="1-2"></patient-sidebar>
         <!-- <div class="app-container"> -->
-            <div class="container" v-loading="loading">
-                <div>
+            <div  v-loading="loading">
+              <div class="patient-app-container advice-container app-container">
+
+              <div>
                     <span style="margin-left: 10px;float:right;">
                         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="show_dialog = true">新增</el-button>
                         <el-button  size="small" v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
                     </span>
-                    <span class="filter_title">日期查询</span>
-                    <el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>
-
+                    <!--<span class="filter_title">日期查询</span>-->
+                    <!--<el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>-->
                 </div>
+              <!--<div></div>-->
+              <div class="cell clearfix">
+                <label class="title"><span class="name">日期查询</span> : </label>
+                <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                                type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+                <span class="">-</span>
+                <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                                type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+              </div>
                 <div class="record">
                     <el-row :gutter="15">
                         <el-col :span="10">
             </div>
         </el-dialog>
     </div>
-<!-- </div> -->
+    </div>
+
+  <!-- </div> -->
 </template>
 
 <script>
 
             patient_id: 0,
             date: [],
+            start_time: '',
+            end_time: '',
 
             records: [],
             doctors: [],
         var now = new Date()
         this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
-        this.requestCourseRecords()
+
+
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+
+
+      this.requestCourseRecords()
+
+
+
     },
     methods: {
         requestCourseRecords: function() {
-            var startTime = new Date(this.date[0])
-            var endTime = new Date(this.date[1])
             this.loading = true
-            getCourseOfDiseaseRecords(this.patient_id, parseTime(startTime, "{y}-{m}-{d}"), parseTime(endTime, "{y}-{m}-{d}")).then(rs => {
+            getCourseOfDiseaseRecords(this.patient_id, this.start_time,this.end_time).then(rs => {
                 this.loading = false
                 var resp = rs.data
                 if (resp.state == 1) {
                 this.loading = false
                 this.$message.error(err)
             })
-        },
+        },startTimeChange(val) {
+        this.requestCourseRecords()
+      }, endTimeChange(val) {
+        this.requestCourseRecords()
+      }
     },
 }
 </script>