Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -93,6 +93,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             scmVehicleReturn.setMoney(mo);
             scmVehicleReturn.setCreateBySid(scmVehicleReturnDto.getUserSid());
             scmVehicleReturn.setApplicationName(scmVehicleReturnDto.getName());
+            scmVehicleReturn.setNodeState("待提交");
             boolean isSave = save(scmVehicleReturn);
             if (!isSave) {
                 return rb.setMsg("保存失败");
@@ -184,6 +185,14 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         //取组织架构的全路径sid
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData();
         String orgSidPath = sysStaffOrg.getOrgSidPath();
+        if (Double.parseDouble(scmVehicleReturnDto.getMoney()) > 0) {
+            variables.put("isLoan", true);
+        } else {
+            variables.put("isLoan", false);
+        }
+        if (scmVehicleReturnDto.getDetailsList().size() == 0) {
+            return rb.setMsg("请选择需要退库的车辆");
+        }
         String busSid = scmVehicleReturnDto.getBusinessSid();
         if (org.apache.commons.lang3.StringUtils.isBlank(busSid)) {
             ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto);
@@ -252,7 +261,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆");
         }
         String money = (String) bv.getFormVariables().get("money");
-        if (Integer.parseInt(money) > 0) {
+        if (Double.parseDouble(money) > 0) {
             bv.getFormVariables().put("isLoan", true);
         } else {
             bv.getFormVariables().put("isLoan", false);

anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue

@@ -59,7 +59,7 @@
               </div>
             </div>
             <template class="tablelist">
-              <el-table :data="list" border style="width: 100%" :index="index">
+              <el-table :data="formobj.voList" border style="width: 100%" :index="index">
                 <el-table-column align="center" label="序号" type="index" width="50"/>
                 <el-table-column label="车架号" align="center">
                   <template slot-scope="scope" @click="">
@@ -112,7 +112,7 @@
           name: window.sessionStorage.getItem('name'),
           createTime: '',
           userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
-          detailsList: []
+          voList: []
         },
         revokeList: {// 撤回
           businessSid: '',
@@ -165,8 +165,8 @@
           this.$refs['form_obj'].clearValidate()
         })
         this.dialogStatus = 'edit'
-        this.viewTitle = '【编辑】车辆采购退库申请'
+        this.viewTitle = '【详情】车辆采购退库申请'
-        req.detailsInfo(sid).then(resp => {
+        req.detailsInfo({'sid':sid}).then(resp => {
           const data = resp.data
           this.formobj = data
         }).catch(e => {