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

src/api/device/device.js

@@ -58,10 +58,11 @@ export function getZones() {
     })
 }
 
-export function createZone(name, zone_type) {
+export function createZone(name, zone_type,sort) {
     const params = {
         name: name,
         type: zone_type,
+        sort:sort,
     }
     return request({
         url: '/api/device/zone/create',
@@ -70,11 +71,12 @@ export function createZone(name, zone_type) {
     })
 }
 
-export function modifyZone(id, name, zone_type) {
+export function modifyZone(id, name, zone_type,sort) {
     const params = {
         id: id,
         name: name,
         type: zone_type,
+        sort:sort,
     }
     return request({
         url: '/api/device/zone/modify',

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -261,7 +261,7 @@
             </el-table-column>
             <el-table-column label="药品追溯码" width="162" align="center">
               <template slot-scope="scope">
-                 <el-input style="width: 100;" v-model="scope.row.DrugCode" @input="changeDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode)"></el-input>
+                 <el-input style="width: 100;" v-model="scope.row.DrugCode" @input="changeDrugCode(scope.row.ID,scope.row.data_sources,scope.row.DrugCode)"></el-input>
               </template>
             </el-table-column>
             <el-table-column

src/xt_pages/device/zone_main.vue

@@ -34,6 +34,12 @@
                 <span>{{ getZoneTypeLabel(scope.row.type) }}</span>
               </template>
             </el-table-column>
+
+            <el-table-column label="排序" align="center">
+              <template slot-scope="scope">
+                <span>{{scope.row.sort }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-tooltip
@@ -109,6 +115,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
+
+          <el-form-item
+            label="排序 : "
+            prop="name">
+            <el-input v-model="zone_form.sort" style="width: 220px"></el-input>
+          </el-form-item>
           <!-- <el-form-item>
                     <el-button @click="cancelModifyZone">取 消</el-button>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="editZoneSubmitAction">保 存</el-button>
@@ -152,7 +164,8 @@ export default {
       zone_form: {
         id: 0,
         name: "",
-        type: ""
+        type: "",
+        sort:""
       },
       showEditZone: false,
       formLabelWidth: "90px",
@@ -175,6 +188,7 @@ export default {
       this.loading = false;
       var resp = rs.data;
       if (resp.state === 1) {
+        console.log("zones+++++++++++++++",resp.data.zones)
         this.zones.push(...resp.data.zones);
       } else {
         this.$message.error(resp.msg);
@@ -199,12 +213,14 @@ export default {
       this.zone_form.id = row.id;
       this.zone_form.name = row.name;
       this.zone_form.type = row.type;
+      this.zone_form.sort = row.sort
       this.showEditZone = true;
     },
     cancelModifyZone() {
       this.zone_form.id = 0;
       this.zone_form.name = "";
       this.zone_form.type = "";
+      this.zone_form.sort = ""
       this.$refs.form_zone.clearValidate();
       this.showEditZone = false;
     },
@@ -212,7 +228,7 @@ export default {
       this.$refs.form_zone.validate(valid => {
         if (valid) {
           if (this.zone_form.id === 0) {
-            createZone(this.zone_form.name, this.zone_form.type).then(rs => {
+            createZone(this.zone_form.name, this.zone_form.type, parseInt(this.zone_form.sort)).then(rs => {
               var resp = rs.data;
               if (resp.state === 1) {
                 var newZone = resp.data.zone;
@@ -226,7 +242,8 @@ export default {
             modifyZone(
               this.zone_form.id,
               this.zone_form.name,
-              this.zone_form.type
+              this.zone_form.type,
+              parseInt(this.zone_form.sort)
             ).then(rs => {
               var resp = rs.data;
               if (resp.state === 1) {

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -451,7 +451,7 @@ export default {
            
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               list[i].drugInMoney = list[i].last_price
-              if(this.org_id == 0){
+              if(this.org_id == 0 || this.org_id == 10697){
                 list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
               }else{
                 list[i].drugSaleMoney = "/"
@@ -461,7 +461,7 @@ export default {
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               
-              if(this.org_id == 0){
+              if(this.org_id == 0 || this.org_id == 10697){
                  list[i].drugAddPrice = list[i].last_price
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
               }else{
@@ -473,7 +473,7 @@ export default {
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
            
-              if(this.org_id == 0){
+              if(this.org_id == 0 || this.org_id == 10697){
                 list[i].drugOutPrice = list[i].retail_price
                 list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
               }else{
@@ -490,7 +490,7 @@ export default {
             }
              
             list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
-            if(this.org_id == 0){
+            if(this.org_id == 0 || this.org_id == 10697){
                 list[i].overDrugPrice = list[i].retail_price
                 list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
             }else{

src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue

@@ -355,20 +355,43 @@ export default {
               
                list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
                
-                list[i].drugInMoney = "/"
-                list[i].drugSaleMoney = "/"
+                // list[i].drugInMoney = "/"
+                // list[i].drugSaleMoney = "/"
+
+                list[i].drugInMoney = list[i].last_price
+                if(this.org_id == 0 || this.org_id == 10697){
+                  list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
+                }else{
+                  list[i].drugSaleMoney = "/"
+                }
 
                 list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                 list[i].drugAddOne= this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                
+                // list[i].drugAddPrice = "/"
+                // list[i].drugAddSalePrice = "/"
+
+                if(this.org_id == 0 || this.org_id == 10697){
+                 list[i].drugAddPrice = list[i].last_price
+                 list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
+              }else{
                 list[i].drugAddPrice = "/"
                 list[i].drugAddSalePrice = "/"
+              }
 
                 list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
                 list[i].drugOutOne = this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
                 
-                list[i].drugOutPrice = "/"
-                list[i].drugOutSalePrice = "/"
+                // list[i].drugOutPrice = "/"
+                // list[i].drugOutSalePrice = "/"
+
+                if(this.org_id == 0 || this.org_id == 10697){
+                  list[i].drugOutPrice = list[i].retail_price
+                  list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
+                }else{
+                  list[i].drugOutPrice = "/"
+                  list[i].drugOutSalePrice = "/"
+                }
 
                
                 if(this.org_id ==10265 || this.org_id ==10210 || this.org_id ==10402 || this.org_id ==10215){
@@ -376,8 +399,16 @@ export default {
                 }else{
                   list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }
-                list[i].overDrugPrice = "/"
-                list[i].oveDrugSaleMoney = "/"
+                // list[i].overDrugPrice = "/"
+                // list[i].oveDrugSaleMoney = "/"
+                list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+                if(this.org_id == 0 || this.org_id == 10697){
+                  list[i].overDrugPrice = list[i].retail_price
+                  list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
+                }else{
+                  list[i].overDrugPrice = "/"
+                  list[i].oveDrugSaleMoney = "/"
+                }
             }
             this.tableList = list;
             this.total = response.data.data.total
@@ -1300,7 +1331,14 @@ export default {
         return max_str + min_str;
       }
     },
-
+    GetDrugOverOne(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+      
+      total = totalone + totaltwo - totalthree
+       
+      return total
+       
+    },
     GetInitStartFlow(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
       var total_one =0
       var total_two = 0

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -282,7 +282,7 @@ export default {
                
               }
               //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
-               if(this.org_id == 0){
+               if(this.org_id == 0 || this.org_id ==10697){
                   list[i].stock_in_price = list[i].buy_price
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                }else{
@@ -294,7 +294,7 @@ export default {
               
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
 
-              if(this.org_id == 0){
+              if(this.org_id == 0 || this.org_id ==10697){
                list[i].addStockMoney = list[i].buy_price 
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
               }else{
@@ -326,7 +326,7 @@ export default {
                
               }
             
-              if(this.org_id == 0){
+              if(this.org_id == 0 || this.org_id ==10697){
                 list[i].overPrice = list[i].packing_price
                 list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
               }else{

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -181,19 +181,37 @@ export default {
                         }
                       }
                     }
-                    list[i].stock_in_price = "/"
-                    list[i].stockMoney = "/"
+                    
+                    if(this.org_id == 0 || this.org_id ==10697){
+                      list[i].stock_in_price = list[i].buy_price
+                      list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
+                    }else{
+                      list[i].stock_in_price = "/"
+                      list[i].stockMoney = "/"
+                    }
                    
                     
                     list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
                    
-                    list[i].addStockMoney = "/"
-                    list[i].saleStockMoney = "/"
+                    if(this.org_id == 0 || this.org_id ==10697){
+                        list[i].addStockMoney = list[i].buy_price 
+                        list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
+                      }else{
+                        list[i].addStockMoney = "/"
+                        list[i].saleStockMoney = "/"
+                      }
+             
 
                     list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
                    
-                    list[i].stockOutprice = "/"
-                    list[i].saleOutprice = "/"
+                     
+                    if(this.org_id == 0){
+                      list[i].stockOutprice = list[i].packing_price
+                      list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
+                    }else{
+                      list[i].stockOutprice = "/"
+                      list[i].saleOutMoney = "/"
+                    }
                   
                     if(this.org_id ==0 || this.org_id ==10265){
                       list[i].overStock = list[i].GoodEndFlowInfo.over_count
@@ -201,9 +219,13 @@ export default {
                         list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
                     } 
                   
-                  
-                    list[i].overPrice = "/"
-                    list[i].overMoney = "/"
+                    if(this.org_id == 0 || this.org_id ==10697){
+                      list[i].overPrice = list[i].packing_price
+                      list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
+                     }else{
+                        list[i].overPrice = "/"
+                        list[i].overMoney = "/"
+                     }
                 
                 }
                 this.tableList = list