From d5eb813ecacca11cc1525f996f56d4e9d8c3d587 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Mon, 1 Apr 2024 10:10:57 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index e0c8c2f6..e992171d 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -534,7 +534,7 @@
     
       /** 导出按钮操作 */
       handleExport() {
-        // this.downloadJson('material/secondaryWarehouse/exportList',JSON.stringify(this.queryParams), `二级库_${new Date().getTime()}.xlsx`)
+        this.downloadJson('base/tm_task/export',JSON.stringify(this.queryParams), `领料出库_${new Date().getTime()}.xlsx`)
       },
     }
   };

From 369162753f7c3a938a02d77ace210ffbd21b6948 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 1 Apr 2024 10:52:35 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/store/warehousing/putInStore.vue    | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index 3169ccca..8e7860d6 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -157,7 +157,7 @@
     <el-dialog 
       :title="title" 
       :visible.sync="codeOpen" 
-      width="1450px" 
+      width="90%" 
       append-to-body 
       :show-close="false"
       :close-on-click-modal="false"
@@ -205,7 +205,7 @@
                 :min="1"
                 :max="99"
                 :controls="false"
-                style="width: 220px;"
+                style="width: 13vw;"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -257,7 +257,7 @@
                 clearable
                 :min="0"
                 :controls="false"
-                style="width: 220px"
+                style="width: 13vw;"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -283,23 +283,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="检修时间" label-width="130px" prop="thisCheckFixTime">
+            <el-form-item label="检验时间" label-width="130px" prop="thisCheckFixTime">
               <el-date-picker
                 v-model="codeForm.thisCheckFixTime"
                 type="date"
-                placeholder="请输入检修时间"
+                placeholder="请输入检验时间"
                 style="width: 400px"
                 @keyup.enter.native="handleQuery">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="下次检修时间" label-width="130px" prop="nextCheckFixTime">
+            <el-form-item label="下次检验时间" label-width="130px" prop="nextCheckFixTime">
               <el-date-picker
                 v-model="codeForm.nextCheckFixTime"
                 type="date"
-                placeholder="请输入检修时间"
-                style="width: 220px"
+                placeholder="请输入检验时间"
+                style="width: 13vw;"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -307,8 +307,13 @@
         </el-row>
         
         <el-row :gutter="20">
-          
           <el-col :span="7">
+            <el-form-item label="检验人" label-width="130px" prop="checkMan">
+              <el-input v-model="codeForm.checkMan"  placeholder="请输入检验人" clearable style="width: 220px;" />
+            </el-form-item>
+          </el-col>
+          
+          <el-col :span="10">
             <el-form-item label="备注" label-width="130px" prop="remarks">
               <el-input
                 v-model="codeForm.remarks"
@@ -317,12 +322,12 @@
                 maxlength="200"
                 rows="4"
                 show-word-limit
-                style="width: 220px"
+                style="width: 400px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="7">
             <el-form-item style="margin-left: 200px;">
               <el-button type="primary" icon="el-icon-edit" size="mini" @click="fillCodeForm">点击填充</el-button>
               <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
@@ -385,24 +390,24 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="检修日期" align="center" prop="thisCheckFixTime" :show-overflow-tooltip="true">
+        <el-table-column label="检验日期" align="center" prop="thisCheckFixTime" :show-overflow-tooltip="true">
           <template v-slot:default="{ row }">
             <el-date-picker
               v-model="row.thisCheckFixTime"
               type="date"
-              placeholder="请输入检修时间"
-              style="width: 160px"
+              placeholder="请输入检验时间"
+              style="width: 170px"
               @keyup.enter.native="handleQuery"
             ></el-date-picker>
           </template>
         </el-table-column>
-        <el-table-column label="下次检修日期" align="center" prop="nextCheckFixTime" :show-overflow-tooltip="true">
+        <el-table-column label="下次检验日期" align="center" prop="nextCheckFixTime" :show-overflow-tooltip="true">
           <template v-slot:default="{ row }">
             <el-date-picker
               v-model="row.nextCheckFixTime"
               type="date"
