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

廖井涛

2024-10-14 6ac9391135ded7e668d2d42f408f4a6c59b27d23

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

@@ -15,9 +15,15 @@
import useUserInfoStore from '@/stores/userInfo'
import {toolbarButtonClickEvent} from "@/hook/mouseMove";
import footSum from "@/hook/footSum"
import userInfo from "@/stores/userInfo"
import useOrderInfoStore from "@/stores/sd/order/orderInfo"

//语言获取
const {t} = useI18n()
const userStore = useUserInfoStore()
const user=userInfo()
const orderInfo = useOrderInfoStore()

let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
let props = defineProps({
@@ -32,7 +38,7 @@
      break
    }
    case 'delete': {
      request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
      request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}/${user.user.userId}/${user.user.userName}`).then((res) => {
        if (res.code == 200 && res.data === true) {
          ElMessage.success(t('workOrder.deleteOk'))
          router.push({path: '/main/processCard/SelectProcessCard', query: {random: Math.random()}})
@@ -100,7 +106,7 @@

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
      .toISOString()
      .replace('T', ' ')
      .slice(0, 10) //默认开始时间7天前
@@ -113,9 +119,11 @@


//第一次加载获取近七天时间和默认状态
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 total = reactive({
  pageTotal: 0,
  dataTotal: 0,
@@ -138,8 +146,8 @@

//页脚翻页查询
const selectPageList = () => {
  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let startTime = orderInfo.workOrderDate[0]
  let endTime = orderInfo.workOrderDate[1]
  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
    if (res.code == 200) {

@@ -154,8 +162,8 @@
//点击查询
const getWorkOrder = () => {

  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let startTime = orderInfo.workOrderDate[0]
  let endTime = orderInfo.workOrderDate[1]
  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
    if (res.code == 200) {
      total.dataTotal = res.data.total.total * 1
@@ -198,8 +206,8 @@
  }

//获取选中时间
  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let startTime = orderInfo.workOrderDate[0]
  let endTime = orderInfo.workOrderDate[1]

  request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
    if (res.code == 200) {
@@ -255,7 +263,7 @@
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
    {title: t('basicData.operate'), width: 100, slots: {default: 'button_slot'}, fixed: "left"},
    {title: t('basicData.operate'), width: 90, slots: {default: 'button_slot'}, fixed: "left"},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
    {field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
@@ -286,12 +294,14 @@
    {field: 'founder', title: t('processCard.founder'),},
    {field: 'orderDetail.processingNote', title: t('order.processingNote'),},

    {field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}}
    {field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}},
    {field: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
  ],//表头按钮

  toolbarConfig: {
    buttons: [
      {code: 'update', name: t('processCard.composing'), status: 'primary'},
      {code: 'delete', name: t('basicData.delete'), status: 'primary'},
    ],
    import: false,
    // export: true,
@@ -362,6 +372,43 @@
          return;

        }
        case 'delete': {
          const $table = xGrid.value
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()
            if (selectRecords.length == 0) {
              ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
              return;
            }
            //简化勾选的值
            const extractedData = selectRecords.map(item => ({
              orderId: item.orderId,
              processId: item.processId
            }));
            let composingData = ref({
              composing: extractedData,
              userId: user.user.userId,
              userName:user.user.userName
            })
            //多选删除流程卡
            request.post("/processCard/checkboxDelete", composingData.value).then((res) => {
              if (res.code == 200 && res.data === true) {
                ElMessage.success(t('basicData.msg.deleteSuccess'))
                router.push({
                  path: '/main/processCard/SelectProcessCard',
                  query: {random: Math.random()}
                })
              } else {

                ElMessage.warning(t('basicData.msg.deleteFail'))

              }
            })

          }
          return;

        }

      }
    }
@@ -369,7 +416,7 @@
}
const checkBoxConfig = {
  checkMethod: ({row}) => {
    if (row['layoutStatus'] === t('processCard.composingOk') || row['layoutStatus'] === t('processCard.typesetter')) {
    if ( row['layoutStatus'] === t('processCard.typesetter')) {
      return row.disable
    } else {
      return !row.disable
@@ -387,7 +434,7 @@
    <div id="selectForm">
      <el-row :gutter="0">
        <el-date-picker
            v-model="form.date1"
            v-model="orderInfo.workOrderDate"
            :default-time="defaultTime"
            :end-placeholder="$t('basicData.endDate')"
            :start-placeholder="$t('basicData.startDate')"
@@ -410,7 +457,7 @@
        ref="xGrid"
        :checkbox-config="checkBoxConfig"
        class="mytable-scrollbar"
        max-height="100%"
        height="100%"
        v-bind="gridOptions"
        v-on="gridEvents"
        @filter-change="filterChanged"
@@ -434,7 +481,7 @@
      <template #button_slot="{ row }">
        <!--        <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
        <!--        </el-button>-->
        <el-button v-if="userStore.user.permissions.indexOf('SelectProcessCard.edit') > -1"
        <el-button v-if="userStore.user.permissions.indexOf('selectProcessCard.edit') > -1"
                   link
                   size="small"
                   type="primary"
@@ -445,17 +492,19 @@
        <!--        <el-button v-else-if="row.layoutStatus=='不可排版'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>-->
        <!--        <el-button v-else-if="row.layoutStatus=='已排版'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>-->
        <!--        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
        <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
          <template #reference>
            <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>
          </template>
        </el-popconfirm>
<!--        <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">-->
<!--          <template #reference>-->
<!--            <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>-->
<!--          </template>-->
<!--        </el-popconfirm>-->
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
            <input v-model="option.data" type="text"
                   @keyup.enter.native="$panel.confirmFilter()"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
@@ -492,7 +541,7 @@
<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
  height: 95%;
}

#selectForm {