Home Verkennen Help
Registreren Inloggen
wangchao
/
yiliangyiyun-pc-jj
1
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

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

gjy 3 jaren geleden
bovenliggende
4cd672c424 8b496501f3
commit
546896f1b2
13 gewijzigde bestanden met toevoegingen van 1154 en 614 verwijderingen
Gecombineerde weergave Toon Diff Stats
  1. 335 0
      public/static/collectionContractRecordPrint.html
  2. 29 2
      src/api/V2/contract/index.js
  3. 38 2
      src/model/contarct/index.js
  4. 8 2
      src/views/contractManagement/collectionContract.vue
  5. 654 608
      src/views/contractManagement/collectionContractRecord.vue
  6. 18 0
      src/views/houseSelfCollect/paymentManagement.vue
  7. 12 0
      src/views/statisticalReport/autoSettlementList.vue
  8. 12 0
      src/views/statisticalReport/huoyunList.vue
  9. 12 0
      src/views/statisticalReport/purchaseClosingCashierList.vue
  10. 12 0
      src/views/statisticalReport/purchaseReceiptStatisticsList.vue
  11. 12 0
      src/views/statisticalReport/salesDeliveryReportList.vue
  12. 6 0
      src/views/statisticalReport/shippingList.vue
  13. 6 0
      src/views/statisticalReport/stockPurchaseReceiptReportList.vue

+ 335 - 0
public/static/collectionContractRecordPrint.html
Bestand weergeven 

@@ -0,0 +1,335 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta charset="utf-8" />
 
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
 
+    <title></title>
 
+    <style>
 
+      table tr td {
 
+        border: 2px solid #333333;
 
+        padding: 5px 0;
 
+      }
 
+
 
+      #app {
 
+        height: 88vh;
 
+        position: relative;
 
+      }
 
+
 
+      .simple {
 
+        height: 120vh !important;
 
+      }
 
+
 
+      .content {
 
+        width: 1000px;
 
+        margin: auto;
 
+      }
 
+
 
+      table {
 
+        width: 100%;
 
+        text-align: center;
 
+        border-collapse: collapse;
 
+      }
 
+
 
+      .col-bgc {
 
+        background: #f6f7fb;
 
+      }
 
+
 
+      .bottom-row1 {
 
+        display: flex;
 
+        justify-content: space-between;
 
+        margin: 20px 0;
 
+      }
 
+
 
+      .bottom-row2 {
 
+        display: flex;
 
+        margin: 10px 0;
 
+      }
 
+
 
+      img {
 
+        width: 80px;
 
+        height: 80px;
 
+        /* margin-right: 118px; */
 
+      }
 
+
 
+      .leftimg {
 
+        width: 80px;
 
+        height: 80px;
 
+        position: absolute;
 
+        right: 20px;
 
+        top: 3px;
 
+      }
 
+
 
+      .config {
 
+        margin-right: 240px;
 
+      }
 
+
 
+      .bottom-row3 {
 
+        margin: 10px 0;
 
+      }
 
+
 
+      .title {
 
+        text-align: center;
 
+        font-size: 24px;
 
+      }
 
+
 
+      .number {
 
+        text-align: right;
 
+        margin-bottom: 10px;
 
+      }
 
+
 
+      .number1 {
 
+        text-align: right;
 
+        margin-bottom: 10px;
 
+        margin-top: 60px;
 
+      }
 
+
 
+      .small-row {
 
+        display: flex;
 
+      }
 
+
 
+      .small-content {
 
+        width: 400px;
 
+        margin: 0 auto;
 
+        border: 1px solid #ccc;
 
+        padding: 20px 20px 160px 20px;
 
+        position: absolute;
 
+        top: 0;
 
+        bottom: 0;
 
+        left: 0;
 
+        right: 0;
 
+        margin: auto;
 
+        height: 650px;
 
+      }
 
+
 
+      .small-title {
 
+        text-align: center;
 
+        font-size: 18px;
 
+        display: flex;
 
+        justify-content: space-between;
 
+        align-items: center;
 
+      }
 
+
 
+      .small-row {
 
+        display: flex;
 
+        justify-content: space-between;
 
+        margin: 10px;
 
+      }
 
+
 
+      .small-img {
 
+        margin-right: 0;
 
+      }
 
+
 
+      .sign {
 
+        margin-right: 100px;
 
+      }
 
+
 
