1.更新vxe-pc-ui版本

package-lock.json

@@ -21,7 +21,7 @@
         "unplugin-vue-components": "^0.27.4",
         "vue": "^3.5.11",
         "vue-router": "^4.4.5",
-        "vxe-pc-ui": "^4.3.40",
+        "vxe-pc-ui": "^4.4.19",
         "vxe-table": "^4.9.33",
         "xlsx": "^0.18.5"
       },
@@ -1490,12 +1490,12 @@
       }
     },
     "node_modules/@vxe-ui/core": {
-      "version": "4.0.23",
-      "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.0.23.tgz",
-      "integrity": "sha512-1UfRNEnawaCT+OR6RkBv6YPNqKrVd7dfMJbvhzkKvvKYrS3/0/Xmppxt5zjMEzCnfPq0WtUjXJvutu1eWBI8rQ==",
+      "version": "4.0.38",
+      "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.0.38.tgz",
+      "integrity": "sha512-zQHcYUUsMUiDNi5buxP9AIz9Ru2BK5JXkKmtGZ5gjdr/nF8Nm/jcMcAdZXDmYAryn1BLka+ZTq83G++HkfWdBg==",
       "dependencies": {
         "dom-zindex": "^1.0.6",
-        "xe-utils": "^3.5.32"
+        "xe-utils": "^3.7.4"
       },
       "peerDependencies": {
         "vue": "^3.2.0"
@@ -4141,11 +4141,11 @@
       }
     },
     "node_modules/vxe-pc-ui": {
-      "version": "4.3.40",
-      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.3.40.tgz",
-      "integrity": "sha512-rhHBweoK0iiDqtHSogUprXA5dnSFYEHIYjnKwsp4/Tx5loROpYbBnq6+VcrpZSaJRkpwIsAHbbTHzNxsrCpoQA==",
+      "version": "4.4.19",
+      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.4.19.tgz",
+      "integrity": "sha512-sUMqa55hJwulzV1As7TM3DKXkDdI3tvorWVbqPrcw3uCNbpbgLNkGvYw32qES8y59HHO3/PALcmminr8s+zaCQ==",
       "dependencies": {
-        "@vxe-ui/core": "^4.0.23"
+        "@vxe-ui/core": "^4.0.38"
       }
     },
     "node_modules/vxe-table": {
@@ -4201,9 +4201,9 @@
       }
     },
     "node_modules/xe-utils": {
-      "version": "3.5.32",
-      "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.32.tgz",
-      "integrity": "sha512-R8ZT2lRnRBQO3pchM1za/Aru+/29DVDWD/OmOFODWWGkiQYz0iVIr8Bq8uKXS6zMhEsSqVCrn46bXzfe/Agjcw=="
+      "version": "3.7.4",
+      "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.7.4.tgz",
+      "integrity": "sha512-9yuCHLOU+og4OEkPWWtzrYk1Zt1hgN66U/NCJ0+vYJSx1MplBtoQRz8aEA+2RmCr3leLru98vQxNpw/vJsu/sg=="
     },
     "node_modules/xlsx": {
       "version": "0.18.5",
@@ -5203,12 +5203,12 @@
       }
     },
     "@vxe-ui/core": {
-      "version": "4.0.23",
-      "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.0.23.tgz",
-      "integrity": "sha512-1UfRNEnawaCT+OR6RkBv6YPNqKrVd7dfMJbvhzkKvvKYrS3/0/Xmppxt5zjMEzCnfPq0WtUjXJvutu1eWBI8rQ==",
+      "version": "4.0.38",
+      "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.0.38.tgz",
+      "integrity": "sha512-zQHcYUUsMUiDNi5buxP9AIz9Ru2BK5JXkKmtGZ5gjdr/nF8Nm/jcMcAdZXDmYAryn1BLka+ZTq83G++HkfWdBg==",
       "requires": {
         "dom-zindex": "^1.0.6",
-        "xe-utils": "^3.5.32"
+        "xe-utils": "^3.7.4"
       }
     },
     "@vxe-ui/plugin-render-element": {
@@ -6996,11 +6996,11 @@
       }
     },
     "vxe-pc-ui": {
-      "version": "4.3.40",
-      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.3.40.tgz",
-      "integrity": "sha512-rhHBweoK0iiDqtHSogUprXA5dnSFYEHIYjnKwsp4/Tx5loROpYbBnq6+VcrpZSaJRkpwIsAHbbTHzNxsrCpoQA==",
+      "version": "4.4.19",
+      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.4.19.tgz",
+      "integrity": "sha512-sUMqa55hJwulzV1As7TM3DKXkDdI3tvorWVbqPrcw3uCNbpbgLNkGvYw32qES8y59HHO3/PALcmminr8s+zaCQ==",
       "requires": {
-        "@vxe-ui/core": "^4.0.23"
+        "@vxe-ui/core": "^4.0.38"
       }
     },
     "vxe-table": {
@@ -7041,9 +7041,9 @@
       "dev": true
     },
     "xe-utils": {
-      "version": "3.5.32",
-      "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.32.tgz",
-      "integrity": "sha512-R8ZT2lRnRBQO3pchM1za/Aru+/29DVDWD/OmOFODWWGkiQYz0iVIr8Bq8uKXS6zMhEsSqVCrn46bXzfe/Agjcw=="
+      "version": "3.7.4",
+      "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.7.4.tgz",
+      "integrity": "sha512-9yuCHLOU+og4OEkPWWtzrYk1Zt1hgN66U/NCJ0+vYJSx1MplBtoQRz8aEA+2RmCr3leLru98vQxNpw/vJsu/sg=="
     },
     "xlsx": {
       "version": "0.18.5",

package.json

@@ -23,7 +23,7 @@
     "unplugin-vue-components": "^0.27.4",
     "vue": "^3.5.11",
     "vue-router": "^4.4.5",
-    "vxe-pc-ui": "^4.3.40",
+    "vxe-pc-ui": "^4.4.19",
     "vxe-table": "^4.9.33",
     "xlsx": "^0.18.5"
   },

