From f9dde5f2f75298ff2aa50f2f7ecff3b47ac570e9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 18 十月 2023 11:05:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into wn
---
src/views/warehouseManage/bussinessType/index.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/views/warehouseManage/bussinessType/index.vue b/src/views/warehouseManage/bussinessType/index.vue
index d81f3dc..11fe1c6 100644
--- a/src/views/warehouseManage/bussinessType/index.vue
+++ b/src/views/warehouseManage/bussinessType/index.vue
@@ -3,7 +3,7 @@
<div class="top">
<SearchCommonView
:add-title="'鏂板缓'"
- :placeholder="'璇疯緭鍏ュ崟鍙�'"
+ :placeholder="'璇疯緭鍏ュ叆搴撶被鍨�'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
@@ -58,7 +58,8 @@
setTable() {
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -77,7 +78,7 @@
let tableColumn = [
{
label: "鍏ュ簱绫诲瀷",
- prop: "id",
+ prop: "name",
isShowColumn: true,
default: true
},
@@ -123,15 +124,25 @@
// 琛岀偣鍑�
tableRowClick(row) {
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row }
+ let obj=JSON.parse(JSON.stringify(row))
+ for(let i in obj){
+ if(i=='name'||i=='prefix'){
+ obj[i]=obj[i]?obj[i]:''
+ }else{
+ obj[i]=obj[i]?obj[i]:null
+ }
+ }
+ this.editConfig.infomation = { ...obj }
this.editConfig.visible = true
},
// 鏂板缓
addBtnClick() {
this.editConfig.title = "鏂板缓"
this.editConfig.infomation={
+ name:'',
+ prefix:'',
// 浣滀笟绫诲瀷
- baseOperationType:null,
+ baseOperationType:null,
// 閫�璐х被鍨�
returnOperationTypeID:null,
// 鍒涘缓娆犲崟
@@ -139,7 +150,8 @@
// 浠撳簱
warehouseId:null,
// 鏄剧ず浣滀笟璇︽儏
- showOperations:null,
+ showOperations:false,
+ earlyOperations:null,
// 淇濈暀鏂瑰紡
reservationMethod:null,
// 榛樿鍘熶綅缃�
--
Gitblit v1.8.0