ZaiZai 1 ano atrás
pai
commit
6b2edda4de
2 arquivos alterados com 5 adições e 8 exclusões
  1. 1 1
      public/version.json
  2. 4 7
      src/views/tentative/material/approach.vue

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240620102855"
+  "value": "20240620111105"
 }

+ 4 - 7
src/views/tentative/material/approach.vue

@@ -292,7 +292,7 @@ import HcDragUpload from './components/HcDragUpload.vue'
 import FormItemUpload from './components/FormItemUpload.vue'
 import notableform from '~src/assets/view/notableform.svg'
 import approachApi from '~api/tentative/material/approach'
-import { arrIndex, arrToId, deepClone, formValidate, getArrValue } from 'js-fast-way'
+import { arrIndex, arrToId, deepClone, formValidate, getArrValue, isNullES } from 'js-fast-way'
 import { getDictionary } from '~api/other'
 import { toPdfPage } from '~uti/btn-auth'
 import Dayjs from 'dayjs'
@@ -600,17 +600,14 @@ const copyTableClick = () => {
     const rows = copyTableData.value
     if (rows.length > 0) {
         //判断是否满足条件
-        const result = rows.every(({ isMaterialNumber }) => {
-            return isMaterialNumber === false
+        const result = rows.every(({ materialNumber }) => {
+            return !isNullES(materialNumber)
         })
         //判断状态
         if (result) {
-            for (let i = 0; i < rows.length; i++) {
-                rows[i].dataNumber = i
-            }
             tableCopyData(rows)
         } else {
-            window.$message?.warning('请先完善材料编号')
+            window.$message?.warning('材料编号不能为空')
         }
     } else {
         window.$message?.warning('请先在列表勾选要复制的数据')