diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/busvehicleorder.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/busvehicleorder.js
index 6114ca1474..4e626e5a80 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/busvehicleorder.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/busvehicleorder.js
@@ -26,12 +26,5 @@ export default {
url: '/base/v1/busvehicleorder/fetchBySid/' + sid,
method: 'get'
})
- },
- pullDown: function (data) {
- return request({
- url: '/portal/v1/dictcommons/typeValues',
- method: 'get',
- params: data
- })
}
}
diff --git a/anrui-scm/anrui-scm-ui/src/api/supplychain/rukuguanli.js b/anrui-scm/anrui-scm-ui/src/api/supplychain/rukuguanli.js
index 594aa14997..40c8ba99b9 100644
--- a/anrui-scm/anrui-scm-ui/src/api/supplychain/rukuguanli.js
+++ b/anrui-scm/anrui-scm-ui/src/api/supplychain/rukuguanli.js
@@ -14,7 +14,7 @@ export function selectCarWarehousingList(data) {
// 入库管理 新增初始化
export function getCarWarehousingInfo(data) {
return request({
- url: '/scm/v1/scmvehicleenterlibrary/getCarWarehousingInfo/'+ data.warehousingSid + '/' + data.userSid,
+ url: '/scm/v1/scmvehicleenterlibrary/getCarWarehousingInfo/' + data.warehousingSid + '/' + data.userSid,
method: 'get'
})
}
@@ -22,12 +22,12 @@ export function getCarWarehousingInfo(data) {
// 库位下拉框
export function selectWarehouseByUserSid(data) {
return request({
- url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid/' + data,
+ url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid',
+ params: data,
method: 'get'
})
}
-
// 保存 入库
export function saveCarWarehousingInfo(data) {
return request({
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue
index 479994a124..9591c574ca 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue
@@ -105,8 +105,7 @@ export default {
},
methods: {
getType() {
- const userSid = window.sessionStorage.getItem('userSid')
- selectWarehouseByUserSid(userSid).then((res) => {
+ selectWarehouseByUserSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.code === '200') {
this.warehouse_list = res.data
console.log('库位', this.warehouse_list)
@@ -138,30 +137,6 @@ export default {
})
this.getType()
},
- // showEdit(sid) {
- // this.$nextTick(() => {
- // this.$refs['dataForm'].clearValidate()
- // })
- // this.dialogStatus = 'update'
- // this.viewTitle = '【修改】车辆台账'
- // this.temp.sid = sid
- // console.log('修改页面sid', this.temp.sid)
- // details(sid).then((response) => {
- // if (response.code === '200') {
- // if (response.data.createOrg) {
- // console.log('级联选择1:', response.data.useOrg)
- // this.useOrgArry = response.data.createOrg
- // console.log('级联选择2:', this.useOrgArry)
- // }
- // this.temp = response.data
- // this.getLocation()
- // this.getModelConfig(this.temp.modelSid)
- // }
- // })
- // this.getType()
- // this.getZuZhi()
- // this.getUseOrg()
- // },
getUrl() {
if (this.imgList.length > 0) {
for (var i = 0; i < this.imgList.length; i++) {
@@ -213,16 +188,6 @@ export default {
}
})
}
-
- // 处理图片
- // this.temp.vehiclePhoto = []
- // if (this.vehiclePhoto_Images.length > 0) {
- // for (var i = 0; i < this.vehiclePhoto_Images.length; i++) {
- // var image_start = this.vehiclePhoto_Images.indexOf('/upload') + 8
- // var image_url = this.vehiclePhoto_Images.substring(image_start)
- // this.temp.vehiclePhoto.push(image_url)
- // }
- // }
}
}
@@ -232,11 +197,6 @@ export default {
width: 80%;
}
-/*.listconadd {*/
-/* width: 100%;*/
-/* padding: 0 240px !important;*/
-/*}*/
-
/deep/ .el-col-3 {
text-align: right;
float: left;
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
index 82002c9b03..5d986212f3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
@@ -49,12 +49,11 @@
-
+
-
-
+
查看
@@ -93,8 +92,8 @@ import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import rukuguanliInfo from '@/views/supplychain/rukuguanli/rukuguanliInfo'
-import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
-import { typeValues } from '@/api/supplychain/yancheguanli'
+import { selectModelName } from '@/api/cheliang/basevehicle'
+import { typeValues } from '@/api/cheliang/dictcommons'
import { selectCarWarehousingList } from '@/api/supplychain/rukuguanli'
export default {
@@ -112,12 +111,8 @@ export default {
isSearchShow: false,
tableLoading: false,
dataList: [],
- useOrg_list: [],
modelName_list: [],
- slowMachine_list: [],
purchaseType_list: [],
- useOrg: '', // 使用组织
- useOrgSid: '', // 使用组织sid
listQuery: {
current: 1,
size: 10,
@@ -129,7 +124,8 @@ export default {
type: '2',
inboundStartDate: '',
inboundEndDate: '',
- userSid: window.sessionStorage.getItem('userSid')
+ userSid: '',
+ orgPath: ''
}
},
btnList: [
@@ -146,7 +142,6 @@ export default {
},
created() {
this.getList()
- // this.getUseOrg()
this.getModelName()
this.getType()
},
@@ -155,9 +150,7 @@ export default {
},
methods: {
getType() {
- typeValues({
- type: 'purchaseOrderType '
- }).then((response) => {
+ typeValues({ type: 'purchaseOrderType ' }).then((response) => {
if (response.code === '200' && response.data) {
this.purchaseType_list = response.data
}
@@ -176,12 +169,6 @@ export default {
break
}
},
-
- // handleCheck(row) {
- // this.$refs['divinfo'].showInfo(row)
- // console.log('详情回显', row)
- // this.viewState = 4
- // },
handleInvoiceList() {
this.$parent.viewState = 1
this.$parent.getList()
@@ -202,7 +189,8 @@ export default {
type: '2',
inboundStartDate: '',
inboundEndDate: '',
- userSid: window.sessionStorage.getItem('userSid')
+ userSid: '',
+ orgPath: ''
}
}
this.getList()
@@ -213,23 +201,23 @@ export default {
this.viewState = 6
},
loadList() {
- const _this = this
this.tableLoading = true
- selectCarWarehousingList(this.listQuery)
- .then(resp => {
- _this.tableLoading = false
+ this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+ this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+ selectCarWarehousingList(this.listQuery).then((resp) => {
+ this.tableLoading = false
+ if (resp.success) {
const data = resp.data
- _this.listQuery.total = data.total
- _this.dataList = data.records
- })
- .catch(() => {
- _this.tableLoading = false
- })
+ this.listQuery.total = data.total
+ this.dataList = data.records
+ } else {
+ this.listQuery.total = 0
+ this.dataList = []
+ }
+ }).catch(() => {
+ this.tableLoading = false
+ })
},
- // handleSelectionChange(val) {
- // this.multipleSelection = val
- // console.log('点击数据', this.multipleSelection)
- // },
// 车型名称下拉框
getModelName() {
selectModelName({ name: '' }).then((response) => {
@@ -238,18 +226,6 @@ export default {
}
})
},
- // 根据个人sid查询个人分公司
- getUseOrg() {
- const userSid = window.sessionStorage.getItem('userSid')
- getUseOrgByUserSid({ userSid: userSid }).then((res) => {
- if (res.success) {
- this.useOrg = res.data.name // 使用组织
- this.useOrgSid = res.data.sid // 使用组织sid
- this.listQuery.params.useOrgSid = res.data.sid
- this.loadList()
- }
- })
- },
// 序号
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
index d046f7d58a..c5caf79ff0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
@@ -40,12 +40,11 @@
-
+
-
-
+
收车
@@ -55,8 +54,6 @@
-
-
@@ -84,10 +81,10 @@ import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { selectCarWarehousingList } from '@/api/supplychain/rukuguanli'
+import { selectModelName } from '@/api/cheliang/basevehicle'
+import { typeValues } from '@/api/cheliang/dictcommons'
import rukuguanliAdd from '@/views/supplychain/rukuguanli/rukuguanliAdd'
import rukuguanli from '@/views/supplychain/rukuguanli/rukuguanliAlready'
-import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
-import { typeValues } from '@/api/supplychain/yancheguanli'
export default {
name: 'rukuguanliawait',
@@ -120,7 +117,8 @@ export default {
model: '',
purchaseType: '',
type: '1',
- userSid: window.sessionStorage.getItem('userSid')
+ userSid: '',
+ orgPath: ''
}
},
btnList: [
@@ -137,7 +135,6 @@ export default {
},
created() {
this.getList()
- // this.getUseOrg()
this.getModelName()
this.getType()
},
@@ -195,29 +192,30 @@ export default {
model: '',
purchaseType: '',
type: '1',
- userSid: window.sessionStorage.getItem('userSid')
+ userSid: '',
+ orgPath: ''
}
}
this.getList()
},
loadList() {
- const _this = this
this.tableLoading = true
- selectCarWarehousingList(this.listQuery)
- .then(resp => {
- _this.tableLoading = false
+ this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+ this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+ selectCarWarehousingList(this.listQuery).then((resp) => {
+ this.tableLoading = false
+ if (resp.success) {
const data = resp.data
- _this.listQuery.total = data.total
- _this.dataList = data.records
- })
- .catch(() => {
- _this.tableLoading = false
- })
+ this.listQuery.total = data.total
+ this.dataList = data.records
+ } else {
+ this.listQuery.total = 0
+ this.dataList = []
+ }
+ }).catch(() => {
+ this.tableLoading = false
+ })
},
- // handleSelectionChange(val) {
- // this.multipleSelection = val
- // console.log('点击数据', this.multipleSelection)
- // },
// 车型名称下拉框
getModelName() {
selectModelName({ name: '' }).then((response) => {
@@ -226,18 +224,6 @@ export default {
}
})
},
- // 根据个人sid查询个人分公司
- getUseOrg() {
- const userSid = window.sessionStorage.getItem('userSid')
- getUseOrgByUserSid({ userSid: userSid }).then((res) => {
- if (res.success) {
- this.useOrg = res.data.name // 使用组织
- this.useOrgSid = res.data.sid // 使用组织sid
- this.listQuery.params.useOrgSid = res.data.sid
- this.loadList()
- }
- })
- },
// 序号
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklistInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklistInfo.vue
index baab1c35ac..12cf3c8610 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklistInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklistInfo.vue
@@ -46,19 +46,8 @@
{{ item.imgTitle }}
- 查看
-
-
-
-
-
-
-
-
- 图片示例
-
+ 查看
+ 图片示例
@@ -95,20 +84,14 @@
-
-
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
index 9d1e100da6..98aa15e7c9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
@@ -82,8 +82,8 @@