From 701030849ae02ccb3e1983b1838257532476bcf0 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 16 Jan 2026 16:26:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stquery/deviceStatusRecord.vue      | 28 -------------------
 .../machinery/coding-nw/index.vue             |  8 +++---
 .../toolsAcceptance/component/addTools.vue    | 19 ++++++-------
 .../component/codingTools-cq.vue              | 10 +++----
 .../warehouseManage/tagBind/bind/index.vue    |  9 +++---
 .../warehouseManage/tagBind/history/index.vue |  1 +
 .../warehousing/newTools/index.vue            |  8 +++---
 7 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/src/views/stquery/deviceStatusRecord.vue b/src/views/stquery/deviceStatusRecord.vue
index 19b147d..a36cbca 100644
--- a/src/views/stquery/deviceStatusRecord.vue
+++ b/src/views/stquery/deviceStatusRecord.vue
@@ -68,21 +68,6 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            <el-form-item label="资产属性" prop="propId">
-                <el-select
-                    v-model="queryParams.propId"
-                    filterable
-                    placeholder="请选择资产属性"
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="keeper in propList"
-                        :key="keeper.propId"
-                        :label="keeper.propName"
-                        :value="keeper.propId"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
             <!-- <el-form-item label="关键字" prop="keyWord">
         <el-input
           v-model="queryParams.keyWord"
@@ -170,12 +155,6 @@
                 prop="unit"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column
-                label="资产属性"
-                align="center"
-                prop="propName"
-                width="100px"
-            />
             <el-table-column
                 label="在库数量"
                 align="center"
