From b8982b86a15d186c4cf6144fface700d9769fa95 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 三月 2025 09:13:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue |  610 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 404 insertions(+), 206 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 7cd887e..b267239 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -9,82 +9,67 @@
 import GlassType from "@/components/sd/product/GlassType.vue"
 import {useRouter} from 'vue-router'
 import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
 import {VXETable} from "vxe-table";
-import { useI18n } from 'vue-i18n'
+import {useI18n} from 'vue-i18n'
+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"
+import {Printer} from "@element-plus/icons-vue/global";
+import SelectProcessCardDetail from "@/components/pp/SelectProcessCardDetail.vue";
+
 //璇█鑾峰彇
-const { t } = useI18n()
+const {t} = useI18n()
+const userStore = useUserInfoStore()
+const user=userInfo()
+const orderInfo = useOrderInfoStore()
+
 let productGlassTypeStore = useProductGlassTypeStore()
+const dialogTableVisible = ref(false)
 let router = useRouter()
 let props = defineProps({
-  rowIndex:{}
+  rowIndex: {}
+})
+let printRow = ref({
+  list: null,
 })
 const getTableRow = (row, type) => {
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
   switch (type) {
     case 'select' : {
-      console.log(row.processId)
-      router.push({path: '/main/processCard/SelectDetailProcessCard', query: { processId: row.processId }})
-      break
-    }
-    case 'setType': {
-      let state=row.layoutStatus
-
-      if (state=='鍙帓鐗�'){
-        request.post(`/processCard/updateLayoutStatus/${row.processId}/2`).then((res) => {
-          if (res.code == 200) {
-            ElMessage.success(t('processCard.typesettingSuccess')
-            )
-            router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
-          } else {
-
-            ElMessage.warning(res.msg)
-          }
-        })
-      }
-      else if(state=='涓嶅彲鎺掔増'){
-        request.post(`/processCard/updateLayoutStatus/${row.processId}/1`).then((res) => {
-          if (res.code == 200) {
-            ElMessage.success(t('processCard.modifySuccessfully'))
-            router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
-          } else {
-
-            ElMessage.warning(res.msg)
-          }
-        })
-      }
-
+      router.push({path: '/main/processCard/SelectDetailProcessCard', query: {processId: row.processId}})
       break
     }
     case 'delete': {
-      request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
-        if (res.code == 200) {
+      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()}})
+          router.push({path: '/main/processCard/SelectProcessCard', query: {random: Math.random()}})
         } else {
-
-          ElMessage.warning(res.msg)
-
+          ElMessage.warning(t('processCard.deleteNo'))
         }
       })
+
+      break
+    }
+    case 'rack' : {
+      dialogTableVisible.value = true
       break
     }
   }
 }
 
 
-
 function padLeftZero(str) {
   return ('00' + str).substr(str.length)
 }
 
-//瀹氫箟鏃堕棿
+//瀹氫箟鍙橀噺
 const form = reactive({
   date1: '',
+  getSelect:t('processCard.composingNo')
 })
-
-
 
 
 //琛ㄥ熬姹傚拰
@@ -124,58 +109,46 @@
 //瀹氫箟鏁版嵁杩斿洖缁撴灉
 let produceList = ref([])
 //瀹氫箟褰撳墠椤垫暟
-let pageNum=ref(1)
+let pageNum = ref(1)
 let pageState = null
 
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
-  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
-      .toISOString()
-      .replace('T', ' ')
-      .slice(0,10) //榛樿寮�濮嬫椂闂�7澶╁墠
-  const end = new Date(new Date().getTime()+3600 * 1000 * 24)
-      .toISOString()
-      .replace('T', ' ')
-      .slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
-  return [start, end]
-}
-
-
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1=getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
 let total = reactive({
-  pageTotal : 0,
-  dataTotal : 0,
-  pageSize : 100
+  pageTotal: 0,
+  dataTotal: 0,
+  pageSize: 100
 })
