新增完善

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

@@ -27,7 +27,9 @@
                             </li>
                             <li>
                                 <label>物流公司：</label>
-                                <input type="text" name="logisticsCompany"/>
+                                <select name="logisticsCompany" class="form-control" th:with="type=${@dict.getType('logistics_company')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
                             <li>
                                 <label>发货状态：</label>

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

@@ -9,7 +9,8 @@
     input[name="versionCode"]::-webkit-outer-spin-button {
         transform: scale(1.2);
     }
-    label[for="versionCode"]{
+
+    label[for="versionCode"] {
         margin-right: 20px;
     }
 
@@ -56,7 +57,7 @@
                 <label class="col-sm-4 control-label is-required">合同类型：</label>
                 <div class="col-sm-8">
                     <select name="orderType" class="form-control" th:with="type=${@dict.getType('order_type')}"
-                           onchange="changeOrderType()" required>
+                            onchange="changeOrderType()" required>
                         <option value="">请选择合同类型</option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                 th:value="${dict.dictValue}"></option>
@@ -85,6 +86,9 @@
                         <input class="form-control" type="text" name="orderPartnerName" onclick="selectPartner()"
                                required>
                         <span class="input-group-addon" onclick="selectPartner()"><i class="fa fa-search"></i></span>
+                        <span class="input-group-addon" id="customerSet" onclick="setCustomer()" title="同步"><i
+                                class="fa fa-refresh"></i></span>
+
                     </div>
                 </div>
             </div>
@@ -186,7 +190,7 @@
     function submitHandler() {
         if ($.validate.form()) {
             $.operate.save(prefix + "/add", $('#form-order-add').serialize());
-        }else{
+        } else {
             $.modal.alertWarning("请完善表单必填项");
         }
     }
@@ -299,7 +303,7 @@
             left: '300px'
         });
 
-        $('[name="versionCode"]').on('focus',function (){
+        $('[name="versionCode"]').on('focus', function () {
             $(this).blur()
         })
     });
@@ -330,7 +334,7 @@
             title: '选择客户',
             width: "680",
             url: url,
-            height:'600',
+            height: '600',
             callBack: doSubmitCustomer
         };
         $.modal.openOptions(options);
@@ -342,7 +346,7 @@
             title: '选择代表处',
             width: "680",
             url: url,
-            height:'600',
+            height: '600',
             callBack: doSubmitAgent
         };
         $.modal.openOptions(options);
@@ -353,13 +357,25 @@
         var options = {
             title: '选择代理商',
             width: "680",
-            height:'600',
+            height: '600',
             url: url,
             callBack: doSubmitPartner
         };
         $.modal.openOptions(options);
     }
 
+    function setCustomer() {
+        if (!$('#customerSet').attr('partnerName')) {
+            $.modal.alertWarning("请先选择代理商");
+            return
+        }
+        $('[name="customerCode"]').attr('readonly', false).attr('required', false).val('').parent().parent().find('label').removeClass('is-required')
+        $(' [name="customerEmail"]').val('');
+        $(' [name="customerName"]').val($('#customerSet').attr('partnerName'));
+        $(' [name="customerContact"]').val($('#customerSet').attr('contactPerson'));
+        $(' [name="customerPhone"]').val($('#customerSet').attr('contactPhone'));
+    }
+
     function doSubmitCustomer(index, layero) {
         var rows = layero.find("iframe")[0].contentWindow.getSelections();
         if (rows.length == 0) {
@@ -394,7 +410,9 @@
         }
         $('[name="orderPartnerCode"]').val(rows[0].partnerCode);
         $('[name="orderPartnerName"]').val(rows[0].partnerName);
-
+        $('#customerSet').attr('partnerName', rows[0].partnerName);
+        $('#customerSet').attr('contactPerson', rows[0].contactPerson);
+        $('#customerSet').attr('contactPhone', rows[0].contactPhone);
         $.modal.close(index);
     }
 
