push

.hbuilderx/launch.json

@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

components/p-inputSearch/inputSearch.vue

@@ -0,0 +1,113 @@
+<template>
+	<!--
+	<inputSearch :dataSource="dataSource" @select="handleChange" placeholder="请输入商品名称" />
+	//数据源
+	dataSource: [{
+			id: 1,
+			name: '耐克1'
+		},
+		{
+			id: 2,
+			name: '耐克2'
+		}
+	],
+	 
+	 //用户点击获取的数据
+	 handleChange(data) {
+	 	console.log(data)
+	 }
+	 
+	 -->
+	<view class="input-group">
+		<input :placeholder="placeholder" @input="search" @blur="hideList" v-model="name" />
+		<view class="ul">
+			<view class="li" v-for="(item,index) in list" :key="index" @tap="select(item)">{{item.name}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			placeholder: String, //默认提示
+			searchKey: String, //模糊搜索的key值
+			dataSource: {
+				type: Array,
+				default: function() { //数据源
+					return [];
+				}
+			}
+		},
+		data() {
+			return {
+				list: [],
+				name: '',
+				backName: ''
+			};
+		},
+		destroyed() {
+			clearTimeout(this.t);
+		},
+		methods: {
+			search(e) {
+				let val = e.detail.value;
+				let {
+					dataSource
+				} = this;
+				let arr = [];
+				for (let i = 0; i < dataSource.length; i++) {
+					if (dataSource[i].name.indexOf(val) !== -1) {
+						arr.push(dataSource[i]);
+					}
+				}
+				// console.log(arr)
+				if (!val) {
+					this.list = [];
+				} else {
+					this.list = arr;
+				}
+
+			},
+			select(item) {
+				this.backName = item.name;
+				this.list = [];
+				this.$emit('select', item);
+			},
+			hideList() {
+				this.list = [];
+				this.t = setTimeout(() => {
+					this.name = this.backName;
+				}, 0);
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.input-group {
+		position: relative;
+
+
+		input {
+			border: 1upx solid gray;
+			height: 90upx;
+			padding-left: 10upx;
+			font-size: 30upx;
+			box-sizing: border-box;
+		}
+
+		.ul {
+			position: absolute;
+			left: 0;
+			top: 100%;
+			width: 100%;
+			background: #eaeaea;
+
+			.li {
+				border-bottom: 1upx solid gray;
+				line-height: 60upx;
+			}
+		}
+	}
+</style>

manifest.json

@@ -1,112 +1,112 @@
 {
-    "name" : "wms",
-    "appid" : "__UNI__5D5D9CA",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "compatible" : {
-            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
-        },
-        "statusbar" : {
-            "immersed" : false,
-            "background" : "#ff0505"
-        },
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {
-            "Barcode" : {},
-            "Camera" : {}
-        },
-        "plugins" : {
-            "H5plus" : {
-                "version" : "1.0.0",
-                "provider" : "io.dcloud.H5plus"
-            }
-        },
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {},
-            "splashscreen" : {
-                "iosStyle" : "common",
-                "androidStyle" : "common"
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            }
-        }
+  "name": "wmsBaisuilai",
+  "appid": "__UNI__AE3CE08",
+  "description": "",
+  "versionName": "1.0.0",
+  "versionCode": "100",
+  "transformPx": false,
+  "app-plus": {
+    /* 5+App特有相关 */
+    "usingComponents": true,
+    "nvueCompiler": "uni-app",
+    "nvueStyleCompiler": "uni-app",
+    "compatible": {
+      "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
     },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
+    "statusbar": {
+      "immersed": false,
+      "background": "#ff0505"
+    },
+    "splashscreen": {
+      "alwaysShowBeforeRender": true,
+      "waiting": true,
+      "autoclose": true,
+      "delay": 0
+    },
+    "modules": {
+      "Barcode": {},
+      "Camera": {}
+    },
+    "plugins": {
+      "H5plus": {
+        "version": "1.0.0",
+        "provider": "io.dcloud.H5plus"
+      }
+    },
+    /* 模块配置 */
+    "distribute": {
+      /* 应用发布信息 */
+      "android": {
+        /* android打包配置 */
+        "permissions": [
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      "ios": {},
+      /* ios打包配置 */
+      "sdkConfigs": {},
+      "splashscreen": {
+        "iosStyle": "common",
+        "androidStyle": "common"
+      },
+      "icons": {
+        "android": {
+          "hdpi": "unpackage/res/icons/72x72.png",
+          "xhdpi": "unpackage/res/icons/96x96.png",
+          "xxhdpi": "unpackage/res/icons/144x144.png",
+          "xxxhdpi": "unpackage/res/icons/192x192.png"
         },
-        "usingComponents" : true
+        "ios": {
+          "appstore": "unpackage/res/icons/1024x1024.png",
+          "ipad": {
+            "app": "unpackage/res/icons/76x76.png",
+            "app@2x": "unpackage/res/icons/152x152.png",
+            "notification": "unpackage/res/icons/20x20.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "proapp@2x": "unpackage/res/icons/167x167.png",
+            "settings": "unpackage/res/icons/29x29.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "spotlight": "unpackage/res/icons/40x40.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png"
+          },
+          "iphone": {
+            "app@2x": "unpackage/res/icons/120x120.png",
+            "app@3x": "unpackage/res/icons/180x180.png",
+            "notification@2x": "unpackage/res/icons/40x40.png",
+            "notification@3x": "unpackage/res/icons/60x60.png",
+            "settings@2x": "unpackage/res/icons/58x58.png",
+            "settings@3x": "unpackage/res/icons/87x87.png",
+            "spotlight@2x": "unpackage/res/icons/80x80.png",
+            "spotlight@3x": "unpackage/res/icons/120x120.png"
+          }
+        }
+      }
+    }
+  },
+  /* SDK配置 */
+  "quickapp": {},
+  /* 快应用特有相关 */
+  "mp-weixin": {
+    /* 小程序特有相关 */
+    "appid": "",
+    "setting": {
+      "urlCheck": false
     },
-    "vueVersion" : "2"
+    "usingComponents": true
+  },
+  "vueVersion": "2"
 }

pages.json

@@ -90,6 +90,17 @@
         }
       }
     },