src/views/assets/workbench/eqpt/calculate/importInfo.vue

@@ -193,7 +193,7 @@
             </span>
           </template>
         </vxe-column>
-        <vxe-column field="usageSituation" title="使用情况" width="160" :edit-render="{}">
+        <vxe-column field="usageSituation" title="使用情况" width="160" :edit-render="{autoFocus: true}">
           <template #header>
             <span>使用情况</span>
             <span @click="getEqptTableFilter(eqptPageData, 'usageSituation'), autoSaveBatch()">
@@ -206,13 +206,13 @@
             </span>
           </template>
           <template #edit="{ row }">
-            <el-select v-model="row.usageSituation" placeholder="使用情况" filterable allow-create size="small">
-              <el-option label="在用" value="在用"></el-option>
-              <el-option label="闲置" value="闲置"></el-option>
-              <el-option label="无实物" value="无实物"></el-option>
-              <el-option label="已损坏" value="已损坏"></el-option>
-              <el-option label="已报废" value="已报废"></el-option>
-            </el-select>
+            <vxe-select v-model="row.usageSituation" placeholder="使用情况" clearable filterable allow-create>
+              <vxe-option label="在用" value="在用"></vxe-option>
+              <vxe-option label="闲置" value="闲置"></vxe-option>
+              <vxe-option label="无实物" value="无实物"></vxe-option>
+              <vxe-option label="已损坏" value="已损坏"></vxe-option>
+              <vxe-option label="已报废" value="已报废"></vxe-option>
+            </vxe-select>
           </template>
         </vxe-column>
         <vxe-column field="quantity" title="数量" width="160" :edit-render="{ name: 'VxeNumberInput', props: { controls: false } }">
@@ -343,7 +343,7 @@
             </template>
           </vxe-column>
         </vxe-colgroup>
-        <vxe-column field="economicServiceLife" title="经济使用年数" width="160" :edit-render="{}">
+        <vxe-column field="economicServiceLife" title="经济使用年数" width="160" :edit-render="{autoFocus: true}">
           <template #header>
             <span>经济使用年数</span>
             <span @click="getEqptTableFilter(eqptPageData, 'economicServiceLife'), autoSaveBatch()">
@@ -369,7 +369,7 @@
             </span>
           </template>
         </vxe-column>
