Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/summary.vue

             <div v-if="scope.row.order_status == 3">已退费</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" width="" prop="name" label="操作">
+        <el-table-column align="center" width="" prop="name" label="操作"  fixed="right">
           <template slot-scope="scope">
             <el-button class="butt_1" size="mini" type="primary" @click="toDetail(scope.row)"
             >详情
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              '周期': '2024年第二季度',
+              '周期': '2024年第四季度',
               '类别': '门诊',
               '医保目录编码': list[i].code,
               '医保目录名称': list[i].name,

src/xt_pages/outpatientTool/components/settle.vue

                   <div v-if="scope.row.med_type == '11'">普通门诊</div>
                   <div v-if="scope.row.med_type == '1112'">普通门诊</div>
                   <div v-if="scope.row.med_type == '140104'">城乡门诊特殊病(140104)</div>
+                <div v-if="scope.row.med_type == '140201'">门诊特病(140201)</div>
                   <div v-if="scope.row.med_type == '992102'">单病种(992102)</div>
               </template>
           </el-table-column>
           <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
           <div v-if="scope.row.med_type == '11'">普通门诊</div>
           <div v-if="scope.row.med_type == '1112'">普通门诊</div>
-
+          <div v-if="scope.row.med_type == '140104'">门诊特殊病(140104)</div>
+          <div v-if="scope.row.med_type == '140201'">门诊特病(140201)</div>
+          <div v-if="scope.row.med_type == '992102'">单病种(992102)</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">
             return
           }
           const values = data.map(item => Number(item[column.property]))
