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

廖井涛

82 分钟以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

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

@@ -15,6 +15,8 @@
import {remove} from "xe-utils";
import PrintProcess from "@/components/pp/PrintProcess.vue";
import PrintProcessStraight from "@/components/pp/PrintProcessStraight.vue";
import useOrderInfoStore from "@/stores/sd/order/orderInfo"

//语言获取
const {t} = useI18n()

@@ -23,13 +25,14 @@
const dialogTableVisibleLabelXJTwo = ref(false)
const dialogTableVisibleStraight = ref(false)
let rowClickIndex = ref(null)

const orderInfo = useOrderInfoStore()


//定义数据返回结果
let produceList = ref([])
let titleStyleVisible = ref(false)
let print = ref("1")
let printStyle = ref("1")

//标签
let labelRow = ref({
@@ -43,6 +46,13 @@
const company = companyInfo()
let hidePrintLabels = company.printLabel.hideButton;

//倒叙
let  flashback = ref(1)
//落架顺序
let landingSequence= ref(1)
//合架打印
let compound = ref(null)

const form = reactive({
  date1: '',
  orderId: '',
@@ -55,13 +65,16 @@
  printMergeVal: null,
  like: null,
  project:null,
  merge: null
  merge: null,
  flashback:null,
  compound:null,
  landingSequence:null,
})
const getTableRow = (row, type) => {
  switch (type) {
    case 'edit' :{
      if(parseInt(print.value)==1){
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1,printStyle:parseInt(printStyle.value) }})
      }else{
        router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
      }
@@ -70,19 +83,22 @@
    }
    case 'edit1' :{
      if(parseInt(print.value)==1){
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2,printStyle:parseInt(printStyle.value) }})
      }else{
        router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:2 }})
      }
      break
    }
    case 'edit2' :{
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3 }})
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3,printStyle:parseInt(printStyle.value) }})
      break
    }
    case 'edit3' :{
      printRow.value.project=row.project_no
      printRow.value.merge = company.flowCardMerge
      printRow.value.flashback = flashback.value
      printRow.value.compound = compound.value
      printRow.value.landingSequence=landingSequence.value
      if(company.companyName=='常州市吉利玻璃有限公司'){
        dialogTableVisibleStraight.value = true
      }else{
@@ -125,20 +141,22 @@
}

//第一次加载获取近七天时间和默认状态
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
  orderInfo.workOrderDate=getNowTime()
}
let startTime = orderInfo.workOrderDate[0]
let endTime = orderInfo.workOrderDate[1]
let orderId=form.orderId
let project=form.project

//第一次加载数据

request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
request.post(`/processCard/selectPrintPrintProject/${orderInfo.workOrderDate}`, filterData.value).then((res) => {

  if (res.code == 200) {
    if(hidePrintLabels=="true"){
      //删除下拉框
      remove(gridOptions.toolbarConfig.slots)
      //remove(gridOptions.toolbarConfig.slots)
      const button = {'code': 'printLabel',
        status: 'primary',
        'name': t('processCard.finishedProductPrinting2')}
@@ -155,6 +173,7 @@
      gridOptions.toolbarConfig.buttons.push(button2)

    }
    orderInfo.workOrderDate = res.data.selectDate
    produceList.value = deepClone(res.data.data)
    xGrid.value.reloadData(produceList.value)
    gridOptions.loading = false
@@ -169,9 +188,9 @@
  let startTime = form.date1[0]
  let endTime = form.date1[1]

  request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
  request.post(`/processCard/selectPrintPrintProject/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
    if (res.code == 200) {

      orderInfo.workOrderDate = res.data.selectDate
      xGrid.value.loadData(res.data.data)
      gridOptions.loading = false
    } else {
@@ -223,6 +242,27 @@
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    // {
    //   field: 'order_id',
    //   title: t('order.orderId'),
    //   filters: [{data: ''}],
    //   slots: {filter: 'num1_filter'},
    //   filterMethod: filterChanged
    // },
    {
      field: 'glass_thickness',
      title: t('order.totalThickness'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_type',
      title: t('ingredients.films'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_total',
      title: t('order.quantity'),
@@ -239,11 +279,11 @@
    },
    {
      field: 'labelPrintNum',
      title: t('标签打印次数')
      title: t('processCard.numberLabelPrintingOperations')
    },
    {
      field: 'processPrintNum',
      title: t('流程卡打印次数')
      title: t('processCard.numberTimesProcessCardPrinted')
    },
  ],//表头按钮

@@ -251,7 +291,7 @@
    buttons: [
    ],
    slots:{
      buttons: "toolbar_buttons"
      buttons: "toolbar_buttons",
    },
    zoom: true,
    custom: true
@@ -264,7 +304,7 @@
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity",'area',]
        const List = ["glass_total","glass_total_area","labelPrintNum",'processPrintNum',]
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }
@@ -348,7 +388,7 @@
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            v-model="orderInfo.workOrderDate"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
@@ -402,12 +442,36 @@
          </div>
        </template>

        <template #toolbar_buttons>
        <template #toolbar_buttons="{ $grid }">
          <vxe-select @change="changeOrderType" v-model="printStyle" >
            <vxe-option value="1" :label="t('processCard.print1')"></vxe-option>
            <vxe-option value="2" :label="t('processCard.print2')"></vxe-option>
          </vxe-select>
          &nbsp;&nbsp;
<!--          <el-button
              v-if="hidePrintLabels=='true'"
              type="primary"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel' })"
          >
            {{ t('processCard.finishedProductPrinting2') }}
          </el-button>-->
          &nbsp;&nbsp;
          <el-button
              v-if="hidePrintLabels=='true'"
              type="primary"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'detailPrinting' })"
          >
            {{ t('processCard.detailPrinting') }}
          </el-button>
        </template>

        <template #toolbar_button2>
          <vxe-select @change="changeOrderType" v-model="print" >
            <vxe-option value="1" label="EPSON LQ-82KF ESC/P2"></vxe-option>
            <vxe-option value="2" label="TSC TTP-244Pro"></vxe-option>
          </vxe-select>
        </template>




@@ -462,6 +526,9 @@
          :printMerge="printRow.printMergeVal"
          :printProject="printRow.project"
          :merges="printRow.merge"
          :flashback = "printRow.flashback"
          :compound = "printRow.compound"
          :landingSequence = "printRow.landingSequence"
          style="width: 100%;height: 100%"/>
    </el-dialog>