Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -376,10 +376,15 @@
         show-footer
         class="vxeModal"
       >
-        <div class="demo-image__preview">
+          <div
+          class="demo-image__preview"
+          v-for="item in srcList"
+          :key="item.src"
+        >
+          <span>{{ item.title }}</span>
           <el-image
-            style=" height:731px;text-align:center;"
-            :src="src"
+            style="height:731px;text-align:center"
+            :src="item.src"
             @click="receiveClick(item.src)"
           >
             <div slot="error" class="image-slot">
@@ -765,12 +770,19 @@
             title="抵达上传照片"
           >
             <div class="demo-image__preview">
-              <el-image style=" height:731px;text-align:center;" :src="src">
+              <div
+              class="demo-image__preview"
+              v-for="(item, index) in srcList"
+              :key="index"
+            >
+              <span>{{ item.title }}</span>
+              <el-image style="height:731px;text-align:center" :src="item.src">
                 <div slot="error" class="image-slot">
-                  <span>司机未上传图片</span>
+                  <span>司机未上传抵达图片</span>
                 </div>
               </el-image>
             </div>
+            </div>
           </vxe-modal>
           <vxe-modal
             width="549px"
@@ -787,7 +799,7 @@
               <span>{{ item.title }}</span>
               <el-image style="height:731px;text-align:center" :src="item.src">
                 <div slot="error" class="image-slot">
-                  <span>司机未上传图片</span>
+                  <span>司机未上传签收图片</span>
                 </div>
               </el-image>
             </div>
@@ -987,7 +999,7 @@
       :visible.sync="arrivalReceiving"
       :before-close="closeUpload"
     >
-      <el-form :inline="true" style="margin-left:20%">
+      <el-form  style="margin-left:20%">
         <el-form-item label="车牌号码">
           <el-input
             v-model="capacityNumber"
@@ -996,14 +1008,14 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="签收地址">
-          <el-input v-model="location" style="width:300px"></el-input>
+          <el-input v-model="location" style="width:400px"></el-input>
         </el-form-item>
-        <el-form-item label="抵达图片">
+        <el-form-item label="抵达图片（车头、满货箱）" style="">
           <el-upload
             ref="arrival"
             list-type="picture-card"
             action="/api/v1/otms/addtmstruckArrivalResult"
-            :limit="1"
+            :limit="2"
             :on-change="fileChange1"
             :on-preview="handlePictureCardPreview"
             :on-exceed="exceed"
@@ -1505,10 +1517,6 @@ export default {
         this.$message.warning('该车未出厂，不允许签收')
         return
       }
-      if (row.arrivalAddress != null && row.receiptAddress != null) {
-        this.$message.warning('该车已有抵达签收实绩，不允许签收')
-        return
-      }
       if (row.arrivalAddress) {
         this.location = row.arrivalAddress
       } else {
@@ -1523,8 +1531,8 @@ export default {
         this.$message.warning('请填写签收地址')
         return
       }
-      if (this.fileListArrival.length < 1) {
-        this.$message.warning('请上传抵达图片')
+      if (this.fileListArrival.length < 2) {
+        this.$message.warning('抵达图至少两张')
         return
       }
       if (this.fileListReceive.length < 3) {
@@ -1534,7 +1542,8 @@ export default {
       this.isLoading = true
       //上传抵达
       let formData = new window.FormData()
-      formData.append('file', this.fileListArrival[0].raw)
+      formData.append('file1', this.fileListArrival[0].raw);
+      formData.append('file2', this.fileListArrival[1].raw)
       formData.append('orderNumber', this.orderNumber)
       formData.append('resultArrivalAddress', this.location)
       let options = {
@@ -1593,6 +1602,7 @@ export default {
     },
     closeUpload() {
       this.arrivalReceiving = false
+      this.isLoading = false
       this.$refs.arrival.clearFiles()
       this.$refs.receive.clearFiles()
     },
@@ -1935,13 +1945,19 @@ export default {
         .post('/api/v1/otms/getArrivalPhoto?orderNumber=' + orderNo)
         .then(res => {
           this.srcList = []
-          this.src = res.data.data
+           this.srcList.push({
+              title: '车头照片',
+              src: res.data[0]
+            });
+            this.srcList.push({
+              title: '满货箱照片',
+              src: res.data[1]
+            });
           if (num == 1) {
             this.isShow3 = true
           } else {
             this.isShow = true
           }
-          this.srcList.push(res.data.data)
         })
     },
     //查看实时路径