+      .header {
 
+        display: flex;
 
+        justify-content: space-between;
 
+        font-size: 16px;
 
+        margin: 10px 0;
 
+      }
 
+
 
+      .header1 {
 
+        font-size: 24px;
 
+        /* margin: 30px 60px 10px 60px; */
 
+        display: flex;
 
+        justify-content: center;
 
+      }
 
+
 
+      .line {
 
+        height: 2px;
 
+        width: 410px;
 
+        margin: 3px auto;
 
+        background: black;
 
+      }
 
+
 
+      .line:nth-of-type(3) {
 
+        margin-bottom: 30px;
 
+      }
 
+
 
+      .header-top {
 
+        display: flex;
 
+        justify-content: space-between;
 
+      }
 
+
 
+      .sfcard {}
 
+
 
+      .sfcard-content {
 
+        /*        display: flex;
 
+        align-items: center;
 
+        justify-content: space-evenly; */
 
+      }
 
+
 
+      .sfcard-content img {
 
+        width: 100%;
 
+        height: 130vh;
 
+      }
 
+
 
+      .sfcard-title {
 
+        font-size: 28px;
 
+        text-align: center;
 
+      }
 
+
 
+      .center {
 
+        height: 140vh;
 
+      }
 
+
 
+      .part2 {
 
+        height: 140vh;
 
+        /* background: red; */
 
+      }
 
+
 
+      .part5 {
 
+        width: 100%
 
+      }
 
+
 
+      .paymentScreenshot {
 
+        width: 100%;
 
+        height: 130vh
 
+      }
 
+
 
+      /* .onlypz-center{
 
+        height: 130vh;
 
+      } */
 
+    </style>
 
+  </head>
 
+  <body>
 
+    <div id="app">
 
+      <div v-for="(item,index) in customerList1" :key="index">
 
+        <div class="content">
 
+          <div class="sfcard part3" v-if="isShowPrintType1">
 
+            <div class="sfcard-content">
 
+              <div class="sfcard-title">
 
+                {{ item.customerName}}{{
 
+              item.customerNumberCard}}
 
+              </div>
 
+              <img :src="item.imgURl.imageUrl1" class="avatar" />
 
+            </div>
 
+            <div class="sfcard-content">
 
+              <div class="sfcard-title">
 
+                {{ item.customerName}}{{
 
+              item.customerNumberCard}}
 
+              </div>
 
+              <img :src="item.imgURl.imageUrl2" class="avatar" />
 
+            </div>
 
+          </div>
 
+
 
+          <div class="bankcard part4" v-if="isShowPrintType2">
 
+            <div class="sfcard-content">
 
+              <div class="sfcard-title">
 
+                {{item.customerName}}:{{item.bankDeposit}}{{item.bankCard}}
 
+              </div>
 
+              <img :src="item.imgURl.imageUrl3" class="avatar" />
 
+            </div>
 
+            <div class="sfcard-content">
 
+              <div class="sfcard-title">
 
+                {{item.customerName}}:{{item.bankDeposit}}{{item.bankCard}}
 
+              </div>
 
+              <img :src="item.imgURl.imageUrl4" class="avatar" />
 
+            </div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </body>
 
+  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
 
+  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+  <script type="text/javascript">
 
