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

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -24,20 +24,6 @@
     </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"
@@ -52,7 +38,7 @@
             <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">
@@ -433,6 +419,7 @@ export default {
       deliveryWay:[],
       delivery_way:0,
       patient_id:0,
+      org_id:0,
     };
   },
   created() {
@@ -454,6 +441,7 @@ export default {
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
+  
   },
   methods: {
     getTemplateInfo() {
@@ -1017,10 +1005,13 @@ export default {
         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/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2658,7 +2658,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 ){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2933,7 +2933,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 ){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -283,7 +283,7 @@
 
 <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

@@ -427,7 +427,8 @@
           }
         }
         return name;
-      }, handleEdit: function(index, row) {
+      }, 
+      handleEdit: function(index, row) {
         this.canCelShow = false
         const tempObj = {}
         tempObj['id'] = 0
@@ -676,6 +677,7 @@
             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
@@ -683,7 +685,7 @@
              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

@@ -130,8 +130,7 @@
               </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

@@ -557,6 +557,7 @@
               }
             }
             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
               }
@@ -585,7 +586,7 @@
             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) {
@@ -645,7 +646,6 @@
                 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()
@@ -657,7 +657,6 @@
              
               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

@@ -317,6 +317,7 @@ export default {
                         batch_number:item.batch_number,
                         expiry_date:item.expiry_date,
                         type:0,
+                        
                       }
                     }
                   })

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -2,24 +2,6 @@
     <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/drugs/query.vue

@@ -77,9 +77,9 @@
           >搜索
           </el-button>
       </div>
-      
+
        <el-table :data="tableList" border style="width: 100%">
-      
+
         <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
            <template slot-scope="scope">
              {{getDrugType(scope.row.drug_type)}}
@@ -107,15 +107,15 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span> 
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088">
-                <span> 
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+                <span>
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
-                </span> 
+                </span>
              </span>
              <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
            </template>
@@ -123,10 +123,10 @@
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088">
+               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
                </span>
-               
+
                <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
             </div>
            </template>
@@ -148,7 +148,7 @@
           </template>
         </el-table-column>
        </el-table>
-       
+
     <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -194,13 +194,13 @@ import { min } from 'moment'
       this.getlist()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
-      var drugTypeList = getDictionaryDataConfig('system','drug_type') 
+      var drugTypeList = getDictionaryDataConfig('system','drug_type')
       this.drugTypeList.push(...drugTypeList)
       this.org_id =  this.$store.getters.xt_user.org.id
       console.log("机构ID",this.org_id)
       this.getDrugCountList()
-     
-      
+
+
     },
     components: {
       SettingDialog,
@@ -213,7 +213,7 @@ import { min } from 'moment'
           { path: '/stock/drugs/stock/query', name: '药品库存查询' }
         ],
         keywords: '',
-       
+
         multipleSelection: [],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         start_time: '',
@@ -279,7 +279,7 @@ import { min } from 'moment'
                for(let z=0;z<list[i].drug_cancel_stock_info.length;z++){
                  if(list[i].drug_cancel_stock_info[z].max_unit == list[i].max_unit){
                    list[i].drug_cancel_stock_info[z].count = list[i].drug_cancel_stock_info[z].count * list[i].min_number
-                 } 
+                 }
                }
              }
              console.log("列表list232323323232323223",list)
@@ -287,7 +287,7 @@ import { min } from 'moment'
              var total = response.data.data.total
              this.total = total
              this.manufacturerList = response.data.data.manufacturerList
-           
+
            }
         })
       },
@@ -337,7 +337,7 @@ import { min } from 'moment'
           }
         }
       },
-    
+
       getSpecificationName: function(id) {
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
@@ -373,7 +373,7 @@ import { min } from 'moment'
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       },
-  
+
     startTimeChange: function(val) {
       window.sessionStorage.removeItem('start_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -381,7 +381,7 @@ import { min } from 'moment'
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-     
+
         this.getlist()
       }
     },
@@ -392,10 +392,10 @@ import { min } from 'moment'
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-       
+
         this.getlist()
       }
-     
+
     },
       stockInCount: function(row) {
         let total = 0
@@ -430,7 +430,7 @@ import { min } from 'moment'
       search: function() {
         this.getlist()
         this.getDrugCountList()
-      }, 
+      },
       setting: function() {
         this.$refs.dialog.show()
       },
@@ -446,13 +446,13 @@ import { min } from 'moment'
           this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
          }
-       
+
          console.log("hhhhhhhadhfadf 列表",this.tableList)
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
          const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
-       
-        
+
+
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
            header: tHeader,
