huangfuli 3 vuotta sitten
vanhempi
commit
d230a752fc

+ 0 - 1
src/views/tranManagement/tranManagementFireFeedback.vue

@@ -119,7 +119,6 @@
                 </el-upload>
                 </el-upload>
                 <span v-if="item.imgCount > 0">{{item.imgCount}}</span>
                 <span v-if="item.imgCount > 0">{{item.imgCount}}</span>
                 <span v-if="item.imgCount == 0">未上传</span>
                 <span v-if="item.imgCount == 0">未上传</span>
-              <!-- <el-button class="bg-bottom-preview" type="primary" size="small" @click="preview(item)"  v-if="item.imgCount != null ">预览</el-button> -->
               <el-button v-if="item.imgCount>0" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button>
               <el-button v-if="item.imgCount>0" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button>
               </template>
               </template>
             </ws-form-item>
             </ws-form-item>

+ 3 - 2
src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -145,10 +145,10 @@
                     top: -1px;
                     top: -1px;
                   "
                   "
                   src="../../../public/img/fujian.png"
                   src="../../../public/img/fujian.png"
-                  @click="fujian(index)"
+                  :data-img="item.loadPoundImg"
+                  @click="$imgPreview"
                   alt=""
                   alt=""
                 />
                 />
-
                 <span
                 <span
                   v-if="
                   v-if="
                     deptBudgetList.tranCarInfoList[index].loadPoundImgArr
                     deptBudgetList.tranCarInfoList[index].loadPoundImgArr
@@ -165,6 +165,7 @@
                   "
                   "
                   >无</span
                   >无</span
                 >
                 >
+                <!-- <el-button v-if="item.loadPoundImg != null" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button> -->
               </template>
               </template>
             </ws-form-item>
             </ws-form-item>
             <!--装车日期-->
             <!--装车日期-->

+ 21 - 9
src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -197,8 +197,9 @@
                     alt=""
                     alt=""
                   />
                   />
                 </el-upload>
                 </el-upload>
-                <span v-if="item.unloadPoundImg != null">1</span>
-                <span v-if="item.unloadPoundImg == null">未上传</span>
+                <span v-if="item.imgCount > 0">{{item.imgCount}}</span>
+                <span v-if="item.imgCount == 0">未上传</span>
+                <el-button v-if="item.imgCount>0" class="bg-bottom-preview" type="primary" size="small" :data-img="item.unloadPoundImg" @click="$imgPreview">预览</el-button>
               </template>
               </template>
             </ws-form-item>
             </ws-form-item>
             <!--卸车日期-->
             <!--卸车日期-->
@@ -395,10 +396,10 @@ export default {
         {
         {
           boxNo: '',
           boxNo: '',
           unloadNetWeight: '',
           unloadNetWeight: '',
-          unloadPoundImg: null,
+          unloadPoundImg: '',
           unloadingDate: '',
           unloadingDate: '',
+          imgCount: 0
         },
         },
-        // {loadPoundImg:{}},
       ],
       ],
       name: '',
       name: '',
       staffList: [],
       staffList: [],
@@ -537,20 +538,20 @@ export default {
               ) {
               ) {
                 _this.freightspace[k] = _this.excelFreightspace[i]
                 _this.freightspace[k] = _this.excelFreightspace[i]
                 if (
                 if (
-                  _this.excelFreightspace[i].loadPoundImg.split(',').length > 0
+                  _this.excelFreightspace[i].unloadPoundImg.split(',').length > 0
                 ) {
                 ) {
                   _this.freightspace[k].imgCount =
                   _this.freightspace[k].imgCount =
-                    _this.excelFreightspace[i].loadPoundImg.split(',').length
+                    _this.excelFreightspace[i].unloadPoundImg.split(',').length
                 }
                 }
                 _ispushData = false
                 _ispushData = false
               }
               }
             }
             }
             if (_ispushData) {
             if (_ispushData) {
               if (
               if (
-                _this.excelFreightspace[i].loadPoundImg.split(',').length > 0
+                _this.excelFreightspace[i].unloadPoundImg.split(',').length > 0
               ) {
               ) {
                 _this.excelFreightspace[i].imgCount =
                 _this.excelFreightspace[i].imgCount =
-                  _this.excelFreightspace[i].loadPoundImg.split(',').length
+                  _this.excelFreightspace[i].unloadPoundImg.split(',').length
               }
               }
               _this.freightspace.push(_this.excelFreightspace[i])
               _this.freightspace.push(_this.excelFreightspace[i])
 
 
@@ -739,11 +740,22 @@ export default {
             if (!this.freightspace[i].loadNetWeight) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
               this.freightspace[i].loadNetWeight = 0
             }
             }
+            if (this.freightspace[i].unloadPoundImg) {
+                this.freightspace[i].imgCount = this.freightspace[i].unloadPoundImg.split(",").length
+              } else {
+                this.freightspace[i].unloadPoundImg = ""
+                this.freightspace[i].imgCount = 0
+              }
           }
           }
         })
         })
     },
     },
     uploadSuccessHandle1(e, index) {
     uploadSuccessHandle1(e, index) {
-      this.freightspace[index].unloadPoundImg = e.url
+      this.index = index
+        let that = this;
+        that.$forceUpdate();
+        that.freightspace[that.index].imgCount++
+        console.log(that.freightspace[that.index].imgCount)
+        that.freightspace[that.index].unloadPoundImg += e.url + ","
     },
     },
   },
   },
 }
 }

