@@ -99,6 +108,19 @@
+
+
+
@@ -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 @@
-
-
+
+
{{ scope.row.vinNo }}
-
+
{{ scope.row.InventoryDate }}
-
+
{{ scope.row.location }}
@@ -62,11 +62,16 @@
{{ scope.row.inventoryName }}
-
+
{{ scope.row.InventoryState }}
+
+
+ 查看
+
+
{{ scope.row.remarks }}
@@ -82,6 +87,18 @@
+
+
+
@@ -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) {
From c946876f6a309d760c14939b616e61c57c77f893 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 9 Feb 2023 15:49:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 }
From 9495bb0ec122474443b5f857ee81ef13e28c17db Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 9 Feb 2023 16:23:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93--?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=8F=B8=E5=85=A5=E5=BA=93=E6=97=A5?=
=?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ruzhang/ruzhangguanli/ruzhangAdd.vue | 37 +++++++++-----
.../ruzhang/ruzhangguanli/ruzhangInfo.vue | 11 +++--
.../ruzhangguanli/ruzhangDaiBanInfo.vue | 11 +++--
.../ruzhangguanli/ruzhangEdit.vue | 49 +++++++++++++------
.../ruzhangguanli/ruzhangYiBanInfo.vue | 11 +++--
5 files changed, 84 insertions(+), 35 deletions(-)
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 @@