Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java

@@ -486,6 +486,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(businessSid);
+        String orgSidPath = baseDiscountpackageApply.getOrgSidPath();
         if (bv.getTaskId().equals(baseDiscountpackageApply.getTaskId())) {
             bv.setOrgSidPath(baseDiscountpackageApply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@@ -526,6 +527,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
                 handoverDto.setUseOrgSid(baseDiscountpackageApply.getUseOrgSid());
                 handoverDto.setCreateOrgName(baseDiscountpackageApply.getCreateOrgName());
                 handoverDto.setUseOrgName(baseDiscountpackageApply.getUseOrgName());
+                handoverDto.setOrgSidPath(orgSidPath);
                 SysUser sysUser = userFeign.selectBySid(baseDiscountpackageApply.getCreateBySid()).getData();
                 if (null != sysUser) {
                     if (StringUtils.isNotBlank(sysUser.getMobile())) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandover.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 /**
@@ -58,4 +59,5 @@ public class BusDiscountpackageHandover extends BaseEntity {
     private String transferPhone;
     @ApiModelProperty("移交备注")
     private String transferRemarks;
+    private String orgSidPath;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverDto.java

@@ -71,4 +71,5 @@ public class BusDiscountpackageHandoverDto implements Dto {
     private String transferPhone;
     @ApiModelProperty("移交备注")
     private String transferRemarks;
+    private String orgSidPath;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverRest.java

@@ -38,11 +38,7 @@ public class BusDiscountpackageHandoverRest implements BusDiscountpackageHandove
     public ResultBean save(BusDiscountpackageHandoverDto dto) {
         ResultBean rb = ResultBean.fireFail();
         boolean issuccess = busDiscountpackageHandoverService.saveOrUpdateDto(dto);
-        if (issuccess) {
-            return rb.success().setMsg("添加成功");
-        } else {
-            return rb.fail().setMsg("添加失败");
-        }
+        return rb.success();
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -278,6 +278,9 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
      */
     public boolean saveOrUpdateDto(BusDiscountpackageHandoverDto dto) {
         BusDiscountpackageHandover entity = new BusDiscountpackageHandover();
+        if (dto.getBusDiscountpackageHandoverLists().isEmpty()) {
+            return false;
+        }
         String sid = entity.getSid();
         dto.setSid(sid);
         dto.fillEntity(entity);

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@@ -178,12 +178,19 @@ export default {
       this.$refs['divadd'].showEdit(row)
     },
     handleCancellation(row) {
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         req.cancal({ sid: row.sid }).then((res) => {
           if (res.success) {
             this.$message({ showClose: true, type: 'success', message: '操作成功' })
             this.loadList()
           }
         })
+      })
     },
     handleLooK(row) {
       this.viewState = 4

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue

@@ -80,6 +80,11 @@
                 <span>{{ scope.row.purchaseSystemName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="采购类型" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manPurOrderTypeValue }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="排产订单编号" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.orderingNo }}</span>
@@ -90,129 +95,129 @@
                 <span>{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="贴息" align="center" width="90">
+            <el-table-column label="车型(配置简述)" align="center" width="130">
               <template slot-scope="scope">
-                <span>{{ scope.row.factoryDiscount }}</span>
+                <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.modelName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="中介返利" align="center" width="100">
+            <el-table-column label="车架号" align="center" width="90">
               <template slot-scope="scope">
-                <span>{{ scope.row.distributorPriceAll }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="开票类型" align="center" width="120">
+            <el-table-column label="销售部门" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.kpType }}</span>
+                <span>{{ scope.row.orgName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="物料名称" align="center" width="100">
+            <el-table-column label="销售专员" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.materialName }}</span>
+                <span>{{ scope.row.staffName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="物料编码" align="center" width="100">
+            <el-table-column label="客户名称" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.materialCode }}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车架号" align="center" width="90">
+            <el-table-column label="实际购车人" align="center" width="140">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span>{{ scope.row.realityBuyCarName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车型(配置简述)" align="center" width="130">
+            <el-table-column label="手机号码" align="center" width="120">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.modelName }}</span>
+                <span>{{ scope.row.mobile }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="内部编码" align="center" width="120">
+            <el-table-column label="成交价(元)" align="center" width="110">
               <template slot-scope="scope">
-                <span>{{ scope.row.insideCode }}</span>
+                <span>{{ scope.row.price }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售类型" align="center" width="100">
+            <el-table-column label="贴息" align="center" width="90">
               <template slot-scope="scope">
-                <span>{{ scope.row.type }}</span>
+                <span>{{ scope.row.factoryDiscount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="采购类型" align="center" width="120">
+            <el-table-column label="销售折让" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.manPurOrderTypeValue }}</span>
+                <span>{{ scope.row.salesAllowance }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售日期" align="center" width="100">
+            <el-table-column label="赠品价值(元)" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.saleDate }}</span>
+                <span>{{ scope.row.giftsDescription }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="成交价(元)" align="center" width="110">
+            <el-table-column label="中介人1" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
+                <span>{{ scope.row.middleOne }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售部门" align="center" width="100">
+            <el-table-column label="返利金额1" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.orgName }}</span>
+                <span>{{ scope.row.rebateMoneyOne }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售专员" align="center" width="100">
+            <el-table-column label="中介人2" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.staffName }}</span>
+                <span>{{ scope.row.middleTwo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合同编号" align="center" width="100">
+            <el-table-column label="返利金额2" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.concatNo }}</span>
+                <span>{{ scope.row.rebateMoneyTwo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="实际购车人" align="center" width="140">
+            <el-table-column label="开票类型" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.realityBuyCarName }}</span>
+                <span>{{ scope.row.kpType }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="客户名称" align="center" width="100">
+            <el-table-column label="出库类型" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.customerName }}</span>
+                <span>{{ scope.row.ckType }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="手机号码" align="center" width="120">
+            <el-table-column label="欠款时长(天)" align="center" width="130">
               <template slot-scope="scope">
-                <span>{{ scope.row.mobile }}</span>
+                <span>{{ scope.row.qkDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="赠品价值(元)" align="center" width="120">
+            <el-table-column label="销售类型" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.giftsDescription }}</span>
+                <span>{{ scope.row.type }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售折让" align="center" width="120">
+            <el-table-column label="销售日期" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.salesAllowance }}</span>
+                <span>{{ scope.row.saleDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="中介人1" align="center" width="120">
+            <el-table-column label="内部引荐人" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.middleOne }}</span>
+                <span>{{ scope.row.innerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="返利金额1" align="center" width="120">
+            <el-table-column label="合同编号" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.rebateMoneyOne }}</span>
+                <span>{{ scope.row.concatNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="中介人2" align="center" width="120">
+            <el-table-column label="物料名称" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.middleTwo }}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="返利金额2" align="center" width="120">
+            <el-table-column label="物料编码" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.rebateMoneyTwo }}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="内部引荐人" align="center" width="120">
+            <el-table-column label="内部编码" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.innerName }}</span>
+                <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
           </el-table>

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -229,12 +229,19 @@ export default {
       this.$refs['divinfo'].showInfo(sid, row)
     },
     toTermination(row) {
+      const tip = '请确认是否终止该记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         req.cancal({ sid: row.sid }).then((res) => {
           if (res.success) {
             this.$message({ showClose: true, type: 'success', message: '操作成功' })
             this.loadList()
           }
         })
