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

public/static/payprint.html

@@ -539,13 +539,13 @@
                 </div>
                 <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
               </div>
-              <div class="sfcard-content">
+         <!--     <div class="sfcard-content">
                 <div class="sfcard-title">
                   {{
                   printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
                 </div>
                 <img :src="customerList1[index].imgURl.imageUrl2" class="avatar" />
-              </div>
+              </div> -->
             </div>
             <div class="bankcard" v-if="isShowPrintType2">
 
@@ -555,12 +555,12 @@
                 </div>
                 <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" />
               </div>
-              <div class="sfcard-content part2">
+    <!--          <div class="sfcard-content part2">
                 <div class="sfcard-title">
                   {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
                 </div>
                 <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
-              </div>
+              </div> -->
             </div>
           </div>
         </div>
@@ -1206,10 +1206,10 @@
           let _lsit = this.showType.split(',')
           for (let i = 0; i < _lsit.length; i++) {
             switch (_lsit[i]) {
-              case '打印身份证（正反面）':
+              case '打印身份证':
                 this.isShowPrintType1 = !this.isShowPrintType1
                 break
-              case '打印银行卡（正反面）':
+              case '打印银行卡':
                 this.isShowPrintType2 = !this.isShowPrintType2
                 break
               case '打印结算凭证':

public/static/weightCheckOut.html

@@ -162,11 +162,11 @@
             <td class="col col-bgc" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>箱号</td>
             <td class="col col-bgc" v-if='tableData.outType=="火运"'>车厢号</td>
             <td class="col col-bgc" v-if='tableData.outType=="散船"'>船次</td>
-            <td class="col" colspan="2" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
-              {{tableData.boxNo}},{{tableData.boxNoOther}}
+            <td class="col" colspan="2" v-if='(tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
+              {{tableData.boxNo}} {{tableData.boxNoOther}}
             </td>
             <td class="col" colspan="2" v-if='tableData.outType=="火运"'>
-              {{tableData.wingNumber}},{{tableData.wingNumberOther}}
+              {{tableData.wingNumber}} {{tableData.wingNumberOther}}
             </td>
             <td class="col" colspan="2" v-if='tableData.outType=="散船"'>{{tableData.shipNumber}}</td>
           </tr>

src/api/V2/houseSelfCollect/index.js

@@ -56,6 +56,8 @@ export const API_GET_WEIGHTCHECK_GETWEIGHINGLIST = '/weighingManagement/selectWe
 export const API_POST_WEIGHTCHECK_TARE= '/weighingManagement/api/editTare'
 //毛重检斤保存
 export const API_POST_WEIGHTCHECK_GROSSWEIGHT = '/weighingManagement/api/editGrossWeight'
+//检斤管理删除
+export const API_POST_INSPECT_GETWEIGHTDELETE = '/weighingManagement/api/deleteWeightcheck'
 //付款查看
 export const API_GET_PAYMENT = '/paymentManagement/getInfo'
 // 付款结算

src/model/houseSelfCollect/index.js

@@ -51,6 +51,7 @@ import {
   API_GAT_GETQRCODE,
   API_GAT_INFO,
   API_POST_WORKFLOW_TASK,
+  API_POST_INSPECT_GETWEIGHTDELETE,
   API_POST_SUSPENDINSTANCE
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
@@ -111,6 +112,8 @@ export const getweighingList = appRx.get(API_GET_WEIGHTCHECK_GETWEIGHINGLIST, er
 export const tare = appRx.post(API_POST_WEIGHTCHECK_TARE, errorCatcher, errorHandle, filter)
 //毛重检斤保存
 export const grossWeight = appRx.post(API_POST_WEIGHTCHECK_GROSSWEIGHT, errorCatcher, errorHandle, filter)
+//检斤删除
+export const getweighingDelete = appRx.post(API_POST_INSPECT_GETWEIGHTDELETE, errorCatcher, errorHandle, filter)
 //付款信息查看
 export const getpaymentexamine = appRx.get(API_GET_PAYMENT, errorCatcher, errorHandle, filter)
 //付款信息结算

src/views/houseSelfCollect/paymentManagement.vue

@@ -7,8 +7,8 @@
         <div class="print-type-title">打印凭证</div>
         <div class="print-type-checkbox">
           <el-checkbox-group v-model="ruleForm.type">
-            <el-checkbox label="打印身份证（正反面）" name="type" class="label-width" @change="selectType"></el-checkbox>
-            <el-checkbox label="打印银行卡（正反面）" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <el-checkbox label="打印身份证" name="type" class="label-width" @change="selectType"></el-checkbox>
+            <el-checkbox label="打印银行卡" name="type" class="label-width" @change="selectType"></el-checkbox>
             <el-checkbox label="打印结算凭证" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <el-checkbox label="打印检斤单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <el-checkbox label="打印回执单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
@@ -389,8 +389,8 @@
 
         ruleForm: {
           type: [
-            '打印身份证（正反面）',
-            '打印银行卡（正反面）',
+            '打印身份证',
+            '打印银行卡',
             '打印结算凭证',
             '打印检斤单',
             '打印回执单'
@@ -702,7 +702,7 @@
         } = param
         const sums = []
         var _number = []
-        if (this.warehouseName == "鲅鱼圈金信库") {
+        if (this.warehouseName == '鲅鱼圈金信库') {
           _number = [11, 12, 16, 17, 18]
         } else {
           _number = [10, 11, 15, 16, 17]
@@ -764,10 +764,10 @@
       selectType(val) {
         for (let i = 0; i < this.ruleForm.type.length; i++) {
           switch (this.ruleForm.type[i]) {
-            case '打印身份证（正反面）':
+            case '打印身份证':
               this.isShowPrintType1 = !this.isShowPrintType1
               break
-            case '打印银行卡（正反面）':
+            case '打印银行卡':
               this.isShowPrintType2 = !this.isShowPrintType2
               break
             case '打印结算凭证':
@@ -775,13 +775,16 @@
             case '打印检斤单':
               this.isShowPrintType4 = !this.isShowPrintType4
               break
+              case '打印回执单':
+              this.isShowPrintType5 = !this.isShowPrintType5
+              break
           }
         }
       },
       typePrintCannelClick() {
         this.isShowPrintType = false
       },
-      typePrintClick(type) {
+     async typePrintClick(type) {
         // type 1批量打印 0单个打印
         //  this.isShowPrint = true
         this.selectCustomerList = []
@@ -790,7 +793,7 @@
           let index1 = 0
           let index2 = 0
           for (let i = 0; i < this.modification.length; i++) {
-            getCustomerLook({
+          await getCustomerLook({
                 id: this.modification[i].identityId,
                 authenticationStatusKey: 7,
               })
@@ -806,7 +809,7 @@
                   // this.isShowPrint = true
                   this.printBig()
                 }
-                getpaymentexamine({
+               getpaymentexamine({
                     id: this.modification[i].id,
                   })
                   .toPromise()

src/views/houseSelfCollect/weighingManagement.vue

@@ -106,6 +106,10 @@
           <el-button :disabled="scope.row.allow == 2" @click="weightCheck(scope.row, 2)"
             v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') "
             v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
+          <div style="display: inline-block;">
+            <el-button @click="del(scope.row)" type="danger"
+              v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
+          </div>
           <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'"
             v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
         </template>
@@ -146,6 +150,7 @@
 <script>
   import {
     getweighingList,
+    getweighingDelete,
     selectWarehouseSelf,
     getPrint
   } from '@/model/houseSelfCollect/index'
@@ -476,6 +481,33 @@
         }
 
       },
+      del(row) {
+        //删除
+        this.$confirm('确定删除检斤信息？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getweighingDelete({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
       find() {
         this.getList()
       },

src/views/houseSelfCollect/weightCheck.vue

@@ -1340,7 +1340,7 @@ export default {
   display: flex;
 
   .left {
-    min-width: 500px;
+    min-width: 570px;
      position: relative;
     // padding:0 20px 20px 20px;
 
@@ -1349,7 +1349,7 @@ export default {
       color: #2aff7c;
       font-size: 32px;
       text-align: right;
-      padding: 0 20px;
+       padding: 0 10px 0 20px;
       border-radius: 10px;
       margin: 0 20px 20px 20px;
         position: absolute;