diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue
index 5552f89..4a703b0 100644
--- a/src/components/TableModel/index.vue
+++ b/src/components/TableModel/index.vue
@@ -45,6 +45,7 @@
:options="item.f_selList"
:props="item.optionProps"
:show-all-levels="false"
+ clearable
@change="handleCasAdd($event, item.f_model, cascaderFunc, extraTableProp)"
style="width: 240px"
/>
@@ -64,6 +65,16 @@
value-format="yyyy-MM-dd"
type="date"
/>
+
{
if (valid) {
@@ -393,28 +410,30 @@ export default {
func,
prop
) {
- this.queryParams[val] = e[e.length - 1]
- let setObj = {}
- // 合并
- if(prop) {
- Object.assign(setObj, prop)
+ if(e.length !== 0) {
+ this.queryParams[val] = e[e.length - 1]
+ let setObj = {}
+ // 合并
+ if(prop) {
+ Object.assign(setObj, prop)
+ }
+ // 设置id自增
+ this.$set(setObj, 'id', this.idCount)
+ this.idCount++
+ // 获取单位
+ func({
+ id: e[e.length - 1]
+ }).then(res => {
+ this.$set(setObj, 'name', res.data.parentName)
+ this.$set(setObj, 'unitName', res.data.unitName)
+ this.$set(setObj, 'typeName', res.data.name)
+ }).catch(err => {})
+ for(let key in this.queryParams) {
+ this.$set(setObj, key, this.queryParams[key])
+ }
+ this.tableList.unshift(setObj)
+ console.log(this.tableList)
}
- // 设置id自增
- /* this.$set(setObj, 'id', this.idCount)
- this.idCount++ */
- // 获取单位
- func({
- id: e[e.length - 1]
- }).then(res => {
- this.$set(setObj, 'name', res.data.parentName)
- this.$set(setObj, 'unitName', res.data.unitName)
- this.$set(setObj, 'typeName', res.data.name)
- }).catch(err => {})
- for(let key in this.queryParams) {
- this.$set(setObj, key, this.queryParams[key])
- }
- this.tableList.unshift(setObj)
- console.log(this.tableList)
},
/** 动态设置操作列的列宽 */
getOperatorWidth() {
diff --git a/src/utils/request.js b/src/utils/request.js
index 6535e62..0bdebd7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -182,7 +182,7 @@ export function download(url, params, filename, config) {
transformRequest: [(params) => {
return tansParams(params)
}],
- headers: { 'Content-Type': 'application/x-www-form-urlencoded', encryptResponse: false},
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded', encryptResponse: false },
responseType: 'blob',
...config
}).then(async(data) => {
diff --git a/src/views/base/project/config.js b/src/views/base/project/config.js
index 2d0afdd..90bb2fa 100644
--- a/src/views/base/project/config.js
+++ b/src/views/base/project/config.js
@@ -1,6 +1,6 @@
export const formLabel = [
- { f_label: '工程名称', f_model: 'name', f_type: 'ipt' },
+ { f_label: '工程名称', f_model: 'keyWord', f_type: 'ipt' },
]
export const columnsList = [
{ t_props: 'name', t_label: '工程项目名称', },
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index 3547311..33e2ad6 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -13,8 +13,14 @@
新建
- 导出导出
diff --git a/src/views/purchase/arrival/components/add-arrival.vue b/src/views/purchase/arrival/components/add-arrival.vue
index dc46773..b45b5df 100644
--- a/src/views/purchase/arrival/components/add-arrival.vue
+++ b/src/views/purchase/arrival/components/add-arrival.vue
@@ -13,7 +13,7 @@
@transIdList="getIdList"
>
- 保存
@@ -115,6 +115,9 @@ import {
queryPurchaseArrivalListApi,
addArrivalApi
} from '@/api/purchase/arrival'
+import {
+ queryPurchaseArrivalListInnerApi
+} from '@/api/purchase/arrival'
import ReportManage from '../components/report-manage.vue'
export default {
name: 'AddArrival',
@@ -128,10 +131,30 @@ export default {
sendCascader: {
type: Array,
default: () => null
+ },
+ sendParams: {
+ type: Object,
+ default: () => null
}
},
created() {
- // console.log(this.sendRange)
+ console.log(this.sendParams)
+ if(this.sendParams) {
+ queryPurchaseArrivalListInnerApi({
+ taskId: this.sendParams.id
+ }).then(res => {
+ console.log(res)
+ res.rows.forEach(item => {
+ // 处理返回数据
+ item.notaxPrice = item.notaxPrice / 100
+ item.purchasePrice = item.purchasePrice / 100
+ item.purchaseNum = item.purchaseNum / 1000
+ item.name = item.materialName
+ item.typeName = item.materialModel
+ this.$refs.tableRef.tableList.push(item)
+ })
+ })
+ }
},
mounted() {
@@ -155,9 +178,7 @@ export default {
extraProp: {
purchasePrice: '',
notaxPrice: ''
- },
- storageDex: 1000,
- priceDex: 100
+ }
}
},
methods: {
@@ -166,35 +187,37 @@ export default {
getIdList(idList) {
this.exportList = idList
},
- // 删除
+ /** 删除机具 */
delMa(data) {
this.$modal
.confirm('是否确认删除所选择的数据项？')
.then(() => {
this.$refs.tableRef.tableList.forEach((item, index) => {
- if(item.type === data.type) {
+ if(item.id === data.id) {
this.$refs.tableRef.tableList.splice(index, 1)
}
})
})
.catch(() => {})
},
- save() {
+ /** 保存机具 */
+ save(params) {
+ console.log(params, '表单参数')
if(this.exportList.length === 0) {
this.$modal.msgError('请选择需要保存的机具')
} else {
this.exportList.forEach(item => {
- item.purchaseNum = item.purchaseNum * this.storageDex
- item.purchasePrice = item.purchasePrice * this.priceDex
- item.notaxPrice = item.notaxPrice * this.priceDex
+ item.purchaseNum = item.purchaseNum * 1000
+ item.purchasePrice = item.purchasePrice * 100
+ item.notaxPrice = item.notaxPrice * 100
})
let subObj = {
- arrivalTime: this.exportList[0].arrivalTime,
+ arrivalTime: params.arrivalTime,
// supplierId: this.exportList[0].supplierId,
- productDate: this.exportList[0].productDate,
+ productDate: params.productDate,
// taxRate: this.exportList[0].taxRate,
// typeId: this.exportList[0].typeId,
- remark: this.exportList[0].remark,
+ remark: params.remark,
bpmPurchaseDetailsList: this.exportList
}
// 新增
@@ -202,9 +225,9 @@ export default {
console.log(res)
this.$modal.msgSuccess('保存成功')
this.$refs.tableRef.tableList.forEach(item => {
- item.purchaseNum = item.purchaseNum / this.storageDex
- item.purchasePrice = item.purchasePrice / this.priceDex
- item.notaxPrice = item.notaxPrice / this.priceDex
+ item.purchaseNum = item.purchaseNum / 1000
+ item.purchasePrice = item.purchasePrice / 100
+ item.notaxPrice = item.notaxPrice / 100
})
// this.$refs.tableRef.getTableList()
}).catch(err => {})
diff --git a/src/views/purchase/arrival/components/table-notice-add.vue b/src/views/purchase/arrival/components/table-notice-add.vue
index bab1ed5..c1f74e3 100644
--- a/src/views/purchase/arrival/components/table-notice-add.vue
+++ b/src/views/purchase/arrival/components/table-notice-add.vue
@@ -12,7 +12,11 @@
>
- 添加
+ 添加
@@ -42,7 +46,8 @@ export default {
{ t_props: 'deptName', t_label: '所属机构' },
{ t_props: 'userRole', t_label: '角色', },
{ t_props: 'phone', t_label: '联系电话', t_width: '150px' },
- ]
+ ],
+ userList: []
}
},
computed: {
@@ -51,7 +56,15 @@ export default {
methods: {
queryAllPersonList,
getIdList(idList) {
- console.log(idList)
+ this.userList = idList
+ },
+ addNoticePerson() {
+ let sendUserList = []
+ this.userList.forEach(item => {
+ sendUserList.push(item.userId)
+ })
+ // 发起请求
+
}
},
}
diff --git a/src/views/purchase/arrival/components/table-notice.vue b/src/views/purchase/arrival/components/table-notice.vue
index 6419d08..8821971 100644
--- a/src/views/purchase/arrival/components/table-notice.vue
+++ b/src/views/purchase/arrival/components/table-notice.vue
@@ -82,7 +82,7 @@ export default {
components: { TableNoticeAdd },
created() {
console.log(this.editParams)
- this.transObj = { ['taskId']: this.editParams['id'] }
+ this.transObj = { taskId: this.editParams.id }
this.noticeIpt = `各位同事您好，请于2023-11-22在2号库，进行机具验收。验收内容如下：机具类型：${this.editParams.purchaseMaterial}
`
},
diff --git a/src/views/purchase/arrival/config-add.js b/src/views/purchase/arrival/config-add.js
index f6707e0..130928c 100644
--- a/src/views/purchase/arrival/config-add.js
+++ b/src/views/purchase/arrival/config-add.js
@@ -8,7 +8,7 @@ export const formLabelAdd = [
{ f_label: '出厂日期', f_model: 'productDate', f_type: 'date' },
{ f_label: '税率', f_model: 'taxRate', f_type: 'num' },
{ f_label: '类型规格', f_model: 'keyWord', f_type: 'ipt' },
- { f_label: '备注', f_model: 'keyWord', f_type: 'ipt' },
+ { f_label: '备注', f_model: 'remark', f_type: 'ipt' },
]
export const columnsListAdd = [
{ t_props: 'name', t_label: '物资名称', },
diff --git a/src/views/purchase/arrival/config.js b/src/views/purchase/arrival/config.js
index b9a5a6d..6c8779e 100644
--- a/src/views/purchase/arrival/config.js
+++ b/src/views/purchase/arrival/config.js
@@ -4,7 +4,8 @@ import {
export const queryStatusSelData = () => {
queryStatusSelApi().then(res => {
- formLabel[3].f_selList = res.data.data.map(item => {
+ console.log(res.data.data)
+ formLabel[2].f_selList = res.data.data.map(item => {
return {
label: item.dictLabel,
value: item.dictCode
@@ -14,8 +15,7 @@ export const queryStatusSelData = () => {
}
export const formLabel = [
- { f_label: '开始时间', f_model: 'startTime', f_type: 'date' },
- { f_label: '结束时间', f_model: 'endTime', f_type: 'date' },
+ { f_label: '日期范围', f_model: 'time', f_type: 'dateRange' },
{ f_label: '关键字', f_model: 'keyWord', f_type: 'ipt' },
{ f_label: '状态', f_model: 'status', f_type: 'sel', f_selList: [] },
]
diff --git a/src/views/purchase/arrival/index.vue b/src/views/purchase/arrival/index.vue
index 36589ac..e199981 100644
--- a/src/views/purchase/arrival/index.vue
+++ b/src/views/purchase/arrival/index.vue
@@ -15,7 +15,7 @@
v-if="isShowComponent === 'Index'"
>
- 设备到货新增
编辑
@@ -197,16 +199,26 @@ export default {
},
// 提交按钮
handleSubmit(id) {
- let idList = []
- idList.push(id)
- submitArrivalApi(idList).then(res => {
- console.log(res)
- this.$modal.msgSuccess('提交成功')
- this.$refs.tableRef.getTableList()
- }).catch(err => {})
+ this.$modal.confirm('是否确定提交').then(() => {
+ let idList = []
+ idList.push(id)
+ submitArrivalApi(idList).then(res => {
+ console.log(res)
+ this.$modal.msgSuccess('提交成功')
+ this.$refs.tableRef.getTableList()
+ }).catch(err => {})
+ })
},
goBack() {
this.isShowComponent = 'Index'
+ },
+ addArrival() {
+ this.editParams = undefined
+ this.isShowComponent = 'add-arrival'
+ },
+ handleEdit(data) {
+ this.editParams = data
+ this.isShowComponent = 'add-arrival'
}
},
data() {
@@ -224,6 +236,7 @@ export default {
storageDex: 1000,
priceDex: 100,
detailParams: undefined,
+ editParams: undefined,
// 通知弹框
}
diff --git a/src/views/purchase/binding/config.js b/src/views/purchase/binding/config.js
index eb73f5d..75dfeba 100644
--- a/src/views/purchase/binding/config.js
+++ b/src/views/purchase/binding/config.js
@@ -1,9 +1,22 @@
+import {
+ queryStatusSelApi
+} from '@/api/purchase/receive'
+
+export const queryStatusSelData = () => {
+ queryStatusSelApi().then(res => {
+ formLabel[2].f_selList = res.data.data.map(item => {
+ return {
+ label: item.dictLabel,
+ value: item.dictCode
+ }
+ })
+ })
+}
export const formLabel = [
- { f_label: '开始时间', f_model: 'startTime', f_type: 'date' },
- { f_label: '结束时间', f_model: 'endTime', f_type: 'date' },
+ { f_label: '日期范围', f_model: 'time', f_type: 'dateRange' },
{ f_label: '关键字', f_model: 'keyWord', f_type: 'ipt' },
-
+ { f_label: '状态', f_model: 'status', f_type: 'sel', f_selList: [] },
]
export const columnsList = [
{ t_props: 'arrivalTime', t_label: '到货时间', },
@@ -14,7 +27,7 @@ export const columnsList = [
{ t_props: 'notaxPrice', t_label: '采购价格(不含税)', t_slot: 'notaxPrice' },
{ t_props: 'createBy', t_label: '操作人' },
{ t_props: 'createTime', t_label: '操作时间' },
- { t_props: 'statusName', t_label: '状态' },
+ { t_props: 'statusName', t_label: '状态', t_slot: 'statusName' },
{ t_props: 'remark', t_label: '备注' },
]
diff --git a/src/views/purchase/binding/index.vue b/src/views/purchase/binding/index.vue
index cbe7d6f..432d663 100644
--- a/src/views/purchase/binding/index.vue
+++ b/src/views/purchase/binding/index.vue
@@ -54,9 +54,16 @@
{{ data.purchasePrice / 100 }}
-
+
+
{{ data.notaxPrice / 100 }}
+
+
+ {{ data.statusName }}
+
+
+
@@ -71,7 +78,7 @@