-              placeholder="请输入下次检修时间"
-              style="width: 160px"
+              placeholder="请输入下次检验时间"
+              style="width: 170px"
               @keyup.enter.native="handleQuery"
             ></el-date-picker>
           </template>
@@ -556,6 +561,7 @@ export default {
       // 表单参数：编号表单 / 数量表单
       numberForm: {},
       codeForm: {
+        checkMan: undefined,
         putInType: undefined,
         remarks: undefined,
         typeId: undefined,
@@ -652,6 +658,7 @@ export default {
     // 编码表单重置
     resetCodeForm() {
       this.codeForm = {
+        checkMan: undefined,
         putInType: undefined,
         remarks: undefined,
         typeId: undefined,
@@ -691,10 +698,10 @@ export default {
           const outFacCode = ''
           // 生产厂家
           const maVender = this.supplierList.find(item => item.supplierId == this.codeForm.codeFactory)?.supplier || ''
-          // 检修日期: codeForm.thisCheckFixTime, 时间格式为 yyyy-MM-dd
+          // 检验日期: codeForm.thisCheckFixTime, 时间格式为 yyyy-MM-dd
           let thisCheckFixTime = new Date(this.codeForm.thisCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
           if (thisCheckFixTime == 'Invalid Date') thisCheckFixTime = ''
-          // 下次检修日期: codeForm.nextCheckFixTime
+          // 下次检验日期: codeForm.nextCheckFixTime
           let nextCheckFixTime = new Date(this.codeForm.nextCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
           if (nextCheckFixTime == 'Invalid Date') nextCheckFixTime = ''
           // 单价: codeForm.buyPrice
@@ -775,7 +782,8 @@ export default {
             typeId: this.codeForm.typeId,
             num: this.codeForm.num,
             remarks: this.codeForm.remarks || '',
-            machIneDtoList: this.codeTableList
+            machIneDtoList: this.codeTableList,
+            checkMan: this.codeForm.checkMan || '',
           }
           console.log('🚀 ~ submitForm: ~ SavePutInfoDto', SavePutInfoDto)
           

From 9038f8db8bb6ac18994e6c789f6cd3d6da36422d Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Mon, 1 Apr 2024 10:55:49 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=9B=B4=E6=94=B94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index e992171d..f88b2961 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -101,12 +101,12 @@
       <!-- 出库弹窗 -->
       <el-dialog :title="title" :visible.sync="openLeaseDevices" width="1200px" append-to-body>
         <el-form :model="dialogQuery" ref="dialogQuery" size="small" :inline="true" label-width="100px">
-        <el-form-item label="设备负责人" prop="director">
-          <el-input v-model="dialogQuery.director" maxlength="20"/>
+        <el-form-item label="设备负责人" prop="userName">
+          <el-input v-model="dialogQuery.userName" maxlength="20"/>
         </el-form-item>
         <el-form-item label="机具类型" prop="typeId">
           <treeselect
-            v-model="queryParams.modelId"
+            v-model="dialogQuery.typeId"
             default-expand-all :options="equipmentTypeList"
             placeholder="请选择规格型号"
 

From a421a118f0cab0ba6964b0df92970a6c3aaea369 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Mon, 1 Apr 2024 16:53:35 +0800
Subject: [PATCH 4/6] =?UTF-8?q?springbootV2=E4=B8=AD=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-gateway/src/main/resources/bootstrap.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml
index bbd166db..f58aa706 100644
--- a/sgzb-gateway/src/main/resources/bootstrap.yml
+++ b/sgzb-gateway/src/main/resources/bootstrap.yml
@@ -2,6 +2,12 @@
 server:
   port: 8080
 
+# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
+management:
+  endpoint:
+    env:
+      enabled: false
+
 # Spring
 spring: 
   application:

From a56b7d44ea1f172b1b5ac8bc5969ecf4236a6651 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 1 Apr 2024 17:51:01 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/store/warehousing/putInStore.vue    | 253 +++++++++++++-----
 1 file changed, 179 insertions(+), 74 deletions(-)

diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index 8e7860d6..d0762a31 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -197,7 +197,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="待入库总数" label-width="130px" prop="num">
+            <el-form-item label="待入库总数" label-width="130px" prop="num" v-if="!isNumCheck">
               <el-input-number
                 v-model="codeForm.num"
                 placeholder="请输入待入库总数"
@@ -215,7 +215,7 @@
         
         <el-row :gutter="20">
           <el-col :span="7">
-            <el-form-item label="前缀" label-width="130px" prop="codePrefix">
+            <el-form-item label="前缀" label-width="130px" prop="codePrefix" v-if="!isNumCheck">
               <el-input
                 v-model="codeForm.codePrefix"
                 placeholder="请输入前缀"
@@ -227,7 +227,7 @@
           </el-col>
 
           <el-col :span="10">
-            <el-form-item label="后缀范围" label-width="130px" prop="codeSuffixStart">
+            <el-form-item label="后缀范围" label-width="130px" prop="codeSuffixStart" v-if="!isNumCheck">
               <el-input
                 v-model="codeForm.codeSuffixStart"
                 clearable
@@ -237,7 +237,7 @@
                 @input="changeInput(codeForm.codeSuffixStart)"
               />
             </el-form-item>
-            <el-form-item label="~" label-width="auto" prop="codeSuffixEnd">
+            <el-form-item label="~" label-width="auto" prop="codeSuffixEnd" v-if="!isNumCheck">
               <el-input
                 v-model="codeForm.codeSuffixEnd"
                 clearable
@@ -249,7 +249,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="单价" label-width="130px" prop="buyPrice">
+            <el-form-item label="单价" label-width="130px" prop="buyPrice" v-if="!isNumCheck">
               <el-input-number
                 v-model="codeForm.buyPrice"
                 :precision="2"
@@ -266,7 +266,7 @@
         
         <el-row :gutter="20">
           <el-col :span="7">
-            <el-form-item label="选择厂家" label-width="130px" prop="codeFactory">
+            <el-form-item label="选择厂家" label-width="130px" prop="codeFactory" v-if="!isNumCheck">
               <el-select
                 v-model="codeForm.codeFactory"
                 placeholder="请选择厂家"
@@ -283,7 +283,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="检验时间" label-width="130px" prop="thisCheckFixTime">
+            <el-form-item label="检验时间" label-width="130px" prop="thisCheckFixTime" v-if="!isNumCheck">
               <el-date-picker
                 v-model="codeForm.thisCheckFixTime"
                 type="date"
@@ -294,7 +294,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="下次检验时间" label-width="130px" prop="nextCheckFixTime">
+            <el-form-item label="下次检验时间" label-width="130px" prop="nextCheckFixTime" v-if="!isNumCheck">
               <el-date-picker
                 v-model="codeForm.nextCheckFixTime"
                 type="date"
@@ -308,12 +308,12 @@
         
         <el-row :gutter="20">
           <el-col :span="7">
-            <el-form-item label="检验人" label-width="130px" prop="checkMan">
+            <el-form-item label="检验人" label-width="130px" prop="checkMan" v-if="!isNumCheck">
               <el-input v-model="codeForm.checkMan"  placeholder="请输入检验人" clearable style="width: 220px;" />
             </el-form-item>
           </el-col>
           
-          <el-col :span="10">
+          <el-col :span="isNumCheck ? 7 : 10">
             <el-form-item label="备注" label-width="130px" prop="remarks">
               <el-input
                 v-model="codeForm.remarks"
@@ -322,7 +322,7 @@
                 maxlength="200"
                 rows="4"
                 show-word-limit
-                style="width: 400px"
+                :style="{ width: isNumCheck ? '220px' : '400px' }"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -365,21 +365,22 @@
          >导出</el-button>
        </el-col>
       </el-row> -->
-      <el-table v-loading="loading" :data="codeTableList" @selection-change="handleSelectionChange" :stripe="true" :border="true">
+      <el-table v-loading="loading" :data="codeTableList" v-if="!isNumCheck" 
+      @selection-change="handleSelectionChange" :stripe="true" :border="true">
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
-          <template v-slot:default="{ row }">
+          <template v-slot:default="{ row }" v-if="!isNumCheck">
             <el-input v-model="row.maCode" placeholder="请输入设备编码"></el-input>
           </template>
         </el-table-column>
         <el-table-column label="出厂编码" align="center" prop="outFacCode" :show-overflow-tooltip="true">
-          <template v-slot:default="{ row }">
-            <el-input v-model="row.outFacCode" placeholder="请输入设备编码"></el-input>
+          <template v-slot:default="{ row }" v-if="!isNumCheck">
+            <el-input v-model="row.outFacCode" placeholder="请输入出厂编码"></el-input>
           </template>
         </el-table-column>
         <el-table-column label="生产厂家" align="center" prop="maVender" :show-overflow-tooltip="true">
-          <template v-slot:default="{ row }">
+          <template v-slot:default="{ row }" v-if="!isNumCheck">
             <el-select v-model="row.maVender" placeholder="请选择生产厂家" clearable filterable>
               <el-option
                 v-for="item in supplierList"
@@ -391,7 +392,7 @@
           </template>
         </el-table-column>
         <el-table-column label="检验日期" align="center" prop="thisCheckFixTime" :show-overflow-tooltip="true">
-          <template v-slot:default="{ row }">
+          <template v-slot:default="{ row }" v-if="!isNumCheck">
             <el-date-picker
               v-model="row.thisCheckFixTime"
               type="date"
@@ -402,7 +403,7 @@
           </template>
         </el-table-column>
         <el-table-column label="下次检验日期" align="center" prop="nextCheckFixTime" :show-overflow-tooltip="true">
-          <template v-slot:default="{ row }">
+          <template v-slot:default="{ row }" v-if="!isNumCheck">
             <el-date-picker
               v-model="row.nextCheckFixTime"
               type="date"
@@ -413,7 +414,7 @@
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" prop="buyPrice" :show-overflow-tooltip="true">
-          <template v-slot:default="{ row }">
+          <template v-slot:default="{ row }" v-if="!isNumCheck">
             <el-input-number
               v-model="row.buyPrice"
               :precision="2"
@@ -457,6 +458,43 @@
         </el-table-column>
       </el-table>
 
+      <!-- 数量入库 -->
+      <el-table v-loading="loading" :data="numTableList" border stripe v-if="isNumCheck">
+          <el-table-column label="序号" align="center" type="index" />
+          <el-table-column prop="typeCn" label="设备名称" align="center" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="guigeCn" label="规格型号" align="center" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="num" label="当前库存" align="center" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="num" label="入库数量" align="center" :show-overflow-tooltip="true">
+            <template v-slot:default="{ row }">
+              <el-input-number v-model="row.putInStoreNum" placeholder="请输入入库数量" @blur="handlePutBlur(row)" 
+              clearable :controls="false" :min="1" style="width: 10vw;" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitCn" label="计量单位" align="center" :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true">
+            <template v-slot:default="{ row }">
+              <el-input v-model="row.remark" placeholder="请输入备注" align="center" :show-overflow-tooltip="true" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template v-slot:default="{ $index }">
+              <el-popconfirm
+                title="确定删除吗？"
+                icon="el-icon-info"
+                placement="top"
+                @confirm="handleDeleteRow($index)"
+                @cancel="cancelPop"
+              >
+                <el-button slot="reference" size="mini" type="text" icon="el-icon-delete">删除</el-button>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </el-table>
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -511,6 +549,9 @@ export default {
       returnList: [],
       // 编码盘点表格数据
       codeTableList: [],
+      // 编码盘点表格数据
+      numTableList: [],
+      numTable: {},
       // 弹出层标题
       title: "",
       // 入库来源选项
@@ -523,6 +564,8 @@ export default {
       codeOpen: false,
       // 日期范围
       dateRange: [],
+      isNumCheck: false,
+      isAdd: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -642,7 +685,9 @@ export default {
       this.deviceType = {}
       this.reset();
       this.codeTableList = []
+      this.numTableList = []
       this.$refs['codeForm'].clearValidate()
+      this.isNumCheck = false;
     },
     // 表单重置
     reset() {
@@ -681,39 +726,50 @@ export default {
     },
     /** 填充编码盘点表单 */
     fillCodeForm() {
+      console.log('🚀 ~ fillCodeForm ~ this.isNumCheck:', this.isNumCheck);
       // 校验表单
       this.$refs['codeForm'].validate(valid => {
         if (!valid) return
         console.log('🚀 ~ fillCodeForm ~ this.codeForm:', this.codeForm);
         // 清空this.codeTableList
         this.codeTableList = []
-        // 根据this.codeForm.num的数量, 往this.codeTableList中添加this.codeForm的数据
-        for (let i = 0; i < this.codeForm.num; i++) {
-          // 设备编码: 前缀 拼接 后缀
-          let suffix = (parseInt(this.codeForm.codeSuffixStart) + i).toString().padStart(this.codeForm.codeSuffixStart?.length, '0')
-          console.log('🚀 ~ fillCodeForm ~ suffix:', suffix);
-          suffix = isNaN(suffix) ? '' : suffix
-          const maCode = `${this.codeForm.codePrefix || ''}${suffix}`
-          // 出厂编码
-          const outFacCode = ''
-          // 生产厂家
-          const maVender = this.supplierList.find(item => item.supplierId == this.codeForm.codeFactory)?.supplier || ''
-          // 检验日期: codeForm.thisCheckFixTime, 时间格式为 yyyy-MM-dd
-          let thisCheckFixTime = new Date(this.codeForm.thisCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
-          if (thisCheckFixTime == 'Invalid Date') thisCheckFixTime = ''
-          // 下次检验日期: codeForm.nextCheckFixTime
-          let nextCheckFixTime = new Date(this.codeForm.nextCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
-          if (nextCheckFixTime == 'Invalid Date') nextCheckFixTime = ''
-          // 单价: codeForm.buyPrice
-          const buyPrice = this.codeForm.buyPrice || 0
-          this.codeTableList.push({
-            maCode,
-            outFacCode,
-            maVender,
-            thisCheckFixTime,
-            nextCheckFixTime,
-            buyPrice
-          })
+        if (this.isNumCheck) {
+          // 判断 this.numTableList 中是否有 this.numTable 的数据, 如果有, 则不添加
+          if (this.numTableList.some(item => item.typeId == this.codeForm.typeId)) {
+            this.$message.error('请勿重复添加')
+            return
+          }
+          console.log('🚀 ~ fillCodeForm ~ this.numTable:', this.numTable);
+          this.numTableList.push(this.numTable)
+        } else {
+          // 根据this.codeForm.num的数量, 往this.codeTableList中添加this.codeForm的数据
+          for (let i = 0; i < this.codeForm.num; i++) {
+            // 设备编码: 前缀 拼接 后缀
+            let suffix = (parseInt(this.codeForm.codeSuffixStart) + i).toString().padStart(this.codeForm.codeSuffixStart?.length, '0')
+            // console.log('🚀 ~ fillCodeForm ~ suffix:', suffix);
+            suffix = isNaN(suffix) ? '' : suffix
+            const maCode = `${this.codeForm.codePrefix || ''}${suffix}`
+            // 出厂编码
+            const outFacCode = ''
+            // 生产厂家
+            const maVender = this.supplierList.find(item => item.supplierId == this.codeForm.codeFactory)?.supplier || ''
+            // 检验日期: codeForm.thisCheckFixTime, 时间格式为 yyyy-MM-dd
+            let thisCheckFixTime = new Date(this.codeForm.thisCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+            if (thisCheckFixTime == 'Invalid Date') thisCheckFixTime = ''
+            // 下次检验日期: codeForm.nextCheckFixTime
+            let nextCheckFixTime = new Date(this.codeForm.nextCheckFixTime).toLocaleDateString('zh-CN', {year: 'numeric', month: '2-digit', day: '2-digit'}).replace(/\//g, '-')
+            if (nextCheckFixTime == 'Invalid Date') nextCheckFixTime = ''
+            // 单价: codeForm.buyPrice
+            const buyPrice = this.codeForm.buyPrice || 0
+            this.codeTableList.push({
+              maCode,
+              outFacCode,
+              maVender,
+              thisCheckFixTime,
+              nextCheckFixTime,
+              buyPrice
+            })
+          }
         }
       })
     },
@@ -743,12 +799,14 @@ export default {
     },
     /** 新增数量盘点按钮操作 */
     handleNumberAdd() {
+      this.isNumCheck = true;
       this.reset();
-      this.numberOpen = true;
+      this.codeOpen = true;
       this.title = "数量盘点入库";
     },
     /** 新增编号盘点按钮操作 */
     handleCodeAdd() {
+      this.isNumCheck = false;
       this.reset();
       this.codeOpen = true;
       this.title = "编码盘点入库";
@@ -773,35 +831,58 @@ export default {
     submitForm: function() {
       this.$refs['codeForm'].validate(valid => {
         if (valid) {
+          let SavePutInfoDto = {}
           console.log('🚀 ~ this.codeForm:', this.codeForm);
           console.log('🚀 ~ this.codeTableList:', this.codeTableList);
-          // 提交数据
-          const SavePutInfoDto = {
-            isCode: true, // 是否编码盘点
-            putInType: this.codeForm.putInType,
-            typeId: this.codeForm.typeId,
-            num: this.codeForm.num,
-            remarks: this.codeForm.remarks || '',
-            machIneDtoList: this.codeTableList,
-            checkMan: this.codeForm.checkMan || '',
+          console.log('🚀 ~ this.numTableList:', this.numTableList);
+          if (this.isNumCheck) {
+            // 提交数据
+            SavePutInfoDto = {
+              isCode: false,
+              putInType: this.codeForm.putInType,
+              remarks: this.codeForm.remarks || '',
+              machIneDtoList: this.numTableList,
+            }
+            console.log('🚀 ~ submitForm: ~ SavePutInfoDto-isNum', SavePutInfoDto)
+            // 发送请求
+            inputByCode(SavePutInfoDto).then(response => {
+              this.$message.success('入库成功')
+              this.codeOpen = false
+              this.getList()
+              this.resetCodeForm()
+              this.reset()
+              this.numTableList = []
+              this.deviceType = {}
+            })
+          } else {
+            // 提交数据
+            SavePutInfoDto = {
+              isCode: true, // 是否编码盘点
+              putInType: this.codeForm.putInType,
+              typeId: this.codeForm.typeId,
+              num: this.codeForm.num,
+              remarks: this.codeForm.remarks || '',
+              machIneDtoList: this.codeTableList,
+              checkMan: this.codeForm.checkMan || '',
+            }
+            console.log('🚀 ~ submitForm: ~ SavePutInfoDto', SavePutInfoDto)
+            
+            if (this.codeTableList.length == 0) {
+              this.$message.error('请点击填充按钮, 填充数据')
+              return
+            }
+            
+            // 发送请求
+            inputByCode(SavePutInfoDto).then(response => {
+              this.$message.success('入库成功')
+              this.codeOpen = false
+              this.getList()
+              this.resetCodeForm()
+              this.reset()
+              this.codeTableList = []
+              this.deviceType = {}
+            })
           }
-          console.log('🚀 ~ submitForm: ~ SavePutInfoDto', SavePutInfoDto)
-          
-          if (this.codeTableList.length == 0) {
-            this.$message.error('请点击填充按钮, 填充数据')
-            return
-          }
-          
-          // 发送请求
-          inputByCode(SavePutInfoDto).then(response => {
-            this.$message.success('入库成功')
-            this.codeOpen = false
-            this.getList()
-            this.resetCodeForm()
-            this.reset()
-            this.codeTableList = []
-            this.deviceType = {}
-          })
         }
       })
       /* this.$refs["form"].validate(valid => {
@@ -822,6 +903,27 @@ export default {
         }
       }); */
     },
+    // 入库数量输入框失去焦点
+    handlePutBlur(row) {
+      if (row.putInStoreNum > row.num) {
+        this.$message.error('入库数量不能大于当前库存')
+        row.putInStoreNum = row.num
+      }
+      if (!row.putInStoreNum) {
+        this.$message.warning('入库数量不能为空')
+        row.putInStoreNum = 1
+      }
+    },
+    // 删除行
+    handleDeleteRow(index) {
+      this.numTableList.splice(index, 1)
+      setTimeout(() => {
+        this.$message.success('删除成功')
+      }, 50)
+    },
+    cancelPop() {
+      this.$message.info('取消删除')
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
@@ -875,12 +977,14 @@ export default {
       )
       console.log('🚀 ~ deviceTypeChange ~ this.leaseApplyDetails:', this.leaseApplyDetails);
       // this.deviceType = {} 
+
+      this.numTable = this.handelTableItemData(nodes[0])
     },
     //// 将数据处理成 表格中需要的数据
     handelTableItemData(node){
       const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
       // template.createBy = this.user.name
-      console.log('🚀 ~ handelTableItemData ~ node.data, node.data.id:', node.data, node.data.id);
+      console.log('🚀 ~ handelTableItemData ~ node.data, node.data.id:', node.data, node.data.id, node);
       this.codeForm.typeId = node.data.id
       template.num = node.data.num
       template.companyId = node.data.companyId
@@ -888,6 +992,7 @@ export default {
       template.unitCn = node.data.unitName
       template.typeCn = node.pathLabels[2]
       template.guigeCn = node.pathLabels[3]
+      template.putInStoreNum = 1
 
       if(this.taskId){
         const index = this.leaseApplyInfoList.find(key => key.companyId == node.data.companyId)

From 51af555aa6d65455bb88756f7ca8fc81198d8a31 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 1 Apr 2024 17:55:31 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/store/warehousing/putInStore.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue
index d0762a31..ff774c19 100644
--- a/sgzb-ui/src/views/store/warehousing/putInStore.vue
+++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue
@@ -736,7 +736,7 @@ export default {
         if (this.isNumCheck) {
           // 判断 this.numTableList 中是否有 this.numTable 的数据, 如果有, 则不添加
           if (this.numTableList.some(item => item.typeId == this.codeForm.typeId)) {
-            this.$message.error('请勿重复添加')
+            this.$message.warning('请勿重复添加')
             return
           }
           console.log('🚀 ~ fillCodeForm ~ this.numTable:', this.numTable);
@@ -905,10 +905,6 @@ export default {
     },
     // 入库数量输入框失去焦点
     handlePutBlur(row) {
-      if (row.putInStoreNum > row.num) {
-        this.$message.error('入库数量不能大于当前库存')
-        row.putInStoreNum = row.num
-      }
       if (!row.putInStoreNum) {
         this.$message.warning('入库数量不能为空')
         row.putInStoreNum = 1