Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -4,11 +4,11 @@
     <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>
-        <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button>
+        <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款</ws-button>
       </template>
       <template slot="right">
@@ -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,15 @@
         </ws-form>
       </div>
     </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">
+         <img :src="item" alt="" class="img">
+       </div>
+       <div style="text-align:center;margin:10px auto;">
+       <el-button @click="showPayImgs = false" type="primary">关闭</el-button>
+       </div>
+     </el-dialog>
     <div style="text-align: center">
       <el-pagination
         @size-change="handleSizeChange"
@@ -216,9 +229,11 @@ export default {
         amountNotPayable: 0,
         paymentDate: ''
       },
+      showPayImgs:false,
       isShowAdopt:false,
       //上传截图路径
-      imageUrl: ''
+      imageUrl: '',
+      payImg:[],
     }
   },
   activated() {
@@ -242,6 +257,19 @@ export default {
       }
       
     },
+    //查看付款截图
+    showPayImg(row){
+      if(!row.paymentScreenshot){
+         this.$message({
+          message: '暂无付款截图！',
+          type: 'warning'
+        })
+        return
+      }else{
+        this.showPayImgs = true
+        this.payImg = row.paymentScreenshot.split("$")
+      }
+    },
     getWarehouse() {
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId')
@@ -683,4 +711,13 @@ table {
   border-radius: 5px;
   display: block;
 }
+.pay_img{
+width:50%;
+// display: flex;
+display: inline-block;
+.img{
+  height: 350px;
+  width: 100%;
+}
+}
 </style>

src/views/houseSelfCollect/weighingManagement.vue

@@ -200,7 +200,7 @@ export default {
           this.allowEdit = this.warehouseList[i].allowEdit
             this.WAREHOUSE[2].payname = this.warehouseList[i].value
              this.common.name  =  this.warehouseList[0].value
-            sessionStorage.setItem('ck',this.common.name)
+            sessionStorage.setItem('ck',e)
         }
       }
       this.getList()

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">
@@ -290,7 +290,7 @@
           if ((_list[i].status == '已称皮重' || _list[i].status == '已称毛重')) {
             this.pList.push(_list[i])
           }
-        }debugger
+        }
         if (this.information == "毛重") {
           this.index = 0
           this.carList = this.mList

src/views/outboundManagement/qualityInspectionManagement.vue

@@ -110,7 +110,8 @@ export default {
     }
   },
   activated() {
-    this.getList()
+    this.selectWarehouse()
+		this.showType = this.isShow
   },
   methods: {
     find(){
@@ -127,7 +128,12 @@ export default {
       })
     },
     selecttaskType(e) {
-      console.log(e)
+      for (let i = 0; i < this.warehouseList.length; i++) {
+					if (this.warehouseList[i].value == e) {
+						this.cangid = this.warehouseList[i].cangid
+					}
+				}
+				this.getList()
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
@@ -139,8 +145,8 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      selectWarehouseSelf({
+  selectWarehouse(){
+    selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
       })
         .toPromise()
@@ -148,15 +154,16 @@ export default {
           this.warehouseList = []
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
-              // valueKey: i,
               value: response[i].warehouseName,
-              id: response[i].id,
+              warehouseId: response[i].id,
             })
           }
           this.warehouseName = response[0].warehouseName
           this.cangid = response[0].id
+          this.getList()
         })
-
+    },
+    getList() {
       getinspectList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
@@ -167,18 +174,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          // for (let i = 0; i < response.length; i++) {
-          //   this.warehouseList.push({
-          //     valueKey: i,
-          //     value: response[i].warehouseName,
-          //     id:response[i].id
-          //   })
-          // }
-          // this.searchTypeText = response[0].warehouseName
-          // this.id = response[0].id
-          // console.log(response)
           this.inspect = response.records
-          console.log(this.inspect,'容重')
           this.deptBudgetTotal = response.total
         })
     },

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]
             }