Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccService.java

@@ -64,9 +64,9 @@ public class SysFlowccService extends MybatisBaseService<SysFlowccMapper, SysFlo
     public PagerVo<SysFlowccVo> listPageVo(PagerQuery<SysFlowccQuery> pq) {
         SysFlowccQuery query = pq.getParams();
         QueryWrapper<SysFlowcc> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getFlowName())) {
+      /*  if (StringUtils.isNotBlank(query.getFlowName())) {
             qw.like("flowName", query.getFlowName());
-        }
+        }*/
         IPage<SysFlowcc> page = PagerUtil.queryToPage(pq);
         IPage<SysFlowccVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<SysFlowccVo> p = PagerUtil.pageToVo(pagging, null);

yxt-as-ui/src/api/storage/oldPartsRecovery.js

@@ -46,6 +46,19 @@ export default {
     });
   },
 
+  // 初始化旧件入库
+  getOldDetailsByBillSid: function(params) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/as/v1/AsBusrepairInventorybillDetail/getOldDetailsByBillSid',
+      method: 'post',
+      params: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
   // 保存旧件入库
   saveInventory: function(data) {
     return request({

yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue

@@ -212,10 +212,10 @@
       showEdit(row) {
         this.init()
         var params = {
-          sid: row.sid
+          busRepairBillSid: row.billSid
         }
 
-        req.init(row.sid)
+        req.getOldDetailsByBillSid(params)
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data

yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingEditReport.vue

@@ -131,9 +131,9 @@
             <!-- <el-table-column prop="pkMoney" label="盘亏金额" align="center" /> -->
             <el-table-column prop="psNum" label="盘损" align="center" />
             <!-- <el-table-column prop="psMoney" label="盘损金额" align="center" /> -->
-            <el-table-column prop="virtualNum" label="虚拟件" align="center" />
+            <!-- <el-table-column prop="virtualNum" label="虚拟件" align="center" /> -->
             <!-- <el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" /> -->
-            <el-table-column prop="unInStorageNum" label="未入库" align="center" />
+            <!-- <el-table-column prop="unInStorageNum" label="未入库" align="center" /> -->
             <!-- <el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" /> -->
           </el-table>
 
@@ -153,9 +153,9 @@
             <!-- <el-table-column prop="pkMoney" label="盘亏金额" align="center" /> -->
             <el-table-column prop="psNum" label="盘损" align="center" />
             <!-- <el-table-column prop="psMoney" label="盘损金额" align="center" /> -->
-            <el-table-column prop="virtualNum" label="虚拟件" align="center" />
+            <!-- <el-table-column prop="virtualNum" label="虚拟件" align="center" /> -->
             <!-- <el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" /> -->
-            <el-table-column prop="unInStorageNum" label="未入库" align="center" />
+            <!-- <el-table-column prop="unInStorageNum" label="未入库" align="center" /> -->
             <!-- <el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" /> -->
           </el-table>
 

yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue

@@ -127,9 +127,9 @@
             <!-- <el-table-column prop="pkMoney" label="盘亏金额" align="center" width="120" /> -->
             <el-table-column prop="psNum" label="盘损" align="center" />
             <!-- <el-table-column prop="psMoney" label="盘损金额" align="center" width="100" /> -->
-            <el-table-column prop="virtualNum" label="虚拟件" align="center" />
+            <!-- <el-table-column prop="virtualNum" label="虚拟件" align="center" /> -->
             <!-- <el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" /> -->
-            <el-table-column prop="unInStorageNum" label="未入库" align="center" />
+            <!-- <el-table-column prop="unInStorageNum" label="未入库" align="center" /> -->
             <!-- <el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" /> -->
           </el-table>
 
@@ -149,9 +149,9 @@
             <!-- <el-table-column prop="pkMoney" label="盘亏金额" align="center" width="120" /> -->
             <el-table-column prop="psNum" label="盘损" align="center" />
             <!-- <el-table-column prop="psMoney" label="盘损金额" align="center" width="120" /> -->
-            <el-table-column prop="virtualNum" label="虚拟件" align="center" />
+            <!-- <el-table-column prop="virtualNum" label="虚拟件" align="center" /> -->
             <!-- <el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" /> -->
-            <el-table-column prop="unInStorageNum" label="未入库" align="center" />
+            <!-- <el-table-column prop="unInStorageNum" label="未入库" align="center" /> -->
             <!-- <el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" /> -->
           </el-table>