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>

@@ -79,9 +79,9 @@

          <a-divider type="vertical" />

          <a @click="handleDetail(record)">发起流程</a>
          <a v-if="record.flowStatus === '1'" @click="handleStartFlow(record)">发起流程</a>

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

          <a @click="handleDetail(record)">详情</a>

@@ -146,7 +146,8 @@
          {
            title:'流水号',
            align:"center",
            dataIndex: 'serialNumber'
            dataIndex: 'serialNumber',
            width:150,
          },
          {
            title:'夹具',
@@ -183,6 +184,7 @@
          deleteBatch: "/dnc/guideCardBatch/deleteBatch",
          exportXlsUrl: "/dnc/guideCardBatch/exportXls",
          importExcelUrl: "dnc/guideCardBatch/importExcel",
          startGuideCardBatch: "/dnc/guideCardBatch/startGuideCardBatch"

        },
        dictOptions:{},
@@ -200,9 +202,15 @@
    methods: {
      initDictConfig(){
      },
      getGuideCardBatchList(){
        console.log('currentDocumentInfo', this.guideCardBatchInfo)
        let params
      searchQuery() {
        this.queryParam.docId = this.guideCardBatchInfo.docId;
        this.loadData(1);
      },
      /**
      * 获取加工确认表列表
      */
      getGuideCardBatchList() {
        let params= {};
        params.docId=this.guideCardBatchInfo.docId;
        params.serialNumber=this.queryParam.serialNumber;
        params.fixtureInformation=this.guideCardBatchInfo.fixtureInformation;
@@ -223,6 +231,19 @@
        }).finally(() => {
          this.loading = false
        })
      },
      searchReset() {
        // 保留必要字段的浅拷贝方式
        this.queryParam = {
          docId: this.guideCardBatchInfo.docId
        };
        this.loadData(1);
      },
      loadData(pageNum) {
        if (this.ipagination) {
          this.ipagination.current = pageNum;
        }
        this.getGuideCardBatchList();
      },
      getSuperFieldList(){
        let fieldList=[];
@@ -272,6 +293,45 @@
      handleOpenPrintKnifeListModal(record){
        this.$refs.knifeListPrintModal.visible = true
        this.$refs.knifeListPrintModal.detail = Object.assign({},record)
        this.$refs.knifeListPrintModal.handleCutter(record.docId)
      },

      handleStartFlow(record){
        const that = this
        that.$confirm({
          this: '提示',
          content: `确认发起确认流程吗？`,
          okText: '确认',
          cancelText: '取消',
          onOk: () => {
            getAction(this.url.startGuideCardBatch,{id:record.id}).then(res => {
                if (res.success) {
                  that.$notification.success({
                    message: '消息',
                    description: res.message
                  })
                } else {
                  that.$notification.error({
                    message: '消息',
                    description: res.message
                  })
                }
              })
              .catch(err => {
                that.$notification.error({
                  message: '消息',
                  description: err.message
                })
              })
              .finally(() => {
                that.$destroyAll()
                this.loadData(1)
              })
          },
          onCancel: () => {
            that.$destroyAll()
          }
        })
      }
    }
  }