Просмотр исходного кода

仓库导入和提现记录导入,更换上传js文件,用本地的

lichunlei 3 лет назад
Родитель
Сommit
cf5bbc251b

+ 1 - 2
Areas/Admin/Views/MainServer/StoreHouse/Import.cshtml

@@ -64,7 +64,6 @@
                             </div>
                             </div>
                         </div>
                         </div>
                         
                         
-
                     </div>
                     </div>
 
 
                 </div>
                 </div>
@@ -77,7 +76,7 @@
     </div>
     </div>
 
 
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/other/oss/upload-min.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
     <script>

+ 1 - 2
Areas/Admin/Views/MainServer/UserCashRecord/Import.cshtml

@@ -50,7 +50,6 @@
                                 </div>
                                 </div>
                             </div>
                             </div>
                         </div>
                         </div>
-                        
 
 
                     </div>
                     </div>
 
 
@@ -64,7 +63,7 @@
     </div>
     </div>
 
 
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/other/oss/upload-min.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
     <script>

+ 11 - 13
wwwroot/layuiadmin/modules_main/MachineChangeDetail_Admin.js

@@ -92,19 +92,17 @@ $('#CreateDate').val(value);
         , cols: [[
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             { type: 'checkbox', fixed: 'left' }
     		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
     		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'ChangeNo', title:'订单号', sort: true}
-,{field:'CreateDate', title:'创建时间', sort: true}
-,{field:'BackProductType', title:'退回产品类型', sort: true}
-,{field:'BackProductName', title:'退回产品名称', sort: true}
-,{field:'UserId', title:'创客', sort: true}
-,{field:'BackSnNo', title:'设备SN编号', sort: true}
-,{field:'BackDeviceStatus', title:'设备状态', sort: true}
-,{field:'OutProductType	', title:'出库产品类型', sort: true}
-,{field:'OutProductName', title:'出库产品名称', sort: true}
-,{field:'OutSnNo', title:'出库设备SN编号', sort: true}
-,{field:'OutSnType', title:'出库SN机具类型', sort: true}
-,{field:'Remark', title:'备注', sort: true}
-,{field:'BackSnType', title:'退回SN机具类型', sort: true}
+            ,{field:'ChangeNo', width:200, title:'订单号', sort: true}
+            ,{field:'CreateDate', width:200, title:'创建时间', sort: true}
+            ,{field:'BackProductName', width:200, title:'退回产品名称', sort: true}
+            ,{field:'UserId', width:200, title:'创客', sort: true}
+            ,{field:'BackSnNo', width:200, title:'设备SN编号', sort: true}
+            ,{field:'BackDeviceStatus', width:200, title:'设备状态', sort: true}
+            ,{field:'OutProductName', width:200, title:'出库产品名称', sort: true}
+            ,{field:'OutSnNo', width:200, title:'出库设备SN编号', sort: true}
+            ,{field:'OutSnType', width:200, title:'出库SN机具类型', sort: true}
+            ,{field:'Remark', width:200, title:'备注', sort: true}
+            ,{field:'BackSnType', width:200, title:'退回SN机具类型', sort: true}
 
 
             , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
             , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }