发起人撤回

src/api/V2/contract/index.js

@@ -117,3 +117,6 @@ export const API_DELETE_CONTRACT ='/contractCostInfo/deleteInfo'
 export const API_PAYMENT ='/contractCostInfo/payment'
 // 获取合同结算单价
 export const API_GET_SETTLEMENTPRICE ='/contractManagementInfo/settlementPrice'
+
+// 发起人撤回
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'

src/api/V2/houseSelfCollect/index.js

@@ -118,4 +118,6 @@ export const API_POST_SUBMIT= '/warehouseInOutInfo/api/newInOutWarehouse'
 export const API_POST_CHANE_NO = `/weighingManagement/api/changeWarehouse`
 // 查询合同
 export const API_GET_CONTRACT ='/contractManagementInfo/getInContract'
+// 发起人撤回
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
 

src/api/V2/profitable/index.js

@@ -84,4 +84,23 @@ export const API_BOODINFO  ='/expenseInfo/selectBondInfo'
 //全部合同
 export const API_GET_CONTRACT  ='/contractManagementInfo/selectContractAll'
 //抵粮款
-export const API_SET_FOODALLOWANCE  ='/expenseInfo/api/foodAllowance'
+export const API_SET_FOODALLOWANCE  ='/expenseInfo/api/foodAllowance'
+
+//固定资产列表
+export const API_GET_FIXEDINFO_LIST = '/fixedAssetsInfo/selectFixedAssetsInfo'
+//固定资产查看
+export const API_LOOK_FIXEDINFO = '/fixedAssetsInfo/getFixedAssets'
+//固定资产新增/编辑
+export const API_ADD_OR_EDIT_FIXEDINFO = '/fixedAssetsInfo/api/insertOrUpdateFixedAssets'
+//固定资产所属部门/库点下拉列表
+export const API_GET_DEPT_AND_WARE = '/fixedAssetsInfo/getDeptAndWarehouseList'
+//固定资产负责人下拉列表
+export const API_GET_LEADINGCADRE = '/fixedAssetsInfo/getLeadingCadreList'
+//固定资产删除
+export const API_DEL_FIXEDINFO = '/fixedAssetsInfo/deleteFixedAssets'
+//固定资产批量删除
+export const API_BATCH_DEL_FIXEDINFO = '/fixedAssetsInfo/batchDeleteFixedAssets'
+// 发起人撤回
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
+// 入库单列表
+export const API_GET_WAREHOUSINGORDER_LIST = '/warehousingOrder/selectInfo'

src/api/V2/taskspost/index.js

@@ -60,4 +60,6 @@ export const API_SET_CORRECT= '/inOutWarehouseTask/api/correct'
 // 出库货源列表
 export const API_GET_GOODSOURCEINFO= '/warehousingOrder/selectGoodSourceInfo'
 // 退库选择任务
-export const API_GET_TASKNO= '/inOutWarehouseTask/getOutTaskNo'
+export const API_GET_TASKNO= '/inOutWarehouseTask/getOutTaskNo'
+// 发起人撤回
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'

src/api/V2/transport/index.js

@@ -36,11 +36,11 @@ export const API_POST_SHIPPING_TRAN_ARR = '/tranCarInfo/api/insertTranCar'
 //派车
 export const API_POST_AUTOMOBILE_DISPATCH= '/tranProcessInfo/api/insertTranCar'
 //派车查看
-export const API_GET_AUTOMOBILE_SEE = "/tranProcessInfo/getTranProcess"
+export const API_GET_AUTOMOBILE_SEE = '/tranProcessInfo/getTranProcess'
 //
-export const API_GET_AUTOMOBILE_NAME = "/driverViewInfo/selectDriverName"
+export const API_GET_AUTOMOBILE_NAME = '/driverViewInfo/selectDriverName'
 //
-export const API_GET_AUTOMOBILE_ARRANGE = "/driverViewInfo/selectDriverDetail"
+export const API_GET_AUTOMOBILE_ARRANGE = '/driverViewInfo/selectDriverDetail'
 //发货反馈
 export const API_POST_AUTOMOBILE_FEEDBACK = '/tranProcessInfo/api/insertTranCar'
 //更改发货反馈状态
@@ -64,4 +64,6 @@ export const API_GET_IMPORT= '/importController/readDocument'
 // 车牌号列表
 export const API_GET_CARNUMBER= '/driverCarInfo/selectAllCarNumber'
 // 通过车牌号查找司机
