seimin vor 2 Jahren
Ursprung
Commit
805bf83b3d

+ 2 - 1
assets/js/controllers/customform/customformCtrl.js

@@ -17455,6 +17455,7 @@ appFormly.config(function config(formlyConfigProvider) {
17455 17455
         $scope.uploadimgs = [];
17456 17456
         var model = $parse("upload_img");
17457 17457
         var modelSetter = model.assign;
17458
+        var maxNum = $scope.options.templateOptions.maxNum || 3;
17458 17459
 
17459 17460
         var uploader = ($scope.uploader =
17460 17461
           $scope.options.templateOptions.fileUploader);
@@ -17482,7 +17483,7 @@ appFormly.config(function config(formlyConfigProvider) {
17482 17483
               var file = document.querySelector("input[type=file]").files[0];
17483 17484
               $scope.uploadimgs.push(file); //这里是放着传给后台的数据file,下面controller的时候会有
17484 17485
               console.log($scope.imgshows, $scope.uploadimgs);
17485
-              if ($scope.imgshows.length < 3) {
17486
+              if ($scope.imgshows.length < maxNum) {
17486 17487
                 $("#upup").show();
17487 17488
               } else {
17488 17489
                 $("#upup").hide();

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
assets/js/controllers/inspect/inspectReportCtrl.js


+ 8 - 7
assets/views/inspect/inspectReport.html

@@ -45,7 +45,7 @@
45 45
     text-align: center;
46 46
   }
47 47
   .inspectReportCtrl .xj_img {
48
-    width: 50px;
48
+    width: 150px;
49 49
     height: 100px;
50 50
     object-fit: cover;
51 51
     margin: 0 2px;
@@ -197,7 +197,7 @@
197 197
           margin: 0;
198 198
         }
199 199
         #print .xj_img {
200
-          width: 50px;
200
+          width: 150px;
201 201
           height: 100px;
202 202
           object-fit: cover;
203 203
           margin: 0 2px;
@@ -209,11 +209,12 @@
209 209
           line-height: 2;
210 210
           padding-top: 100px;
211 211
           padding-bottom: 100px;
212
+          position: relative;
212 213
         }
213 214
         #print .qz .qz_right{
214
-          float: right;
215
-          margin-right: 200px;
216
-          margin-top: 50px;
215
+          position: absolute;
216
+          bottom: 100px;
217
+          right: 200px;
217 218
         }
218 219
         #print .qz .qz_inner > div{
219 220
           text-indent: 2em;
@@ -222,7 +223,7 @@
222 223
       <div class="fm">
223 224
         <h1>巡&nbsp;&nbsp;检&nbsp;&nbsp;报&nbsp;&nbsp;告</h1>
224 225
         <h2>{{queryList.title?queryList.title.title.split('').join('&nbsp;'):''}}</h2>
225
-        <h3>批次号:{{queryList.batchNo?queryList.batchNo.name:''}}</h3>
226
+        <!-- <h3>批次号:{{queryList.batchNo?queryList.batchNo.name:''}}</h3> -->
226 227
       </div>
227 228
       <div class="qz">
228 229
         <div class="qz_inner">
@@ -264,7 +265,7 @@
264 265
           </td>
265 266
           <td>
266 267
             <div ng-if="data.filePath[true]">线上 <img class="xj_img" ng-click="seePic(data,imageurl)" ng-repeat="(index,imageurl) in data.filePath[true]" ng-src="{{imageurl}}"/></div>
267
-            <div ng-if="data.filePath[false]">线下<img class="xj_img" ng-click="seePic(data,imageurl)" ng-repeat="(index,imageurl) in data.filePath[false]" ng-src="{{imageurl}}"/></div>
268
+            <div style="margin-top: 2px;" ng-if="data.filePath[false]">线下 <img class="xj_img" ng-click="seePic(data,imageurl)" ng-repeat="(index,imageurl) in data.filePath[false]" ng-src="{{imageurl}}"/></div>
268 269
           </td>
269 270
           <td>
270 271
             <div class="td">