修改库存管理

src/xt_pages/sign/index.vue

@@ -14,13 +14,13 @@
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
                     </el-select>
                 </div>
-                <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">  
+                <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">
                     <el-table-column type="index" label="序号" width="50px" align="center"></el-table-column>
                     <el-table-column prop="name" label="姓名" min-width="20" align="center">
                        <template slot-scope="scope">
                             {{scope.row.name}}({{scope.row.dialysis_no}})
-                        </template> 
-                    </el-table-column> 
+                        </template>
+                    </el-table-column>
 
                     <el-table-column prop="state" label="状态" min-width="30" align="center">
                         <template slot-scope="scope">
@@ -30,7 +30,7 @@
                         </template>
                     </el-table-column>
                 </el-table>
-            
+
                 <el-table  :data="schedules" :class="signAndWeighBoxPatients" style="width: 100%; margin:15px 0 0 0;" border highlight-current-row :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
                     <el-table-column prop="shift" label="班次" min-width="30" align="center"></el-table-column>
                     <el-table-column prop="arrange" label="排班" min-width="30" align="center" ></el-table-column>
@@ -49,7 +49,7 @@
                   <div class="inforTitle">
                   <el-button  @click="change()" style="float:right;">修改</el-button>
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
-                   </div>   
+                   </div>
                     <div class="border"></div>
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -61,18 +61,18 @@
                      呼吸(次/分):&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 class="border"></div>
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                      透后称重(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>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
                       体温(℃):&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>               
-                   
+                    </div>
+
                     <div class="border"></div>
                     <div v-if="show">
                     <el-row :gutter="20">
@@ -85,7 +85,7 @@
                 </el-form>
             </el-col>
         </el-row>
-    </div>   
+    </div>
    </div>
 </template>
 
@@ -197,9 +197,15 @@ export default {
           this.patients = response.data.data.patients
           console.log("排班数据是什么呢?")
           console.log(this.patients)
+          for (let i = this.patients.length - 1; ; i--) {
+            if(this.patients[i].schedule.id == 0){
+              this.patients.splice(i, 1)
+            }
+          }
+
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today
-           
+
           if (this.queryParams.need_schedule_type === 1) {
             var sl = this.schedules.length
             for (let index = 0; index < sl; index++) {
@@ -250,7 +256,7 @@ export default {
       this.fetchSignPatients()
     },
     handleCurrentChange(row, old) {
-      
+
       //     this.weigh_form = {
       //     id:0,
       //     choose:false,
@@ -423,7 +429,7 @@ export default {
           if(this.weigh_infor.weight_after == 0){
               this.weigh_infor.weight_after = ""
           }
-         
+
           this.weigh_infor.temperature = patientinfor.temperature
           if(this.weigh_infor.temperature == 0){
                this.weigh_infor.temperature = ""
@@ -509,7 +515,7 @@ export default {
       params.breathing_rate = this.weigh_list.breathing_rate
       params.systolic_blood_pressure = this.weigh_list.systolic_blood_pressure
       params.diastolic_blood_pressure = this.weigh_list.diastolic_blood_pressure
-      
+
       //透后数据
       params.weight_after = this.weigh_infor.weight_after
       params.temperatureafter = this.weigh_infor.temperature
@@ -543,14 +549,14 @@ export default {
                                     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){
                                   this.schedules[j].after++
                               }
                          }
-                    }  
+                    }
               }
               break
            }

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -19,6 +19,7 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           style="width: 100%">
           <el-table-column
+            align="center"
             prop="type_name"
             label="商品类型">
           </el-table-column>
@@ -38,15 +39,18 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
           <el-table-column
+            align="center"
             type="selection"
             width="55">
           </el-table-column>
           <el-table-column
+            align="center"
             label="规格名称"
             property="specification_name"
             style="word-break: keep-all;white-space:nowrap;"
           ></el-table-column>
           <el-table-column
+            align="center"
             label="单位"
             property="good_unit"
           >

src/xt_pages/stock/stockInOrderAdd.vue

@@ -59,7 +59,7 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <el-form-item style="padding-top: 15px">
+                    <el-form-item style="padding-top: 15px;margin-left: 10px;margin-right: 10px">
                       <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
                                 :value="typeName(scope.row.good_type_id)"
                                 @focus="showDialog(scope.$index, scope.row)"></el-input>

src/xt_pages/stock/stockQuery.vue

@@ -28,7 +28,7 @@
         </el-table-column>
         <el-table-column label="入库退货" align="center">
           <template slot-scope="scope">
-            <span @click="showSaleReturnDetailDialog(scope.row)" style="color: red">{{salesReturnCount(scope.row)}}</span>
+            <span @click="showSaleReturnDetailDialog(scope.row)" style="color: #F56C6C">{{salesReturnCount(scope.row)}}</span>
 
           </template>
         </el-table-column>
@@ -45,7 +45,7 @@
         </el-table-column>
         <el-table-column label="出库退库" align="center">
           <template slot-scope="scope">
-            <span @click="showCancelStockDetailDialog(scope.row)"  style="color: red">{{cancelStockCount(scope.row)}}</span>
+            <span @click="showCancelStockDetailDialog(scope.row)"  style="color: #F56C6C">{{cancelStockCount(scope.row)}}</span>
 
           </template>
         </el-table-column>

src/xt_pages/user/components/PatientForm.vue

@@ -1,15 +1,22 @@
 <template>
   <div class="main-contain">
-    <div class="position">
-      <bread-crumb v-if="!isEdit" :crumbs='crumbs'></bread-crumb>
-
-      <div class="" style="float:right;">
+    <div v-if="!isEdit" class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div class="" style="float:right;color: white">
         <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
         <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
         <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
         <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
       </div>
     </div>
+
+    <div v-if="isEdit" class="" style="float:right;margin-right: 35px;margin-top: 10px">
+      <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+      <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
+      <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
+      <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
+    </div>
+
     <div class="app-container " v-loading="pageLoad">
       <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
         <div class="dataTitle">一般资料</div>
@@ -83,17 +90,16 @@
                   <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;" >
                 <el-form-item label="患者来源 : " class="is-required" prop="source" >
                   <el-radio-group v-model="form.source">
                     <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;">
                 <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
                   <el-radio-group v-model="form.lapseto">
-                    <!-- <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio> -->
                     <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
                   </el-radio-group>
                 </el-form-item>