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

廖井涛

2024-09-06 10a26b9b670efef0a2adba675c794c539846aa3c

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

@@ -9,13 +9,28 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import footSum from "@/hook/footSum"
import TagStyle from "@/components/pp/TagStyle.vue"
import TagStyleDesigner from "@/components/pp/TagStyleDesigner.vue"
import OrderSortDetail from '@/components/pp/OrderSortDetail.vue'
import companyInfo from "@/stores/sd/companyInfo"
import useUserInfoStore from "@/stores/userInfo";
//语言获取
const {t} = useI18n()

const company = companyInfo()
let router = useRouter()
const printVisible= ref(false)

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

let inquiryMode = company.printLabel.getSelectFlowCard;

const checkedValue = ref("")
if (userId==="A071" || userId==="A107"){
   checkedValue.value = ref(2)
}
else {
   checkedValue.value = ref(inquiryMode)
}
//排序
let editRow = ref({
  orderId:null,
@@ -90,12 +105,19 @@
if (project==''){
  project=null
}

//第一次加载数据

request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {

  if (res.code == 200) {
    produceList = produceList.value.concat(deepClone(res.data.data))
    gridOptions.toolbarConfig.buttons[2].visible=false
    let roleId=res.data.user
    if (roleId=='1' || roleId=='17'){
      gridOptions.toolbarConfig.buttons[2].visible=true
    }

    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
@@ -117,7 +139,7 @@
  if (project==''){
    project=null
  }
  request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
  request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
    if (res.code == 200) {

      xGrid.value.loadData(res.data.data)
@@ -202,6 +224,7 @@
    buttons: [
      {code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
      {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
      {code: 'detailsPrint', name: '明细打印', status: 'primary'},

    ],

@@ -252,7 +275,27 @@
            }
          }
          let array = orderIdList.split('|');
          router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords)}})
         router.push({path: '/main/processCard/PrintFlowCard', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
          return;

        }
        case 'detailsPrint': {
          const selectRecords = $grid.getCheckboxRecords()
          if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }

          let orderIdList = ""
          for (let i = 0; i < selectRecords.length; i++) {
            if (i + 1 === selectRecords.length) {
              orderIdList += selectRecords[i].order_id
            } else {
              orderIdList += selectRecords[i].order_id + "|"
            }
          }
          let array = orderIdList.split('|');
          router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
          return;

        }
@@ -286,13 +329,13 @@
            :icon="Search"
            type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
        </el-button>
        <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value"  content="合并" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
      </el-row>
    </div>
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="100%"
        max-height="100%"
        height="95%"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
@@ -327,11 +370,12 @@
    <el-dialog
        id="titleStyle"
        :title="$t('processCard.labelStyle')"
        style="width: 70%;height:70% "
        style="width: 90%;height:90%;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%"/>-->
    </el-dialog>

    <el-dialog