@@ -483,7 +483,7 @@ import { min } from 'moment'
         });
       },
       getDrugType(id){
-       
+
         var name = ""
         for(let i=0;i<this.drugTypeList.length;i++){
            if(this.drugTypeList[i].id == id){
@@ -491,7 +491,7 @@ import { min } from 'moment'
              name = this.drugTypeList[i].name
            }
         }
-     
+
         return name
       },
       getManufacturerList(id){
@@ -630,10 +630,10 @@ import { min } from 'moment'
             min_str =  total%min_number + min_unit
           }
         }
-    
+
         return str + min_str
       },
-  
+
       getCountOne(drug_id){
         var count= 0
         for(let i=0;i<this.drugOutList.length;i++){
@@ -644,7 +644,7 @@ import { min } from 'moment'
         return count
       },
      getCountTwo(drug_id,min_number,max_unit,min_unit){
-      
+
        var total_count = 0
        var out_count = 0
        var count = 0
@@ -658,7 +658,7 @@ import { min } from 'moment'
        if(parseInt(count/min_number)!=0){
          str = parseInt(count/min_number) + max_unit
        }
-     
+
        if((count%min_number)!=0){
          str_min = count%min_number + min_unit
        }
@@ -683,11 +683,11 @@ import { min } from 'moment'
         if(total == 0){
            total = ""
         }
-       
+
         return total
       },
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
-       
+
          var max_str=  ""
          var min_str = ""
          var total = 0
@@ -711,7 +711,7 @@ import { min } from 'moment'
            if(total%min_number!=0){
               min_str = total%min_number + min_unit
            }
-         
+
          }
         return max_str + min_str
       },
@@ -724,7 +724,7 @@ import { min } from 'moment'
             total += parseInt(arr[i].count)
           }
         }
-      
+
         if (total < min_number){
            min_str = total + min_unit
          }
@@ -739,7 +739,7 @@ import { min } from 'moment'
            if(total%min_number!=0){
               min_str = total%min_number + min_unit
            }
-         
+
          }
         return max_str + min_str
 
@@ -793,7 +793,7 @@ import { min } from 'moment'
          return str + str_min
       },
       getOutFlush(info,max_unit,min_unit,min_number,cancel_info){
-        
+
         var str = ""
         var str_min = ""
         //总库存

src/xt_pages/stock/inventory.vue

@@ -62,13 +62,13 @@
                     {{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> 
@@ -272,27 +272,27 @@ export default {
           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++){
@@ -452,12 +452,13 @@ export default {
           
             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

@@ -117,8 +117,14 @@ export default {
            }
           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

@@ -14,10 +14,32 @@
         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}}
@@ -276,7 +298,7 @@
             </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"
@@ -730,6 +752,9 @@ export default {
           }
         }
         return count
+      },
+      changeReason(){
+
       },
       toDamagedDetail(good_id){
           var params = {
@@ -737,18 +762,25 @@ export default {
             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/stock/stockQuery.vue

@@ -108,19 +108,19 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
           </span>
-          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span> 
+          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
          </template>
        </el-table-column>
 
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
-          <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -171,7 +171,7 @@ export default {
 
     var start_time =  window.sessionStorage.getItem('start_time')
     var end_time =  window.sessionStorage.getItem('end_time')
-   
+
     if(start_time !=null){
       this.start_time = start_time
     }
@@ -221,7 +221,7 @@ export default {
     };
   },
   methods: {
-  
+
     GetAllGoodType: function() {
       GetAllGoodType().then(response => {
         if (response.data.state == 0) {
@@ -259,7 +259,7 @@ export default {
       this.limit = val;
       this.getlist()
       this.getStockDrugCount()
-      
+
     },
     handleCurrentChange(val) {
       this.page = val;
@@ -335,7 +335,7 @@ export default {
          const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
          const filterVal = ['type_name', 'good_name', 'unit','buy_price','prodect_name','inCount','outCount','overplus']
 
-       
+
          for(let i=0;i<this.tableList.length;i++){
            this.tableList[i].type_name = this.getGoodType(this.tableList[i].good_type_id)
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
@@ -347,7 +347,7 @@ export default {
           }else{
              this.tableList[i].overplus = 0
           }
-          
+
          }
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
@@ -429,7 +429,7 @@ export default {
        var specification_name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
           if(val.manufacturer == this.manufacturerList[i].id){
-            manufacturer_name = this.manufacturerList[i].manufacturer_name  
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit
@@ -443,7 +443,7 @@ export default {
        var specification_name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
           if(val.manufacturer == this.manufacturerList[i].id){
-            manufacturer_name = this.manufacturerList[i].manufacturer_name  
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit

src/xt_pages/user/doctorAdvice.vue

@@ -159,19 +159,19 @@
           </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"
@@ -2159,7 +2159,8 @@ export default {
       current_drug_name:"",
       current_drug_spec: "",
       drug_id: 0,
-      src_type:""
+      src_type:"",
+      org_id:0,
     };
   },
   methods: {
@@ -4644,7 +4645,7 @@ export default {
       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

@@ -370,6 +370,8 @@
         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) {