新购验收
{{active == 1 ? '已完成' : '未完成'}}
@@ -40,35 +45,43 @@
到货时间:
- {{ item.arrivalTime }}
+ {{ item.arrivalTime }}
采购单号:
- {{ item.code }}
+ {{ item.code }}
采购物资:
- {{ item.purchaseMaTypeName }}
+ {{ item.purchaseMaTypeName }}
到货数量:
- {{ item.purchaseMaNumber }}
+ {{ item.purchaseMaNumber }}
验收数量:
-
+
diff --git a/src/pages/picking/outbound/index.vue b/src/pages/picking/outbound/index.vue
new file mode 100644
index 0000000..36e5266
--- /dev/null
+++ b/src/pages/picking/outbound/index.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index 9d4efad..816bbfa 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -1,24 +1,64 @@
-
- {{ item.title }}
-
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
diff --git a/src/static/workbench/fetchMaterialOutStore.png b/src/static/workbench/fetchMaterialOutStore.png
new file mode 100644
index 0000000..9ec7aae
Binary files /dev/null and b/src/static/workbench/fetchMaterialOutStore.png differ
diff --git a/src/static/workbench/newInStore.png b/src/static/workbench/newInStore.png
new file mode 100644
index 0000000..b94f0aa
Binary files /dev/null and b/src/static/workbench/newInStore.png differ
diff --git a/src/styles/reset.css b/src/styles/reset.css
index 086aa3e..4fdba9d 100644
--- a/src/styles/reset.css
+++ b/src/styles/reset.css
@@ -1,35 +1,70 @@
/* 基础设置 */
-body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{
+body,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+hr,
+p,
+blockquote,
+dl,
+dt,
+dd,
+ul,
+ol,
+li,
+pre,
+form,
+fieldset,
+legend,
+button,
+input,
+textarea,
+th,
+td {
margin: 0;
padding: 0;
}
-ul,ol {
+ul,
+ol {
list-style: none;
}
img {
/* 底部留白 */
display: block;
- border:0;
+ border: 0;
}
-b,strong {
+b,
+strong {
font-weight: 400;
}
-h1,h2,h3,h4,h5,h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
/* 父元素字号的百分比 */
font-size: 100%;
font-weight: normal;
}
-i,em {
+i,
+em {
/* 不倾斜 */
font-style: normal;
}
-u,ins,s,del {
+u,
+ins,
+s,
+del {
/* 去掉中划线和下划线 */
text-decoration: none;
}
@@ -42,19 +77,21 @@ table {
border-collapse: collapse;
}
-td,th {
+td,
+th {
border: 1px solid #999;
}
-input,button {
+input,
+button {
/* 去掉轮廓线 */
outline: none;
- border:none;
+ border: none;
}
/* 风格设置 */
body {
- font: 12px/1.5 "Microsoft YaHei", Tahoma, Helvetica, Arial, "\5b8b\4f53", sans-serif;
+ font: 12px/1.5 'Microsoft YaHei', Tahoma, Helvetica, Arial, '\5b8b\4f53', sans-serif;
color: #333;
}
@@ -64,7 +101,7 @@ a {
}
a:hover {
- color:#DD302D;
+ color: #dd302d;
text-decoration: none;
}
@@ -77,7 +114,12 @@ a:hover {
}
.clearfix::after {
- content: "";
+ content: '';
display: block;
clear: both;
}
+
+page {
+ height: 100%;
+ font-size: 16px;
+}
diff --git a/src/utils/http.js b/src/utils/http.js
index 95eae8c..10f04b6 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -33,7 +33,6 @@ const httpInterceptor = {
const memberStore = useMemberStore()
const token = memberStore.token
- console.log('token---', token)
// const token = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjQ2NDdmYjlkLWI5OTItNDRiNy05MTdkLTMwZjg0ZjUxYzM5MCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.9xM5bFhrmHK09-4ZgL5SS8WraNIJjIijuB-1P0lJF-n0KlVM5Bglvyjltk1NQbdqgi1hwRocZS1OU41cLiwuig"
if (token) {
options.header.Authorization = token