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

廖井涛

4 小时以前 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,7 +25,7 @@
const dialogTableVisibleLabelXJTwo = ref(false)
const dialogTableVisibleStraight = ref(false)
let rowClickIndex = ref(null)

const orderInfo = useOrderInfoStore()


//定义数据返回结果
@@ -46,6 +48,8 @@

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

@@ -63,7 +67,8 @@
  project:null,
  merge: null,
  flashback:null,
  compound:null
  compound:null,
  landingSequence:null,
})
const getTableRow = (row, type) => {
  switch (type) {
@@ -93,6 +98,7 @@
      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{
@@ -135,15 +141,17 @@
}

//第一次加载获取近七天时间和默认状态
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"){
@@ -165,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
@@ -179,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 {
@@ -233,6 +242,13 @@
      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'),
@@ -372,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"
@@ -426,11 +442,27 @@
          </div>
        </template>

        <template #toolbar_buttons>
        <template #toolbar_buttons="{ $grid }">
          <vxe-select @change="changeOrderType" v-model="printStyle" >
            <vxe-option value="1" label="11列4行"></vxe-option>
            <vxe-option value="2" label="6行3列"></vxe-option>
            <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>
@@ -496,6 +528,7 @@
          :merges="printRow.merge"
          :flashback = "printRow.flashback"
          :compound = "printRow.compound"
          :landingSequence = "printRow.landingSequence"
          style="width: 100%;height: 100%"/>
    </el-dialog>