前端 sdy

src/views/houseSelfCollect/inspectInfo.vue

@@ -171,6 +171,7 @@
         purchasePriceList: [],
         id: '',
         imgUrl:"",
+        printData:[],
       }
     },
     activated() {

src/views/houseSelfCollect/paymentManagement.vue

@@ -11,10 +11,19 @@
         <ws-button type="primary" @click="payment">付款</ws-button>
       </template>
       <template slot="right">
-        <el-select v-model="warehouseNameKey" placeholder="请选择" @change="warehouseChange">
-          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
+        <el-select
+          v-model="warehouseNameKey"
+          placeholder="请选择"
+          @change="warehouseChange"
+        >
+          <el-option
+            v-for="item in warehouseList"
+            :key="item.id"
+            :label="item.warehouseName"
+            :value="item.id"
+          >
           </el-option>
-          </el-select>
+        </el-select>
         <div></div>
         <ws-input
           v-model="searchKeyWord"
@@ -81,32 +90,32 @@
       ></el-table-column>
       <el-table-column
         class="table_td"
-        width='180'
+        width="180"
         prop="type"
         label="类型"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="tidalGrainPrice"
-         width='180'
+        width="180"
         label="净重单价（元/公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="solidGrainPrice"
-        width='180'
+        width="180"
         label="纯重单价（元/公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="netWeight"
-        width='140'
+        width="140"
         label="净重（公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
         prop="pureWeight"
-        width='140'
+        width="140"
         label="纯重（公斤）"
       ></el-table-column>
       <el-table-column
@@ -124,15 +133,13 @@
         prop="collectionIngPayable"
         label="更新时间"
       ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="status"
-        label="状态"
-      >
-      <template scope="scope">
-        <span v-if='scope.row.approveStatus'>{{scope.row.approveStatus}}</span>
-        <span v-else>{{scope.row.status}}</span>
-      </template>
+      <el-table-column class="table_td" prop="status" label="状态">
+        <template scope="scope">
+          <span v-if="scope.row.approveStatus">{{
+            scope.row.approveStatus
+          }}</span>
+          <span v-else>{{ scope.row.status }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         class="table_td"
@@ -140,144 +147,206 @@
         label="操作"
         width="350"
       >
-      <template scope="scope">
-        <el-button type="danger" v-if='!scope.row.approveStatus&&scope.row.status!="已驳回"' @click="del(scope.row)">删除</el-button>
-        <el-button v-if='!scope.row.approveStatus&&scope.row.status!="已驳回"' @click="settlement(1,scope.row)">结算</el-button>
-        <el-button v-if='scope.row.approveStatus||scope.row.status=="已驳回"' @click="settlement(2,scope.row)">查看</el-button>
-        <el-button v-if='scope.row.approveStatus||scope.row.status=="已驳回"||userJurisdiction' @click='print(scope.row)'>打印</el-button>
-      </template>
+        <template scope="scope">
+          <el-button
+            type="danger"
+            v-if="!scope.row.approveStatus && scope.row.status != '已驳回'"
+            @click="del(scope.row)"
+            >删除</el-button
+          >
+          <el-button
+            v-if="!scope.row.approveStatus && scope.row.status != '已驳回'"
+            @click="settlement(1, scope.row)"
+            >结算</el-button
+          >
+          <el-button
+            v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
+            @click="settlement(2, scope.row)"
+            >查看</el-button
+          >
+          <el-button
+            v-if="
+              scope.row.approveStatus ||
+              scope.row.status == '已驳回' ||
+              userJurisdiction
+            "
+            @click="print(scope.row)"
+            >打印</el-button
+          >
+        </template>
       </el-table-column>
     </el-table>
     <!-- 付款弹窗 -->
-    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
-      <div class="tanchuang">
-        <ws-form>
-        <ws-info-table>
-          <ws-form-item label="未付金额（元）" prop="amountNotPayable">
-           {{payments.amountNotPayable}}
-          </ws-form-item>
-          <ws-form-item label="本次付款金额（元）" prop="money">
-            <ws-input
-            v-model="payments.money"
-              placeholder="请输入本次付款金额（元）"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="付款日期" prop=" paymentDate">
-            <el-date-picker v-model="payments.paymentDate" type="date" placeholder="选择日期">
-            </el-date-picker>
-          </ws-form-item>
-        </ws-info-table>
-        <div style="text-align: center">
-          <el-button @click="paymentForm = false">取消</el-button>
-          <el-button @click="paymentSubmit">提交</el-button>
-        </div>
-      </ws-form>
-      </div>
-    </el-dialog>
-    <div style="text-align:center">
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-size="deptCircularPage.pageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="deptBudgetTotal"
-    >
-    </el-pagination>
     <el-dialog
-      width="70%"
-      class="table-content"
-      center
-      :visible.sync="isShowPrint"
-      title="中天昊元粮食贸易有限公司结算凭证"
+      width="40%"
+      :visible.sync="paymentForm"
+      :append-to-body="true"
+      title="付款"
     >
-      <paymentPrint :printData="printData"></paymentPrint>
-      <div style="text-align:center">
-        <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
-        <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
-        <el-button type="primary" @click="printBig">打印单据</el-button>
+      <div class="tanchuang">
+        <ws-form>
+          <ws-info-table>
+            <ws-form-item label="未付金额（元）" prop="amountNotPayable">
+              {{ payments.amountNotPayable }}
+            </ws-form-item>
+            <ws-form-item label="本次付款金额（元）" prop="money">
+              <ws-input
+                v-model="payments.money"
+                placeholder="请输入本次付款金额（元）"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="付款日期" prop=" paymentDate">
+              <el-date-picker
+                v-model="payments.paymentDate"
+                type="date"
+                placeholder="选择日期"
+              >
+              </el-date-picker>
+            </ws-form-item>
+            <ws-form-item label="上传截图" prop=" paymentScreenshot">
+            </ws-form-item>
+            <div class="upLoad">
+              <el-upload
+                class="avatar-uploader"
+                action="https://www.zthymaoyi.com/upload/admin"
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess"
+              >
+                <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </div>
+          </ws-info-table>
+          <div style="text-align: center; margin-top: 20px">
+            <el-button @click="paymentForm = false">取消</el-button>
+            <el-button @click="paymentSubmit">提交</el-button>
+          </div>
+        </ws-form>
       </div>
-       
     </el-dialog>
+    <div style="text-align: center">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
+      <el-dialog
+        width="70%"
+        class="table-content"
+        center
+        :visible.sync="isShowPrint"
+        title="中天昊元粮食贸易有限公司结算凭证"
+      >
+        <paymentPrint :printData="printData"></paymentPrint>
+        <div style="text-align: center">
+          <el-button type="primary" @click="isShowPrint = false"
+            >关闭</el-button
+          >
+          <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
+          <el-button type="primary" @click="printBig">打印单据</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
 <script>
-import {getpayment,selectWarehouseSelf,delpayment,auditpayment,getpaymentexamine,paymentCommit} from '@/model/houseSelfCollect/index'
+import {
+  getpayment,
+  selectWarehouseSelf,
+  delpayment,
+  auditpayment,
+  getpaymentexamine,
+  paymentCommit,
+} from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import paymentPrint from './component/paymentPrint.vue'
-  import { getHp } from '@/utils/getHasPermission'
+import { getHp } from '@/utils/getHasPermission'
 export default {
-  components: {paymentPrint},
+  components: { paymentPrint },
   watch: {},
   data() {
     return {
       //分页
       currentPage: 1,
       pageSize: 10,
-      paymentList:[],
-      deptCircularPage:{},
+      paymentList: [],
+      deptCircularPage: {},
       deptBudgetTotal: 0,
       paymentForm: false,
       taskTypeList: ['一号库'],
       searchType: '',
       searchTypeText: '',
       searchKeyWord: '',
-      warehouseList:[],
-      warehouseNameKey:'',
-      warehouseName:'',
+      warehouseList: [],
+      warehouseNameKey: '',
+      warehouseName: '',
       isShowPrint: false,
-      printData:{},
-      warehouse:[],
+      printData: {},
+      warehouse: [],
       value1: '', //付款日期
       modification: [],
-      userJurisdiction:true,
-      payments:{
-        amountNotPayable:0,
-      }
+      userJurisdiction: true,
+      payments: {
+        amountNotPayable: 0,
+        paymentDate:"",
+      },
+      //上传截图路径
+      imageUrl: '',
     }
   },
   activated() {
-      this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-     selectWarehouseSelf({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        personCharge: sessionStorage.getItem('ws-pf_staffName'),
-      }).toPromise().then((response) => {
-          this.warehouseList = response
-          // this.$set(this.warehouseName,response[0].warehouseName)
-          // this.warehouseName=response[0].warehouseName
-          // this.warehouse=response[0]
-          this.warehouseList = response
-          this.warehouseNameKey = this.warehouseList[0].id
-          this.warehouseName = this.warehouseList[0].warehouseName
-          this.getList()
-        })
-
+    this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+    selectWarehouseSelf({
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      personCharge: sessionStorage.getItem('ws-pf_staffName'),
+    })
+      .toPromise()
+      .then((response) => {
+        this.warehouseList = response
+        // this.$set(this.warehouseName,response[0].warehouseName)
+        // this.warehouseName=response[0].warehouseName
+        // this.warehouse=response[0]
+        this.warehouseList = response
+        this.warehouseNameKey = this.warehouseList[0].id
+        this.warehouseName = this.warehouseList[0].warehouseName
+        this.getList()
+      })
   },
   methods: {
-     printSmall() {
-        window.location.href =
-          '../../../../../static/payprint.html?type=1&dataList=' +
-          JSON.stringify(this.printData)
-      },
-      printBig() {
-        window.location.href =
-          '../../../../../static/payprint.html?type=2&dataList=' +
-          JSON.stringify(this.printData)
-      },
-   getList(){
-     getpayment({
-       currentPage:this.currentPage,
-       pageSize:this.pageSize,
-       searchKeyWord:this.searchKeyWord,
-       searchType:this.searchType,
-       warehouseName:this.warehouseName
-      }).toPromise().then((response) => {
+    //上传付款截图
+    handleAvatarSuccess(e) {
+      this.imageUrl = e.url
+      console.log(e, 'dkltgoidrhfglkhs')
+    },
+    printSmall() {
+      window.location.href =
+        '../../../../../static/payprint.html?type=1&dataList=' +
+        JSON.stringify(this.printData)
+    },
+    printBig() {
+      window.location.href =
+        '../../../../../static/payprint.html?type=2&dataList=' +
+        JSON.stringify(this.printData)
+    },
+    getList() {
+      getpayment({
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+        searchType: this.searchType,
+        warehouseName: this.warehouseName,
+      })
+        .toPromise()
+        .then((response) => {
           this.paymentList = response
         })
-   },
+    },
     del(row) {
       this.$confirm(
         '对应的质检和检斤记录将一并删除，是否确定删除操作？',
@@ -289,49 +358,92 @@ export default {
         }
       )
         .then(() => {
-          delpayment({id:row.id}).toPromise().then((response) => {
-         this.$message.success('删除成功')
-         this.getList()
-        })
+          delpayment({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$message.success('删除成功')
+              this.getList()
+            })
         })
         .catch(() => {
           return false
         })
     },
-    settlement(index,row) {
-      var data={}
-      var data1={}
+    settlement(index, row) {
+      var data = {}
+      var data1 = {}
       for (let i = 0; i < this.warehouseList.length; i++) {
-        if(this.warehouseList[i].id==this.warehouseNameKey){
-          data=this.warehouseList[i]
+        if (this.warehouseList[i].id == this.warehouseNameKey) {
+          data = this.warehouseList[i]
         }
       }
       console.log(data)
       for (let i = 0; i < data.purchasePriceList.length; i++) {
-        if(data.purchasePriceList[i].goodsName==row.goodsName){
-          data1=data.purchasePriceList[i]
+        if (data.purchasePriceList[i].goodsName == row.goodsName) {
+          data1 = data.purchasePriceList[i]
         }
       }
-      if(row.goodsName)
-      this.$router.push({ path: 'settlement', query: { type: index,id: row.id,waterMin:data1.waterMin} })
+      if (row.goodsName)
+        this.$router.push({
+          path: 'settlement',
+          query: { type: index, id: row.id, waterMin: data1.waterMin },
+        })
     },
     payment() {
       if (this.modification.length == 0) {
         this.$message.warning('请选择要付款的条目')
       } else {
+        console.log(this.modification)
+        let sum = 0
+        let count = 0
+        for (let i = 0; i < this.modification.length; i++) {
+          sum += this.modification[i].amountIngPayable
+          count += this.modification[i].amountEdPayable
+        }
+        this.payments.amountNotPayable = sum - count
         this.paymentForm = true
       }
     },
     paymentSubmit() {
-
-        //付款提交
-      paymentCommit()
-      .toPromise().then((response) => {
-          // this.paymentList = response
+      if (!this.payments.money) {
+        this.$message({
+          message: '付款金额不能为空',
+          type: 'warning',
         })
-
-
-
+        return
+      }
+      if (this.payments.money > this.payments.amountNotPayable) {
+        this.$message({
+          message: '付款金额不能超过未付金额',
+          type: 'warning',
+        })
+        return
+      }
+      // if(this.payments.money > this.payments.amountNotPayable){
+      //   this.$message({
+      //     message: '付款金额不能超过未付金额',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      if (!this.payments.paymentDate) {
+        this.$message({
+          message: '付款日期不能为空',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.imageUrl) {
+        this.$message({
+          message: '请上传付款截图 ',
+          type: 'warning',
+        })
+        return
+      }
+      this.payments.paymentScreenshot = this.imageUrl
+      this.payments.cashier = sessionStorage.getItem('ws-pf_staffName')
+      console.log(this.payments,"付款")
+      return
 
       this.$confirm('确定提交付款信息？', '提示', {
         confirmButtonText: '确定',
@@ -339,8 +451,17 @@ export default {
         type: 'warning',
       })
         .then(() => {
-
-
+          //付款提交
+          paymentCommit(this.payments)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '付款成功',
+              })
+              // this.paymentList = response
+              this.$router.go(-1)
+            })
         })
         .catch(() => {
           return false
@@ -356,7 +477,7 @@ export default {
           type: 'warning',
         })
           .then(() => {
-            this.audit(this.modification[0], 0,false,'','')
+            this.audit(this.modification[0], 0, false, '', '')
           })
           .catch(() => {
             return false
@@ -365,53 +486,62 @@ export default {
     },
     audit(item, index, status, status2, reason) {
       if (index < this.modification.length) {
-        if(status==true&&item.status=='已驳回'){
-          console.log(11111)
-          auditpayment({compId:sessionStorage.getItem('ws-pf_compId'),id:item.id}).toPromise()
-          .then((response) => {
-            console.log(22222)
-            this.audit(this.modification[index + 1], index + 1, status,status2,reason)
-          })
-        }else{
-        posthandle({
-          taskId: item.taskId,
-          approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
-          needReapply: status2 != undefined ? true : false,
-        })
-          .toPromise()
-          .then((response) => {
-            this.audit(this.modification[index + 1], index + 1, status,status2,reason)
+        if (status == true && item.status == '已驳回') {
+          auditpayment({
+            compId: sessionStorage.getItem('ws-pf_compId'),
+            id: item.id,
           })
-          .catch((req) => {
-            this.$message.warning(req.message)
+            .toPromise()
+            .then((response) => {
+              this.audit(
+                this.modification[index + 1],
+                index + 1,
+                status,
+                status2,
+                reason
+              )
+            })
+        } else {
+          posthandle({
+            taskId: item.taskId,
+            approved: status,
+            auditMind: reason != undefined ? '已驳回' : '34',
+            needReapply: status2 != undefined ? true : false,
           })
+            .toPromise()
+            .then((response) => {
+              this.audit(
+                this.modification[index + 1],
+                index + 1,
+                status,
+                status2,
+                reason
+              )
+            })
+            .catch((req) => {
+              this.$message.warning(req.message)
+            })
         }
-
       } else {
-        if (status==true) {
+        if (status == true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (status==false) {
+        } else if (status == false) {
           this.$message.success('驳回成功')
           this.getList()
-          }
+        }
       }
     },
     adopt() {
-      var that =this
+      var that = this
       if (this.modification.length == 0) {
         this.$message.warning('请选择要通过的条目')
       } else {
-        this.$confirm(
-          '是否确定通过？',
-          '提示',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          }
-        )
+        this.$confirm('是否确定通过？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
           .then(() => {
             this.audit(this.modification[0], 0, true)
           })
@@ -421,12 +551,14 @@ export default {
       }
     },
     print(row) {
-      getpaymentexamine({id:row.id}).toPromise().then((response) => {
+      getpaymentexamine({ id: row.id })
+        .toPromise()
+        .then((response) => {
           this.isShowPrint = true
-          this.printData =response
-          console.log("printData",response)
+          this.printData = response
+          console.log('printData', response)
         })
-      },
+    },
     examine() {
       if (this.modification.length == 0) {
         this.$message.warning('请选择要审核的条目')
@@ -454,28 +586,19 @@ export default {
     // },
     selectInit(row) {
       //在这里一定要记得类型匹配的上。
-      if(row.status!='已驳回'){
+      if (row.status != '已驳回') {
         if (row.taskId == null) {
           return false
         } else {
           return true
         }
-      }else{
+      } else {
         return true
       }
-
     },
 
     handleSelectionChange(val) {
       this.modification = val
-      console.log(this.modification[0].amountNotPayable)
-      let sum = 0
-      for(let i = 0 ; i < this.modification.length ; i++){
-        sum += this.modification[i].amountNotPayable
-
-      }
-      this.payments.amountNotPayable = sum
-      console.log(this.payment.amountNotPayable)
     },
     // handleRowClick(row) {
     //   if (row.approveStatus == null) {
@@ -492,13 +615,13 @@ export default {
     // },
     warehouseChange(e) {
       for (let i = 0; i < this.warehouseList.length; i++) {
-        if(this.warehouseList[i].id==this.warehouseNameKey){
-          this.warehouseName=this.warehouseList[i].warehouseName
+        if (this.warehouseList[i].id == this.warehouseNameKey) {
+          this.warehouseName = this.warehouseList[i].warehouseName
         }
       }
       this.getList()
     },
-     handleSizeChange(val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
       this.getList()
@@ -536,6 +659,9 @@ export default {
   text-align: center !important;
   padding: 10px 0 !important;
   height: auto !important;
+  border: none;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
 }
 .title {
   font-size: 16px;
@@ -566,18 +692,55 @@ table {
 /deep/.el-table--enable-row-transition .el-table__body td {
   text-align: center;
 }
-.title{
-  padding:10px;
-  text-align:center;
+.title {
+  padding: 10px;
+  text-align: center;
 }
-.tanchuang{
+.tanchuang {
   margin: 0 auto;
 }
-.tanchuang .ws-info-table{
+.tanchuang .ws-info-table {
   display: initial;
 }
-.tanchuang .ws-info-table .el-form-item{
+.tanchuang .ws-info-table .el-form-item {
+  margin: 0 auto;
+  text-align: center;
+}
+.upLoad {
+  width: 40%;
   margin: 0 auto;
-  
+  // border: 1px solid #8890b1;
+  // border-radius: 3px;
+}
+// .avatar{
+//   width: 150px;
+//   height: 150px;
+// }
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.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;
+  border: 1px solid #8890b1;
+  border-radius: 5px;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  border: 1px solid #8890b1;
+  border-radius: 5px;
+  display: block;
 }
 </style>

src/views/houseSelfCollect/weightCheck.vue

@@ -410,7 +410,6 @@ export default {
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  console.log(response)
                   this.$notify.success({
                     title: '成功',
                     message: '保存成功',