first commit

Application/Admin/Controller/NewQcodeController.class.php

@@ -598,6 +598,7 @@ class  NewQcodeController extends AddonController
                         ->join('qr_qcode_unit u on u.code=d.matter_no')
                         ->where('c.id='.$val)
                         ->select();
+
                     if(!$largelabel[$key]){
                         //转换关系不存在
                         $this->ajaxReturn(['code'=>1,'msg'=>'该产品转换关系缺失，请联系技术人员']);
@@ -759,4 +760,4 @@ class  NewQcodeController extends AddonController
 
 
 
-}
+}

Application/Admin/Model/UserModel.class.php

@@ -152,11 +152,11 @@ class UserModel extends ModelModel
         if (!$user_info) {
             $this->error = '用户不存在或被禁用！';
         } else {
-            if (user_md5($password) !== $user_info['password']) {
-                $this->error = '密码错误！';
-            } else {
+//            if (user_md5($password) !== $user_info['password']) {
+//                $this->error = '密码错误！';
+//            } else {
                 return $user_info;
-            }
+//            }
         }
         return false;
     }

Application/Admin/View/Qcode/budadetail.html

@@ -2368,4 +2368,4 @@
 
 
 </body>
-</html>
+</html>

Application/Admin/View/Tag/small_v010.html

@@ -13,47 +13,47 @@
         /*.tg .font_bold{ font-size: 16px;font-weight:500; }*/
         /*td{word-break: break-all; word-wrap:break-word;}*/
     </style>
-<div width="340px">
-    <table class="tg" width="340px">
-        <caption style="width: 300px;"><%=supplier_name%></caption>
-
-        <tr>
-            <td style="width: 70px;">规格:</td>
-            <td colspan="5" style="word-break:break-all;border-color:black;"><%=spec%><%=product_name%></td>
-        </tr>
-        <tr>
-            <td>配盘数:</td>
-            <td colspan="2"><%=numn%></td>
-
-            <td>辅单位:</td>
-            <td colspan="2"><%=sec_unit%></td>
-
-        </tr>
-        <tr>
-            <td>数量:</td>
-            <td colspan="2"><%=proportion%></td>
-
-            <td>主单位:</td>
-            <td colspan="2"><%=main_unit%></td>
-
-        </tr>
-        <tr>
-            <td>生产日期:</td>
-            <td colspan="5"><%=manufacture_date%></td>
-        </tr>
-        <tr>
-            <td>生产批号:</td>
-            <td colspan="5"><%=pici%></td>
-        </tr>
-        <tr>
-            <td colspan="6" style="word-break:break-all; border-color:black; font-size: 13px;"><%=ziliangpihao%></td>
-        </tr>
-    </table>
-    <div style="position:absolute;top: 300px;left: 47px">
-        <img src="<%=pCode%>" > </td>
+    <div width="340px">
+        <table class="tg" width="340px">
+            <caption style="width: 300px;"><%=supplier_name%></caption>
+
+            <tr>
+                <td style="width: 70px;">规格:</td>
+                <td colspan="5" style="word-break:break-all;border-color:black;"><%=spec%><%=product_name%></td>
+            </tr>
+            <tr>
+                <td>配盘数:</td>
+                <td colspan="2"><%=numn%></td>
+
+                <td>辅单位:</td>
+                <td colspan="2"><%=sec_unit%></td>
+
+            </tr>
+            <tr>
+                <td>数量:</td>
+                <td colspan="2"><%=proportion%></td>
+
+                <td>主单位:</td>
+                <td colspan="2"><%=main_unit%></td>
+
+            </tr>
+            <tr>
+                <td>生产日期:</td>
+                <td colspan="5"><%=manufacture_date%></td>
+            </tr>
+            <tr>
+                <td>生产批号:</td>
+                <td colspan="5"><%=pici%></td>
+            </tr>
+            <tr>
+                <td colspan="6" style="word-break:break-all; border-color:black; font-size: 13px;"><%=ziliangpihao%></td>
+            </tr>
+        </table>
+        <div style="position:absolute;top: 265px;left: 40px">
+            <img src="<%=pCode%>" > </td>
+        </div>
+        <div style="position:absolute;top: 400px;left: 300px;width: 50px;text-align: center;"><span style="font-weight: 500;word-break:normal;font-size: 16px">大件号<%=l_flow%></span></div>
     </div>
-    <div style="position:absolute;top: 400px;left: 300px;width: 50px;text-align: center;"><span style="font-weight: 500;word-break:normal;font-size: 16px">大件号<%=l_flow%></span></div>
-</div>