Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 7 months ago
parent
commit
e8f7e742de
  1. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java
  2. 21
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java
  3. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java
  4. 85
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java
  5. 140
      yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js
  6. 169
      yxt-as-ui/src/api/storage/otherOutbound.js
  7. 45
      yxt-as-ui/src/router/index.js
  8. 415
      yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStation.vue
  9. 407
      yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationAdd.vue
  10. 145
      yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationInfo.vue
  11. 7
      yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
  12. 1
      yxt-as-ui/src/views/goods/brands/brandsAdd.vue
  13. 20
      yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue
  14. 4
      yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue
  15. 398
      yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutbound.vue
  16. 442
      yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundAdd.vue
  17. 144
      yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundInfo.vue
  18. 168
      yxt-as-ui/src/views/storage/outStorage/otherOutbound/relation/chooseproducts.vue
  19. 0
      yxt-as-ui/src/views/storage/outStorage/outStorage/distributionAdd.vue
  20. 0
      yxt-as-ui/src/views/storage/outStorage/outStorage/index.vue
  21. 0
      yxt-as-ui/src/views/storage/outStorage/outStorage/outStorageAdd.vue
  22. 0
      yxt-as-ui/src/views/storage/outStorage/outStorage/outStorageInfo.vue
  23. 0
      yxt-as-ui/src/views/storage/outStorage/outStorage/relation/chooseproducts.vue
  24. 438
      yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundDaiBan.vue
  25. 445
      yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundEdit.vue
  26. 191
      yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundYiBan.vue
  27. 168
      yxt-as-ui/src/views/workFlow/qitachukuFlow/relation/chooseproducts.vue
  28. 2
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java
  29. 2
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
  30. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
  31. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOtheroutApplyRest.java
  32. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java
  33. 25
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
  34. 47
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectList.java
  35. 20
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectQuery.java
  36. 18
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
  37. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java
  38. 1005
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyService.java
  39. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyVo.java
  40. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetail.java
  41. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDetailsVo.java
  42. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDto.java
  43. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.java
  44. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.xml
  45. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java

@ -0,0 +1,4 @@
package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
public class VehicleBusinessFileManagementDetailVo {
}

21
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java

