From 7b970c2666ae8d51147890b328d63040bddb751d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 16 十一月 2023 16:15:44 +0800
Subject: [PATCH] #
---
pages/home/home.vue | 51 +++++---
pages/order/orderPutOn2.vue | 10 +
pages/pakin/putOn.vue | 4
.idea/workspace.xml | 205 +++++----------------------------
pages.json | 12 ++
pages/pakin/pakin.vue | 32 ++---
6 files changed, 102 insertions(+), 212 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 864ad2d..0be88aa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,14 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
-<<<<<<< HEAD
- <list default="true" id="3511a345-4d79-4992-8675-dec24ac8e81a" name="Changes" comment="#" />
-=======
- <list default="true" id="27540a7d-3f63-4c4a-abfc-e2a9c26a1c3a" name="Changes" comment="#" />
->>>>>>> origin/mtmmwms
+ <list default="true" id="8e93bff3-97f8-4658-b238-9ec6c5240bb9" name="Changes" comment="#">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages.json" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/pages/home/home.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/home/home.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/pages/order/orderPutOn2.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order/orderPutOn2.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/pages/pakin/pakin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/pakin/pakin.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/pages/pakin/putOn.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/pakin/putOn.vue" afterDir="false" />
+ </list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -17,41 +20,26 @@
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
-<<<<<<< HEAD
- <entry key="$PROJECT_DIR$" value="jzwms" />
-=======
- <entry key="$PROJECT_DIR$" value="jkwms" />
->>>>>>> origin/mtmmwms
+ <entry key="$PROJECT_DIR$" value="hzjzwms2" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
-<<<<<<< HEAD
- <component name="ProblemsViewState">
- <option name="selectedTabId" value="DEPENDENCY_CHECKER_PROBLEMS_TAB" />
- </component>
<component name="ProjectColorInfo">{
- "associatedIndex": 3
+ "customColor": "",
+ "associatedIndex": 6
}</component>
- <component name="ProjectId" id="2VHdaWeRcDF4aLi2gteXpxKFc6A" />
-=======
- <component name="ProjectColorInfo">{
- "associatedIndex": 4
-}</component>
- <component name="ProjectId" id="2Wau6UBvwEwe0sjIaraE1SSyKsb" />
->>>>>>> origin/mtmmwms
+ <component name="ProjectId" id="2XszXxHRkBat0xJeUzzHKIegehA" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
-<<<<<<< HEAD
<component name="PropertiesComponent">{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"git-widget-placeholder": "mtmmwms",
- "last_opened_file_path": "D:/code/wms_app",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -63,169 +51,53 @@
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="3511a345-4d79-4992-8675-dec24ac8e81a" name="Changes" comment="" />
- <created>1694497003121</created>
+ <changelist id="8e93bff3-97f8-4658-b238-9ec6c5240bb9" name="Changes" comment="" />
+ <created>1699432620690</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1694497003121</updated>
- <workItem from="1694497004158" duration="77000" />
- <workItem from="1694497090912" duration="42000" />
- <workItem from="1694563354049" duration="1835000" />
- <workItem from="1694675928360" duration="1600000" />
- <workItem from="1694737629242" duration="4435000" />
- <workItem from="1694996440664" duration="1914000" />
- <workItem from="1695027292864" duration="9000" />
- <workItem from="1695084917461" duration="60000" />
- <workItem from="1695209023567" duration="226000" />
- <workItem from="1695797422085" duration="1404000" />
- <workItem from="1695869082373" duration="4077000" />
- <workItem from="1696464312188" duration="59000" />
- <workItem from="1696475917286" duration="739000" />
- <workItem from="1696577987827" duration="2943000" />
- <workItem from="1696636272247" duration="2712000" />
- <workItem from="1696647666333" duration="5472000" />
- <workItem from="1696809730844" duration="1238000" />
- <workItem from="1696896188372" duration="4500000" />
- <workItem from="1696912905390" duration="621000" />
- <workItem from="1697761064887" duration="1845000" />
- <workItem from="1698020142899" duration="63000" />
- <workItem from="1698891557598" duration="143000" />
- <workItem from="1698891705693" duration="308000" />
+ <updated>1699432620690</updated>
+ <workItem from="1699432622129" duration="606000" />
+ <workItem from="1699434354706" duration="221000" />
+ <workItem from="1699575110056" duration="3636000" />
+ <workItem from="1699695294520" duration="11000" />
+ <workItem from="1699843248051" duration="1939000" />
+ <workItem from="1699920329664" duration="1246000" />
+ <workItem from="1700008888115" duration="3591000" />
+ <workItem from="1700094259189" duration="885000" />
</task>
<task id="LOCAL-00001" summary="#">
<option name="closed" value="true" />
- <created>1694594752102</created>
+ <created>1699599060157</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
- <updated>1694594752102</updated>
+ <updated>1699599060157</updated>
</task>
- <task id="LOCAL-00002" summary="#璁㈠崟缁勬墭2">
+ <task id="LOCAL-00002" summary="#">
<option name="closed" value="true" />
- <created>1694681567501</created>
+ <created>1699843276193</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
- <updated>1694681567501</updated>
+ <updated>1699843276193</updated>
</task>
- <task id="LOCAL-00003" summary="#pda鐗╂枡椤甸潰">
+ <task id="LOCAL-00003" summary="#">
<option name="closed" value="true" />
- <created>1694766572703</created>
+ <created>1699853710158</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
- <updated>1694766572703</updated>
+ <updated>1699853710158</updated>
</task>
<task id="LOCAL-00004" summary="#">
<option name="closed" value="true" />
- <created>1695869225095</created>
+ <created>1700024086284</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
- <updated>1695869225095</updated>
+ <updated>1700024086284</updated>
</task>
- <task id="LOCAL-00005" summary="#">
- <option name="closed" value="true" />
- <created>1696464346991</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1696464346991</updated>
- </task>
- <task id="LOCAL-00006" summary="#">
- <option name="closed" value="true" />
- <created>1696581224085</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1696581224085</updated>
- </task>
- <task id="LOCAL-00007" summary="#">
- <option name="closed" value="true" />
- <created>1696582402892</created>
- <option name="number" value="00007" />
- <option name="presentableId" value="LOCAL-00007" />
- <option name="project" value="LOCAL" />
- <updated>1696582402892</updated>
- </task>
- <task id="LOCAL-00008" summary="#">
- <option name="closed" value="true" />
- <created>1696642603099</created>
- <option name="number" value="00008" />
- <option name="presentableId" value="LOCAL-00008" />
- <option name="project" value="LOCAL" />
- <updated>1696642603099</updated>
- </task>
- <task id="LOCAL-00009" summary="#">
- <option name="closed" value="true" />
- <created>1696667934350</created>
- <option name="number" value="00009" />
- <option name="presentableId" value="LOCAL-00009" />
- <option name="project" value="LOCAL" />
- <updated>1696667934350</updated>
- </task>
- <task id="LOCAL-00010" summary="#">
- <option name="closed" value="true" />
- <created>1696906209700</created>
- <option name="number" value="00010" />
- <option name="presentableId" value="LOCAL-00010" />
- <option name="project" value="LOCAL" />
- <updated>1696906209700</updated>
- </task>
- <task id="LOCAL-00011" summary="#">
- <option name="closed" value="true" />
- <created>1698891587271</created>
- <option name="number" value="00011" />
- <option name="presentableId" value="LOCAL-00011" />
- <option name="project" value="LOCAL" />
- <updated>1698891587271</updated>
- </task>
- <option name="localTasksCounter" value="12" />
-=======
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "ts.external.directory.path": "D:\\Program File\\IntelliJ IDEA 2023.1\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
- "vue.rearranger.settings.migration": "true"
- }
-}]]></component>
- <component name="RunManager">
- <configuration default="true" type="JetRunConfigurationType">
- <module name="wms_app" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
- <module name="wms_app" />
- <option name="filePath" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- </component>
- <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="27540a7d-3f63-4c4a-abfc-e2a9c26a1c3a" name="Changes" comment="#" />
- <created>1696982837648</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1696982837648</updated>
- <workItem from="1696982840108" duration="1034000" />
- <workItem from="1697069029748" duration="1200000" />
- <workItem from="1697160928498" duration="612000" />
- <workItem from="1697330263478" duration="2880000" />
- <workItem from="1697449532351" duration="17000" />
- <workItem from="1697760672872" duration="47000" />
- </task>
->>>>>>> origin/mtmmwms
+ <option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -242,11 +114,7 @@
<entry key="branch">
<value>
<list>
-<<<<<<< HEAD
<option value="mtmmwms" />
-=======
- <option value="origin/jkwms" />
->>>>>>> origin/mtmmwms
</list>
</value>
</entry>
@@ -259,11 +127,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
-<<<<<<< HEAD
- <MESSAGE value="#璁㈠崟缁勬墭2" />
- <MESSAGE value="#pda鐗╂枡椤甸潰" />
-=======
->>>>>>> origin/mtmmwms
<MESSAGE value="#" />
<option name="LAST_COMMIT_MESSAGE" value="#" />
</component>
diff --git a/pages.json b/pages.json
index 0046b12..6bf919c 100644
--- a/pages.json
+++ b/pages.json
@@ -36,6 +36,18 @@
"navigationBarTitleText": "璁㈠崟缁勬墭"
}
},
+ {
+ "path": "pages/pakin/goodsUp",
+ "style": {
+ "navigationBarTitleText": "骞冲簱涓婃灦"
+ }
+ },
+ {
+ "path": "pages/pakin/goodsDown",
+ "style": {
+ "navigationBarTitleText": "骞冲簱涓嬫灦"
+ }
+ },
{
"path": "pages/order/orderPutOn",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 66477d4..385f85f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,27 +24,42 @@
icon: '',
elements: [],
elements2: [
+
{
- title: '缁勬墭鍏ュ簱',
+ title: '骞冲簱涓婃灦',
+ name: 'goodsUp',
+ color: 'pink',
+ cuIcon: 'pullup',
+ url: '/pakin/goodsUp'
+ },
+ {
+ title: '骞冲簱涓嬫灦',
+ name: 'goodsDown',
+ color: 'orange',
+ cuIcon: 'pullup',
+ url: '/pakin/goodsDown'
+ },
+ {
+ title: '骞冲簱缁勬墭',
name: 'pakin',
color: 'orange',
cuIcon: 'pullup',
url: '/pakin/pakin'
},
- {
- title: '璁㈠崟缁勬墭',
- name: 'orderPakin',
- color: 'blue',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
- },
// {
// title: '璁㈠崟缁勬墭',
- // name: 'putOn',
- // color: 'cyan',
+ // name: 'orderPakin',
+ // color: 'blue',
// cuIcon: 'pullup',
- // url: '/order/orderPutOn2'
+ // url: '/order/orderPakin'
// },
+ {
+ title: '璁㈠崟缁勬墭',
+ name: 'putOn',
+ color: 'cyan',
+ cuIcon: 'pullup',
+ url: '/order/orderPutOn2'
+ },
{
title: '缁勬墭涓婃灦',
name: 'putOn',
@@ -74,13 +89,13 @@
// cuIcon: 'pullup',
// url: '/order/orderPutOn'
// },
- {
- title: '璁㈠崟涓嬫灦',
- name: 'orderPutDown',
- color: 'pink',
- cuIcon: 'pulldown',
- url: '/order/orderPutDown'
- },
+ // {
+ // title: '璁㈠崟涓嬫灦',
+ // name: 'orderPutDown',
+ // color: 'pink',
+ // cuIcon: 'pulldown',
+ // url: '/order/orderPutDown'
+ // },
{
title: '鎷ｈ揣涓嬫灦',
name: 'pickOffLines',
diff --git a/pages/order/orderPutOn2.vue b/pages/order/orderPutOn2.vue
index bca6b30..441789e 100644
--- a/pages/order/orderPutOn2.vue
+++ b/pages/order/orderPutOn2.vue
@@ -156,7 +156,7 @@
order: '',
barcode: '',
barcodeFocus: '',
- dataList: [{}],
+ dataList: [],
checkedDataList: [],
count: 0,
rowNum: '',
@@ -176,6 +176,11 @@
orderNoList: [],
orderNo: '',
}
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.getOrderNoList()
},
methods: {
set(e) {
@@ -203,6 +208,7 @@
if (res.code === 200) {
that.dataList = res.data
for (var i = 0; i < that.dataList.length; i++) {
+ that.dataList[i].anfme = 0
that.$set(that.dataList[i],'checked',false)
}
}
@@ -219,7 +225,7 @@
success(res) {
res = res.data
for (var i = 0; i < res.data.length; i++) {
- that.orderNoList.push(res.data[i].order_no)
+ that.orderNoList.push(res.data[i].orderNo)
}
}
})
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 46a7040..456e187 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -7,13 +7,13 @@
@input="barcodeInput()">
</view>
<view class="item">
- <view class="code-decs">鍒嗗寘鐮�:</view>
+ <view class="code-decs">鐗╂枡鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
- <!-- <view class="item-right">
+ <view class="item-right">
<button></button>
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
<uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view> -->
+ </view>
</view>
</view>
<view class="mat-list-title">
@@ -27,35 +27,29 @@
<view class="left-item">{{i + 1}}</view>
</view>
<view class="list-left-item">
- <view class="desc">璁㈠崟鍙凤細</view>
- <view class="left-item">
- <uni-tag :text="item.orderNo" type="primary"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鍒嗗寘鐮侊細</view>
+ <view class="desc">缂栫爜锛�</view>
<view class="left-item">
<uni-tag :text="item.matnr" type="primary"></uni-tag>
</view>
</view>
<view class="list-left-item">
- <view class="desc">鐗╂祦鏂瑰悜锛�</view>
- <view class="left-item">{{item.logisticsTo}}</view>
+ <view class="desc">鍝佸悕锛�</view>
+ <view class="left-item">{{item.maktx}}</view>
</view>
<view class="list-left-item">
- <view class="desc">鍒嗙被锛�</view>
- <view class="left-item">{{item.tag}}</view>
+ <view class="desc">瑙勬牸锛�</view>
+ <view class="left-item">{{item.specs}}</view>
</view>
<view class="list-left-item">
- <view class="desc">灏哄锛�</view>
+ <view class="desc">鎵瑰彿锛�</view>
<view class="left-item">
- {{item.size}}
+ <uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
<view class="list-left-item">
- <view class="desc">浣撶Н锛�</view>
+ <view class="desc">閲嶉噺锛�</view>
<view class="left-item">
- {{item.volume}}
+ <uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
</view>
<view class="list-left-item">
@@ -214,7 +208,7 @@
findMat() {
let that = this
uni.request({
- url: that.baseUrl + '/order/createOrder',
+ url: that.baseUrl + '/mat/auth',
data: {
matnr: that.matnr
},
diff --git a/pages/pakin/putOn.vue b/pages/pakin/putOn.vue
index 66c6801..e60480a 100644
--- a/pages/pakin/putOn.vue
+++ b/pages/pakin/putOn.vue
@@ -306,7 +306,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪涓婃灦!'
this.$refs.combConfirm.open()
},
comb() {
@@ -332,7 +332,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "涓婃灦鎴愬姛"
that.messageToggle('success')
} else if (res.code == 403) {
that.messageText = res.msg
--
Gitblit v1.9.1