11月14日 库存扣减更新

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

     </div>
     <div class="app-container">
       <div class="filter-container">
-       <!-- <el-autocomplete
-            style="margin:16px 5px"
-            popper-class="my-autocomplete"
-            v-model.trim="listQuery.keyword"
-            :fetch-suggestions="querySearchAsync"
-            :trigger-on-focus="false"
-            placeholder="病人名字"
-            @select="handleSelect"
-    >
-        <i class="el-icon-search el-input__icon" slot="suffix"> </i>
-        <template slot-scope="{ item }">
-            <div class="name">{{ item.name }}</div>
-        </template>
-     </el-autocomplete> -->
       <el-autocomplete
           class="checkSearch"
           popper-class="my-autocomplete"
             <div class="name">{{ item.name }}</div>
           </template>
        </el-autocomplete>
-       
+       <el-button type="primary" @click="toSeach">搜索</el-button>
       </div>
       <div class="cell clearfix">
         <label class="title">
       deliveryWay:[],
       delivery_way:0,
       patient_id:0,
+      org_id:0,
     };
   },
   created() {
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
+  
   },
   methods: {
     getTemplateInfo() {
         return searchArray
       },
      handleSelect(val) {
-       console.log("val23323232322323",val.id)
        this.patient_id = val.id
        this.requestSchedualDoctors(this.time)
       },
+     toSeach(){
+       this.patient_id = 0
+       this.requestSchedualDoctors(this.time)
+     }
   },
   components: {
     BreadCrumb

src/xt_pages/stock/cancelStockOrderAdd.vue

 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getCancelStockConfig, postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
+import { postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
 

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

           }
         }
         return name;
-      }, handleEdit: function(index, row) {
+      }, 
+      handleEdit: function(index, row) {
         this.canCelShow = false
         const tempObj = {}
         tempObj['id'] = 0
             return
          }
          this.getDrugBatchNumber(val.id)
+         console.log("val2323232323223",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id  = val.id
              this.recordInfo.recordData[i].drug_type = val.drug_type
              this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
              this.recordInfo.recordData[i].last_price = val.last_price
-             this.recordInfo.recordData[i].price = val.price
+             this.recordInfo.recordData[i].price = val.last_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number =  val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit

src/xt_pages/stock/drugs/drugDamaged.vue

               </el-table-column>
               <el-table-column prop="address" label="损耗数量" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.last_stock_max_number>0">{{scope.row.last_stock_max_number}}{{scope.row.warehousing_unit}}</span>
-                   <span v-if="scope.row.last_stock_min_number>0">{{scope.row.last_stock_min_number}}{{scope.row.min_unit}}</span>
+                  <span v-if="scope.row.count>0">{{scope.row.count}}{{scope.row.min_unit}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="address" label="药损比" align="center">

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

               }
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
               if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
               }
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-          
+            console.log("param23322323233222323",params)
           
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
               }
               
-             
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
              
               response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{h}-{d}")
               response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{h}-{d}")
-              
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
              for(let j=0;j<this.recordInfo.recordData.length;j++){

src/xt_pages/stock/drugs/inventory.vue

                         batch_number:item.batch_number,
                         expiry_date:item.expiry_date,
                         type:0,
+                        
                       }
                     }
                   })

src/xt_pages/stock/drugs/inventoryDetails.vue

     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <!-- 耗材类别：
-                <el-select v-model="value" size="small" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-                停用状态：
-                <el-select v-model="value" size="small" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select> -->
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"

src/xt_pages/stock/inventory.vue

                     {{scope.row.manufacturer_name}}
                   </template> 
               </el-table-column>
-              <el-table-column prop="name" label="盘点前数量" width="100"  align="center">
+              <el-table-column prop="name" label="盘点前数量" width="120"  align="center">
                 <template slot-scope="scope">
                     <span><el-input style="width:80px" v-model="scope.row.stock_count" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
                   </template> 
               </el-table-column>
 
-             <el-table-column prop="name" label="盘点后数量" width="100"  align="center">
+             <el-table-column prop="name" label="盘点后数量" width="120"  align="center">
                 <template slot-scope="scope">
                   <el-input style="width:80px" v-model="scope.row.last_stock_count"></el-input>
                  </template> 
           this.page = val
           this.getlist()
         },