@@ -404,7 +422,7 @@
 
     function downloadTem() {
         var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
-        window.location.href =prefix + "/list/export"
+        window.location.href = prefix + "/list/export"
         $.modal.closeLoading();
         // $.post(prefix + "/list/export", {}, function (result) {
         //     if (result.code == web_status.SUCCESS) {
@@ -467,13 +485,14 @@
         let res = Number((price * quantity * discount).toFixed(2))
         $(ele).parent().parent().find('.amount').val(res)
     }
-    function changeOrderType(){
-    let orderType=$('[name="orderType"]').val()
-        if(orderType=='zq'){
+
+    function changeOrderType() {
+        let orderType = $('[name="orderType"]').val()
+        if (orderType == 'zq') {
             $('[name="orderPartnerName"]').removeAttr('required')
             $('[name="orderPartnerName"]').parent().parent().parent().find('label').removeClass('is-required')
-        }else{
-            $('[name="orderPartnerName"]').attr('required',true)
+        } else {
+            $('[name="orderPartnerName"]').attr('required', true)
             $('[name="orderPartnerName"]').parent().parent().parent().find('label').addClass('is-required')
         }
     }

ruoyi-admin/src/main/resources/templates/project/info/add.html

@@ -158,26 +158,26 @@
                 <td>预计金额（RMB）<span class="is-required">*</span></td>
                 <td><input type="number" name="estimatedAmount" class="form-control" required></td>
                 <td>预计下单时间</td>
-                <td><input name="estimatedOrderTime" class="form-control" placeholder="yyyy-MM-dd" autocomplete="false">
+                <td><input name="estimatedOrderTime" class="form-control" placeholder="yyyy-MM-dd">
                 </td>
                 <td>预计发货时间</td>
                 <td><input name="estimatedDeliverTime" class="form-control" placeholder="yyyy-MM-dd"
-                           autocomplete="false"></td>
+                           ></td>
 
             </tr>
             <tr>
                 <td>竞争对手</td>
                 <td colspan="5" class="checkbox-group">
                     <div class="checkbox-box">
-                        <label><input type="checkbox" name="competitor[0]" value="华为">华为</label>
-                        <label><input type="checkbox" name="competitor[1]" value="锐捷">锐捷</label>
-                        <label><input type="checkbox" name="competitor[2]" value="深信服">深信服</label>
-                        <label><input type="checkbox" name="competitor[3]" value="中兴">中兴</label>
-                        <label><input type="checkbox" name="competitor[4]" value="曙云">曙云</label>
+                        <label><input type="checkbox" name="competitorList[0]" value="华为">华为</label>
+                        <label><input type="checkbox" name="competitorList[1]" value="锐捷">锐捷</label>
+                        <label><input type="checkbox" name="competitorList[2]" value="深信服">深信服</label>
+                        <label><input type="checkbox" name="competitorList[3]" value="中兴">中兴</label>
+                        <label><input type="checkbox" name="competitorList[4]" value="曙云">曙云</label>
                     </div>
 
                     <div>
-                        其它：<input type="text" name="competitor[5]" class="form-control" style="width: 400px">
+                        其它：<input type="text" name="competitorList[5]" class="form-control" style="width: 400px">
                     </div>
                 </td>
             </tr>
@@ -204,14 +204,14 @@
                 <th>产品型号</th>
                 <th>描述</th>
                 <th>数量</th>
-                <th style="width: 80px">目录单价(RMB)</th>
-                <th style="width: 80px">指导折扣</th>
-                <th style="width: 80px">折扣</th>
-                <th style="width: 80px">单价(RMB)</th>
-                <th>总价(RMB)</th>
-                <th>目录总价(RMB)</th>
-                <th>备注</th>
-                <th>操作</th>
+                <th style="width: 90px">目录单价(RMB)</th>
+                <th style="width: 90px">指导折扣</th>
+                <th style="width: 90px">折扣</th>
+                <th style="width: 90px">单价(RMB)</th>
+                <th style="width: 120px">总价(RMB)</th>
+                <th style="width: 120px">目录总价(RMB)</th>
+                <th >备注</th>
+                <th style="width: 60px">操作</th>
             </tr>
             </thead>
 
@@ -284,12 +284,12 @@
         var layerIndex = parent.layer.index
         parent.layer.full(layerIndex)
 
-        $("input[name='orderDate']").datetimepicker({
+        $("input[name='estimatedOrderTime']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",
             autoclose: true
         });
-        $("input[name='deliveryDate']").datetimepicker({
+        $("input[name='estimatedDeliverTime']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",
             autoclose: true
@@ -397,19 +397,19 @@
         let length = $('#productTable tbody').find('tr').length
         let tr = $(`
 <tr>
-<td>${length + 1}</td>
+<td class="indexBox">${length + 1}</td>
 <td><input name=projectProductInfoList[${length}].productBomCode" type="text" class="form-control productBomCode" required></td>
 <td><input name="projectProductInfoList[${length}].model" type="text" class="form-control model" required></td>
 <td><textarea name="projectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly></textarea></td>
 <td><input name="projectProductInfoList[${length}].quantity" type="number" class="form-control quantity" step="1" required></td>
 <td><input name="projectProductInfoList[${length}].cataloguePrice" type="text" class="form-control cataloguePrice" required></td>
-<td><input name="projectProductInfoList[${length}].guidanceDiscount" type="number" class="form-control guidanceDiscount" min="0"  step="0.1" required></td>
-<td><input name="projectProductInfoList[${length}].discount" type="number" class="form-control discount" min="0"  step="0.1" required></td>
+<td><input name="projectProductInfoList[${length}].guidanceDiscount" type="number" class="form-control guidanceDiscount" min="0" max="1"  step="0.1" required></td>
+<td><input name="projectProductInfoList[${length}].discount" type="number" class="form-control discount" min="0" max="1" step="0.1" required></td>
 <td><input name="projectProductInfoList[${length}].price" type="number" class="form-control price" placeholder="自动计算" required readonly></td>
 <td><input name="projectProductInfoList[${length}].allPrice" type="number" class="form-control allPrice" placeholder="自动计算" required readonly></td>
 <td><input name="projectProductInfoList[${length}].catalogueAllPrice" type="number" class="form-control catalogueAllPrice" placeholder="自动计算" required readonly></td>
 <td><input name="projectProductInfoList[${length}].remark" type="text" class="form-control"  ></td>
-<td><span>删除</span></td>
+<td><span style="cursor:pointer;color: ff5722" class="delRow">删除</span></td>
 
 </tr>`)
         $('#productTable tbody').append(tr)
@@ -418,13 +418,13 @@
     }
 
     function addLog() {
-        let length = $('#productTable tbody').find('tr').length
+        let length = $('#workLog tbody').find('tr').length
         let tr = $(`
 <tr>
 <td>${length + 1}</td>
-<td><textarea type="text" class="form-control" required></textarea></td>
-<td><input type="text" class="form-control" value="" required readonly></td>
-<td><input type="text" class="form-control" required value="" readonly></td>
+<td><textarea type="text" name="projectOperateLogList[${length}].operateLog" class="form-control" required></textarea></td>
+<td><input type="text" class="form-control"  placeholder="保存后自动填入" required readonly></td>
+<td><input type="text" class="form-control" placeholder="保存后自动填入" readonly></td>
 </tr>`)
         $('#workLog tbody').append(tr)
 
@@ -439,6 +439,17 @@
             let val = $(this).val()
             searchProduct(val, 'model', this)
         })
+        $('#productTable .delRow').on('click', function () {
+            let ele=$(this)
+            $.modal.confirm('是否确认删除',function (){
+                $(ele).parent().parent().remove()
+               $('#productTable tbody tr').each((index,item)=>{
+                   $(item).find('.indexBox').text(index+1)
+               })
+
+            });
+        })
+
     }
 
     function searchProduct(val, type, ele) {