Merge remote-tracking branch 'origin/master'

cuilei

2025-06-24 a22a69946912221dab4d32987dda6c4c8ba3c5d8

 src/views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue

@@ -67,9 +67,9 @@

        <span slot="action" slot-scope="text, record">

          <a @click="handleEdit(record)">上传/修改信息</a>
          <a v-if="record.flowStatus === '0'" @click="handleEdit(record)">上传/修改信息</a>

          <a-divider type="vertical" />
          <a-divider v-if="record.flowStatus === '0'" type="vertical" />

          <a @click="handleOpenPrintGuideCardModal(record)">生成数控加工程序确认表</a>

@@ -325,6 +325,7 @@
              })
              .finally(() => {
                that.$destroyAll()
                this.loadData(1)
              })
          },
          onCancel: () => {