+
+const getFlowCardList = async () => {
 //绗竴娆″姞杞芥暟鎹�
+  await request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
 
-request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
-
-  if (res.code == 200) {
-    total.dataTotal = res.data.total.total*1
-    total.pageTotal= res.data.total.pageTotal
-    pageTotal.value = res.data.total
-    produceList = produceList.value.concat(deepClone(res.data.data))
-    xGrid.value.reloadData(produceList)
-    gridOptions.loading = false
-  } else {
-    ElMessage.warning(res.msg)
-  }
+    if (res.code == 200) {
+      total.dataTotal = res.data.total.total * 1
+      total.pageTotal = res.data.total.pageTotal
+      orderInfo.workOrderDate = res.data.selectDate
+      pageTotal.value = res.data.total
+      produceList.value = produceList.value.concat(deepClone(res.data.data))
+      xGrid.value.loadData(produceList.value)
+    } else {
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+onMounted(async () => {
+  filterData.value = orderInfo.selectProcessCardFilter.data
+  await getFlowCardList()
+  orderInfo.selectProcessCardFilter.list.forEach(item =>{
+    xGrid.value.getColumnByField(item.field).filters = item.column.filters
+  })
 })
-
 //椤佃剼缈婚〉鏌ヨ
-const selectPageList = ()=>{
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`,filterData.value).then((res) => {
-    if(res.code==200){
+const selectPageList = () => {
+  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
+    if (res.code == 200) {
 
-      produceList = deepClone(res.data.data)
-      xGrid.value.reloadData(produceList)
-    }else{
+      produceList.value = deepClone(res.data.data)
+      xGrid.value.loadData(produceList.value)
+    } else {
       ElMessage.warning(res.msg)
     }
   })
@@ -184,11 +157,10 @@
 //鐐瑰嚮鏌ヨ
 const getWorkOrder = () => {
 
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
-  request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
+  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
     if (res.code == 200) {
-
+      total.dataTotal = res.data.total.total * 1
+      total.pageTotal = res.data.total.pageTotal
       pageTotal.value = res.data.total
       xGrid.value.loadData(res.data.data)
       gridOptions.loading = false
@@ -199,9 +171,9 @@
 }
 
 //椤佃剼璺宠浆
-const handlePageChange = ({ currentPage, pageSize }) => {
-  pageNum.value=currentPage
-  total.pageTotal    = pageSize
+const handlePageChange = ({currentPage, pageSize}) => {
+  pageNum.value = currentPage
+  total.pageTotal = pageSize
   selectPageList()
 }
 
@@ -212,33 +184,32 @@
 }
 
 function filterChanged(column) {
-  gridOptions.loading = true
+  gridOptions.loading=true
   //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
-  let value = column.datas[0] != undefined ? column.datas[0] : ''
+  let value = column.datas[0]!=undefined?column.datas[0]:''
   value = value.trim()
   //鍒ゆ柇鏄惁瀛樺湪澶栭敭
-  if (column.property.indexOf('.') > -1) {
-    const columnArr = column.property.split('.')
+  if (column.property.indexOf('.')>-1){
+    const  columnArr = column.property.split('.')
     filterData.value[columnArr[0]] = {
-      [columnArr[1]]: value
+      [columnArr[1]]:value
     }
-  } else {
+  }else{
     filterData.value[column.property] = value
   }
 
-//鑾峰彇閫変腑鏃堕棿
-  let startTime = form.date1[0]
-  let endTime = form.date1[1]
 
-  request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
-    if(res.code==200){
-      pageTotal.value=res.data.total
+  request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
+    if (res.code == 200) {
+      total.dataTotal = res.data.total.total*1
       total.pageTotal=parseInt(res.data.total)
       pageNum.value=1
-      produceList = deepClone(res.data.data)
-      xGrid.value.loadData(produceList)
+      produceList.value = deepClone(res.data.data)
+      xGrid.value.loadData(produceList.value)
       gridOptions.loading=false
-    }else{
+      orderInfo.selectProcessCardFilter.list = xGrid.value.getCheckedFilters()
+      orderInfo.selectProcessCardFilter.data = filterData.value
+    } else {
       ElMessage.warning(res.msg)
     }
   })
@@ -253,18 +224,18 @@
 //瀛愮粍浠舵帴鏀跺弬鏁�
 const xGrid = ref()
 const gridOptions = reactive({
-  border:  "full",//琛ㄦ牸鍔犺竟妗�
+  border: "full",//琛ㄦ牸鍔犺竟妗�
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
-  stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'CustomerList',
+  stripe: true,//鏂戦┈绾�
+  rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'SelectProcessCard',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
   importConfig: {},
   exportConfig: {},
-  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
-  showOverflow:true,
+  scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+  showOverflow: true,
   columnConfig: {
     resizable: true,
     useKey: true
@@ -280,35 +251,61 @@
     mode: 'row',
     showStatus: true
   },//琛ㄥご鍙傛暟
-  columns:[
-    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-    {title: t('basicData.operate'), width: 160, 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: 80 },
-    {field: 'processId', width: 130, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: 'orderDetail.productId', title: t('order.productId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
-    {field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
-    {field: 'order.project', title: t('order.project') ,showOverflow:"ellipsis"},
-    {field: 'quantity', title: t('order.quantity'), },
-    {field: 'orderDetail.computeGrossArea', title: t('order.area'), },
-    {field: 'founder', title: t('processCard.founder'), },
-    {field: 'orderDetail.processingNote', title: t('order.processingNote'), },
-    {field: 'layoutStatus', title: t('processCard.layoutStatus'), }
+  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: 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},
+    {field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+
+    {
+      field: 'processId',
+      width: 140,
+      title: t('processCard.processId'),
+      showOverflow: "ellipsis",
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'}
+    },
+    {
+      field: 'orderDetail.productId',
+      title: t('order.productId'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+    },
+    {
+      field: 'orderDetail.productName',
+      title: t('order.product'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      width: 180
+    },
+    {field: 'order.project', title: t('order.project'), showOverflow: "ellipsis"},
+    {field: 'quantity', title: t('order.quantity'),},
+    {field: 'orderDetail.computeGrossArea', title: t('order.area'),},
+    {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: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+    {field: 'rack',width:100, title: t('鏋跺彿'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
-    // buttons: [{
-    //
-    // }],
+    buttons: [
+      {code: 'update', name: t('processCard.composing'), status: 'primary'},
+      {code: 'revoke', name: t('processCard.revoke'), status: 'primary'},
+      {code: 'delete', name: t('basicData.delete'), status: 'primary'},
+      {code: 'rack', name: t('鍚堟灦'), status: 'primary'},
+    ],
     import: false,
     // export: true,
     // print: true,
     zoom: true,
     custom: true
   },
-  data:  [
-
-  ],//table body瀹為檯鏁版嵁
+  data: [],//table body瀹為檯鏁版嵁
   //鑴氶儴姹傚拰
   footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
     return[
@@ -316,9 +313,10 @@
         if (columnIndex === 0) {
           return t('basicData.total')
         }
-        // if (props.tableProp.footList.includes(column.field)) {
-        //   return sumNum(data, column.field)
-        // }
+        const List = ["quantity",'orderDetail.computeGrossArea']
+        if (List.includes(column.field)) {
+          return footSum(data, column.field)
+        }
         return ''
       })
     ]
@@ -326,98 +324,298 @@
 
 })
 
+const sexOptions = ref([
+  {label: t('processCard.typesetter'), value: t('processCard.typesetter')},
+  {label: t('processCard.composingOk'), value: t('processCard.composingOk')},
+  {label: t('processCard.composingNo'), value: t('processCard.composingNo')}
+])
+
+//琛ㄦ牸鎸夐挳
+const gridEvents = {
+  async toolbarButtonClick({code}) {
+    const $grid = xGrid.value
+    if ($grid) {
+      switch (code) {
+        case 'update': {
+          const $table = xGrid.value
+          if ($table) {
+            const selectRecords = $table.getCheckboxRecords()
+            if (selectRecords.length == 0) {
+              ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
+              return;
+            }
+
+            let composingData = ref({
+              composing: selectRecords,
+            })
+
+            //淇敼鎺掔増鐘舵��
+            request.post("/processCard/updateComposing", composingData.value).then((res) => {
+              if (res.code == 200 && res.data === true) {
+                ElMessage.success(t('basicData.msg.saveSuccess'))
+                router.push({
+                  path: '/main/processCard/SelectProcessCard',
+                  query: {random: Math.random()}
+                })
+              } else {
+
+                ElMessage.warning(t('basicData.msg.saveFail'))
+
+              }
+            })
+
+          }
+          return;
+
+        }
+        case 'revoke': {
+          const $table = xGrid.value
+          if ($table) {
+            const selectRecords = $table.getCheckboxRecords()
+            if (selectRecords.length == 0) {
+              ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
+              return;
+            }
+
+            let composingData = ref({
+              composing: selectRecords,
+            })
+            selectRecords.forEach(item => {
+                if (item.layoutStatus == "宸叉帓鐗�"){
+                  ElMessage.warning(t('processCard.notSelectTheOptionData'))
+                  return;
+                }
+            });
+            //鎾ら攢鍙帓鐗堢姸鎬�
+            request.post("/processCard/revokeComposing", composingData.value).then((res) => {
+              if (res.code == 200 && res.data === true) {
+                ElMessage.success(t('basicData.msg.saveSuccess'))
+                router.push({
+                  path: '/main/processCard/SelectProcessCard',
+                  query: {random: Math.random()}
+                })
+              } else {
+
+                ElMessage.warning("鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�")
+
+              }
+            })
+
+          }
+          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;
+
+        }
+        case 'rack': {
+          const $table = xGrid.value
+          if ($table) {
+            const selectRecords = $table.getCheckboxRecords()
+            if (selectRecords.length == 0) {
+              ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
+              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 + "|"
+              }
+            }
+            printRow.value.list = JSON.stringify(selectRecords)
+            dialogTableVisible.value = true
+
+          }
+          return;
+
+        }
+
+      }
+    }
+  }
+}
+const checkBoxConfig = {
+  checkMethod: ({row}) => {
+    if ( row['layoutStatus'] === t('processCard.typesetter')) {
+      return row.disable
+    } else {
+      return !row.disable
+    }
+
+  },
+  reserve: true
+}
 
 
 </script>
 
 <template>
-  <div class="main-div-customer">
-    <div id="selectForm">
-      <el-row :gutter="0">
+  <div  style="width: 100%;height: 100%">
+    <div class="head">
         <el-date-picker
-            v-model="form.date1"
-            type="daterange"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
-            :start-placeholder="$t('basicData.startDate')"
-            :end-placeholder="$t('basicData.endDate')"
+            v-model="orderInfo.workOrderDate"
             :default-time="defaultTime"
+            :end-placeholder="$t('basicData.endDate')"
+            :start-placeholder="$t('basicData.startDate')"
+            format="YYYY/MM/DD"
+            type="daterange"
+            value-format="YYYY-MM-DD"
 
         />
         &nbsp;&nbsp;
         <el-button
-            @click="getWorkOrder"
             id="select"
-            type="primary" :icon="Search">{{$t('basicData.search')}}
+            :icon="Search"
+            style="margin-top: -5px"
+            type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
 
         </el-button>
-      </el-row>
 
     </div>
-    <vxe-grid
-        max-height="100%"
-        @filter-change="filterChanged"
-        class="mytable-scrollbar"
-        ref="xGrid"
-        v-bind="gridOptions"
+    <div class="main-table">
+      <vxe-grid
+          ref="xGrid"
+          :checkbox-config="checkBoxConfig"
+          class="mytable-scrollbar"
+          height="100%"
+          v-bind="gridOptions"
+          v-on="gridEvents"
+          @filter-change="filterChanged"
 
-    >
-      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
-      <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
-      <template #content="{ row }">
-        <ul class="expand-wrapper">
-          <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
-            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
-            <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
-            <span v-else>{{ row[item.field] }}</span>
+      >
+        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
+        <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+        <template #content="{ row }">
+          <ul class="expand-wrapper">
+            <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+              <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
+              <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+              <span v-else>{{ row[item.field] }}</span>
 
-          </li>
-        </ul>
-      </template>
+            </li>
+          </ul>
+        </template>
 
-      <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+        <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
 
-      <template #button_slot="{ row }" >
-        <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}
-        </el-button>
-        <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>
-        <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>
-      </template>
+        <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"
+                     link
+                     size="small"
+                     type="primary"
+                     @click="getTableRow(row,'select')">
+            {{ $t('basicData.edit') }}
+          </el-button>
+          <!--        <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>-->
+          <!--        <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>-->
+        </template>
 
-      <template #num1_filter="{ column, $panel }">
-        <div>
-          <div v-for="(option, index) in column.filters" :key="index">
-            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+        <template #num1_filter="{ column, $panel }">
+          <div>
+            <div v-for="(option, index) in column.filters" :key="index">
+              <input
+                  v-model="option.data"
+                  @keyup.enter.native="$panel.confirmFilter()"
+                  @input="changeFilterEvent($event, option, $panel)"/>
+            </div>
           </div>
-        </div>
-      </template>
-      <template #pager>
-        <!--浣跨敤 pager 鎻掓Ы-->
-        <!--        'PrevJump','NextJump', -->
-        <vxe-pager
-            @page-change="handlePageChange"
-            :layouts="[  'PrevPage', 'Jump','PageCount', 'NextPage',  'Total']"
-            v-model:current-page="pageNum"
-            v-model:page-size="total.pageSize"
-            v-model:pager-count="total.pageTotal"
-            :total="total.dataTotal"
-        >
-        </vxe-pager>
-      </template>
+        </template>
+        <template #select_filter="{ column, $panel }">
+          <div>
 
-    </vxe-grid>
+            <div v-for="(option, index) in column.filters" :key="index">
+              <select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" style="width: 100%">
+                <option  :value="$t('processCard.typesetter')" :label="$t('processCard.typesetter')"></option>
+                <option  :value="$t('processCard.composingOk')" :label="$t('processCard.composingOk')"></option>
+                <option  :value="$t('processCard.composingNo')" :label="$t('processCard.composingNo')"></option>
+              </select>
+            </div>
+          </div>
+        </template>
+        <template #pager>
+          <!--浣跨敤 pager 鎻掓Ы-->
+          <!--        'PrevJump','NextJump', -->
+          <vxe-pager
+              v-model:current-page="pageNum"
+              v-model:page-size="total.pageSize"
+              v-model:pager-count="total.pageTotal"
+              :layouts="[  'PrevPage', 'Jump','PageCount', 'NextPage',  'Total']"
+              :total="total.dataTotal"
+              @page-change="handlePageChange"
+          >
+          </vxe-pager>
+        </template>
+
+      </vxe-grid>
+    </div>
+
+    <el-dialog
+        id="sizePrintCalrd"
+        v-model="dialogTableVisible"
+        :title="$t('娴佺▼鍗″悎鏋�')"
+        destroy-on-close
+        style="width: 75%;height:75% ">
+      <select-process-card-detail
+          id="child"
+          :printList="printRow.list"
+          style="width: 100%;height: 100%"/>
+    </el-dialog>
   </div>
 </template>
 
 <style scoped>
-.main-div-customer{
-  width: 99%;
-  height: 100%;
+.head{
+  width: 100%;
+  height: 35px;
 }
-#selectForm {
-  width: 40%;
-  text-align: center;
+
+.main-table{
+  width: 100%;
+  height: calc(100% - 35px);
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0