-export const API_GET_DRIVERINFO='/driverViewInfo/selectDriverViewList'
+export const API_GET_DRIVERINFO='/driverViewInfo/selectDriverViewList'
+// 发起人撤回
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'

src/api/V2/warehouse/index.js

@@ -150,4 +150,6 @@ export const API_POST_EDITSUBMIT='/dryWarehouse/api/editDryWarehouse'
 //烘干入库  记录删除
 export const API_POST_DELETEINFO='/dryWarehouse/api/deleteDryWarehouse'
 //仓位类型
-export const API_GET_BINTYPE='/warehousePositionInfo/selectBinNumberList'
+export const API_GET_BINTYPE='/warehousePositionInfo/selectBinNumberList'
+// 发起人撤回
+export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'

src/model/contarct/index.js

@@ -50,7 +50,8 @@ import {
     API_DELETE_CONTRACT,
     API_PAYMENT,
     API_GET_SETTLEMENTPRICE,
-    API_GET_STAFF_ALL
+    API_GET_STAFF_ALL,
+    API_SPONSOR_WITHDRAW
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -168,3 +169,8 @@ export const delcontractcost = appRx.post(API_DELETE_CONTRACT, errorCatcher, err
 export const payment = appRx.post(API_PAYMENT, errorCatcher, errorHandle, filter)
 // 获取合同结算单价
 export const getsettlementprice = appRx.get(API_GET_SETTLEMENTPRICE, errorCatcher, errorHandle, filter)
+
+// 发起人撤回
+export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
+
+

src/model/houseSelfCollect/index.js

@@ -61,8 +61,8 @@ import {
   API_POST_SUBMIT,
   API_POST_CHANE_NO,
   API_POST_DELETE,
-API_GET_CONTRACT
-  
+  API_GET_CONTRACT,
+  API_SPONSOR_WITHDRAW
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -185,4 +185,6 @@ export const newSubmit = appRx.post(API_POST_SUBMIT, errorCatcher, errorHandle,
 // 换仓
 export const changeNo = appRx.post(API_POST_CHANE_NO, errorCatcher, errorHandle, filter)
 // 获取合同
-export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
+export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
+// 发起人撤回
+export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)

src/model/profitable/index.js

@@ -13,7 +13,6 @@ import {
   API_GET_WAREHOUSE,
   API_GET_LOOK,
   API_POST_SUBMIT,
-
   API_POST_SHOUGUAN,
   API_POST_SUBMITPAY,
   API_GET_WAREHOUSE_NO,
@@ -44,7 +43,16 @@ import {
   API_GETXIALALIST,
   API_BOODINFO,
   API_GET_CONTRACT,
-  API_SET_FOODALLOWANCE
+  API_SET_FOODALLOWANCE,
+  API_GET_FIXEDINFO_LIST,
+  API_LOOK_FIXEDINFO,
+  API_ADD_OR_EDIT_FIXEDINFO,
+  API_GET_DEPT_AND_WARE,
+  API_GET_LEADINGCADRE,
+  API_DEL_FIXEDINFO,
+  API_BATCH_DEL_FIXEDINFO,
+  API_SPONSOR_WITHDRAW,
+  API_GET_WAREHOUSINGORDER_LIST,
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -132,3 +140,22 @@ export const getcontractno= appRx.get(API_GET_CONTRACT, errorCatcher, errorHandl
 export const setfoodallowance= appRx.post(API_SET_FOODALLOWANCE, errorCatcher, errorHandle, filter)
 //费用下拉详情筛选
 export const getXialaList= appRx.get(API_GETXIALALIST, errorCatcher, errorHandle, filter)
+
+// 固定资产列表
+export const getFixedInfoList = appRx.get(API_GET_FIXEDINFO_LIST, errorCatcher, errorHandle, filter)
+// 固定资产查看
+export const lookFixedInfo = appRx.get(API_LOOK_FIXEDINFO, errorCatcher, errorHandle, filter)
+// 固定资产添加/编辑
+export const addOrEditFixedInfo = appRx.post(API_ADD_OR_EDIT_FIXEDINFO, errorCatcher, errorHandle, filter)
+// 固定资产 所属部门/库点下拉列表
+export const getDeptAndWare = appRx.get(API_GET_DEPT_AND_WARE, errorCatcher, errorHandle, filter)
+// 固定资产 负责人下拉列表
+export const getLeadingCadre = appRx.get(API_GET_LEADINGCADRE, errorCatcher, errorHandle, filter)
+// 固定资产删除
+export const delFixedInfo = appRx.post(API_DEL_FIXEDINFO, errorCatcher, errorHandle, filter)
+// 固定资产批量删除
+export const batchDelFixedInfo = appRx.post(API_BATCH_DEL_FIXEDINFO, errorCatcher, errorHandle, filter)
+	// 发起人撤回
+  export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
+  //入库单列表
+export const getwarehousingorderList = appRx.get(API_GET_WAREHOUSINGORDER_LIST,errorCatcher, errorHandle, filter)

src/model/tasksport/index.js

@@ -25,6 +25,7 @@ import {
     API_POST_DEL_HAULAGE_STAGE,
     API_GET_STAFF,
     API_GET_TASKHISTORIES,
+    API_SPONSOR_WITHDRAW,
     API_POST_WORKFLOW_TASK,
     API_EDIT_SOURCEOFGOODS,
     API_GET_SOURCEGOOD,
@@ -92,4 +93,6 @@ export const setcorrect = appRx.post(API_SET_CORRECT, errorCatcher, errorHandle,
 //出库货源列表
 export const getSourceOfGoodsinfo = appRx.get(API_GET_GOODSOURCEINFO, errorCatcher, errorHandle, filter)
 //退库选择的任务编号
-export const gettaskNo = appRx.get(API_GET_TASKNO, errorCatcher, errorHandle, filter)
+export const gettaskNo = appRx.get(API_GET_TASKNO, errorCatcher, errorHandle, filter)
+	// 发起人撤回
+    export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)

src/model/transport/index.js

@@ -35,7 +35,8 @@ import {
     API_POST_TRANPROCESSINFO,
     API_POST_AUTOMOBILE_TRANPRICE_CAR,
     API_GET_CARNUMBER,
-    API_GET_DRIVERINFO
+    API_GET_DRIVERINFO,
+    API_SPONSOR_WITHDRAW
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
@@ -102,4 +103,6 @@ export const importApplFileUrl = appRx.get(API_GET_IMPORT, errorCatcher, errorHa
 // 车牌号
 export const getcarNumber = appRx.get(API_GET_CARNUMBER, errorCatcher, errorHandle, filter)
 // 根据车牌号查找司机
-export const getdriverinfo = appRx.get(API_GET_DRIVERINFO, errorCatcher, errorHandle, filter)
+export const getdriverinfo = appRx.get(API_GET_DRIVERINFO, errorCatcher, errorHandle, filter)
+	// 发起人撤回
+    export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)

src/model/warehouse/index.js

@@ -73,7 +73,8 @@ import {
      API_GET_RECORD,
      API_POST_EDITSUBMIT,
      API_POST_DELETEINFO,
-     API_GET_BINTYPE
+     API_GET_BINTYPE,
+    API_SPONSOR_WITHDRAW,
     // API_GET_EXPENSEINFO
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
@@ -225,4 +226,6 @@ export const editDryWarehouse = appRx.post(API_POST_EDITSUBMIT,errorCatcher, err
 //烘干入库  记录删除
 export const delRecord= appRx.post(API_POST_DELETEINFO,errorCatcher, errorHandle, filter)
 //仓位类型
-export const getbintype= appRx.get(API_GET_BINTYPE,errorCatcher, errorHandle, filter)
+export const getbintype= appRx.get(API_GET_BINTYPE,errorCatcher, errorHandle, filter)
+// 发起人撤回
+export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContract.vue

@@ -185,7 +185,7 @@
             " alt="" />
           <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                !scope.row.approveStatus)
+                !scope.row.approveStatus || scope.row.approveStatus == '发起人撤回')
             " style="display: inline-block">
             <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
               src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
@@ -201,6 +201,13 @@
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
+            <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                @click="withdraw(scope.row)" v-hasPermission="
+                            `contractManagement.buyContract.buyContractInfo.edit`
+                          " alt="" />
+            </div>
+            <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -230,7 +237,8 @@
     deletecontract,
     editInfo,
     getsettlementprice,
-    getstafffind
+    getstafffind,
+    sponsorWithdraw
   } from '@/model/contarct/index'
   import {
     downloadFile
@@ -370,7 +378,7 @@
         },
         value1: '',
         value2: '',
-        createPersion: "",//创建人
+        createPersion: '',//创建人
       persionList: [],
       }
     },
@@ -385,6 +393,22 @@
 
     },
     methods: {
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该合同吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       persionXiaLa() {
       getstafffind({
         roles: 'b96299bb5dcf461e916b72b64c6943b0'

src/views/contractManagement/purchaseContract.vue

@@ -193,7 +193,7 @@
             " alt="" />
           <div v-if="
             (scope.row.approveStatus != '待决策人审核' &&
-              !scope.row.approveStatus)
+              !scope.row.approveStatus || scope.row.approveStatus == '发起人撤回')
           " style="display: inline-block">
             <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
               src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
@@ -209,6 +209,13 @@
             src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
+                         <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                @click="withdraw(scope.row)" v-hasPermission="
+                            `contractManagement.buyContract.buyContractInfo.edit`
+                          " alt="" />
+            </div>
+            <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -263,7 +270,8 @@ import {
   deletecontract,
   editInfo,
   getsettlementprice,
-  getstafffind
+  getstafffind,
+  sponsorWithdraw
 } from '@/model/contarct/index'
 import {
   downloadFile
@@ -408,7 +416,7 @@ export default {
       fapiaostatus:false,
       value1: '',
       value2: '',
-      createPersion: "",//创建人
+      createPersion: '',//创建人
       persionList: [],
     }
   },
@@ -435,6 +443,22 @@ export default {
           this.persionList = response
         })
     },
+    withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该合同吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
     handlecost(row) {
       this.$router.push({
         name: 'buyContractcost',

src/views/contractManagement/salesContract.vue

@@ -200,7 +200,7 @@
             " alt="" />
           <div v-if="
             (scope.row.approveStatus != '待决策人审核' &&
-              !scope.row.approveStatus)
+              !scope.row.approveStatus || scope.row.approveStatus == '发起人撤回')
           " style="display: inline-block">
             <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
               src="../../../public/img/bianji.png" v-hasPermission="
@@ -217,6 +217,14 @@
             src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
+                        <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                @click="withdraw(scope.row)" v-hasPermission="
+                            `contractManagement.buyContract.buyContractInfo.edit`
+                          " alt="" />
+            </div>
+            <!-- <ws-button v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" type="primary" @click="withdraw(scope.row)" >撤回</ws-button> -->
+            <!-- v-hasPermission="`contractManagement.salesContract.salesContractInfo.add`" -->
         </template>
       </el-table-column>
     </el-table>
@@ -281,7 +289,8 @@ import {
   deletecontract,
   editInfo,
   getsettlementprice,
-  getstafffind
+  getstafffind,
+  sponsorWithdraw
 } from '@/model/contarct/index'
 import {
   downloadFile
@@ -438,7 +447,7 @@ export default {
       fapiaostatus: false,
       value1: '',
       value2: '',
-      createPersion: "",//创建人
+      createPersion: '',//创建人
       persionList: [],
     }
   },
@@ -794,6 +803,23 @@ export default {
         },
       })
     },
+    withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该合同吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
+
     handleAdd() {
       this.$router.push({
         path: 'salesContractAdd',

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -49,10 +49,11 @@
         
       </el-table-column>
       <el-table-column prop="updateDate" label="通过时间"></el-table-column>
-      <el-table-column label="操作" width="300">
+      <el-table-column label="操作" width="500">
         <template slot-scope="scope">
           <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>
-          <el-button v-if="scope.row.status!='审核中'" size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')"
+          <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回'" size="mini" @click="withdraw(scope.row)">撤回</el-button>
+          <el-button v-if="scope.row.status!='审核中' || scope.row.approveStatus =='发起人撤回' " size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')"
             v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`">编辑</el-button>
           <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!scope.row.taskId"
             @click="newAcquisition(scope.$index, scope.row,'审核中')">审核中</el-button>
@@ -75,7 +76,8 @@
     selectWarehouseSelf,
     purchasePriceAllowEdit,
     purchasePriceLook,
-    purchasePriceDel
+    purchasePriceDel,
+    sponsorWithdraw
   } from '@/model/houseSelfCollect/index'
   import {
     getHp
@@ -115,6 +117,22 @@
     computed() {},
     created() {},
     methods: {
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       getUserJurisdiction() {
         this.userJurisdiction = getHp('acquisitionManagement.acquisition.view')
         this.userJurisdictionAllow = getHp(
@@ -304,7 +322,7 @@
               JSON.stringify(response.detailPrints)
             )
             if(response.bulkDensityStandard == 1){
-              window.open('../../../static/print.html?name=' + row.goodsName+"&type=" + 1)
+              window.open('../../../static/print.html?name=' + row.goodsName+'&type=' + 1)
             }else{
             window.open('../../../static/print.html?name=' + row.goodsName)
             }

src/views/profitable/expensemanagementdetails.vue

@@ -178,8 +178,8 @@
                   scope.row.status == '已付款' &&
                   !scope.row.approveStatus)
               " @click="accomplish(scope.row)" type="primary">完成</el-button>
-              <el-button v-if="scope.row.status == '已驳回'" @click="edit(scope.row)" type="primary">编辑</el-button>
-              <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(scope.row)" type="primary">编辑</el-button> -->
+              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " @click="withdraw(scope.row)" type="primary">撤回</el-button>
+              <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
               <el-button v-if="
                 (!scope.row.distributionStatus &&
                   scope.row.expensesPurpose == 1 &&
@@ -302,7 +302,8 @@ import {
   editexenseinfo,
   getAuditRecord,
   getfielfillinginfo,
-  getXialaList
+  getXialaList,
+  sponsorWithdraw
 } from '@/model/profitable/index'
 export default {
   components: {
@@ -345,23 +346,23 @@ export default {
       choiceObj: [],
       costChoice: [
         {
-          name: "合同费用",
+          name: '合同费用',
           id: 1
         },
         {
-          name: "库点费用",
+          name: '库点费用',
           id: 2
         }, 
         {
-          name: "经营性费用",
+          name: '经营性费用',
           id: 3
         },
         {
-          name: "运费",
+          name: '运费',
           id: 4
         },
         {
-          name: "其他",
+          name: '其他',
           id: 5
         }
       ],
@@ -378,6 +379,22 @@ export default {
     this.xiala()
   },
   methods: {
+    withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
     xiala(){
       
        //搜索框下拉数据
@@ -385,7 +402,7 @@ export default {
         compId: localStorage.getItem('ws-pf_compId'),
         startDate: this.startDate,
         endDate: this.endDate,
-        searchKeyWord: "",
+        searchKeyWord: '',
         currentPage: 1,
         pageSize: 9999,
       })
@@ -406,7 +423,7 @@ export default {
             }else if(this.flowToList[i].expensesPurpose == 1){
               this.flowToList[i].flowTo = this.flowToList[i].contractNo
             }else if(this.flowToList[i].expensesPurpose == 5){
-              this.flowToList[i].flowTo = "中天昊元"
+              this.flowToList[i].flowTo = '中天昊元'
             }else if(this.flowToList[i].expensesPurpose == 2){
               this.flowToList[i].flowTo = this.flowToList[i].contractNo
             }
@@ -770,12 +787,12 @@ export default {
         pageSize: this.pageSize,
         searchType: this.searchType,
         expensesPurpose: this.expensesPurpose,
-        costNo:this.costNo.length>0?this.costNo.toString():"",
-        purpose:this.purpose.length>0?this.purpose.toString():"",
-        expenseName:this.expenseName.length>0?this.expenseName.toString():"",
-        unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():"",
-        agent:this.agent.length>0?this.agent.toString():"",
-        flowTo:this.flowTo.length>0?this.flowTo.toString():"",
+        costNo:this.costNo.length>0?this.costNo.toString():'',
+        purpose:this.purpose.length>0?this.purpose.toString():'',
+        expenseName:this.expenseName.length>0?this.expenseName.toString():'',
+        unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():'',
+        agent:this.agent.length>0?this.agent.toString():'',
+        flowTo:this.flowTo.length>0?this.flowTo.toString():'',
       })
         .toPromise()
         .then((response) => {

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -107,6 +107,14 @@
               <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
             </span>
 
+            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus"
+            >撤回</span>
+            <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.View`" -->
+              <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`" -->
+            <span >
+              <el-divider direction="vertical" v-if="scope.row.approveStatus == '发起人撤回'"></el-divider>
+            </span>
+
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
               " v-if="scope.row.taskStatus == '待审核'&&scope.row.taskId" @click="audit(scope.row)">审核</span>
@@ -119,11 +127,12 @@
                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
               " v-if="
                 scope.row.taskStatus == '执行中' ||
-                scope.row.taskStatus == '已驳回'
+                scope.row.taskStatus == '已驳回' ||
+                scope.row.approveStatus == '发起人撤回'
               " @click="delivery(scope.row)">编辑</span>
               <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.delete`">
               <el-divider direction="vertical" v-if=" scope.row.taskStatus == '执行中' ||
-                scope.row.taskStatus == '已驳回'"></el-divider>
+                scope.row.taskStatus == '已驳回' || scope.row.approveStatus == '发起人撤回'"></el-divider>
             </span>
             <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.delete`">
               <el-divider direction="vertical" v-if="scope.row.show"></el-divider>
@@ -150,7 +159,8 @@
     getoreditoutput,
     outdelete,
     movestates,
-    setcorrect
+    setcorrect,
+    sponsorWithdraw
   } from '@/model/tasksport/index'
   import {
   selectWarehouseSelf,
@@ -421,6 +431,22 @@
             this.deptBudgetTotal = response.total
           })
       },
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该任务吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       //编辑
       delivery(item) {
         this.$router.push({

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -95,14 +95,18 @@
             </el-form-item>
             <!--审核中的运输总价-->
             <el-form-item label="审核中的运输总价(元):" prop="tranPriceIng" label-width="180px" class="input-item-margin">
-              <el-input v-if="deptBudgetList.priceStatus=='审核中'" :disabled="readonly"
+              <el-input v-if="deptBudgetList.priceStatus=='审核中' && deptBudgetList.approveStatus != '发起人撤回'" :disabled="readonly"
                 v-model="deptBudgetList.tranPriceIng" maxlength="70" />
               <el-input v-else v-model="deptBudgetList.tranPriceIng" maxlength="70" />
             </el-form-item>
             <div class="input-item-margin">
+              <el-button v-if="deptBudgetList.approveStatus=='发起人撤回'" type="primary" size="small" @click="priceSubmit()">提交
+              </el-button>
               <el-button v-if="deptBudgetList.priceStatus=='审核中'" type="primary"
                  size="small">{{deptBudgetList.approveStatus}}</el-button>
               <el-button v-else type="primary" @click="priceSubmit()">提交</el-button>
+              <el-button v-if="deptBudgetList.approveStatus &&deptBudgetList.approveStatus!='发起人撤回'" type="primary"
+              @click="withdraw()">撤回</el-button>
             </div>
           </el-row>
 
@@ -231,7 +235,8 @@
     packList,
     dispatchCat,
     delhaulagestage,
-    setUpTranPrice
+    setUpTranPrice,
+    sponsorWithdraw,
   } from '@/model/transport/index'
   import {
     getstaff
@@ -358,6 +363,22 @@
       },
     },
     methods: {
+      withdraw() {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该单价吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: this.deptBudgetList.workflowId,
+          businessKey: this.deptBudgetList.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.loaddata()
+          })
+      })
+    },
       getList() {
         getstaff({
             compId: localStorage.getItem('el-pf_compId')
@@ -529,7 +550,7 @@
           tranProcessInfo.reviewer = localStorage.getItem('el-pf_roleName') +
             localStorage.getItem('el-pf_staffName')
           tranProcessInfo.id = this.deptBudgetList.id
-          tranProcessInfo.flag = "2"
+          tranProcessInfo.flag = '2'
           tranProcessInfo.tranPriceIng = value
           tranProcessInfo.tranTypeKey = 3
           setUpTranPrice(tranProcessInfo)
@@ -553,7 +574,7 @@
           .then(() => {
             var tranProcessInfo = {}
             tranProcessInfo.id = this.deptBudgetList.id
-            tranProcessInfo.flag = "1"
+            tranProcessInfo.flag = '1'
             tranProcessInfo.tranPriceIng = this.deptBudgetList.tranPriceIng
             tranProcessInfo.tranTypeKey = 3
             setUpTranPrice(tranProcessInfo)

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -93,7 +93,7 @@
             </ws-form-item>
             <ws-form-item label="审核中的运输总价(元):" span="1" prop="tranPriceIng">
               <ws-input
-                  v-if="deptBudgetList.priceStatus=='审核中'"
+                  v-if="deptBudgetList.priceStatus=='审核中'&& deptBudgetList.approveStatus != '发起人撤回'"
                   :disabled="readonly"
                   v-model="deptBudgetList.tranPriceIng"
                   maxlength="70"
@@ -110,6 +110,14 @@
             </ws-form-item>
             <!-- <ws-form-item>
             </ws-form-item> -->
+            <el-button
+             v-if="deptBudgetList.approveStatus=='发起人撤回'"
+              type="primary"
+              size="small"
+              class="submit"
+              @click="priceSubmit()"
+              >提交</el-button
+            >
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
@@ -125,6 +133,8 @@
               @click="priceSubmit()"
               >提交</el-button
             >
+            <el-button v-if="deptBudgetList.approveStatus &&deptBudgetList.approveStatus!='发起人撤回'" type="primary" class="submit"
+              @click="withdraw()">撤回</el-button>
           </div>
       <div
         class="liaison"
@@ -238,7 +248,8 @@ import {
   dispatchCat,
   packList,
   delhaulagestage,
-  setUpTranPrice
+  setUpTranPrice,
+  sponsorWithdraw,
 } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
@@ -311,6 +322,22 @@ export default {
     },
   },
   methods: {
+    withdraw() {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该单价吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: this.deptBudgetList.workflowId,
+          businessKey: this.deptBudgetList.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
@@ -512,7 +539,7 @@ export default {
               tranProcessInfo.reviewer = localStorage.getItem('ws-pf_roleName') +
         localStorage.getItem('ws-pf_staffName')
               tranProcessInfo.id = this.deptBudgetList.id
-              tranProcessInfo.flag = "2"
+              tranProcessInfo.flag = '2'
               tranProcessInfo.tranPriceIng = value
                  tranProcessInfo.tranTypeKey = 2
               setUpTranPrice(tranProcessInfo)
@@ -536,7 +563,7 @@ export default {
         .then(() => {
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
-              tranProcessInfo.flag = "1"
+              tranProcessInfo.flag = '1'
               tranProcessInfo.tranPriceIng = this.deptBudgetList.tranPriceIng
                tranProcessInfo.tranTypeKey = 2
               setUpTranPrice(tranProcessInfo)

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -96,31 +96,32 @@
               <el-input v-model="deptBudgetList.tranPriceCar" maxlength="70" disabled />
             </el-form-item>
             <el-form-item v-if='pricetype==1' label="审核中的运输总价(元/吨):" prop="tranPriceIng" label-width="180px" class="input-item-margin">
-              <el-input v-if="deptBudgetList.priceStatus=='审核中'" :disabled="readonly"
+              <el-input v-if="deptBudgetList.priceStatus=='审核中'&& deptBudgetList.approveStatus!='发起人撤回'" :disabled="readonly"
                 v-model="deptBudgetList.tranPriceIng" maxlength="70" />
               <el-input v-else v-model="deptBudgetList.tranPriceIng" maxlength="70" />
             </el-form-item>
             <el-form-item v-else label="审核中的运输总价(元/车):" prop="tranPriceIng" label-width="180px" class="input-item-margin">
-              <el-input v-if="deptBudgetList.priceStatusCar=='审核中'" :disabled="readonly"
+              <el-input v-if="deptBudgetList.priceStatusCar=='审核中' && deptBudgetList.approveStatus!='发起人撤回'" :disabled="readonly"
                 v-model="deptBudgetList.tranPriceIngCar" maxlength="70" />
               <el-input v-else v-model="deptBudgetList.tranPriceIngCar" maxlength="70" />
             </el-form-item>
             <div class="input-item-margin">
-              <div style="display:inline-block;" v-if="deptBudgetList.priceStatus=='审核中'&&pricetype==1">
+              <div style="display:inline-block;" v-if="deptBudgetList.priceStatus=='审核中'&&pricetype==1 || deptBudgetList.approveStatus=='发起人撤回'&&pricetype==1 ">
                 {{deptBudgetList.approveStatus}}
-                <el-button type="primary" v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small"
+                <el-button type="primary" v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small" 
                 @click="examine(1)">审核中
                 </el-button>
               </div>
-              <el-button v-if="deptBudgetList.priceStatus!='审核中'&&pricetype==1" type="primary" @click="priceSubmit(1)">提交</el-button>
+              <el-button v-if="deptBudgetList.priceStatus!='审核中'&&pricetype==1 || deptBudgetList.approveStatus == '发起人撤回'&&pricetype==1" type="primary" @click="priceSubmit(1)">提交</el-button>
               <!-- <el-button @click="examine(1)" v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==1" type="primary">{{deptBudgetList.approveStatus}}</el-button> -->
-              <div style="display:inline-block;" v-if="deptBudgetList.priceStatusCar=='审核中'&&pricetype==2">
+              <div style="display:inline-block;" v-if="deptBudgetList.priceStatusCar=='审核中'&&pricetype==2 || deptBudgetList.approveStatus=='发起人撤回'&&pricetype==2 ">
                 {{deptBudgetList.approveStatus}}
                 <el-button @click="examine(2)" type="primary" v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small"
                   >审核中
                 </el-button>
               </div>
-              <el-button v-if="deptBudgetList.priceStatusCar!='审核中'&&pricetype==2" type="primary" @click="priceSubmit(2)">提交</el-button>
+              <el-button v-if="deptBudgetList.priceStatusCar!='审核中'&&pricetype==2 || deptBudgetList.approveStatus == '发起人撤回'&&pricetype==2" type="primary" @click="priceSubmit(2)">提交</el-button>
+              <el-button v-if="deptBudgetList.approveStatus && deptBudgetList.approveStatus != '发起人撤回'" type="primary" @click="withdraw()">撤回</el-button>
               <!-- <el-button @click="examine(2)" v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==2" type="primary">{{deptBudgetList.approveStatus}}</el-button> -->
             </div>
           </div>
@@ -290,7 +291,8 @@
     setUpTranPrice,
     setUpTranPriceCar,
     getcarNumber,
-    getdriverinfo
+    getdriverinfo,
+    sponsorWithdraw,
   } from '@/model/transport/index'
   // import { dayjs, fmoney, EventBus } from 'base-core-lib'
   import {
@@ -392,6 +394,22 @@
       },
     },
     methods: {
+      withdraw() {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该单价吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: this.deptBudgetList.workflowId,
+          businessKey: this.deptBudgetList.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       pricetypechange(e){
         console.log(e)
         this.deptBudgetList.billingMethod=e
@@ -1291,7 +1309,7 @@
     // background: green;
     padding-left: 20px;
     align-items: center;
-    width: 800px;
+    width: 999px;
   }
 
   .myTest .el-form-item {

src/views/warehousenew/warehousingOrder.vue

@@ -77,6 +77,9 @@
           <ws-button v-if='item.payshow' type="primary" @click="payout(item)"
             v-hasPermission="`warehouseManagement.warehousingOrder.appl`">请款
           </ws-button>
+          <ws-button v-if="item.approveStatus&& item.payshow" type="primary" @click="withdraw(item)"
+            v-hasPermission="`warehouseManagement.warehousingOrder.appl`">撤回
+          </ws-button>
           <ws-button v-if='!item.payshow' type="primary" @click="cancel(item)" v-hasPermission="
             `warehouseManagement.warehousingOrder.appl`
           ">取消
@@ -481,7 +484,6 @@
       </span>
     </el-dialog>
   </div>
-  </div>
 </template>
 <script>
 import {
@@ -500,7 +502,9 @@ import {
   dryout,
   getenabledinfo,
   setenabledinfo,
-  getbyname
+  getbyname,
+  sponsorWithdraw,
+  updateApprove
 } from '@/model/warehouse/index'
 import {
   selectWarehouseSelf,
@@ -961,6 +965,45 @@ export default {
             })
         })
     },
+    withdraw(item) {
+      var arr1 = this.multipleSelection1[item.id]
+      for (let i = 0; i < arr1.length; i++) {
+        if (!arr1[i].approveStatus || arr1[i].approveStatus == '发起人撤回') {
+          this.$message({
+            message: '请选择请款审核中的条目进行撤回',
+            type: 'warning'
+          });
+          return
+        } else {
+          this.$confirm(`撤回成功后，可再次提交，确定撤回该次请款吗？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          }).then(() => {
+            var arr4 = this.unique(arr1)
+            for (let j = 0; j < arr4.length; j++) {
+              sponsorWithdraw({
+                workflowId: arr4[j].workflowId,
+                businessKey: arr4[j].batchId,
+              }).toPromise()
+                .then((response) => {
+                  this.$message.success('撤回成功')
+                })
+              // updateApprove({
+              //   batchId: arr4[j].batchId,
+              // }).toPromise()
+              //   .then((response) => {
+              //   })
+            }
+          })
+        }
+      }
+      this.getList()
+    },
+    unique(arr) {
+      const res = new Map();
+      return arr.filter((arr) => !res.has(arr.batchId) && res.set(arr.batchId, 1));
+    },
     payout(item) {
       console.log(item)
       if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤') {
@@ -981,7 +1024,8 @@ export default {
                 });
                 return
               }
-              if (this.multipleSelection1[item.id][i].amountNotPayable > 0 && this.multipleSelection1[item.id][i].approveStatus) {
+              if (this.multipleSelection1[item.id][i].amountNotPayable > 0 && this.multipleSelection1[item.id][i].approveStatus 
+              && this.multipleSelection1[item.id][i].approveStatus !='发起人撤回') {
                 this.$message({
                   message: '请选择未请款的条目！',
                   type: 'warning'
@@ -1332,7 +1376,7 @@ export default {
           });
           return
         }
-        if (arr1[i].approveStatus) {
+        if (arr1[i].approveStatus && arr1[i].approveStatus!='发起人撤回') {
           this.$message({
             message: '至少选择一条待请款条目',
             type: 'warning'