+    new Vue({
 
+      el: '#app',
 
+      data: {
 
+        isShowPrintType1: false,
 
+        isShowPrintType2: false,
 
+        isShowPrintType3: false,
 
+        isShowPrintType4: false,
 
+        isShowPrintType5: false,
 
+        showType: [],
 
+        printData: {},
 
+        printData1: [],
 
+        customerList: {},
 
+        customerList1: [],
 
+        name: '',
 
+        bigContent: false,
 
+        smallContent: false,
 
+        date: '',
 
+        imageUrl1: '',
 
+        imageUrl2: '',
 
+        imageUrl3: '',
 
+        imageUrl4: '',
 
+        identity: [],
 
+        bank: [],
 
+        selectPrint: false,
 
+        onlyShowPz: false,
 
+        tableData: []
 
+      },
 
+      computed: {},
 
+      methods: {
 
+        dealNo(str) {
 
+          return str.slice(4)
 
+        },
 
+        tableRowClassName({
 
+          row,
 
+          rowIndex
 
+        }) {
 
+          if (rowIndex === 1) {
 
+            return 'warning-row'
 
+          } else if (rowIndex === 3) {
 
+            return 'success-row'
 
+          }
 
+          return ''
 
+        },
 
+        getQueryVariable(variable) {
 
+          var query = window.location.search.substring(1)
 
+          var vars = query.split('&')
 
+          for (var i = 0; i < vars.length; i++) {
 
+            var pair = vars[i].split('=')
 
+            if (pair[0] == variable) {
 
+              return pair[1]
 
+            }
 
+          }
 
+          return false
 
+        },
 
+        printSmall() {},
 
+        printBig() {}
 
+      },
 
+      mounted() {
 
+        this.date = new Date().toLocaleString()
 
+        this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
 
+        this.customerList1 = JSON.parse(
 
+          localStorage.getItem('collectionContractCustomerList_printList')
 
+        )
 
+        for (let i = 0; i < this.customerList1.length; i++) {
 
+          let _url1 = this.customerList1[i].cardAddressUrl.split(',')
 
+          let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
 
+          this.customerList1[i].imgURl = {
 
+            imageUrl1: _url1[0],
 
+            imageUrl2: _url1[1],
 
+            imageUrl3: _url2[0],
 
+            imageUrl4: _url2[0]
 
+          }
 
+        }
 
+        let _lsit = this.showType.split(',')
 
+        for (let i = 0; i < _lsit.length; i++) {
 
+          switch (_lsit[i]) {
 
+            case '打印身份证（正反面）':
 
+              this.isShowPrintType1 = !this.isShowPrintType1
 
+              break
 
+            case '打印银行卡（正反面）':
 
+              this.isShowPrintType2 = !this.isShowPrintType2
 
+              break
 
+          }
 
+        }
 
+        this.bigContent = true
 
+        this.smallContent = false
 
+        // if (this.printData.compName == undefined) this.printData.compName = ''
 
+        // document.title = this.printData.compName + '结算凭证'
 
+        window.print()
 
+        window.onafterprint = function(event) {
 
+          window.history.back(-1)
 
+        }
 
+      },
 
+      watch: {}
 
+    })
 
+  </script>
 
+</html>

+ 29 - 2
src/api/V2/contract/index.js
Bestand weergeven 

@@ -24,7 +24,7 @@ export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
 
 export const API_GET_RELATION_CONTRACTNO = '/contractManagementInfo/selectContract'
 
 export const API_GET_RELATION_CONTRACTNO = '/contractManagementInfo/selectContract'
 
 //删除销售合同
 
 //删除销售合同
 
 export const API_POST_CONTRACT_DELETE = '/contractManagementInfo/deleteInfo '
 
 export const API_POST_CONTRACT_DELETE = '/contractManagementInfo/deleteInfo '
 
-//销售合同修改编辑 
+//销售合同修改编辑
 
 
 
 export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'
 
 export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'
 
 // 获取负责人
 
 // 获取负责人
 
@@ -49,4 +49,31 @@ export const API_POST_CONFIRMATIONSHEET_DELETE = '/priceConfirmationSheet/api/de
 
 //编辑时查看点价确认单
 
 //编辑时查看点价确认单
 
 export const API_GET_GETINFO = '/priceConfirmationSheet/getInfo'
 
 export const API_GET_GETINFO = '/priceConfirmationSheet/getInfo'
 
 //客户
 
 //客户
 
-export const API_GET_CUSTOMERINFO = '/customerInfo/customerList'
 
+export const API_GET_CUSTOMERINFO = '/customerInfo/customerList'
 
+
 
+// 代收合同记录
 
+export const API_GET_RECORDPAGE = '/collectionWarehousingRecord/selectCollectionWarehousingRecordPage'
 
+
 
+// 代收合同添加记录
 
+export const API_POST_ADDRECORD = '/collectionWarehousingRecord/api/insertCollectionWarehousingRecord'
 
+
 
+// 代收合同身份证号查询认证客户
 
+export const API_GET_IDENTITYBYCARD = '/identityAuthenticationInfo/api/selectIdentityByCard'
 
+
 
+// 代收合同记录编辑
 
+export const API_POST_RECORDEDIT = '/collectionWarehousingRecord/editCollectionWarehousingRecord'
 
+
 
+// 代收合同记录删除
 
+export const API_POST_RECORDDELETE = '/collectionWarehousingRecord/deleteCollectionWarehousingRecord'
 
+
 
+// 代收合同记录导出
 