@@ -302,17 +281,10 @@ export default {
     },
     created() {
         this.getList()
-        this.getPropData()
         /* this.getUnitList();
     this.getProList(); */
     },
     methods: {
-        /** 查询资产属性下拉 */
-        getPropData() {
-            getProLists().then((response) => {
-                this.propList = response.rows
-            })
-        },
         // 获取 申请列表
         async getList() {
             this.loading = true
diff --git a/src/views/warehouseManage/machinery/coding-nw/index.vue b/src/views/warehouseManage/machinery/coding-nw/index.vue
index 3b1a188..3260e73 100644
--- a/src/views/warehouseManage/machinery/coding-nw/index.vue
+++ b/src/views/warehouseManage/machinery/coding-nw/index.vue
@@ -205,7 +205,7 @@
                 </template>
             </el-table-column>
             <el-table-column
-                label="固定资产编号"
+                label="资产编号"
                 align="center"
                 prop="assetsCode"
             />
@@ -348,7 +348,6 @@
                             <el-input
                                 v-model="form.maCode"
                                 placeholder="请输入设备编号"
-                                disabled
                             />
                         </el-form-item>
                     </el-col>
@@ -388,10 +387,10 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="固定资产编号" prop="assetsCode">
+                        <el-form-item label="资产编号" prop="assetsCode">
                             <el-input
                                 v-model="form.assetsCode"
-                                placeholder="请输入固定资产编号"
+                                placeholder="请输入资产编号"
                                 maxlength="50"
                             />
                         </el-form-item>
@@ -558,6 +557,7 @@
                     <div class="maCode">规格型号：{{ rowObj.specificationType }}</div>
                     <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
                     <div class="maCode">二维码编号：{{ rowObj.qrCode }}</div>
+                    <div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
                 </div>
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: center">
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
index 7d4b2ef..f859621 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
@@ -82,7 +82,6 @@
                     v-model="maForm.arrivalTime"
                     style="width: 240px"
                     value-format="yyyy-MM-dd"
-                    :picker-options="pickerOptions"
                     type="date"
                     placeholder="请选择到货日期"
                 ></el-date-picker>
@@ -489,15 +488,15 @@ export default {
         }
     },
     computed: {
-        pickerOptions() {
-            return {
-                disabledDate(time) {
-                    const currentDate = new Date()
-                    currentDate.setHours(0, 0, 0, 0)
-                    return time.getTime() < currentDate.getTime()
-                },
-            }
-        },
+        // pickerOptions() {
+        //     return {
+        //         disabledDate(time) {
+        //             const currentDate = new Date()
+        //             currentDate.setHours(0, 0, 0, 0)
+        //             return time.getTime() < currentDate.getTime()
+        //         },
+        //     }
+        // },
     },
     watch: {
         'maForm.purchaseTime'() {
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools-cq.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools-cq.vue
index 27118f0..1299d96 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools-cq.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools-cq.vue
@@ -346,7 +346,8 @@ export default {
             if (isCode) return
             const codeListParams = JSON.parse(JSON.stringify(this.codeList))
             codeListParams.forEach((e) => {
-                e.maCode = e.specificationType + e.tempCode
+                // 修复问题1：添加+号到提交的编码中
+                e.maCode = e.specificationType + '+' + e.tempCode
                 e.fixCode ? (e.fixCode = '0') : (e.fixCode = '1')
                 return e
             })
@@ -399,10 +400,9 @@ export default {
 
         /* 向下填充事件 */
         onFillDownwards(index, code) {
-            const codeNumList = this.extractNumber(code)
-            let newStr = code
-            codeNumList.forEach((e) => {
-                newStr = newStr.replace(e, e * 1 + 1)
+            // 修复问题2：只对最后一个数字部分加1
+            const newStr = code.replace(/(\d+)(?!.*\d)/g, (match) => {
+                return parseInt(match) + 1
             })
             this.codeList[index + 1].tempCode = newStr
         },
diff --git a/src/views/warehouseManage/tagBind/bind/index.vue b/src/views/warehouseManage/tagBind/bind/index.vue
index 2182099..8da59ee 100644
--- a/src/views/warehouseManage/tagBind/bind/index.vue
+++ b/src/views/warehouseManage/tagBind/bind/index.vue
@@ -236,7 +236,7 @@
                     width="180"
                 />
                 <el-table-column
-                    label="固定资产编号"
+                    label="资产编号"
                     align="center"
                     prop="assetsCode"
                     width="180"
@@ -366,10 +366,10 @@
                         :disable-branch-nodes="true"
                     />
                 </el-form-item>
-              <el-form-item label="固定资产编号" prop="assetsCode">
+              <el-form-item label="资产编号" prop="assetsCode">
                 <el-input
                   v-model="form.assetsCode"
-                  placeholder="请输入固定（财务）资产编号"
+                  placeholder="请输入资产编号"
                   :clearable="true"
                   maxlength="50"
                 />
@@ -456,6 +456,7 @@
                     <div class="maCode">规格型号：{{ rowObj.typeName }}</div>
                     <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
                     <div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
+                    <div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
                 </div>
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: center">
@@ -596,7 +597,7 @@ export default {
                 assetsCode: [
                     {
                         required: true,
-                        message: '固定（财务）资产编号不能为空',
+                        message: '资产编号不能为空',
                         trigger: 'blur',
                     },
                 ],
diff --git a/src/views/warehouseManage/tagBind/history/index.vue b/src/views/warehouseManage/tagBind/history/index.vue
index 4c2d7ff..07859e3 100644
--- a/src/views/warehouseManage/tagBind/history/index.vue
+++ b/src/views/warehouseManage/tagBind/history/index.vue
@@ -176,6 +176,7 @@
                     <div class="maCode">规格型号：{{ rowObj.typeName }}</div>
                     <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
                     <div class="maCode">标签编号：{{ rowObj.labelCode }}</div>
+                    <div class="maCode">资产编号：{{ rowObj.assetsCode }}</div>
                 </div>
             </div>
         </el-dialog>
diff --git a/src/views/warehouseManage/warehousing/newTools/index.vue b/src/views/warehouseManage/warehousing/newTools/index.vue
index b278025..100fff5 100644
--- a/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -146,13 +146,13 @@
                         size="mini"
                         type="primary"
                         v-if="scope.row.taskStatus == '28'"
-                        >已审核</el-tag
+                        >已入库</el-tag
                     >
                     <el-tag
                         size="mini"
                         type="warning"
                         v-if="scope.row.taskStatus == '105'"
-                        >待审核</el-tag
+                        >待入库</el-tag
                     >
                     <el-tag
                         size="mini"
@@ -184,7 +184,7 @@
                         "
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['warehousing:newTools:auditing']"
-                        >审核</el-button
+                        >入库</el-button
                     >
                     <el-button
                         size="mini"
@@ -705,7 +705,7 @@ export default {
             this.getDialogTable()
             this.open = true
             this.showHandle = true
-            this.title = '审核'
+            this.title = '入库'
         },
 
         //通过