Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-10-14 6ac9391135ded7e668d2d42f408f4a6c59b27d23

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

@@ -19,9 +19,11 @@
import footSum from "@/hook/footSum"
import companyInfo from "@/stores/sd/companyInfo"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";

import TagStyleDesigner from "@/components/pp/TagStyleDesigner.vue";
import useUserInfoStore from "@/stores/userInfo";
const company = companyInfo()

const userStore = useUserInfoStore()
const userId = userStore.user.userId

//语言获取
const {t} = useI18n()
@@ -33,7 +35,7 @@
const dialogTableVisibleCustomLabel = ref(false)
const printVisible = ref(false)
let selectRecords = ref(null)

let titleStyleVisible = ref(false)
const selectRecordsData = ref({
  printList: []
})
@@ -200,6 +202,8 @@
    titleSelectJson.value.dataType = res.data.type
    xGrid.value.reloadData(newDataCollection)
    gridOptions.loading = false


    hideButton()
  } else {
    ElMessage.warning(res.msg)
@@ -300,7 +304,10 @@
    {field: 'glass_address', title: t('processCard.glassAddress'), width: 90},
    {field: 'quantity', title: t('order.quantity'), width: 90},
    {field: 'total_area', title: t('order.area'), width: 90},
    {field: 'product_name', title: t('order.product'), width: 120},
    {field: 'product_name', title: t('order.product'), width: 120,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged},
    {
      field: 'glass_child',
      title: t('reportingWorks.glassChild'),
@@ -332,6 +339,7 @@
      {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
      {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
      {code: 'sortTable', name: "排序汇总", status: 'primary'},
      // {code: 'printTest', name: "测试打印", status: 'primary'},
      // {code: 'printLike', name: "同配置打印", status: 'primary'},
    ],
    // import: false,
@@ -409,7 +417,10 @@
              id += selectRecords[i].id + "|"
            }
          }
          router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}})
          router.push({
            path: '/main/processCard/PrintLabel',
            query: {printList: JSON.stringify(selectRecords),printType:1}
          })

          break
        }
@@ -429,7 +440,7 @@
          }
          router.push({
            path: '/main/processCard/PrintCustomLabelSemi2',
            query: {printList: JSON.stringify(selectRecords)}
            query: {printList: JSON.stringify(selectRecords),printType:1}
          })

          break
@@ -501,7 +512,8 @@
                  type: type,
                  faceOrientation: faceOrientation,
                  lableType: lableTypes,
                  printList: JSON.stringify(selectRecords)
                  printList: JSON.stringify(selectRecords),
                  printType:1
                }
              })
            }
@@ -520,7 +532,8 @@
                  type: type,
                  faceOrientation: faceOrientation,
                  lableType: lableTypes,
                  printList: JSON.stringify(selectRecords)
                  printList: JSON.stringify(selectRecords),
                  printType:1
                }
              })
            }
@@ -531,7 +544,8 @@
                type: type,
                faceOrientation: faceOrientation,
                lableType: lableTypes,
                printList: JSON.stringify(selectRecords)
                printList: JSON.stringify(selectRecords),
                printType:1
              }
            })

@@ -570,6 +584,32 @@
          tableRow.value.orderId=JSON.stringify(data.value.printList)
          // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
          dialogSortTable.value = true
          break
        }
        case 'printTest': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          // if (type === null || type === '' || type === undefined) {
          //   ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
          //   return
          // }

          let id = ""
          for (let i = 0; i < selectRecords.length; i++) {
            if (i + 1 === selectRecords.length) {
              id += selectRecords[i].id
            } else {
              id += selectRecords[i].id + "|"
            }
          }

            labelRow.value.list = JSON.stringify(selectRecords)
            labelRow.value.faceOrientation = faceOrientation
            labelRow.value.type = type
            labelRow.value.lableType = lableTypes
          titleStyleVisible.value = true
          break
        }
      }
@@ -687,6 +727,7 @@
          <div v-for="(option, index) in column.filters" :key="index">
            <input v-model="option.data"
                   type="text"
                   @keyup.enter.native="$panel.confirmFilter()"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
@@ -730,7 +771,7 @@
                          style="width: 100%;height: 100%"/>
    </el-dialog>

    <!--    成品标签新疆-->
    <!--    成品标签两列-->
    <el-dialog
        id="sizeCustom"
        v-model="dialogTableVisibleLabelXJ"
@@ -786,7 +827,21 @@
      <select-sort-table id="child" :orderId="tableRow.orderId"/>
    </el-dialog>


<!--   标签样式    -->
    <el-dialog
        id="titleStyle"
        :title="$t('processCard.labelStyle')"
        style="width: 90%;height:93%;margin-top: 3vh "
        :close-on-click-modal="false"
        :close-on-press-escape="false"
        v-model="titleStyleVisible">
      <!--      <tag-style style="width: 100%;height: 100%"/>-->
      <tag-style-designer style="width: 100%;height: 100%"
                          :faceOrientation="labelRow.faceOrientation"
                          :lableType="labelRow.lableType"
                          :list="labelRow.list"
                          :type="labelRow.type"/>
    </el-dialog>
  </div>
</template>

@@ -820,4 +875,9 @@
  overflow-y: auto;
}

:deep(#titleStyle .el-dialog__body){
  height: 93%;
  width: 100%;
}

</style>