Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

public/static/payprint1.html

@@ -810,11 +810,11 @@
             </div>
 
             <div class="center part1" v-if="isShowPrintType3&&printData.extra2||isShowPrintType6" :class="!selectPrint? 'simple':''">
-                <div class="header1">{{ printData.compName}}结算凭证</div>
+                <div class="header1">{{ print_company_name_ew}}结算凭证</div>
                 <div class="line"></div>
                 <div class="line"></div>
                 <div class="header">
-                    <div>单位名称：{{ printData.compName}}</div>
+                    <div>单位名称：{{ print_company_name_ew}}</div>
                     <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
                 </div>
                 <div class="header-top">
@@ -827,38 +827,38 @@
                     <div class="number">{{dealNo(printData.paymentNo)}}</div>
                 </div>
                 <table class="table">
-                    <tr class="row">
-                        <td rowspan="4" class="col col-bgc">买方</td>
+                        <td rowspan="2" class="col col-bgc">买方</td>
                         <td class="col col-bgc">单位名称</td>
-                        <td class="col" colspan="3">{{ print_customer_name_ew}}</td>
-                        <td rowspan="4" class="col col-bgc">卖方</td>
-                        <td class="col col-bgc">单位名称</td>
-                        <td class="col" colspan="4" >{{ print_company_name_ew}}</td>
+                        <td class="col" colspan="3">{{ print_company_name_ew}}</td>
+                        <td rowspan="4" class="col col-bgc">客户</td>
+                        <td class="col col-bgc">姓名</td>
+                        <td class="col" colspan="4" >{{printData.customerName}}</td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc">税务登记号</td>
-                        <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
-                        <td class="col col-bgc">联系人</td>
+                        <td class="col col-bgc">收货仓库</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName=='洮南新友谊兴旺库'?'建发农产品-洮南安定自管仓':printData.warehouseName}}</td>
+                        <td class="col col-bgc">身份证号</td>
                         <td class="col" colspan="4">
-                            {{ printData.customerName}}
+                           {{ printData.identityAuthenticationInfo.customerNumberCard}}
                         </td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc">业务编号</td>
-                        <td class="col" colspan="3">{{ printData.paymentNo}}</td>
-                        <td class="col col-bgc">联系电话</td>
+                        <td rowspan="2" class="col col-bgc">卖方</td>
+                        <td class="col col-bgc">单位名称</td>
+                        <td class="col" colspan="3">{{ print_customer_name_ew}}</td>
+                        <td class="col col-bgc">卡号</td>
                         <td class="col" colspan="4">
