导入弹框初步编写

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1056,6 +1056,10 @@ var table = {
                         if (typeof callback == "function") {
                             callback(result);
                         }
+                        if(data.isTable===0){
+                            $.modal.closeLoading();
+                            return
+                        }
                         $.operate.ajaxSuccess(result);
                     }
                 };

ruoyi-admin/src/main/resources/templates/manage/delivery/add.html

@@ -11,7 +11,9 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">关联合同id：</label>
                     <div class="col-sm-8">
-                        <input name="orderId" class="form-control" type="text" required>
+                        <select name="orderId" class="form-control" required>
+
+                        </select>
                     </div>
                 </div>
             </div>
@@ -120,10 +122,26 @@
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "manage/delivery"
+        var prefixOrder = ctx + "manage/order";
+        let orderList=[]
         $("#form-delivery-add").validate({
             focusCleanup: true
         });
+        $(function (){
+            getOrderList()
 
+        })
+function getOrderList() {
+    $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
+        orderList=res.rows
+        $("[name='orderId']").html(
+            orderList.map((ele)=>{
+                return `<option value="${ele.id}">${ele.orderName}</option>`
+            }).join('')
+        )
+
+    })
+}
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-delivery-add').serialize());

ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html

@@ -70,6 +70,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
+        var listFlag = [[${@permission.hasPermi('manage:delivery:list')}]];
         var editFlag = [[${@permission.hasPermi('manage:delivery:edit')}]];
         var removeFlag = [[${@permission.hasPermi('manage:delivery:remove')}]];
         var deliveryTypeDatas = [[${@dict.getType('delivery_type')}]];
@@ -123,6 +124,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="openList(\'' + row.id + '\')"><i class="fa fa-list"></i>发货清单</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
@@ -131,6 +133,9 @@
             };
             $.table.init(options);
         });
+        function openList(id){
+            $.modal.open('发货清单', prefix + `/import/${id}`)
+        }
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html

@@ -12,7 +12,9 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">关联合同id：</label>
                     <div class="col-sm-8">
-                        <input name="orderId" th:field="*{orderId}" class="form-control" type="text" required>
+                        <select name="orderId" class="form-control" th:orderId="*{orderId}" required>
+
+                        </select>
                     </div>
                 </div>
             </div>
@@ -121,10 +123,25 @@
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "manage/delivery";
+        var prefixOrder = ctx + "manage/order";
         $("#form-delivery-edit").validate({
             focusCleanup: true
         });
+        $(function (){
+            getOrderList()
+        })
+        function getOrderList() {
+            $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
+                orderList=res.rows
+                var orderId=$("[name='orderId']").attr('orderid')
+                $("[name='orderId']").html(
+                    orderList.map((ele)=>{
+                        return `<option value="${ele.id}" ${orderId==ele.id?'selected':''}>${ele.orderName}</option>`
+                    }).join('')
+                )
 
+            })
+        }
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/edit", $('#form-delivery-edit').serialize());

ruoyi-admin/src/main/resources/templates/manage/delivery/import.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('发货清单列表')" />
+</head>
+<body>
+<script>
+$(function() {
+var options = {
+url: prefix + "/list",
+columns: [{
+checkbox: true
+},
+{
+field: 'id',
+title: '主键，自增',
+visible: false
+},
+{
+field: 'orderId',
+title: '关联合同id'
+},
+{
+field: 'deliveryCode',
+title: '发货单号'
+},
+{
+field: 'deliveryDate',
+title: '发货日期'
+},
+{
+field: 'deliveryType',
+title: '发货方式',
+formatter: function(value, row, index) {
+return $.table.selectDictLabel(deliveryTypeDatas, value);
+}
+},
+{
+field: 'deliveryStatus',
+title: '发货状态',
+formatter: function(value, row, index) {
+return $.table.selectDictLabel(deliveryStatusDatas, value);
+}
+},
+]
+};
+$.table.init(options);
+});
+</script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/manage/order/add.html

@@ -28,7 +28,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">版本号：</label>
                     <div class="col-sm-8">
-                        <input name="versionCode" class="form-control" type="text" required>
+                        <input name="versionCode" class="form-control" type="number" required>
                     </div>
                 </div>
             </div>
@@ -111,8 +111,8 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">备注：</label>
+                    <label class="col-sm-2 control-label">备注：</label>
-                    <div class="col-sm-8">
+                    <div class="col-sm-10">
                         <textarea name="remark" class="form-control"></textarea>
                     </div>
                 </div>
@@ -183,7 +183,7 @@
                     align: 'center',
                     title: '数量',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].quantity' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].quantity' value='%s'>", index, value);
                         return html;
                     }
                 },
@@ -192,7 +192,7 @@
                     align: 'center',
                     title: '单价',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].price' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].price' value='%s'>", index, value);
                         return html;
                     }
                 },
@@ -201,7 +201,7 @@
                     align: 'center',
                     title: '总价',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].amount' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].amount' value='%s'>", index, value);
                         return html;
                     }
                 },