浏览代码

新分支

28169 11 个月前
父节点
当前提交
50b9a4de71

+ 2 - 2
src/xt_pages/role/admin.vue 查看文件

227
           @click="toAutoDrug">自动生成</el-button> -->
227
           @click="toAutoDrug">自动生成</el-button> -->
228
 
228
 
229
 
229
 
230
-         <!-- <el-button
230
+         <el-button
231
           type="primary"
231
           type="primary"
232
           size="small"
232
           size="small"
233
           icon="el-icon-circle-plus-outline"
233
           icon="el-icon-circle-plus-outline"
234
           style="float:left"
234
           style="float:left"
235
-          @click="toAutoDiagnose">自动脚本</el-button> -->
235
+          @click="toAutoDiagnose">自动脚本</el-button>
236
 
236
 
237
         <!-- <el-button
237
         <!-- <el-button
238
           type="primary"
238
           type="primary"

+ 2 - 1
src/xt_pages/stock/query/purchaseNewStockQuery.vue 查看文件

265
             this.loading = false
265
             this.loading = false
266
             for(let i=0;i<list.length;i++){
266
             for(let i=0;i<list.length;i++){
267
                
267
                
268
-              if(this.org_id ==10210 || this.org_id ==10215){
268
+              if(this.org_id ==10210 || this.org_id ==10215 || this.org_id == 10265){
269
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
269
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
270
               }else{
270
               }else{
271
                
271
                
278
                   list[i].stockIn = list[i].GoodStartFlowInfo.over_count
278
                   list[i].stockIn = list[i].GoodStartFlowInfo.over_count
279
                 }else{
279
                 }else{
280
                   list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
280
                   list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
281
+                  console.log("剩余库存---------------",list[i].stockIn)
281
                   if(list[i].stockIn <0){
282
                   if(list[i].stockIn <0){
282
                     list[i].stockIn =0
283
                     list[i].stockIn =0
283
                   }
284
                   }

+ 1 - 1
src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue 查看文件

169
                 for(let i=0;i<list.length;i++){
169
                 for(let i=0;i<list.length;i++){
170
                     // list[i].stockIn = list[i].GoodStartFlowInfo.over_count
170
                     // list[i].stockIn = list[i].GoodStartFlowInfo.over_count
171
 
171
 
172
-                    if(this.org_id == 0 || this.org_id ==10210){
172
+                    if(this.org_id == 0 || this.org_id ==10210 || this.org_id == 10265){
173
                        list[i].stockIn = list[i].GoodStartFlowInfo.over_count
173
                        list[i].stockIn = list[i].GoodStartFlowInfo.over_count
174
                     }else{
174
                     }else{
175
                       if(list[i].id== 5052){
175
                       if(list[i].id== 5052){