-                            {{printData.customerPhone}}
+                            {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
                         </td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc">收货仓库</td>
-                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
-                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
+                        <td class="col col-bgc">联系人</td>
+                        <td class="col" colspan="1">{{printData.warehouseName=='洮南新友谊兴旺库'?'程冬冬':''}}</td>
+                        <td class="col col-bgc">联系电话</td>
+                        <td class="col" colspan="1">{{printData.warehouseName=='洮南新友谊兴旺库'?'13946256986':''}}</td>
                         <td class="col col-bgc">地址</td>
-                        <td class="col" colspan="4">
-                            {{printData.identityAuthenticationInfo.compAddress}}
-                        </td>
+                        <td class="col" colspan="4">{{printData.identityAuthenticationInfo.compAddress}}</td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">货名</td>
@@ -1005,7 +1005,8 @@
                <img src="../../../../public/img/add.png" alt="" />
              </div> -->
                         <div class="config">收货单位签名或盖章</div>
-                        <div class="">客户签名</div>
+                        <div class="config">客户签名</div>
+                        <div class="">司机签名</div>
                     </div>
                     <!-- <div class="bottom-row3">扫一扫</div> -->
                     <!-- <div class="bottom-row4">

src/api/V2/universalityAudit/index.js

@@ -13,4 +13,6 @@ export const API_GET_INFO= '/commonSysParameter/getInfo'
 // 审核流1
 export const API_GET_workflow= '/newWorkflow/query/workflowsByBusinessCode'
 // 审核流2
-export const API_GET_HIS= '/newWorkflow/query/workflowInfo'
+export const API_GET_HIS= '/newWorkflow/query/workflowInfo'
+// 发起人撤回
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'

src/model/universalityAudit/index.js

@@ -9,12 +9,13 @@ import {
     API_LIST_AUDITINFO,
     API_GET_INFO,
     API_GET_workflow,
-    API_GET_HIS
+    API_GET_HIS,
+    API_SPONSOR_WITHDRAW
 } from '@/api/V2/universalityAudit'
 // 查看
 export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
 // 编辑
-export const editaduitinfo = appRx.get(API_EDIT_AUDITINFO, errorCatcher, errorHandle, filter)
+export const editaduitinfo = appRx.post(API_EDIT_AUDITINFO, errorCatcher, errorHandle, filter)
 // 删除
 export const deladuitinfo = appRx.post(API_DEL_AUDITINFO, errorCatcher, errorHandle, filter)
 // 添加
@@ -26,4 +27,6 @@ export const xiala = appRx.get(API_GET_INFO, errorCatcher, errorHandle, filter)
 // 审核流1
 export const workflow = appRx.get(API_GET_workflow, errorCatcher, errorHandle, filter)
 // 审核流2
-export const gethis = appRx.get(API_GET_HIS, errorCatcher, errorHandle, filter)
+export const gethis = appRx.get(API_GET_HIS, errorCatcher, errorHandle, filter)
+// 发起人撤回
+export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/paymentManagement.vue

@@ -62,9 +62,9 @@
         </ws-button>
       </template>
     </BaseHeaderLayout>
-    <BaseHeaderLayout :leftSpan="10">
-      <template slot="left">
-        <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
+    <el-row>
+      <el-col :span="20">
+         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
 
@@ -106,10 +106,17 @@
         >
           <el-button type="primary">模板下载</el-button>
         </el-link>
+      </el-col>
+      <el-col :span="4">
+      </el-col>
+    </el-row>
+    <!-- <BaseHeaderLayout :leftSpan="10">
+      <template slot="left">
+       
        
       </template>
       <template slot="right"></template>
-    </BaseHeaderLayout>
+    </BaseHeaderLayout> -->
     <el-table :data="paymentList" ref="table" style="width: 100%; margin-top: 20px" border height="calc(100% - 170px)"
       @row-click="handleRowClick" @selection-change="handleSelectionChange" :summary-method="getSummaries" show-summary>
       <!-- <el-table-column :selectable="selectInit" type="selection" width="30"></el-table-column> -->
@@ -1118,6 +1125,8 @@
         }
         if (arr.length > 0) {
           this.filesToRar(arr, '结算单文件')
+        }else{
+          this.$message.error('当前勾选的条目未生成结算单！')
         }
       },
       
@@ -2299,7 +2308,9 @@
     border-radius: 5px;
     display: block;
   }
-
+  .inline-block{
+    display:inline-block;
+  }
   .pay_img {
     width: 50%;
     // display: flex;

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -107,7 +107,7 @@
               <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
             </span>
 
-            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus" v-show="scope.row.showFlag"
+            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'" v-show="scope.row.showFlag"
             >撤回</span>
             <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.View`" -->
               <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`" -->
@@ -424,7 +424,7 @@
               }else{
                 response.records[i].show=false
               }
-              if (response.records[i].publisher == localStorage.getItem('ws-pf_staffName')) {
+              if (response.records[i].createUserId == localStorage.getItem('ws-pf_userId')) {
                 response.records[i].showFlag = true
               }
               

src/views/universalityAudit/audit.vue

@@ -96,7 +96,9 @@
               <el-button v-if="scope.row.approveStatus&&scope.row.taskId" @click="pass(scope.row)" type="primary">通过</el-button>
               <el-button v-if="scope.row.approveStatus&&scope.row.taskId" @click="reject(scope.row)" type="primary">驳回</el-button>
               <!-- <div style="display:inline-block;"> -->
-                <el-button v-if="scope.row.status=='已驳回'" @click="del(scope.row)" type="danger">删除</el-button>
+                <el-button v-show="scope.row.showFlag" v-if="scope.row.approveStatus&&scope.row.approveStatus != '发起人撤回'" @click="withdraw(scope.row)" type="primary">撤回</el-button>
+                <el-button v-show="scope.row.showFlag" v-if="scope.row.status=='已驳回' || scope.row.approveStatus =='发起人撤回'" @click="del(scope.row)" type="danger">删除</el-button>
+                <el-button v-show="scope.row.showFlag" v-if="scope.row.status=='已驳回' || scope.row.approveStatus =='发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
               <!-- </div> -->
             </template>
           </el-table-column>
@@ -129,7 +131,7 @@
   </el-form-item>
   <el-form-item>
     <el-button @click="addshow=false">取消</el-button>
-    <el-button type="primary" @click="onSubmit">提交</el-button>
+    <el-button type="primary" @click="onSubmit(flag)">提交</el-button>
   </el-form-item>
 </el-form>
 </el-dialog>
@@ -188,7 +190,10 @@
     addaduitinfo,
     deladuitinfo,
     workflow,
-    gethis
+    gethis,
+    sponsorWithdraw,
+    editaduitinfo,
+    getaduitinfo
   } from '@/model/universalityAudit/index'
   import { getUuid } from '../../utils'
   import WsUpload from '@/components/WsUpload'
