前端

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -63,10 +63,18 @@
         <td v-if="printData.paramType == '1'" class="col" colspan="1">{{ printData.natureOfGrainPurchase }}</td>
         <td v-else class="col" colspan="2">{{ printData.natureOfGrainPurchase }}</td>
       </tr>
+      <tr class="row">
+        <td class="col col-bgc">仓位号</td>
+        <td class="col">{{ printData.binNumber }}</td>
+        <td class="col col-bgc">囤位号</td>
+        <td class="col">{{ printData.storageTagNo }}</td>
+        <td class="col col-bgc" colspan="2">质检员</td>
+        <td class="col" colspan="2">{{ printData.qualityInspector }}</td>
+      </tr>
     </table>
     <div class="bottom">
       <div class="bottom-row1">
-        <div>质检：{{ printData.qualityInspector }}</div>
+        <div></div>
         <div>{{ printData.qualityDate }}</div>
       </div>
       <div class="bottom-row2">

src/views/houseSelfCollect/paymentManagement.vue

@@ -127,7 +127,7 @@
           <span v-else>已开票</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="300">
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="500">
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button v-if="
@@ -190,9 +190,46 @@
     </el-dialog>
     <!-- 付款截图 -->
     <el-dialog width="50%" :visible.sync="showPayImgs" :append-to-body="true" title="付款截图">
-      <div v-for="(item, index) in payImg" :key="index" class="pay_img">
+      <!-- <div v-for="(item, index) in payImg" :key="index" class="pay_img">
         <img :src="item" alt class="img" />
-      </div>
+      </div> -->
+      <el-upload
+  action="https://www.zthymaoyi.com/upload/admin"
+  list-type="picture-card"
+  :on-success="handleAvatarSuccess1"
+  :file-list='payImg'
+  :limit='1'>
+    <i slot="default" class="el-icon-plus"></i>
+    <div slot="file" slot-scope="{file}">
+      <img
+        class="el-upload-list__item-thumbnail"
+        :src="file.url" alt=""
+      >
+      
+      <span class="el-upload-list__item-actions"> 
+        <span
+          class="el-upload-list__item-preview"
+          @click="handlePictureCardPreview(file)"
+        >
+          <i class="el-icon-zoom-in"></i>
+        </span>
+        <span
+          v-if="!disabled"
+          class="el-upload-list__item-delete"
+          @click="_handleRemove(file)"
+        >
+          <i class="el-icon-delete"></i>
+        </span>
+      </span>
+    </div>
+</el-upload>
+      <!-- <el-upload class="avatar-uploader"  action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+                :on-success="handleAvatarSuccess1" :on-remove="_handleRemove">
+                <img @mouseout='imgshow' @mouseover="deleteshow=true" v-if="payImg" :src="payImg" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                 
+     
+              </el-upload> -->
       <div style="text-align: center; margin: 10px auto">
         <el-button @click="showPayImgs = false" type="primary">关闭</el-button>
       </div>
@@ -213,6 +250,9 @@
         </div>
       </el-dialog>
     </div>
+    <el-dialog :visible.sync="dialogVisible">
+  <img width="100%" :src="dialogImageUrl" alt="">
+</el-dialog>
     <!--客户信息-->
     <el-dialog width="50%" title="客户信息" :visible.sync="customerInfo" :append-to-body="true" :close="customerclose">
       <el-form class="customer">
@@ -302,6 +342,7 @@
     getJurisdiction,
     invoicing,
     export1,
+    settlementEdit
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle
@@ -329,6 +370,7 @@
         form: {},
         formLabelWidth: '300px',
         invoicing: '',
+        deleteshow:false,
         customerlist: {
           payeeAddressUrls: [],
         },
@@ -369,6 +411,9 @@
         isShowPrint: false,
         printData: {},
         warehouse: [],
+        disabled: false,
+        dialogImageUrl:'',
+        dialogVisible:false,
         value1: '', //付款日期
         modification: [],
         userJurisdiction: true,
@@ -402,6 +447,14 @@
       })
     },
     methods: {
+      imgshow(){
+        this.deleteshow=false
+        console.log(11111)
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      },
       previewPayOrder(val){debugger
       this.paymentReceipt = val.paymentScreenshot
       this.isPreviewPayOrder = true
@@ -793,16 +846,24 @@
       },
       //查看付款截图
       showPayImg(row) {
-        if (!row.paymentScreenshot) {
-          this.$message({
-            message: '暂无付款截图！',
-            type: 'warning',
-          })
-          return
-        } else {
+        // if (!row.paymentScreenshot) {
+        //   this.$message({
+        //     message: '暂无付款截图！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // } else {
           this.showPayImgs = true
-          this.payImg = row.paymentScreenshot.split('$')
-        }
+          this.id=row.id
+          var arr=row.paymentScreenshot.split('$')
+          console.log(arr)
+          this.payImg=[]
+          for (let i = 0; i < arr.length; i++) {
+            if(arr[i]!=''){
+              this.payImg.push({url:arr[i]})
+            }
+          }
+        // }
       },
       getWarehouse() {
         let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
@@ -838,6 +899,30 @@
       handleAvatarSuccess(e) {
         this.imageUrl = e.url
       },
+      handleAvatarSuccess1(file) {
+        if(this.payImg[0]){
+          this.$set(this.payImg[0],'url',file.url)
+        }else{
+          this.payImg[0]={
+            url:file.url
+          }
+        }
+        settlementEdit({id:this.id,paymentScreenshot:this.payImg[0].url}).toPromise()
+          .then((response) => {
+            this.showPayImgs=false
+            this.$message.success('修改成功')
+            this.getList()
+          })
+      },
+      _handleRemove(){
+this.payImg[0].url=''
+settlementEdit({id:this.id,paymentScreenshot:this.payImg[0].url}).toPromise()
+          .then((response) => {
+            this.showPayImgs=false
+            this.$message.success('修改成功')
+            this.getList()
+          })
+      },
       printSmall() {
         window.open(
           '../../../../../static/payprint.html?type=1&dataList=' +
@@ -1334,12 +1419,17 @@
   //   width: 150px;
   //   height: 150px;
   // }
+  .avatar-uploader{
+    position:relative;
+    width:178px;
+  }
   .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
     cursor: pointer;
     position: relative;
     overflow: hidden;
+    width:178px;
   }
 
   .avatar-uploader .el-upload:hover {
@@ -1448,4 +1538,7 @@
             width: 200px;
             height: 200px;
         }
+  .el-icon-delete{
+    font-size:20px;
+  }
 </style>