From 92408b7aeec7465866abf0159a252e24b7d48eed Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 17 Jan 2023 16:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E5=8E=82=E5=AE=B6=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A4=E6=AC=BE=E3=80=81=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E7=AE=A1=E7=90=86--=E4=B8=8E=E5=88=87=E6=8D=A2=E6=9C=BA?=
=?UTF-8?q?=E6=9E=84=E5=8A=9F=E8=83=BD=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cheliangcaigou/cheliangcaigou.vue | 71 +++++++------------
.../othermenu/affichetype/gonggaoguanli.vue | 9 ++-
.../changjiaxitong/manufacturers.vue | 4 +-
3 files changed, 35 insertions(+), 49 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
index 3c8d885d24..183a58de81 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
@@ -11,7 +11,7 @@
-
+
@@ -98,6 +98,7 @@ import pageye from '@/components/pagination/pageye'
import divAdd from './cheliangcaigouAdd'
import divInfo from './cheliangcaigouInfo'
import vehicleconfiguration from '@/views/cheliang/cheliangcaigou/relation/vehicleconfiguration'
+import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'cheliangcaigou',
@@ -117,11 +118,6 @@ export default {
tableLoading: false,
// 下拉框
billType_list: [], // 单据类型
- manu_list: [], // 供应商
- customer_list: [], // 客户
- cargoType_list: [], // 货主类型
- billState_list: [], // 单据状态
- // Inspector_list: [], // 验收员
// 列表数据
dataList: [],
btnList: [
@@ -135,7 +131,6 @@ export default {
],
// sid数组
sids: [], // 用于导出的时候保存已选择SID
- sides: '', // 一条数据的sid
queryParams: {
current: 1,
size: 10,
@@ -147,9 +142,10 @@ export default {
startDate: '',
endDate: '',
modelName: '',
- staffSid: window.sessionStorage.getItem('staffSid'),
- userSid: window.sessionStorage.getItem('userSid'),
- applicationCode: ''
+ staffSid: '',
+ userSid: '',
+ applicationCode: '',
+ orgPath: ''
}
},
row: {}
@@ -184,7 +180,7 @@ export default {
this.viewState = 4
this.$refs['divinfo'].showInfo(row)
},
- handlePeizhi(row){
+ handlePeizhi(row) {
this.viewState = 5
this.$refs['divPeizhi'].showInfo(row)
},
@@ -194,31 +190,12 @@ export default {
},
// 下拉框-单据类型 changeBillType
getBillType() {
- req.pullDown({
- type: 'orderType'
- }).then((res) => {
- if (res.code === '200') {
+ typeValues({ type: 'orderType' }).then((res) => {
+ if (res.success) {
this.billType_list = res.data
- console.log('下拉框请求111', res.data)
}
})
},
- changeBillType(value) {
- console.log('触发下拉框按钮')
- let bb = {}
- this.billType_list.forEach((e) => {
- if (e.dictKey === value) {
- bb = {
- type: e.dictType,
- name: e.dictValue,
- key: e.dictKey,
- sid: e.sid
- }
- }
- })
- this.queryParams.params.billType = bb.name
- console.log('name', this.queryParams.params.billType)
- },
resetQuery() {
this.queryParams = {
current: 1,
@@ -231,27 +208,33 @@ export default {
startDate: '',
endDate: '',
modelName: '',
- staffSid: window.sessionStorage.getItem('staffSid'),
- userSid: window.sessionStorage.getItem('userSid'),
- applicationCode: ''
+ staffSid: '',
+ userSid: '',
+ applicationCode: '',
+ orgPath: ''
}
}
this.dosearch()
},
// 查询
loadList() {
- const _this = this
this.tableLoading = true
+ this.queryParams.params.staffSid = window.sessionStorage.getItem('staffSid')
+ this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+ this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.queryParams).then(resp => {
- console.log('查询列表', resp)
- _this.tableLoading = false
+ this.tableLoading = false
+ if (resp.success) {
const data = resp.data
- _this.queryParams.total = data.total
- _this.dataList = data.records
- })
- .catch(() => {
- _this.tableLoading = false
- })
+ this.queryParams.total = data.total
+ this.dataList = data.records
+ } else {
+ this.queryParams.total = 0
+ this.dataList = []
+ }
+ }).catch(() => {
+ this.tableLoading = false
+ })
},
// 序号
indexMethod(index) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/othermenu/affichetype/gonggaoguanli.vue b/anrui-scm/anrui-scm-ui/src/views/othermenu/affichetype/gonggaoguanli.vue
index 15feba4d9a..c9e9050fc0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/othermenu/affichetype/gonggaoguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/othermenu/affichetype/gonggaoguanli.vue
@@ -117,7 +117,8 @@ export default {
announcementmodelName: '',
createStartTime: '',
createEndTime: '',
- userSid: ''
+ userSid: '',
+ orgPath: ''
},
current: 1,
size: 5,
@@ -177,10 +178,11 @@ export default {
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+ this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
console.log('列表查询结果：', response)
this.listLoading = false
- if (response.success && response.data && response.data.total > 0) {
+ if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
@@ -200,7 +202,8 @@ export default {
announcementmodelName: '',
createStartTime: '',
createEndTime: '',
- userSid: ''
+ userSid: '',
+ orgPath: ''
},
current: 1,
size: 5,
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
index ae459cc0cb..f81ceb76fe 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
@@ -117,7 +117,7 @@