From a94c085d22f47213b94a4d7ecdc3c0ddce8bae1d Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Tue, 14 Nov 2023 15:48:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E5=90=88=E5=90=8C?=
=?UTF-8?q?=E5=8F=B7=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/host.js | 4 ++--
pages.json | 12 ++++++------
pagesTask/pages/contracts/contracts.vue | 18 +++++++-----------
3 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/config/host.js b/config/host.js
index d99eb61..41fe80d 100644
--- a/config/host.js
+++ b/config/host.js
@@ -12,9 +12,9 @@
// tjj
// const devhost = 'http://192.168.10.29:13000/'
// cyz
-// const devhost = 'http://192.168.10.75:8777/'
+const devhost = 'http://192.168.10.75:8777/'
// 正式
-const devhost = 'http://h5uapi.huitongys.com/'
+// const devhost = 'http://h5uapi.huitongys.com/'
// cg
// const devhost='http://192.168.10.200:8888/'
/**
diff --git a/pages.json b/pages.json
index 80bed23..eca5871 100644
--- a/pages.json
+++ b/pages.json
@@ -1272,12 +1272,12 @@
// "selectedIconPath": "/static/TabberIcon/icon3check.png",
// "text": "报表"
// },
- // {
- // "pagePath": "pages/news/news",
- // "iconPath": "/static/TabberIcon/icon4.png",
- // "selectedIconPath": "/static/TabberIcon/icon4check.png",
- // "text": "消息"
- // },
+ {
+ "pagePath": "pages/news/news",
+ "iconPath": "/static/TabberIcon/icon4.png",
+ "selectedIconPath": "/static/TabberIcon/icon4check.png",
+ "text": "消息"
+ },
{
"pagePath": "pages/user/user",
"iconPath": "/static/TabberIcon/icon5.png",
diff --git a/pagesTask/pages/contracts/contracts.vue b/pagesTask/pages/contracts/contracts.vue
index 6ae8170..a66121c 100644
--- a/pagesTask/pages/contracts/contracts.vue
+++ b/pagesTask/pages/contracts/contracts.vue
@@ -72,9 +72,6 @@
</template>
</view>
</view>
- </template>
-
- <template>
<!-- 列表 -->
<scroll-view class="scvmabx" @scrolltolower="reachBottomInitPage" scroll-y="true" @touchmove.stop>
<!-- 按库位盘点 -->
@@ -89,7 +86,7 @@
</image>
</template>
</view>
-
+
<!-- 定制品 -->
<template v-if="stock.isInventory !== 1 && zero.isZero !== 1">
<!-- <view class="table_article">
@@ -100,7 +97,7 @@
<view class="">状态</view>
<view class="">操作</view>
</view>
-
+
<view class="table_body">
<view>{{item.orderPackageCode}}</view>
<view>{{item.orderCode}}</view>
@@ -130,7 +127,7 @@
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>合同号：{{item.orderCode}}</view>
</view>
-
+
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>库位：{{item.allocation}}</view>
@@ -141,7 +138,7 @@
</view>
</view>
</template>
-
+
<!-- 零担 -->
<template v-else-if="zero.isZero === 1">
<view class="rightMsg">
@@ -176,7 +173,7 @@
</view>
</view>
</template>
-
+
<!-- 库存品 -->
<template v-else>
<view class="rightMsg">
@@ -189,7 +186,7 @@
<text class="button" @click="upDataItem(item)">上架</text>
</view>
</view>
-
+
<view class="tpbx">
<image src="/pagesHome/static/kuweiicon.png"></image>
<view>合同号：{{item.orderCode}}</view>
@@ -220,8 +217,6 @@
</template>
</scroll-view>
</template>
-
-
</BasicContainer>
<!-- 提交 -->
<button @click="submitCheck" class="submitButton" type="primary">提交盘点</button>
@@ -463,6 +458,7 @@
// 公共判断
function Tjinfo() {
+ console.log(infos.value.orderCode,'infos.value.orderCode');
const FormData = {
warehouseId: infos.value.warehouseId,
taskId: infos.value.taskId,