Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄媛媛
ElectricitySheep
Commits
9ecc4e6f
Commit
9ecc4e6f
authored
Feb 28, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商品批量设置价格修改
parent
11d8074b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
1582 additions
and
1724 deletions
+1582
-1724
goodsListEdit.vue
src/components/CommodityMan/goodsListEdit.vue
+3
-4
materialMan.vue
src/components/CommodityMan/materialMan.vue
+0
-1
memberGroup.vue
src/components/UserMan/memberGroup.vue
+0
-2
edit.vue
src/components/coffeeManage/edit.vue
+15
-15
index.vue
src/components/coffeeManage/index.vue
+1
-3
orderList.vue
src/components/coffeeManage/orderList.vue
+0
-1
afterSalesOrder.vue
src/components/orderMan/afterSalesOrder.vue
+980
-945
adminList.vue
src/components/phoneManage/adminList.vue
+0
-1
billboardList.vue
src/components/tradePavilion/billboardList.vue
+368
-537
listRegistration.vue
src/components/tradePavilion/listRegistration.vue
+215
-213
signList.vue
src/components/tradePavilion/signList.vue
+0
-2
No files found.
src/components/CommodityMan/goodsListEdit.vue
View file @
9ecc4e6f
...
@@ -399,13 +399,13 @@
...
@@ -399,13 +399,13 @@
:key=
"rIndex"
multiple
style=
"width:130px"
size=
"small"
>
:key=
"rIndex"
multiple
style=
"width:130px"
size=
"small"
>
<el-option
label=
"全部"
:value=
"-1"
></el-option>
<el-option
label=
"全部"
:value=
"-1"
></el-option>
<el-option
v-for=
"(subItem,subIndex) in rItem.SpecificationValueList"
<el-option
v-for=
"(subItem,subIndex) in rItem.SpecificationValueList"
:key=
"subIndex"
:label=
"subItem.Name"
:value=
"subI
ndex+1
"
></el-option>
:key=
"subIndex"
:label=
"subItem.Name"
:value=
"subI
tem.Sort
"
></el-option>
</el-select>
</el-select>
</
template
>
</
template
>
</template>
</template>
<el-input
style=
"width:
28
0px;"
size=
"small"
v-model=
"valpl"
placeholder=
"请输入内容"
<el-input
style=
"width:
30
0px;"
size=
"small"
v-model=
"valpl"
placeholder=
"请输入内容"
class=
"input-with-select"
>
class=
"input-with-select"
>
<el-select
style=
"width:1
0
0px"
v-model=
"ggpl"
slot=
"prepend"
placeholder=
"请选择"
>
<el-select
style=
"width:1
2
0px"
v-model=
"ggpl"
slot=
"prepend"
placeholder=
"请选择"
>
<el-option
label=
"价格"
:value=
"1"
></el-option>
<el-option
label=
"价格"
:value=
"1"
></el-option>
<el-option
label=
"库存"
:value=
"2"
></el-option>
<el-option
label=
"库存"
:value=
"2"
></el-option>
<el-option
label=
"成本价"
:value=
"5"
></el-option>
<el-option
label=
"成本价"
:value=
"5"
></el-option>
...
@@ -1625,7 +1625,6 @@
...
@@ -1625,7 +1625,6 @@
this
.
ggplList
.
forEach
(
subItem
=>
{
this
.
ggplList
.
forEach
(
subItem
=>
{
var
findRow
=
chooseSpecList
[
index
];
var
findRow
=
chooseSpecList
[
index
];
if
(
subItem
.
SpecificationSort
==
findRow
)
{
if
(
subItem
.
SpecificationSort
==
findRow
)
{
console
.
log
(
findRow
,
"findRow"
)
if
(
this
.
ggpl
==
1
)
{
if
(
this
.
ggpl
==
1
)
{
item
.
SellingPrice
=
this
.
valpl
;
item
.
SellingPrice
=
this
.
valpl
;
}
}
...
...
src/components/CommodityMan/materialMan.vue
View file @
9ecc4e6f
...
@@ -314,7 +314,6 @@
...
@@ -314,7 +314,6 @@
canvas
.
height
=
140
;
canvas
.
height
=
140
;
canvas
.
getContext
(
'2d'
).
drawImage
(
video
,
0
,
0
,
video
.
clientWidth
,
video
.
clientHeight
)
canvas
.
getContext
(
'2d'
).
drawImage
(
video
,
0
,
0
,
video
.
clientWidth
,
video
.
clientHeight
)
base64Str
=
canvas
.
toDataURL
(
'image/jpeg'
);
base64Str
=
canvas
.
toDataURL
(
'image/jpeg'
);
console
.
log
(
"base64Str"
,
base64Str
)
var
arr
=
base64Str
.
split
(
','
);
// 分隔base64编码的头部信息
var
arr
=
base64Str
.
split
(
','
);
// 分隔base64编码的头部信息
var
mime
=
arr
[
0
].
match
(
/:
(
.*
?)
;/
)[
1
];
// 获取MIME类型
var
mime
=
arr
[
0
].
match
(
/:
(
.*
?)
;/
)[
1
];
// 获取MIME类型
var
bstr
=
atob
(
arr
[
1
]);
// Base64解码
var
bstr
=
atob
(
arr
[
1
]);
// Base64解码
...
...
src/components/UserMan/memberGroup.vue
View file @
9ecc4e6f
...
@@ -178,8 +178,6 @@
...
@@ -178,8 +178,6 @@
this
.
apipost
(
"/api/User/GetMemberGroup"
,
{
this
.
apipost
(
"/api/User/GetMemberGroup"
,
{
GroupId
:
item
.
GroupId
GroupId
:
item
.
GroupId
},
res
=>
{
},
res
=>
{
console
.
log
(
res
);
});
});
},
},
//删除分组
//删除分组
...
...
src/components/coffeeManage/edit.vue
View file @
9ecc4e6f
...
@@ -33,7 +33,8 @@
...
@@ -33,7 +33,8 @@
<!--
<el-radio
:label=
"3"
>
教室类
</el-radio>
-->
<!--
<el-radio
:label=
"3"
>
教室类
</el-radio>
-->
</el-radio-group>
</el-radio-group>
<div
v-if=
"addMsg.GoodsEduType == 2"
>
<div
v-if=
"addMsg.GoodsEduType == 2"
>
<el-button
type=
"primary"
@
click=
"isShowZC=true"
style=
"margin:0 10px;"
size=
"mini"
:disabled=
"addMsg.Id > 0"
>
选择资产
<el-button
type=
"primary"
@
click=
"isShowZC=true"
style=
"margin:0 10px;"
size=
"mini"
:disabled=
"addMsg.Id > 0"
>
选择资产
</el-button>
</el-button>
<span
v-if=
"addMsg.MaterialId"
>
资产编号:
{{
addMsg
.
MaterialId
}}
</span>
<span
v-if=
"addMsg.MaterialId"
>
资产编号:
{{
addMsg
.
MaterialId
}}
</span>
</div>
</div>
...
@@ -1374,7 +1375,7 @@
...
@@ -1374,7 +1375,7 @@
this
.
getData
();
this
.
getData
();
}
else
{
}
else
{
this
.
getTree
();
this
.
getTree
();
}
}
if
(
this
.
currentUserInfo
.
IsOpenSchool
==
0
)
{
if
(
this
.
currentUserInfo
.
IsOpenSchool
==
0
)
{
this
.
isShowPlat
=
false
;
this
.
isShowPlat
=
false
;
...
@@ -2415,10 +2416,9 @@
...
@@ -2415,10 +2416,9 @@
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
options
=
res
.
data
.
data
;
this
.
options
=
res
.
data
.
data
;
console
.
log
(
2418
,
this
.
$route
.
query
.
GoodsId
,
this
.
options
)
if
(
this
.
$route
.
query
.
GoodsId
==
0
)
{
if
(
this
.
$route
.
query
.
GoodsId
==
0
){
this
.
SupplierId
=
this
.
options
[
0
].
ID
this
.
SupplierId
=
this
.
options
[
0
].
ID
}
}
}
}
});
});
},
},
...
@@ -2518,15 +2518,15 @@
...
@@ -2518,15 +2518,15 @@
this
.
addMsg
.
SellingPrice
=
val
.
SellPrice
this
.
addMsg
.
SellingPrice
=
val
.
SellPrice
this
.
addMsg
.
OriginalPrice
=
val
.
SellPrice
this
.
addMsg
.
OriginalPrice
=
val
.
SellPrice
this
.
addMsg
.
CostPrice
=
val
.
Money
this
.
addMsg
.
CostPrice
=
val
.
Money
this
.
addMsg
.
Unit
=
val
.
Units
||
'件'
this
.
addMsg
.
Unit
=
val
.
Units
||
'件'
this
.
addMsg
.
InventoryNum
=
val
.
InventoryNum
this
.
addMsg
.
InventoryNum
=
val
.
InventoryNum
this
.
defaultMsg
=
val
.
Name
this
.
defaultMsg
=
val
.
Name
this
.
addggxm2
()
this
.
addggxm2
()
this
.
addGgz2
(
this
.
SpecificationList
[
0
],
0
)
this
.
addGgz2
(
this
.
SpecificationList
[
0
],
0
)
this
.
ggzChange
()
this
.
ggzChange
()
this
.
SpecificationPriceList
[
0
].
SellingPrice
=
val
.
SellPrice
this
.
SpecificationPriceList
[
0
].
SellingPrice
=
val
.
SellPrice
this
.
SpecificationPriceList
[
0
].
InventoryNum
=
val
.
InventoryNum
this
.
SpecificationPriceList
[
0
].
InventoryNum
=
val
.
InventoryNum
this
.
SpecificationPriceList
[
0
].
CostMoney
=
val
.
Money
this
.
SpecificationPriceList
[
0
].
CostMoney
=
val
.
Money
}
}
},
},
// 添加规格模板2
// 添加规格模板2
...
@@ -2540,20 +2540,20 @@
...
@@ -2540,20 +2540,20 @@
Id
:
0
,
Id
:
0
,
EnabledImage
:
2
EnabledImage
:
2
};
};
this
.
SpecificationList
[
0
]
=
obj
;
this
.
SpecificationList
[
0
]
=
obj
;
},
},
// 添加规格值2
// 添加规格值2
addGgz2
(
item
,
index
)
{
addGgz2
(
item
,
index
)
{
let
obj
=
{
let
obj
=
{
Id
:
0
,
Id
:
0
,
Image
:
""
,
Image
:
""
,
Name
:
"1"
+
this
.
addMsg
.
Unit
,
Name
:
"1"
+
this
.
addMsg
.
Unit
,
Sort
:
item
.
SpecificationValueList
.
length
>
0
?
Sort
:
item
.
SpecificationValueList
.
length
>
0
?
item
.
SpecificationValueList
[
item
.
SpecificationValueList
[
item
.
SpecificationValueList
.
length
-
1
item
.
SpecificationValueList
.
length
-
1
].
Sort
+
1
:
item
.
SpecificationValueList
.
length
+
1
].
Sort
+
1
:
item
.
SpecificationValueList
.
length
+
1
};
};
this
.
SpecificationList
[
index
].
SpecificationValueList
[
0
]
=
obj
;
this
.
SpecificationList
[
index
].
SpecificationValueList
[
0
]
=
obj
;
},
},
}
}
};
};
...
...
src/components/coffeeManage/index.vue
View file @
9ecc4e6f
...
@@ -470,7 +470,7 @@
...
@@ -470,7 +470,7 @@
EndTime
:
""
,
EndTime
:
""
,
OrderBy
:
0
,
OrderBy
:
0
,
Q_GoodsEduType
:
1
,
Q_GoodsEduType
:
1
,
MaterialId
:
""
,
MaterialId
:
""
,
},
},
total
:
0
,
total
:
0
,
tableData
:
[],
tableData
:
[],
...
@@ -901,7 +901,6 @@
...
@@ -901,7 +901,6 @@
}
}
},
},
mounted
()
{
mounted
()
{
let
that
=
this
;
let
that
=
this
;
if
(
localStorage
.
getItem
(
"iframeData"
))
{
if
(
localStorage
.
getItem
(
"iframeData"
))
{
that
.
getList
();
that
.
getList
();
...
@@ -913,7 +912,6 @@
...
@@ -913,7 +912,6 @@
}
}
window
.
addEventListener
(
"message"
,
function
(
messageEvent
)
{
window
.
addEventListener
(
"message"
,
function
(
messageEvent
)
{
let
data
=
messageEvent
.
data
||
''
;
let
data
=
messageEvent
.
data
||
''
;
console
.
log
(
"收到vue的数据:"
,
data
);
if
(
data
.
indexOf
(
'token'
)
>
-
1
)
{
if
(
data
.
indexOf
(
'token'
)
>
-
1
)
{
window
.
localStorage
.
setItem
(
"iframeData"
,
data
);
window
.
localStorage
.
setItem
(
"iframeData"
,
data
);
}
}
...
...
src/components/coffeeManage/orderList.vue
View file @
9ecc4e6f
...
@@ -1023,7 +1023,6 @@
...
@@ -1023,7 +1023,6 @@
}
}
window
.
addEventListener
(
"message"
,
function
(
messageEvent
)
{
window
.
addEventListener
(
"message"
,
function
(
messageEvent
)
{
let
data
=
messageEvent
.
data
||
''
;
let
data
=
messageEvent
.
data
||
''
;
console
.
log
(
"收到的数据:"
,
data
);
if
(
data
.
indexOf
(
'token'
)
>
-
1
)
{
if
(
data
.
indexOf
(
'token'
)
>
-
1
)
{
window
.
localStorage
.
setItem
(
"iframeData"
,
data
);
window
.
localStorage
.
setItem
(
"iframeData"
,
data
);
}
}
...
...
src/components/orderMan/afterSalesOrder.vue
View file @
9ecc4e6f
This diff is collapsed.
Click to expand it.
src/components/phoneManage/adminList.vue
View file @
9ecc4e6f
...
@@ -188,7 +188,6 @@ export default {
...
@@ -188,7 +188,6 @@ export default {
});
});
},
},
ChangeListName
(
val
)
{
ChangeListName
(
val
)
{
console
.
log
(
'tag'
,
val
)
this
.
usermsg
.
Name
=
val
;
this
.
usermsg
.
Name
=
val
;
this
.
getUserList
();
this
.
getUserList
();
},
},
...
...
src/components/tradePavilion/billboardList.vue
View file @
9ecc4e6f
This diff is collapsed.
Click to expand it.
src/components/tradePavilion/listRegistration.vue
View file @
9ecc4e6f
This diff is collapsed.
Click to expand it.
src/components/tradePavilion/signList.vue
View file @
9ecc4e6f
...
@@ -438,11 +438,9 @@ export default {
...
@@ -438,11 +438,9 @@ export default {
// 详情
// 详情
seeDetail
(
row
,
UserName
,
item
)
{
seeDetail
(
row
,
UserName
,
item
)
{
this
.
detailDialog
=
true
;
this
.
detailDialog
=
true
;
// let data = JSON.parse(row.Content);
this
.
seeData
=
row
;
this
.
seeData
=
row
;
this
.
UserName
=
UserName
this
.
UserName
=
UserName
this
.
information
=
item
this
.
information
=
item
console
.
log
(
'llllllllllllllllllllll'
,
row
);
},
},
ChangeListName
(
val
)
{
ChangeListName
(
val
)
{
this
.
usermsg
.
Name
=
val
;
this
.
usermsg
.
Name
=
val
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment