Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
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
周远喜
mes-ui
Commits
f01d4d91
Commit
f01d4d91
authored
May 22, 2020
by
康振飞
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product
parents
ca3126bb
25cd92c6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
240 deletions
+27
-240
zh-CN.js
i18n/locale/zh-CN.js
+10
-0
index.vue
pages/crm/customer/index.vue
+2
-2
orderlist.vue
pages/produce/orderlist.vue
+15
-238
No files found.
i18n/locale/zh-CN.js
View file @
f01d4d91
...
...
@@ -1438,5 +1438,15 @@ export default {
productUrl
:
'产品图像url'
,
productUrlList
:
'产品图象列表'
,
},
order_list
:{
mesCode
:
'订单编号'
,
status
:
'工单状态'
,
productName
:
'产品名称'
,
drawnNumber
:
'图号'
,
quantity
:
'生产数量'
,
beginTime
:
'开始时间'
,
endTime
:
'结束时间'
,
action
:
'操作'
}
}
pages/crm/customer/index.vue
View file @
f01d4d91
...
...
@@ -5,7 +5,7 @@
<Form
ref=
"formInline"
:model=
"easySearch"
inline
>
<FormItem
prop=
"keys"
>
<Input
placeholder=
"请输入关键字客户名称/
客户简称/邮政地址/负责人/办公电话/手机/客户类型/客户区域/备注/客户编码/行业
"
placeholder=
"请输入关键字客户名称/
办公电话
"
v-model=
"easySearch.keys.value"
search
enter-button
...
...
@@ -55,7 +55,7 @@ export default {
easySearch
:
{
keys
:
{
op
:
'name,
abbre,address,principal,telephone,mobile,type,area,notes,code,trad
e'
,
'name,
telephon
e'
,
value
:
null
}
},
...
...
pages/produce/orderlist.vue
View file @
f01d4d91
This diff is collapsed.
Click to expand it.
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