-          if (column.property === 'total' || column.property === 'medfee_sumamt'  || column.property === 'fund_pay_sumamt'  || 
-              column.property === 'acct_pay'  || column.property === 'maf_pay'  || column.property === 'psn_cash_pay'  || 
-              column.property === 'hifp_pay'  || column.property === 'hifob_pay' ||  column.property === 'hifes_pay' || 
-              column.property === 'hifmi_pay' || column.property === 'oth_pay' || column.property === 'cvlserv_pay' || 
-              column.property === 'wechat_pay' || column.property === 'ali_pay' || column.property === 'band_card_pay' || 
+          if (column.property === 'total' || column.property === 'medfee_sumamt'  || column.property === 'fund_pay_sumamt'  ||
+              column.property === 'acct_pay'  || column.property === 'maf_pay'  || column.property === 'psn_cash_pay'  ||
+              column.property === 'hifp_pay'  || column.property === 'hifob_pay' ||  column.property === 'hifes_pay' ||
+              column.property === 'hifmi_pay' || column.property === 'oth_pay' || column.property === 'cvlserv_pay' ||
+              column.property === 'wechat_pay' || column.property === 'ali_pay' || column.property === 'band_card_pay' ||
               column.property === 'jifen_pay' || column.property === 'cash_pay' || column.property ==='card_desc'
           ) {
             sums[index] = values.reduce((prev, curr) => {

src/xt_pages/stock/detail/cancelStockDetail.vue

         @click="getAllQuery"
         >查询</el-button
       >
+    
+     
+
+    </div>
 
+    <div style="margin-bottom: 10px;">
+
+        <label class="title"><span class="name">耗材名称</span> : </label>
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="good_name"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="true"
+          placeholder="请输入耗材名称"
+          @select="handleSelect"
+          style="width:300px;"
+          :popper-append-to-body="true"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+        </template>
+        </el-autocomplete>
 
     </div>
 
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,postSearchGoodList } from "@/api/stock";
 
 export default {
   name: "cancelStockDetail",
       storehouse_id:0,
       manufacturerList:[],
       dealerList:[],
-      patientsList:[]
+      patientsList:[],
+      good_name:"",
+      good_id:0,
         
     };
   },
   methods: {
+    handleSelect(val){
+     this.good_name = val.good_name
+     this.good_id = val.id
+     this.GetCancelStock();
+    },
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+      postSearchGoodList(key,this.storehouse_id).then(response => {
+          if (response.data.state == 1) {
+
+             var list = response.data.data.list
+
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
+
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+     },
     PrintAction: function() {
       window.sessionStorage.setItem('start_time_one',this.start_time)
       window.sessionStorage.setItem('end_time_one',this.end_time)
         dealer: this.dealer_id,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        good_id:this.good_id,
       };
       const loading = this.$loading({
           lock: true,

src/xt_pages/stock/detail/stockInDetail.vue

 
     <div class="cell clearfix">
       <label class="title"><span class="name">仓库</span> :</label>
-      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:100px" @change="changeHouseList">
           <el-option
             v-for="(option, index) in houseList"
             :key="index"
             :value="option.id">
           </el-option>
       </el-select>
+
       <el-input
         size="small"
         style="width: 180px;"
         @click="search"
         >搜索</el-button
       >
+    
+    
+      
+
+
 
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
         >
     </div>
 
+    <div style="margin-bottom: 10px;">
+      <label class="title"><span class="name">耗材名称</span> : </label>
+      <el-autocomplete
+        class="checkSearch"
+        popper-class="my-autocomplete"
+        v-model="good_name"
+        :fetch-suggestions="querySearchAsync"
+        :trigger-on-focus="true"
+        placeholder="请输入耗材名称"
+        @select="handleSelect"
+        style="width:300px;"
+        :popper-append-to-body="true"
+      >
+        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+      <template slot-scope="{ item }">
+        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+      </template>
+    </el-autocomplete>
+    </div>
+
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
       <div style="width: 100%;">
         <el-table
   GetAllConfig,
   getStockDetail,
   getPrintStockGood,
-  getGoodDetailPrintList
+  getGoodDetailPrintList,
+  postSearchGoodList
 } from "@/api/stock";
 
 export default {
         { value: 2, label: "其他入库单" }
       ],
       newDate: [{ name: "合计", num: "111111" }],
-
+      good_name:"",
       searchKey: "",
       type: 1,
       page: 1,
       storehouse_id:0,
       manufacturerList:[],
       dealerList:[],
+      currentIndex:0,
+      good_id:0,
     };
   },
   methods: {
+    handleSelect(val){
+     this.good_name = val.good_name
+     this.good_id = val.id
+     this.GetCancelStock();
+     this.getGoodDetailPrintList()
+    },
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        postSearchGoodList(key,this.storehouse_id).then(response => {
+          if (response.data.state == 1) {
+
+             var list = response.data.data.list
+
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
+
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+     },
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
         dealer: this.dealer_id,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        good_id:this.good_id,
       };
       this.cancelStockDate = [];
       const loading = this.$loading({
           end_time:this.end_time,
           type:1,
           storehouse_id:this.storehouse_id,
+          good_id:this.good_id,
         }
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){

src/xt_pages/stock/detail/stockOutDetail.vue

 
     </div>
 
-    <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
+    <div style="margin-bottom: 10px;">
+      <label class="title"><span class="name">耗材名称</span> : </label>
+      <el-autocomplete
+        class="checkSearch"
+        popper-class="my-autocomplete"
+        v-model="good_name"
+        :fetch-suggestions="querySearchAsync"
+        :trigger-on-focus="true"
+        placeholder="请输入耗材名称"
+        @select="handleSelect"
+        style="width:300px;"
+        :popper-append-to-body="true"
+      >
+        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+      <template slot-scope="{ item }">
+        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+      </template>
+    </el-autocomplete>
+
+    <label class="title"><span class="name">出库方式</span> : </label>
+    <el-select size="small" v-model="order_way" filterable placeholder="请选择仓库" style="width:200px" @change="changeOrderWayList">
+          <el-option
+            v-for="(option, index) in orderWay"
+            :key="index"
+            :label="option.label"
+            :value="option.value">
+          </el-option>
+      </el-select>
+    </div>
+
+   
       <el-table class="table"
         :data="cancelStockDate"
         :class="signAndWeighBoxPatients"
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList,getGoodDetailPrintList } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList,getGoodDetailPrintList,postSearchGoodList } from "@/api/stock";
 
 export default {
   name: "stockOutDetail",
         { value: 1, label: "耗材入库单" },
         { value: 2, label: "其他入库单" }
       ],
+      orderWay:[
+        {value:0,label:"全部"},
+        {value:1,label:"手动出库"},
+        {value:2,label:"自动出库"},
+      ],
       manufacturer_id: "",
       dealer_id: "",
       order_type:"",
-
+      order_way:"",
       searchKey: "",
       type: 2,
       page: 1,
       manufacturerList:[],
       dealerList:[],
       patientsList:[],
+      good_id:0,
+      good_name:"",
     };
   },
   methods: {
+    changeOrderWayList(){
+      this.GetCancelStock();
+      this.getGoodDetailPrintList()
+    },
+    handleSelect(val){
+     this.good_name = val.good_name
+     this.good_id = val.id
+     this.GetCancelStock();
+     this.getGoodDetailPrintList()
+    },
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        postSearchGoodList(key,this.storehouse_id).then(response => {
+          if (response.data.state == 1) {
+
+             var list = response.data.data.list
+
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
+
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+     },
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
         dealer: this.dealer_id,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        good_id:this.good_id,
+        order_way:this.order_way
       };
       this.cancelStockDate = [];
       const loading = this.$loading({
           start_time:this.start_time,
           end_time:this.end_time,
           type:2,
+          good_id:this.good_id,
         }
       this.tableOut = []
       getGoodDetailPrintList(params).then(response=>{

src/xt_pages/stock/query/purchaseNewStockQuery.vue

                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                }else if(this.org_id == 0 || this.org_id == 10644){
                  list[i].stock_in_price = "/"
-                list[i].stockMoney = this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)
+                 console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
+                 console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
+                 console.log("val3",this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) )
+                 console.log("val4",this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
+
+                list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
+                if(list[i].stockMoney>0){
+                  list[i].stockMoney = list[i].stockMoney.toFixed(2)
+                }
+                
                 
                }else{
                 list[i].stock_in_price = "/"
                 list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
               }else if(this.org_id == 0 || this.org_id ==10644){
                 list[i].overPrice = "/"
-                console.log("stockMoney-00000000000000",list[i].stockMoney)
-                console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
-                console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
+                // console.log("stockMoney-00000000000000",list[i].stockMoney)
+                // console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
+                // console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
                 list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
                 // console.log("hahahha",list[i].overMoney)
               }else{
        if(total_price>0){
         return total_price.toFixed(2)
        }else{
-        return ""
+        return total_price
        }
       
     },
        if(total_price>0){
         return total_price.toFixed(2)
        }else{
-        return ""
+        return total_price
        }
        
     },
       return count
     },
     getAllStockInFlowPrice(val){
+     
       var total_price = 0
       if(val!=null && val.length>0){
         for(let i=0;i<val.length;i++){
-          total_price+= val[i].count * val[i].total_price
+          total_price+= val[i].count * val[i].price
         }
       }
       if(total_price>0){
         return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
      
     },
       if(total_price>0){
          return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
      
     },

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

                       list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].stock_in_price = "/"
-                      list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
+                      list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
+                      if(list[i].stockMoney>0){
+                        list[i].stockMoney = list[i].stockMoney.toFixed(2)
+                      }
                     } else{
                       list[i].stock_in_price = "/"
                       list[i].stockMoney = "/"
        if(total_price>0){
         return total_price.toFixed(2)
        }else{
-        return ""
+        return total_price
        }
       
     },
       var total_price = 0
       if(val!=null && val.length>0){
         for(let i=0;i<val.length;i++){
-          total_price+= val[i].count * val[i].total_price
+          total_price+= val[i].count * val[i].price
         }
       }
       if(total_price>0){
         return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
       
     },
        if(total_price>0){
         return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
      
     },
       if(total_price>0){
         return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
     
     },

src/xt_pages/stock/stockInOrderAdd.vue

         this.currentIndex = val
       },
       handleSelect(val){
-        console.log("al32323232323223",val)
+        // console.log("al32323232323223",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].id = 0