Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/scm/SupplierInfoController.java

@@ -66,7 +66,7 @@ public class SupplierInfoController extends BaseController
         String resultCode = stringObjectMap.get("resultCode").toString();
 
         if ("00".equals(resultCode)){
-            return AjaxResult.success();
+            return AjaxResult.success("上架成功");
         } else {
             return AjaxResult.error(stringObjectMap.get("resultMsg").toString());
         }

ruoyi-admin/src/main/resources/templates/scm/supplier/approve.html

@@ -16,7 +16,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">供应商表示：</label>
+            <label class="col-sm-3 control-label">供应商标识：</label>
             <div class="col-sm-8">
                 <input name="policyNo" th:field="*{supplierInfo.supplierCode}" readonly="true" class="form-control"
                        type="text">

ruoyi-admin/src/main/resources/templates/scm/supplier/supplier.html

@@ -253,6 +253,13 @@
 <!--                                <label>人员邮编：</label>-->
 <!--                                <input type="text" name="headerPostCode"/>-->
 <!--                            </li>-->
+                                <li>
+                                    <label>上下架情况：</label>
+                                    <select name="status" th:with="type=${@dict.getType('is_type')}">
+                                        <option value="">所有</option>
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                    </select>
+                                </li>
 <!--                            <li>-->
 <!--                                <label>上架申请拒绝原因：</label>-->
 <!--                                <input type="text" name="refuseMsg"/>-->
@@ -315,6 +322,7 @@
         var contributCurrencyDatas = [[${@dict.getType('currency')}]];
         var financialIsAccountantDatas = [[${@dict.getType('is_or_no')}]];
         var papersTypeDatas = [[${@dict.getType('papers_number')}]];
+        var statusDatas = [[${@dict.getType('is_type')}]];
         var prefix = ctx + "scm/supplier";
 
         $(function() {
@@ -627,10 +635,17 @@
                     field: 'consPicture',
                     title: '反面盖章图片'
                 },
-                {
-                    field: 'status',
-                    title: '上下架情况'
-                },
+                    {
+                        field: 'status',
+                        title: '上下架情况',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(statusDatas, value);
+                        }
+                    },
+                // {
+                //     field: 'status',
+                //     title: '上下架情况'
+                // },
                 {
                     field: 'refuseMsg',
                     title: '上架申请拒绝原因'