From ac7371c95bfbc963c65b1c1ee7d9234366e88573 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 4 Mar 2025 16:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/section/index.vue              | 14 ++++++------
 .../picking/apply/component/AddPicking1.vue   |  1 -
 .../auditing/component/auditingPage1.vue      |  6 +++++
 .../claimAndreturn/picking/outbound/index.vue | 22 +++++++++++++++++++
 vue.config.js                                 |  4 ++--
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/views/base/section/index.vue b/src/views/base/section/index.vue
index 127c0d0..d584b63 100644
--- a/src/views/base/section/index.vue
+++ b/src/views/base/section/index.vue
@@ -426,13 +426,13 @@ export default {
                 // ownPro: [
                 //   { required: true, message: "所属工程项目不能为空", trigger: "blur" }
                 // ],
-                typeId: [
-                    {
-                        required: true,
-                        message: '工程类型不能为空',
-                        trigger: 'blur',
-                    },
-                ],
+                // typeId: [
+                //     {
+                //         required: true,
+                //         message: '工程类型不能为空',
+                //         trigger: 'blur',
+                //     },
+                // ],
                 deptId: [
                     {
                         required: true,
diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 26f0f15..f09b5a4 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -286,7 +286,6 @@
                         placeholder="请输入预领数量"
                         type="number"
                         min="1"
-                        @input="checkNum(scope.row)"
                         clearable
                         style="width: 100%"
                     />
diff --git a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
index cf0304d..855fa59 100644
--- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
@@ -151,6 +151,12 @@
                         prop="num"
                         :show-overflow-tooltip="true"
                     />
+                    <el-table-column
+                        label="出库数量"
+                        align="center"
+                        prop="outNum"
+                        :show-overflow-tooltip="true"
+                    />
                     <el-table-column
                         label="预领数量"
                         align="center"
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 14a091f..873a6ae 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -524,6 +524,17 @@
                     prop="maStatus"
                     :show-overflow-tooltip="true"
                 />
+                <el-table-column label="备注" align="center" prop="remark">
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model="scope.row.remark"
+                            placeholder="请输入备注"
+                            clearable
+                            maxlength="300"
+                            style="width: 100%"
+                        />
+                    </template>
+                </el-table-column>
             </el-table>
 
             <pagination
@@ -615,6 +626,17 @@
                         />
                     </template>
                 </el-table-column>
+                <el-table-column label="备注" align="center" prop="remark">
+                    <template slot-scope="scope">
+                        <el-input
+                            v-model="scope.row.remark"
+                            placeholder="请输入备注"
+                            clearable
+                            maxlength="300"
+                            style="width: 100%"
+                        />
+                    </template>
+                </el-table-column>
             </el-table>
         </el-dialog>
 
diff --git a/vue.config.js b/vue.config.js
index f1aaf37..d03fd36 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,13 +37,13 @@ module.exports = {
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://112.29.103.165:21626`, //线上环境-重庆
                 // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
-                // target: `http://192.168.0.56:39080`, //测试环境
+                target: `http://192.168.0.56:39080`, //测试环境
                 // target: `http://1.12.248.179:23028`,//线上环境-南网
                 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
                 // target: `https://z.csgmall.com.cn`,
 
                 // target: `http://192.168.2.125:39080`, //超
-                target: `http://192.168.2.122:39080`, //超
+                // target: `http://192.168.2.122:39080`, //超
 
                 // target: `http://192.168.2.74:49080`, //旭/
                 // target: `http://192.168.2.17:39080`, //帅