-   getlist(){
-    var params = {
-          keyword:this.searchKey,
-          start_time:this.start_time,
-          end_time:this.end_time,
-          inventory_status:this.inventory_status, 
-          page:this.page,
-          limit:this.limit,
-         }
-        console.log("我爱你中国parasm",params)
-       getInventoryList(params).then(response=>{
-          if(response.data.state ==1 ){
-           var list =  response.data.data.list
-           console.log("列表23232323232",list)
-           this.tableList = list
-           var total = response.data.data.total
-           this.total = total
-           this.doctorList =  response.data.data.doctorlist
+    getlist(){
+      var params = {
+            keyword:this.searchKey,
+            start_time:this.start_time,
+            end_time:this.end_time,
+            inventory_status:this.inventory_status, 
+            page:this.page,
+            limit:this.limit,
           }
-       })
-     },
+          console.log("我爱你中国parasm",params)
+        getInventoryList(params).then(response=>{
+            if(response.data.state ==1 ){
+            var list =  response.data.data.list
+            console.log("列表23232323232",list)
+            this.tableList = list
+            var total = response.data.data.total
+            this.total = total
+            this.doctorList =  response.data.data.doctorlist
+            }
+        })
+      },
      getChecker(id){
        var name = ""
        for(let i=0;i<this.doctorList.length;i++){
           
             for(let i=0;i<this.WarehouseList.length;i++){
               for(let j=0;j<newList.length;j++){
-                if(this.WarehouseList[i].drug_id == newList[j].drug_id){
+                if(this.WarehouseList[i].good_id == newList[j].good_id){
                     newList[j].child.push(this.WarehouseList[i])
                 }
               }
             }
           console.log("newList2333232323232",newList)
+          
           this.tableData = newList
           this.showSearch = false
           this.showTable = true

src/xt_pages/stock/inventoryDetails.vue

            }
           this.$router.push({path:'/stock/inventoryDetailPrint?ids='+this.ids})
         },
-        handleSizeChange(){},
-        handleCurrentChange(){},
+        handleSizeChange(val){
+          this.limit = val
+          this.getlist()
+        },
+        handleCurrentChange(val){
+          this.page = val
+          this.getlist()
+        },
         getlist(){
          var params = {
             keyword:this.searchKey,

src/xt_pages/stock/stockDamaged.vue

         type="primary"
         icon="el-icon-search"
         @click="search">搜索</el-button>
+
+         <el-date-picker
+          size="small"
+          v-model="start_time"
+          type="date"
+          style="margin-left:5px;width:140px;"
+          placeholder="选择日期"
+          @change="changeStartTime">
+          </el-date-picker>
+          <el-date-picker
+          size="small"
+          v-model="end_time"
+          type="date"
+          style="margin-left:5px;width:140px;"
+          placeholder="选择日期"
+          @change="changeEndTime">
+      </el-date-picker>
     </div>
   
-    <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
+    <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
         <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <el-table-column  prop="date" label="报损日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.ctime)}}
+            </template>
+        </el-table-column>
         <el-table-column prop="date" label="耗材名称"  align="center">
           <template  slot-scope="scope">
             {{scope.row.good_name}}
             </el-col>
             <el-col :span="8">
               <el-form-item label="原因:">
-                  <el-select v-model="form.type" placeholder="请选择">
+                  <el-select v-model="form.type" placeholder="请选择" @change="changeReason">
                       <el-option
                         v-for="item in reasonList"
                         :key="item.id"
           }
         }
         return count
+      },
+      changeReason(){
+
       },
       toDamagedDetail(good_id){
           var params = {
             warehousing_order:this.form.warehousing_order,
             type:this.form.type,
           }
+          console.log("para2233232",params)
          getDamageDetailByGoodId(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
               console.log("list233232",list)
-              this.modifyDialogVisible = true
-              this.good_name = list[0].good_name
-              this.price = list[0].buy_price
-              this.good_id = list[0].good_id
-              this.goodList = []
-              this.goodList = list
-              this.damageList = []
-              this.damageList = response.data.data.damageList
+              if (list.length>0){
+                this.modifyDialogVisible = true
+                this.good_name = list[0].good_name
+                this.price = list[0].buy_price
+                this.good_id = list[0].good_id
+                this.goodList = []
+                this.goodList = list
+                this.damageList = []
+                this.damageList = response.data.data.damageList
+              }else{
+                this.damageList = []
+                this.goodList = []
+              }
+            
             }
          })
       },

src/xt_pages/user/doctorAdvice.vue

           </template>
         </el-table-column>
 
+     、
+        
         <el-table-column
-          label="开始时间"
+          label="开嘱时间"
           width="180"
-          property="start_time"
+          property="created_time"
           align="center"
         >
           <template slot-scope="scope">
-            <span>{{
-              scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}")
-            }}</span>
+            <span v-if="org_id == 10215">{{ scope.row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
+            <span v-else>{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
           </template>
         </el-table-column>
-
         <el-table-column
           label="医嘱内容"
           property="advice_name"
       current_drug_name:"",
       current_drug_spec: "",
       drug_id: 0,
-      src_type:""
+      src_type:"",
+      org_id:0,
     };
   },
   methods: {
       this.$router.push("/patients/patients");
     }
     this.listQuery.id = this.patientID;
-
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
     // var nowDate = new Date()
     // var nowYear = nowDate.getFullYear()
     // var nowMonth = nowDate.getMonth() + 1

src/xt_pages/workforce/template.vue

         for (let key in results[0]) {
           headers.push(key)
         }
+        console.log("hhh2332323232",this.template_mode.mode)
+        console.log("result233232233223232323",results)
         if (this.template_mode.mode == 1) {
           if(results.length > 0) {