新分支

src/xt_pages/role/admin.vue

@@ -227,12 +227,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <!-- <el-button
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> -->
+          @click="toAutoDiagnose">自动脚本</el-button>
 
         <!-- <el-button
           type="primary"

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -265,7 +265,7 @@ export default {
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              if(this.org_id ==10210 || this.org_id ==10215){
+              if(this.org_id ==10210 || this.org_id ==10215 || this.org_id == 10265){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
                
@@ -278,6 +278,7 @@ export default {
                   list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                 }else{
                   list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
+                  console.log("剩余库存---------------",list[i].stockIn)
                   if(list[i].stockIn <0){
                     list[i].stockIn =0
                   }

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -169,7 +169,7 @@ export default {
                 for(let i=0;i<list.length;i++){
                     // list[i].stockIn = list[i].GoodStartFlowInfo.over_count
 
-                    if(this.org_id == 0 || this.org_id ==10210){
+                    if(this.org_id == 0 || this.org_id ==10210 || this.org_id == 10265){
                        list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                     }else{
                       if(list[i].id== 5052){