前端

public/static/payprint1.html

@@ -320,8 +320,8 @@
                                 <td class="col col-bgc">霉变粒</td>
                                 <td class="col col-bgc">热损伤</td>
                                 <td class="col col-bgc">不完善粒</td>
-                                <td class="col col-bgc">扣重比</td>
-                                <td v-if="printData1[index].type=='潮粮'" class="col col-bgc">扣量%</td>
+                                <td v-if="printData1[index].type=='潮粮'" class="col col-bgc">扣重比</td>
+                                <td class="col col-bgc">扣量%</td>
                                 <td :colspan="printData1[index].type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
                             </tr>
                             <tr class="row">
@@ -348,8 +348,7 @@
                                 <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData1[index].buckleWeightRatio}}</td>
                                 <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                                 <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'"></td>
-                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col "></td>
-                                <td :colspan="printData.type == '潮粮'?1:2" class="col ">{{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.binNumber:''}}</td>
+                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col ">{{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.binNumber:''}}</td>
                                 <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                             </tr>
                             <tr class="row">

src/views/houseSelfCollect/settlement.vue

@@ -260,6 +260,43 @@
               <ws-input v-model="paymentList.remarks" placeholder="备注信息，不超过20个字" maxlength="20" :disabled="disabled"
                 size="small" />
             </ws-form-item>
+            <ws-form-item label="记事（选填）" span="1" prop="waterContent">
+              <ws-input v-model="paymentList.remarks" placeholder="备注信息，不超过20个字" maxlength="20" :disabled="disabled"
+                size="small" />
+            </ws-form-item>
+          </ws-info-table>
+          <ws-info-table v-if="!this.disabled">
+            <div class="avatar-uploader-wrap">
+            <ws-form-item label="自产证明" span="1" prop="waterContent">
+                <el-image 
+                v-if="paymentList.selfCertificate"
+                  style="width: 178px; height: 178px;"
+                  :src="paymentList.selfCertificate" 
+                  :preview-src-list="[paymentList.selfCertificate]">
+                </el-image>
+                <el-upload  v-else
+                  class="avatar-uploader"
+                  :action="global.uploadPath"
+                  :show-file-list="false"
+                  :on-success="uploadSuccess"
+                  accept=".jpg, .jpeg, .png, .gif"
+                >
+                <i  class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+              </ws-form-item> 
+            </div>
+          </ws-info-table>
+          <ws-info-table v-else>
+            <div class="avatar-uploader-wrap">
+            <ws-form-item label="自产证明" span="1" prop="waterContent">
+                <el-image 
+                v-if="paymentList.selfCertificate"
+                  style="width: 178px; height: 178px;"
+                  :src="paymentList.selfCertificate" 
+                  :preview-src-list="[paymentList.selfCertificate]">
+                </el-image>
+              </ws-form-item> 
+            </div>
           </ws-info-table>
           <div class="but">
             <el-button @click="cancel" v-if="this.types == 1" type="primary">取消</el-button>
@@ -586,6 +623,9 @@
       }
     },
     methods: {
+      uploadSuccess(e) {
+      this.$set(this.paymentList, 'selfCertificate', e.data.url)
+    },
       changeEw(e) {
         this.ddchecked = false
         if (e) {
@@ -971,6 +1011,7 @@
             return
           }
         }
+        
         if (this.paymentList.weighingSubsidy < 0 || this.paymentList.weighingSubsidy > 100000) {
           this.$message({
             message: '称重补助范围应在0-100000内',
@@ -1056,6 +1097,13 @@
           })
           return
         }
+        if (!this.paymentList.selfCertificate&&localStorage.getItem('ws-pf_compName')=='黑龙江中天昊元贸易有限公司'||!this.paymentList.selfCertificate&&localStorage.getItem('ws-pf_compName')=='吉林昊友城元粮食贸易有限公司') {
+          this.$message({
+            message: '请上传自产证明!',
+            type: 'warning',
+          })
+          return
+        }
         this.paymentList.id = this.$route.query.id
         this.paymentList.amountIngPayable = this.paymentList.actualPayment
         this.paymentList.settlementClerk = localStorage.getItem('ws-pf_staffName')
@@ -1334,5 +1382,46 @@
     margin: 20px 0;
     text-align: center;
   }
-
+  /deep/.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    width: 178px;
+    height: 178px;
+  }
+  /deep/.avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  .avatar-uploader-wrap{
+    display: inline-block;
+    width:100%;
+  }
+  /deep/.ws-info-table{
+    width:100%;
+  }
+  /deep/.ws-info-table .avatar-uploader-wrap .el-form-item{
+    width:100%;
+  }
+  /deep/.ws-info-table .avatar-uploader-wrap .el-form-item .el-form-item__label{
+    width:21%;
+  }
+  /deep/.ws-info-table .avatar-uploader-wrap .el-form-item .el-form-item__content{
+    height:210px;
+    width:79%;
+  }
 </style>