+ 3 - 1
src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -154,7 +154,8 @@
                     top: -1px;
                     top: -1px;
                   "
                   "
                   src="../../../public/img/fujian.png"
                   src="../../../public/img/fujian.png"
-                  @click="fujian(index)"
+                  :data-img="item.unloadPoundImg"
+                  @click="$imgPreview"
                   alt=""
                   alt=""
                 />
                 />
 
 
@@ -264,6 +265,7 @@
 import { regionData } from 'element-china-area-data'
 import { regionData } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 import mapDrag from '@/components/mapdrag/mapdrag'
+import { seeCat} from '@/model/transport/index'
 export default {
 export default {
   name: 'viewSpareMoney',
   name: 'viewSpareMoney',
   components: {
   components: {

+ 6 - 0
src/views/tranManagement/tranManagementReceivingloading.vue

@@ -294,6 +294,9 @@
                     "
                     "
                     >未上传</span
                     >未上传</span
                   >
                   >
+                  <el-button v-if="deptBudgetList.tranCarInfoList[index].unloadPoundImg !=null"  
+                  class="bg-bottom-preview" type="primary" size="small" :data-img="deptBudgetList.tranCarInfoList[index].unloadPoundImg" @click="$imgPreview">
+                  <span style="margin-left: -7px;">预览</span></el-button>
                 </template>
                 </template>
               </ws-form-item>
               </ws-form-item>
               <!--箱号-->
               <!--箱号-->
@@ -1000,4 +1003,7 @@ export default {
   // width: 120px;
   // width: 120px;
   // line-height: 40px;
   // line-height: 40px;
 }
 }
+.bg-bottom-preview{
+    margin: 0 8px;
+  }
 </style>
 </style>

+ 2 - 1
src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -155,7 +155,8 @@
                     top: -1px;
                     top: -1px;
                   "
                   "
                   src="../../../public/img/fujian.png"
                   src="../../../public/img/fujian.png"
-                  @click="fujian(index)"
+                  @click="$imgPreview"
+                  :data-img="deptBudgetList.tranCarInfoList[index].unloadPoundImg"
                   alt=""
                   alt=""
                 />
                 />
                 <span
                 <span

+ 3 - 2
src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -348,6 +348,8 @@
                 >未上传</span
                 >未上传</span
               >
               >
             </div>
             </div>
+            <el-button v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg != null" 
+               class="bg-bottom-preview" type="primary" size="small" :data-img="deptBudgetList.tranCarInfoList[0].loadPoundImg" @click="$imgPreview">预览</el-button>
           </template>
           </template>
         </ws-form-item>
         </ws-form-item>
 
 
@@ -901,8 +903,7 @@ export default {
             this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
             this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
             this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
             this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
             this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
             this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
-            this.deptBudgetList.boxNumber =
-              response.tranCarInfoList[0].boxNumber
+            this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
             //上传附件计数
             //上传附件计数
             if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
             if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
               this.pictureTotal =
               this.pictureTotal =

+ 3 - 1
src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -135,7 +135,9 @@
                     vertical-align: text-top;
                     vertical-align: text-top;
                     position: relative;
                     position: relative;
                     top: -1px;
                     top: -1px;
-                  " src="../../../public/img/fujian.png" @click="fujian()" alt />
+                  " src="../../../public/img/fujian.png" 
+                  :data-img="deptBudgetList.tranCarInfoList[0].loadPoundImg"
+                  @click="$imgPreview" alt />
           <span v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length > 0">
           <span v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length > 0">
             {{ deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length}}
             {{ deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length}}
           </span>
           </span>

+ 4 - 14
src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -154,12 +154,9 @@
                 <span v-if="
                 <span v-if="
                     item.loadPoundImg == null
                     item.loadPoundImg == null
                   ">未上传</span>
                   ">未上传</span>
+                  <el-button v-if="item.loadPoundImg != null" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button>
               </template>
               </template>
             </ws-form-item>
             </ws-form-item>
-            <!--预览-->
-            <div>
-              <el-button class="bg-bottom" type="primary" size="small" @click="preview(item)"  v-if="item.loadPoundImg != null ">预览</el-button>
-            </div>
             <!--箱号-->
             <!--箱号-->
             <ws-form-item label="箱号:" span="1" prop="caseNo">
             <ws-form-item label="箱号:" span="1" prop="caseNo">
               <span>{{ item.caseNo }}</span>
               <span>{{ item.caseNo }}</span>
@@ -197,11 +194,6 @@
       <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
       <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
       <el-button class="bg-bottom" type="primary" size="small" @click="finished (deptBudgetList)">完货</el-button>
       <el-button class="bg-bottom" type="primary" size="small" @click="finished (deptBudgetList)">完货</el-button>
     </div>
     </div>
-    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
-			@on-cancel="handleClose">
-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-		</WinseaContentModal>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -345,11 +337,6 @@
       }
       }
     },
     },
     methods: {
     methods: {
-      preview(item) {
-				this.accessoryTFs = true
-				this.appendixIdss = item.loadPoundImg
-			},
-
       uploadHandle(response, file, fileList) {
       uploadHandle(response, file, fileList) {
         this.localFile = file.raw // 或者 this.localFile=file.raw
         this.localFile = file.raw // 或者 this.localFile=file.raw
         let Base64 = require('js-base64').Base64
         let Base64 = require('js-base64').Base64
@@ -1251,4 +1238,7 @@
   /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
     padding: 0px;
     padding: 0px;
   }
   }
+  .bg-bottom-preview{
+    margin: 0 8px;
+  }
 </style>
 </style>

+ 3 - 1
src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -150,7 +150,8 @@
                     top: -1px;
                     top: -1px;
                   "
                   "
                   src="../../../public/img/fujian.png"
                   src="../../../public/img/fujian.png"
-                  @click="fujian(index)"
+                  :data-img="item.loadPoundImg"
+                  @click="$imgPreview"
                   alt=""
                   alt=""
                 />
                 />
 
 
@@ -169,6 +170,7 @@
                       .length == 0
                       .length == 0
                   "
                   "
                   >无</span>
                   >无</span>
+                  <!-- <el-button v-if="item.loadPoundImg != null" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button> -->
               </template>
               </template>
             </ws-form-item>
             </ws-form-item>
              <!--箱号-->
              <!--箱号-->

+ 32 - 12
src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -293,7 +293,7 @@
         >
         >
       </div>
       </div>
       <!--运单-->
       <!--运单-->
-      <ws-form-item label="运单:" span="1" prop="loadPoundImg">
+      <ws-form-item label="运单:" span="1" prop="unloadPoundImg">
         <!-- slot-scope="scope" -->
         <!-- slot-scope="scope" -->
         <template>
         <template>
           <el-upload
           <el-upload
@@ -317,19 +317,21 @@
           <div class="tupian">
           <div class="tupian">
             <span
             <span
               v-if="
               v-if="
-                deptBudgetList.tranCarInfoList[0] &&
-                deptBudgetList.tranCarInfoList[0].loadPoundImg != null
+                deptBudgetList.tranCarInfoList.length > 0 &&
+                  deptBudgetList.tranCarInfoList[0].unloadPoundImg != null
               "
               "
-              >1</span
+              >{{ pictureTotal }}</span
             >
             >
             <span
             <span
               v-if="
               v-if="
-                deptBudgetList.tranCarInfoList[0] &&
-                deptBudgetList.tranCarInfoList[0].loadPoundImg == null
+                deptBudgetList.tranCarInfoList.length > 0 &&
+                  deptBudgetList.tranCarInfoList[0].unloadPoundImg == null
               "
               "
               >未上传</span
               >未上传</span
             >
             >
           </div>
           </div>
+          <el-button v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].unloadPoundImg != null" 
+               class="bg-bottom-preview" type="primary" size="small" :data-img="deptBudgetList.tranCarInfoList[0].unloadPoundImg" @click="$imgPreview">预览</el-button>
         </template>
         </template>
       </ws-form-item>
       </ws-form-item>
     </ws-form>
     </ws-form>
@@ -374,6 +376,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      pictureTotal: 0,
       deptBudgetList: {
       deptBudgetList: {
         totalStorage: 0,
         totalStorage: 0,
       },
       },
@@ -431,16 +434,15 @@ export default {
           driverPhone: '',
           driverPhone: '',
           carNo: '',
           carNo: '',
           loadNetWeight: '',
           loadNetWeight: '',
-          loadPoundImg: '',
+          unloadPoundImg: '',
         },
         },