-        <vxe-column field="remainingUsefulLife" title="尚可使用年限" width="160" :edit-render="{}">
+        <vxe-column field="remainingUsefulLife" title="尚可使用年限" width="160" :edit-render="{autoFocus: true}">
           <template #edit="{ $rowIndex, row }">
             <vxe-number-input v-model="row.remainingUsefulLife" @change="countDepreciationRate(row)" placeholder="整数类型" type="integer" :controls="false"></vxe-number-input>
           </template>
@@ -414,7 +414,7 @@
             </span>
           </template>
         </vxe-column>
-        <vxe-column field="equipmentType" title="设备类型" width="160" :edit-render="{}">
+        <vxe-column field="equipmentType" title="设备类型" width="160" :edit-render="{autoFocus: true}">
           <template #header>
             <span>设备类型</span>
             <span @click="getEqptTableFilter(eqptPageData, 'equipmentType'), autoSaveBatch()">
@@ -434,7 +434,7 @@
             </vxe-select>
           </template>
         </vxe-column>
-        <vxe-column field="valuationMethod" title="作价方法" width="160" :edit-render="{}">
+        <vxe-column field="valuationMethod" title="作价方法" width="160" :edit-render="{autoFocus: true}">
           <template #header>
             <span>作价方法</span>
             <span @click="getEqptTableFilter(eqptPageData, 'valuationMethod'), autoSaveBatch()">
@@ -454,7 +454,7 @@
             </vxe-select>
           </template>
         </vxe-column>
-        <vxe-column field="inquiryBasis" title="询价依据" width="300" :edit-render="{}">
+        <vxe-column field="inquiryBasis" title="询价依据" width="300" :edit-render="{autoFocus: true}">
           <template #edit="{ row }">
             <el-select v-if="row.valuationMethod === '物价指数调整法'" v-model="row.inquiryBasis" placeholder="Select" filterable allow-create @change="countPrice(row)" size="small">
               <el-option-group v-for="group in ppiOptions" :label="group.ppiType">
@@ -675,7 +675,7 @@
         <vxe-column field="productCode" title="商品编号" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
         <vxe-column field="currency" title="合同结算币种" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
         <vxe-column field="address" title="生产国/进口国" width="160" :edit-render="{ name: 'VxeInput' }"></vxe-column>
-        <vxe-column field="transactionMethod" title="成交方式" width="160" :edit-render="{}">
+        <vxe-column field="transactionMethod" title="成交方式" width="160" :edit-render="{autoFocus: true}">
           <template #edit="{ row }">
             <el-select v-model="row.transactionMethod" placeholder="成交方式" clearable style="width: 130px;">
               <el-option label="CIF" value="CIF"></el-option>
@@ -705,7 +705,7 @@
           </vxe-column>
         </vxe-colgroup>
         <vxe-column field="tariffRate" title="关税税率%" width="160" :edit-render="{ name: 'VxeNumberInput', props: { controls: false } }"></vxe-column>
-        <vxe-column field="tariffRatePicture" title="关税税率截图" width="160" :edit-render="{}">
+        <vxe-column field="tariffRatePicture" title="关税税率截图" width="160" :edit-render="{autoFocus: true}">
           <template #edit="{ row, $rowIndex }">
             <el-input v-model="row.tariffRatePicture" placeholder="粘贴关税税率截图" @paste.native="(e) => { return imagePaste(e, row, 'tariffRatePicture'); }" />
           </template>
@@ -1760,8 +1760,7 @@ export default {
           verify = false
         }
       }
-      if (verify) {
-        updateBatch(this.eqptPageData).then((res) => {
+      updateBatch(this.eqptPageData).then((res) => {
           if (res.code == 200) {
             ElMessage({
               showClose: true,
@@ -1769,9 +1768,9 @@ export default {
               type: 'success',
             })
           }
-        })
-      } else {
-        let message = '经济年限成新率结果<15%时，尚可使用年限必填，设备序号：'
+      })
+      if (verify) {
+        let message = '设备序号：的经济年限成新率<15%，请及时补充尚可使用年限'
         for (let index = 0; index < sort.length; index++) {
           message += sort[index]
           if (index !== sort.length - 1) {