+    {
+      "path": "pages/index/news/move/move",
+      "style": {
+        "navigationBarTitleText": "移库",
+        "navigationBarBackgroundColor": "#ff0505",
+        "navigationBarTextStyle": "white",
+        "app-plus": {
+          "softinputMode": "adjustResize"
+        }
+      }
+    },
     {
       "path": "pages/index/news/news",
       "style": {

pages/Warehousing/select/index-copy.vue

@@ -0,0 +1,416 @@
+<template>
+  <view class="content">
+    <view class="title">
+      <view class="">
+        <text>库区筛选</text>
+      </view>
+      <view class="view_icon" @click="inputDialogToggle">
+        <text>{{ value }}</text>
+        <u-icon name="arrow-right" color="#000000" size="20"></u-icon>
+      </view>
+    </view>
+    <view class="content_table">
+      <view class="uni-container">
+        <uni-table
+          ref="table"
+          :loading="loading"
+          stripe
+          emptyText="暂无更多数据"
+          @selection-change="selectionChange">
+          <uni-tr>
+            <uni-th width="50" align="center">库位</uni-th>
+            <uni-th width="50" align="center"></uni-th>
+            <uni-th width="50" align="center">库位状态</uni-th>
+            <uni-th width="50" align="center">库存状态</uni-th>
+          </uni-tr>
+          <uni-tr
+            @filter-change="filtechange"
+            v-for="(item, index) in tableData"
+            :key="index">
+            <uni-td>
+              <view class="name" @click.prevent="ferterMan(item)">
+                {{ item.locationNo }}
+              </view>
+            </uni-td>
+            <uni-td>
+              <view class="name" @click.prevent="ferterMan(item)">
+                {{ item.name }}
+              </view>
+            </uni-td>
+            <uni-td align="center">
+              <view class="name" @click.prevent="ferterMan(item)">
+                {{ item.stockStatus }}
+              </view>
+            </uni-td>
+            <uni-td align="center">
+              <view
+                class="name"
+                @click.prevent="ferterMan(item)"
+                v-if="item.isEmpty == 'Y'">
+                空
+              </view>
+              <view
+                class="name"
+                @click.prevent="ferterMan(item)"
+                v-if="item.isEmpty == 'N'">
+                非空
+              </view>
+            </uni-td>
+          </uni-tr>
+        </uni-table>
+        <view class="uni-pagination-box">
+          <uni-pagination
+            show-icon
+            :page-size="pageSize"
+            :current="pageCurrent"
+            :total="total"
+            @change="change" />
+        </view>
+      </view>
+    </view>
+    <uni-popup ref="inputDialog" type="dialog">
+      <uni-popup-dialog
+        ref="inputClose"
+        title="选择库区"
+        value="对话框预置提示内容!"
+        placeholder="请输入内容"
+        @confirm="dialogInputConfirm">
+        <u-radio-group
+          placement="column"
+          :borderBottom="true"
+          v-model="value"
+          iconPlacement="right">
+          <u-radio
+            :customStyle="{ marginBottom: '8px' }"
+            v-for="(item, index) in radiolist1"
+            :key="index"
+            :label="item.name"
+            :name="item.name"
+            @change="radioChange($event, item)"></u-radio>
+        </u-radio-group>
+      </uni-popup-dialog>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+import tableData from "../tableData.js";
+export default {
+  data() {
+    return {
+      type: "center",
+      msgType: "success",
+      messageText: "这是一条成功提示",
+      value: "请选择",
+      value1: "",
+      value3: "",
+      searchVal: "",
+      tableData: [],
+      IDBIndexs: "",
+      pageSize: 10,
+      host: "",
+      pageCurrent: 1,
+      total: 0,
+      loading: true,
+      rangeValue: "",
+      zoneId: "",
+      tip: 0,
+      radiolist1: [
+        {
+          name: "SE车检",
+          disabled: false,
+        },
+        {
+          name: "成品区",
+          disabled: false,
+        },
+      ],
+    };
+  },
+  onLoad(options) {
+    console.log("进", options);
+    let _this = this;
+    uni.getStorage({
+      key: "hostappst",
+      success(res) {
+        console.log("获取成功", res.data);
+        _this.host = res.data;
+      },
+    });
+    this.getData(1);
+    this.getReservoir();
+    this.IDBIndexs = options.show;
+    if (options.rangeValue != "") {
+      this.rangeValue = options.rangeValue;
+    }
+    this.tip = options.tip;
+
+    this.selectedIndexs = [];
+
+    this.radiolist1 = [];
+  },
+  mounted() {
+    if (this.tip == 1) {
+      this.value = "桶装物料入库缓存区";
+      this.dialogInputConfirm();
+    } else if (this.tip == 2) {
+      this.value = "桶装物料出库缓存区";
+      this.dialogInputConfirm();
+    } else if (this.rangeValue == "emptyPalletTargetOut") {
+      this.value = "桶装物料入库缓存区";
+      this.dialogInputConfirm();
+    } else {
+      this.inputDialogToggle();
+    }
+    // || this.IDBIndexs == 4
+    if (this.IDBIndexs == 1 || this.IDBIndexs == 2) {
+      this.inputDialogToggle();
+    }
+  },
+  methods: {
+    selectedItems() {
+      return this.selectedIndexs.map((i) => this.tableData[i]);
+    },
+
+    selectionChange(e) {
+      console.log(e.detail.index);
+      this.selectedIndexs = e.detail.index;
+    },
+    ferterMan(val) {
+      console.log("val", val);
+      var pages = getCurrentPages();
+      var prevPage = pages[pages.length - 2];
+      let object = {
+        id: val.id,
+        locationNo: val.locationNo,
+        show: this.IDBIndexs,
+      };
+      prevPage.$vm.otherFun(object);
+      uni.navigateBack({
+        delta: 1,
+      });
+    },
+
+    delTable() {
+      console.log(this.selectedItems());
+    },
+    filtechange(e) {
+      console.log("e", e);
+    },
+
+    change(e) {
+      this.$refs.table.clearSelection();
+      this.selectedIndexs.length = 0;
+      this.getData(e.current);
+    },
+
+    search() {
+      this.getData(1, this.searchVal);
+    },
+
+    getData(pageCurrent, value = "") {
+      this.loading = true;
+      this.pageCurrent = pageCurrent;
+      this.request({
+        pageSize: this.pageSize,
+        pageCurrent: pageCurrent,
+        value: value,
+        success: (res) => {},
+      });
+    },
+    getReservoir() {
+      let that = this;
+      uni.getStorage({
+        key: "GetPhone_Token",
+        success: function (res) {
+          uni.request({
+            url: `http://${that.host}` + "/inv/asn/getZoneList",
+            header: {
+              Authorization: res.data,
+            },
+            method: "GET",
+            success(res) {
+              console.log("chaoShiPanDuan", res);
+              if (res.data.code == 200) {
+                res.data.data.forEach((item, index) => {
+                  that.radiolist1.push({
+                    name: item.zoneName,
+                    id: item.zoneId,
+                    disabled: false,
+                  });
+                });
+              } else {
+              }
+              console.log("res", res);
+            },
+          });
+        },
+      });
+    },
+    request(options) {
+      const { pageSize, pageCurrent, success, value } = options;
+      let total = tableData.length;
+      let data = tableData.filter((item, index) => {
+        const idx = index - (pageCurrent - 1) * pageSize;
+        return idx < pageSize && idx >= 0;
+      });
+      if (value) {
+        data = [];
+        tableData.forEach((item) => {
+          if (item.name.indexOf(value) !== -1) {
+            data.push(item);
+          }
+        });
+        total = data.length;
+      }
+
+      setTimeout(() => {
+        typeof success === "function" &&
+          success({
+            data: data,
+            total: total,
+          });
+      }, 500);
+    },
+    goto(data) {
+      uni.navigateTo({
+        url: data,
+      });
+    },
+    inputDialogToggle() {
+      // || this.IDBIndexs == 4
+      if (this.IDBIndexs == 1 || this.IDBIndexs == 2) {
+        this.$refs.inputDialog.open();
+      }
+    },
+    radioChange(val, row) {
+      console.log("111", val, row);
+      this.value3 = val;
+      this.zoneId = row.id;
+    },
+    dialogInputConfirm(val) {
+      if (this.value3 != "") {
+        this.value = this.value3;
+      }
+      this.tableData = [];
+      console.log("val", this.zoneId);
+      let that = this;
+      let data = {
+        zoneId: that.zoneId,
+        locationSceneCode: "emptyPalletInvList",
+      };
+      let dataobj = {};
+      let name;
+      if (this.IDBIndexs == 3 || this.IDBIndexs == 6 || this.IDBIndexs == 7) {
+        name = "getCacheLocationInfoCacheList";
+        if (this.tip == 1) {
+          dataobj = {
+            cacheZoneSceneCode: "bucketCacheZoneIn",
+            locationSceneCode: "bucketCacheIn",
+          };
+        } else {
+          dataobj = {
+            cacheZoneSceneCode: "bucketCacheZoneOut",
+            locationSceneCode: "bucketCacheOut",
+          };
+        }
+      } else if (this.IDBIndexs == 1 || this.IDBIndexs == 2) {
+        name = "getBaseLocationInfoList";
+        if (this.zoneId == 4) {
+          dataobj = {
+            zoneId: 4,
+          };
+        } else {
+          dataobj = {
+            zoneId: 5,
+          };
+        }
+      } else {
+        name = "getBaseLocationInfoList";
+        if (this.zoneId == 4 || this.IDBIndexs == 4) {
+          dataobj = {
+            zoneId: 4,
+            locationSceneCode: this.rangeValue,
+          };
+        } else {
+          dataobj = {
+            zoneId: 5,
+            locationSceneCode: this.rangeValue,
+          };
+        }
+      }
+
+      this.loading = false;
+      uni.getStorage({
+        key: "GetPhone_Token",
+        success: function (res) {
+          // 恢复请求
+          uni.request({
+            url: `http://${that.host}` + "/inv/asn/" + name,
+            header: {
+              Authorization: res.data,
+            },
+            method: "GET",
+            data: dataobj,
+            success(res) {
+              console.log("chaoShiPanDuan", res);
+              if (res.data.code == 200) {
+                res.data.data.forEach((item, index) => {
+                  res.data.data.forEach((item, index) => {
+                    if (item.stockStatus == "00") {
+                      item.stockStatus = "空闲";
+                    } else if (item.stockStatus == "10") {
+                      item.stockStatus = "占用";
+                    } else if (item.stockStatus == "20") {
+                      item.stockStatus = "完成";
+                    } else if (item.stockStatus == "90") {
+                      item.stockStatus = "合格";
+                    } else if (item.stockStatus == "99") {
+                      item.stockStatus = "不合格";
+                    } else if (item.stockStatus == "80") {
+                      item.stockStatus = "封存";
+                    }
+                  });
+
+                  that.tableData = [...res.data.data];
+                  that.total = res.data.total;
+                });
+              } else {
+              }
+              console.log("res", res);
+            },
+          });
+        },
+      });
+
+      setTimeout(() => {
+        uni.hideLoading();
+        console.log(val);
+
+        // 关闭窗口后，恢复默认内容
+        this.$refs.inputDialog.close();
+      }, 100);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.content {
+  padding: 15px;
+  .title {
+    display: flex;
+    justify-content: space-between;
+    font-size: 17px;
+    color: #525151;
+    .view_icon {
+      display: flex;
+      align-content: center;
+      align-items: center;
+    }
+  }
+  .content_table {
+    padding-top: 20px;
+  }
+}
+</style>

pages/Warehousing/select/index.vue

@@ -94,6 +94,7 @@
 </template>
 
 <script>
+import { queryDict, getqueryDict } from "@/libs/http/index.js";
 import tableData from "../tableData.js";
 export default {
   data() {
@@ -103,7 +104,7 @@ export default {
       messageText: "这是一条成功提示",
       value: "请选择",
       value1: "",
-      value3: "",
+      searchValue: "",
       searchVal: "",
       tableData: [],
       IDBIndexs: "",
@@ -150,19 +151,6 @@ export default {
     this.radiolist1 = [];
   },
   mounted() {
-    if (this.tip == 1) {
-      this.value = "桶装物料入库缓存区";
-      this.dialogInputConfirm();
-    } else if (this.tip == 2) {
-      this.value = "桶装物料出库缓存区";
-      this.dialogInputConfirm();
-    } else if (this.rangeValue == "emptyPalletTargetOut") {
-      this.value = "桶装物料入库缓存区";
-      this.dialogInputConfirm();
-    } else {
-      this.inputDialogToggle();
-    }
-    // || this.IDBIndexs == 4
     if (this.IDBIndexs == 1 || this.IDBIndexs == 2) {
       this.inputDialogToggle();
     }
@@ -224,13 +212,12 @@ export default {
         key: "GetPhone_Token",
         success: function (res) {
           uni.request({
-            url: `http://${that.host}` + "/inv/asn/getZoneList",
+            url: `http://${that.host}` + "/base/locationZone/queryDict",
             header: {
               Authorization: res.data,
             },
             method: "GET",
             success(res) {
-              console.log("chaoShiPanDuan", res);
               if (res.data.code == 200) {
                 res.data.data.forEach((item, index) => {
                   that.radiolist1.push({
@@ -240,6 +227,10 @@ export default {
                   });
                 });
               } else {
+                uni.showToast({
+                  title: res.data.msg,
+                  icon: "none",
+                });
               }
               console.log("res", res);
             },
@@ -285,12 +276,70 @@ export default {
     },
     radioChange(val, row) {
       console.log("111", val, row);
-      this.value3 = val;
+      this.searchValue = val;
       this.zoneId = row.id;
     },
-    dialogInputConfirm(val) {
-      if (this.value3 != "") {
-        this.value = this.value3;
+    async dialogInputConfirm(val) {
+      console.log("val", this.zoneId);
+      let that = this;
+      this.loading = false;
+      // let res = await getqueryDict(this.zoneId);
+
+      uni.getStorage({
+        key: "GetPhone_Token",
+        success: function (res) {
+          uni.request({
+            url:
+              `http://${that.host}` +
+              "/base/locationInfo/queryDict/" +
+              that.zoneId,
+            header: {
+              Authorization: res.data,
+            },
+            method: "GET",
+
+            success(res) {
+              if (res.data.code == 200) {
+                res.data.data.forEach((item, index) => {
+                  res.data.data.forEach((item, index) => {
+                    if (item.stockStatus == "00") {
+                      item.stockStatus = "空闲";
+                    } else if (item.stockStatus == "10") {
+                      item.stockStatus = "占用";
+                    } else if (item.stockStatus == "20") {
+                      item.stockStatus = "完成";
+                    } else if (item.stockStatus == "90") {
+                      item.stockStatus = "合格";
+                    } else if (item.stockStatus == "99") {
+                      item.stockStatus = "不合格";
+                    } else if (item.stockStatus == "80") {
+                      item.stockStatus = "封存";
+                    }
+                  });
+
+                  that.tableData = [...res.data.data];
+                  that.total = res.data.total;
+                });
+              } else {
+                uni.showToast({
+                  title: res.data.msg,
+                  icon: "none",
+                });
+              }
+              setTimeout(() => {
+                uni.hideLoading();
+                console.log(val);
+                // 关闭窗口后，恢复默认内容
+                this.$refs.inputDialog.close();
+              }, 100);
+            },
+          });
+        },
+      });
+    },
+    dialogInputConfirms(val) {
+      if (this.searchValue != "") {
+        this.value = this.searchValue;
       }
       this.tableData = [];
       console.log("val", this.zoneId);

pages/index/news/move/move.vue

@@ -0,0 +1,351 @@
+<template>
+  <view class="content">
+    <view class="">
+      <view class="confirm-view">
+        <text class="text">起始点位：</text>
+        <!-- focus -->
+        <uni-easyinput
+          style="margin: 0 11px"
+          errorMessage
+          v-model="sourceLocationId"
+          :adjust-position="false"
+          :class="recshow ? 'rec' : ''"
+          class="uni-mt-5"
+          trim="all"
+          @focus="focusFunc"
+          placeholder-style="font-size:16px;color: #a7a7a7;"
+          placeholder="请输入起始点位"
+          @input="input"></uni-easyinput>
+        <button
+          type="default"
+          @click="goto('/pages/Warehousing/select/index?show=1')">
+          选择
+        </button>
+      </view>
+
+      <view class="confirm-view">
+        <text class="text">终点点位：</text>
+        <!-- focus -->
+        <uni-easyinput
+          style="margin: 0 11px"
+          errorMessage
+          v-model="targetLocationId"
+          :class="recshowto ? 'rec' : ''"
+          :adjust-position="false"
+          @focus="focusFunvac"
+          placeholder-style="font-size:16px;color: #a7a7a7;"
+          placeholder="请输入终点点位"
+          @input="inputEimt"></uni-easyinput>
+        <button
+          type="default"
+          @click="goto('/pages/Warehousing/select/index?show=2')">
+          选择
+        </button>
+      </view>
+    </view>
+
+    <view class="border-buttons" @click="subfeom">
+      <view class="buttons2">
+        <text>移动</text>
+      </view>
+    </view>
+
+    <xw-scan></xw-scan>
+  </view>
+</template>
+
+<script>
+import { moveLocInv } from "@/libs/http/index.js";
+export default {
+  data() {
+    return {
+      valueSian: "",
+      curNow: 0,
+      nameOut: "起始点位",
+      valueSianid: "",
+      recshow: false,
+      sourceLocationIdcode: "",
+      targetLocationIdcode: "",
+      host: "",
+      rangeValue: "in",
+      sourceLocationId: "",
+      targetLocationId: "",
+      recshowminu: false,
+      recshowto: false,
+      type: "center",
+      msgType: "success",
+      messageText: "这是一条成功提示",
+      value: "in",
+      rangeValueto: "",
+      value3: "",
+      testdata: {},
+    };
+  },
+  onShow() {
+    let that = this;
+    let pages = getCurrentPages();
+    let currPage = pages[pages.length - 1];
+    console.log("json", currPage.testdata);
+    let json = currPage._data.testdata;
+    this.testdata = json;
+  },
+  onUnload() {
+    uni.$off("xwscan");
+  },
+  mounted() {
+    let _this = this;
+    uni.getStorage({
+      key: "hostappst",
+      success(res) {
+        console.log("获取成功", res.data);
+        _this.host = res.data;
+      },
+    });
+  },
+  methods: {
+    otherFun(obj) {
+      console.log(obj);
+      if (obj.show == 1) {
+        this.sourceLocationId = obj.locationNo;
+        this.sourceLocationIdcode = obj.id;
+      } else if (obj.show == 2) {
+        this.targetLocationId = obj.locationNo;
+        this.targetLocationIdcode = obj.id;
+      }
+    },
+    focusFunc(e) {
+      this.recshow = true;
+      this.recshowto = false;
+      uni.$off("xwscan");
+      uni.$on("xwscan", (res) => {
+        console.log("扫码结果：", res.code);
+        this.sourceLocationId = res.code;
+        this.sourceLocationIdcode = res.code;
+      });
+      console.log("focus事件");
+    },
+
+    sectionChange(index) {
+      console.log("index", index);
+      this.curNow = index;
+    },
+    focusFunvac(e) {
+      this.recshow = false;
+      this.recshowto = true;
+      uni.$off("xwscan");
+      uni.$on("xwscan", (res) => {
+        console.log("扫码结果：", res.code);
+        this.targetLocationId = res.code;
+        this.targetLocationIdcode = res.code;
+      });
+      console.log("focus事件");
+    },
+    goto(data) {
+      uni.navigateTo({
+        url: data,
+      });
+    },
+    input(e) {
+      console.log(e);
+      this.sourceLocationIdcode = e;
+    },
+    inputEimt(e) {
+      this.targetLocationIdcode = e;
+    },
+
+    async subfeom() {
+      let dataobj = {
+        sourceLocationId: this.sourceLocationIdcode,
+        targetLocationId: this.targetLocationIdcode,
+      };
+      let that = this;
+
+      uni.getStorage({
+        key: "GetPhone_Token",
+        success: function (res) {
+          // 恢复请求
+          uni.request({
+            url: `http://${that.host}` + "/ams/invLotLocId/moveLocInv",
+            header: {
+              Authorization: res.data,
+            },
+            method: "POST",
+            data: dataobj,
+            success(res) {
+              console.log("chaoShiPanDuan", res);
+              if (res.data.code == 200) {
+                uni.showToast({
+                  title: res.data.msg,
+                  icon: "none",
+                  duration: 2000,
+                });
+                setTimeout(() => {
+                  uni.navigateTo({
+                    url: "/pages/index/tabbar/tabbar",
+                  });
+                }, 1000);
+              } else {
+                uni.showToast({
+                  title: res.data.msg,
+                  icon: "none",
+                });
+              }
+            },
+          });
+        },
+      });
+      // let res = await moveLocInv(dataobj);
+    },
+    inputDialogToggle() {
+      this.$refs.inputDialog.open();
+    },
+    radioChange(val) {
+      console.log(val);
+      this.targetLocationId = val;
+    },
+  },
+};
+</script>
+<style scoped>
+/deep/.uni-select {
+  font-size: 16px;
+  border: 1px solid #e5e5e5;
+  box-sizing: border-box;
+  border-radius: 4px;
+  padding: 13px 5px;
+  padding-left: 10px;
+  position: relative;
+  display: flex;
+  -webkit-user-select: none;
+  user-select: none;
+  flex-direction: row;
+  align-items: center;
+  border-bottom: solid 1px #e5e5e5;
+  width: 100%;
+  flex: 1;
+  height: 35px;
+}
+/deep/.uni-select__input-placeholder {
+  color: #6a6a6a;
+  font-size: 16px;
+}
+/deep/.uni-icons {
+  font-family: uniicons;
+  text-decoration: none;
+  text-align: center;
+  font-size: 20px !important;
+}
+/deep/.u-subsection__item__text {
+  font-size: 12px;
+  line-height: 12px;
+  display: flex;
+  flex-direction: row;
+  font-size: 15px !important;
+  align-items: center;
+  transition-property: color;
+  transition-duration: 0.3s;
+}
+/deep/.is-input-border {
+  display: flex;
+  box-sizing: border-box;
+  flex-direction: row;
+  align-items: center;
+
+  border-radius: 4px;
+  background-color: rgb(245 245 245) !important;
+  /* background: #24bdbd; */
+}
+/deep/.u-radio-label--right {
+  flex-direction: row-reverse;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+/deep/uni-button {
+  color: #000;
+  border: 1px solid #ff0000;
+  border-radius: 31px;
+  width: 21%;
+  background-color: #f5f5f5;
+  height: 42px;
+  font-size: 16px;
+  color: #ff0000;
+}
+/deep/.uni-easyinput__content-input[data-v-abe12412] {
+  width: auto;
+  position: relative;
+  overflow: hidden;
+  flex: 1;
+  line-height: 1;
+  font-size: 14px;
+  height: 35px;
+  /* border-bottom: 1px solid #ff0000 !important; */
+}
+/deep/.is-input-border {
+  display: flex;
+  box-sizing: border-box;
+  flex-direction: row;
+  align-items: center;
+  border: none !important;
+  border-radius: 4px;
+}
+</style>
+<style lang="scss" scoped>
+.content {
+  // padding: 15px;
+  .confirm-view {
+    display: flex;
+    padding: 15px;
+    margin: 5px 0;
+    align-items: center;
+    border-bottom: 1px solid #d5d5d5;
+    height: 56px;
+    .text {
+      font-size: 16px;
+      color: #6e6860;
+      font-weight: 500;
+    }
+  }
+  .confirm-views {
+    .title {
+      display: flex;
+      justify-content: space-between;
+      font-size: 15px;
+      color: #525151;
+      padding: 15px;
+      margin: 5px 0;
+      align-items: center;
+      border-bottom: 1px solid #d5d5d5;
+      height: 56px;
+      .view_icon {
+        display: flex;
+        align-content: center;
+        align-items: center;
+      }
+    }
+  }
+  .border-buttons {
+    display: flex;
+    position: absolute;
+    button: 0;
+    bottom: 32px;
+    padding: 0 15px;
+    justify-content: space-between;
+    width: 100%;
+    text-align: center;
+
+    .buttons2 {
+      width: 100%;
+      border: 1px solid #ff0505;
+      border-radius: 34px;
+      height: 42px;
+      background: red;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 18px;
+      color: white;
+      font-weight: 500;
+    }
+  }
+}
+</style>

pages/index/news/news.vue

@@ -7,12 +7,12 @@
           <text style="margin-top: 5px">库位移动</text>
         </view>
       </view>
-      <view class="border-boke" @click="Water">
+      <!-- <view class="border-boke" @click="Water">
         <view class="sawda">
           <uni-icons type="tune" color="#ff0505" size="40"></uni-icons>
           <text style="margin-top: 5px">库位越库</text>
         </view>
-      </view>
+      </view> -->
     </view>
   </view>
 </template>
@@ -46,7 +46,8 @@ export default {
   methods: {
     Waereroter(url) {
       uni.navigateTo({
-        url: "/pages/index/news/movement/movement",
+        // url: "/pages/index/news/movement/movement",
+        url: "/pages/index/news/move/move",
       });
     },
     Water() {

unpackage/resources/__UNI__AE3CE08/www/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>

unpackage/resources/__UNI__AE3CE08/www/static/customicons.css

@@ -0,0 +1,20 @@
+@font-face {
+  font-family: "customicons"; /* Project id 2878519 */
+  src:url('/static/customicons.ttf') format('truetype');
+}
+
+.customicons {
+  font-family: "customicons" !important;
+}
+
+.youxi:before {
+  content: "\e60e";
+}
+
+.wenjian:before {
+  content: "\e60f";
+}
+
+.zhuanfa:before {
+  content: "\e610";
+}