@ -0,0 +1,21 @@
package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(
contextId = "anrui-buscenter-VehicleBusinessFileManagement",
name = "anrui-buscenter",
path = "v1/vehicleBusinessFileManagement")
public interface VehicleBusinessFileManagementFeign {
/*@ApiOperation("车辆业务档案管理列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<VehicleBusinessFileManagementVo>> listPage(@RequestBody PagerQuery<VehicleBusinessFileManagementQuery> pq);*/
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java

@ -0,0 +1,4 @@
package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
public class VehicleBusinessFileManagementQuery {
}

85
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java

@ -0,0 +1,85 @@
package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class VehicleBusinessFileManagementVo {
/**
* 车架号
*/
private String vinNo;
/**
* 车型
*/
private String modelName;
/**
* 销售订单编号
*/
private String saleOrderNo;
/**
* 买卖合同编号
*/
private String contractNo;
/**
* 付款方式
*/
private String payType;
/**
* 业务类型
*/
private String businessType;
/**
* 客户名称
*/
private String customerName;
/**
* 客户电话
*/
private String customerPhone;
/**
* 销售合同价
*/
private String salePrice;
/**
* 开票单位
*/
private String invoiceTitle;
/**
* 开票类型
*/
private String invoiceType;
/**
* 出库日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date outBoundDate;
/**
* 交款金额
*/
private String paymentAmount;
/**
* 欠款金额
*/
private String arrearsMoney;
/**
* 业务状态
*/
private String businessStatus;
/**
* 分公司
*/
private String orgName;
/**
* 销售部门
*/
private String sellDept;
/**
* 销售专员
*/
private String staffName;
}

140
yxt-as-ui/src/api/basicinformation/secondaryCooperativeStation.js

@ -0,0 +1,140 @@
import request from '@/utils/request'
// 合作二级站备案申请 接口文档
export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/secondaryCooperativeStation/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// // 初始化
// init: function(data) {
// return request({
// url: '/as/v1/secondaryCooperativeStation/init',
// method: 'post',
// data: data,
// headers: {
// 'Content-Type': 'application/json'
// }
// })
// },
// 回显
fetchDetailsBySid: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/secondaryCooperativeStation/fetchDetailsBySid/' + data,
method: 'get'
})
},
saveOrUpdate: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/secondaryCooperativeStation/save',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
deleteBySids: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/secondaryCooperativeStation/delBySids',
method: 'DELETE',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 提交流程
submit: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/secondaryCooperativeStation/submit',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(同意)
complete: function(params) {
return request({
url: '/as/v1/secondaryCooperativeStation/complete',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/as/v1/secondaryCooperativeStation/delegate',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(驳回)
reject: function(params) {
return request({
url: '/as/v1/secondaryCooperativeStation/reject',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(终止)
breakProcess: function(params) {
return request({
url: '/as/v1/secondaryCooperativeStation/breakProcess',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(撤回)
revokeProcess: function(params) {
return request({
url: '/as/v1/secondaryCooperativeStation/revokeProcess',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 审批流程(同意)获取下一环节
getNextNodesForSubmit: function(data) {
return request({
url: '/as/v1/secondaryCooperativeStation/getNextNodesForSubmit',
method: 'get',
params: data
})
},
// 审批流程(驳回)获取上一环节
getPreviousNodesForReject: function(data) {
return request({
url: '/as/v1/secondaryCooperativeStation/getPreviousNodesForReject',
method: 'get',
params: data
})
}
}

169
yxt-as-ui/src/api/storage/otherOutbound.js

@ -0,0 +1,169 @@
import request from '@/utils/request'
// 其他出库
export default {
// 查询分页列表
listPage: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsotheroutapply/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
deleteBySids: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsotheroutapply/delBySids',
method: 'DELETE',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 详情
fetchDetailsBySid: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsotheroutapply/fetchDetailsBySid/' + params,
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 获取商品
sourceBillBySid: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventory/otherOutGoodsListPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 保存
save: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsotheroutapply/save',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 提交
submit: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsotheroutapply/submitApply',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 流程审批(同意)
complete: function(params) {
return request({
url: '/wms/v1/wmsotheroutapply/complete',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/wms/v1/wmsotheroutapply/delegate',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(转办)
assignTask: function(params) {
return request({
url: '/wms/v1/wmsotheroutapply/assignTask',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(驳回)
reject: function(params) {
return request({
url: '/wms/v1/wmsotheroutapply/reject',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(终止)
breakProcess: function(params) {
return request({
url: '/wms/v1/wmsotheroutapply/breakProcess',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 流程审批(撤回)
revokeProcess: function(params) {
return request({
url: '/wms/v1/wmsotheroutapply/revokeProcess',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 审批流程(同意)获取下一环节
getNextNodesForSubmit: function(data) {
return request({
url: '/wms/v1/wmsotheroutapply/getNextNodesForSubmit',
method: 'get',
params: data
})
},
// 审批流程(驳回)获取上一环节
getPreviousNodesForReject: function(data) {
return request({
url: '/wms/v1/wmsotheroutapply/getPreviousNodesForReject',
method: 'get',
params: data
})
},
}

45
yxt-as-ui/src/router/index.js

@ -416,12 +416,20 @@ export const constantRoutes = [{
},
children: [{
path: '/outStorage/index',
component: () => import('@/views/storage/outStorage/index'),
component: () => import('@/views/storage/outStorage/outStorage/index'),
name: 'OutStorage',
meta: {
title: '出库管理',
noCache: true
}
}, {
path: '/otherOutbound/otherOutbound',
component: () => import('@/views/storage/outStorage/otherOutbound/otherOutbound'),
name: 'OtherOutbound',
meta: {
title: '其他出库',
noCache: true
}
},
{
path: '/inventory/inventory',
@ -963,6 +971,16 @@ export const constantRoutes = [{
noCache: true
}
},
{
path: '/secondaryCooperativeStation/secondaryCooperativeStation',
component: () => import(
'@/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStation.vue'),
name: 'SecondaryCooperativeStation',
meta: {
title: '合作二级备案申请管理',
noCache: true
}
},
{
path: '/claimantManufacturer/claimantManufacturer',
component: () => import('@/views/basicinformation/claimantManufacturer/claimantManufacturer.vue'),
@ -1365,11 +1383,34 @@ export const constantRoutes = [{
},
// 欠款月结客户备案 -- 已办
{
path: '/qiankuanyuejieFlow/maintenanceEnterpriseYiBan',
path: '/workFlow/maintenanceEnterpriseYiBan',
component: () =>
import('@/views/workFlow/qiankuanyuejieFlow/maintenanceEnterpriseYiBan.vue'),
name: 'MaintenanceEnterpriseYiBan'
},
// 其他出库 -- 编辑
{
path: '/qitachukuFlow/otherOutboundEdit',
component: () =>
import('@/views/workFlow/qitachukuFlow/otherOutboundEdit.vue'),
name: 'OtherOutboundEdit'
},
// 其他出库 -- 待办
{
path: '/qitachukuFlow/otherOutboundDaiBan',
component: () =>
import('@/views/workFlow/qitachukuFlow/otherOutboundDaiBan.vue'),
name: 'OtherOutboundDaiBan'
},
// 其他出库 -- 已办
{
path: '/qitachukuFlow/otherOutboundYiBan',
component: () =>
import('@/views/workFlow/qitachukuFlow/otherOutboundYiBan.vue'),
name: 'OtherOutboundYiBan'
},
// 404 page must be placed at the end !!!
// { path: '*', redirect: '/404', hidden: true }
]

415
yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStation.vue

@ -0,0 +1,415 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="合作二级站备案申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.useOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable />
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="二级站名称">
<el-input v-model="listQuery.params.siteName" placeholder="" clearable />
</el-form-item>
<el-form-item label="法定代表人">
<el-input v-model="listQuery.params.legalPerson" placeholder="" clearable />
</el-form-item>
<el-form-item label="合作有效期至">
<el-date-picker v-model="listQuery.params.limitedStartTerm" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.limitedEndTerm" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">合作二级站备案申请列表</div>
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" /> -->
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
<el-table-column label="操作" width="150" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)"
:disabled="scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="流程状态" width="180" header-align="center" align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="useOrgName" label="分公司" align="center" width="110" />
<el-table-column prop="deptName" label="申请部门" align="center" width="110" />
<el-table-column prop="createByName" label="申请人" align="center" min-width="200" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
<el-table-column prop="siteName" label="二级站名称" align="center" width="150" />
<el-table-column prop="legalPerson" label="法定代表人" align="center" width="120" />
<el-table-column prop="phone" label="法人联系电话" align="center" width="120" />
<el-table-column prop="directorName" label="负责人" align="center" width="80" />
<el-table-column prop="limitedTerm" label="合作有限期至" align="center" width="180" />
<el-table-column prop="remarks" label="备注" align="center" width="180" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
<!--End查询列表部分-->
</div>
</div>
<!--新增及修改 -->
<secondaryCooperativeStationAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState"
@reloadlist="getList" />
<!-- 详情 -->
<secondaryCooperativeStationInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
:src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/basicinformation/secondaryCooperativeStation'
import secondaryCooperativeStationAdd from './secondaryCooperativeStationAdd'
import secondaryCooperativeStationInfo from './secondaryCooperativeStationInfo'
import {
getStorage
} from '@/utils/auth'
export default {
name: 'Supplier',
components: {
Pagination,
pageye,
ButtonBar,
secondaryCooperativeStationAdd,
secondaryCooperativeStationInfo
},
data() {
return {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
btndisabled: false,
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
// {
// type: 'primary',
// size: 'small',
// icon: 'edit',
// btnKey: 'toEdit',
// btnLabel: ''
// },
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
"orgPath": "",
"userSid": "",
"menuUrl": "",
"useOrgName": "",
"deptName": "",
"createByName": "",
"finishStartTime": "",
"finishEndTime": "",
"siteName": "",
"legalPerson": "",
"limitedStartTerm": "",
"limitedEndTerm": ""
}
}
}
},
created() {
//
this.getList()
},
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
}
if (code === 1) {
this.centerDialogVisible = false
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'))
}
},
closeIt() {
this.url = ''
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight
},
flowRecord(row) {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
procInsId: row.procInstId,
token: getStorage()
}
console.log('flowRecord ', params)
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 5,
total: 0,
params: {
"orgPath": "",
"userSid": "",
"menuUrl": "",
"useOrgName": "",
"deptName": "",
"createByName": "",
"finishStartTime": "",
"finishEndTime": "",
"siteName": "",
"legalPerson": "",
"limitedStartTerm": "",
"limitedEndTerm": ""
}
}
this.getList()
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd()
},
toEdit(row) {
// if (this.sids.length === 1) {
// this.viewState = 3
// this.$refs['divAdd'].showEdit({
// sid: this.sids[0]
// })
// } else {
// this.$message({
// showClose: true,
// type: 'error',
// message: ''
// })
// }
this.viewState = 3
this.$refs['divAdd'].showEdit(row.sid)
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row.sid)
// window.open(
// 'https://service.shanhainengyuan.com/#/zorder/zzdetail?id=110311&order_no=20241008164623186050050&admin_id=11210&customer_id=18605&agent_id=12640&product_id=17&create_time=1728377183&data_id=10037&workflow_unique=63_17_0_2028_1&prototype_id=63&remain_unique=&is_best=0&order_type=10&update_time=1729499177&company_id=0&company_name=%E6%B3%89%E5%B7%9E%E5%8F%B0%E5%95%86%E6%8A%95%E8%B5%84%E5%8C%BA%E8%80%80%E5%BA%B7%E8%BE%BE%E9%9E%8B%E6%9D%90%E5%BA%97%E5%88%86%E5%B8%83%E5%BC%8F%E5%85%89%E4%BC%8F%E5%8F%91%E7%94%B5%E9%A1%B9%E7%9B%AE&component_number=314&component_power=635&area_id=246661&pw_longitude=117.8734&pw_latitude=24.50&address=%E6%B3%89%E5%B7%9E%E5%8F%B0%E5%95%86%E6%8A%95%E8%B5%84%E5%8C%BA%E5%BC%A0%E5%9D%82%E9%95%87%E9%BB%84%E5%B2%AD%E5%B7%A5%E4%B8%9A%E5%8C%BA&admin_name=%E6%9E%97%E5%BF%97%E6%B4%8B&admin_phone=18030025520&user_name=%E8%B0%AD%E6%B6%A6%E5%9F%8E&user_phone=187****8053&id_card=&agent_name=%E6%B3%89%E5%B7%9E%E5%8F%B0%E5%95%86%E6%8A%95%E8%B5%84%E5%8C%BA%E8%80%80%E5%BA%B7%E8%BE%BE%E9%9E%8B%E6%9D%90%E5%BA%97%E5%88%86%E5%B8%83%E5%BC%8F%E5%85%89%E4%BC%8F%E5%8F%91%E7%94%B5%E9%A1%B9%E7%9B%AE&product_name=%E8%87%AA%E4%B8%BB%E5%8C%96%E5%B7%A5%E5%95%86%E4%B8%9A&workflow_name=%E5%95%86%E5%8A%A1%E9%80%A0%E4%BB%B7&show_node=2,60,62,78,72,61,66&role_id=1,48&write_node=&group_id=22&component_all=199390&title=&project_company_name&c_t=2024-10-08+16:46:23&order_type_text=%E8%87%AA%E4%B8%BB%E5%B7%A5%E5%95%86%E4%B8%9A&shareholding=&flow_name=&str=%E5%95%86%E5%8A%A1%E9%80%A0%E4%BB%B7&all_power=199390&show=[{%22id%22:2,%22name%22:%22%E6%B5%81%E7%A8%8B%E8%8A%82%E7%82%B9%22,%22group_id%22:2,%22status%22:1},{%22id%22:78,%22name%22:%22%E9%A1%B9%E7%9B%AE%E5%88%9D%E5%AE%A1%22,%22group_id%22:2,%22status%22:1},{%22id%22:72,%22name%22:%22%E9%A3%8E%E6%8E%A7%E4%BF%A1%E6%81%AF%22,%22group_id%22:2,%22status%22:1},{%22id%22:61,%22name%22:%22%E5%B7%A5%E7%A8%8B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81%22,%22group_id%22:2,%22status%22:1},{%22id%22:66,%22name%22:%22%E8%B5%84%E6%96%99%E7%A1%AE%E8%AE%A4%22,%22group_id%22:2,%22status%22:1}]&write=[]&sn_code=&auth={%22id%22:212372,%22admin_id%22:11197,%22is_agree%22:1,%22opinion%22:%22%E5%B7%B2%E9%87%8D%E6%96%B0%E4%B8%8A%E4%BC%A0%E7%94%B5%E8%B4%B9%E6%B8%85%E5%8D%95%22,%22create_time%22:%221729499177%22,%22prototype_id%22:63,%22node_id%22:2005,%22workflow_unique%22:%2263_17_0_2005_1%22,%22work_name%22:%22%22,%22up_workflow%22:%2263_17_0_2005_1%22}&is_role_write=2&is_auth=1&area=[{%22id%22:239384,%22name%22:%22%E7%A6%8F%E5%BB%BA%E7%9C%81%22,%22level%22:0,%22parent_code%22:0,%22area_code%22:350000000000,%22lng%22:%22119.295144%22,%22lat%22:%2226.100779%22,%22chain%22:%220%22},{%22id%22:246273,%22name%22:%22%E6%B3%89%E5%B7%9E%E5%B8%82%22,%22level%22:1,%22parent_code%22:350000000000,%22area_code%22:350500000000,%22lng%22:%22118.675675%22,%22lat%22:%2224.874132%22,%22chain%22:%22239384%22},{%22id%22:246661,%22name%22:%22%E6%83%A0%E5%AE%89%E5%8E%BF%22,%22level%22:2,%22parent_code%22:350500000000,%22area_code%22:350521000000,%22lng%22:%22118.796605%22,%22lat%22:%2225.030781%22,%22chain%22:%22239384_246273%22}]&area_text=%E7%A6%8F%E5%BB%BA%E7%9C%81%E6%B3%89%E5%B7%9E%E5%B8%82%E6%83%A0%E5%AE%89%E5%8E%BF&yyds=1'
// );
// var token =
// 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJodHRwOi8vaGYtc2VydmljZS5zaGFuaGFpbmVuZ3l1YW4uY29tL2FwaS9zeXN0ZW0vaW5kZXgvbG9naW4iLCJpYXQiOjE3Mjk0OTk2MTEsImV4cCI6MTczMDcwOTIxMSwibmJmIjoxNzI5NDk5NjExLCJqdGkiOiIwSFZRTmJCaW5qS1BqeUJwIiwic3ViIjoiNTQzIiwicHJ2IjoiNDZjZDMxOTIyYTljMjNlOTU2YTNlZjNhMGI3ZGU4MDY2YTY1NjViMiIsImlkZW50aXR5Ijoic3lzdGVtIn0.w5MJ37G9kKtnwrrdc-QXYtVWApoPYautUbJ8QDZTZPIgFQ2oJS9g9G66qkpxCcY1jdNo1kZRcIn79hbVg7DyDw'
// var xhr = new XMLHttpRequest();
// xhr.open("get",
// 'https://service.shanhainengyuan.com/#/zorder/zzdetail?id=110311&order_no=20241008164623186050050&admin_id=11210&customer_id=18605&agent_id=12640&product_id=17&create_time=1728377183&data_id=10037&workflow_unique=63_17_0_2028_1&prototype_id=63&remain_unique=&is_best=0&order_type=10&update_time=1729499177&company_id=0&company_name=%E6%B3%89%E5%B7%9E%E5%8F%B0%E5%95%86%E6%8A%95%E8%B5%84%E5%8C%BA%E8%80%80%E5%BA%B7%E8%BE%BE%E9%9E%8B%E6%9D%90%E5%BA%97%E5%88%86%E5%B8%83%E5%BC%8F%E5%85%89%E4%BC%8F%E5%8F%91%E7%94%B5%E9%A1%B9%E7%9B%AE&component_number=314&component_power=635&area_id=246661&pw_longitude=117.8734&pw_latitude=24.50&address=%E6%B3%89%E5%B7%9E%E5%8F%B0%E5%95%86%E6%8A%95%E8%B5%84%E5%8C%BA%E5%BC%A0%E5%9D%82%E9%95%87%E9%BB%84%E5%B2%AD%E5%B7%A5%E4%B8%9A%E5%8C%BA&admin_name=%E6%9E%97%E5%BF%97%E6%B4%8B&admin_phone=18030025520&user_name=%E8%B0%AD%E6%B6%A6%E5%9F%8E&user_phone=187****8053&id_card=&agent_name=%E6%B3%89%E5%B7%9E%E5%8F%B0%E5%95%86%E6%8A%95%E8%B5%84%E5%8C%BA%E8%80%80%E5%BA%B7%E8%BE%BE%E9%9E%8B%E6%9D%90%E5%BA%97%E5%88%86%E5%B8%83%E5%BC%8F%E5%85%89%E4%BC%8F%E5%8F%91%E7%94%B5%E9%A1%B9%E7%9B%AE&product_name=%E8%87%AA%E4%B8%BB%E5%8C%96%E5%B7%A5%E5%95%86%E4%B8%9A&workflow_name=%E5%95%86%E5%8A%A1%E9%80%A0%E4%BB%B7&show_node=2,60,62,78,72,61,66&role_id=1,48&write_node=&group_id=22&component_all=199390&title=&project_company_name&c_t=2024-10-08+16:46:23&order_type_text=%E8%87%AA%E4%B8%BB%E5%B7%A5%E5%95%86%E4%B8%9A&shareholding=&flow_name=&str=%E5%95%86%E5%8A%A1%E9%80%A0%E4%BB%B7&all_power=199390&show=[{%22id%22:2,%22name%22:%22%E6%B5%81%E7%A8%8B%E8%8A%82%E7%82%B9%22,%22group_id%22:2,%22status%22:1},{%22id%22:78,%22name%22:%22%E9%A1%B9%E7%9B%AE%E5%88%9D%E5%AE%A1%22,%22group_id%22:2,%22status%22:1},{%22id%22:72,%22name%22:%22%E9%A3%8E%E6%8E%A7%E4%BF%A1%E6%81%AF%22,%22group_id%22:2,%22status%22:1},{%22id%22:61,%22name%22:%22%E5%B7%A5%E7%A8%8B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81%22,%22group_id%22:2,%22status%22:1},{%22id%22:66,%22name%22:%22%E8%B5%84%E6%96%99%E7%A1%AE%E8%AE%A4%22,%22group_id%22:2,%22status%22:1}]&write=[]&sn_code=&auth={%22id%22:212372,%22admin_id%22:11197,%22is_agree%22:1,%22opinion%22:%22%E5%B7%B2%E9%87%8D%E6%96%B0%E4%B8%8A%E4%BC%A0%E7%94%B5%E8%B4%B9%E6%B8%85%E5%8D%95%22,%22create_time%22:%221729499177%22,%22prototype_id%22:63,%22node_id%22:2005,%22workflow_unique%22:%2263_17_0_2005_1%22,%22work_name%22:%22%22,%22up_workflow%22:%2263_17_0_2005_1%22}&is_role_write=2&is_auth=1&area=[{%22id%22:239384,%22name%22:%22%E7%A6%8F%E5%BB%BA%E7%9C%81%22,%22level%22:0,%22parent_code%22:0,%22area_code%22:350000000000,%22lng%22:%22119.295144%22,%22lat%22:%2226.100779%22,%22chain%22:%220%22},{%22id%22:246273,%22name%22:%22%E6%B3%89%E5%B7%9E%E5%B8%82%22,%22level%22:1,%22parent_code%22:350000000000,%22area_code%22:350500000000,%22lng%22:%22118.675675%22,%22lat%22:%2224.874132%22,%22chain%22:%22239384%22},{%22id%22:246661,%22name%22:%22%E6%83%A0%E5%AE%89%E5%8E%BF%22,%22level%22:2,%22parent_code%22:350500000000,%22area_code%22:350521000000,%22lng%22:%22118.796605%22,%22lat%22:%2225.030781%22,%22chain%22:%22239384_246273%22}]&area_text=%E7%A6%8F%E5%BB%BA%E7%9C%81%E6%B3%89%E5%B7%9E%E5%B8%82%E6%83%A0%E5%AE%89%E5%8E%BF&yyds=1',
// true)
// xhr.setRequestHeader("authorization", "Bearer " + token)
// xhr.withCredentials = false
// xhr.send()
},
doDel() {
if (this.sids.length === 0) {
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then(resp => {
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {})
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

407
yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationAdd.vue

@ -0,0 +1,407 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable
placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title">合作二级站基本信息</div>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>二级站点名称</div>
<el-form-item prop="siteName"><el-input class="addinputInfo addinputw" v-model="formobj.siteName"
clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty"><span class="icon">*</span>法定代表人</div>
<el-form-item prop="legalPerson"><el-input class="addinputInfo addinputw" v-model="formobj.legalPerson"
clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">手机号码</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.phone" clearable
placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty"><span class="icon">*</span>负责人</div>
<el-form-item prop="directorName"><el-input class="addinputInfo addinputw" v-model="formobj.directorName"
clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>手机号码</div>
<el-form-item prop="directorPhone"><el-input class="addinputInfo addinputw"
v-model="formobj.directorPhone" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty"><span class="icon">*</span>统一社会信用号码</div>
<el-form-item prop="unifiedCreditCode"><el-input class="addinputInfo addinputw"
v-model="formobj.unifiedCreditCode" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>证件有效期</div>
<el-form-item prop="termValidity"><el-date-picker v-model="formobj.termValidity" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" type="date" class="addinputInfo addinputw"
placeholder="选择日期"></el-date-picker></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>地址</div>
<el-form-item prop="address"><el-input class="addinputInfo addinputw" v-model="formobj.address" clearable
placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty"><span class="icon">*</span>合作有效期至</div>
<el-form-item prop="limitedTerm"><el-date-picker v-model="formobj.limitedTerm" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" type="date" class="addinputInfo addinputw"
placeholder="选择日期"></el-date-picker></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>授信金额</div>
<el-form-item prop="creditGranting"><el-input class="addinputInfo addinputw"
v-model="formobj.creditGranting" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /></el-form-item>
</el-col>
</el-row>
<div class="title">附件清单</div>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>营业执照</div>
<el-form-item prop="businessLicenseFile">
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.businessLicenseFile" :limit="50"
bucket="map" :upload-data="{ type: '0001' }" />
</el-form-item>
</el-col>
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>合作协议</div>
<el-form-item prop="agreementFile">
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.agreementFile" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" />
</el-form-item>
</el-col>
<el-col :span="24">
<div class="span-sty">其他资料</div>
<el-form-item>
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.otherFile" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/basicinformation/secondaryCooperativeStation'
import uploadImg from '@/components/uploadFile/uploadImg'
import {
getOrgSidByPath,
fetchBySid
} from '@/api/Common/dictcommons'
import {
getCurrentDate
} from '@/utils/index'
export default {
name: 'SecondaryCooperativeStationAdd',
components: {
uploadImg
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 1,
index: 0,
formobj: {
"sid": "",
"nodeState": "",
"procInstId": "",
"procDefId": "",
"taskId": "",
"nodeId": "",
"useOrgName": "",
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createByName": window.sessionStorage.getItem('name'),
"createBySid": window.sessionStorage.getItem('userSid'),
"createOrgSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createOrgName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"remarks": "",
"finishTime": "",
"createTime": getCurrentDate(),
"siteName": "",
"legalPerson": "",
"phone": "",
"directorName": "",
"directorPhone": "",
"unifiedCreditCode": "",
"termValidity": "",
"address": "",
"limitedTerm": "",
"creditGranting": "",
"businessLicenseFile": [],
"agreementFile": [],
"otherFile": []
},
rules: {
siteName: [{
required: true,
message: '二级站名称不能为空',
trigger: 'blur'
}],
legalPerson: [{
required: true,
message: '法定代表人不能为空',
trigger: 'blur'
}],
directorName: [{
required: true,
message: '负责人不能为空',
trigger: 'blur'
}],
directorPhone: [{
required: true,
message: '负责人手机号码不能为空',
trigger: 'blur'
}],
directorPhone: [{
required: true,
message: '负责人手机号码不能为空',
trigger: 'blur'
}],
unifiedCreditCode: [{
required: true,
message: '统一社会信用代码不能为空',
trigger: 'blur'
}],
termValidity: [{
required: true,
message: '证件有效期不能为空',
trigger: 'change'
}],
address: [{
required: true,
message: '地址不能为空',
trigger: 'blur'
}],
limitedTerm: [{
required: true,
message: '合作有效期不能为空',
trigger: 'change'
}],
creditGranting: [{
required: true,
message: '授信金额不能为空',
trigger: 'change'
}],
businessLicenseFile: [{
required: true,
message: '营业执照不能为空',
trigger: 'change'
}],
agreementFile: [{
required: true,
message: '合作协议不能为空',
trigger: 'change'
}]
}
}
},
methods: {
showAdd() {
this.viewTitle = '【新增】合作二级站备案申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((resp) => {
if (resp.success) {
this.formobj.useOrgSid = resp.data
fetchBySid(resp.data).then((respsone) => {
if (respsone.success) {
this.formobj.useOrgName = respsone.data.name
}
})
}
})
},
showEdit(row) {
this.viewTitle = '【编辑】合作二级站备案申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"nodeState": "",
"procInstId": "",
"procDefId": "",
"taskId": "",
"nodeId": "",
"useOrgName": "",
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createByName": window.sessionStorage.getItem('name'),
"createBySid": window.sessionStorage.getItem('userSid'),
"createOrgSid": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createOrgName": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"remarks": "",
"finishTime": "",
"createTime": getCurrentDate(),
"siteName": "",
"legalPerson": "",
"phone": "",
"directorName": "",
"directorPhone": "",
"unifiedCreditCode": "",
"termValidity": "",
"address": "",
"limitedTerm": "",
"creditGranting": "",
"businessLicenseFile": [],
"agreementFile": [],
"otherFile": []
}
this.submitdisabled = false
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed {
height: 100% !important;
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed-right {
height: 100% !important;
}
</style>

145
yxt-as-ui/src/views/basicinformation/secondaryCooperativeStation/secondaryCooperativeStationInfo.vue

@ -0,0 +1,145 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>合作二级站备案申请详情</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">合作二级站基本信息</div>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty">二级站点名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.siteName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">法定代表人</div>
<el-form-item><span class="addinputInfo">{{ formobj.legalPerson }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">手机号码</div>
<el-form-item><span class="addinputInfo">{{ formobj.phone }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">负责人</div>
<el-form-item><span class="addinputInfo">{{ formobj.directorName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">手机号码</div>
<el-form-item><span class="addinputInfo">{{ formobj.directorPhone }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">统一社会信用号码</div>
<el-form-item><span class="addinputInfo">{{ formobj.unifiedCreditCode }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">证件有效期</div>
<el-form-item><span class="addinputInfo">{{ formobj.termValidity }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">地址</div>
<el-form-item><span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">合作有效期至</div>
<el-form-item><span class="addinputInfo">{{ formobj.limitedTerm }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">授信金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.creditGranting }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">附件清单</div>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty">营业执照</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px"
v-for="(item, index) in formobj.businessLicenseFile" :key="index" :src="item.url"
:preview-src-list="[item.url]" /></el-form-item>
</el-col>
<el-col :span="24">
<div class="span-sty">合作协议</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px"
v-for="(item, index) in formobj.agreementFile" :key="index" :src="item.url"
:preview-src-list="[item.url]" /></el-form-item>
</el-col>
<el-col :span="24">
<div class="span-sty">其他资料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px"
v-for="(item, index) in formobj.otherFile" :key="index" :src="item.url"
:preview-src-list="[item.url]" /></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/basicinformation/secondaryCooperativeStation'
export default {
name: 'SecondaryCooperativeStation',
data() {
return {
viewState: 1,
formobj: {},
}
},
methods: {
showInfo(sid) {
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
handleReturn() {
this.formobj = {}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

7
yxt-as-ui/src/views/client/customermanagement/customermanagement.vue

@ -108,7 +108,7 @@
<!-- 对接人信息 -->
<person v-show="viewState == 8" ref="divPerson" @doback="resetState" />
<!-- 客户登记 -->
<el-dialog :visible.sync="dialogVisible" width="30%">
<el-dialog :visible.sync="dialogVisible" width="40%">
<el-form ref="form_obj" v-model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
@ -136,6 +136,11 @@
<el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.vinNo" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item><span style="color: red;font-weight: bold">若填写的车架号为集团销售车辆平台自动获取相应客户信息</span></el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleConfirm()"> </el-button>

1
yxt-as-ui/src/views/goods/brands/brandsAdd.vue

@ -250,6 +250,7 @@
this.$refs['form_obj'].clearValidate()
})
req.initBrands(row.sid)
.then(resp => {
if (resp.success) {

20
yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue

@ -573,8 +573,8 @@ export default {
// =
k.price = k.goodsDetailsPrice
} else {
// = + * (1 + )
k.price = Math.round((parseFloat(k.goodsDetailsPrice) + parseFloat(k.goodsDetailsPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
// = * (1 + )
k.price = Math.round((parseFloat(k.goodsDetailsPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
}
this.computeYHAndXSJE(k)
} else {
@ -586,8 +586,8 @@ export default {
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (this.formobj.invoiceVo.isInvoicing === '1') {
// = + * (1 + )
e.price = Math.round((parseFloat(e.aitemPrice) + parseFloat(e.aitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
// = * (1 + )
e.price = Math.round((parseFloat(e.aitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
} else {
// =
e.price = e.aitemPrice
@ -683,8 +683,8 @@ export default {
// =
row.price = row.goodsDetailsPrice
} else {
// = + * (1 + )
row.price = Math.round((parseFloat(row.goodsDetailsPrice) + parseFloat(row.goodsDetailsPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
// = * (1 + )
row.price = Math.round((parseFloat(row.goodsDetailsPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
}
} else {
// =
@ -749,8 +749,8 @@ export default {
row.aitemName = value.aitemName
row.aitemPrice = value.price
if (this.formobj.invoiceVo.isInvoicing === '1') {
// = + * (1 + )
row.price = Math.round((parseFloat(row.aitemPrice) + parseFloat(row.aitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
// = * (1 + )
row.price = Math.round((parseFloat(row.aitemPrice) * (parseFloat(1) + parseFloat(this.formobj.invoiceVo.taxRate !== '' ? this.formobj.invoiceVo.taxRate : '0') / 100)) * 100) / 100
} else {
// =
row.price = row.aitemPrice
@ -955,4 +955,8 @@ export default {
line-height: 1px;
vertical-align: middle;
}
/deep/ .el-collapse .el-collapse-item .el-collapse-item__header {
height: 42px !important;
line-height: 42px !important;
}
</style>

4
yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue

@ -319,4 +319,8 @@ export default {
.addinputInfo {
margin-left: 120px !important;
}
/deep/ .el-collapse .el-collapse-item .el-collapse-item__header {
height: 42px !important;
line-height: 42px !important;
}
</style>

398
yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutbound.vue

@ -0,0 +1,398 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="其他出库申请管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
{{ searchxianshitit }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="申请部门">
<el-input v-model="queryParams.params.deptName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in busTypeList" :key="i" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">其他出库申请列表</div>
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="150">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="流程状态" align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="deptName" label="申请部门" align="center" />
<el-table-column prop="createByName" label="申请人" align="center" />
<el-table-column prop="createTime" label="申请日期" align="center" />
<el-table-column prop="finishTime" label="办结日期" align="center" />
<el-table-column prop="busTypeValue" label="业务类型" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
:src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import {
getStorage
} from '@/utils/auth'
import divAdd from './otherOutboundAdd.vue'
import divInfo from './otherOutboundInfo.vue'
import {
getTypeValueList
} from '@/api/Common/dictcommons'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
},
data() {
return {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
}, {
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
"deptName": "",
"createByName": "",
"billNo": "",
"busTypeKey": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"menuSid": ""
}
},
sids: [],
selectionList: [],
busTypeList: []
}
},
computed: {
//
profitandNumber() {
let quantity = 0
if (this.formobj.wmsInventoryCheckbillDetailList.length > 0) {
this.formobj.wmsInventoryCheckbillDetailList.forEach((e) => {
if (Number(e.bookCount) < Number(e.realCount)) {
quantity += e.realCount - e.bookCount
}
})
}
this.formobj.profitCount = quantity
return quantity
},
},
mounted() {
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
getTypeValueList({
type: 'wms_busType',
groupNum: 'wms_ck'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
methods: {
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
}
if (code === 1) {
this.centerDialogVisible = false
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'))
}
},
closeIt() {
this.url = ''
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight
},
flowRecord(row) {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
procInsId: row.procInstId,
token: getStorage()
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'toAdd':
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
"deptName": "",
"createByName": "",
"billNo": "",
"busTypeKey": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"userSid": "",
"orgPath": "",
"menuUrl": "",
"menuSid": ""
}
}
this.loadList()
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit(row) {
this.viewState = 2
this.$refs['divadd'].showEdit(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showAdd(row)
},
resetState() {
this.viewState = 1
},
}
}
</script>
<style scoped>
</style>

442
yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundAdd.vue

@ -0,0 +1,442 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{title}}其他出库</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 业务类型</div>
<el-form-item prop="busTypeKey"><el-select v-model="formobj.busTypeKey" filterable clearable
placeholder="请选择" class="addinputInfo addinputw" @change="busTypeSelect">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputInfo addinputw"
clearable /></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleMaintenance()">选择商品</el-button>
</div>
<el-table v-loading="listLoading" :data="formobj.otheroutDetailList" border style="width: 100%;"
ref="dataTable">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品ID" prop="goodsID" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="图号" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="200" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" width="120" />
<!-- <el-table-column label="库存" prop="count" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="inCost" align="center" width="120" />
<el-table-column label="出库数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
v-model="scope.row.outCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="金额" prop="amount" align="center" width="150" />
</el-table>
</el-form>
</div>
</div>
<!-- 选择商品 -->
<chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
import {
getCurrentDate
} from '@/utils/index.js'
import chooseproducts from './relation/chooseproducts'
import {
getOrgSidByPath,
getTypeValueList
} from '@/api/Common/dictcommons'
export default {
components: {
chooseproducts,
},
data() {
return {
viewState: 1,
title: '【新增】',
listLoading: false,
submitdisabled: false,
formobj: {
"sid": "",
"createTime": getCurrentDate(),
"billNo": "",
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"busTypeKey": "",
"busTypeValue": "",
"finishTime": "",
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"instanceId": "",
"createOrgName": "",
"createOrgSid": "",
"otheroutDetailList": [
]
},
busTypeList: [],
rules: {
busTypeKey: [{
required: true,
message: '请选择业务类型',
trigger: 'change'
}],
}
}
},
created() {
},
methods: {
init() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
getTypeValueList({
type: 'wms_busType',
groupNum: 'wms_ck'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
backData(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.otheroutDetailList.push({
"sid": "",
"mainSid": "",
"goodsID": e.goodsID,
"goodsSpuSid": e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName,
"goodsSkuSid": e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle,
"goodsSkuCode": e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec,
"manufacturerSid": e.manufacturerSid,
"manufacturerName": e.manufacturerName,
"unit": e.unit,
"warehouseSid": e.warehouseSid,
"warehouseName": e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid,
"warehouseArea": e.warehouseArea,
"warehouseRackSid": e.warehouseRackSid,
"warehouseRackCode": e.warehouseRackCode,
"inCost": e.taxPrice,
// "count": e.count,
"outCount": 0,
"amount": 0
})
})
}
},
resetState() {
this.viewState = 1
},
seleMaintenance() {
this.viewState = 2
const aa = []
this.$refs['divSp'].showData(aa, this.formobj.deptSid)
},
doGoods(row) {
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.otheroutDetailList.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.otheroutDetailList.splice(index, 1)
})
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.otheroutDetailList.length == 0) {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
for (var i = 0; i < this.formobj.otheroutDetailList.length; i++) {
var item = this.formobj.otheroutDetailList[i]
if (item.goodsSkuSid == '') {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
if (item.outCount == 0) {
this.$message({
showClose: true,
type: 'error',
message: '出库数量不能为空或0'
})
return
}
}
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"createTime": getCurrentDate(),
"billNo": "",
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"busTypeKey": "",
"busTypeValue": "",
"finishTime": "",
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"instanceId": "",
"createOrgName": "",
"createOrgSid": "",
"otheroutDetailList": []
}
this.submitdisabled = false
this.$emit('doback')
},
showAdd() {
this.title = "【新增】"
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
console.log('>>>>>>>>>showEdit', row)
this.title = "【修改】"
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
//this.Array
this.formobj.otheroutDetailList.forEach(item => {
this.$set(item, 'amount', (Number(item.outCount) * Number(item.inCost)).toFixed(2))
})
}
})
.catch(e => {
this.formobj = {}
})
},
busTypeSelect(val) {
const choose = this.busTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>busTypeSelect', choose)
this.formobj.busTypeKey = choose[0].dictKey
this.formobj.busTypeValue = choose[0].dictValue
},
commodityComputeYHAndXSJE(row, val) {
// if (Number(row.outCount) > Number(row.count)) {
// row.outCount = row.count
// }
row.amount = (Number(row.outCount) * Number(row.inCost)).toFixed(2)
},
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

144
yxt-as-ui/src/views/storage/outStorage/otherOutbound/otherOutboundInfo.vue

@ -0,0 +1,144 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>其他出库详情</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.otheroutDetailList" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品ID" prop="goodsID" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="图号" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="200" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" width="120" />
<!-- <el-table-column label="库存" prop="count" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="inCost" align="center" width="120" />
<el-table-column label="出库数量" prop="outCount" align="center" width="120" />
<el-table-column label="金额" prop="amount" align="center" />
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
export default {
components: {},
data() {
return {
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {},
}
},
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback')
},
showAdd(row) {
req.fetchDetailsBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
//this.Array
this.formobj.otheroutDetailList.forEach(item => {
this.$set(item, 'amount', (Number(item.outCount) * Number(item.inCost)).toFixed(2))
})
}
})
.catch(e => {
this.formobj = {}
})
},
showEdit(row) {
},
resetState() {
this.viewState = 1
},
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

168
yxt-as-ui/src/views/storage/outStorage/otherOutbound/relation/chooseproducts.vue

@ -0,0 +1,168 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择商品</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品编码" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable />
</el-form-item>
<!-- <el-form-item label="供应商" class="searchlist">
<el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable />
</el-form-item> -->
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">商品列表</div>
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center" />
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<!-- <el-table-column prop="count" label="库存" align="center" /> -->
<!-- <el-table-column prop="manufacturerName" label="供应商" align="center" /> -->
</el-table>
</div>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import req from '@/api/storage/otherOutbound.js'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
params: {
deptSid: '',
goodsSkuTitle: '',
goodsSkuCode: '',
},
total: 0
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
req.sourceBillBySid(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.listQuery.params.goodsSkuTitle = ''
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
//
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

0
yxt-as-ui/src/views/storage/outStorage/distributionAdd.vue → yxt-as-ui/src/views/storage/outStorage/outStorage/distributionAdd.vue

0
yxt-as-ui/src/views/storage/outStorage/index.vue → yxt-as-ui/src/views/storage/outStorage/outStorage/index.vue

0
yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue → yxt-as-ui/src/views/storage/outStorage/outStorage/outStorageAdd.vue

0
yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue → yxt-as-ui/src/views/storage/outStorage/outStorage/outStorageInfo.vue

0
yxt-as-ui/src/views/storage/outStorage/relation/chooseproducts.vue → yxt-as-ui/src/views/storage/outStorage/outStorage/relation/chooseproducts.vue

438
yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundDaiBan.vue

@ -0,0 +1,438 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>其他出库详情</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.otheroutDetailList" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品ID" prop="goodsID" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="图号" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="200" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" width="120" />
<!-- <el-table-column label="库存" prop="count" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="inCost" align="center" width="120" />
<el-table-column label="出库数量" prop="outCount" align="center" width="120" />
<el-table-column label="金额" prop="amount" align="center" />
</el-table>
</el-form>
</div>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd">
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span class="icon">*</span>加签人员:
</el-col>
<el-col :span="20">
<el-form-item>
<el-select v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>当前环节:</span>
</el-col>
<el-col :span="20">
<el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row :class="{rowClass:!currentLink}">
<el-col :span="4" class="tleftb">
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
import {
selectStaffListss
} from '@/api/Common/dictcommons'
export default {
components: {},
data() {
return {
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {},
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
indexMethod(index) {
return index + 1
},
showInfo(sid) {
req.fetchDetailsBySid(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
//this.Array
this.formobj.otheroutDetailList.forEach(item => {
this.$set(item, 'amount', (Number(item.outCount) * Number(item.inCost)).toFixed(2))
})
}
})
.catch(e => {
this.formobj = {}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
resetState() {
this.viewState = 1
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({
showClose: true,
type: 'error',
message: '请选择加签人员'
})
return
}
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.first_row {
border-top: 1px solid #E0E3EB;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.rowClass {
border-top: 1px solid #E0E3EB;
}
</style>

445
yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundEdit.vue

@ -0,0 +1,445 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{title}}其他出库</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">提交</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 业务类型</div>
<el-form-item prop="busTypeKey"><el-select v-model="formobj.busTypeKey" filterable clearable
placeholder="请选择" class="addinputInfo addinputw" @change="busTypeSelect">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputInfo addinputw"
clearable /></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleMaintenance()">选择商品</el-button>
</div>
<el-table v-loading="listLoading" :data="formobj.otheroutDetailList" border style="width: 100%;"
ref="dataTable">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品ID" prop="goodsID" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="图号" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="200" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" width="120" />
<!-- <el-table-column label="库存" prop="count" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="inCost" align="center" width="120" />
<el-table-column label="出库数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
v-model="scope.row.outCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="金额" prop="amount" align="center" width="150" />
</el-table>
</el-form>
</div>
</div>
<!-- 选择商品 -->
<chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
import {
getCurrentDate
} from '@/utils/index.js'
import chooseproducts from './relation/chooseproducts'
import {
getOrgSidByPath,
getTypeValueList
} from '@/api/Common/dictcommons'
export default {
components: {
chooseproducts,
},
data() {
return {
viewState: 1,
title: '【新增】',
listLoading: false,
submitdisabled: false,
formobj: {
"sid": "",
"createTime": getCurrentDate(),
"billNo": "",
"remarks": "",
"createBySid": '',
"createByName": '',
"deptSid": '',
"deptName": '',
"busTypeKey": "",
"busTypeValue": "",
"finishTime": "",
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"instanceId": "",
"createOrgName": "",
"createOrgSid": "",
"otheroutDetailList": [
]
},
busTypeList: [],
rules: {
busTypeKey: [{
required: true,
message: '请选择业务类型',
trigger: 'change'
}],
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
init() {
getTypeValueList({
type: 'wms_busType',
groupNum: 'wms_ck'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
backData(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.otheroutDetailList.push({
"sid": "",
"mainSid": "",
"goodsID": e.goodsID,
"goodsSpuSid": e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName,
"goodsSkuSid": e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle,
"goodsSkuCode": e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec,
"manufacturerSid": e.manufacturerSid,
"manufacturerName": e.manufacturerName,
"unit": e.unit,
"warehouseSid": e.warehouseSid,
"warehouseName": e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid,
"warehouseArea": e.warehouseArea,
"warehouseRackSid": e.warehouseRackSid,
"warehouseRackCode": e.warehouseRackCode,
"inCost": e.taxPrice,
// "count": e.count,
"outCount": 0,
"amount": 0
})
})
}
},
resetState() {
this.viewState = 1
},
seleMaintenance() {
this.viewState = 2
const aa = []
this.$refs['divSp'].showData(aa, this.formobj.deptSid)
},
doGoods(row) {
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.otheroutDetailList.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.otheroutDetailList.splice(index, 1)
})
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.otheroutDetailList.length == 0) {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
for (var i = 0; i < this.formobj.otheroutDetailList.length; i++) {
var item = this.formobj.otheroutDetailList[i]
if (item.goodsSkuSid == '') {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
if (item.outCount == 0) {
this.$message({
showClose: true,
type: 'error',
message: '出库数量不能为空或0'
})
return
}
}
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"createTime": getCurrentDate(),
"billNo": "",
"remarks": "",
"createBySid": '',
"createByName": '',
"deptSid": '',
"deptName": '',
"busTypeKey": "",
"busTypeValue": "",
"finishTime": "",
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"instanceId": "",
"createOrgName": "",
"createOrgSid": "",
"otheroutDetailList": []
}
this.submitdisabled = false
this.$emit('doback')
},
showInfo(sid) {
this.title = "【修改】"
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId
//this.Array
this.formobj.otheroutDetailList.forEach(item => {
this.$set(item, 'amount', (Number(item.outCount) * Number(item.inCost)).toFixed(2))
})
}
})
.catch(e => {
this.formobj = {}
})
},
busTypeSelect(val) {
const choose = this.busTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>busTypeSelect', choose)
this.formobj.busTypeKey = choose[0].dictKey
this.formobj.busTypeValue = choose[0].dictValue
},
commodityComputeYHAndXSJE(row, val) {
// if (Number(row.outCount) > Number(row.count)) {
// row.outCount = row.count
// }
row.amount = (Number(row.outCount) * Number(row.inCost)).toFixed(2)
},
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

191
yxt-as-ui/src/views/workFlow/qitachukuFlow/otherOutboundYiBan.vue

@ -0,0 +1,191 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>其他出库详情</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.otheroutDetailList" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品ID" prop="goodsID" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="图号" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="200" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" width="120" />
<!-- <el-table-column label="库存" prop="count" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="inCost" align="center" width="120" />
<el-table-column label="出库数量" prop="outCount" align="center" width="120" />
<el-table-column label="金额" prop="amount" align="center" />
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/storage/otherOutbound.js'
export default {
components: {},
data() {
return {
viewState: 1,
listLoading: false,
submitdisabled: false,
formobj: {},
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
indexMethod(index) {
return index + 1
},
showInfo(sid) {
req.fetchDetailsBySid(sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
//this.Array
this.formobj.otheroutDetailList.forEach(item => {
this.$set(item, 'amount', (Number(item.outCount) * Number(item.inCost)).toFixed(2))
})
}
})
.catch(e => {
this.formobj = {}
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
},
/** 撤回任务 */
handleRevoke() {
req.revokeProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

168
yxt-as-ui/src/views/workFlow/qitachukuFlow/relation/chooseproducts.vue

@ -0,0 +1,168 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择商品</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品编码" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable />
</el-form-item>
<!-- <el-form-item label="供应商" class="searchlist">
<el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable />
</el-form-item> -->
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">商品列表</div>
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center" />
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<!-- <el-table-column prop="count" label="库存" align="center" /> -->
<!-- <el-table-column prop="manufacturerName" label="供应商" align="center" /> -->
</el-table>
</div>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import req from '@/api/storage/otherOutbound.js'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
params: {
deptSid: '',
goodsSkuTitle: '',
goodsSkuCode: '',
},
total: 0
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
req.sourceBillBySid(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.listQuery.params.goodsSkuTitle = ''
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
//
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

2
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuVo.java

@ -27,6 +27,8 @@ public class GoodsSkuVo {
private String manufacturerSid;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("库存数量")
private String count;
/* @ApiModelProperty("仓库sid")
private String warehouseSid;

2
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java

@ -412,7 +412,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
inventoryRecordDto.setGoodsSkuCode(pmsPurchasebackDetailDetailsVo.getGoodsSkuCode());
inventoryRecordDto.setGoodsSkuOwnSpec(pmsPurchasebackDetailDetailsVo.getGoodsSkuOwnSpec());
inventoryRecordDto.setUnit(pmsPurchasebackDetailDetailsVo.getUnit());
inventoryRecordDto.setCount(pmsPurchasebackDetailDetailsVo.getCount().toString());
inventoryRecordDto.setCount(pmsPurchasebackDetailDetailsVo.getBackCount().toString());
inventoryRecordDto.setWarehouseSid(pmsPurchasebackDetailDetailsVo.getWarehouseSid());
inventoryRecordDto.setWarehouseName(pmsPurchasebackDetailDetailsVo.getWarehouseName());
inventoryRecordDto.setWarehouseRackSid(pmsPurchasebackDetailDetailsVo.getWarehouseRackSid());

6
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@ -190,6 +190,12 @@ public class WmsInventoryRest {
return wmsInventoryService.alloGoodsListPage(pq);
}
@ApiOperation("其他出库商品分页列表")
@PostMapping("/otherOutGoodsListPage")
public ResultBean<PagerVo<WmsInventoryOtherOutSelectList>> otherOutGoodsListPage(@RequestBody PagerQuery<WmsInventoryOtherOutSelectQuery> pq) {
return wmsInventoryService.otherOutGoodsListPage(pq);
}
@ApiOperation("旧件返厂商品分页列表")
@PostMapping("/returnGoodsListPage")
public ResultBean<PagerVo<WmsInventoryReturnSelectList>> returnGoodsListPage(@RequestBody PagerQuery<WmsInventoryReturnSelectQuery> pq) {

2
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOtheroutApplyRest.java

@ -33,6 +33,7 @@ import com.yxt.wms.biz.inventory.wmsinventoryprofitout.flowable.*;
import com.yxt.wms.biz.inventory.wmsotheroutapply.*;
import com.yxt.wms.biz.inventory.wmsotheroutapply.flowable.*;
import com.yxt.wms.feign.flowable.flow.BusinessVariables;
import com.yxt.wms.feign.flowable.flow.ProcDefEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -91,7 +92,6 @@ public class WmsOtheroutApplyRest {
public ResultBean complete(@Valid @RequestBody CompleteOtheroutDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId("");
return wmsOtheroutApplyService.complete(bv);
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java

@ -53,6 +53,8 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
IPage<WmsInventoryAlloSelectList> alloGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
IPage<WmsInventoryOtherOutSelectList> otherOutGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
IPage<WmsInventoryReturnSelectList> returnGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
IPage<WmsInventoryHandleSelectList> handleGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);

25
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@ -622,4 +622,29 @@
<select id="selbyGoodsId" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventory">
SELECT * FROM wms_inventory WHERE goodsID =#{goodsID}
</select>
<select id="otherOutGoodsListPage"
resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryOtherOutSelectList">
SELECT
wi.goodsID,
wi.goodsSpuSid,
wi.goodsSpuName,
wi.goodsSkuSid,
wi.goodsSkuTitle,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
wi.manufacturerSid,
wi.manufacturerName,
wi.unit,
wi.warehouseSid,
wi.warehouseName,
wi.warehouseRackSid,
wi.warehouseRackCode,
wi.count,
wi.cost AS taxPrice
FROM wms_inventory wi
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

47
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectList.java

@ -0,0 +1,47 @@
package com.yxt.wms.biz.inventory.wmsinventory;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/3/21
**/
@Data
public class WmsInventoryOtherOutSelectList {
//sid
private String inventorySid;
//商品ID
private String goodsID;
//商品spuSid
private String goodsSpuSid;
//商品spu名称
private String goodsSpuName;
//商品skuSid
private String goodsSkuSid;
//商品sku名称
private String goodsSkuTitle;
//图号
private String goodsSkuCode;
//规格
private String goodsSkuOwnSpec;
//厂家sid
private String manufacturerSid;
//厂家名称
private String manufacturerName;
//商品单位
private String unit;
//仓库sid
private String warehouseSid;
//仓库名称
private String warehouseName;
//库位sid
private String warehouseRackSid;
//库位编码
private String warehouseRackCode;
//库存数量
private String count;
//入库单价
private String taxPrice;
}

20
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectQuery.java

@ -0,0 +1,20 @@
package com.yxt.wms.biz.inventory.wmsinventory;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/3/21
**/
@Data
public class WmsInventoryOtherOutSelectQuery implements Query {
//商品名称
private String goodsSkuTitle;
//商品编码
private String goodsSkuCode;
//部门sid
private String deptSid;
}

18
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@ -467,6 +467,24 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
return rb.success().setData(p);
}
public ResultBean<PagerVo<WmsInventoryOtherOutSelectList>> otherOutGoodsListPage(PagerQuery<WmsInventoryOtherOutSelectQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryOtherOutSelectQuery query = pq.getParams();
QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
qw.eq("wi.useOrgSid", query.getDeptSid());
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("wi.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) {
qw.like("wi.goodsSkuTitle", query.getGoodsSkuTitle());
}
qw.gt("wi.count", 0);
IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryOtherOutSelectList> pagging = baseMapper.otherOutGoodsListPage(page, qw);
PagerVo<WmsInventoryOtherOutSelectList> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean<WmsInventory> fetchEntityBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsInventory inventory = fetchBySid(sid);

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java

@ -35,9 +35,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillDto;
import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillService;
import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailDto;
import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbill;
import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillService;
import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*;
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService;
import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*;
import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDetailsVo;

1005
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyService.java

File diff suppressed because it is too large

1
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyVo.java

@ -51,6 +51,7 @@ import lombok.Data;
@ApiModel(value = "其他出库 视图数据对象", description = "其他出库 视图数据对象")
public class WmsOtheroutApplyVo implements Vo {
private String sid;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("单据编号")

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetail.java

@ -80,8 +80,8 @@ public class WmsOtheroutDetail extends BaseEntity {
private String warehouseName; // 仓库名称
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位名称")
private String warehouseRackName; // 库位名称
@ApiModelProperty("库位编码")
private String warehouseRackCode;
@ApiModelProperty("入库单价")
private BigDecimal inCost; // 入库单价
@ApiModelProperty("出库数量")

5
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDetailsVo.java

@ -81,11 +81,10 @@ public class WmsOtheroutDetailDetailsVo implements Vo {
private String warehouseName; // 仓库名称
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位名称")
private String warehouseRackName; // 库位名称
@ApiModelProperty("库位编码")
private String warehouseRackCode;
@ApiModelProperty("入库单价")
private BigDecimal inCost; // 入库单价
@ApiModelProperty("出库数量")
private BigDecimal outCount; // 出库数量
}

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDto.java

@ -81,8 +81,8 @@ public class WmsOtheroutDetailDto implements Dto {
private String warehouseName; // 仓库名称
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位名称")
private String warehouseRackName; // 库位名称
@ApiModelProperty("库位编码")
private String warehouseRackCode;
@ApiModelProperty("入库单价")
private BigDecimal inCost; // 入库单价
@ApiModelProperty("出库数量")

1
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.java

@ -38,6 +38,5 @@ public interface WmsOtheroutDetailMapper extends BaseMapper<WmsOtheroutDetail> {
@Delete("delete from wms_otherout_detail where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
@Select("select * from wms_otherout_detail where mainSid = #{mainSid}")
List<WmsOtheroutDetailDetailsVo> selByMainSid(String mainSid);
}

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.xml

@ -3,4 +3,12 @@
<mapper namespace="com.yxt.wms.biz.inventory.wmsotheroutdetail.WmsOtheroutDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selByMainSid" resultType="com.yxt.wms.biz.inventory.wmsotheroutdetail.WmsOtheroutDetailDetailsVo">
SELECT
*
FROM
wms_otherout_detail
WHERE mainSid = #{mainSid}
</select>
</mapper>

1
yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java

@ -10,6 +10,7 @@ public enum ProcDefEnum {
WMSINVENCHECKREPORT("盘点报告审批", "process_wtab67fj:1:14197600"),
WMSINVENTORYPROFITIN("盘盈入库申请", "process_kwd3cagu:1:14197564"),
WMSINVENTORYPROFITOUT("盘亏出库申请", "process_gmjrjghm:1:14197568"),
WMSOTHEROUTAPPLY("其他出库(报损出库)", "process_iks2hour:1:14197560"),
WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"),
WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"),
WMSINVENTORYALLOCATEBILLTHREE("调拨申请(集团内同一分公司两一级站间调拨)", "process_6clsvwsg:1:14177512"),

Loading…
Cancel
Save