Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

5 小时以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue

@@ -151,7 +151,7 @@
request.post(`/processCard/selectPrintProjectDetails/${projectNo}`).then((res) => {

  if (res.code == 200) {
    xGrid.value.loadData(res.data.data)
    xGrid.value.reloadData(res.data.data)
    gridOptions.loading = false
  } else {
    ElMessage.warning(res.msg)
@@ -235,6 +235,7 @@
  toolbarConfig: {
    buttons: [
      {code: 'printLabel3', name: t('basicData.print'), status: 'primary'},
      {code: 'printSmallPiece', name: t('小片打印'), status: 'primary'},
    ],
    zoom: true,
    custom: true
@@ -290,6 +291,19 @@
            lastList.value = []
            dialogTableVisibleLabelProject.value = true
          }
          break
        }
        case 'printSmallPiece': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('processCard.projectMsg1'))
            return
          }
          let stock_id=[]
          for (let i=0;i<selectRecords.length;i++){
              stock_id.push(selectRecords[i].stock_id)
          }
          console.log(stock_id)
          router.push({path: '/main/processCard/printProjectDetailSmallPiece', query: {projectNo: projectNo,stockId:JSON.stringify(stock_id)}})
          break
        }
      }
@@ -410,11 +424,28 @@
        destroy-on-close
        style="width: 80%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button :icon="Printer" circle @click="printObjectProcess(1)"/>
        <el-button @click="printObjectProcess(3)"  >{{ $t('processCard.noTitle') }}</el-button>
<!--        <el-button :icon="Printer" circle @click="printObjectProcess(1)"/>-->
<!--        <el-button @click="printObjectProcess(3)"  >{{ $t('processCard.noTitle') }}</el-button>-->
        <el-tooltip
            class="box-item"
            effect="dark"
            :content="$t('processCard.yesTitle')"
            placement="top"
        >
          <el-button :icon="Printer" circle @click="printObjectProcess(1)"/>
        </el-tooltip>
        <el-tooltip
            class="box-item"
            effect="dark"
            :content="$t('processCard.noTitle')"
            placement="top"
        >
          <el-button @click="printObjectProcess(3)">
            <i class="vxe-icon-print"></i>
          </el-button>
        </el-tooltip>
      </template>
      <print-custom-label-project id="childLabel"

                                  :detailType="labelRow.detailType"
                                  :faceOrientation="labelRow.faceOrientation"
                                  :lableType="labelRow.lableType"