Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java

@@ -973,7 +973,8 @@ private ISysAttachService attachService;
 //        }else if(roleKeys.contains("gcjlRole")){
 //            variables.put("authority",2);
 //        }
-//        if(roleKeys.contains("yfzjRole") || roleKeys.contains("admin")){
+        if(roleKeys.contains("admin")) {
-//            variables.put("authority",4);
+            variables.put("authority", 4);
+        }
     }
 }

ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml

@@ -71,6 +71,12 @@
     </select>
 
 
+    <select id="selectOrderChildListByMaterialNo" parameterType="String" resultMap="PurchaseOrderChildResult">
+        <include refid="selectPurchaseOrderChildVo"/>
+        where material_no = #{materialNo}
+    </select>
+
+
     <insert id="insertPurchaseOrderChild" parameterType="PurchaseOrderChild" useGeneratedKeys="true" keyProperty="purchaseOrderChildId">
         insert into purchase_order_child
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-admin/src/main/resources/templates/system/customer/add.html

@@ -365,7 +365,7 @@
                     return;
                 }
                 console.log( $('#form-customer-add').serialize());
-                $.operate.save(prefix + "/ad", $('#form-customer-add').serialize());
+                $.operate.save(prefix + "/add", $('#form-customer-add').serialize());
             }
         }
 

ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

@@ -299,7 +299,7 @@
                             // 已作废
                             if(row.useStatus=="2" && !row.restoreInstanceId){
                                 // 恢复
-                                actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
+                                actions.push('<a  href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
                             }
                             // 有流程实例id
                             if (row.instanceId) {
@@ -308,7 +308,7 @@
                                     var todoUserIdList = row.todoUserId.split(",");
                                     if(todoUserIdList.includes(loginName)){
                                         var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
-                                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
+                                        actions.push('<a  href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                     }
                                 }
                                 // 审批历史