-        // {loadPoundImg:{}},
       ],
       ],
       name: '',
       name: '',
       staffList: [],
       staffList: [],
       options: [],
       options: [],
       carModel: [],
       carModel: [],
       tranCarInfoList: {
       tranCarInfoList: {
-        loadPoundImg: '',
+        unloadPoundImg: '',
       },
       },
       excelFreightspace:[],
       excelFreightspace:[],
       //上传
       //上传
@@ -783,7 +785,8 @@ export default {
         .toPromise()
         .toPromise()
         .then((response) => {
         .then((response) => {
           this.deptBudgetList = response
           this.deptBudgetList = response
-          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          if(response.tranCarInfoList.length > 0){
+            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
             response.tranCarInfoList[0].driverPhone
           this.$set(
           this.$set(
@@ -797,8 +800,17 @@ export default {
           this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
           this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
           this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
           this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
           this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
           this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          //上传附件计数
+            if (this.deptBudgetList.tranCarInfoList[0].unloadPoundImg) {
+              this.pictureTotal =
+                this.deptBudgetList.tranCarInfoList[0].unloadPoundImg.split(
+                  ','
+                ).length
+            }
+
           this.freightspace = response.tranCarInfoList
           this.freightspace = response.tranCarInfoList
+          }
+          
           for (var i = 0; i < this.freightspace.length; i++) {
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
               this.freightspace[i].loadNetWeight = 0
@@ -857,7 +869,15 @@ export default {
       }
       }
     },
     },
     uploadSuccessHandle1(e, index) {
     uploadSuccessHandle1(e, index) {
-      this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
+      this.pictureTotal++
+      if (this.deptBudgetList.tranCarInfoList[0].unloadPoundImg) {
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImg += ',' + e.url
+      } else {
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImg = e.url
+      }
+      feedback(this.deptBudgetList)
+        .toPromise()
+        .then((response) => {})
     },
     },
   },
   },
 }
 }

+ 13 - 12
src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -211,7 +211,7 @@
         }}</span>
         }}</span>
       </div>
       </div>
       <!--运单-->
       <!--运单-->