+export const API_POST_RECORDEXPORT = '/collectionWarehousingRecord/export'
 
+
 
+// 代收合同记录收款
 
+export const API_POST_COLLECTMONEY = '/collectionWarehousingRecord/api/collectMoney'
 
+
 
+// 代收合同记录付款
 
+export const API_POST_PAYMONEY = '/collectionWarehousingRecord/api/payMoney'
 
+
 
+// 代收合同记录开票
 
+export const API_POST_INVOICING = '/collectionWarehousingRecord/api/openInvoiceList'

+ 38 - 2
src/model/contarct/index.js
Bestand weergeven 

@@ -25,7 +25,16 @@ import {
 
     API_GET_STAFF,
 
     API_GET_STAFF,
 
     API_GET_STAFF_FIND,
 
     API_GET_STAFF_FIND,
 
     API_GET_CUSTOMERINFO,
 
     API_GET_CUSTOMERINFO,
 
-    API_POST_EXPORT1
 
+    API_GET_RECORDPAGE,
 
+    API_POST_ADDRECORD,
 
+    API_GET_IDENTITYBYCARD,
 
+    API_POST_RECORDEDIT,
 
+    API_POST_EXPORT1,
 
+    API_POST_RECORDDELETE,
 
+    API_POST_RECORDEXPORT,
 
+    API_POST_COLLECTMONEY,
 
+    API_POST_PAYMONEY,
 
+    API_POST_INVOICING
 
 } from '@/api/V2/contract'
 
 } from '@/api/V2/contract'
 
 // 列表
 
 // 列表
 
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
 
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
 
@@ -76,4 +85,31 @@ export const deletePriceConfirmationSheet = appRx.post(API_POST_CONFIRMATIONSHEE
 
 //编辑时查看点价确认单
 
 //编辑时查看点价确认单
 
 export const getInfo = appRx.get(API_GET_GETINFO, errorCatcher, errorHandle, filter)
 
 export const getInfo = appRx.get(API_GET_GETINFO, errorCatcher, errorHandle, filter)
 
 // 客户
 
 // 客户
 
-export const getcustomerinfo = appRx.get(API_GET_CUSTOMERINFO, errorCatcher, errorHandle, filter)
 
+export const getcustomerinfo = appRx.get(API_GET_CUSTOMERINFO, errorCatcher, errorHandle, filter)
 
+
 
+// 代收合同记录
 
+export const selectCollectionWarehousingRecordPage = appRx.get(API_GET_RECORDPAGE, errorCatcher, errorHandle, filter)
 
+
 
+// 代收合同记录
 
+export const insertCollectionWarehousingRecord = appRx.post(API_POST_ADDRECORD, errorCatcher, errorHandle, filter)
 
+
 
+// 代收合同身份证号查询认证客户
 
+export const selectIdentityByCard = appRx.get(API_GET_IDENTITYBYCARD, errorCatcher, errorHandle, filter)
 
+
 
+// 代收合同记录编辑
 
+export const editCollectionWarehousingRecord = appRx.post(API_POST_RECORDEDIT, errorCatcher, errorHandle, filter)
 
+
 
+// 代收合同记录删除
 
+export const deleteCollectionWarehousingRecord = appRx.post(API_POST_RECORDDELETE, errorCatcher, errorHandle, filter)
 
+
 
+// 代收合同记录导出
 
+export const exportCollectionWarehousingRecord = appRx.post(API_POST_RECORDEXPORT)
 
+
 
+// 代收合同记录收款
 
+export const collectMoneyApi = appRx.post(API_POST_COLLECTMONEY, errorCatcher, errorHandle, filter)
 
+
 
+ // 代收合同记录收款
 
+export const payMoney = appRx.post(API_POST_PAYMONEY, errorCatcher, errorHandle, filter)
 
+
 
+ // 代收合同记开票
 
+export const invoicing = appRx.post(API_POST_INVOICING, errorCatcher, errorHandle, filter)

+ 8 - 2
src/views/contractManagement/collectionContract.vue
Bestand weergeven 

@@ -131,7 +131,7 @@
 
                 position: relative;
 
                 position: relative;
 
                 top: -1px;
 
                 top: -1px;
 
                 margin: 0 6px;
 
                 margin: 0 6px;
 
-              " v-if="scope.row.status == '执行中'||scope.row.status == '已完成'" src="../../../public/img/jl.png"
 
+              "  src="../../../public/img/jl.png"
 
             v-hasPermission="
 
             v-hasPermission="
 
                 `contractManagement.dsContract.dsContractInfo.list`
 
                 `contractManagement.dsContract.dsContractInfo.list`
 
               " @click="handleRecord(scope.row)" alt="" />
 
               " @click="handleRecord(scope.row)" alt="" />
 
@@ -560,7 +560,13 @@
 
         this.$router.push({
 
         this.$router.push({
 
           name: 'collectionContractRecord',
 
           name: 'collectionContractRecord',
 
           query: {
 
           query: {
 
-            id: row.id,
 
+            contractNo: row.contractNo,
 
+            compId:row.compId,
 
+            buyer:row.buyer,
 
+            goodsName:row.goodsName,
 
+            weight:row.weight,
 
+            completed:row.completed,
 
+            agencyCharge:row.agencyCharge
 
           },
 
           },
 
         })
 
         })
 
       },
 
       },

