diff --git a/README.md b/README.md index 21984e94..e6b58f3a 100644 --- a/README.md +++ b/README.md @@ -266,6 +266,12 @@ const reg = /^[A-Z0-9]{2}$/ const date = new Date() date.setTime(date.getTime() + 3600 * 1000 * 24 * 7) this.getemplist.time = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() +``` +###### 当前日期 +```js + const date = new Date() + date.setTime(date.getTime()) + this.personalForm.enterDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() ``` ###### 完成进度 ```text diff --git a/src/api/Advancemanage.js b/src/api/Advancemanage.js index ad957f24..b1030512 100644 --- a/src/api/Advancemanage.js +++ b/src/api/Advancemanage.js @@ -31,6 +31,9 @@ export function advancelist(query) { if (query.productType !== '' && query.productType !== null && query.productType !== undefined) { params.append('productType', query.productType) // 你要传给后台的参数值 key/value } + if (query.isUse !== '' && query.isUse !== null && query.isUse !== undefined) { + params.append('isUse', query.isUse) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/api/CarStatList.js b/src/api/CarStatList.js new file mode 100644 index 00000000..710e6981 --- /dev/null +++ b/src/api/CarStatList.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' + +// 车辆使用情况 +export function carStatList(query) { + var params = new URLSearchParams() + if (query.licencenumber !== '' && query.licencenumber !== null && query.licencenumber !== undefined) { + params.append('licencenumber', query.licencenumber) // 你要传给后台的参数值 key/value + } + if (query.carnumber !== '' && query.carnumber !== null && query.carnumber !== undefined) { + params.append('carnumber', query.carnumber) // 你要传给后台的参数值 key/value + } + if (query.outPersonId !== '' && query.outPersonId !== null && query.outPersonId !== undefined) { + params.append('outPersonId', query.outPersonId) // 你要传给后台的参数值 key/value + } + if (query.carStat !== '' && query.carStat !== null && query.carStat !== undefined) { + params.append('carStat', query.carStat) // 你要传给后台的参数值 key/value + } + if (query.carType !== '' && query.carType !== null && query.carType !== undefined) { + params.append('carType', query.carType) // 你要传给后台的参数值 key/value + } + if (query.stat !== '' && query.stat !== null && query.stat !== undefined) { + params.append('stat', query.stat) // 你要传给后台的参数值 key/value + } + if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) { + params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value + } + if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) { + params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } + params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value + params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/logisticsCar/carStatList', + method: 'post', + data: params + }) +} diff --git a/src/api/DeliverGoods.js b/src/api/DeliverGoods.js new file mode 100644 index 00000000..9e016aa4 --- /dev/null +++ b/src/api/DeliverGoods.js @@ -0,0 +1,103 @@ +import request from '@/utils/request' + +// 新建配送单 +export function addDeliverGoods(query, query2, query4) { + var params = new URLSearchParams() + params.append('deliverGoodsJson', query) // 你要传给后台的参数值 key/value + params.append('deliverGoodsDetailJson', query2) // 你要传给后台的参数值 key/value + if (query4.repositoryId !== '' && query4.repositoryId !== null && query4.repositoryId !== undefined) { + params.append('repositoryId', query4.repositoryId) // 你要传给后台的参数值 key/value + } + if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) { + params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/deliverGoods/addDeliverGoods', + method: 'post', + data: params + }) +} + +// 配送单列表 +export function deliverGoodsList(query) { + var params = new URLSearchParams() + if (query.title !== '' && query.title !== null && query.title !== undefined) { + params.append('title', query.title) // 你要传给后台的参数值 key/value + } + if (query.deliverNumber !== '' && query.deliverNumber !== null && query.deliverNumber !== undefined) { + params.append('deliverNumber', query.deliverNumber) // 你要传给后台的参数值 key/value + } + if (query.sourceNUmber !== '' && query.sourceNUmber !== null && query.sourceNUmber !== undefined) { + params.append('sourceNUmber', query.sourceNUmber) // 你要传给后台的参数值 key/value + } + if (query.sourceType !== '' && query.sourceType !== null && query.sourceType !== undefined) { + params.append('sourceType', query.sourceType) // 你要传给后台的参数值 key/value + } + if (query.deliverPersonId !== '' && query.deliverPersonId !== null && query.deliverPersonId !== undefined) { + params.append('deliverPersonId', query.deliverPersonId) // 你要传给后台的参数值 key/value + } + if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) { + params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value + } + if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) { + params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value + } + if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) { + params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value + } + if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) { + params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value + } + if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) { + params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value + } + if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) { + params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } + params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value + params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/deliverGoods/deliverGoodsList', + method: 'post', + data: params + }) +} + +// 修改配送单 +export function updateDeliverGoods(query, query2) { + var params = new URLSearchParams() + params.append('deliverGoodsJson', query) // 你要传给后台的参数值 key/value + params.append('deliverGoodsDetailJson', query2) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/deliverGoods/updateDeliverGoods', + method: 'post', + data: params + }) +} + +// 删除配送单 +export function deleteDeliverGoods(query) { + var params = new URLSearchParams() + if (query !== '' && query !== null && query !== undefined) { + params.append('deliverIds', query) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/deliverGoods/deleteDeliverGoods', + method: 'post', + data: params + }) +} + +// 审核配送单 +export function updateDeliverGoods2(query) { + var params = new URLSearchParams() + params.append('deliverGoodsJson', query) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/deliverGoods/updateDeliverGoods', + method: 'post', + data: params + }) +} diff --git a/src/api/EmployeeInformation.js b/src/api/EmployeeInformation.js index 956daa35..6629cea6 100644 --- a/src/api/EmployeeInformation.js +++ b/src/api/EmployeeInformation.js @@ -99,8 +99,11 @@ export function updateemp(query) { if (query.postId !== '' && query.postId !== null && query.postId !== undefined) { params.append('postid', query.postId) // 你要传给后台的参数值 key/value } - if (query.repositoryid2 !== '' && query.repositoryid2 !== null && query.repositoryid2 !== undefined) { - params.append('repositoryid', query.repositoryid2) // 你要传给后台的参数值 key/value + if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) { + params.append('repositoryid', query.repositoryId) // 你要传给后台的参数值 key/value + } + if (query.roleId !== '' && query.roleId !== null && query.roleId !== undefined) { + params.append('roleid', query.roleId) // 你要传给后台的参数值 key/value } if (query.regionId !== '' && query.regionId !== null && query.regionId !== undefined) { params.append('regionid', query.regionId) // 你要传给后台的参数值 key/value @@ -160,6 +163,12 @@ export function getemplist(query) { if (query.regionid !== '' && query.regionid !== undefined) { params.append('regionid', query.regionid) // 你要传给后台的参数值 key/value } + if (query.loginRepositoryId !== '' && query.loginRepositoryId !== undefined && query.loginRepositoryId !== null) { + params.append('loginRepositoryId', query.loginRepositoryId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== undefined && query.regionIds !== null) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } if (query.postid !== '') { params.append('postid', query.postid) // 你要传给后台的参数值 key/value } diff --git a/src/api/ProducePlan.js b/src/api/ProducePlan.js index 7914fc0e..78b15c6f 100644 --- a/src/api/ProducePlan.js +++ b/src/api/ProducePlan.js @@ -58,6 +58,9 @@ export function produceplanlist(query) { if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value } + if (query.isUse !== '' && query.isUse !== null && query.isUse !== undefined) { + params.append('isUse', query.isUse) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/api/Repository.js b/src/api/Repository.js index 31ad3dc8..d08da357 100644 --- a/src/api/Repository.js +++ b/src/api/Repository.js @@ -85,6 +85,12 @@ export function searchRepository2(query) { if (query.iseffective !== '' && query.iseffective !== null && query.iseffective !== undefined) { params.append('iseffective', query.iseffective) // 你要传给后台的参数值 key/value } + if (query.loginRepositoryId !== '' && query.loginRepositoryId !== undefined && query.loginRepositoryId !== null) { + params.append('loginRepositoryId', query.loginRepositoryId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== undefined && query.regionIds !== null) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } if (query.regionId !== '' && query.regionId !== null && query.regionId !== undefined) { params.append('regionId', query.regionId) // 你要传给后台的参数值 key/value } diff --git a/src/api/ReturnExchange.js b/src/api/ReturnExchange.js new file mode 100644 index 00000000..9e093006 --- /dev/null +++ b/src/api/ReturnExchange.js @@ -0,0 +1,105 @@ +import request from '@/utils/request' + +// 新建换货单 +export function addReturnExchange(query, query2, query3, query4) { + var params = new URLSearchParams() + params.append('returnExchangeJson', query) // 你要传给后台的参数值 key/value + params.append('returnExchangeOutJson', query2) // 你要传给后台的参数值 key/value + params.append('returnExchangeRetreatJson', query3) // 你要传给后台的参数值 key/value + if (query4.repositoryId !== '' && query4.repositoryId !== null && query4.repositoryId !== undefined) { + params.append('repositoryId', query4.repositoryId) // 你要传给后台的参数值 key/value + } + if (query4.regionId !== '' && query4.regionId !== null && query4.regionId !== undefined) { + params.append('regionId', query4.regionId) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/returnExchange/addReturnExchange', + method: 'post', + data: params + }) +} + +// 换货单列表 +export function exchangelist(query) { + var params = new URLSearchParams() + if (query.title !== '' && query.title !== null && query.title !== undefined) { + params.append('title', query.title) // 你要传给后台的参数值 key/value + } + if (query.exchangeNumber !== '' && query.exchangeNumber !== null && query.exchangeNumber !== undefined) { + params.append('exchangeNumber', query.exchangeNumber) // 你要传给后台的参数值 key/value + } + if (query.handlePersonId !== '' && query.handlePersonId !== null && query.handlePersonId !== undefined) { + params.append('handlePersonId', query.handlePersonId) // 你要传给后台的参数值 key/value + } + if (query.saleRepositoryId !== '' && query.saleRepositoryId !== null && query.saleRepositoryId !== undefined) { + params.append('saleRepositoryId', query.saleRepositoryId) // 你要传给后台的参数值 key/value + } + if (query.customerName !== '' && query.customerName !== null && query.customerName !== undefined) { + params.append('customerName', query.customerName) // 你要传给后台的参数值 key/value + } + if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) { + params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value + } + if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) { + params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value + } + if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) { + params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value + } + if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) { + params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value + } + if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) { + params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value + } + if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) { + params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value + } + if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { + params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value + } + params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value + params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/returnExchange/exchangelist', + method: 'post', + data: params + }) +} + +// 修改换货单 +export function updateReturnExchange(query, query2, query3) { + var params = new URLSearchParams() + params.append('returnExchangeJson', query) // 你要传给后台的参数值 key/value + params.append('returnExchangeOutJson', query2) // 你要传给后台的参数值 key/value + params.append('returnExchangeRetreatJson', query3) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/returnExchange/updateReturnExchange', + method: 'post', + data: params + }) +} + +// 删除换货单 +export function deleteReturnExchange(query) { + var params = new URLSearchParams() + if (query !== '' && query !== null && query !== undefined) { + params.append('exchangeIds', query) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/returnExchange/deleteReturnExchange', + method: 'post', + data: params + }) +} + +// 审核换货单 +export function updateReturnExchange2(query) { + var params = new URLSearchParams() + params.append('returnExchangeJson', query) // 你要传给后台的参数值 key/value + return request({ + url: '/erp/returnExchange/updateReturnExchange', + method: 'post', + data: params + }) +} diff --git a/src/api/SaleOpportunity.js b/src/api/SaleOpportunity.js index 603bd097..8616ad50 100644 --- a/src/api/SaleOpportunity.js +++ b/src/api/SaleOpportunity.js @@ -42,6 +42,9 @@ export function saleopportunitylist(query) { if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) { params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value } + if (query.isUse !== '' && query.isUse !== null && query.isUse !== undefined) { + params.append('isUse', query.isUse) // 你要传给后台的参数值 key/value + } params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value return request({ diff --git a/src/api/public.js b/src/api/public.js index a1ab14be..293cb950 100644 --- a/src/api/public.js +++ b/src/api/public.js @@ -353,3 +353,16 @@ export function agentCollectList(query) { data: params }) } + +// 取角色名称 +export function getDetailById(query) { + var params = new URLSearchParams() + if (query !== '' && query !== null && query !== undefined) { + params.append('detailId', query) // 你要传给后台的参数值 key/value + } + return request({ + url: '/erp/role/getDetailById', + method: 'post', + data: params + }) +} diff --git a/src/icons/svg/huanhuo.svg b/src/icons/svg/huanhuo.svg new file mode 100644 index 00000000..b6c7596c --- /dev/null +++ b/src/icons/svg/huanhuo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/peisong.svg b/src/icons/svg/peisong.svg new file mode 100644 index 00000000..6bee68ff --- /dev/null +++ b/src/icons/svg/peisong.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/shiyongqingkuan.svg b/src/icons/svg/shiyongqingkuan.svg new file mode 100644 index 00000000..c194705b --- /dev/null +++ b/src/icons/svg/shiyongqingkuan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lang/zh.js b/src/lang/zh.js index 931240a4..047498e2 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -268,7 +268,14 @@ export default { GroupBuyRules: '团购活动规则', AddGroupBuyRules: '新建团购活动规则', GroupBuyRulesList: '团购活动规则列表', - Getauthority: '角色权限' + Getauthority: '角色权限', + DeliverGoods: '配送单', + AddDeliverGoods: '新建配送单', + DeliverGoodsList: '配送单列表', + CarStatList: '车辆使用情况', + ReturnExchange: '换货单', + AddReturnExchange: '新建换货单', + ReturnExchangeList: '换货单列表' }, navbar: { logOut: '退出登录', @@ -1459,7 +1466,16 @@ export default { contractStat: '合同状态', invoiceType: '开票类型', taxRate: '汇率', - allMoney: '金额' + allMoney: '金额', + installmentCount: '分期期数', + dayOfMonth: '每月还款日期', + installmentAllMoney: '分期总金额', + installmentBegintime: '分期开始时间', + installmentEndtime: '分期结束时间', + notaryPerson: '公证人', + notaryDate: '公证日期', + firstMoney: '首付金额', + eachMoney: '每期还款金额' }, income: { title: '收入单主题', @@ -1718,6 +1734,51 @@ export default { createTime: '创建时间', createPersonName: '创建人' }, + DeliverGoods: { + title: '配送单主题', + sourceType: '源单类型', + sourceNumber: '源单编号', + requireArriveDate: '要求到货日期', + deliverDept: '配送部门', + deliverPersonId: '配送人', + requireType: '要货类型', + requireId: '要货方', + stat: '业务状态', + address: '地址', + deliverNumber: '配送单编号' + }, + CarStatList: { + carnumber: '车辆编号', + licencenumber: '车牌号', + carName: '车辆名称', + carStat: '车辆状态', + carType: '车辆型号', + outPersonId: '出车人', + stat: '状态', + driverNames: '驾驶员', + outTime: '最近一次出车时间', + returnTime: '最近一次返回时间', + orderType: '订单类型', + orderNumber: '订单编号', + address: '送货地址', + outTime2: '出车时间', + outPersonPhone: '电话' + }, + ReturnExchange: { + title: '换货单主题', + sourceType: '源单类型', + sourceNumber: '源单编号', + customerType: '客户类型', + customerId: '客户姓名', + customerPhone: '客户电话', + sourceMoney: '源单车辆金额', + diffMoney: '差异金额', + applyNumber: '分期申请编号', + handlePersonId: '换货人', + exchangeDate: '换货时间', + repositoryId: '仓库', + exchangeNumber: '换货单编号' + }, public: { cancel: '取消', save: '保存', diff --git a/src/router/index.js b/src/router/index.js index ad09ce00..8431a19c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1730,6 +1730,32 @@ export const asyncRouterMap = [ } ] }, + { + path: '/ReturnExchange', + component: Layout, + redirect: 'noredirect', + name: 'ReturnExchange', + alwaysShow: true, + meta: { + title: 'ReturnExchange', + icon: 'huanhuo', + type: 3 + }, + children: [ + { + path: 'AddReturnExchange', + component: () => import('@/views/ReturnExchange/AddReturnExchange'), + name: 'AddReturnExchange', + meta: { title: 'AddReturnExchange', noCache: false } + }, + { + path: 'ReturnExchangeList', + component: () => import('@/views/ReturnExchange/ReturnExchangeList'), + name: 'ReturnExchangeList', + meta: { title: 'ReturnExchangeList', noCache: true } + } + ] + }, { path: '/Recycling', component: Layout, @@ -1975,55 +2001,98 @@ export const asyncRouterMap = [ } ] }, + // { + // path: '/SendCar', + // component: Layout, + // redirect: 'noredirect', + // name: 'SendCar', + // alwaysShow: true, + // meta: { + // title: 'SendCar', + // icon: 'paiche', + // type: 9 + // }, + // children: [ + // { + // path: 'Addsendcar', + // component: () => import('@/views/LogisticsCar/Addsendcar'), + // name: 'Addsendcar', + // meta: { title: 'Addsendcar', noCache: false } + // }, + // { + // path: 'SendcarList', + // component: () => import('@/views/LogisticsCar/SendcarList'), + // name: 'SendcarList', + // meta: { title: 'SendcarList', noCache: true } + // } + // ] + // }, + // { + // path: '/ReturnCar', + // component: Layout, + // redirect: 'noredirect', + // name: 'ReturnCar', + // alwaysShow: true, + // meta: { + // title: 'ReturnCar', + // icon: 'huiche', + // type: 9 + // }, + // children: [ + // { + // path: 'Addreturncar', + // component: () => import('@/views/LogisticsCar/Addreturncar'), + // name: 'Addreturncar', + // meta: { title: 'Addreturncar', noCache: false } + // }, + // { + // path: 'ReturncarList', + // component: () => import('@/views/LogisticsCar/ReturncarList'), + // name: 'ReturncarList', + // meta: { title: 'ReturncarList', noCache: true } + // } + // ] + // }, { - path: '/SendCar', + path: '/DeliverGoods', component: Layout, redirect: 'noredirect', - name: 'SendCar', + name: 'DeliverGoods', alwaysShow: true, meta: { - title: 'SendCar', - icon: 'paiche', + title: 'DeliverGoods', + icon: 'peisong', type: 9 }, children: [ { - path: 'Addsendcar', - component: () => import('@/views/LogisticsCar/Addsendcar'), - name: 'Addsendcar', - meta: { title: 'Addsendcar', noCache: false } + path: 'AddDeliverGoods', + component: () => import('@/views/DeliverGoods/AddDeliverGoods'), + name: 'AddDeliverGoods', + meta: { title: 'AddDeliverGoods', noCache: false } }, { - path: 'SendcarList', - component: () => import('@/views/LogisticsCar/SendcarList'), - name: 'SendcarList', - meta: { title: 'SendcarList', noCache: true } + path: 'DeliverGoodsList', + component: () => import('@/views/DeliverGoods/DeliverGoodsList'), + name: 'DeliverGoodsList', + meta: { title: 'DeliverGoodsList', noCache: true } } ] }, { - path: '/ReturnCar', + path: '/CarStatList', component: Layout, redirect: 'noredirect', - name: 'ReturnCar', - alwaysShow: true, meta: { - title: 'ReturnCar', - icon: 'huiche', + icon: 'shiyongqingkuan', type: 9 }, children: [ { - path: 'Addreturncar', - component: () => import('@/views/LogisticsCar/Addreturncar'), - name: 'Addreturncar', - meta: { title: 'Addreturncar', noCache: false } - }, - { - path: 'ReturncarList', - component: () => import('@/views/LogisticsCar/ReturncarList'), - name: 'ReturncarList', - meta: { title: 'ReturncarList', noCache: true } + path: 'index', + component: () => import('@/views/CarStatList/index'), + name: 'CarStatList', + meta: { title: 'CarStatList', noCache: true } } ] }, diff --git a/src/store/getters.js b/src/store/getters.js index eba55278..ccfa1d95 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -16,8 +16,12 @@ const getters = { addRouters: state => state.permission.addRouters, errorLogs: state => state.errorLog.logs, userId: state => state.user.userId, - regionid: state => state.user.regionid, - repositoryid: state => state.user.repositoryid, - yin: state => state.app.yin + regionId: state => state.user.regionId, + repositoryId: state => state.user.repositoryId, + yin: state => state.app.yin, + countryId: state => state.user.countryId, + deptId: state => state.user.deptId, + regionName: state => state.user.regionName, + repositoryName: state => state.user.repositoryName } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e7bcc4f7..e0ef36c0 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -15,8 +15,12 @@ const user = { articlePlatform: [] }, userId: '', - regionid: '', - repositoryid: '' + regionId: '', + repositoryId: '', + countryId: '', + deptId: '', + regionName: '', + repositoryName: '' }, mutations: { @@ -47,11 +51,23 @@ const user = { SET_USERID: (state, userId) => { state.userId = userId }, - SET_REGIONID: (state, regionid) => { - state.regionid = regionid + SET_REGIONID: (state, regionId) => { + state.regionId = regionId }, - SET_REPOSITORYID: (state, repositoryid) => { - state.repositoryid = repositoryid + SET_REPOSITORYID: (state, repositoryId) => { + state.repositoryId = repositoryId + }, + SET_COUNTTRYID: (state, countryId) => { + state.countryId = countryId + }, + SET_DEPTID: (state, deptId) => { + state.deptId = deptId + }, + SET_REGIONNAME: (state, regionName) => { + state.regionName = regionName + }, + SET_REPOSITORYNAME: (state, repositoryName) => { + state.repositoryName = repositoryName } }, @@ -94,6 +110,10 @@ const user = { commit('SET_USERID', data.userId) commit('SET_REGIONID', data.regionId) commit('SET_REPOSITORYID', data.repositoryId) + commit('SET_COUNTTRYID', data.countryId) + commit('SET_DEPTID', data.deptId) + commit('SET_REGIONNAME', data.regionName) + commit('SET_REPOSITORYNAME', data.repositoryName) resolve(response) }).catch(error => { reject(error) diff --git a/src/views/AccessMaterials/AccessMaterialsList.vue b/src/views/AccessMaterials/AccessMaterialsList.vue index 20dae208..1cd27a82 100644 --- a/src/views/AccessMaterials/AccessMaterialsList.vue +++ b/src/views/AccessMaterials/AccessMaterialsList.vue @@ -262,9 +262,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -379,7 +378,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -387,7 +386,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/AccessMaterials/AddAccessMaterials.vue b/src/views/AccessMaterials/AddAccessMaterials.vue index c8a8accc..525a1c3a 100644 --- a/src/views/AccessMaterials/AddAccessMaterials.vue +++ b/src/views/AccessMaterials/AddAccessMaterials.vue @@ -206,10 +206,10 @@ export default { control: false, // 生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 生产任务规则数据 @@ -474,10 +474,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.produceTaskNumber = null diff --git a/src/views/AccessMaterials/AddRetreatMaterials.vue b/src/views/AccessMaterials/AddRetreatMaterials.vue index 9ba0477c..77e16a8b 100644 --- a/src/views/AccessMaterials/AddRetreatMaterials.vue +++ b/src/views/AccessMaterials/AddRetreatMaterials.vue @@ -171,10 +171,10 @@ export default { control: false, // 生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 生产任务规则数据 @@ -405,10 +405,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.receivePersonId = null diff --git a/src/views/AccessMaterials/RetreatMaterialsList.vue b/src/views/AccessMaterials/RetreatMaterialsList.vue index 1fe156e8..c5317d95 100644 --- a/src/views/AccessMaterials/RetreatMaterialsList.vue +++ b/src/views/AccessMaterials/RetreatMaterialsList.vue @@ -258,9 +258,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -378,7 +377,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -386,7 +385,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/AccessMaterials/components/MyCenter.vue b/src/views/AccessMaterials/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/AccessMaterials/components/MyCenter.vue +++ b/src/views/AccessMaterials/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/components/MyCreate.vue b/src/views/AccessMaterials/components/MyCreate.vue index fa841bf1..fc706e4f 100644 --- a/src/views/AccessMaterials/components/MyCreate.vue +++ b/src/views/AccessMaterials/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AccessMaterials/components/MyDelivery.vue b/src/views/AccessMaterials/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/AccessMaterials/components/MyDelivery.vue +++ b/src/views/AccessMaterials/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AccessMaterials/components/MyDialog.vue b/src/views/AccessMaterials/components/MyDialog.vue index d4b6907b..5d458574 100644 --- a/src/views/AccessMaterials/components/MyDialog.vue +++ b/src/views/AccessMaterials/components/MyDialog.vue @@ -477,10 +477,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.produceTaskNumber = null @@ -490,11 +490,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/AccessMaterials/components/MyDialog2.vue b/src/views/AccessMaterials/components/MyDialog2.vue index 28cf62a4..07d8bbbc 100644 --- a/src/views/AccessMaterials/components/MyDialog2.vue +++ b/src/views/AccessMaterials/components/MyDialog2.vue @@ -423,10 +423,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.receivePersonId = null @@ -435,11 +435,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/AccessMaterials/components/MyEmp.vue b/src/views/AccessMaterials/components/MyEmp.vue index 68a77b96..85a50ee5 100644 --- a/src/views/AccessMaterials/components/MyEmp.vue +++ b/src/views/AccessMaterials/components/MyEmp.vue @@ -183,7 +183,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -304,7 +304,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AccessMaterials/components/MyMaterials.vue b/src/views/AccessMaterials/components/MyMaterials.vue index e4f63c36..eef0dfcb 100644 --- a/src/views/AccessMaterials/components/MyMaterials.vue +++ b/src/views/AccessMaterials/components/MyMaterials.vue @@ -238,9 +238,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AccessMaterials/components/MyRepository.vue b/src/views/AccessMaterials/components/MyRepository.vue index 0eab9f54..bf2d0bb3 100644 --- a/src/views/AccessMaterials/components/MyRepository.vue +++ b/src/views/AccessMaterials/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/AccessMaterials/components/ProduceTask.vue b/src/views/AccessMaterials/components/ProduceTask.vue index 1c5ae8f7..575d2ca9 100644 --- a/src/views/AccessMaterials/components/ProduceTask.vue +++ b/src/views/AccessMaterials/components/ProduceTask.vue @@ -219,9 +219,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdjustPrice/AddAdjustPrice.vue b/src/views/AdjustPrice/AddAdjustPrice.vue index e05fb518..020f788b 100644 --- a/src/views/AdjustPrice/AddAdjustPrice.vue +++ b/src/views/AdjustPrice/AddAdjustPrice.vue @@ -147,10 +147,10 @@ export default { control: false, // 调价信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 调价单规则数据 @@ -280,10 +280,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.handlePersonId = '' diff --git a/src/views/AdjustPrice/AdjustPriceList.vue b/src/views/AdjustPrice/AdjustPriceList.vue index 28dc878e..c4d52bc0 100644 --- a/src/views/AdjustPrice/AdjustPriceList.vue +++ b/src/views/AdjustPrice/AdjustPriceList.vue @@ -224,10 +224,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -370,7 +369,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -378,7 +377,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/AdjustPrice/components/DetailList.vue b/src/views/AdjustPrice/components/DetailList.vue index 9c51e466..dcb65694 100644 --- a/src/views/AdjustPrice/components/DetailList.vue +++ b/src/views/AdjustPrice/components/DetailList.vue @@ -315,11 +315,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/AdjustPrice/components/MyAccept.vue b/src/views/AdjustPrice/components/MyAccept.vue index 1d6bd1a0..f1bea415 100644 --- a/src/views/AdjustPrice/components/MyAccept.vue +++ b/src/views/AdjustPrice/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdjustPrice/components/MyCreate.vue b/src/views/AdjustPrice/components/MyCreate.vue index 91ba3aa7..7b11b81c 100644 --- a/src/views/AdjustPrice/components/MyCreate.vue +++ b/src/views/AdjustPrice/components/MyCreate.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdjustPrice/components/MyDelivery.vue b/src/views/AdjustPrice/components/MyDelivery.vue index 41aa63f0..f5c14889 100644 --- a/src/views/AdjustPrice/components/MyDelivery.vue +++ b/src/views/AdjustPrice/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdjustPrice/components/MyDialog.vue b/src/views/AdjustPrice/components/MyDialog.vue index 19f1167a..849d2539 100644 --- a/src/views/AdjustPrice/components/MyDialog.vue +++ b/src/views/AdjustPrice/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/AdjustPrice/components/MyEdit.vue b/src/views/AdjustPrice/components/MyEdit.vue index 2e06db4b..fe6a3090 100644 --- a/src/views/AdjustPrice/components/MyEdit.vue +++ b/src/views/AdjustPrice/components/MyEdit.vue @@ -305,11 +305,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/AdjustPrice/components/MyEmp.vue b/src/views/AdjustPrice/components/MyEmp.vue index 289f1b96..53e85f94 100644 --- a/src/views/AdjustPrice/components/MyEmp.vue +++ b/src/views/AdjustPrice/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdjustPrice/components/MyOther.vue b/src/views/AdjustPrice/components/MyOther.vue index 22759834..45c8ec9b 100644 --- a/src/views/AdjustPrice/components/MyOther.vue +++ b/src/views/AdjustPrice/components/MyOther.vue @@ -321,11 +321,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/AdjustPrice/components/MyRepository.vue b/src/views/AdjustPrice/components/MyRepository.vue index 95998884..beffb2ee 100644 --- a/src/views/AdjustPrice/components/MyRepository.vue +++ b/src/views/AdjustPrice/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/AdvancePay/AddAdvancePay.vue b/src/views/AdvancePay/AddAdvancePay.vue index c70f423e..8c390b9e 100644 --- a/src/views/AdvancePay/AddAdvancePay.vue +++ b/src/views/AdvancePay/AddAdvancePay.vue @@ -166,10 +166,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, payDate: null }, @@ -378,10 +378,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null diff --git a/src/views/AdvancePay/AdvancePayList.vue b/src/views/AdvancePay/AdvancePayList.vue index 9c8423ed..88a6ba5e 100644 --- a/src/views/AdvancePay/AdvancePayList.vue +++ b/src/views/AdvancePay/AdvancePayList.vue @@ -365,7 +365,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/AdvancePay/components/MyApply.vue b/src/views/AdvancePay/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/AdvancePay/components/MyApply.vue +++ b/src/views/AdvancePay/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdvancePay/components/MyDelivery.vue b/src/views/AdvancePay/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/AdvancePay/components/MyDelivery.vue +++ b/src/views/AdvancePay/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdvancePay/components/MyDialog.vue b/src/views/AdvancePay/components/MyDialog.vue index b03dd344..eff54921 100644 --- a/src/views/AdvancePay/components/MyDialog.vue +++ b/src/views/AdvancePay/components/MyDialog.vue @@ -363,10 +363,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -378,11 +378,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/AdvancePay/components/MyEmp.vue b/src/views/AdvancePay/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/AdvancePay/components/MyEmp.vue +++ b/src/views/AdvancePay/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AdvancePay/components/MyLnquiry.vue b/src/views/AdvancePay/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/AdvancePay/components/MyLnquiry.vue +++ b/src/views/AdvancePay/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdvancePay/components/MyOrder.vue b/src/views/AdvancePay/components/MyOrder.vue index 065e7de5..33e1fed1 100644 --- a/src/views/AdvancePay/components/MyOrder.vue +++ b/src/views/AdvancePay/components/MyOrder.vue @@ -245,9 +245,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AdvancePay/components/MyPlan.vue b/src/views/AdvancePay/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/AdvancePay/components/MyPlan.vue +++ b/src/views/AdvancePay/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/AddAdvanceOrder.vue b/src/views/Advancemanage/AddAdvanceOrder.vue index f056d337..62e941cd 100644 --- a/src/views/Advancemanage/AddAdvanceOrder.vue +++ b/src/views/Advancemanage/AddAdvanceOrder.vue @@ -210,10 +210,10 @@ export default { advancecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 }, // 采购申请单规则数据 @@ -433,10 +433,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.salePersonId = null diff --git a/src/views/Advancemanage/AddAdvanceProduct.vue b/src/views/Advancemanage/AddAdvanceProduct.vue index aa885502..516b1c00 100644 --- a/src/views/Advancemanage/AddAdvanceProduct.vue +++ b/src/views/Advancemanage/AddAdvanceProduct.vue @@ -224,10 +224,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1', depositBegintime: null, depositEndtime: null, @@ -368,10 +368,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.depositTime = null diff --git a/src/views/Advancemanage/AddPrepReturn.vue b/src/views/Advancemanage/AddPrepReturn.vue index e361bbf1..62f1ebc5 100644 --- a/src/views/Advancemanage/AddPrepReturn.vue +++ b/src/views/Advancemanage/AddPrepReturn.vue @@ -233,10 +233,10 @@ export default { advancecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 }, // 采购申请单规则数据 @@ -469,10 +469,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.salePersonId = null diff --git a/src/views/Advancemanage/AdvanceOrderList.vue b/src/views/Advancemanage/AdvanceOrderList.vue index e741e30a..f8b2d29b 100644 --- a/src/views/Advancemanage/AdvanceOrderList.vue +++ b/src/views/Advancemanage/AdvanceOrderList.vue @@ -252,9 +252,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -373,7 +372,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -381,7 +380,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Advancemanage/AdvanceProductList.vue b/src/views/Advancemanage/AdvanceProductList.vue index d98a3ceb..33c3b3e2 100644 --- a/src/views/Advancemanage/AdvanceProductList.vue +++ b/src/views/Advancemanage/AdvanceProductList.vue @@ -223,9 +223,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/PrepReturnList.vue b/src/views/Advancemanage/PrepReturnList.vue index 0f89bf8c..08c9ce82 100644 --- a/src/views/Advancemanage/PrepReturnList.vue +++ b/src/views/Advancemanage/PrepReturnList.vue @@ -268,9 +268,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -424,7 +423,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -432,7 +431,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Advancemanage/components/MyAdvance.vue b/src/views/Advancemanage/components/MyAdvance.vue index 2896538d..86c413e2 100644 --- a/src/views/Advancemanage/components/MyAdvance.vue +++ b/src/views/Advancemanage/components/MyAdvance.vue @@ -202,9 +202,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyApply.vue b/src/views/Advancemanage/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/Advancemanage/components/MyApply.vue +++ b/src/views/Advancemanage/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyArrival.vue b/src/views/Advancemanage/components/MyArrival.vue index c132f293..05c7ea12 100644 --- a/src/views/Advancemanage/components/MyArrival.vue +++ b/src/views/Advancemanage/components/MyArrival.vue @@ -243,9 +243,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyDelivery.vue b/src/views/Advancemanage/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Advancemanage/components/MyDelivery.vue +++ b/src/views/Advancemanage/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Advancemanage/components/MyDialog.vue b/src/views/Advancemanage/components/MyDialog.vue index 4d6fdda2..75e2893a 100644 --- a/src/views/Advancemanage/components/MyDialog.vue +++ b/src/views/Advancemanage/components/MyDialog.vue @@ -526,10 +526,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.salePersonId = null @@ -541,11 +541,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Advancemanage/components/MyDialog2.vue b/src/views/Advancemanage/components/MyDialog2.vue index 834e165f..61e26820 100644 --- a/src/views/Advancemanage/components/MyDialog2.vue +++ b/src/views/Advancemanage/components/MyDialog2.vue @@ -426,10 +426,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.salePersonId = null @@ -441,11 +441,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Advancemanage/components/MyDialog3.vue b/src/views/Advancemanage/components/MyDialog3.vue index eed2a0b8..1da0ec4a 100644 --- a/src/views/Advancemanage/components/MyDialog3.vue +++ b/src/views/Advancemanage/components/MyDialog3.vue @@ -380,10 +380,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.depositTime = null @@ -402,11 +402,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Advancemanage/components/MyEmp.vue b/src/views/Advancemanage/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Advancemanage/components/MyEmp.vue +++ b/src/views/Advancemanage/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Advancemanage/components/MyLnquiry.vue b/src/views/Advancemanage/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/Advancemanage/components/MyLnquiry.vue +++ b/src/views/Advancemanage/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyPlan.vue b/src/views/Advancemanage/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/Advancemanage/components/MyPlan.vue +++ b/src/views/Advancemanage/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Advancemanage/components/MyPresale.vue b/src/views/Advancemanage/components/MyPresale.vue index d8ae3d3e..83adaf67 100644 --- a/src/views/Advancemanage/components/MyPresale.vue +++ b/src/views/Advancemanage/components/MyPresale.vue @@ -227,9 +227,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AgentCollect/components/MyApply.vue b/src/views/AgentCollect/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/AgentCollect/components/MyApply.vue +++ b/src/views/AgentCollect/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AgentCollect/components/MyDelivery.vue b/src/views/AgentCollect/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/AgentCollect/components/MyDelivery.vue +++ b/src/views/AgentCollect/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AgentCollect/components/MyDialog.vue b/src/views/AgentCollect/components/MyDialog.vue index 0ed78d95..717ea9f6 100644 --- a/src/views/AgentCollect/components/MyDialog.vue +++ b/src/views/AgentCollect/components/MyDialog.vue @@ -724,9 +724,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personalForm.applyDate = new Date() @@ -751,11 +751,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId this.personalForm.installmentCount = this.productForm.installmentCount this.personalForm.installmentDays = this.productForm.installmentDays this.productForm.price = this.personalForm.totalMoney diff --git a/src/views/AgentCollect/components/MyEmp.vue b/src/views/AgentCollect/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/AgentCollect/components/MyEmp.vue +++ b/src/views/AgentCollect/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/AgentCollect/components/MyRequire.vue b/src/views/AgentCollect/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/AgentCollect/components/MyRequire.vue +++ b/src/views/AgentCollect/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/AgentCollect/index.vue b/src/views/AgentCollect/index.vue index f6f2ec8d..507584e8 100644 --- a/src/views/AgentCollect/index.vue +++ b/src/views/AgentCollect/index.vue @@ -248,9 +248,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, time: null }, // 传给组件的数据 @@ -413,7 +412,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -421,7 +420,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/BasicSettings/components/MyEmp.vue b/src/views/BasicSettings/components/MyEmp.vue index ad36b0c8..b63e477e 100644 --- a/src/views/BasicSettings/components/MyEmp.vue +++ b/src/views/BasicSettings/components/MyEmp.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -270,7 +270,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/AddBuildUp.vue b/src/views/BuildUp/AddBuildUp.vue index bc4b4e2e..7a7fc764 100644 --- a/src/views/BuildUp/AddBuildUp.vue +++ b/src/views/BuildUp/AddBuildUp.vue @@ -187,10 +187,10 @@ export default { buildcontrol: false, // 组装信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 组装单规则数据 @@ -340,9 +340,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.buildupRepositoryId = '' diff --git a/src/views/BuildUp/BuildUpList.vue b/src/views/BuildUp/BuildUpList.vue index 383da835..c4c0042f 100644 --- a/src/views/BuildUp/BuildUpList.vue +++ b/src/views/BuildUp/BuildUpList.vue @@ -214,10 +214,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -345,7 +344,7 @@ export default { isReview(row) { if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -353,7 +352,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/BuildUp/components/DetailList.vue b/src/views/BuildUp/components/DetailList.vue index f2fc7f9c..fbc59ce8 100644 --- a/src/views/BuildUp/components/DetailList.vue +++ b/src/views/BuildUp/components/DetailList.vue @@ -348,11 +348,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/BuildUp/components/MyAccept.vue b/src/views/BuildUp/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/BuildUp/components/MyAccept.vue +++ b/src/views/BuildUp/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyCreate.vue b/src/views/BuildUp/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/BuildUp/components/MyCreate.vue +++ b/src/views/BuildUp/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyDelivery.vue b/src/views/BuildUp/components/MyDelivery.vue index 05040af3..9c2e2483 100644 --- a/src/views/BuildUp/components/MyDelivery.vue +++ b/src/views/BuildUp/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyDialog.vue b/src/views/BuildUp/components/MyDialog.vue index 66a403ff..dde74ec0 100644 --- a/src/views/BuildUp/components/MyDialog.vue +++ b/src/views/BuildUp/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/BuildUp/components/MyEdit.vue b/src/views/BuildUp/components/MyEdit.vue index 3d63ab55..bea55b2c 100644 --- a/src/views/BuildUp/components/MyEdit.vue +++ b/src/views/BuildUp/components/MyEdit.vue @@ -355,11 +355,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/BuildUp/components/MyEmp.vue b/src/views/BuildUp/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/BuildUp/components/MyEmp.vue +++ b/src/views/BuildUp/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/BuildUp/components/MyOther.vue b/src/views/BuildUp/components/MyOther.vue index e76bb2a8..b90e5508 100644 --- a/src/views/BuildUp/components/MyOther.vue +++ b/src/views/BuildUp/components/MyOther.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/BuildUp/components/MyRepository.vue b/src/views/BuildUp/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/BuildUp/components/MyRepository.vue +++ b/src/views/BuildUp/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/BuildUp/components/MyRules.vue b/src/views/BuildUp/components/MyRules.vue index 4f411b6c..1c398cae 100644 --- a/src/views/BuildUp/components/MyRules.vue +++ b/src/views/BuildUp/components/MyRules.vue @@ -126,12 +126,12 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId this.personalForm.createId = 3 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/CarStatList/index.vue b/src/views/CarStatList/index.vue new file mode 100644 index 00000000..172f3f0d --- /dev/null +++ b/src/views/CarStatList/index.vue @@ -0,0 +1,449 @@ + + + + + diff --git a/src/views/ChangeCount/AddChangeCount.vue b/src/views/ChangeCount/AddChangeCount.vue index 062f273e..7d684e2c 100644 --- a/src/views/ChangeCount/AddChangeCount.vue +++ b/src/views/ChangeCount/AddChangeCount.vue @@ -158,10 +158,10 @@ export default { list2: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 商品信息 @@ -228,10 +228,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.saleRepositoryId = null diff --git a/src/views/ChangeCount/ChangeCountList.vue b/src/views/ChangeCount/ChangeCountList.vue index ce3586f1..e1eee970 100644 --- a/src/views/ChangeCount/ChangeCountList.vue +++ b/src/views/ChangeCount/ChangeCountList.vue @@ -270,9 +270,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -424,7 +423,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -432,7 +431,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ChangeCount/components/MyApply.vue b/src/views/ChangeCount/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/ChangeCount/components/MyApply.vue +++ b/src/views/ChangeCount/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ChangeCount/components/MyDelivery.vue b/src/views/ChangeCount/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/ChangeCount/components/MyDelivery.vue +++ b/src/views/ChangeCount/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ChangeCount/components/MyDialog.vue b/src/views/ChangeCount/components/MyDialog.vue index 68eed3d7..44e483cc 100644 --- a/src/views/ChangeCount/components/MyDialog.vue +++ b/src/views/ChangeCount/components/MyDialog.vue @@ -231,10 +231,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.saleRepositoryId = null @@ -251,11 +251,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/ChangeCount/components/MyEmp.vue b/src/views/ChangeCount/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/ChangeCount/components/MyEmp.vue +++ b/src/views/ChangeCount/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ChangeCount/components/MyInstallment.vue b/src/views/ChangeCount/components/MyInstallment.vue index acbf3bdc..7f330935 100644 --- a/src/views/ChangeCount/components/MyInstallment.vue +++ b/src/views/ChangeCount/components/MyInstallment.vue @@ -216,9 +216,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ChangeCount/components/MyRepository.vue b/src/views/ChangeCount/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/ChangeCount/components/MyRepository.vue +++ b/src/views/ChangeCount/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/ChangeCount/components/MyRequire.vue b/src/views/ChangeCount/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/ChangeCount/components/MyRequire.vue +++ b/src/views/ChangeCount/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/AddCheckFail.vue b/src/views/CheckFail/AddCheckFail.vue index 44605577..94774bf4 100644 --- a/src/views/CheckFail/AddCheckFail.vue +++ b/src/views/CheckFail/AddCheckFail.vue @@ -207,10 +207,10 @@ export default { producecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '1' }, @@ -414,10 +414,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.handlePersonId = null diff --git a/src/views/CheckFail/CheckFailList.vue b/src/views/CheckFail/CheckFailList.vue index 41402210..427747ed 100644 --- a/src/views/CheckFail/CheckFailList.vue +++ b/src/views/CheckFail/CheckFailList.vue @@ -257,9 +257,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -379,7 +378,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -387,7 +386,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/CheckFail/components/MyAccept.vue b/src/views/CheckFail/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/CheckFail/components/MyAccept.vue +++ b/src/views/CheckFail/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckFail/components/MyApply.vue b/src/views/CheckFail/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/CheckFail/components/MyApply.vue +++ b/src/views/CheckFail/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyArrival.vue b/src/views/CheckFail/components/MyArrival.vue index db020562..627cf440 100644 --- a/src/views/CheckFail/components/MyArrival.vue +++ b/src/views/CheckFail/components/MyArrival.vue @@ -243,9 +243,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyCenter.vue b/src/views/CheckFail/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/CheckFail/components/MyCenter.vue +++ b/src/views/CheckFail/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyDelivery.vue b/src/views/CheckFail/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/CheckFail/components/MyDelivery.vue +++ b/src/views/CheckFail/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckFail/components/MyDialog.vue b/src/views/CheckFail/components/MyDialog.vue index 90c5a498..25e629cc 100644 --- a/src/views/CheckFail/components/MyDialog.vue +++ b/src/views/CheckFail/components/MyDialog.vue @@ -411,10 +411,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.handlePersonId = null @@ -426,11 +426,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/CheckFail/components/MyEmp.vue b/src/views/CheckFail/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/CheckFail/components/MyEmp.vue +++ b/src/views/CheckFail/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckFail/components/MyEmp2.vue b/src/views/CheckFail/components/MyEmp2.vue index 29b1058d..1d250784 100644 --- a/src/views/CheckFail/components/MyEmp2.vue +++ b/src/views/CheckFail/components/MyEmp2.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -270,7 +270,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckFail/components/MyQuality.vue b/src/views/CheckFail/components/MyQuality.vue index 9223eefe..91910a58 100644 --- a/src/views/CheckFail/components/MyQuality.vue +++ b/src/views/CheckFail/components/MyQuality.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/MyReport.vue b/src/views/CheckFail/components/MyReport.vue index e4c07520..a16d940a 100644 --- a/src/views/CheckFail/components/MyReport.vue +++ b/src/views/CheckFail/components/MyReport.vue @@ -255,9 +255,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckFail/components/ProduceTask.vue b/src/views/CheckFail/components/ProduceTask.vue index 972ffd77..7018bf39 100644 --- a/src/views/CheckFail/components/ProduceTask.vue +++ b/src/views/CheckFail/components/ProduceTask.vue @@ -219,9 +219,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/AddCheckReport.vue b/src/views/CheckReport/AddCheckReport.vue index c5089198..ae5e8506 100644 --- a/src/views/CheckReport/AddCheckReport.vue +++ b/src/views/CheckReport/AddCheckReport.vue @@ -356,10 +356,10 @@ export default { producecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isRecheck: 1, sourceType: '4' }, @@ -678,10 +678,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.inspectionPersonId = null diff --git a/src/views/CheckReport/CheckReportList.vue b/src/views/CheckReport/CheckReportList.vue index fb71a2df..a8098249 100644 --- a/src/views/CheckReport/CheckReportList.vue +++ b/src/views/CheckReport/CheckReportList.vue @@ -277,9 +277,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -399,7 +398,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -407,7 +406,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/CheckReport/components/MyAccept.vue b/src/views/CheckReport/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/CheckReport/components/MyAccept.vue +++ b/src/views/CheckReport/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckReport/components/MyApply.vue b/src/views/CheckReport/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/CheckReport/components/MyApply.vue +++ b/src/views/CheckReport/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyArrival.vue b/src/views/CheckReport/components/MyArrival.vue index cea877c2..39678903 100644 --- a/src/views/CheckReport/components/MyArrival.vue +++ b/src/views/CheckReport/components/MyArrival.vue @@ -243,9 +243,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyCenter.vue b/src/views/CheckReport/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/CheckReport/components/MyCenter.vue +++ b/src/views/CheckReport/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/MyDelivery.vue b/src/views/CheckReport/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/CheckReport/components/MyDelivery.vue +++ b/src/views/CheckReport/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckReport/components/MyDialog.vue b/src/views/CheckReport/components/MyDialog.vue index d7eb61df..5cfd936e 100644 --- a/src/views/CheckReport/components/MyDialog.vue +++ b/src/views/CheckReport/components/MyDialog.vue @@ -538,10 +538,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.inspectionPersonId = null @@ -553,11 +553,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/CheckReport/components/MyEmp.vue b/src/views/CheckReport/components/MyEmp.vue index 82bc83d6..50f1cc38 100644 --- a/src/views/CheckReport/components/MyEmp.vue +++ b/src/views/CheckReport/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, diff --git a/src/views/CheckReport/components/MyEmp2.vue b/src/views/CheckReport/components/MyEmp2.vue index 29b1058d..1d250784 100644 --- a/src/views/CheckReport/components/MyEmp2.vue +++ b/src/views/CheckReport/components/MyEmp2.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -270,7 +270,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CheckReport/components/MyQuality.vue b/src/views/CheckReport/components/MyQuality.vue index 4b47bd6d..79e91617 100644 --- a/src/views/CheckReport/components/MyQuality.vue +++ b/src/views/CheckReport/components/MyQuality.vue @@ -231,9 +231,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CheckReport/components/ProduceTask.vue b/src/views/CheckReport/components/ProduceTask.vue index 383c3962..7d05851a 100644 --- a/src/views/CheckReport/components/ProduceTask.vue +++ b/src/views/CheckReport/components/ProduceTask.vue @@ -219,9 +219,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CollectList/components/MyApply.vue b/src/views/CollectList/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/CollectList/components/MyApply.vue +++ b/src/views/CollectList/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CollectList/components/MyDelivery.vue b/src/views/CollectList/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/CollectList/components/MyDelivery.vue +++ b/src/views/CollectList/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CollectList/components/MyDialog.vue b/src/views/CollectList/components/MyDialog.vue index 0ed78d95..717ea9f6 100644 --- a/src/views/CollectList/components/MyDialog.vue +++ b/src/views/CollectList/components/MyDialog.vue @@ -724,9 +724,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personalForm.applyDate = new Date() @@ -751,11 +751,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId this.personalForm.installmentCount = this.productForm.installmentCount this.personalForm.installmentDays = this.productForm.installmentDays this.productForm.price = this.personalForm.totalMoney diff --git a/src/views/CollectList/components/MyEmp.vue b/src/views/CollectList/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/CollectList/components/MyEmp.vue +++ b/src/views/CollectList/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CollectList/components/MyRequire.vue b/src/views/CollectList/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/CollectList/components/MyRequire.vue +++ b/src/views/CollectList/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CollectList/index.vue b/src/views/CollectList/index.vue index e9fa2165..ebac462f 100644 --- a/src/views/CollectList/index.vue +++ b/src/views/CollectList/index.vue @@ -242,9 +242,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, time: null }, // 传给组件的数据 @@ -402,7 +401,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -410,7 +409,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/Collection/AddRecoverVehicle.vue b/src/views/Collection/AddRecoverVehicle.vue index 924589ec..88d21059 100644 --- a/src/views/Collection/AddRecoverVehicle.vue +++ b/src/views/Collection/AddRecoverVehicle.vue @@ -180,10 +180,10 @@ export default { list3: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, receiveDate: null }, // 商品信息 @@ -270,10 +270,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.getdatatime() diff --git a/src/views/Collection/CollectionList.vue b/src/views/Collection/CollectionList.vue index 6d0cb1d7..4be9d213 100644 --- a/src/views/Collection/CollectionList.vue +++ b/src/views/Collection/CollectionList.vue @@ -246,9 +246,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, stat: 4 }, // 传给组件的数据 @@ -401,7 +400,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -409,7 +408,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/Collection/RecoverVehicleList.vue b/src/views/Collection/RecoverVehicleList.vue index 984935fe..05c0ab0d 100644 --- a/src/views/Collection/RecoverVehicleList.vue +++ b/src/views/Collection/RecoverVehicleList.vue @@ -262,9 +262,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -416,7 +415,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -424,7 +423,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Collection/components/MyApply.vue b/src/views/Collection/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/Collection/components/MyApply.vue +++ b/src/views/Collection/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Collection/components/MyDelivery.vue b/src/views/Collection/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Collection/components/MyDelivery.vue +++ b/src/views/Collection/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Collection/components/MyDialog.vue b/src/views/Collection/components/MyDialog.vue index bc1e98cd..e19f7f32 100644 --- a/src/views/Collection/components/MyDialog.vue +++ b/src/views/Collection/components/MyDialog.vue @@ -286,10 +286,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.getdatatime() @@ -301,11 +301,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Collection/components/MyEmp.vue b/src/views/Collection/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Collection/components/MyEmp.vue +++ b/src/views/Collection/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Collection/components/MyInstallment.vue b/src/views/Collection/components/MyInstallment.vue index acbf3bdc..0b56e350 100644 --- a/src/views/Collection/components/MyInstallment.vue +++ b/src/views/Collection/components/MyInstallment.vue @@ -216,9 +216,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Collection/components/MyRepository.vue b/src/views/Collection/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Collection/components/MyRepository.vue +++ b/src/views/Collection/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Collection/components/MyRequire.vue b/src/views/Collection/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/Collection/components/MyRequire.vue +++ b/src/views/Collection/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Customer/components/MyEmp.vue b/src/views/Customer/components/MyEmp.vue index 71c27ab1..fdd84944 100644 --- a/src/views/Customer/components/MyEmp.vue +++ b/src/views/Customer/components/MyEmp.vue @@ -158,7 +158,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -265,7 +265,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CustomerMarketing/AddCustomerChat.vue b/src/views/CustomerMarketing/AddCustomerChat.vue index 7e090b6b..9a581ee1 100644 --- a/src/views/CustomerMarketing/AddCustomerChat.vue +++ b/src/views/CustomerMarketing/AddCustomerChat.vue @@ -108,9 +108,9 @@ export default { list2: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 商品信息 @@ -147,9 +147,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' diff --git a/src/views/CustomerMarketing/AddCustomerVisit.vue b/src/views/CustomerMarketing/AddCustomerVisit.vue index 06291565..fbc2e427 100644 --- a/src/views/CustomerMarketing/AddCustomerVisit.vue +++ b/src/views/CustomerMarketing/AddCustomerVisit.vue @@ -107,9 +107,9 @@ export default { list2: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 商品信息 @@ -160,9 +160,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' diff --git a/src/views/CustomerMarketing/CustomerChatList.vue b/src/views/CustomerMarketing/CustomerChatList.vue index be62877b..1f7966d0 100644 --- a/src/views/CustomerMarketing/CustomerChatList.vue +++ b/src/views/CustomerMarketing/CustomerChatList.vue @@ -242,9 +242,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -382,7 +381,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -390,7 +389,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/CustomerMarketing/CustomerVisitList.vue b/src/views/CustomerMarketing/CustomerVisitList.vue index 4648d082..ba0c32c5 100644 --- a/src/views/CustomerMarketing/CustomerVisitList.vue +++ b/src/views/CustomerMarketing/CustomerVisitList.vue @@ -237,9 +237,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -377,7 +376,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -385,7 +384,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/CustomerMarketing/components/MyApply.vue b/src/views/CustomerMarketing/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/CustomerMarketing/components/MyApply.vue +++ b/src/views/CustomerMarketing/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/components/MyDelivery.vue b/src/views/CustomerMarketing/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/CustomerMarketing/components/MyDelivery.vue +++ b/src/views/CustomerMarketing/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CustomerMarketing/components/MyDialog.vue b/src/views/CustomerMarketing/components/MyDialog.vue index 097ddde4..f06b7eab 100644 --- a/src/views/CustomerMarketing/components/MyDialog.vue +++ b/src/views/CustomerMarketing/components/MyDialog.vue @@ -162,9 +162,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' @@ -172,11 +172,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/CustomerMarketing/components/MyDialog2.vue b/src/views/CustomerMarketing/components/MyDialog2.vue index 02f7250b..3e3ffc65 100644 --- a/src/views/CustomerMarketing/components/MyDialog2.vue +++ b/src/views/CustomerMarketing/components/MyDialog2.vue @@ -176,9 +176,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' @@ -187,11 +187,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/CustomerMarketing/components/MyEmp.vue b/src/views/CustomerMarketing/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/CustomerMarketing/components/MyEmp.vue +++ b/src/views/CustomerMarketing/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/CustomerMarketing/components/MyInstallment.vue b/src/views/CustomerMarketing/components/MyInstallment.vue index acbf3bdc..0b56e350 100644 --- a/src/views/CustomerMarketing/components/MyInstallment.vue +++ b/src/views/CustomerMarketing/components/MyInstallment.vue @@ -216,9 +216,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/CustomerMarketing/components/MyRepository.vue b/src/views/CustomerMarketing/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/CustomerMarketing/components/MyRepository.vue +++ b/src/views/CustomerMarketing/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/CustomerMarketing/components/MyRequire.vue b/src/views/CustomerMarketing/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/CustomerMarketing/components/MyRequire.vue +++ b/src/views/CustomerMarketing/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/DailyAdjust/AddDailyAdjust.vue b/src/views/DailyAdjust/AddDailyAdjust.vue index 58e5d8c5..e37c7d45 100644 --- a/src/views/DailyAdjust/AddDailyAdjust.vue +++ b/src/views/DailyAdjust/AddDailyAdjust.vue @@ -160,9 +160,9 @@ export default { control: false, // 日常调整信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId2: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId2: this.$store.getters.repositoryId, regionId: 2 }, // 日常调整单规则数据 @@ -309,9 +309,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personId = '' diff --git a/src/views/DailyAdjust/DailyAdjustList.vue b/src/views/DailyAdjust/DailyAdjustList.vue index fa015d5f..7af32b72 100644 --- a/src/views/DailyAdjust/DailyAdjustList.vue +++ b/src/views/DailyAdjust/DailyAdjustList.vue @@ -219,10 +219,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -352,7 +351,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -360,7 +359,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/DailyAdjust/components/DeailList.vue b/src/views/DailyAdjust/components/DeailList.vue index 8484c925..93ab061f 100644 --- a/src/views/DailyAdjust/components/DeailList.vue +++ b/src/views/DailyAdjust/components/DeailList.vue @@ -289,11 +289,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/DailyAdjust/components/MyAccept.vue b/src/views/DailyAdjust/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/DailyAdjust/components/MyAccept.vue +++ b/src/views/DailyAdjust/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/DailyAdjust/components/MyCreate.vue b/src/views/DailyAdjust/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/DailyAdjust/components/MyCreate.vue +++ b/src/views/DailyAdjust/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/DailyAdjust/components/MyDelivery.vue b/src/views/DailyAdjust/components/MyDelivery.vue index 05040af3..9c2e2483 100644 --- a/src/views/DailyAdjust/components/MyDelivery.vue +++ b/src/views/DailyAdjust/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/DailyAdjust/components/MyDialog.vue b/src/views/DailyAdjust/components/MyDialog.vue index 66a403ff..dde74ec0 100644 --- a/src/views/DailyAdjust/components/MyDialog.vue +++ b/src/views/DailyAdjust/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/DailyAdjust/components/MyEdit.vue b/src/views/DailyAdjust/components/MyEdit.vue index ed51d939..6ee12a60 100644 --- a/src/views/DailyAdjust/components/MyEdit.vue +++ b/src/views/DailyAdjust/components/MyEdit.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/DailyAdjust/components/MyEmp.vue b/src/views/DailyAdjust/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/DailyAdjust/components/MyEmp.vue +++ b/src/views/DailyAdjust/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/DailyAdjust/components/MyOther.vue b/src/views/DailyAdjust/components/MyOther.vue index e76bb2a8..b90e5508 100644 --- a/src/views/DailyAdjust/components/MyOther.vue +++ b/src/views/DailyAdjust/components/MyOther.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/DailyAdjust/components/MyRepository.vue b/src/views/DailyAdjust/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/DailyAdjust/components/MyRepository.vue +++ b/src/views/DailyAdjust/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/DeliverGoods/AddDeliverGoods.vue b/src/views/DeliverGoods/AddDeliverGoods.vue new file mode 100644 index 00000000..9c16494a --- /dev/null +++ b/src/views/DeliverGoods/AddDeliverGoods.vue @@ -0,0 +1,461 @@ + + + + + diff --git a/src/views/DeliverGoods/DeliverGoodsList.vue b/src/views/DeliverGoods/DeliverGoodsList.vue new file mode 100644 index 00000000..0e6b78b3 --- /dev/null +++ b/src/views/DeliverGoods/DeliverGoodsList.vue @@ -0,0 +1,605 @@ + + + + + diff --git a/src/views/DeliverGoods/components/DetailList.vue b/src/views/DeliverGoods/components/DetailList.vue new file mode 100644 index 00000000..be49d71e --- /dev/null +++ b/src/views/DeliverGoods/components/DetailList.vue @@ -0,0 +1,363 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyAccept.vue b/src/views/DeliverGoods/components/MyAccept.vue new file mode 100644 index 00000000..b7f710ff --- /dev/null +++ b/src/views/DeliverGoods/components/MyAccept.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyAgent.vue b/src/views/DeliverGoods/components/MyAgent.vue new file mode 100644 index 00000000..ae2e5587 --- /dev/null +++ b/src/views/DeliverGoods/components/MyAgent.vue @@ -0,0 +1,357 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyApply.vue b/src/views/DeliverGoods/components/MyApply.vue new file mode 100644 index 00000000..698924ee --- /dev/null +++ b/src/views/DeliverGoods/components/MyApply.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyCustomer.vue b/src/views/DeliverGoods/components/MyCustomer.vue new file mode 100644 index 00000000..af55158e --- /dev/null +++ b/src/views/DeliverGoods/components/MyCustomer.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyDelivery.vue b/src/views/DeliverGoods/components/MyDelivery.vue new file mode 100644 index 00000000..8bce0364 --- /dev/null +++ b/src/views/DeliverGoods/components/MyDelivery.vue @@ -0,0 +1,326 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyDepot.vue b/src/views/DeliverGoods/components/MyDepot.vue new file mode 100644 index 00000000..7ec066f8 --- /dev/null +++ b/src/views/DeliverGoods/components/MyDepot.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyDetail.vue b/src/views/DeliverGoods/components/MyDetail.vue new file mode 100644 index 00000000..46e2d4e7 --- /dev/null +++ b/src/views/DeliverGoods/components/MyDetail.vue @@ -0,0 +1,315 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyDialog.vue b/src/views/DeliverGoods/components/MyDialog.vue new file mode 100644 index 00000000..15b05bf3 --- /dev/null +++ b/src/views/DeliverGoods/components/MyDialog.vue @@ -0,0 +1,480 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyEmp.vue b/src/views/DeliverGoods/components/MyEmp.vue new file mode 100644 index 00000000..911d490a --- /dev/null +++ b/src/views/DeliverGoods/components/MyEmp.vue @@ -0,0 +1,332 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyMove.vue b/src/views/DeliverGoods/components/MyMove.vue new file mode 100644 index 00000000..55064e8d --- /dev/null +++ b/src/views/DeliverGoods/components/MyMove.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyRepository.vue b/src/views/DeliverGoods/components/MyRepository.vue new file mode 100644 index 00000000..a58721e0 --- /dev/null +++ b/src/views/DeliverGoods/components/MyRepository.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MyRequire.vue b/src/views/DeliverGoods/components/MyRequire.vue new file mode 100644 index 00000000..405bffda --- /dev/null +++ b/src/views/DeliverGoods/components/MyRequire.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/views/DeliverGoods/components/MySaleout.vue b/src/views/DeliverGoods/components/MySaleout.vue new file mode 100644 index 00000000..2ad80202 --- /dev/null +++ b/src/views/DeliverGoods/components/MySaleout.vue @@ -0,0 +1,428 @@ + + + + + diff --git a/src/views/EmployeeInformation/EmployeeInformationList.vue b/src/views/EmployeeInformation/EmployeeInformationList.vue index 4ca20ae5..1c2e509f 100644 --- a/src/views/EmployeeInformation/EmployeeInformationList.vue +++ b/src/views/EmployeeInformation/EmployeeInformationList.vue @@ -164,179 +164,25 @@ - - -

个人信息

-
- - - - - - - - - - - - - - - - - - - - - - - - - {{ $t('NewEmployeeInformation.male') }} - {{ $t('NewEmployeeInformation.female') }} - - - - - - - - - - - - - - - - - - - - -
- -

联系信息

-
- - - - - - - - - - - - - - - - - - - - - - - - -
- -

公司信息

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- 修改 - 取消 -
- + + diff --git a/src/views/Expenses/AddExpenses.vue b/src/views/Expenses/AddExpenses.vue index 3eab1bf3..43e39873 100644 --- a/src/views/Expenses/AddExpenses.vue +++ b/src/views/Expenses/AddExpenses.vue @@ -153,10 +153,10 @@ export default { stockControl: false, // 收入单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1' }, // 收入单规则数据 @@ -229,10 +229,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1' } this.handlePersonId = null diff --git a/src/views/Expenses/ExpensesList.vue b/src/views/Expenses/ExpensesList.vue index 65b3dc08..68443ac5 100644 --- a/src/views/Expenses/ExpensesList.vue +++ b/src/views/Expenses/ExpensesList.vue @@ -257,9 +257,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -361,7 +360,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -369,7 +368,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Expenses/components/MyApply.vue b/src/views/Expenses/components/MyApply.vue index 099e0b49..badd0506 100644 --- a/src/views/Expenses/components/MyApply.vue +++ b/src/views/Expenses/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Expenses/components/MyDialog.vue b/src/views/Expenses/components/MyDialog.vue index acc01bdf..e9a0416f 100644 --- a/src/views/Expenses/components/MyDialog.vue +++ b/src/views/Expenses/components/MyDialog.vue @@ -244,10 +244,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1' } this.handlePersonId = null @@ -258,11 +258,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Expenses/components/MyEmp.vue b/src/views/Expenses/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Expenses/components/MyEmp.vue +++ b/src/views/Expenses/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Expenses/components/MyPlan.vue b/src/views/Expenses/components/MyPlan.vue index 457bf7fd..c35c41db 100644 --- a/src/views/Expenses/components/MyPlan.vue +++ b/src/views/Expenses/components/MyPlan.vue @@ -230,10 +230,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: 3 + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Expenses/components/MyRepository.vue b/src/views/Expenses/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Expenses/components/MyRepository.vue +++ b/src/views/Expenses/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Getauthority/index.vue b/src/views/Getauthority/index.vue index 50f222ed..d451f83d 100644 --- a/src/views/Getauthority/index.vue +++ b/src/views/Getauthority/index.vue @@ -126,7 +126,7 @@ export default { // 加载表格 listLoading: true, getemplist: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, rolename: null }, checkroleId: null diff --git a/src/views/GroupBuyRules/AddGroupBuyRules.vue b/src/views/GroupBuyRules/AddGroupBuyRules.vue index 36122475..15559a01 100644 --- a/src/views/GroupBuyRules/AddGroupBuyRules.vue +++ b/src/views/GroupBuyRules/AddGroupBuyRules.vue @@ -80,9 +80,9 @@ export default { list2: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 商品信息 @@ -119,9 +119,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' diff --git a/src/views/GroupBuyRules/components/MyApply.vue b/src/views/GroupBuyRules/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/GroupBuyRules/components/MyApply.vue +++ b/src/views/GroupBuyRules/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/GroupBuyRules/components/MyDelivery.vue b/src/views/GroupBuyRules/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/GroupBuyRules/components/MyDelivery.vue +++ b/src/views/GroupBuyRules/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/GroupBuyRules/components/MyDialog.vue b/src/views/GroupBuyRules/components/MyDialog.vue index 097ddde4..f06b7eab 100644 --- a/src/views/GroupBuyRules/components/MyDialog.vue +++ b/src/views/GroupBuyRules/components/MyDialog.vue @@ -162,9 +162,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' @@ -172,11 +172,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/GroupBuyRules/components/MyDialog2.vue b/src/views/GroupBuyRules/components/MyDialog2.vue index 02f7250b..3e3ffc65 100644 --- a/src/views/GroupBuyRules/components/MyDialog2.vue +++ b/src/views/GroupBuyRules/components/MyDialog2.vue @@ -176,9 +176,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' @@ -187,11 +187,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/GroupBuyRules/components/MyEmp.vue b/src/views/GroupBuyRules/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/GroupBuyRules/components/MyEmp.vue +++ b/src/views/GroupBuyRules/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/GroupBuyRules/components/MyInstallment.vue b/src/views/GroupBuyRules/components/MyInstallment.vue index acbf3bdc..0b56e350 100644 --- a/src/views/GroupBuyRules/components/MyInstallment.vue +++ b/src/views/GroupBuyRules/components/MyInstallment.vue @@ -216,9 +216,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/GroupBuyRules/components/MyRepository.vue b/src/views/GroupBuyRules/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/GroupBuyRules/components/MyRepository.vue +++ b/src/views/GroupBuyRules/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/GroupBuyRules/components/MyRequire.vue b/src/views/GroupBuyRules/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/GroupBuyRules/components/MyRequire.vue +++ b/src/views/GroupBuyRules/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/InstallmentApply/AddInstallmentApply.vue b/src/views/InstallmentApply/AddInstallmentApply.vue index b681604d..b91d3175 100644 --- a/src/views/InstallmentApply/AddInstallmentApply.vue +++ b/src/views/InstallmentApply/AddInstallmentApply.vue @@ -468,9 +468,9 @@ export default { matercontrol: false, // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 商品信息 @@ -713,9 +713,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personalForm.applyDate = new Date() diff --git a/src/views/InstallmentApply/InstallmentApplyList.vue b/src/views/InstallmentApply/InstallmentApplyList.vue index 9e6e92fc..5865a7f0 100644 --- a/src/views/InstallmentApply/InstallmentApplyList.vue +++ b/src/views/InstallmentApply/InstallmentApplyList.vue @@ -256,9 +256,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -410,7 +409,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -418,7 +417,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/InstallmentApply/components/MyApply.vue b/src/views/InstallmentApply/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/InstallmentApply/components/MyApply.vue +++ b/src/views/InstallmentApply/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/InstallmentApply/components/MyDelivery.vue b/src/views/InstallmentApply/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/InstallmentApply/components/MyDelivery.vue +++ b/src/views/InstallmentApply/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InstallmentApply/components/MyDialog.vue b/src/views/InstallmentApply/components/MyDialog.vue index 0ed78d95..717ea9f6 100644 --- a/src/views/InstallmentApply/components/MyDialog.vue +++ b/src/views/InstallmentApply/components/MyDialog.vue @@ -724,9 +724,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personalForm.applyDate = new Date() @@ -751,11 +751,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId this.personalForm.installmentCount = this.productForm.installmentCount this.personalForm.installmentDays = this.productForm.installmentDays this.productForm.price = this.personalForm.totalMoney diff --git a/src/views/InstallmentApply/components/MyEmp.vue b/src/views/InstallmentApply/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/InstallmentApply/components/MyEmp.vue +++ b/src/views/InstallmentApply/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InstallmentApply/components/MyRepository.vue b/src/views/InstallmentApply/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/InstallmentApply/components/MyRepository.vue +++ b/src/views/InstallmentApply/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/InstallmentApply/components/MyRequire.vue b/src/views/InstallmentApply/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/InstallmentApply/components/MyRequire.vue +++ b/src/views/InstallmentApply/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/InstallmentList/components/MyApply.vue b/src/views/InstallmentList/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/InstallmentList/components/MyApply.vue +++ b/src/views/InstallmentList/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/InstallmentList/components/MyDelivery.vue b/src/views/InstallmentList/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/InstallmentList/components/MyDelivery.vue +++ b/src/views/InstallmentList/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InstallmentList/components/MyDialog.vue b/src/views/InstallmentList/components/MyDialog.vue index 0ed78d95..717ea9f6 100644 --- a/src/views/InstallmentList/components/MyDialog.vue +++ b/src/views/InstallmentList/components/MyDialog.vue @@ -724,9 +724,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personalForm.applyDate = new Date() @@ -751,11 +751,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId this.personalForm.installmentCount = this.productForm.installmentCount this.personalForm.installmentDays = this.productForm.installmentDays this.productForm.price = this.personalForm.totalMoney diff --git a/src/views/InstallmentList/components/MyEmp.vue b/src/views/InstallmentList/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/InstallmentList/components/MyEmp.vue +++ b/src/views/InstallmentList/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InstallmentList/components/MyRequire.vue b/src/views/InstallmentList/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/InstallmentList/components/MyRequire.vue +++ b/src/views/InstallmentList/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/InstallmentList/index.vue b/src/views/InstallmentList/index.vue index d4f2d86a..dbcd981d 100644 --- a/src/views/InstallmentList/index.vue +++ b/src/views/InstallmentList/index.vue @@ -252,9 +252,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -406,7 +405,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -414,7 +413,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/Installmentrate/InstallmentrateList.vue b/src/views/Installmentrate/InstallmentrateList.vue index 259b52a8..64f52906 100644 --- a/src/views/Installmentrate/InstallmentrateList.vue +++ b/src/views/Installmentrate/InstallmentrateList.vue @@ -158,7 +158,7 @@ export default { categoryVisible: false, // 新增数据 addCategoryForm: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, countryId: 1 }, // 校验新增数据 @@ -177,7 +177,7 @@ export default { editcategoryVisible: false, // 修改数据 editCategoryForm: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, countryId: 1 }, // 校验修改数据 diff --git a/src/views/Installmentrate/overdueFineRules.vue b/src/views/Installmentrate/overdueFineRules.vue index 21e12a53..476105b9 100644 --- a/src/views/Installmentrate/overdueFineRules.vue +++ b/src/views/Installmentrate/overdueFineRules.vue @@ -159,7 +159,7 @@ export default { categoryVisible: false, // 新增数据 addCategoryForm: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, countryId: 1 }, // 校验新增数据 @@ -178,7 +178,7 @@ export default { editcategoryVisible: false, // 修改数据 editCategoryForm: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, countryId: 1 }, // 校验修改数据 diff --git a/src/views/Installmentrate/rewardRules.vue b/src/views/Installmentrate/rewardRules.vue index 82b50e21..5f88616b 100644 --- a/src/views/Installmentrate/rewardRules.vue +++ b/src/views/Installmentrate/rewardRules.vue @@ -153,7 +153,7 @@ export default { categoryVisible: false, // 新增数据 addCategoryForm: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, countryId: 1 }, // 校验新增数据 @@ -172,7 +172,7 @@ export default { editcategoryVisible: false, // 修改数据 editCategoryForm: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, countryId: 1 }, // 校验修改数据 diff --git a/src/views/InventoryCount/AddInventoryCount.vue b/src/views/InventoryCount/AddInventoryCount.vue index c38c1aa7..92afa187 100644 --- a/src/views/InventoryCount/AddInventoryCount.vue +++ b/src/views/InventoryCount/AddInventoryCount.vue @@ -141,6 +141,20 @@ export default { name: 'AddInventoryCount', components: { MyCreate, MyRepository, MyDetail }, data() { + const validatePass = (rule, value, callback) => { + if (this.handlePersonId === undefined || this.handlePersonId === null || this.handlePersonId === '') { + callback(new Error('请选择经办人')) + } else { + callback() + } + } + const validatePass2 = (rule, value, callback) => { + if (this.countRepositoryId === undefined || this.countRepositoryId === null || this.countRepositoryId === '') { + callback(new Error('请选择盘点仓库')) + } else { + callback() + } + } return { // 库存数量 out: '', @@ -179,18 +193,18 @@ export default { Time: [], // 库存盘点单信息数据 personalForm: { - repositoryId: 438, - regionId: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, countryId: 1 }, // 库存盘点单规则数据 personalrules: { handlePersonId: [ - { required: true, message: '请选择经办人', trigger: 'blue' } + { required: true, validator: validatePass, trigger: 'change' } ], countRepositoryId: [ - { required: true, message: '请选择盘点仓库', trigger: 'blue' } + { required: true, validator: validatePass2, trigger: 'change' } ] } } @@ -407,9 +421,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - repositoryId: 438, - regionId: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, countryId: 1 } this.handlePersonId = '' diff --git a/src/views/InventoryCount/InventoryCountList.vue b/src/views/InventoryCount/InventoryCountList.vue index 895a8642..073b98cf 100644 --- a/src/views/InventoryCount/InventoryCountList.vue +++ b/src/views/InventoryCount/InventoryCountList.vue @@ -211,9 +211,8 @@ export default { getemplist: { pagenum: 1, pagesize: 10, - regionIds: 43, - repositoryId: 0, - createPersonId: 3 + regionIds: this.$store.getters.regionId, + repositoryId: this.$store.getters.repositoryId }, // 传给组件的数据 personalForm: {}, @@ -334,7 +333,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -342,7 +341,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/InventoryCount/components/DetailList.vue b/src/views/InventoryCount/components/DetailList.vue index b2f1b44d..0c6e2dfb 100644 --- a/src/views/InventoryCount/components/DetailList.vue +++ b/src/views/InventoryCount/components/DetailList.vue @@ -347,11 +347,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/InventoryCount/components/MyCreate.vue b/src/views/InventoryCount/components/MyCreate.vue index 187fb6a6..190bda11 100644 --- a/src/views/InventoryCount/components/MyCreate.vue +++ b/src/views/InventoryCount/components/MyCreate.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryCount/components/MyDialog.vue b/src/views/InventoryCount/components/MyDialog.vue index 5db7e650..131bda0e 100644 --- a/src/views/InventoryCount/components/MyDialog.vue +++ b/src/views/InventoryCount/components/MyDialog.vue @@ -370,11 +370,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/InventoryCount/components/MyDriver.vue b/src/views/InventoryCount/components/MyDriver.vue index 1d93b4b9..43447fa6 100644 --- a/src/views/InventoryCount/components/MyDriver.vue +++ b/src/views/InventoryCount/components/MyDriver.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -284,7 +284,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryCount/components/MyEmp.vue b/src/views/InventoryCount/components/MyEmp.vue index 700a36b0..e91c4250 100644 --- a/src/views/InventoryCount/components/MyEmp.vue +++ b/src/views/InventoryCount/components/MyEmp.vue @@ -166,7 +166,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -274,7 +274,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryCount/components/MyRepository.vue b/src/views/InventoryCount/components/MyRepository.vue index 2557ab10..e4a7fb51 100644 --- a/src/views/InventoryCount/components/MyRepository.vue +++ b/src/views/InventoryCount/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/InventoryOverflow/AddInventoryOverflow.vue b/src/views/InventoryOverflow/AddInventoryOverflow.vue index ab4a6b1f..e5182deb 100644 --- a/src/views/InventoryOverflow/AddInventoryOverflow.vue +++ b/src/views/InventoryOverflow/AddInventoryOverflow.vue @@ -141,10 +141,10 @@ export default { control: false, // 报溢信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 报溢单规则数据 @@ -288,10 +288,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.handlePersonId = '' diff --git a/src/views/InventoryOverflow/OverflowList.vue b/src/views/InventoryOverflow/OverflowList.vue index 3d8e4db7..5a9ea876 100644 --- a/src/views/InventoryOverflow/OverflowList.vue +++ b/src/views/InventoryOverflow/OverflowList.vue @@ -227,10 +227,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -362,7 +361,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -370,7 +369,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/InventoryOverflow/components/DetailList.vue b/src/views/InventoryOverflow/components/DetailList.vue index 2e0f3040..e9bb7653 100644 --- a/src/views/InventoryOverflow/components/DetailList.vue +++ b/src/views/InventoryOverflow/components/DetailList.vue @@ -292,11 +292,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/InventoryOverflow/components/MyAccept.vue b/src/views/InventoryOverflow/components/MyAccept.vue index 1d6bd1a0..f1bea415 100644 --- a/src/views/InventoryOverflow/components/MyAccept.vue +++ b/src/views/InventoryOverflow/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryOverflow/components/MyCreate.vue b/src/views/InventoryOverflow/components/MyCreate.vue index 455f5f08..df9b0338 100644 --- a/src/views/InventoryOverflow/components/MyCreate.vue +++ b/src/views/InventoryOverflow/components/MyCreate.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryOverflow/components/MyDelivery.vue b/src/views/InventoryOverflow/components/MyDelivery.vue index 41aa63f0..f5c14889 100644 --- a/src/views/InventoryOverflow/components/MyDelivery.vue +++ b/src/views/InventoryOverflow/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryOverflow/components/MyDialog.vue b/src/views/InventoryOverflow/components/MyDialog.vue index 19f1167a..849d2539 100644 --- a/src/views/InventoryOverflow/components/MyDialog.vue +++ b/src/views/InventoryOverflow/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/InventoryOverflow/components/MyEdit.vue b/src/views/InventoryOverflow/components/MyEdit.vue index f3ca2819..316770e6 100644 --- a/src/views/InventoryOverflow/components/MyEdit.vue +++ b/src/views/InventoryOverflow/components/MyEdit.vue @@ -316,11 +316,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/InventoryOverflow/components/MyEmp.vue b/src/views/InventoryOverflow/components/MyEmp.vue index 289f1b96..53e85f94 100644 --- a/src/views/InventoryOverflow/components/MyEmp.vue +++ b/src/views/InventoryOverflow/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/InventoryOverflow/components/MyOther.vue b/src/views/InventoryOverflow/components/MyOther.vue index e76bb2a8..b90e5508 100644 --- a/src/views/InventoryOverflow/components/MyOther.vue +++ b/src/views/InventoryOverflow/components/MyOther.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/InventoryOverflow/components/MyRepository.vue b/src/views/InventoryOverflow/components/MyRepository.vue index 95998884..beffb2ee 100644 --- a/src/views/InventoryOverflow/components/MyRepository.vue +++ b/src/views/InventoryOverflow/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Inventorydamaged/AddInventorydamaged.vue b/src/views/Inventorydamaged/AddInventorydamaged.vue index 79831240..abe0ab01 100644 --- a/src/views/Inventorydamaged/AddInventorydamaged.vue +++ b/src/views/Inventorydamaged/AddInventorydamaged.vue @@ -155,9 +155,9 @@ export default { }, // 库存报损单信息数据 personalForm: { - repositoryId: 438, - regionId: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, countryId: 1 }, // 库存报损单规则数据 @@ -273,9 +273,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - repositoryId: 438, - regionId: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, countryId: 1 } this.handlePersonId = '' diff --git a/src/views/Inventorydamaged/InventorydamagedList.vue b/src/views/Inventorydamaged/InventorydamagedList.vue index 8a40181c..64eea1c9 100644 --- a/src/views/Inventorydamaged/InventorydamagedList.vue +++ b/src/views/Inventorydamaged/InventorydamagedList.vue @@ -208,9 +208,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -316,7 +315,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -324,7 +323,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Inventorydamaged/components/DetailList.vue b/src/views/Inventorydamaged/components/DetailList.vue index 7f5de549..b1127aa4 100644 --- a/src/views/Inventorydamaged/components/DetailList.vue +++ b/src/views/Inventorydamaged/components/DetailList.vue @@ -306,10 +306,10 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/Inventorydamaged/components/MyCreate.vue b/src/views/Inventorydamaged/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/Inventorydamaged/components/MyCreate.vue +++ b/src/views/Inventorydamaged/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Inventorydamaged/components/MyDialog.vue b/src/views/Inventorydamaged/components/MyDialog.vue index ed292dcb..c7486c25 100644 --- a/src/views/Inventorydamaged/components/MyDialog.vue +++ b/src/views/Inventorydamaged/components/MyDialog.vue @@ -331,10 +331,10 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/Inventorydamaged/components/MyDriver.vue b/src/views/Inventorydamaged/components/MyDriver.vue index 2457c9da..d9d8ea4f 100644 --- a/src/views/Inventorydamaged/components/MyDriver.vue +++ b/src/views/Inventorydamaged/components/MyDriver.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Inventorydamaged/components/MyEmp.vue b/src/views/Inventorydamaged/components/MyEmp.vue index 700a36b0..e91c4250 100644 --- a/src/views/Inventorydamaged/components/MyEmp.vue +++ b/src/views/Inventorydamaged/components/MyEmp.vue @@ -166,7 +166,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -274,7 +274,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Inventorydamaged/components/MyRepository.vue b/src/views/Inventorydamaged/components/MyRepository.vue index dd9e8986..bfae6e43 100644 --- a/src/views/Inventorydamaged/components/MyRepository.vue +++ b/src/views/Inventorydamaged/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Invoice/AddInvoice.vue b/src/views/Invoice/AddInvoice.vue index 402778fb..c0faca1b 100644 --- a/src/views/Invoice/AddInvoice.vue +++ b/src/views/Invoice/AddInvoice.vue @@ -206,10 +206,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 采购申请单规则数据 @@ -339,10 +339,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null diff --git a/src/views/Invoice/InvoiceList.vue b/src/views/Invoice/InvoiceList.vue index 9adcccbd..01606616 100644 --- a/src/views/Invoice/InvoiceList.vue +++ b/src/views/Invoice/InvoiceList.vue @@ -249,9 +249,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -373,7 +372,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -381,7 +380,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Invoice/components/MyApply.vue b/src/views/Invoice/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/Invoice/components/MyApply.vue +++ b/src/views/Invoice/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Invoice/components/MyArrival.vue b/src/views/Invoice/components/MyArrival.vue index c132f293..05c7ea12 100644 --- a/src/views/Invoice/components/MyArrival.vue +++ b/src/views/Invoice/components/MyArrival.vue @@ -243,9 +243,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Invoice/components/MyDelivery.vue b/src/views/Invoice/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Invoice/components/MyDelivery.vue +++ b/src/views/Invoice/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Invoice/components/MyDialog.vue b/src/views/Invoice/components/MyDialog.vue index 7190f1f2..ed7dc06b 100644 --- a/src/views/Invoice/components/MyDialog.vue +++ b/src/views/Invoice/components/MyDialog.vue @@ -354,10 +354,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -368,11 +368,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/Invoice/components/MyEmp.vue b/src/views/Invoice/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Invoice/components/MyEmp.vue +++ b/src/views/Invoice/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Invoice/components/MyLnquiry.vue b/src/views/Invoice/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/Invoice/components/MyLnquiry.vue +++ b/src/views/Invoice/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Invoice/components/MyPlan.vue b/src/views/Invoice/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/Invoice/components/MyPlan.vue +++ b/src/views/Invoice/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/LogisticsCar/AddLogisticsCar.vue b/src/views/LogisticsCar/AddLogisticsCar.vue index 70c1ecf1..af1a9f7b 100644 --- a/src/views/LogisticsCar/AddLogisticsCar.vue +++ b/src/views/LogisticsCar/AddLogisticsCar.vue @@ -198,7 +198,7 @@ export default { this.personalForm.driverNames = val }, personIds(val) { - this.personalForm.drivers = val + this.personalForm.drivers = ',' + val + ',' }, // 创建人输入框focus事件触发 handlechoosecreateman() { diff --git a/src/views/LogisticsCar/components/MyCreate.vue b/src/views/LogisticsCar/components/MyCreate.vue index 46880f5f..cf95e4bf 100644 --- a/src/views/LogisticsCar/components/MyCreate.vue +++ b/src/views/LogisticsCar/components/MyCreate.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/LogisticsCar/components/MyDriver.vue b/src/views/LogisticsCar/components/MyDriver.vue index 009d2d79..e0993ec9 100644 --- a/src/views/LogisticsCar/components/MyDriver.vue +++ b/src/views/LogisticsCar/components/MyDriver.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -264,7 +264,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/LogisticsCar/components/MyEmp.vue b/src/views/LogisticsCar/components/MyEmp.vue index 55ca6f0e..738fe8b3 100644 --- a/src/views/LogisticsCar/components/MyEmp.vue +++ b/src/views/LogisticsCar/components/MyEmp.vue @@ -177,7 +177,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -293,7 +293,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/LogisticsCar/components/MyOut.vue b/src/views/LogisticsCar/components/MyOut.vue index 089aeb63..1a1433fb 100644 --- a/src/views/LogisticsCar/components/MyOut.vue +++ b/src/views/LogisticsCar/components/MyOut.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/MaterialsList/AddMaterialsList.vue b/src/views/MaterialsList/AddMaterialsList.vue index 4b28c1c0..2ab30a4d 100644 --- a/src/views/MaterialsList/AddMaterialsList.vue +++ b/src/views/MaterialsList/AddMaterialsList.vue @@ -137,9 +137,9 @@ export default { control: false, // 物料信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 物料单规则数据 @@ -214,9 +214,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.productTypeId = null diff --git a/src/views/MaterialsList/MaterialsListli.vue b/src/views/MaterialsList/MaterialsListli.vue index e538da0d..55665ce2 100644 --- a/src/views/MaterialsList/MaterialsListli.vue +++ b/src/views/MaterialsList/MaterialsListli.vue @@ -171,9 +171,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -258,7 +257,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -266,7 +265,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/MaterialsList/components/MyDialog.vue b/src/views/MaterialsList/components/MyDialog.vue index f669b60e..96a6650c 100644 --- a/src/views/MaterialsList/components/MyDialog.vue +++ b/src/views/MaterialsList/components/MyDialog.vue @@ -206,9 +206,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.productTypeId = null @@ -216,11 +216,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/OutFactory/OutFactoryList.vue b/src/views/OutFactory/OutFactoryList.vue index 0b97bae2..67b1587c 100644 --- a/src/views/OutFactory/OutFactoryList.vue +++ b/src/views/OutFactory/OutFactoryList.vue @@ -248,7 +248,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } diff --git a/src/views/OutFactory/components/MyDelivery.vue b/src/views/OutFactory/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/OutFactory/components/MyDelivery.vue +++ b/src/views/OutFactory/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/OutSourcing/AddOutSourcing.vue b/src/views/OutSourcing/AddOutSourcing.vue index e24c1b95..5b273d44 100644 --- a/src/views/OutSourcing/AddOutSourcing.vue +++ b/src/views/OutSourcing/AddOutSourcing.vue @@ -176,9 +176,9 @@ export default { control: false, // 主生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 主生产任务规则数据 @@ -282,9 +282,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personId = null diff --git a/src/views/OutSourcing/OutSourcingList.vue b/src/views/OutSourcing/OutSourcingList.vue index f9aae085..6d38f87e 100644 --- a/src/views/OutSourcing/OutSourcingList.vue +++ b/src/views/OutSourcing/OutSourcingList.vue @@ -224,9 +224,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -333,7 +332,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -341,7 +340,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/OutSourcing/components/MyDelivery.vue b/src/views/OutSourcing/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/OutSourcing/components/MyDelivery.vue +++ b/src/views/OutSourcing/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/OutSourcing/components/MyDialog.vue b/src/views/OutSourcing/components/MyDialog.vue index 4c7f4eeb..3b02b4a2 100644 --- a/src/views/OutSourcing/components/MyDialog.vue +++ b/src/views/OutSourcing/components/MyDialog.vue @@ -298,9 +298,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.personId = null @@ -309,11 +309,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/OverdueList/index.vue b/src/views/OverdueList/index.vue index 3457b8c6..4c009418 100644 --- a/src/views/OverdueList/index.vue +++ b/src/views/OverdueList/index.vue @@ -247,9 +247,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, stat: 3 }, // 传给组件的数据 @@ -402,7 +401,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -410,7 +409,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/PrepReceipt/AddPrepReceipt.vue b/src/views/PrepReceipt/AddPrepReceipt.vue index 912c7c29..2259f9ac 100644 --- a/src/views/PrepReceipt/AddPrepReceipt.vue +++ b/src/views/PrepReceipt/AddPrepReceipt.vue @@ -186,11 +186,11 @@ export default { // 收入单信息数据 // 登陆者数据 personalForm: { - createPersonId: 3, - countryId: 1, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, currency: '1', - repositoryId: 438, - regionId: 2, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, receiptDate: null }, // 收入单规则数据 @@ -351,11 +351,11 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, currency: '1', - repositoryId: 438, - regionId: 2, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, receiptDate: null } this.receiptPersonId = null diff --git a/src/views/PrepReceipt/PrepReceiptList.vue b/src/views/PrepReceipt/PrepReceiptList.vue index d1fa9e62..27ecc7ed 100644 --- a/src/views/PrepReceipt/PrepReceiptList.vue +++ b/src/views/PrepReceipt/PrepReceiptList.vue @@ -250,9 +250,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -353,7 +352,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -361,7 +360,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/PrepReceipt/components/MyApply.vue b/src/views/PrepReceipt/components/MyApply.vue index 099e0b49..badd0506 100644 --- a/src/views/PrepReceipt/components/MyApply.vue +++ b/src/views/PrepReceipt/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/PrepReceipt/components/MyDialog.vue b/src/views/PrepReceipt/components/MyDialog.vue index 30dfb4c3..bb723175 100644 --- a/src/views/PrepReceipt/components/MyDialog.vue +++ b/src/views/PrepReceipt/components/MyDialog.vue @@ -364,11 +364,11 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, currency: '1', - repositoryId: 438, - regionId: 2, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, receiptDate: null } this.receiptPersonId = null @@ -376,11 +376,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/PrepReceipt/components/MyEmp.vue b/src/views/PrepReceipt/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/PrepReceipt/components/MyEmp.vue +++ b/src/views/PrepReceipt/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/PrepReceipt/components/MyOrder.vue b/src/views/PrepReceipt/components/MyOrder.vue index b9365e5b..7ae47c1d 100644 --- a/src/views/PrepReceipt/components/MyOrder.vue +++ b/src/views/PrepReceipt/components/MyOrder.vue @@ -240,9 +240,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/PrepReceipt/components/MyPlan.vue b/src/views/PrepReceipt/components/MyPlan.vue index 457bf7fd..c35c41db 100644 --- a/src/views/PrepReceipt/components/MyPlan.vue +++ b/src/views/PrepReceipt/components/MyPlan.vue @@ -230,10 +230,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: 3 + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/PrepReceipt/components/MyRepository.vue b/src/views/PrepReceipt/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/PrepReceipt/components/MyRepository.vue +++ b/src/views/PrepReceipt/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/ProcessFile/AddProductionFile.vue b/src/views/ProcessFile/AddProductionFile.vue index 41a5d532..fda18019 100644 --- a/src/views/ProcessFile/AddProductionFile.vue +++ b/src/views/ProcessFile/AddProductionFile.vue @@ -59,8 +59,8 @@ export default { // 工艺档案信息数据 personalForm: { createId: 3, - countryId: 1, - repositoryId: 438, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 工艺档案规则数据 @@ -82,8 +82,8 @@ export default { restAllForm() { this.personalForm = { createId: 3, - countryId: 1, - repositoryId: 438, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } }, diff --git a/src/views/ProcessFile/AddStandardProcess.vue b/src/views/ProcessFile/AddStandardProcess.vue index 231ac765..7222214c 100644 --- a/src/views/ProcessFile/AddStandardProcess.vue +++ b/src/views/ProcessFile/AddStandardProcess.vue @@ -143,9 +143,9 @@ export default { centercontrol: false, // 标准工序数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 标准工序规则数据 @@ -216,9 +216,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.productTypeId = null diff --git a/src/views/ProcessFile/AddWorkCenter.vue b/src/views/ProcessFile/AddWorkCenter.vue index 56e738b9..7bda5b11 100644 --- a/src/views/ProcessFile/AddWorkCenter.vue +++ b/src/views/ProcessFile/AddWorkCenter.vue @@ -69,8 +69,8 @@ export default { // 工作中心信息数据 personalForm: { createId: 3, - countryId: 1, - repositoryId: 438, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 工作中心规则数据 @@ -109,8 +109,8 @@ export default { restAllForm() { this.personalForm = { createId: 3, - countryId: 1, - repositoryId: 438, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } }, diff --git a/src/views/ProcessFile/ProductionFile.vue b/src/views/ProcessFile/ProductionFile.vue index 85c9c202..5f7bb0dc 100644 --- a/src/views/ProcessFile/ProductionFile.vue +++ b/src/views/ProcessFile/ProductionFile.vue @@ -158,9 +158,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProcessFile/StandardProcess.vue b/src/views/ProcessFile/StandardProcess.vue index 9b231878..f7dd13ec 100644 --- a/src/views/ProcessFile/StandardProcess.vue +++ b/src/views/ProcessFile/StandardProcess.vue @@ -201,9 +201,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给修改组件的数据 personalForm: {}, diff --git a/src/views/ProcessFile/WorkCenter.vue b/src/views/ProcessFile/WorkCenter.vue index b332ad65..73cc4905 100644 --- a/src/views/ProcessFile/WorkCenter.vue +++ b/src/views/ProcessFile/WorkCenter.vue @@ -167,9 +167,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProcessFile/components/MyCenter.vue b/src/views/ProcessFile/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/ProcessFile/components/MyCenter.vue +++ b/src/views/ProcessFile/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProcessFile/components/MyDetail.vue b/src/views/ProcessFile/components/MyDetail.vue index c4e1ac98..f34b613f 100644 --- a/src/views/ProcessFile/components/MyDetail.vue +++ b/src/views/ProcessFile/components/MyDetail.vue @@ -135,9 +135,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProcessFile/components/MyDialog.vue b/src/views/ProcessFile/components/MyDialog.vue index 73adb8dc..16a8919c 100644 --- a/src/views/ProcessFile/components/MyDialog.vue +++ b/src/views/ProcessFile/components/MyDialog.vue @@ -120,19 +120,19 @@ export default { restAllForm() { this.personalForm = { createId: 3, - countryId: 1, - repositoryId: 438, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } }, // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/ProcessFile/components/MyDialog2.vue b/src/views/ProcessFile/components/MyDialog2.vue index 07267a52..1d6f8e18 100644 --- a/src/views/ProcessFile/components/MyDialog2.vue +++ b/src/views/ProcessFile/components/MyDialog2.vue @@ -91,19 +91,19 @@ export default { restAllForm() { this.personalForm = { createId: 3, - countryId: 1, - repositoryId: 438, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } }, // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/ProcessFile/components/MyDialog3.vue b/src/views/ProcessFile/components/MyDialog3.vue index 2313cc62..db57b466 100644 --- a/src/views/ProcessFile/components/MyDialog3.vue +++ b/src/views/ProcessFile/components/MyDialog3.vue @@ -229,9 +229,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.productTypeId = null @@ -239,11 +239,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/ProducePlan/AddProducePlan.vue b/src/views/ProducePlan/AddProducePlan.vue index 5af63dc7..41124bd9 100644 --- a/src/views/ProducePlan/AddProducePlan.vue +++ b/src/views/ProducePlan/AddProducePlan.vue @@ -104,9 +104,9 @@ export default { control: false, // 主生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 主生产任务规则数据 @@ -195,9 +195,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = null diff --git a/src/views/ProducePlan/ProducePlanList.vue b/src/views/ProducePlan/ProducePlanList.vue index 9468a4af..d0423b24 100644 --- a/src/views/ProducePlan/ProducePlanList.vue +++ b/src/views/ProducePlan/ProducePlanList.vue @@ -213,9 +213,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -314,7 +313,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -322,7 +321,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ProducePlan/components/MyCenter.vue b/src/views/ProducePlan/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/ProducePlan/components/MyCenter.vue +++ b/src/views/ProducePlan/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProducePlan/components/MyDialog.vue b/src/views/ProducePlan/components/MyDialog.vue index 04cdf423..d99c215c 100644 --- a/src/views/ProducePlan/components/MyDialog.vue +++ b/src/views/ProducePlan/components/MyDialog.vue @@ -169,9 +169,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = null @@ -180,11 +180,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/ProducePlan/components/MyEmp.vue b/src/views/ProducePlan/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/ProducePlan/components/MyEmp.vue +++ b/src/views/ProducePlan/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceRequire/components/MyApply.vue b/src/views/ProduceRequire/components/MyApply.vue index c232a3c0..4f69e534 100644 --- a/src/views/ProduceRequire/components/MyApply.vue +++ b/src/views/ProduceRequire/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceRequire/components/MyCenter.vue b/src/views/ProduceRequire/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/ProduceRequire/components/MyCenter.vue +++ b/src/views/ProduceRequire/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceRequire/components/MyContract.vue b/src/views/ProduceRequire/components/MyContract.vue index 3ec3dcc1..8a85d359 100644 --- a/src/views/ProduceRequire/components/MyContract.vue +++ b/src/views/ProduceRequire/components/MyContract.vue @@ -249,10 +249,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: 3 + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceRequire/components/MyDelivery.vue b/src/views/ProduceRequire/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/ProduceRequire/components/MyDelivery.vue +++ b/src/views/ProduceRequire/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceRequire/components/MyDialog.vue b/src/views/ProduceRequire/components/MyDialog.vue index 1229c518..03b637c5 100644 --- a/src/views/ProduceRequire/components/MyDialog.vue +++ b/src/views/ProduceRequire/components/MyDialog.vue @@ -986,10 +986,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '5', currency: '1' @@ -1021,11 +1021,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/ProduceRequire/components/MyEmp.vue b/src/views/ProduceRequire/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/ProduceRequire/components/MyEmp.vue +++ b/src/views/ProduceRequire/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceRequire/components/MyLnquiry.vue b/src/views/ProduceRequire/components/MyLnquiry.vue index 155614d6..8efdf11c 100644 --- a/src/views/ProduceRequire/components/MyLnquiry.vue +++ b/src/views/ProduceRequire/components/MyLnquiry.vue @@ -252,11 +252,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: 3, - judgeStat: '' + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceRequire/components/MyPlan.vue b/src/views/ProduceRequire/components/MyPlan.vue index 0a14c5c1..ed10f967 100644 --- a/src/views/ProduceRequire/components/MyPlan.vue +++ b/src/views/ProduceRequire/components/MyPlan.vue @@ -230,10 +230,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, supplierId: this.supp, - regionIds: 2, - createPersonId: 3 + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceRequire/index.vue b/src/views/ProduceRequire/index.vue index 0f310e0d..8da2105d 100644 --- a/src/views/ProduceRequire/index.vue +++ b/src/views/ProduceRequire/index.vue @@ -280,9 +280,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, beginTime: null, endTime: null }, @@ -417,7 +416,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } diff --git a/src/views/ProduceTask/AddProduceReport.vue b/src/views/ProduceTask/AddProduceReport.vue index 8cf6d18d..8192ef95 100644 --- a/src/views/ProduceTask/AddProduceReport.vue +++ b/src/views/ProduceTask/AddProduceReport.vue @@ -336,9 +336,9 @@ export default { control: false, // 主生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 主生产任务规则数据 @@ -466,9 +466,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.workCenterId = null diff --git a/src/views/ProduceTask/AddProduceTask.vue b/src/views/ProduceTask/AddProduceTask.vue index bca3bfdb..db3d9410 100644 --- a/src/views/ProduceTask/AddProduceTask.vue +++ b/src/views/ProduceTask/AddProduceTask.vue @@ -151,9 +151,9 @@ export default { control: false, // 生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 生产任务规则数据 @@ -311,9 +311,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.produceRepositoryId = null diff --git a/src/views/ProduceTask/ProduceReportList.vue b/src/views/ProduceTask/ProduceReportList.vue index b515f85f..4acdad93 100644 --- a/src/views/ProduceTask/ProduceReportList.vue +++ b/src/views/ProduceTask/ProduceReportList.vue @@ -201,9 +201,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -307,7 +306,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -315,7 +314,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ProduceTask/ProduceTaskList.vue b/src/views/ProduceTask/ProduceTaskList.vue index fda7a17b..8a4bea01 100644 --- a/src/views/ProduceTask/ProduceTaskList.vue +++ b/src/views/ProduceTask/ProduceTaskList.vue @@ -245,9 +245,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -355,7 +354,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -363,7 +362,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/ProduceTask/components/MyCenter.vue b/src/views/ProduceTask/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/ProduceTask/components/MyCenter.vue +++ b/src/views/ProduceTask/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ProduceTask/components/MyDelivery.vue b/src/views/ProduceTask/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/ProduceTask/components/MyDelivery.vue +++ b/src/views/ProduceTask/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceTask/components/MyDialog.vue b/src/views/ProduceTask/components/MyDialog.vue index e1c86587..bdeb2d85 100644 --- a/src/views/ProduceTask/components/MyDialog.vue +++ b/src/views/ProduceTask/components/MyDialog.vue @@ -327,9 +327,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.produceRepositoryId = null @@ -340,11 +340,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/ProduceTask/components/MyDialog2.vue b/src/views/ProduceTask/components/MyDialog2.vue index f57b8924..6b6bae66 100644 --- a/src/views/ProduceTask/components/MyDialog2.vue +++ b/src/views/ProduceTask/components/MyDialog2.vue @@ -484,9 +484,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.workCenterId = null @@ -494,11 +494,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() const EnterDetail2 = this.$refs.editable2.getRecords() const EnterDetail3 = this.$refs.editable3.getRecords() diff --git a/src/views/ProduceTask/components/MyEmp.vue b/src/views/ProduceTask/components/MyEmp.vue index 68a77b96..85a50ee5 100644 --- a/src/views/ProduceTask/components/MyEmp.vue +++ b/src/views/ProduceTask/components/MyEmp.vue @@ -183,7 +183,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -304,7 +304,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ProduceTask/components/ProducePlan.vue b/src/views/ProduceTask/components/ProducePlan.vue index 094d14b5..57c65036 100644 --- a/src/views/ProduceTask/components/ProducePlan.vue +++ b/src/views/ProduceTask/components/ProducePlan.vue @@ -178,9 +178,9 @@ export default { getemplist: { pagenum: 1, pagesize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 开始时间到结束时间 date: [] diff --git a/src/views/ProduceTask/components/ProduceTask.vue b/src/views/ProduceTask/components/ProduceTask.vue index c975584c..ae4a1c05 100644 --- a/src/views/ProduceTask/components/ProduceTask.vue +++ b/src/views/ProduceTask/components/ProduceTask.vue @@ -218,9 +218,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Product/components/MyCenter.vue b/src/views/Product/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/Product/components/MyCenter.vue +++ b/src/views/Product/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Product/components/MyEmp.vue b/src/views/Product/components/MyEmp.vue index 8487db95..6a196311 100644 --- a/src/views/Product/components/MyEmp.vue +++ b/src/views/Product/components/MyEmp.vue @@ -159,7 +159,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -264,7 +264,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/QualityCheck/AddQualityCheck.vue b/src/views/QualityCheck/AddQualityCheck.vue index 69a40eef..8b1233f1 100644 --- a/src/views/QualityCheck/AddQualityCheck.vue +++ b/src/views/QualityCheck/AddQualityCheck.vue @@ -215,10 +215,10 @@ export default { producecontrol: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '3', reportDate: null @@ -400,10 +400,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null diff --git a/src/views/QualityCheck/QualityCheckList.vue b/src/views/QualityCheck/QualityCheckList.vue index 6ac0484a..9db94a91 100644 --- a/src/views/QualityCheck/QualityCheckList.vue +++ b/src/views/QualityCheck/QualityCheckList.vue @@ -255,9 +255,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -377,7 +376,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -385,7 +384,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/QualityCheck/components/MyApply.vue b/src/views/QualityCheck/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/QualityCheck/components/MyApply.vue +++ b/src/views/QualityCheck/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/QualityCheck/components/MyArrival.vue b/src/views/QualityCheck/components/MyArrival.vue index a141cc5f..c64be53d 100644 --- a/src/views/QualityCheck/components/MyArrival.vue +++ b/src/views/QualityCheck/components/MyArrival.vue @@ -247,9 +247,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp }, // 传给组件的数据 diff --git a/src/views/QualityCheck/components/MyCenter.vue b/src/views/QualityCheck/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/QualityCheck/components/MyCenter.vue +++ b/src/views/QualityCheck/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/QualityCheck/components/MyDelivery.vue b/src/views/QualityCheck/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/QualityCheck/components/MyDelivery.vue +++ b/src/views/QualityCheck/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/QualityCheck/components/MyDialog.vue b/src/views/QualityCheck/components/MyDialog.vue index 260ae3f6..25640e6b 100644 --- a/src/views/QualityCheck/components/MyDialog.vue +++ b/src/views/QualityCheck/components/MyDialog.vue @@ -412,10 +412,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -426,11 +426,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/QualityCheck/components/MyEmp.vue b/src/views/QualityCheck/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/QualityCheck/components/MyEmp.vue +++ b/src/views/QualityCheck/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/QualityCheck/components/MyLnquiry.vue b/src/views/QualityCheck/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/QualityCheck/components/MyLnquiry.vue +++ b/src/views/QualityCheck/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/QualityCheck/components/MyPlan.vue b/src/views/QualityCheck/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/QualityCheck/components/MyPlan.vue +++ b/src/views/QualityCheck/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/QualityCheck/components/ProduceTask.vue b/src/views/QualityCheck/components/ProduceTask.vue index 972ffd77..b793b20a 100644 --- a/src/views/QualityCheck/components/ProduceTask.vue +++ b/src/views/QualityCheck/components/ProduceTask.vue @@ -219,9 +219,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Receipt/AddReceipt.vue b/src/views/Receipt/AddReceipt.vue index f7b33c73..d744655f 100644 --- a/src/views/Receipt/AddReceipt.vue +++ b/src/views/Receipt/AddReceipt.vue @@ -206,10 +206,10 @@ export default { list2: [], // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1', receiptMoney: 0, deductionMoney: 0 @@ -359,10 +359,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1', receiptMoney: 0, deductionMoney: 0 diff --git a/src/views/Receipt/ReceiptList.vue b/src/views/Receipt/ReceiptList.vue index 805a1fd3..a1657e15 100644 --- a/src/views/Receipt/ReceiptList.vue +++ b/src/views/Receipt/ReceiptList.vue @@ -254,9 +254,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -408,7 +407,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -416,7 +415,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Receipt/components/MyAgentcollect.vue b/src/views/Receipt/components/MyAgentcollect.vue index 703a4f06..0a3ddd08 100644 --- a/src/views/Receipt/components/MyAgentcollect.vue +++ b/src/views/Receipt/components/MyAgentcollect.vue @@ -222,9 +222,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, time: null }, // 传给组件的数据 diff --git a/src/views/Receipt/components/MyApply.vue b/src/views/Receipt/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/Receipt/components/MyApply.vue +++ b/src/views/Receipt/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Receipt/components/MyDelivery.vue b/src/views/Receipt/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Receipt/components/MyDelivery.vue +++ b/src/views/Receipt/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Receipt/components/MyDialog.vue b/src/views/Receipt/components/MyDialog.vue index 68eed3d7..44e483cc 100644 --- a/src/views/Receipt/components/MyDialog.vue +++ b/src/views/Receipt/components/MyDialog.vue @@ -231,10 +231,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.saleRepositoryId = null @@ -251,11 +251,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/Receipt/components/MyEmp.vue b/src/views/Receipt/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Receipt/components/MyEmp.vue +++ b/src/views/Receipt/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Receipt/components/MyInstallment.vue b/src/views/Receipt/components/MyInstallment.vue index 55c8f701..61b61c86 100644 --- a/src/views/Receipt/components/MyInstallment.vue +++ b/src/views/Receipt/components/MyInstallment.vue @@ -216,9 +216,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Receipt/components/MyRequire.vue b/src/views/Receipt/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/Receipt/components/MyRequire.vue +++ b/src/views/Receipt/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Recycling/AddRecycling.vue b/src/views/Recycling/AddRecycling.vue index 890b70a2..5f2f5cb3 100644 --- a/src/views/Recycling/AddRecycling.vue +++ b/src/views/Recycling/AddRecycling.vue @@ -206,11 +206,11 @@ export default { // 收入单信息数据 // 登陆者数据 personalForm: { - createPersonId: 3, - countryId: 1, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, currency: '1', - repositoryId: 438, - regionId: 2, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, recyclingDate: null }, // 收入单规则数据 @@ -349,10 +349,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, recyclingDate: null } this.recyclingPersonId = null diff --git a/src/views/Recycling/RecyclingList.vue b/src/views/Recycling/RecyclingList.vue index 999b4454..147c7166 100644 --- a/src/views/Recycling/RecyclingList.vue +++ b/src/views/Recycling/RecyclingList.vue @@ -255,9 +255,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -358,7 +357,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -366,7 +365,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Recycling/components/MyApply.vue b/src/views/Recycling/components/MyApply.vue index 099e0b49..badd0506 100644 --- a/src/views/Recycling/components/MyApply.vue +++ b/src/views/Recycling/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Recycling/components/MyDialog.vue b/src/views/Recycling/components/MyDialog.vue index 78718bab..a424c0b3 100644 --- a/src/views/Recycling/components/MyDialog.vue +++ b/src/views/Recycling/components/MyDialog.vue @@ -368,10 +368,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, recyclingDate: null } this.recyclingPersonId = null @@ -385,11 +385,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/Recycling/components/MyEmp.vue b/src/views/Recycling/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Recycling/components/MyEmp.vue +++ b/src/views/Recycling/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Recycling/components/MyPlan.vue b/src/views/Recycling/components/MyPlan.vue index 457bf7fd..c35c41db 100644 --- a/src/views/Recycling/components/MyPlan.vue +++ b/src/views/Recycling/components/MyPlan.vue @@ -230,10 +230,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: 3 + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Recycling/components/MyRepository.vue b/src/views/Recycling/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Recycling/components/MyRepository.vue +++ b/src/views/Recycling/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Repository/NewRepository.vue b/src/views/Repository/NewRepository.vue index 49261fb1..6a50f32a 100644 --- a/src/views/Repository/NewRepository.vue +++ b/src/views/Repository/NewRepository.vue @@ -427,7 +427,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -664,7 +664,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Repository/RepositoryList.vue b/src/views/Repository/RepositoryList.vue index 6b3bbaa8..0e1e98e1 100644 --- a/src/views/Repository/RepositoryList.vue +++ b/src/views/Repository/RepositoryList.vue @@ -495,6 +495,8 @@ export default { iseffective: '', regionId: '', countyrId: '', + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, id: '', pagenum: 1, pagesize: 10 @@ -567,6 +569,8 @@ export default { pagenum: 1, pagesize: 10, stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -941,6 +945,8 @@ export default { pagenum: 1, pagesize: 10, stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/RequirePlan/AddRequirePlan.vue b/src/views/RequirePlan/AddRequirePlan.vue index f7932515..d4a87048 100644 --- a/src/views/RequirePlan/AddRequirePlan.vue +++ b/src/views/RequirePlan/AddRequirePlan.vue @@ -145,9 +145,9 @@ export default { control: false, // 主生产任务信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 主生产任务规则数据 @@ -289,9 +289,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.produceRepositoryId = null diff --git a/src/views/RequirePlan/RequirePlanList.vue b/src/views/RequirePlan/RequirePlanList.vue index 16245561..ed520710 100644 --- a/src/views/RequirePlan/RequirePlanList.vue +++ b/src/views/RequirePlan/RequirePlanList.vue @@ -225,9 +225,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -337,7 +336,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -345,7 +344,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/RequirePlan/components/MyCenter.vue b/src/views/RequirePlan/components/MyCenter.vue index cb3bf2df..67319313 100644 --- a/src/views/RequirePlan/components/MyCenter.vue +++ b/src/views/RequirePlan/components/MyCenter.vue @@ -143,9 +143,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/RequirePlan/components/MyDialog.vue b/src/views/RequirePlan/components/MyDialog.vue index 490c15c7..feeb5a0b 100644 --- a/src/views/RequirePlan/components/MyDialog.vue +++ b/src/views/RequirePlan/components/MyDialog.vue @@ -291,9 +291,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.produceRepositoryId = null @@ -304,11 +304,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/RequirePlan/components/MyEmp.vue b/src/views/RequirePlan/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/RequirePlan/components/MyEmp.vue +++ b/src/views/RequirePlan/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/RequirePlan/components/MyRepository.vue b/src/views/RequirePlan/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/RequirePlan/components/MyRepository.vue +++ b/src/views/RequirePlan/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/RequirePlan/components/ProducePlan.vue b/src/views/RequirePlan/components/ProducePlan.vue index 104d1dda..2c09d124 100644 --- a/src/views/RequirePlan/components/ProducePlan.vue +++ b/src/views/RequirePlan/components/ProducePlan.vue @@ -178,9 +178,12 @@ export default { getemplist: { pagenum: 1, pagesize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, + receiptStat: 2, + isUse: 1, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 开始时间到结束时间 date: [] diff --git a/src/views/ReturnExchange/AddReturnExchange.vue b/src/views/ReturnExchange/AddReturnExchange.vue new file mode 100644 index 00000000..9ea61a0e --- /dev/null +++ b/src/views/ReturnExchange/AddReturnExchange.vue @@ -0,0 +1,715 @@ + + + + + diff --git a/src/views/ReturnExchange/ReturnExchangeList.vue b/src/views/ReturnExchange/ReturnExchangeList.vue new file mode 100644 index 00000000..1b8d3621 --- /dev/null +++ b/src/views/ReturnExchange/ReturnExchangeList.vue @@ -0,0 +1,583 @@ + + + + + diff --git a/src/views/ReturnExchange/components/DetailList.vue b/src/views/ReturnExchange/components/DetailList.vue new file mode 100644 index 00000000..2ff32e51 --- /dev/null +++ b/src/views/ReturnExchange/components/DetailList.vue @@ -0,0 +1,415 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyAccept.vue b/src/views/ReturnExchange/components/MyAccept.vue new file mode 100644 index 00000000..b7f710ff --- /dev/null +++ b/src/views/ReturnExchange/components/MyAccept.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyAgent.vue b/src/views/ReturnExchange/components/MyAgent.vue new file mode 100644 index 00000000..ae2e5587 --- /dev/null +++ b/src/views/ReturnExchange/components/MyAgent.vue @@ -0,0 +1,357 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyApply.vue b/src/views/ReturnExchange/components/MyApply.vue new file mode 100644 index 00000000..698924ee --- /dev/null +++ b/src/views/ReturnExchange/components/MyApply.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyCustomer.vue b/src/views/ReturnExchange/components/MyCustomer.vue new file mode 100644 index 00000000..af55158e --- /dev/null +++ b/src/views/ReturnExchange/components/MyCustomer.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyDelivery.vue b/src/views/ReturnExchange/components/MyDelivery.vue new file mode 100644 index 00000000..8bce0364 --- /dev/null +++ b/src/views/ReturnExchange/components/MyDelivery.vue @@ -0,0 +1,326 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyDepot.vue b/src/views/ReturnExchange/components/MyDepot.vue new file mode 100644 index 00000000..7ec066f8 --- /dev/null +++ b/src/views/ReturnExchange/components/MyDepot.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyDetail.vue b/src/views/ReturnExchange/components/MyDetail.vue new file mode 100644 index 00000000..75515498 --- /dev/null +++ b/src/views/ReturnExchange/components/MyDetail.vue @@ -0,0 +1,310 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyDialog.vue b/src/views/ReturnExchange/components/MyDialog.vue new file mode 100644 index 00000000..063cc81f --- /dev/null +++ b/src/views/ReturnExchange/components/MyDialog.vue @@ -0,0 +1,728 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyEmp.vue b/src/views/ReturnExchange/components/MyEmp.vue new file mode 100644 index 00000000..911d490a --- /dev/null +++ b/src/views/ReturnExchange/components/MyEmp.vue @@ -0,0 +1,332 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyMove.vue b/src/views/ReturnExchange/components/MyMove.vue new file mode 100644 index 00000000..55064e8d --- /dev/null +++ b/src/views/ReturnExchange/components/MyMove.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyRepository.vue b/src/views/ReturnExchange/components/MyRepository.vue new file mode 100644 index 00000000..a58721e0 --- /dev/null +++ b/src/views/ReturnExchange/components/MyRepository.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MyRequire.vue b/src/views/ReturnExchange/components/MyRequire.vue new file mode 100644 index 00000000..405bffda --- /dev/null +++ b/src/views/ReturnExchange/components/MyRequire.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/views/ReturnExchange/components/MySaleout.vue b/src/views/ReturnExchange/components/MySaleout.vue new file mode 100644 index 00000000..91f2b5e2 --- /dev/null +++ b/src/views/ReturnExchange/components/MySaleout.vue @@ -0,0 +1,439 @@ + + + + + diff --git a/src/views/SaleContract/AddSaleContract.vue b/src/views/SaleContract/AddSaleContract.vue index 04461ad8..957199e0 100644 --- a/src/views/SaleContract/AddSaleContract.vue +++ b/src/views/SaleContract/AddSaleContract.vue @@ -25,10 +25,12 @@ + - + + @@ -38,7 +40,7 @@ - + @@ -92,7 +94,7 @@ - + @@ -128,6 +130,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,9 +308,11 @@ import MyApply from './components/MyApply' import MyPlan from './components/MyPlan' import MyDelivery from './components/MyDelivery' import MyOpportunity from './components/MyOpportunity' +import MyInstallmentapply from './components/MyInstallmentapply' +import MyCustomer from '../SaleOpportunity/components/MyCustomer' export default { name: 'AddSaleContract', - components: { MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp }, + components: { MyCustomer, MyInstallmentapply, MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp }, data() { const validatePass = (rule, value, callback) => { console.log(this.supplierId) @@ -271,6 +339,31 @@ export default { } } return { + pickerOptions0: { + disabledDate: (time) => { + if (this.personalForm.installmentEndtime !== null) { + return time.getTime() < new Date().getTime() - 8.64e7 + } else if (this.personalForm.installmentEndtime === null) { + return time.getTime() < new Date().getTime() - 8.64e7 + } + } + }, + pickerOptions1: { + disabledDate: (time) => { + return time.getTime() < new Date(this.personalForm.installmentBegintime).getTime() - 8.64e7 + } + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() < new Date().getTime() - 8.64e7 + } + }, + // 是否可以编辑分期数据 + isinstallappley: false, + // 回显客户 + customerId: '', + // 控制客户弹窗 + customercontrol: false, // 合计数据 allNumber: '', allMoney: '', @@ -278,6 +371,8 @@ export default { allIncludeTaxMoney: '', allDiscountMoney: '', allMoneyMoveDiscount: '', + // 分期申请 + installappleycontrol: false, // 交货方式 giveIds: [], // 运送方式 @@ -302,8 +397,10 @@ export default { choosedata: [], // 部门数据 depts: [], + // 销售门店 + saleRepositoryId: this.$store.getters.repositoryName, // 业务员回显 - salePersonId: '', + salePersonId: this.$store.getters.name, // 控制业务员 stockControl: false, // 类别数据 @@ -317,11 +414,17 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, - isVat: 1 + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, + salePersonId: this.$store.getters.userId, + isVat: 1, + installmentEndtime: null, + installmentBegintime: null, + notaryDate: null, + deptId: this.$store.getters.deptId, + saleRepositoryId: this.$store.getters.repositoryId }, // 采购申请单规则数据 personalrules: { @@ -359,9 +462,23 @@ export default { this.getways() }, methods: { + // 选择客户focus + chooseCustomer() { + this.customercontrol = true + }, + customerdata(val) { + this.personalForm.customerId = val.id + this.customerId = val.customerName + this.personalForm.customerPhone = val.phoneNumber + }, + clearfinal() { + this.personalForm.installmentEndtime = null + }, chooseData() { if (this.personalForm.sourceType === '1') { this.opportunitycontrol = true + } else if (this.personalForm.sourceType === '2') { + this.installappleycontrol = true } }, // 总计 @@ -484,8 +601,14 @@ export default { console.log(this.personalForm.sourceType) if (this.personalForm.sourceType === '1') { this.$refs.editable.clear() + this.personalForm.sourceNumber = '' + this.personalForm.installmentCount = '' + this.isinstallappley = true } else if (this.personalForm.sourceType === '2') { this.$refs.editable.clear() + this.personalForm.sourceNumber = '' + this.personalForm.installmentCount = '' + this.isinstallappley = false } }, // 从源单中添加商品 @@ -501,6 +624,7 @@ export default { // 从销售机会过来的源单数据 opportunityDetail(val) { console.log(val) + this.$refs.editable.clear() const nowlistdata = this.$refs.editable.getRecords() for (let i = 0; i < val.length; i++) { for (let j = 0; j < nowlistdata.length; j++) { @@ -518,11 +642,31 @@ export default { }, opportunity(val) { this.personalForm.sourceNumber = val.opportunityNumber - this.personalForm.customerName = val.customerName - this.personalForm.customerPhone = val.customerPhone this.personalForm.salePersonId = val.handlePersonId this.salePersonId = val.handlePersonName }, + installappleyDetail(val) { + console.log(val) + this.$refs.editable.clear() + const nowlistdata = this.$refs.editable.getRecords() + for (let i = 0; i < val.length; i++) { + for (let j = 0; j < nowlistdata.length; j++) { + if (val[i].sourceNumber === nowlistdata[j].sourceNumber) { + this.$notify.error({ + title: '错误', + message: '物品已添加', + offset: 100 + }) + return false + } + } + this.$refs.editable.insert(val[i]) + } + }, + installappley(val) { + this.personalForm.sourceNumber = val.applyNumber + this.personalForm.installmentCount = val.installmentCount + }, // 更新类型 updatecountry() { this.getTypes() @@ -557,8 +701,12 @@ export default { }, // 业务员回显 stockName(val) { + console.log(val) this.salePersonId = val.personName this.personalForm.salePersonId = val.id + this.personalForm.deptId = val.deptId + this.personalForm.saleRepositoryId = val.repositoryId + this.saleRepositoryId = val.repositoryName }, // 我方签约人foucs事件触发 handlechooseDelivery() { @@ -593,16 +741,23 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, - isVat: 1 + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, + salePersonId: this.$store.getters.userId, + isVat: 1, + installmentEndtime: null, + installmentBegintime: null, + notaryDate: null, + deptId: this.$store.getters.deptId, + saleRepositoryId: this.$store.getters.repositoryId } this.supplierId = null this.inquiryPersonId = null this.stockPersonId = null this.ourContractorId = null + this.isinstallappley = false }, // 保存操作 handlesave() { @@ -649,11 +804,11 @@ export default { if (elem.taxRate !== null || elem.taxRate !== '' || elem.taxRate !== undefined) { elem.taxRate = elem.taxRate / 100 } - if (elem.discountRate === null || elem.discountRate === '' || elem.discountRate === undefined) { - delete elem.discountRate + if (elem.discount === null || elem.discount === '' || elem.discount === undefined) { + delete elem.discount } - if (elem.discountRate !== null || elem.discountRate !== '' || elem.discountRate !== undefined) { - elem.discountRate = elem.discountRate / 100 + if (elem.discount !== null || elem.discount !== '' || elem.discount !== undefined) { + elem.discount = elem.discount / 100 } if (elem.money === null || elem.money === '' || elem.money === undefined) { delete elem.money @@ -724,9 +879,13 @@ export default { } - diff --git a/src/views/SaleContract/SaleContractList.vue b/src/views/SaleContract/SaleContractList.vue index cf20a959..14f7be35 100644 --- a/src/views/SaleContract/SaleContractList.vue +++ b/src/views/SaleContract/SaleContractList.vue @@ -265,9 +265,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -421,7 +420,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -429,7 +428,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SaleContract/components/MyApply.vue b/src/views/SaleContract/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/SaleContract/components/MyApply.vue +++ b/src/views/SaleContract/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleContract/components/MyDelivery.vue b/src/views/SaleContract/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleContract/components/MyDelivery.vue +++ b/src/views/SaleContract/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleContract/components/MyDialog.vue b/src/views/SaleContract/components/MyDialog.vue index f8bfb3d4..f4ab1542 100644 --- a/src/views/SaleContract/components/MyDialog.vue +++ b/src/views/SaleContract/components/MyDialog.vue @@ -24,10 +24,12 @@ + - + + @@ -37,7 +39,7 @@ - + @@ -91,7 +93,7 @@ - + @@ -127,6 +129,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241,8 +302,10 @@ import MyApply from './MyApply' import MyPlan from './MyPlan' import MyDelivery from './MyDelivery' import MyOpportunity from './MyOpportunity' +import MyInstallmentapply from './MyInstallmentapply' +import MyCustomer from '../../SaleOpportunity/components/MyCustomer' export default { - components: { MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp }, + components: { MyCustomer, MyInstallmentapply, MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp }, props: { editcontrol: { type: Boolean, @@ -279,6 +342,37 @@ export default { } } return { + pickerOptions0: { + disabledDate: (time) => { + if (this.personalForm.installmentEndtime !== null) { + return time.getTime() < new Date().getTime() - 8.64e7 + } else if (this.personalForm.installmentEndtime === null) { + return time.getTime() < new Date().getTime() - 8.64e7 + } + } + }, + pickerOptions1: { + disabledDate: (time) => { + return time.getTime() < new Date(this.personalForm.installmentBegintime).getTime() - 8.64e7 + } + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() < new Date().getTime() - 8.64e7 + } + }, + // 是否可以编辑分期数据 + isinstallappley: false, + // 回显客户 + customerId: '', + // 控制客户弹窗 + customercontrol: false, + // 分期申请 + installappleycontrol: false, + // 销售门店 + saleRepositoryId: this.$store.getters.repositoryName, + // 业务员回显 + salePersonId: this.$store.getters.name, // 选择的数据 choosedata: [], // 弹窗组件的控制 @@ -314,8 +408,6 @@ export default { empcontrol: false, // 部门数据 depts: [], - // 业务员回显 - salePersonId: '', // 控制业务员 stockControl: false, // 类别数据 @@ -375,9 +467,23 @@ export default { this.getways() }, methods: { + // 选择客户focus + chooseCustomer() { + this.customercontrol = true + }, + customerdata(val) { + this.personalForm.customerId = val.id + this.customerId = val.customerName + this.personalForm.customerPhone = val.phoneNumber + }, + clearfinal() { + this.personalForm.installmentEndtime = null + }, chooseData() { if (this.personalForm.sourceType === '1') { this.opportunitycontrol = true + } else if (this.personalForm.sourceType === '2') { + this.installappleycontrol = true } }, // 总计 @@ -500,8 +606,14 @@ export default { console.log(this.personalForm.sourceType) if (this.personalForm.sourceType === '1') { this.$refs.editable.clear() + this.personalForm.sourceNumber = '' + this.personalForm.installmentCount = '' + this.isinstallappley = true } else if (this.personalForm.sourceType === '2') { this.$refs.editable.clear() + this.personalForm.sourceNumber = '' + this.personalForm.installmentCount = '' + this.isinstallappley = false } }, // 从源单中添加商品 @@ -517,6 +629,7 @@ export default { // 从销售机会过来的源单数据 opportunityDetail(val) { console.log(val) + this.$refs.editable.clear() const nowlistdata = this.$refs.editable.getRecords() for (let i = 0; i < val.length; i++) { for (let j = 0; j < nowlistdata.length; j++) { @@ -534,11 +647,31 @@ export default { }, opportunity(val) { this.personalForm.sourceNumber = val.opportunityNumber - this.personalForm.customerName = val.customerName - this.personalForm.customerPhone = val.customerPhone this.personalForm.salePersonId = val.handlePersonId this.salePersonId = val.handlePersonName }, + installappleyDetail(val) { + console.log(val) + this.$refs.editable.clear() + const nowlistdata = this.$refs.editable.getRecords() + for (let i = 0; i < val.length; i++) { + for (let j = 0; j < nowlistdata.length; j++) { + if (val[i].sourceNumber === nowlistdata[j].sourceNumber) { + this.$notify.error({ + title: '错误', + message: '物品已添加', + offset: 100 + }) + return false + } + } + this.$refs.editable.insert(val[i]) + } + }, + installappley(val) { + this.personalForm.sourceNumber = val.applyNumber + this.personalForm.installmentCount = val.installmentCount + }, // 更新类型 updatecountry() { this.getTypes() @@ -573,8 +706,12 @@ export default { }, // 业务员回显 stockName(val) { + console.log(val) this.salePersonId = val.personName this.personalForm.salePersonId = val.id + this.personalForm.deptId = val.deptId + this.personalForm.saleRepositoryId = val.repositoryId + this.saleRepositoryId = val.repositoryName }, // 我方签约人foucs事件触发 handlechooseDelivery() { @@ -609,10 +746,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -623,11 +760,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem @@ -671,11 +808,11 @@ export default { if (elem.taxRate !== null || elem.taxRate !== '' || elem.taxRate !== undefined) { elem.taxRate = elem.taxRate / 100 } - if (elem.discountRate === null || elem.discountRate === '' || elem.discountRate === undefined) { - delete elem.discountRate + if (elem.discount === null || elem.discount === '' || elem.discount === undefined) { + delete elem.discount } - if (elem.discountRate !== null || elem.discountRate !== '' || elem.discountRate !== undefined) { - elem.discountRate = elem.discountRate / 100 + if (elem.discount !== null || elem.discount !== '' || elem.discount !== undefined) { + elem.discount = elem.discount / 100 } if (elem.money === null || elem.money === '' || elem.money === undefined) { delete elem.money @@ -736,7 +873,7 @@ export default { } - diff --git a/src/views/SaleContract/components/MyLnquiry.vue b/src/views/SaleContract/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/SaleContract/components/MyLnquiry.vue +++ b/src/views/SaleContract/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleContract/components/MyOpportunity.vue b/src/views/SaleContract/components/MyOpportunity.vue index 4b364090..63dca506 100644 --- a/src/views/SaleContract/components/MyOpportunity.vue +++ b/src/views/SaleContract/components/MyOpportunity.vue @@ -232,9 +232,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleContract/components/MyPlan.vue b/src/views/SaleContract/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/SaleContract/components/MyPlan.vue +++ b/src/views/SaleContract/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOpportunity/AddSaleOpportunity.vue b/src/views/SaleOpportunity/AddSaleOpportunity.vue index efbf3883..140a2ef2 100644 --- a/src/views/SaleOpportunity/AddSaleOpportunity.vue +++ b/src/views/SaleOpportunity/AddSaleOpportunity.vue @@ -195,10 +195,10 @@ export default { control: false, // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1', isSale: '1' }, @@ -298,10 +298,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1', isSale: '1' } diff --git a/src/views/SaleOpportunity/SaleOpportunityList.vue b/src/views/SaleOpportunity/SaleOpportunityList.vue index 722e1779..64e99397 100644 --- a/src/views/SaleOpportunity/SaleOpportunityList.vue +++ b/src/views/SaleOpportunity/SaleOpportunityList.vue @@ -268,9 +268,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -415,7 +414,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -423,7 +422,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/SaleOpportunity/components/MyApply.vue b/src/views/SaleOpportunity/components/MyApply.vue index 50be2ea5..e35da9c6 100644 --- a/src/views/SaleOpportunity/components/MyApply.vue +++ b/src/views/SaleOpportunity/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOpportunity/components/MyDelivery.vue b/src/views/SaleOpportunity/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleOpportunity/components/MyDelivery.vue +++ b/src/views/SaleOpportunity/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOpportunity/components/MyDialog.vue b/src/views/SaleOpportunity/components/MyDialog.vue index 24251671..90ff8d30 100644 --- a/src/views/SaleOpportunity/components/MyDialog.vue +++ b/src/views/SaleOpportunity/components/MyDialog.vue @@ -345,10 +345,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1', isSale: '1' } @@ -358,11 +358,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/SaleOpportunity/components/MyEmp.vue b/src/views/SaleOpportunity/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SaleOpportunity/components/MyEmp.vue +++ b/src/views/SaleOpportunity/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOpportunity/components/MyRequire.vue b/src/views/SaleOpportunity/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/SaleOpportunity/components/MyRequire.vue +++ b/src/views/SaleOpportunity/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOrder/AddSaleOrder.vue b/src/views/SaleOrder/AddSaleOrder.vue index 2dbe64e5..394b4d30 100644 --- a/src/views/SaleOrder/AddSaleOrder.vue +++ b/src/views/SaleOrder/AddSaleOrder.vue @@ -429,10 +429,10 @@ export default { control: false, // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1', backType: '2', backMoney: '0.00', @@ -644,10 +644,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1', backType: '2', backMoney: '0.00', diff --git a/src/views/SaleOrder/SaleOrderList.vue b/src/views/SaleOrder/SaleOrderList.vue index a011c753..359207f8 100644 --- a/src/views/SaleOrder/SaleOrderList.vue +++ b/src/views/SaleOrder/SaleOrderList.vue @@ -265,9 +265,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -421,7 +420,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -429,7 +428,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SaleOrder/components/MyApply.vue b/src/views/SaleOrder/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/SaleOrder/components/MyApply.vue +++ b/src/views/SaleOrder/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOrder/components/MyDelivery.vue b/src/views/SaleOrder/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleOrder/components/MyDelivery.vue +++ b/src/views/SaleOrder/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOrder/components/MyDialog.vue b/src/views/SaleOrder/components/MyDialog.vue index 1fb2d931..c24f9660 100644 --- a/src/views/SaleOrder/components/MyDialog.vue +++ b/src/views/SaleOrder/components/MyDialog.vue @@ -624,9 +624,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.customerId = null @@ -635,11 +635,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() const EnterDetail2 = this.$refs.editable2.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/SaleOrder/components/MyEmp.vue b/src/views/SaleOrder/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SaleOrder/components/MyEmp.vue +++ b/src/views/SaleOrder/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOrder/components/MyRequire.vue b/src/views/SaleOrder/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/SaleOrder/components/MyRequire.vue +++ b/src/views/SaleOrder/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/AddSaleOut.vue b/src/views/SaleOut/AddSaleOut.vue index 24f7520c..f96debee 100644 --- a/src/views/SaleOut/AddSaleOut.vue +++ b/src/views/SaleOut/AddSaleOut.vue @@ -533,10 +533,10 @@ export default { control: false, // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1', sendType: '2', sendDate: null, @@ -917,6 +917,7 @@ export default { } }, opportunity(val) { + console.log(val) if (val.customerType !== null && val.customerType !== undefined && val.customerType !== '') { this.personalForm.customerType = String(val.customerType) } @@ -1005,10 +1006,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1', sendType: '2', sendDate: null, diff --git a/src/views/SaleOut/SaleOutList.vue b/src/views/SaleOut/SaleOutList.vue index d7286cfc..fd549be7 100644 --- a/src/views/SaleOut/SaleOutList.vue +++ b/src/views/SaleOut/SaleOutList.vue @@ -258,9 +258,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -437,7 +436,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -445,7 +444,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SaleOut/components/MyAccept.vue b/src/views/SaleOut/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/SaleOut/components/MyAccept.vue +++ b/src/views/SaleOut/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOut/components/MyAdvance.vue b/src/views/SaleOut/components/MyAdvance.vue index 2896538d..86c413e2 100644 --- a/src/views/SaleOut/components/MyAdvance.vue +++ b/src/views/SaleOut/components/MyAdvance.vue @@ -202,9 +202,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/components/MyApply.vue b/src/views/SaleOut/components/MyApply.vue index 716007a5..f9000522 100644 --- a/src/views/SaleOut/components/MyApply.vue +++ b/src/views/SaleOut/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/components/MyDelivery.vue b/src/views/SaleOut/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleOut/components/MyDelivery.vue +++ b/src/views/SaleOut/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOut/components/MyDialog.vue b/src/views/SaleOut/components/MyDialog.vue index 65d1a2c0..690ef574 100644 --- a/src/views/SaleOut/components/MyDialog.vue +++ b/src/views/SaleOut/components/MyDialog.vue @@ -1036,10 +1036,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1', sendType: '2', sendDate: null, @@ -1056,11 +1056,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() const EnterDetail2 = this.$refs.editable2.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/SaleOut/components/MyEmp.vue b/src/views/SaleOut/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SaleOut/components/MyEmp.vue +++ b/src/views/SaleOut/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleOut/components/MyOpportunity.vue b/src/views/SaleOut/components/MyOpportunity.vue index 342897db..b8be0ef8 100644 --- a/src/views/SaleOut/components/MyOpportunity.vue +++ b/src/views/SaleOut/components/MyOpportunity.vue @@ -232,9 +232,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + isUse: 1, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/components/MyOrder.vue b/src/views/SaleOut/components/MyOrder.vue index 9cfd3b32..c7e563ff 100644 --- a/src/views/SaleOut/components/MyOrder.vue +++ b/src/views/SaleOut/components/MyOrder.vue @@ -240,9 +240,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/components/MyPresale.vue b/src/views/SaleOut/components/MyPresale.vue index 6de6b1dd..28313957 100644 --- a/src/views/SaleOut/components/MyPresale.vue +++ b/src/views/SaleOut/components/MyPresale.vue @@ -225,9 +225,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, + receiptStat: 2, + isUse: 1, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleOut/components/MyRepository.vue b/src/views/SaleOut/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/SaleOut/components/MyRepository.vue +++ b/src/views/SaleOut/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/SaleOut/components/MyRequire.vue b/src/views/SaleOut/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/SaleOut/components/MyRequire.vue +++ b/src/views/SaleOut/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SalePlan/AddSalePlan.vue b/src/views/SalePlan/AddSalePlan.vue index 83b0e4d7..2e61036a 100644 --- a/src/views/SalePlan/AddSalePlan.vue +++ b/src/views/SalePlan/AddSalePlan.vue @@ -236,10 +236,10 @@ export default { control: false, // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, beginTime: null, endTime: null }, @@ -700,9 +700,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.customerId = null diff --git a/src/views/SalePlan/SalePlanList.vue b/src/views/SalePlan/SalePlanList.vue index 82152ac5..5fd507be 100644 --- a/src/views/SalePlan/SalePlanList.vue +++ b/src/views/SalePlan/SalePlanList.vue @@ -258,9 +258,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -417,7 +416,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -425,7 +424,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SalePlan/components/MyApply.vue b/src/views/SalePlan/components/MyApply.vue index 50be2ea5..e35da9c6 100644 --- a/src/views/SalePlan/components/MyApply.vue +++ b/src/views/SalePlan/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SalePlan/components/MyDelivery.vue b/src/views/SalePlan/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SalePlan/components/MyDelivery.vue +++ b/src/views/SalePlan/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SalePlan/components/MyDialog.vue b/src/views/SalePlan/components/MyDialog.vue index bdd146a2..21a816e6 100644 --- a/src/views/SalePlan/components/MyDialog.vue +++ b/src/views/SalePlan/components/MyDialog.vue @@ -713,9 +713,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.customerId = null @@ -740,11 +740,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.treeToList(this.data2) // 输出转换后数组 console.log(EnterDetail) console.log(EnterDetail) diff --git a/src/views/SalePlan/components/MyEmp.vue b/src/views/SalePlan/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SalePlan/components/MyEmp.vue +++ b/src/views/SalePlan/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SalePlan/components/MyRequire.vue b/src/views/SalePlan/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/SalePlan/components/MyRequire.vue +++ b/src/views/SalePlan/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleReturn/AddSaleReturn.vue b/src/views/SaleReturn/AddSaleReturn.vue index f3b50ed0..cab0062f 100644 --- a/src/views/SaleReturn/AddSaleReturn.vue +++ b/src/views/SaleReturn/AddSaleReturn.vue @@ -327,10 +327,10 @@ export default { control: false, // 销售订单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, customerType: '1' }, // 销售订单规则数据 @@ -565,9 +565,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.customerId = null diff --git a/src/views/SaleReturn/SaleReturnList.vue b/src/views/SaleReturn/SaleReturnList.vue index 0d44d8fe..5cb97781 100644 --- a/src/views/SaleReturn/SaleReturnList.vue +++ b/src/views/SaleReturn/SaleReturnList.vue @@ -280,9 +280,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -433,7 +432,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -441,7 +440,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/SaleReturn/components/MyApply.vue b/src/views/SaleReturn/components/MyApply.vue index 50be2ea5..e35da9c6 100644 --- a/src/views/SaleReturn/components/MyApply.vue +++ b/src/views/SaleReturn/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/SaleReturn/components/MyDelivery.vue b/src/views/SaleReturn/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/SaleReturn/components/MyDelivery.vue +++ b/src/views/SaleReturn/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleReturn/components/MyDialog.vue b/src/views/SaleReturn/components/MyDialog.vue index 0aacd537..ab96c68f 100644 --- a/src/views/SaleReturn/components/MyDialog.vue +++ b/src/views/SaleReturn/components/MyDialog.vue @@ -580,9 +580,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.customerId = null @@ -591,11 +591,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/SaleReturn/components/MyEmp.vue b/src/views/SaleReturn/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/SaleReturn/components/MyEmp.vue +++ b/src/views/SaleReturn/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/SaleReturn/components/MyRequire.vue b/src/views/SaleReturn/components/MyRequire.vue index b7a0b953..405bffda 100644 --- a/src/views/SaleReturn/components/MyRequire.vue +++ b/src/views/SaleReturn/components/MyRequire.vue @@ -197,9 +197,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ShouldPayList/components/MyApply.vue b/src/views/ShouldPayList/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/ShouldPayList/components/MyApply.vue +++ b/src/views/ShouldPayList/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ShouldPayList/components/MyDelivery.vue b/src/views/ShouldPayList/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/ShouldPayList/components/MyDelivery.vue +++ b/src/views/ShouldPayList/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ShouldPayList/components/MyDialog.vue b/src/views/ShouldPayList/components/MyDialog.vue index 16058751..eb53ba29 100644 --- a/src/views/ShouldPayList/components/MyDialog.vue +++ b/src/views/ShouldPayList/components/MyDialog.vue @@ -386,10 +386,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -401,11 +401,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/ShouldPayList/components/MyEmp.vue b/src/views/ShouldPayList/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/ShouldPayList/components/MyEmp.vue +++ b/src/views/ShouldPayList/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/ShouldPayList/components/MyLnquiry.vue b/src/views/ShouldPayList/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/ShouldPayList/components/MyLnquiry.vue +++ b/src/views/ShouldPayList/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ShouldPayList/components/MyOrder.vue b/src/views/ShouldPayList/components/MyOrder.vue index 065e7de5..33e1fed1 100644 --- a/src/views/ShouldPayList/components/MyOrder.vue +++ b/src/views/ShouldPayList/components/MyOrder.vue @@ -245,9 +245,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ShouldPayList/components/MyPlan.vue b/src/views/ShouldPayList/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/ShouldPayList/components/MyPlan.vue +++ b/src/views/ShouldPayList/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/ShouldPayList/index.vue b/src/views/ShouldPayList/index.vue index 8f352a41..c68909ab 100644 --- a/src/views/ShouldPayList/index.vue +++ b/src/views/ShouldPayList/index.vue @@ -218,9 +218,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -342,7 +341,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } diff --git a/src/views/SmartReplenishment/SmartReplenishmentList.vue b/src/views/SmartReplenishment/SmartReplenishmentList.vue index f4c90abd..bd5eb63b 100644 --- a/src/views/SmartReplenishment/SmartReplenishmentList.vue +++ b/src/views/SmartReplenishment/SmartReplenishmentList.vue @@ -256,9 +256,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, @@ -359,7 +359,7 @@ export default { // console.log(row) // if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { // const approvalUse = row.approvalUseVos - // if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + // if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { // return true // } // } @@ -367,7 +367,7 @@ export default { // // 审批操作 // handleReview(row) { // this.reviewParms.id = row.id - // this.reviewParms.judgePersonId = this.getemplist.createPersonId + // this.reviewParms.judgePersonId = this.$store.getters.userId // this.$confirm('请审核', '审核', { // distinguishCancelAndClose: true, // confirmButtonText: '通过', diff --git a/src/views/StockAlarm/BatchAlarm.vue b/src/views/StockAlarm/BatchAlarm.vue index 45995209..96954add 100644 --- a/src/views/StockAlarm/BatchAlarm.vue +++ b/src/views/StockAlarm/BatchAlarm.vue @@ -136,10 +136,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- diff --git a/src/views/StockAlarm/SearchStockAlarmRules.vue b/src/views/StockAlarm/SearchStockAlarmRules.vue index 2798a83f..9094e0d7 100644 --- a/src/views/StockAlarm/SearchStockAlarmRules.vue +++ b/src/views/StockAlarm/SearchStockAlarmRules.vue @@ -148,10 +148,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId2: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId2: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -224,10 +223,10 @@ export default { this.getemplist = { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId2: 438, - regionIds: 2 + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId2: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId } }, // 清空搜索条件 diff --git a/src/views/StockAlarm/StockAlarmList.vue b/src/views/StockAlarm/StockAlarmList.vue index ff7a6e31..c32baa12 100644 --- a/src/views/StockAlarm/StockAlarmList.vue +++ b/src/views/StockAlarm/StockAlarmList.vue @@ -138,10 +138,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- diff --git a/src/views/StockAlarm/components/MyAccept.vue b/src/views/StockAlarm/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/StockAlarm/components/MyAccept.vue +++ b/src/views/StockAlarm/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyCreate.vue b/src/views/StockAlarm/components/MyCreate.vue index 1561e346..0599dfcc 100644 --- a/src/views/StockAlarm/components/MyCreate.vue +++ b/src/views/StockAlarm/components/MyCreate.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyDelivery.vue b/src/views/StockAlarm/components/MyDelivery.vue index 05040af3..9c2e2483 100644 --- a/src/views/StockAlarm/components/MyDelivery.vue +++ b/src/views/StockAlarm/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyDialog.vue b/src/views/StockAlarm/components/MyDialog.vue index 9ca7a683..64ff53b6 100644 --- a/src/views/StockAlarm/components/MyDialog.vue +++ b/src/views/StockAlarm/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/StockAlarm/components/MyEdit.vue b/src/views/StockAlarm/components/MyEdit.vue index 7ba8b2a0..13afd4ab 100644 --- a/src/views/StockAlarm/components/MyEdit.vue +++ b/src/views/StockAlarm/components/MyEdit.vue @@ -294,11 +294,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/StockAlarm/components/MyEmp.vue b/src/views/StockAlarm/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/StockAlarm/components/MyEmp.vue +++ b/src/views/StockAlarm/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockAlarm/components/MyOther.vue b/src/views/StockAlarm/components/MyOther.vue index e76bb2a8..b90e5508 100644 --- a/src/views/StockAlarm/components/MyOther.vue +++ b/src/views/StockAlarm/components/MyOther.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/StockAlarm/components/MyRepository.vue b/src/views/StockAlarm/components/MyRepository.vue index 83d4d5a0..3e80fc55 100644 --- a/src/views/StockAlarm/components/MyRepository.vue +++ b/src/views/StockAlarm/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/StockAlarm/components/MyRules.vue b/src/views/StockAlarm/components/MyRules.vue index 4f411b6c..1c398cae 100644 --- a/src/views/StockAlarm/components/MyRules.vue +++ b/src/views/StockAlarm/components/MyRules.vue @@ -126,12 +126,12 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId this.personalForm.createId = 3 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/StockApply/AddStockApply.vue b/src/views/StockApply/AddStockApply.vue index c8791a1d..2558f518 100644 --- a/src/views/StockApply/AddStockApply.vue +++ b/src/views/StockApply/AddStockApply.vue @@ -217,11 +217,11 @@ export default { // 采购申请单信息数据 personalForm: { applyPersonId: 3, - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, applyDeptId: 1, - regionId: 2, + regionId: this.$store.getters.regionId, sourceType: '1', applyDate: null }, @@ -441,10 +441,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.applyPersonId = null diff --git a/src/views/StockApply/StockApplyList.vue b/src/views/StockApply/StockApplyList.vue index 6a67e08c..8a2f2de5 100644 --- a/src/views/StockApply/StockApplyList.vue +++ b/src/views/StockApply/StockApplyList.vue @@ -259,9 +259,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -364,7 +363,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -372,7 +371,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockApply/components/MyDialog.vue b/src/views/StockApply/components/MyDialog.vue index 66b0a995..4fa01989 100644 --- a/src/views/StockApply/components/MyDialog.vue +++ b/src/views/StockApply/components/MyDialog.vue @@ -415,10 +415,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.applyPersonId = null @@ -426,11 +426,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() const EnterDetail2 = this.$refs.editable2.getRecords() for (let i = 0; i < EnterDetail.length; i++) { diff --git a/src/views/StockApply/components/MyEmp.vue b/src/views/StockApply/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockApply/components/MyEmp.vue +++ b/src/views/StockApply/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockApply/components/MyOrder.vue b/src/views/StockApply/components/MyOrder.vue index e5a5f935..6c266f6e 100644 --- a/src/views/StockApply/components/MyOrder.vue +++ b/src/views/StockApply/components/MyOrder.vue @@ -240,9 +240,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockArrival/AddStockArrival.vue b/src/views/StockArrival/AddStockArrival.vue index 87daa5d6..b9fc8121 100644 --- a/src/views/StockArrival/AddStockArrival.vue +++ b/src/views/StockArrival/AddStockArrival.vue @@ -332,10 +332,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '2', currencyId: '1', @@ -600,10 +600,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null diff --git a/src/views/StockArrival/StockArrivalList.vue b/src/views/StockArrival/StockArrivalList.vue index 43b3d47f..10098c2a 100644 --- a/src/views/StockArrival/StockArrivalList.vue +++ b/src/views/StockArrival/StockArrivalList.vue @@ -260,9 +260,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -383,7 +382,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -391,7 +390,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockArrival/components/MyApply.vue b/src/views/StockArrival/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/StockArrival/components/MyApply.vue +++ b/src/views/StockArrival/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockArrival/components/MyDelivery.vue b/src/views/StockArrival/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockArrival/components/MyDelivery.vue +++ b/src/views/StockArrival/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockArrival/components/MyDialog.vue b/src/views/StockArrival/components/MyDialog.vue index 6160d4ba..1ab49d79 100644 --- a/src/views/StockArrival/components/MyDialog.vue +++ b/src/views/StockArrival/components/MyDialog.vue @@ -596,10 +596,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -611,11 +611,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/StockArrival/components/MyEmp.vue b/src/views/StockArrival/components/MyEmp.vue index 82bc83d6..50f1cc38 100644 --- a/src/views/StockArrival/components/MyEmp.vue +++ b/src/views/StockArrival/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, diff --git a/src/views/StockArrival/components/MyLnquiry.vue b/src/views/StockArrival/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/StockArrival/components/MyLnquiry.vue +++ b/src/views/StockArrival/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockArrival/components/MyOrder.vue b/src/views/StockArrival/components/MyOrder.vue index c41a741c..5cbd7a61 100644 --- a/src/views/StockArrival/components/MyOrder.vue +++ b/src/views/StockArrival/components/MyOrder.vue @@ -249,10 +249,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - supplierId: this.supp, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + supplierId: this.supp }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockArrival/components/MyPlan.vue b/src/views/StockArrival/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/StockArrival/components/MyPlan.vue +++ b/src/views/StockArrival/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockContract/AddStockContract.vue b/src/views/StockContract/AddStockContract.vue index b4de35ee..8f7abbad 100644 --- a/src/views/StockContract/AddStockContract.vue +++ b/src/views/StockContract/AddStockContract.vue @@ -379,10 +379,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 }, // 采购申请单规则数据 @@ -705,10 +705,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null diff --git a/src/views/StockContract/StockContractList.vue b/src/views/StockContract/StockContractList.vue index f5624ce9..b0c35354 100644 --- a/src/views/StockContract/StockContractList.vue +++ b/src/views/StockContract/StockContractList.vue @@ -270,9 +270,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -390,7 +389,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -398,7 +397,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockContract/components/MyApply.vue b/src/views/StockContract/components/MyApply.vue index 3a466ebf..12310b8f 100644 --- a/src/views/StockContract/components/MyApply.vue +++ b/src/views/StockContract/components/MyApply.vue @@ -232,9 +232,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockContract/components/MyDelivery.vue b/src/views/StockContract/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockContract/components/MyDelivery.vue +++ b/src/views/StockContract/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockContract/components/MyDialog.vue b/src/views/StockContract/components/MyDialog.vue index 56eb4089..96df5389 100644 --- a/src/views/StockContract/components/MyDialog.vue +++ b/src/views/StockContract/components/MyDialog.vue @@ -699,10 +699,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -713,11 +713,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/StockContract/components/MyEmp.vue b/src/views/StockContract/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockContract/components/MyEmp.vue +++ b/src/views/StockContract/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockContract/components/MyLnquiry.vue b/src/views/StockContract/components/MyLnquiry.vue index 1ac29aba..e82e1fbd 100644 --- a/src/views/StockContract/components/MyLnquiry.vue +++ b/src/views/StockContract/components/MyLnquiry.vue @@ -248,10 +248,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockContract/components/MyPlan.vue b/src/views/StockContract/components/MyPlan.vue index 02a48b31..8ca72951 100644 --- a/src/views/StockContract/components/MyPlan.vue +++ b/src/views/StockContract/components/MyPlan.vue @@ -226,9 +226,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockInquiry/AddStockInquiry.vue b/src/views/StockInquiry/AddStockInquiry.vue index 4d7d3667..6966ccb9 100644 --- a/src/views/StockInquiry/AddStockInquiry.vue +++ b/src/views/StockInquiry/AddStockInquiry.vue @@ -348,10 +348,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, inquiryTimes: 1, currency: '1', @@ -662,10 +662,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null diff --git a/src/views/StockInquiry/StockInquiryList.vue b/src/views/StockInquiry/StockInquiryList.vue index 013b0b72..3aad8824 100644 --- a/src/views/StockInquiry/StockInquiryList.vue +++ b/src/views/StockInquiry/StockInquiryList.vue @@ -275,9 +275,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -395,7 +394,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -403,7 +402,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockInquiry/components/MyApply.vue b/src/views/StockInquiry/components/MyApply.vue index 099e0b49..a0bff7a0 100644 --- a/src/views/StockInquiry/components/MyApply.vue +++ b/src/views/StockInquiry/components/MyApply.vue @@ -232,9 +232,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockInquiry/components/MyDialog.vue b/src/views/StockInquiry/components/MyDialog.vue index 70cfbb3d..29421be2 100644 --- a/src/views/StockInquiry/components/MyDialog.vue +++ b/src/views/StockInquiry/components/MyDialog.vue @@ -638,10 +638,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -650,11 +650,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/StockInquiry/components/MyEmp.vue b/src/views/StockInquiry/components/MyEmp.vue index 82bc83d6..50f1cc38 100644 --- a/src/views/StockInquiry/components/MyEmp.vue +++ b/src/views/StockInquiry/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, diff --git a/src/views/StockInquiry/components/MyPlan.vue b/src/views/StockInquiry/components/MyPlan.vue index 457bf7fd..3c61709c 100644 --- a/src/views/StockInquiry/components/MyPlan.vue +++ b/src/views/StockInquiry/components/MyPlan.vue @@ -230,10 +230,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - supplierId: this.supp, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + supplierId: this.supp }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/AddStockOrder.vue b/src/views/StockOrder/AddStockOrder.vue index b831c2f5..83cc2d34 100644 --- a/src/views/StockOrder/AddStockOrder.vue +++ b/src/views/StockOrder/AddStockOrder.vue @@ -409,10 +409,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '5', currency: '1', @@ -989,10 +989,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '5', currency: '1' diff --git a/src/views/StockOrder/StockOrderList.vue b/src/views/StockOrder/StockOrderList.vue index cace7e87..1431e216 100644 --- a/src/views/StockOrder/StockOrderList.vue +++ b/src/views/StockOrder/StockOrderList.vue @@ -272,9 +272,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -395,7 +394,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -403,7 +402,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockOrder/components/MyApply.vue b/src/views/StockOrder/components/MyApply.vue index c232a3c0..13c6bd54 100644 --- a/src/views/StockOrder/components/MyApply.vue +++ b/src/views/StockOrder/components/MyApply.vue @@ -232,9 +232,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/components/MyContract.vue b/src/views/StockOrder/components/MyContract.vue index 3ec3dcc1..e4b75d5d 100644 --- a/src/views/StockOrder/components/MyContract.vue +++ b/src/views/StockOrder/components/MyContract.vue @@ -249,10 +249,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - supplierId: this.supp, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + supplierId: this.supp }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/components/MyDelivery.vue b/src/views/StockOrder/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockOrder/components/MyDelivery.vue +++ b/src/views/StockOrder/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOrder/components/MyDialog.vue b/src/views/StockOrder/components/MyDialog.vue index 197b7d00..82a01169 100644 --- a/src/views/StockOrder/components/MyDialog.vue +++ b/src/views/StockOrder/components/MyDialog.vue @@ -986,10 +986,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '5', currency: '1' @@ -1021,11 +1021,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/StockOrder/components/MyEmp.vue b/src/views/StockOrder/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockOrder/components/MyEmp.vue +++ b/src/views/StockOrder/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOrder/components/MyLnquiry.vue b/src/views/StockOrder/components/MyLnquiry.vue index 155614d6..b9c08228 100644 --- a/src/views/StockOrder/components/MyLnquiry.vue +++ b/src/views/StockOrder/components/MyLnquiry.vue @@ -252,11 +252,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: 3, - judgeStat: '' + judgeStat: 2 }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOrder/components/MyPlan.vue b/src/views/StockOrder/components/MyPlan.vue index 0a14c5c1..6ad03ed8 100644 --- a/src/views/StockOrder/components/MyPlan.vue +++ b/src/views/StockOrder/components/MyPlan.vue @@ -230,10 +230,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, supplierId: this.supp, - regionIds: 2, - createPersonId: 3 + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockOut/AddOtherStockOut.vue b/src/views/StockOut/AddOtherStockOut.vue index b95935ac..eb47e27e 100644 --- a/src/views/StockOut/AddOtherStockOut.vue +++ b/src/views/StockOut/AddOtherStockOut.vue @@ -169,10 +169,10 @@ export default { control: false, // 出库信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 出库单规则数据 @@ -326,10 +326,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.produceManagerId = '' diff --git a/src/views/StockOut/OtherStockOutList.vue b/src/views/StockOut/OtherStockOutList.vue index 5e340870..5be1bfd9 100644 --- a/src/views/StockOut/OtherStockOutList.vue +++ b/src/views/StockOut/OtherStockOutList.vue @@ -207,10 +207,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -326,7 +325,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -334,7 +333,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockOut/components/DetailList.vue b/src/views/StockOut/components/DetailList.vue index f84743ab..46c7ba04 100644 --- a/src/views/StockOut/components/DetailList.vue +++ b/src/views/StockOut/components/DetailList.vue @@ -326,11 +326,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/StockOut/components/MyAccept.vue b/src/views/StockOut/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/StockOut/components/MyAccept.vue +++ b/src/views/StockOut/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOut/components/MyCreate.vue b/src/views/StockOut/components/MyCreate.vue index ed5e5a1b..f8ba97a0 100644 --- a/src/views/StockOut/components/MyCreate.vue +++ b/src/views/StockOut/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, diff --git a/src/views/StockOut/components/MyDelivery.vue b/src/views/StockOut/components/MyDelivery.vue index 41aa63f0..f5c14889 100644 --- a/src/views/StockOut/components/MyDelivery.vue +++ b/src/views/StockOut/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOut/components/MyDialog.vue b/src/views/StockOut/components/MyDialog.vue index d7f18400..9ac7003b 100644 --- a/src/views/StockOut/components/MyDialog.vue +++ b/src/views/StockOut/components/MyDialog.vue @@ -340,11 +340,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/StockOut/components/MyEdit.vue b/src/views/StockOut/components/MyEdit.vue index bec4e67d..46270136 100644 --- a/src/views/StockOut/components/MyEdit.vue +++ b/src/views/StockOut/components/MyEdit.vue @@ -348,11 +348,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/StockOut/components/MyEmp.vue b/src/views/StockOut/components/MyEmp.vue index 289f1b96..b91ee66d 100644 --- a/src/views/StockOut/components/MyEmp.vue +++ b/src/views/StockOut/components/MyEmp.vue @@ -161,6 +161,8 @@ export default { pagenum: 1, pagesize: 10, stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +274,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockOut/components/MyOther.vue b/src/views/StockOut/components/MyOther.vue index 89ba1441..b8cc4fcc 100644 --- a/src/views/StockOut/components/MyOther.vue +++ b/src/views/StockOut/components/MyOther.vue @@ -321,11 +321,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/StockOut/components/MyRepository.vue b/src/views/StockOut/components/MyRepository.vue index beca53f0..30e2db64 100644 --- a/src/views/StockOut/components/MyRepository.vue +++ b/src/views/StockOut/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/StockPlan/AddStockPlan.vue b/src/views/StockPlan/AddStockPlan.vue index 3cf4ad59..18c7fa94 100644 --- a/src/views/StockPlan/AddStockPlan.vue +++ b/src/views/StockPlan/AddStockPlan.vue @@ -306,10 +306,10 @@ export default { control: false, // 采购计划单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '3', totalQuantity: '', allMoney: '', @@ -646,9 +646,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.planPersonId = null diff --git a/src/views/StockPlan/StockPlanList.vue b/src/views/StockPlan/StockPlanList.vue index 5c13ec2c..542a780b 100644 --- a/src/views/StockPlan/StockPlanList.vue +++ b/src/views/StockPlan/StockPlanList.vue @@ -253,9 +253,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -358,7 +357,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -366,7 +365,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockPlan/components/MyApply.vue b/src/views/StockPlan/components/MyApply.vue index 4d6f27af..da405880 100644 --- a/src/views/StockPlan/components/MyApply.vue +++ b/src/views/StockPlan/components/MyApply.vue @@ -231,9 +231,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, + receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockPlan/components/MyDelivery.vue b/src/views/StockPlan/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockPlan/components/MyDelivery.vue +++ b/src/views/StockPlan/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockPlan/components/MyDialog.vue b/src/views/StockPlan/components/MyDialog.vue index 7a5b691d..ec1125f7 100644 --- a/src/views/StockPlan/components/MyDialog.vue +++ b/src/views/StockPlan/components/MyDialog.vue @@ -616,9 +616,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.planPersonId = null @@ -627,11 +627,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() const EnterDetail2 = this.$refs.editable2.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/StockPlan/components/MyEmp.vue b/src/views/StockPlan/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockPlan/components/MyEmp.vue +++ b/src/views/StockPlan/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockPlan/components/MyRequire.vue b/src/views/StockPlan/components/MyRequire.vue index a0e651ea..447b1073 100644 --- a/src/views/StockPlan/components/MyRequire.vue +++ b/src/views/StockPlan/components/MyRequire.vue @@ -197,9 +197,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/ArrivalSummary.vue b/src/views/StockQuery/ArrivalSummary.vue index b31a0f51..65c29ada 100644 --- a/src/views/StockQuery/ArrivalSummary.vue +++ b/src/views/StockQuery/ArrivalSummary.vue @@ -157,9 +157,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/OnSummary.vue b/src/views/StockQuery/OnSummary.vue index ec8b858f..4fea3331 100644 --- a/src/views/StockQuery/OnSummary.vue +++ b/src/views/StockQuery/OnSummary.vue @@ -172,9 +172,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/StockPrice.vue b/src/views/StockQuery/StockPrice.vue index 43059cda..212c92bc 100644 --- a/src/views/StockQuery/StockPrice.vue +++ b/src/views/StockQuery/StockPrice.vue @@ -132,9 +132,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/components/MyApply.vue b/src/views/StockQuery/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/StockQuery/components/MyApply.vue +++ b/src/views/StockQuery/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/components/MyArrival.vue b/src/views/StockQuery/components/MyArrival.vue index c132f293..05c7ea12 100644 --- a/src/views/StockQuery/components/MyArrival.vue +++ b/src/views/StockQuery/components/MyArrival.vue @@ -243,9 +243,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/components/MyDelivery.vue b/src/views/StockQuery/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockQuery/components/MyDelivery.vue +++ b/src/views/StockQuery/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockQuery/components/MyDialog.vue b/src/views/StockQuery/components/MyDialog.vue index eed131bc..cc693002 100644 --- a/src/views/StockQuery/components/MyDialog.vue +++ b/src/views/StockQuery/components/MyDialog.vue @@ -513,10 +513,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -528,11 +528,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/StockQuery/components/MyEmp.vue b/src/views/StockQuery/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockQuery/components/MyEmp.vue +++ b/src/views/StockQuery/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockQuery/components/MyLnquiry.vue b/src/views/StockQuery/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/StockQuery/components/MyLnquiry.vue +++ b/src/views/StockQuery/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/components/MyOrder.vue b/src/views/StockQuery/components/MyOrder.vue index 065e7de5..33e1fed1 100644 --- a/src/views/StockQuery/components/MyOrder.vue +++ b/src/views/StockQuery/components/MyOrder.vue @@ -245,9 +245,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockQuery/components/MyPlan.vue b/src/views/StockQuery/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/StockQuery/components/MyPlan.vue +++ b/src/views/StockQuery/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRequire/index.vue b/src/views/StockRequire/index.vue index 8b09432f..00ffb43b 100644 --- a/src/views/StockRequire/index.vue +++ b/src/views/StockRequire/index.vue @@ -194,9 +194,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/AddStockRetreat.vue b/src/views/StockRetreat/AddStockRetreat.vue index 2673e962..4b62a487 100644 --- a/src/views/StockRetreat/AddStockRetreat.vue +++ b/src/views/StockRetreat/AddStockRetreat.vue @@ -324,10 +324,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, sourceType: '2', retreatDate: null @@ -574,10 +574,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null diff --git a/src/views/StockRetreat/StockRetreatList.vue b/src/views/StockRetreat/StockRetreatList.vue index 133540de..bd14a11a 100644 --- a/src/views/StockRetreat/StockRetreatList.vue +++ b/src/views/StockRetreat/StockRetreatList.vue @@ -251,9 +251,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -374,7 +373,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -382,7 +381,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/StockRetreat/components/MyApply.vue b/src/views/StockRetreat/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/StockRetreat/components/MyApply.vue +++ b/src/views/StockRetreat/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/components/MyArrival.vue b/src/views/StockRetreat/components/MyArrival.vue index eeedd164..9e719dc6 100644 --- a/src/views/StockRetreat/components/MyArrival.vue +++ b/src/views/StockRetreat/components/MyArrival.vue @@ -243,9 +243,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/components/MyDelivery.vue b/src/views/StockRetreat/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/StockRetreat/components/MyDelivery.vue +++ b/src/views/StockRetreat/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockRetreat/components/MyDialog.vue b/src/views/StockRetreat/components/MyDialog.vue index dd61aabc..0aa111ed 100644 --- a/src/views/StockRetreat/components/MyDialog.vue +++ b/src/views/StockRetreat/components/MyDialog.vue @@ -548,10 +548,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -563,11 +563,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/StockRetreat/components/MyEmp.vue b/src/views/StockRetreat/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/StockRetreat/components/MyEmp.vue +++ b/src/views/StockRetreat/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/StockRetreat/components/MyLnquiry.vue b/src/views/StockRetreat/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/StockRetreat/components/MyLnquiry.vue +++ b/src/views/StockRetreat/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/components/MyOrder.vue b/src/views/StockRetreat/components/MyOrder.vue index 065e7de5..33e1fed1 100644 --- a/src/views/StockRetreat/components/MyOrder.vue +++ b/src/views/StockRetreat/components/MyOrder.vue @@ -245,9 +245,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/components/MyPlan.vue b/src/views/StockRetreat/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/StockRetreat/components/MyPlan.vue +++ b/src/views/StockRetreat/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/StockRetreat/components/MyRepository.vue b/src/views/StockRetreat/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/StockRetreat/components/MyRepository.vue +++ b/src/views/StockRetreat/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Stockenter/AddOtherenter.vue b/src/views/Stockenter/AddOtherenter.vue index e54e894c..4429b4b6 100644 --- a/src/views/Stockenter/AddOtherenter.vue +++ b/src/views/Stockenter/AddOtherenter.vue @@ -176,10 +176,10 @@ export default { control: false, // 入库信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 入库单规则数据 @@ -329,10 +329,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.acceptPersonId = null diff --git a/src/views/Stockenter/OtherEnterList.vue b/src/views/Stockenter/OtherEnterList.vue index e8ef8df2..48fbac55 100644 --- a/src/views/Stockenter/OtherEnterList.vue +++ b/src/views/Stockenter/OtherEnterList.vue @@ -236,10 +236,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -391,7 +390,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -404,7 +403,7 @@ export default { cancelButtonText: '不通过', type: 'warning' }).then(() => { - updateotherenter5(row, 2, this.getemplist.createPersonId).then(res => { + updateotherenter5(row, 2, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', @@ -415,7 +414,7 @@ export default { }) }).catch(action => { if (action === 'cancel') { - updateotherenter5(row, 1, this.getemplist.createPersonId).then(res => { + updateotherenter5(row, 1, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', diff --git a/src/views/Stockenter/ProduceEnter.vue b/src/views/Stockenter/ProduceEnter.vue index 2c5d481b..eafa20ce 100644 --- a/src/views/Stockenter/ProduceEnter.vue +++ b/src/views/Stockenter/ProduceEnter.vue @@ -159,10 +159,10 @@ export default { control: false, // 生产入库信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 生产入库单规则数据 @@ -304,10 +304,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.produceManagerId = '' diff --git a/src/views/Stockenter/ProduceEnterList.vue b/src/views/Stockenter/ProduceEnterList.vue index 4c499a6c..d4706579 100644 --- a/src/views/Stockenter/ProduceEnterList.vue +++ b/src/views/Stockenter/ProduceEnterList.vue @@ -224,10 +224,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -374,7 +373,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -387,7 +386,7 @@ export default { cancelButtonText: '不通过', type: 'warning' }).then(() => { - updatestockenter4(row, 2, this.getemplist.createPersonId).then(res => { + updatestockenter4(row, 2, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', @@ -398,7 +397,7 @@ export default { }) }).catch(action => { if (action === 'cancel') { - updatestockenter4(row, 1, this.getemplist.createPersonId).then(res => { + updatestockenter4(row, 1, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', diff --git a/src/views/Stockenter/Stockenterlist.vue b/src/views/Stockenter/Stockenterlist.vue index 9737f1fd..12cd8c46 100644 --- a/src/views/Stockenter/Stockenterlist.vue +++ b/src/views/Stockenter/Stockenterlist.vue @@ -245,9 +245,8 @@ export default { getemplist: { pagenum: 1, pagesize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -336,7 +335,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -349,7 +348,7 @@ export default { cancelButtonText: '不通过', type: 'warning' }).then(() => { - updatestockenter3(row, 2, this.getemplist.createPersonId).then(res => { + updatestockenter3(row, 2, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', @@ -360,7 +359,7 @@ export default { }) }).catch(action => { if (action === 'cancel') { - updatestockenter3(row, 1, this.getemplist.createPersonId).then(res => { + updatestockenter3(row, 1, this.$store.getters.userId).then(res => { if (res.data.ret === 200) { this.$message({ type: 'success', diff --git a/src/views/Stockenter/addstockenter.vue b/src/views/Stockenter/addstockenter.vue index a7ddca42..7ac4ffa5 100644 --- a/src/views/Stockenter/addstockenter.vue +++ b/src/views/Stockenter/addstockenter.vue @@ -221,7 +221,7 @@ export default { // 明细表控制框 control: false, // 验收人回显 - acceptPersonId: 'xucan', + acceptPersonId: this.$store.getters.name, // 验收人控制框 accetpcontrol: false, // 交货人回显 @@ -237,7 +237,7 @@ export default { // 采购员回显 stockPersonId: '', // 入库员回显 - enterPersonId: 'xu x can', + enterPersonId: this.$store.getters.name, // 供货商回显 supplierId: '', // 供货商控制 @@ -266,13 +266,13 @@ export default { // 采购入库信息数据 personalForm: { enterDate: null, - repositoryId: 438, - enterRepositoryId: 438, - regionId: 2, - createPersonId: 3, - enterPersonId: 3, - countryId: 1, - acceptPersonId: 3, + repositoryId: this.$store.getters.repositoryId, + enterRepositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, + enterPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + acceptPersonId: this.$store.getters.userId, sourceType: '1' }, // 个人信息规则数据 @@ -443,18 +443,23 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - repositoryId: 438, - regionId: 2, - createPersonId: 3, - countryId: 1, + enterDate: null, + repositoryId: this.$store.getters.repositoryId, + enterRepositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId, + enterPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + acceptPersonId: this.$store.getters.userId, sourceType: '1' } - this.acceptPersonId = '' + this.acceptPersonId = this.$store.getters.name this.deliveryPersonId = '' this.stockPersonId = '' this.supplierId = '' this.enterRepositoryId = '' - this.enterPersonId = '' + this.enterPersonId = this.$store.getters.name + this.getdatatime() }, // 取消操作 handlecancel() { diff --git a/src/views/Stockenter/components/DetailList.vue b/src/views/Stockenter/components/DetailList.vue index f5f05320..4f51f5df 100644 --- a/src/views/Stockenter/components/DetailList.vue +++ b/src/views/Stockenter/components/DetailList.vue @@ -388,11 +388,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/Stockenter/components/DetailList2.vue b/src/views/Stockenter/components/DetailList2.vue index 80199ac0..4d616515 100644 --- a/src/views/Stockenter/components/DetailList2.vue +++ b/src/views/Stockenter/components/DetailList2.vue @@ -332,11 +332,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/Stockenter/components/DetailList3.vue b/src/views/Stockenter/components/DetailList3.vue index e2fa1330..7daab90f 100644 --- a/src/views/Stockenter/components/DetailList3.vue +++ b/src/views/Stockenter/components/DetailList3.vue @@ -355,11 +355,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/Stockenter/components/MyAccept.vue b/src/views/Stockenter/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/Stockenter/components/MyAccept.vue +++ b/src/views/Stockenter/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyArrival.vue b/src/views/Stockenter/components/MyArrival.vue index afaa866c..604418b6 100644 --- a/src/views/Stockenter/components/MyArrival.vue +++ b/src/views/Stockenter/components/MyArrival.vue @@ -243,9 +243,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Stockenter/components/MyCreate.vue b/src/views/Stockenter/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/Stockenter/components/MyCreate.vue +++ b/src/views/Stockenter/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyDelivery.vue b/src/views/Stockenter/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/Stockenter/components/MyDelivery.vue +++ b/src/views/Stockenter/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyDialog.vue b/src/views/Stockenter/components/MyDialog.vue index b2c612e8..8707f705 100644 --- a/src/views/Stockenter/components/MyDialog.vue +++ b/src/views/Stockenter/components/MyDialog.vue @@ -441,11 +441,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/Stockenter/components/MyEdit.vue b/src/views/Stockenter/components/MyEdit.vue index 1932df7d..3f93d760 100644 --- a/src/views/Stockenter/components/MyEdit.vue +++ b/src/views/Stockenter/components/MyEdit.vue @@ -325,11 +325,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/Stockenter/components/MyEmp.vue b/src/views/Stockenter/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Stockenter/components/MyEmp.vue +++ b/src/views/Stockenter/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyEmp2.vue b/src/views/Stockenter/components/MyEmp2.vue index 6eb18016..04353b17 100644 --- a/src/views/Stockenter/components/MyEmp2.vue +++ b/src/views/Stockenter/components/MyEmp2.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Stockenter/components/MyOther.vue b/src/views/Stockenter/components/MyOther.vue index f6d48847..ae9e471a 100644 --- a/src/views/Stockenter/components/MyOther.vue +++ b/src/views/Stockenter/components/MyOther.vue @@ -354,11 +354,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/Stockenter/components/MyRepository.vue b/src/views/Stockenter/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Stockenter/components/MyRepository.vue +++ b/src/views/Stockenter/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Storagemove/AddMoveApplication.vue b/src/views/Storagemove/AddMoveApplication.vue index 300fd02c..cc62c166 100644 --- a/src/views/Storagemove/AddMoveApplication.vue +++ b/src/views/Storagemove/AddMoveApplication.vue @@ -141,10 +141,10 @@ export default { control: false, // 调拨信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 调拨单规则数据 @@ -251,10 +251,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.moveOutRepository = '' diff --git a/src/views/Storagemove/AddStoragemove.vue b/src/views/Storagemove/AddStoragemove.vue index b8b68f48..f75701b7 100644 --- a/src/views/Storagemove/AddStoragemove.vue +++ b/src/views/Storagemove/AddStoragemove.vue @@ -181,10 +181,10 @@ export default { control: false, // 调拨信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 调拨单规则数据 @@ -347,10 +347,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' } this.moveOutRepository = '' diff --git a/src/views/Storagemove/MoveApplicationList.vue b/src/views/Storagemove/MoveApplicationList.vue index 171a7de7..c1c056be 100644 --- a/src/views/Storagemove/MoveApplicationList.vue +++ b/src/views/Storagemove/MoveApplicationList.vue @@ -198,10 +198,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- diff --git a/src/views/Storagemove/StoragemoveList.vue b/src/views/Storagemove/StoragemoveList.vue index 83f7d349..3d86a6c5 100644 --- a/src/views/Storagemove/StoragemoveList.vue +++ b/src/views/Storagemove/StoragemoveList.vue @@ -100,7 +100,7 @@ align="center"/> @@ -238,10 +238,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -385,7 +384,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -393,7 +392,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Storagemove/components/DetailList.vue b/src/views/Storagemove/components/DetailList.vue index c91949c1..c80680b4 100644 --- a/src/views/Storagemove/components/DetailList.vue +++ b/src/views/Storagemove/components/DetailList.vue @@ -369,11 +369,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/Storagemove/components/MyAccept.vue b/src/views/Storagemove/components/MyAccept.vue index 21fb11d8..b7f710ff 100644 --- a/src/views/Storagemove/components/MyAccept.vue +++ b/src/views/Storagemove/components/MyAccept.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Storagemove/components/MyApplication.vue b/src/views/Storagemove/components/MyApplication.vue index 455f4115..023d3741 100644 --- a/src/views/Storagemove/components/MyApplication.vue +++ b/src/views/Storagemove/components/MyApplication.vue @@ -277,11 +277,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/Storagemove/components/MyCreate.vue b/src/views/Storagemove/components/MyCreate.vue index 1561e346..0599dfcc 100644 --- a/src/views/Storagemove/components/MyCreate.vue +++ b/src/views/Storagemove/components/MyCreate.vue @@ -162,7 +162,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Storagemove/components/MyDelivery.vue b/src/views/Storagemove/components/MyDelivery.vue index bf1a89c6..b3e38f77 100644 --- a/src/views/Storagemove/components/MyDelivery.vue +++ b/src/views/Storagemove/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Storagemove/components/MyDepot.vue b/src/views/Storagemove/components/MyDepot.vue index d39987ed..7ec066f8 100644 --- a/src/views/Storagemove/components/MyDepot.vue +++ b/src/views/Storagemove/components/MyDepot.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Storagemove/components/MyDialog.vue b/src/views/Storagemove/components/MyDialog.vue index 19f1167a..849d2539 100644 --- a/src/views/Storagemove/components/MyDialog.vue +++ b/src/views/Storagemove/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/Storagemove/components/MyEdit.vue b/src/views/Storagemove/components/MyEdit.vue index 563887b5..3b6181b3 100644 --- a/src/views/Storagemove/components/MyEdit.vue +++ b/src/views/Storagemove/components/MyEdit.vue @@ -367,11 +367,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/Storagemove/components/MyEdit2.vue b/src/views/Storagemove/components/MyEdit2.vue index 11706025..3314176a 100644 --- a/src/views/Storagemove/components/MyEdit2.vue +++ b/src/views/Storagemove/components/MyEdit2.vue @@ -268,11 +268,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/Storagemove/components/MyEmp.vue b/src/views/Storagemove/components/MyEmp.vue index 289f1b96..53e85f94 100644 --- a/src/views/Storagemove/components/MyEmp.vue +++ b/src/views/Storagemove/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Storagemove/components/MyOther.vue b/src/views/Storagemove/components/MyOther.vue index e76bb2a8..b90e5508 100644 --- a/src/views/Storagemove/components/MyOther.vue +++ b/src/views/Storagemove/components/MyOther.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/Storagemove/components/MyRepository.vue b/src/views/Storagemove/components/MyRepository.vue index 95998884..beffb2ee 100644 --- a/src/views/Storagemove/components/MyRepository.vue +++ b/src/views/Storagemove/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/Supplier/components/MyDialog.vue b/src/views/Supplier/components/MyDialog.vue index c5a9897b..ef4ae311 100644 --- a/src/views/Supplier/components/MyDialog.vue +++ b/src/views/Supplier/components/MyDialog.vue @@ -592,11 +592,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/Supplier/components/MyEmp.vue b/src/views/Supplier/components/MyEmp.vue index 71c27ab1..fdd84944 100644 --- a/src/views/Supplier/components/MyEmp.vue +++ b/src/views/Supplier/components/MyEmp.vue @@ -158,7 +158,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -265,7 +265,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/AddTearDown.vue b/src/views/TearDown/AddTearDown.vue index 99ea6251..cee4a390 100644 --- a/src/views/TearDown/AddTearDown.vue +++ b/src/views/TearDown/AddTearDown.vue @@ -187,10 +187,10 @@ export default { buildcontrol: false, // 拆装信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, sourceType: '1' }, // 拆装单规则数据 @@ -340,9 +340,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.teardownRepositoryId = '' diff --git a/src/views/TearDown/TearDownList.vue b/src/views/TearDown/TearDownList.vue index 476b6a45..ee15f3d4 100644 --- a/src/views/TearDown/TearDownList.vue +++ b/src/views/TearDown/TearDownList.vue @@ -214,10 +214,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- @@ -346,7 +345,7 @@ export default { isReview(row) { if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -354,7 +353,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/TearDown/components/DetailList.vue b/src/views/TearDown/components/DetailList.vue index f0bc673a..2a093201 100644 --- a/src/views/TearDown/components/DetailList.vue +++ b/src/views/TearDown/components/DetailList.vue @@ -343,11 +343,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/TearDown/components/MyAccept.vue b/src/views/TearDown/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/TearDown/components/MyAccept.vue +++ b/src/views/TearDown/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyCreate.vue b/src/views/TearDown/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/TearDown/components/MyCreate.vue +++ b/src/views/TearDown/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyDelivery.vue b/src/views/TearDown/components/MyDelivery.vue index 05040af3..9c2e2483 100644 --- a/src/views/TearDown/components/MyDelivery.vue +++ b/src/views/TearDown/components/MyDelivery.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyDialog.vue b/src/views/TearDown/components/MyDialog.vue index 9ca7a683..64ff53b6 100644 --- a/src/views/TearDown/components/MyDialog.vue +++ b/src/views/TearDown/components/MyDialog.vue @@ -349,11 +349,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() console.log(rest) diff --git a/src/views/TearDown/components/MyEdit.vue b/src/views/TearDown/components/MyEdit.vue index 01473498..8681eb27 100644 --- a/src/views/TearDown/components/MyEdit.vue +++ b/src/views/TearDown/components/MyEdit.vue @@ -356,11 +356,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { diff --git a/src/views/TearDown/components/MyEmp.vue b/src/views/TearDown/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/TearDown/components/MyEmp.vue +++ b/src/views/TearDown/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/TearDown/components/MyOther.vue b/src/views/TearDown/components/MyOther.vue index e76bb2a8..b90e5508 100644 --- a/src/views/TearDown/components/MyOther.vue +++ b/src/views/TearDown/components/MyOther.vue @@ -324,11 +324,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest !== true) { diff --git a/src/views/TearDown/components/MyRepository.vue b/src/views/TearDown/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/TearDown/components/MyRepository.vue +++ b/src/views/TearDown/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/TearDown/components/MyRules.vue b/src/views/TearDown/components/MyRules.vue index 4f411b6c..1c398cae 100644 --- a/src/views/TearDown/components/MyRules.vue +++ b/src/views/TearDown/components/MyRules.vue @@ -126,12 +126,12 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId this.personalForm.createId = 3 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/Transfer/AddTransfer.vue b/src/views/Transfer/AddTransfer.vue index e17d7e52..dc474f78 100644 --- a/src/views/Transfer/AddTransfer.vue +++ b/src/views/Transfer/AddTransfer.vue @@ -129,10 +129,10 @@ export default { stockControl: false, // 收入单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1' }, // 收入单规则数据 @@ -205,10 +205,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1' } this.handlePersonId = null diff --git a/src/views/Transfer/TransferList.vue b/src/views/Transfer/TransferList.vue index 264c16fa..c6c9c8df 100644 --- a/src/views/Transfer/TransferList.vue +++ b/src/views/Transfer/TransferList.vue @@ -277,9 +277,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -377,7 +376,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -385,7 +384,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/Transfer/components/MyApply.vue b/src/views/Transfer/components/MyApply.vue index 099e0b49..badd0506 100644 --- a/src/views/Transfer/components/MyApply.vue +++ b/src/views/Transfer/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Transfer/components/MyDialog.vue b/src/views/Transfer/components/MyDialog.vue index 21cb18ab..9d048e91 100644 --- a/src/views/Transfer/components/MyDialog.vue +++ b/src/views/Transfer/components/MyDialog.vue @@ -221,10 +221,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1' } this.handlePersonId = null @@ -233,11 +233,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const Data = this.personalForm for (const key in Data) { if (Data[key] === '' || Data[key] === undefined || Data[key] === null) { diff --git a/src/views/Transfer/components/MyEmp.vue b/src/views/Transfer/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/Transfer/components/MyEmp.vue +++ b/src/views/Transfer/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/Transfer/components/MyPlan.vue b/src/views/Transfer/components/MyPlan.vue index 457bf7fd..c35c41db 100644 --- a/src/views/Transfer/components/MyPlan.vue +++ b/src/views/Transfer/components/MyPlan.vue @@ -230,10 +230,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: 3 + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/Transfer/components/MyRepository.vue b/src/views/Transfer/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/Transfer/components/MyRepository.vue +++ b/src/views/Transfer/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/WarehouseAdjust/AddInitialenter.vue b/src/views/WarehouseAdjust/AddInitialenter.vue index 6d6b86e5..945f2f1b 100644 --- a/src/views/WarehouseAdjust/AddInitialenter.vue +++ b/src/views/WarehouseAdjust/AddInitialenter.vue @@ -151,11 +151,11 @@ export default { }, // 库存入库单信息数据 personalForm: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, countryId: 1 }, - repositoryId: 438, - regionId: 2, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, // 库存入库单规则数据 personalrules: { enterPersonId: [ @@ -269,7 +269,7 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, + createPersonId: this.$store.getters.userId, countryId: 1 } this.enterPersonId = '' diff --git a/src/views/WarehouseAdjust/AddLocationAdjust.vue b/src/views/WarehouseAdjust/AddLocationAdjust.vue index d522cf36..aa7c73c8 100644 --- a/src/views/WarehouseAdjust/AddLocationAdjust.vue +++ b/src/views/WarehouseAdjust/AddLocationAdjust.vue @@ -178,9 +178,9 @@ export default { }, // 库存入库单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 库存入库单规则数据 @@ -312,9 +312,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.handlePersonId = '' diff --git a/src/views/WarehouseAdjust/AddStockAlarm.vue b/src/views/WarehouseAdjust/AddStockAlarm.vue index cb28c696..ea36d537 100644 --- a/src/views/WarehouseAdjust/AddStockAlarm.vue +++ b/src/views/WarehouseAdjust/AddStockAlarm.vue @@ -69,10 +69,10 @@ export default { control: false, // 库存预警数据 personalForm: { - createPersonId: 3, + createPersonId: this.$store.getters.userId, createId: 3, - countryId: 1, - repositoryId: 438, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 }, // 库存预警规则数据 @@ -117,9 +117,9 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, regionId: 2 } this.repositoryId = '' diff --git a/src/views/WarehouseAdjust/Enterlist.vue b/src/views/WarehouseAdjust/Enterlist.vue index 0396248f..9eae2638 100644 --- a/src/views/WarehouseAdjust/Enterlist.vue +++ b/src/views/WarehouseAdjust/Enterlist.vue @@ -213,9 +213,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -315,7 +314,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -323,7 +322,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/WarehouseAdjust/LocationAdjustList.vue b/src/views/WarehouseAdjust/LocationAdjustList.vue index 49ef906b..3e60b673 100644 --- a/src/views/WarehouseAdjust/LocationAdjustList.vue +++ b/src/views/WarehouseAdjust/LocationAdjustList.vue @@ -225,9 +225,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -340,7 +339,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -348,7 +347,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/WarehouseAdjust/components/DetailList.vue b/src/views/WarehouseAdjust/components/DetailList.vue index 2673824e..7006ee0a 100644 --- a/src/views/WarehouseAdjust/components/DetailList.vue +++ b/src/views/WarehouseAdjust/components/DetailList.vue @@ -277,10 +277,10 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/WarehouseAdjust/components/MyAccept.vue b/src/views/WarehouseAdjust/components/MyAccept.vue index 04cfc155..07dd7b80 100644 --- a/src/views/WarehouseAdjust/components/MyAccept.vue +++ b/src/views/WarehouseAdjust/components/MyAccept.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -266,7 +266,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyCreate.vue b/src/views/WarehouseAdjust/components/MyCreate.vue index ed5e5a1b..22ce4fc2 100644 --- a/src/views/WarehouseAdjust/components/MyCreate.vue +++ b/src/views/WarehouseAdjust/components/MyCreate.vue @@ -173,7 +173,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -283,7 +283,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyDelivery.vue b/src/views/WarehouseAdjust/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/WarehouseAdjust/components/MyDelivery.vue +++ b/src/views/WarehouseAdjust/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyDialog.vue b/src/views/WarehouseAdjust/components/MyDialog.vue index 63c9773b..ebcf03c3 100644 --- a/src/views/WarehouseAdjust/components/MyDialog.vue +++ b/src/views/WarehouseAdjust/components/MyDialog.vue @@ -279,10 +279,10 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/WarehouseAdjust/components/MyDialog2.vue b/src/views/WarehouseAdjust/components/MyDialog2.vue index 9a19ca6d..87bfa228 100644 --- a/src/views/WarehouseAdjust/components/MyDialog2.vue +++ b/src/views/WarehouseAdjust/components/MyDialog2.vue @@ -353,10 +353,10 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId const EnterDetail = this.$refs.editable.getRecords() console.log(EnterDetail) if (EnterDetail.length === 0) { diff --git a/src/views/WarehouseAdjust/components/MyDriver.vue b/src/views/WarehouseAdjust/components/MyDriver.vue index 3d216d80..408e9822 100644 --- a/src/views/WarehouseAdjust/components/MyDriver.vue +++ b/src/views/WarehouseAdjust/components/MyDriver.vue @@ -158,7 +158,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -262,7 +262,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyEdit.vue b/src/views/WarehouseAdjust/components/MyEdit.vue index 7ba8b2a0..13afd4ab 100644 --- a/src/views/WarehouseAdjust/components/MyEdit.vue +++ b/src/views/WarehouseAdjust/components/MyEdit.vue @@ -294,11 +294,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId console.log(this.personalForm) const rest = this.$refs.editable.getRecords() if (rest.length === 0) { diff --git a/src/views/WarehouseAdjust/components/MyEmp.vue b/src/views/WarehouseAdjust/components/MyEmp.vue index c1a66d0b..9480fffc 100644 --- a/src/views/WarehouseAdjust/components/MyEmp.vue +++ b/src/views/WarehouseAdjust/components/MyEmp.vue @@ -160,7 +160,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -272,7 +272,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/WarehouseAdjust/components/MyLocation.vue b/src/views/WarehouseAdjust/components/MyLocation.vue index 725bc99e..b9d7537d 100644 --- a/src/views/WarehouseAdjust/components/MyLocation.vue +++ b/src/views/WarehouseAdjust/components/MyLocation.vue @@ -135,10 +135,10 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId console.log(this.personalForm) const parms = JSON.stringify(this.personalForm) updatelocation(parms).then(res => { diff --git a/src/views/WarehouseAdjust/components/MyRepository.vue b/src/views/WarehouseAdjust/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/WarehouseAdjust/components/MyRepository.vue +++ b/src/views/WarehouseAdjust/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/WarehouseAdjust/inventorydetaillist.vue b/src/views/WarehouseAdjust/inventorydetaillist.vue index db29c7e0..3c29dd4f 100644 --- a/src/views/WarehouseAdjust/inventorydetaillist.vue +++ b/src/views/WarehouseAdjust/inventorydetaillist.vue @@ -238,10 +238,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionIds: 2 + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 搜索结束 ---------------------- // 列表操作 ------------------------- diff --git a/src/views/income/AddIncome.vue b/src/views/income/AddIncome.vue index addabaad..db828df5 100644 --- a/src/views/income/AddIncome.vue +++ b/src/views/income/AddIncome.vue @@ -153,10 +153,10 @@ export default { stockControl: false, // 收入单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1', incomeDate: null }, @@ -230,10 +230,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1' } this.handlePersonId = null diff --git a/src/views/income/IncomeList.vue b/src/views/income/IncomeList.vue index b4c227d4..bc0bb761 100644 --- a/src/views/income/IncomeList.vue +++ b/src/views/income/IncomeList.vue @@ -257,9 +257,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -361,7 +360,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -369,7 +368,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过', diff --git a/src/views/income/components/MyApply.vue b/src/views/income/components/MyApply.vue index 099e0b49..badd0506 100644 --- a/src/views/income/components/MyApply.vue +++ b/src/views/income/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/income/components/MyDialog.vue b/src/views/income/components/MyDialog.vue index 053fd3ad..40a70550 100644 --- a/src/views/income/components/MyDialog.vue +++ b/src/views/income/components/MyDialog.vue @@ -244,10 +244,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, currency: '1' } this.handlePersonId = null @@ -258,11 +258,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() if (EnterDetail.length === 0) { this.$notify.error({ diff --git a/src/views/income/components/MyEmp.vue b/src/views/income/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/income/components/MyEmp.vue +++ b/src/views/income/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/income/components/MyPlan.vue b/src/views/income/components/MyPlan.vue index 457bf7fd..c35c41db 100644 --- a/src/views/income/components/MyPlan.vue +++ b/src/views/income/components/MyPlan.vue @@ -230,10 +230,11 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, supplierId: this.supp, - createPersonId: 3 + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/income/components/MyRepository.vue b/src/views/income/components/MyRepository.vue index e1b5d9cb..a58721e0 100644 --- a/src/views/income/components/MyRepository.vue +++ b/src/views/income/components/MyRepository.vue @@ -144,6 +144,9 @@ export default { regionId: '', countyrId: '', id: '', + stat: 1, + loginRepositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, pagenum: 1, pagesize: 10 }, diff --git a/src/views/payment/AddPayment.vue b/src/views/payment/AddPayment.vue index 475dde79..125853cb 100644 --- a/src/views/payment/AddPayment.vue +++ b/src/views/payment/AddPayment.vue @@ -288,10 +288,10 @@ export default { control: false, // 采购申请单信息数据 personalForm: { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1, offsetAdvance: 0, moneyThis: 0, @@ -525,10 +525,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.getdatatime() diff --git a/src/views/payment/components/MyApply.vue b/src/views/payment/components/MyApply.vue index 3a466ebf..6b85fff5 100644 --- a/src/views/payment/components/MyApply.vue +++ b/src/views/payment/components/MyApply.vue @@ -232,9 +232,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/payment/components/MyDelivery.vue b/src/views/payment/components/MyDelivery.vue index c7388ed9..8bce0364 100644 --- a/src/views/payment/components/MyDelivery.vue +++ b/src/views/payment/components/MyDelivery.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -285,7 +285,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/payment/components/MyDialog.vue b/src/views/payment/components/MyDialog.vue index 8199444b..54199d90 100644 --- a/src/views/payment/components/MyDialog.vue +++ b/src/views/payment/components/MyDialog.vue @@ -499,10 +499,10 @@ export default { // 清空记录 restAllForm() { this.personalForm = { - createPersonId: 3, - countryId: 1, - repositoryId: 438, - regionId: 2, + createPersonId: this.$store.getters.userId, + countryId: this.$store.getters.countryId, + repositoryId: this.$store.getters.repositoryId, + regionId: this.$store.getters.regionId, isVat: 1 } this.supplierId = null @@ -514,11 +514,11 @@ export default { // 修改和取消按钮 // 修改按钮 handleEditok() { - this.personalForm.repositoryId = 438 - this.personalForm.regionId = 2 - this.personalForm.createPersonId = 3 - this.personalForm.countryId = 1 - this.personalForm.modifyPersonId = 3 + this.personalForm.repositoryId = this.$store.getters.repositoryId + this.personalForm.regionId = this.$store.getters.regionId + this.personalForm.createPersonId = this.$store.getters.userId + this.personalForm.countryId = this.$store.getters.countryId + this.personalForm.modifyPersonId = this.$store.getters.userId const EnterDetail = this.$refs.editable.getRecords() EnterDetail.map(function(elem) { return elem diff --git a/src/views/payment/components/MyEmp.vue b/src/views/payment/components/MyEmp.vue index 82bc83d6..911d490a 100644 --- a/src/views/payment/components/MyEmp.vue +++ b/src/views/payment/components/MyEmp.vue @@ -171,7 +171,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' }, @@ -291,7 +291,7 @@ export default { employeename: '', pagenum: 1, pagesize: 10, - stat: 1, + stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId, time: '', jobnumber: '' } diff --git a/src/views/payment/components/MyLnquiry.vue b/src/views/payment/components/MyLnquiry.vue index 1ac29aba..c13d8bc1 100644 --- a/src/views/payment/components/MyLnquiry.vue +++ b/src/views/payment/components/MyLnquiry.vue @@ -248,10 +248,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3, - judgeStat: '' + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/payment/components/MyOrder.vue b/src/views/payment/components/MyOrder.vue index 065e7de5..d0f3167f 100644 --- a/src/views/payment/components/MyOrder.vue +++ b/src/views/payment/components/MyOrder.vue @@ -245,9 +245,9 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/payment/components/MyPlan.vue b/src/views/payment/components/MyPlan.vue index 02a48b31..865d3c8f 100644 --- a/src/views/payment/components/MyPlan.vue +++ b/src/views/payment/components/MyPlan.vue @@ -226,9 +226,10 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + judgeStat: 2, receiptStat: 2, + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId, + createPersonId: this.$store.getters.userId }, // 传给组件的数据 personalForm: {}, diff --git a/src/views/payment/paymentList.vue b/src/views/payment/paymentList.vue index 9379264a..f15a2736 100644 --- a/src/views/payment/paymentList.vue +++ b/src/views/payment/paymentList.vue @@ -239,9 +239,8 @@ export default { getemplist: { pageNum: 1, pageSize: 10, - repositoryId: 438, - regionIds: 2, - createPersonId: 3 + repositoryId: this.$store.getters.repositoryId, + regionIds: this.$store.getters.regionId }, // 传给组件的数据 personalForm: {}, @@ -365,7 +364,7 @@ export default { console.log(row) if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) { const approvalUse = row.approvalUseVos - if (this.getemplist.createPersonId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { + if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) { return true } } @@ -373,7 +372,7 @@ export default { // 审批操作 handleReview(row) { this.reviewParms.id = row.id - this.reviewParms.judgePersonId = this.getemplist.createPersonId + this.reviewParms.judgePersonId = this.$store.getters.userId this.$confirm('请审核', '审核', { distinguishCancelAndClose: true, confirmButtonText: '通过',