-            <ws-form-item label="运单:" span="1" prop="loadPoundImg">
+            <ws-form-item label="运单:" span="1" prop="unloadPoundImg"> 
               <template>
               <template>
                 <img
                 <img
                   width="18"
                   width="18"
@@ -222,21 +222,22 @@
                     top: -1px;
                     top: -1px;
                   "
                   "
                   src="../../../public/img/fujian.png"
                   src="../../../public/img/fujian.png"
-                  @click="fujian()"
+                  :data-img="deptBudgetList.tranCarInfoList[0].unloadPoundImg"
+                  @click="$imgPreview"
                   alt=""
                   alt=""
                 />
                 />
                 <span
                 <span
                   v-if="deptBudgetList.tranCarInfoList[0]&&
                   v-if="deptBudgetList.tranCarInfoList[0]&&
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+                    deptBudgetList.tranCarInfoList[0].unloadPoundImgArr
                       .length > 0
                       .length > 0
                   "
                   "
                   >{{
                   >{{
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length
+                    deptBudgetList.tranCarInfoList[0].unloadPoundImgArr.length
                   }}</span
                   }}</span
                 >
                 >
                  <span
                  <span
                   v-if="deptBudgetList.tranCarInfoList[0]&&
                   v-if="deptBudgetList.tranCarInfoList[0]&&
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+                    deptBudgetList.tranCarInfoList[0].unloadPoundImgArr
                       .length == 0
                       .length == 0
                   "
                   "
                   >无</span>
                   >无</span>
@@ -457,12 +458,12 @@ export default {
               this.freightspace[i].loadNetWeight = 0
               this.freightspace[i].loadNetWeight = 0
             }
             }
             if (this.deptBudgetList.tranCarInfoList[i]&&this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
             if (this.deptBudgetList.tranCarInfoList[i]&&this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.deptBudgetList.tranCarInfoList[i].unloadPoundImgArr =
+              this.deptBudgetList.tranCarInfoList[i].unloadPoundImg.split(',')
               this.fileList[i] =
               this.fileList[i] =
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.deptBudgetList.tranCarInfoList[i].unloadPoundImg.split(',')
             } else {
             } else {
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
+              this.deptBudgetList.tranCarInfoList[i].unloadPoundImgArr = []
             }
             }
           }
           }
         })
         })
@@ -505,8 +506,8 @@ export default {
     //上传
     //上传
     fujian(e) {
     fujian(e) {
       if (
       if (
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === null ||
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === ''
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImg === ''
       ) {
       ) {
         this.$message({
         this.$message({
           message: '暂无附件!',
           message: '暂无附件!',
@@ -517,7 +518,7 @@ export default {
         this.accessoryTFs = true
         this.accessoryTFs = true
       }
       }
       this.appendixIdss =
       this.appendixIdss =
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImgArr
     },
     },
   },
   },
 }
 }