From ed6f35069824d71ee6da599a328d865eb0c58550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 四月 2024 09:16:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue |  507 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 373 insertions(+), 134 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index f343336..f5af339 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -1,164 +1,403 @@
-<script lang="ts" setup>
-import {reactive, ref} from 'vue'
+<script setup>
 
-// do not use same name with ref
+import {reactive, ref} from "vue";
+import {useRouter} from  'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+import {Search} from "@element-plus/icons-vue";
+import { useI18n } from 'vue-i18n'
+import SelectProduct from "@/views/sd/product/SelectProduct.vue";
+//璇█鑾峰彇
+const { t } = useI18n()
+let router=useRouter()
+const getTableRow = (row,type) =>{
+  switch (type) {
+    case 'edit' :{
+      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+      router.push({path: '/main/reportingWorks/AddReportingWork', query: { reportingWorkId: row.reportingWorkId }})
+      break
+    }
+    case 'delete':{
+      request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${row.processId}/${row.thisProcess}`).then((res) => {
+        if (res.code == 200) {
+          ElMessage.success(t('workOrder.deleteOk'))
+          router.push({path: '/main/reportingWorks/SelectReportingWorks', query: {random:Math.random()}})
+        } else {
+
+          ElMessage.warning(res.msg)
+
+        }
+      })
+      break
+    }
+  }
+}
+
+
+function padLeftZero(str) {
+  return ('00' + str).substr(str.length)
+}
+
+//鎻愪氦鐨勮〃鍗�
 const form = reactive({
-  name: '',
-  region: '',
   date1: '',
-  date2: '',
-  delivery: false,
-  type: [],
-  resource: '',
-  desc: '',
+  orderId: ''
 })
-const value = ref('')
-const defaultTime = ref<[Date, Date]>([
-  new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1, 23, 59, 59),
-])
-const tableData = [
-  {
-    reportingWorkNo: 'BG2312080011',
-    reportingWorkTime: '2023-12-08 09:05:58',
-    processCard: 'NG23120801A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '鍥涙壒浜�',
-    device:'澶ф捣鍒╁畞',
-    thisProcess: '鍒囧壊',
-    finishedNumber: '13',
-    finishedArea: '44.22',
-    wornNumber: '',
-    wornArea: '',
-    teamName:'鍒囧壊涓�鐝�'
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+  let count = 0
+  list.forEach(item => {
+    count += Number(item[field])
+  })
+  return count.toFixed(2)
+}
+
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+  // 鍐呭楂樺害
+  scrollTop.value = row.$event.target.scrollTop
+  scrollHeight.value = row.$event.target.scrollHeight
+  clientHeight.value = row.$event.target.clientHeight
+}
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+  order: {
+    project: '',
+    batch:''
   },
-  {
-    reportingWorkNo: 'BG2312080013',
-    reportingWorkTime: '2023-12-08 09:05:58',
-    processCard: 'NG23120801A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '涓�鎵逛簩',
-    device:'澶ф捣鍒╁畞',
-    thisProcess: '鍒囧壊',
-    finishedNumber: '13',
-    finishedArea: '44.22',
-    wornNumber: '',
-    wornArea: '',
-    teamName:'鍒囧壊涓�鐝�'
+  orderGlassDetail: {
+    completedArea:'',
+    wornArea:''
+  }
+
+})
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+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 inputVal = form.orderId
+if (inputVal == '') {
+  inputVal = null
+}
+let total = reactive({
+  pageTotal : 0,
+  dataTotal : 0,
+  pageSize : 100
+})
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, 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)
+  }
+})
+
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = ()=>{
+  let startTime = form.date1[0]
+  let endTime = form.date1[1]
+  let inputVal = form.orderId
+  if (inputVal == '') {
+    inputVal = null
+  }
+  request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`,filterData.value).then((res) => {
+    if(res.code==200){
+
+
+      produceList = deepClone(res.data.data)
+      xGrid.value.reloadData(produceList)
+    }else{
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+
+  let startTime = form.date1[0]
+  let endTime = form.date1[1]
+  let inputVal = form.orderId
+  if (inputVal == '') {
+    inputVal = null
+  }
+  request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, 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
+    } else {
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+  pageNum.value=currentPage
+  total.pageTotal    = pageSize
+  selectPageList()
+}
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+const changeFilterEvent = (event, option, $panel,) => {
+  // 鎵嬪姩瑙﹀彂绛涢��
+  $panel.changeOption(event, !!option.data, option)
+}
+
+function filterChanged(column) {
+  gridOptions.loading = true
+  //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+  let value = column.datas[0] != undefined ? column.datas[0] : ''
+  value = value.trim()
+  //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+  if (column.property.indexOf('.') > -1) {
+    const columnArr = column.property.split('.')
+    filterData.value[columnArr[0]] = {
+      [columnArr[1]]: value
+    }
+  } else {
+    filterData.value[column.property] = value
+  }
+
+//鑾峰彇閫変腑鏃堕棿
+  let startTime = form.date1[0]
+  let endTime = form.date1[1]
+
+  request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
+    if(res.code==200){
+      pageTotal.value=res.data.total
+      total.pageTotal=parseInt(res.data.total)
+      pageNum.value=1
+      produceList = deepClone(res.data.data)
+      xGrid.value.loadData(produceList)
+      gridOptions.loading=false
+    }else{
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+  const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+  return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
+const gridOptions = reactive({
+  loading: true,
+  border:  "full",//琛ㄦ牸鍔犺竟妗�
+  keepSource: true,//淇濇寔婧愭暟鎹�
+  align: 'center',//鏂囧瓧灞呬腑
+  stripe:true,//鏂戦┈绾�
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'CustomerList',
+  showFooter: true,//鏄剧ず鑴�
+  printConfig: {},
+  importConfig: {},
+  exportConfig: {},
+  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+  showOverflow:true,
+  columnConfig: {
+    resizable: true,
+    useKey: true
   },
-  {
-    reportingWorkNo: 'BG2311080025',
-    reportingWorkTime: '2023-12-08 09:05:58',
-    processCard: 'NG23120801A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '涓�鎵逛簩',
-    device:'澶ф捣鍒╁畞',
-    thisProcess: '鍒囧壊',
-    finishedNumber: '13',
-    finishedArea: '44.22',
-    wornNumber: '',
-    wornArea: '',
-    teamName:'鍒囧壊涓�鐝�'
+  filterConfig: {   //绛涢�夐厤缃」
+    remote: true
   },
-  {
-    reportingWorkNo: 'BG2303080025',
-    reportingWorkTime: '2023-12-08 09:05:58',
-    processCard: 'NG23120801A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '涓�鎵逛簩',
-    device:'澶ф捣鍒╁畞',
-    thisProcess: '鍒囧壊',
-    finishedNumber: '13',
-    finishedArea: '44.22',
-    wornNumber: '',
-    wornArea: '',
-    teamName:'鍒囧壊涓�鐝�'
+  customConfig: {
+    storage: true
   },
-  {
-    reportingWorkNo: 'BG2312080001',
-    reportingWorkTime: '2023-12-08 09:05:58',
-    processCard: 'NG23120801A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '涓�鎵逛簩',
-    device:'澶ф捣鍒╁畞',
-    thisProcess: '鍒囧壊',
-    finishedNumber: '13',
-    finishedArea: '44.22',
-    wornNumber: '',
-    wornArea: '',
-    teamName:'鍒囧壊涓�鐝�'
+  editConfig: {
+    trigger: 'click',
+    mode: 'row',
+    showStatus: true
+  },//琛ㄥご鍙傛暟
+  columns:[
+    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+    {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
+    { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+    {field: 'reportingWorkId', width: 120, title: '鎶ュ伐缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
+    {field: 'reportingWorkTime',width: 120, title: '鎶ュ伐鏃堕棿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'orderId', width: 130,title: '閿�鍞崟鍙�' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'processId', width: 130,title: '娴佺▼鍗″彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'order.project',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
+    {field: 'order.batch', width: 100,title: '鎵规' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+
+    {field: 'thisProcess',width: 100, title: '鏈伐搴�',filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+    {field: 'thisCompletedQuantity',width: 120, title: '鏈伐搴忓畬宸�' },
+    {field: 'completedArea', width: 120,title: '瀹屽伐闈㈢Н', },
+    {field: 'thisWornQuantity',width: 120, title: '鏈伐搴忔鐮�', },
+    {field: 'wornArea',width: 120, title: '娆＄牬闈㈢Н', },
+    {field: 'deviceName', width: 100,title: '鎶ュ伐璁惧', },
+    {field: 'teamsGroupsName',width: 120, title: '鎶ュ伐鐝粍', },
+    {field: 'reviewedState',width: 120, title: '瀹℃牳鐘舵��', },
+
+  ],//琛ㄥご鎸夐挳
+
+  toolbarConfig: {
+    // buttons: [{
+    //
+    // }],
+    // import: false,
+    // export: true,
+    // print: true,
+    zoom: true,
+    custom: true
   },
-  {
-    reportingWorkNo: 'BG2312080015',
-    reportingWorkTime: '2023-12-08 09:05:58',
-    processCard: 'NG23120801A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    batch: '涓�鎵逛簩',
-    device:'澶ф捣鍒╁畞',
-    thisProcess: '鍒囧壊',
-    finishedNumber: '13',
-    finishedArea: '44.22',
-    wornNumber: '',
-    wornArea: '',
-    teamName:'鍒囧壊涓�鐝�'
-  },
-]
+  data:  [],//table body瀹為檯鏁版嵁
+  //鑴氶儴姹傚拰
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    let footList=['','','','']
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return '鍚堣:'
+        }
+        if (footList.includes(column.field)) {
+          return sumNum(data, column.field)
+        }
+        return ''
+      })
+    ]
+  }
+
+})
+
+
 </script>
 
 <template>
-  <div>
-    <div id="selectForm" >
+  <div class="main-div-customer">
+    <div id="selectForm">
       <el-row :gutter="0">
-<!--          <el-input placeholder="娴佺▼鍗″彿" v-model="form.name" style="width: 200px"/>-->
-
-
-<!--        &nbsp;&nbsp;-->
-<!--          <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 200px"/>-->
-
-<!--        &nbsp;&nbsp;-->
         <el-date-picker
-            v-model="value"
+            v-model="form.date1"
             type="daterange"
-            start-placeholder="鎶ュ伐寮�濮嬫椂闂�"
-            end-placeholder="缁撴潫鏃堕棿"
+            format="YYYY/MM/DD"
+            value-format="YYYY-MM-DD"
+            :start-placeholder="$t('basicData.startDate')"
+            :end-placeholder="$t('basicData.endDate')"
             :default-time="defaultTime"
+
         />
         &nbsp;&nbsp;
-        <el-button type="primary">鏌ヨ</el-button>
+        <el-input v-model="form.orderId" clearable :placeholder="$t('order.orderId')" style="width: 130px"></el-input>
+        &nbsp;
+        <el-button
+            @click="getWorkOrder"
+            id="select"
+            type="primary" :icon="Search">{{$t('basicData.search')}}
+
+        </el-button>
       </el-row>
 
     </div>
-    <el-table :data="tableData" border style="width: 100%" height="100%">
-      <el-table-column fixed label="鎿嶄綔" width="140"  >
-        <el-button link type="primary" size="small">鍒犻櫎</el-button>
-        <el-button link type="primary" size="small">缂栬緫</el-button>
-        <el-button link type="primary" size="small">鍙嶅</el-button>
-      </el-table-column>
-      <el-table-column sortable prop="reportingWorkNo" label="鎶ュ伐缂栧彿" width="120" >
-        <template v-slot="scope">
-          <router-link :to="{path:'ReportingWorkDetail'}" >{{scope.row.reportingWorkNo}}</router-link>
-        </template>
-      </el-table-column>
-      <el-table-column prop="reportingWorkTime" label="鎶ュ伐鏃堕棿" width="155" />
-      <el-table-column prop="processCard" label="娴佺▼鍗″彿" width="135" />
-      <el-table-column prop="entryName" label="椤圭洰鍚嶇О" width="155" />
-      <el-table-column prop="batch" label="鎵规" width="75" />
-      <el-table-column prop="device" label="璁惧" width="100" />
-      <el-table-column prop="thisProcess" label="鏈伐搴�" width="100" />
-      <el-table-column prop="finishedNumber" label="鏈伐搴忓畬宸�" width="100" />
-      <el-table-column prop="finishedArea" label="瀹屽伐闈㈢Н" width="90" />
-      <el-table-column prop="wornNumber" label="鏈伐搴忔鐮�" width="100" />
-      <el-table-column prop="wornArea" label="娆＄牬闈㈢Н" width="90" />
-      <el-table-column prop="teamName" label="鐝粍鍚嶇О"  width="150" />
-    </el-table><!-- <h1>{{msg}}</h1> -->
+    <vxe-grid
+        max-height="100%"
+        @filter-change="filterChanged"
+        class="mytable-scrollbar"
+        ref="xGrid"
+        v-bind="gridOptions"
+
+    >
+      <!--      @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>
+
+      <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+      <template #button_slot="{ row }">
+        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
+<!--        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
+        <el-popconfirm   @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+          <template #reference>
+            <el-button  link type="primary" size="small">{{ $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)"/>
+          </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>
+
+    </vxe-grid>
+<!--    <el-dialog v-model="updateWork"  style="width: 80%;height:75% ">-->
+<!--      <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
 <style scoped>
+.main-div-customer{
+  width: 99%;
+  height: 100%;
+}
 #selectForm {
   width: 45%;
-  height: 100%;
   text-align: center;
 }
-
 </style>
\ No newline at end of file

--
Gitblit v1.8.0