8.26

src/views/BasicSettings/partCombination/index.vue

@@ -171,8 +171,8 @@
             </template>
           </vxe-grid>
         </div>
-        <div>大型车部位档案</div>
-        <div style="max-height: 200px; border: 1px solid #fff">
+        <div style="margin-top: 50px">大型车部位档案</div>
+        <div style="max-height: 200px; border: 1px solid #fff;">
           <vxe-grid
             v-bind="modalGridOptions1"
             :footer-method="footerMethod"
@@ -216,7 +216,7 @@
             </template>
           </vxe-grid>
         </div>
-        <div style="margin-top: 20px">所属集团</div>
+        <div style="margin-top: 50px">所属集团</div>
         <div style="max-height: 200px; border: 1px solid #fff">
           <vxe-grid v-bind="companyGridOptions">
             <template #set="{ rowIndex }">
@@ -711,4 +711,4 @@ export default {
   max-height: calc(100% - 150px);
   border: 1px solid #fff;
 }
-</style>
+</style>

src/views/BusinessManagement/Construction/detail.vue

@@ -362,6 +362,10 @@
                 v-model="ele.roll_film_combine_id"
                 style="width: 200px"
                 :disabled="!formData.company_id || !formData.car_file_id"
+                @on-change="
+                  ($event) =>
+                    is_ready ? handleSelectCombine($event, index) : ''
+                "
               >
                 <Option
                   v-for="item in SureRollFilmCombineList"
@@ -488,29 +492,32 @@
             v-show="formData.basic_type_item_id && img_type.indexOf('1') != -1"
           >
             <div class="total_img">
-              <div v-show="imgData['1']" class="img_content">
+              <div
+                  class="img_content"
+                  v-for="(item, index) in imgData['1']"
+                  :key="index"
+              >
                 <img
-                  @click="looks(imgData['1'])"
-                  :src="$store.state.ip + imgData['1']"
-                  alt=""
+                    @click="looks(imgData['1'], true)"
+                    :src="$store.state.ip + item"
+                    alt=""
                 />
                 <Icon
-                  v-show="type != 3"
-                  size="20"
-                  @click="imgData['1'] = ''"
-                  class="delete-img"
-                  type="ios-close-circle"
+                    v-show="type != 3"
+                    size="20"
+                    @click="imgData['1'].splice(index, 1)"
+                    class="delete-img"
+                    type="ios-close-circle"
                 />
               </div>
               <Upload
-                multiple
-                :headers="headers"
-                v-show="!imgData['1']"
-                :show-upload-list="false"
-                :max-size="3072"
-                :on-success="(res) => handleSuccess(res, '1')"
-                :before-upload="handleError"
-                :action="$store.state.ip + '/api/uploadConstructionFile'"
+                  multiple
+                  :headers="headers"
+                  :show-upload-list="false"
+                  :max-size="3072"
+                  :on-success="(res) => handleSuccess(res, '1')"
+                  :before-upload="handleError"
+                  :action="$store.state.ip + '/api/uploadConstructionFile'"
               >
                 <div class="upd_file">
                   <Icon type="ios-cloud-upload-outline" class="ico" size="50" />
@@ -871,7 +878,7 @@ export default {
         status: 0
       },
       imgData: {
-        '1': '',
+        '1': [],
         '2': '',
         '3': [],
         '4': '',
@@ -1052,9 +1059,11 @@ export default {
       });
     },
     handleSuccess(res, type) {
-      if (res.code == 200) {
+      if (res.code === 200) {
         if (type === '3') {
           this.imgData['3'].push(res.data.url);
+        } else if (type === '1') {
+          this.imgData['1'].push(res.data.url);
         } else {
           this.imgData[type] = res.data.url;
         }
@@ -1078,7 +1087,7 @@ export default {
         this.SureRollFilmCombineList = this.rollFilmCombineList.filter(v => (this.formData.company_id ? v.company_id == this.formData.company_id : true))
       }
       this.imgData = {
-        '1': '',
+        '1': [],
         '2': '',
         '3': [],
         '4': '',
@@ -1141,7 +1150,7 @@ export default {
         this.constructionPersonList = arr2.concat(arr1);
         this.formData.img.forEach(v => {
           if (v.src) {
-            if (v.type === 3) {
+            if (v.type == 3 || v.type == 1) {
               this.imgData[v.type] = v.src.split(',');
             } else {
               this.imgData[v.type] = v.src
@@ -1214,7 +1223,7 @@ export default {
         if (this.imgData[v] && this.imgData[v].length != 0) {
 
           let obj = {};
-          if (v === '3') {
+          if (v === '3' || v === '1') {
 
             obj.type = v;
             obj.src = this.imgData[v].toString();

src/views/Report/RollFilmInAndOutList/index.vue

@@ -161,7 +161,8 @@ export default {
           { field: 'start_number', title: '期初数量', showHeaderOverflow: true, minWidth: 100 },
           { field: 'in_number', title: '本期收入', showHeaderOverflow: true, minWidth: 100 },
           { field: 'out_number', title: '本期发出', showHeaderOverflow: true, minWidth: 100 },
-          { field: 'end_number', title: '期末结存', showHeaderOverflow: true, minWidth: 100 }
+          { field: 'end_number', title: '期末结存', showHeaderOverflow: true, minWidth: 100 },
+          { field: 'combine_num', title: '已贴车数', showHeaderOverflow: true, minWidth: 100 }
         ],
         data: []
       },
@@ -251,4 +252,4 @@ export default {
 .table_content {
   height: calc(100% - 250px);
 }
-</style>
+</style>