File diff suppressed because it is too large
+ 654 - 608
src/views/contractManagement/collectionContractRecord.vue


+ 18 - 0
src/views/houseSelfCollect/paymentManagement.vue
Bestand weergeven 

@@ -878,6 +878,12 @@
 
         if (this.modification.length == 0) {
 
         if (this.modification.length == 0) {
 
           this.$message.warning('请选择要通过的条目')
 
           this.$message.warning('请选择要通过的条目')
 
         } else {
 
         } else {
 
+			for(let i =0;i<this.modification.length;i++){
 
+			  if(!this.modification[i].taskId){
 
+			     this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+			     return
 
+			  }
 
+			}
 
           this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
 
           this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
 
             cancelButtonText: '取消',
 
             cancelButtonText: '取消',
 
             confirmButtonText: '确定',
 
             confirmButtonText: '确定',
 
@@ -1200,6 +1206,12 @@
 
         if (this.modification.length == 0) {
 
         if (this.modification.length == 0) {
 
           this.$message.warning('请选择要驳回的条目')
 
           this.$message.warning('请选择要驳回的条目')
 
         } else {
 
         } else {
 
+			for(let i =0;i<this.modification.length;i++){
 
+			  if(!this.modification[i].taskId){
 
+				 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+				 return
 
+			  }
 
+			}
 
           this.$confirm('是否确定驳回？', '提示', {
 
           this.$confirm('是否确定驳回？', '提示', {
 
               confirmButtonText: '确定',
 
               confirmButtonText: '确定',
 
               cancelButtonText: '取消',
 
               cancelButtonText: '取消',
 
@@ -1289,6 +1301,12 @@
 
         if (this.modification.length == 0) {
 
         if (this.modification.length == 0) {
 
           this.$message.warning('请选择要通过的条目')
 
           this.$message.warning('请选择要通过的条目')
 
         } else {
 
         } else {
 
+			for(let i =0;i<this.modification.length;i++){
 
+			  if(!this.modification[i].taskId){
 
+			     this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+			     return
 
+			  }
 
+			}
 
           this.$confirm('是否确定通过？', '提示', {
 
           this.$confirm('是否确定通过？', '提示', {
 
               confirmButtonText: '确定',
 
               confirmButtonText: '确定',
 
               cancelButtonText: '取消',
 
               cancelButtonText: '取消',

+ 12 - 0
src/views/statisticalReport/autoSettlementList.vue
Bestand weergeven 

@@ -1195,6 +1195,12 @@ export default {
 
       if (this.modification.length == 0) {
 
       if (this.modification.length == 0) {
 
         this.$message.warning('请选择要驳回的条目')
 
         this.$message.warning('请选择要驳回的条目')
 
       } else {
 
       } else {
 
+		  for(let i =0;i<this.modification.length;i++){
 
+		    if(!this.modification[i].taskId){
 
+		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+		  	 return
 
+		    }
 
+		  }
 
         this.$confirm(`是否确定驳回？`, {
 
         this.$confirm(`是否确定驳回？`, {
 
           cancelButtonText: '取消',
 
           cancelButtonText: '取消',
 
           confirmButtonText: '确定',
 
           confirmButtonText: '确定',
 
@@ -1231,6 +1237,12 @@ export default {
 
       if (this.modification.length == 0) {
 
       if (this.modification.length == 0) {
 
         this.$message.warning('请选择要通过的条目')
 
         this.$message.warning('请选择要通过的条目')
 
       } else {
 
       } else {
 
+		  for(let i =0;i<this.modification.length;i++){
 
+		    if(!this.modification[i].taskId){
 
+		       this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+		       return
 
+		    }
 
+		  }
 
         this.$confirm(`是否确定通过？`, {
 
         this.$confirm(`是否确定通过？`, {
 
           cancelButtonText: '取消',
 
           cancelButtonText: '取消',
 
           confirmButtonText: '确定',
 
           confirmButtonText: '确定',

+ 12 - 0
src/views/statisticalReport/huoyunList.vue
Bestand weergeven 

@@ -1036,6 +1036,12 @@ export default {
 
       if (this.modification.length == 0) {
 
       if (this.modification.length == 0) {
 
         this.$message.warning('请选择要驳回的条目')
 
         this.$message.warning('请选择要驳回的条目')
 
       } else {
 
       } else {
 
+		  for(let i =0;i<this.modification.length;i++){
 
+		    if(!this.modification[i].taskId){
 
+		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+		  	 return
 
+		    }
 
+		  }
 
         this.$confirm(`是否确定驳回？`, {
 
         this.$confirm(`是否确定驳回？`, {
 
           cancelButtonText: '取消',
 
           cancelButtonText: '取消',
 
           confirmButtonText: '确定',
 
           confirmButtonText: '确定',
 
@@ -1068,6 +1074,12 @@ export default {
 
       if (this.modification.length == 0) {
 
       if (this.modification.length == 0) {
 
         this.$message.warning('请选择要通过的条目')
 
         this.$message.warning('请选择要通过的条目')
 
       } else {
 
       } else {
 
+		  for(let i =0;i<this.modification.length;i++){
 
+		    if(!this.modification[i].taskId){
 
+		       this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+		       return
 
+		    }
 
+		  }
 
         this.$confirm(`是否确定通过？`, {
 
         this.$confirm(`是否确定通过？`, {
 
           cancelButtonText: '取消',
 
           cancelButtonText: '取消',
 
           confirmButtonText: '确定',
 
           confirmButtonText: '确定',

+ 12 - 0
src/views/statisticalReport/purchaseClosingCashierList.vue
Bestand weergeven 

@@ -359,6 +359,12 @@
 
         if (this.modification.length == 0) {
 
         if (this.modification.length == 0) {
 
           this.$message.warning('请选择要驳回的条目')
 
           this.$message.warning('请选择要驳回的条目')
 
         } else {
 
         } else {
 
+			for(let i =0;i<this.modification.length;i++){
 
+			  if(!this.modification[i].taskId){
 
+				 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+				 return
 
+			  }
 
+			}
 
           this.$confirm(`是否确定驳回？`, {
 
           this.$confirm(`是否确定驳回？`, {
 
             cancelButtonText: '取消',
 
             cancelButtonText: '取消',
 
             confirmButtonText: '确定',
 
             confirmButtonText: '确定',
 
@@ -546,6 +552,12 @@
 
         if (this.modification.length == 0) {
 
         if (this.modification.length == 0) {
 
           this.$message.warning('请选择要通过的条目')
 
           this.$message.warning('请选择要通过的条目')
 
         } else {
 
         } else {
 
+			for(let i =0;i<this.modification.length;i++){
 
+			  if(!this.modification[i].taskId){
 
+			     this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+			     return
 
+			  }
 
+			}
 
           this.$confirm(`是否确定通过？`, {
 
           this.$confirm(`是否确定通过？`, {
 
             cancelButtonText: '取消',
 
             cancelButtonText: '取消',
 
             confirmButtonText: '确定',
 
             confirmButtonText: '确定',

+ 12 - 0
src/views/statisticalReport/purchaseReceiptStatisticsList.vue
Bestand weergeven 

@@ -677,6 +677,12 @@
 
         if (this.modification.length == 0) {
 
         if (this.modification.length == 0) {
 
           this.$message.warning('请选择要驳回的条目')
 
           this.$message.warning('请选择要驳回的条目')
 
         } else {
 
         } else {
 
+			for(let i =0;i<this.modification.length;i++){
 
+			  if(!this.modification[i].taskId){
 
+				 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+				 return
 
+			  }
 
+			}
 
           this.$confirm(`是否确定驳回？`, {
 
           this.$confirm(`是否确定驳回？`, {
 
             cancelButtonText: '取消',
 
             cancelButtonText: '取消',
 
             confirmButtonText: '确定',
 
             confirmButtonText: '确定',
 
@@ -709,6 +715,12 @@
 
         if (this.modification.length == 0) {
 
         if (this.modification.length == 0) {
 
           this.$message.warning('请选择要通过的条目')
 
           this.$message.warning('请选择要通过的条目')
 
         } else {
 
         } else {
 
+			for(let i =0;i<this.modification.length;i++){
 
+			  if(!this.modification[i].taskId){
 
+			     this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+			     return
 
+			  }
 
+			}
 
           this.$confirm(`是否确定通过？`, {
 
           this.$confirm(`是否确定通过？`, {
 
             cancelButtonText: '取消',
 
             cancelButtonText: '取消',
 
             confirmButtonText: '确定',
 
             confirmButtonText: '确定',

+ 12 - 0
src/views/statisticalReport/salesDeliveryReportList.vue
Bestand weergeven 

@@ -639,6 +639,12 @@ export default {
 
       if (this.modification.length == 0) {
 
       if (this.modification.length == 0) {
 
         this.$message.warning('请选择要驳回的条目')
 
         this.$message.warning('请选择要驳回的条目')
 
       } else {
 
       } else {
 
+		  for(let i =0;i<this.modification.length;i++){
 
+		    if(!this.modification[i].taskId){
 
+		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+		  	 return
 
+		    }
 
+		  }
 
         this.$confirm(`是否确定驳回？`, {
 
         this.$confirm(`是否确定驳回？`, {
 
           cancelButtonText: '取消',
 
           cancelButtonText: '取消',
 
           confirmButtonText: '确定',
 
           confirmButtonText: '确定',
 
@@ -653,6 +659,12 @@ export default {
 
       if (this.modification.length == 0) {
 
       if (this.modification.length == 0) {
 
         this.$message.warning('请选择要通过的条目')
 
         this.$message.warning('请选择要通过的条目')
 
       } else {
 
       } else {
 
+		  for(let i =0;i<this.modification.length;i++){
 
+		    if(!this.modification[i].taskId){
 
+		       this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+		       return
 
+		    }
 
+		  }
 
         this.$confirm(`是否确定通过？`, {
 
         this.$confirm(`是否确定通过？`, {
 
           cancelButtonText: '取消',
 
           cancelButtonText: '取消',
 
           confirmButtonText: '确定',
 
           confirmButtonText: '确定',

+ 6 - 0
src/views/statisticalReport/shippingList.vue
Bestand weergeven 

@@ -1036,6 +1036,12 @@ export default {
 
       if (this.warehouseList.records.length == 0) {
 
       if (this.warehouseList.records.length == 0) {
 
         this.$message.warning('请选择要驳回的条目')
 
         this.$message.warning('请选择要驳回的条目')
 
       } else {
 
       } else {
 
+		  for(let i =0;i<this.warehouseList.records.length;i++){
 
+		    if(!this.warehouseList.records[i].taskId){
 
+		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+		  	 return
 
+		    }
 
+		  }
 
         this.$confirm(`是否确定驳回？`, {
 
         this.$confirm(`是否确定驳回？`, {
 
           cancelButtonText: '取消',
 
           cancelButtonText: '取消',
 
           confirmButtonText: '确定',
 
           confirmButtonText: '确定',

+ 6 - 0
src/views/statisticalReport/stockPurchaseReceiptReportList.vue
Bestand weergeven 

@@ -941,6 +941,12 @@ export default {
 
       if (this.modification.length == 0) {
 
       if (this.modification.length == 0) {
 
         this.$message.warning('请选择要驳回的条目')
 
         this.$message.warning('请选择要驳回的条目')
 
       } else {
 
       } else {
 
+		  for(let i =0;i<this.modification.length;i++){
 
+		    if(!this.modification[i].taskId){
 
+		  	 this.$message.warning('序号第'+(i+1)+'条数据无需审核，请重新勾选审核数据！')
 
+		  	 return
 
+		    }
 
+		  }
 
         this.$confirm(`是否确定驳回？`, {
 
         this.$confirm(`是否确定驳回？`, {
 
           cancelButtonText: '取消',
 
           cancelButtonText: '取消',
 
           confirmButtonText: '确定',
 
           confirmButtonText: '确定',

Some files were not shown because too many files changed in this diff