@@ -204,7 +209,7 @@
     },
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         show:false,
         title:'',
@@ -216,14 +221,17 @@
         currentPage: 1,
         pageSize: 10,
         businessType:'',
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
-        endDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
+        showFlag:false,
+        flag:'',
         outtotal:0,
         xialaList:[],
         intotal:0,
         form:{},
+        generalAuditInfo:{},
         dialogVisible:false,
         contractList:[],
         datalist:{},
@@ -389,6 +397,22 @@
       //     index++
       //   }
       // },
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该申请吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       fujian(row) {
         this.id = row.id
         this.accessoryTFs = true
@@ -410,7 +434,14 @@
             this.getList()
           })
           })
-      },  
+      }, 
+      edit(row) {
+        getaduitinfo({ id: row.id }).toPromise().then(response => {
+          this.form = response
+        })
+        this.addshow = true
+        this.flag = 1
+      },
       onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -436,25 +467,47 @@
                 type: 'warning',
             })
         }
-        this.$confirm('确定发起审核？', '提示', {
+        if (this.flag != 1) {
+          this.$confirm('确定发起审核？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           })
-          .then(() => {
-            this.form.compId=localStorage.getItem('ws-pf_compId')
-            this.form.sponsor=localStorage.getItem('ws-pf_staffName')
-          addaduitinfo(this.form).toPromise().then(response => {
-            this.$message({
-                message: '提交成功!',
-                type: 'success',
+            .then(() => {
+              this.form.compId = localStorage.getItem('ws-pf_compId')
+              this.form.sponsor = localStorage.getItem('ws-pf_staffName')
+              addaduitinfo(this.form).toPromise().then(response => {
+                this.$message({
+                  message: '提交成功!',
+                  type: 'success',
+                })
+                this.getList()
+              })
+              this.form = {}
+              this.$refs.upload.clearFiles()
+              this.addshow = false
             })
-            this.form={}
-            this.$refs.upload.clearFiles()
-            this.addshow=false
-            this.getList()
+        } else {
+          this.$confirm('确定提交本次修改？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           })
-        })
+            .then(() => {
+              // this.form.compId = localStorage.getItem('ws-pf_compId')
+              // this.form.sponsor = localStorage.getItem('ws-pf_staffName')
+              editaduitinfo(this.form).toPromise().then(response => {
+                this.$message({
+                  message: '修改成功!',
+                  type: 'success',
+                })
+                this.getList()
+              })
+              this.form = {}
+              this.$refs.upload.clearFiles()
+              this.addshow = false
+            })
+        }
       },
       addlist(){
         this.addshow=true
@@ -487,7 +540,8 @@
             currentPage: this.currentPage,
             pageSize:this.pageSize ,
             searchType:this.searchType,
-            businessType:this.businessType
+            businessType:this.businessType,
+            flag:0
           })
           .toPromise()
           .then(response => {
@@ -500,11 +554,11 @@
                     if(arr[q]!=''){
                       response.records[i].addressUrlArray.push(arr[q])
                     }
-                    
                   }
-                  
                 }
-                
+                if(response.records[i].sponsor == localStorage.getItem('ws-pf_staffName')){
+                  response.records[i].showFlag = true
+                }
               }
             }
             this.tableData=response.records