查看收购付款截图 sdy

src/views/houseSelfCollect/paymentManagement.vue

@@ -4,7 +4,7 @@
     <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
         <ws-button type="primary" @click="screen(2)">待结算</ws-button>
-        <ws-button type="primary" @click="screen()">待审核</ws-button>
+        <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>
         <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
         <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
@@ -74,7 +74,11 @@
       <el-table-column class="table_td" prop="netWeight" width="120" label="净重（公斤）"></el-table-column>
       <el-table-column class="table_td" prop="pureWeight" width="120" label="纯重（公斤）"></el-table-column>
       <el-table-column class="table_td" prop="amountIngPayable" label="应付款(元)"></el-table-column>
-      <el-table-column class="table_td" prop="amountEdPayable" label="已付款(元)"></el-table-column>
+      <el-table-column class="table_td" prop="amountEdPayable" label="已付款(元)">
+        <template slot-scope="scope">
+          <div @click="showPayImg(scope.row)">{{scope.row.amountEdPayable}}</div>
+        </template>
+      </el-table-column>
       <el-table-column class="table_td" prop="updateDate" label="更新时间" width="140" ></el-table-column>
       <el-table-column class="table_td" prop="status" label="状态">
         <template scope="scope">
@@ -150,6 +154,17 @@
         </ws-form>
       </div>
     </el-dialog>
+     <el-dialog width="50%" :visible.sync="showPayImgs" :append-to-body="true" title="付款截图">
+       <div style="display: flex;">
+       <div v-for="(item,index) in payImg" :key="index" style="width:50%;display: flex;">
+         <img :src="item" alt="" style="height:300px">
+
+       </div>
+       </div>
+
+
+
+     </el-dialog>
     <div style="text-align: center">
       <el-pagination
         @size-change="handleSizeChange"
@@ -216,9 +231,11 @@ export default {
         amountNotPayable: 0,
         paymentDate: ''
       },
+      showPayImgs:false,
       isShowAdopt:false,
       //上传截图路径
-      imageUrl: ''
+      imageUrl: '',
+      payImg:[],
     }
   },
   activated() {
@@ -242,6 +259,11 @@ export default {
       }
       
     },
+    //查看付款截图
+    showPayImg(row){
+     this.showPayImgs = true
+     this.payImg = row.paymentScreenshot.split("$")
+    },
     getWarehouse() {
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId')

src/views/houseSelfCollect/weightCheck.vue

@@ -88,8 +88,8 @@
             </ws-info-table>
             <div class="but">
               <el-button @click="cancel" type="primary">取消</el-button>
-              <el-button @click="print" v-if="this.tpyeNo == 1" type="primary">保存</el-button>
-              <el-button @click="print" v-if="this.tpyeNo == 2" type="primary">保存并打印</el-button>
+              <el-button @click="print" v-if="this.information == '毛重'" type="primary">保存</el-button>
+              <el-button @click="print" v-if="this.information == '皮重'" type="primary">保存并打印</el-button>
             </div>
           </div>
           <div class="bottom">

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -654,9 +654,10 @@ export default {
             this.dataList = response[0]
             this.dataList1 = response[1]
           } else {
-            if(response[0].taskTypeKey==2){
+            if(response[0].taskTypeKey == 2){
+              this.dataList.taskTypeKey=response[0].taskTypeKey
+              this.dataList.inOutType=response[0].inOutType
               this.dataList1 = response[0]
-
             }else{
               this.dataList = response[0]
             }