+      })
     },
     hangleLook(row) {
       this.viewState = 5

anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@@ -307,12 +307,19 @@ export default {
       })
     },
     handCancellation(row) {
+      const tip = '请确认是否作废该记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         req.cancel({ sid: row.sid }).then((res) => {
           if (res.success) {
             this.$message({ showClose: true, type: 'success', message: '操作成功' })
             this.getList()
           }
         })
+      })
     },
     handleGetCheck(row) {
       this.dialogImgVisible = true

anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue

@@ -255,9 +255,11 @@
                   <tr>
                     <td>可操作功能列表</td>
                     <td>
+                      <div style="height:230px;line-height:120px;overflow:auto;overflow-x:hidden;">
                         <el-tree v-loading="loading" :data="treedata" ref="funTree" show-checkbox accordion node-key="sid"
                                  :default-checked-keys="checkedId" :props="defaultProps" @check-change="checkchange">
                         </el-tree>
+                      </div>
                     </td>
                   </tr>
                 </table>
@@ -289,7 +291,7 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
-                  <el-table :key="tableKey" :data="formobj.tableData" :index="index" border style="width: 100%">
+                  <el-table :key="tableKey" :data="formobj.tableData" :index="index" border style="width: 100%" max-height="300">
                     <el-table-column type="index" label="序号" :index="index + 1" width="80" align="center">
                     </el-table-column>
                     <el-table-column prop="name" label="菜单名称" header-align="center" align="left">