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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -80,7 +80,7 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="org_id = 10206">
+          <div v-if="org_id == 10206">
             <el-button  size="small"
                         @click="openZb(1)"
                         v-if=" this.order.id == 0"

src/xt_pages/stock/drugs/inventory.vue

@@ -336,6 +336,7 @@ export default {
                   //  }else{
                   //    list[i].type = 6
                   //   }
+                   list[i].type = 6
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){
                         list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

src/xt_pages/stock/drugs/newDrugInventory.vue

@@ -809,7 +809,7 @@ export default {
                 list[i].last_stock_min_number = ""
                 list[i].min_number = list[i].XtBaseDrug.min_number
                 list[i].manufacturer_name  = ""
-                // list[i].type = 4
+                list[i].type = 6
                 list[i].last_stock_max_number = list[i].stock_max_number
                 list[i].last_stock_min_number = list[i].stock_min_number
                 for(let j=0;j<this.manufacturerList.length;j++){

src/xt_pages/stock/inventory.vue

@@ -461,6 +461,7 @@ export default {
               // }else{
               //   list[i].type = 6
               // }
+              list[i].type =6
               
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
@@ -485,7 +486,7 @@ export default {
                   price:item.price,
                   number:item.number,
                   expiry_date:item.expiry_date,
-                  type:0,
+                  type:6,
                   last_stock_count:0,
                 }
               }

src/xt_pages/stock/newInventory.vue

@@ -446,7 +446,7 @@ export default {
           this.manufacturerList = response.data.data.manufacturerList
           loading.close()
           for(let i=0;i<list.length;i++){
-              // list[i].type = 4
+              list[i].type = 6
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               list[i].manufacturer_name = ""

src/xt_pages/stock/stockFlow.vue

@@ -96,12 +96,12 @@
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-
+<!-- 
         <el-table-column prop="drug_name" label="出库日期" align="center">
            <template slot-scope="scope">
              {{getTime(scope.row.system_time)}}
            </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="drug_name" label="仓库名称"  align="center">
            <template slot-scope="scope">
              <span>{{getHouseName(scope.row.storehouse_id)}}</span>