diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 9d78cf7261..ef77c38bc3 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -291,14 +291,14 @@ const codemenu = [ }, // 采购退库 { - path: '/caigoutuiku', + path: '/supplychain', component: Layout, - redirect: '/caigoutuiku/index', + redirect: '/supplychain/caigoutuiku', meta: { title: '采购退库' }, children: [{ - path: '/caigoutuiku/index', + path: '/supplychain/caigoutuiku', component: () => import('@/views/supplychain/caigoutuiku/caigoutuiku.vue'), name: 'caigoutuiku', meta: { title: '采购退库', noCache: true } diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue index d74e3efc41..1c73ff8623 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue @@ -28,7 +28,7 @@
盘库人员:
- + @@ -52,8 +52,8 @@ 盘盈 - - + + @@ -63,17 +63,17 @@ {{ scope.row.vinNo }} - + - + - + @@ -85,6 +85,15 @@ + + + @@ -107,17 +129,22 @@ import req from '@/api/kucunguanli/panku' import { getUserByOrgSid, fetchByUseOrgSid, typeValues } from '@/api/cheliang/dictcommons' import pankuByPanYing from './pankuByPanYing' import Pagination from '@/components/pagination' +import upload_jianchabiao from '@/components/uploadFile/upload_jianchabiao' export default { name: 'pankuAdd', components: { Pagination, - pankuByPanYing + pankuByPanYing, + upload_jianchabiao }, data() { return { viewTitle: '盘库操作', listLoading: false, + dialogVisible: false, + dialogUrl: [], + dialogindex: '', viewState: 1, index: 0, tableKey: 0, @@ -237,19 +264,6 @@ export default { } this.formobj.inventoryName = aa.join('、') this.formobj.inventorySid = bb.join('、') - // let bb = null - // this.staff_list.forEach((e) => { - // if (e.sid === value) { - // bb = { - // name: e.name, - // sid: e.sid - // } - // } - // }) - // this.listQuery.params.inventoryName = bb.name - // this.formobj.inventoryName = bb.name - // this.formobj.inventorySid = bb.sid - console.log(this.formobj) }, handleAdd() { this.viewState = 2 @@ -260,6 +274,10 @@ export default { this.$message({ showClose: true, type: 'error', message: '结果不能为空' }) return } + if (row.InventoryState !== '正常' && row.images.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请上传见证材料' }) + return + } if (row.InventoryState !== '正常' && row.remarks === '') { this.$message({ showClose: true, type: 'error', message: '请填写备注' }) return @@ -273,6 +291,7 @@ export default { this.formobj.InventoryState = row.InventoryState this.formobj.InventoryStateKey = row.InventoryStateKey this.formobj.remarks = row.remarks + this.formobj.images = row.images if (this.formobj.inventoryName === '') { this.formobj.inventorySid = '' } @@ -302,6 +321,20 @@ export default { restState() { this.viewState = 1 }, + // 查看上传图片 + handleLookImg(row, index) { + this.dialogVisible = true + this.dialogUrl = row.images + this.dialogindex = index + }, + handleDel(item, index) { + this.dialogUrl.splice(index, 1) + for (var i = 0; i < this.list[this.index].images.length; i++) { + if (this.list[this.index].images[i] === item) { + this.list[this.index].images.splice(i, 1) + } + } + }, // 返回(===既判断) handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -359,5 +392,15 @@ export default { .colOneStyle { border-right: 0px !important; } +.upload_img { + display: inline-block; + padding: 0 10px; +} +.dialogImg{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue index 50d14521de..9de60fa23c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue @@ -41,18 +41,18 @@
- - + + - + - + @@ -62,11 +62,16 @@ {{ scope.row.inventoryName }} - + + + + @@ -106,6 +123,8 @@ export default { data() { return { btndisabled: false, + dialogVisible: false, + dialogUrl: [], btnList: [ { type: 'primary', @@ -258,6 +277,10 @@ export default { } this.init() }, + handleLook(row) { + this.dialogVisible = true + this.dialogUrl = row.images + }, toAdd() { req.getInventoryRecords(window.sessionStorage.getItem('userSid')).then((res) => { if (res.success) { diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue index fd401a3a7e..d1475b78e1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue @@ -193,11 +193,15 @@ - +
厂家入库日期
- + +
公司入库日期
+ +
+
物流发车日期
@@ -225,6 +229,12 @@ export default { }, data() { return { + pickerOptions: { + disabledDate(time) { + let oneDay = 3600 * 1000 * 24 * 5 + return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay + } + }, viewTitle: '', index: 0, tableKey: 0, @@ -281,7 +291,8 @@ export default { scmFiles: [], vehicleList: [], vehicleOrderSid: '', - orgPath: '' + orgPath: '', + priceDate: '' }, rules: {}, submitdisabled: false @@ -773,14 +784,6 @@ export default { this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' }) return } - if (this.formobj.priceDate === '' || this.formobj.priceDate === null) { - this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' }) - return - } - if (this.formobj.departureDate === '') { - this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' }) - return - } if (this.formobj.onceFreight === '') { this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) return @@ -789,6 +792,18 @@ export default { this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零,请完善一次运费' }) return } + if (this.formobj.priceDate === '' || this.formobj.priceDate === null) { + this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' }) + return + } + if (this.formobj.orgPriceDate === '') { + this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' }) + return + } + if (this.formobj.departureDate === '') { + this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' }) + return + } if (this.freightChecked) { this.formobj.deductionFreight = 0 } else { diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue index feb25d56ff..87a0282655 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue @@ -196,11 +196,15 @@ - +
厂家入库日期
{{ formobj.priceDate }}
- + +
公司入库日期
+ {{ formobj.orgPriceDate }} +
+
物流发车日期
{{ formobj.departureDate }}
@@ -281,7 +285,8 @@ export default { deductionPolicyTwoOne: '', scmFiles: [], vehicleList: [], - vehicleOrderSid: '' + vehicleOrderSid: '', + priceDate: '' }, rules: {}, submitdisabled: false diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue index 4702da67e0..56d595a691 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue @@ -198,11 +198,15 @@ - +
厂家入库日期
{{ formobj.priceDate }}
- + +
公司入库日期
+ {{ formobj.orgPriceDate }} +
+
物流发车日期
{{ formobj.departureDate }}
@@ -316,7 +320,8 @@ export default { deductionPolicyTwoOne: '', scmFiles: [], vehicleList: [], - vehicleOrderSid: '' + vehicleOrderSid: '', + priceDate: '' }, // 环节所需参数 linkByParameter: { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue index 154d469d86..3872a72bba 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue @@ -192,11 +192,15 @@ - +
厂家入库日期
- + +
公司入库日期
+ +
+
物流发车日期
@@ -224,6 +228,12 @@ export default { }, data() { return { + pickerOptions: { + disabledDate(time) { + let oneDay = 3600 * 1000 * 24 * 5 + return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay + } + }, viewTitle: '', index: 0, tableKey: 0, @@ -278,7 +288,8 @@ export default { scmFiles: [], vehicleList: [], vehicleOrderSid: '', - orgPath: '' + orgPath: '', + priceDate: '' }, rules: {}, submitdisabled: false @@ -720,10 +731,6 @@ export default { }, saveEdit() { this.getUrl() - if (this.formobj.departureDate === '') { - this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' }) - return - } if (this.formobj.onceFreight === '') { this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) return @@ -732,6 +739,14 @@ export default { this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零,请完善一次运费' }) return } + if (this.formobj.departureDate === '') { + this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' }) + return + } + if (this.formobj.orgPriceDate === '') { + this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' }) + return + } if (this.freightChecked) { this.formobj.deductionFreight = 0 } else { @@ -792,14 +807,6 @@ export default { this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' }) return } - if (this.formobj.priceDate === '' || this.formobj.priceDate === null) { - this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' }) - return - } - if (this.formobj.departureDate === '') { - this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' }) - return - } if (this.formobj.onceFreight === '') { this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) return @@ -808,6 +815,18 @@ export default { this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零,请完善一次运费' }) return } + if (this.formobj.priceDate === '' || this.formobj.priceDate === null) { + this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' }) + return + } + if (this.formobj.orgPriceDate === '') { + this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' }) + return + } + if (this.formobj.departureDate === '') { + this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' }) + return + } if (this.freightChecked) { this.formobj.deductionFreight = 0 } else { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue index 3ebb9d146d..12241c087a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue @@ -196,11 +196,15 @@ - +
厂家入库日期
{{ formobj.priceDate }}
- + +
公司入库日期
+ {{ formobj.orgPriceDate }} +
+
物流发车日期
{{ formobj.departureDate }}
@@ -281,7 +285,8 @@ export default { deductionPolicyTwoOne: '', scmFiles: [], vehicleList: [], - vehicleOrderSid: '' + vehicleOrderSid: '', + priceDate: '' }, // 环节所需参数 linkByParameter: {