From de18cca83738bdf6b279046e34b910ccd5b73a84 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue |  388 +++++++++++++++++++++++++++---------------------------
 1 files changed, 195 insertions(+), 193 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
index f8a96f2..d57c97f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -1,8 +1,21 @@
 <script setup>
 
-import {reactive} from "vue";
-import {useRouter} from  'vue-router'
-let router=useRouter()
+import {reactive, ref} from "vue";
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import {ElMessage} from "element-plus";
+import deepClone from "@/utils/deepClone";
+import {Search} from "@element-plus/icons-vue";
+import useUserInfoStore from "@/stores/userInfo";
+import {changeFilterEvent,filterChanged} from "@/hook"
+
+
+const userStore = useUserInfoStore()
+const username = userStore.user.userName
+const userid = userStore.user.userId
+let router = useRouter()
+let produceList = ref([])
+const dialogFormVisible = ref(false)
 const getTableRow = (row,type) =>{
   switch (type) {
     case 'edit' :{
@@ -21,6 +34,41 @@
   }
 }
 
+let pageNum=ref(1)
+let total = reactive({
+  pageTotal : 0,
+  dataTotal : 0,
+  pageSize : 10
+})
+
+let selectDate = ref(["",""])
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+
+
+})
+
+//绗竴娆¤皟鐢�
+request.post(`/Replenish/SelectReplenish/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+
+  if(res.code==200){
+    console.log(res.data.data)
+    total.dataTotal = res.data.total.total*1
+    total.pageTotal= res.data.total.pageTotal
+
+    selectDate.value = res.data.selectDate
+    pageNum.value=1
+
+    produceList = deepClone(res.data.data)
+    xGrid.value.loadData(produceList)
+    gridOptions.loading=false
+  }else{
+    ElMessage.warning(res.msg)
+    router.push("/login")
+  }
+})
+
 //琛ㄥ熬姹傚拰
 const sumNum = (list, field) => {
   let count = 0
@@ -31,7 +79,7 @@
 }
 
 //瀛愮粍浠舵帴鏀跺弬鏁�
-
+const xGrid = ref()
 const gridOptions = reactive({
   border:  "full",//琛ㄦ牸鍔犺竟妗�
   keepSource: true,//淇濇寔婧愭暟鎹�
@@ -50,7 +98,7 @@
     useKey: true
   },
   filterConfig: {   //绛涢�夐厤缃」
-    remote: true
+    //remote: true
   },
   customConfig: {
     storage: true
@@ -61,199 +109,56 @@
     showStatus: true
   },//琛ㄥご鍙傛暟
   columns:[
-    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-    {title: '鎿嶄綔', width: 80, slots: { default: 'button_slot' },fixed:"left"},
-    { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
 
-    {field: 'salesOrderNo', width: 120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
-    {field: 'processCardNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: 'entryName', width: 130,title: '椤圭洰鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: 'productName',width: 120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'reportingWorkNo', width: 100,title: '鎶ュ伐缂栧彿', sortable: true,showOverflow:"ellipsis"},
-    {field: 'serialNumber', width: 70,title: '搴忓彿', sortable: true},
-    {field: 'singlePieceName',width: 100, title: '鍗曠墖鍚嶇О', sortable: true},
-    {field: 'floorNumber',width: 120, title: '妤煎眰缂栧彿', sortable: true,showOverflow:"ellipsis"},
-    {field: 'marking', width: 80,title: '鏍囪', sortable: true},
-    {field: 'pieces',width: 90, title: '鐗囨爣璁�', sortable: true},
-    {field: 'processCardNumber',width: 120, title: '娴佺▼鍗℃暟閲�', sortable: true},
-    {field: 'width',width: 80, title: '瀹�', sortable: true},
-    {field: 'height',width: 80, title: '楂�', sortable: true},
-    {field: 'area',width: 80, title: '闈㈢Н', sortable: true},
-    {field: 'shape',width: 80, title: '褰㈢姸', sortable: true},
-    {field: 'numberBroken',width: 120, title: '娆＄牬鏁伴噺', sortable: true},
-    {field: 'reasonType',width: 120, title: '娆＄牬绫诲瀷', sortable: true},
-    {field: 'reasonDamage',width: 120, title: '娆＄牬鍘熷洜', sortable: true},
-    {field: 'responsibilityDevice',width: 120, title: '璐ｄ换璁惧', sortable: true},
-    {field: 'reportingProcess',width: 120, title: '鎶ュ伐宸ュ簭', sortable: true},
-    {field: 'responsibilityProcess',width: 120, title: '璐ｄ换宸ュ簭', sortable: true},
-    {field: 'responsibilityTeams',width: 120, title: '璐ｄ换鐝粍', sortable: true},
-    {field: 'responsibilityPersonnel',width: 120, title: '璐ｄ换浜哄憳', sortable: true},
-    {field: 'qualityInspector',width: 100, title: '璐ㄦ鍛�', sortable: true}
+    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+    {type:'checkbox',title: '閫夋嫨', width: 80,fixed:"left"},
+    {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+    {field: 'review_status',title: '瀹℃牳', width: 40, slots: { default: 'state' }},
+    {field: 'patch_id', width: 120, title: '琛ョ墖鍗曞彿', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'order_id', width: 120, title: '閿�鍞崟鍙�', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'process_id', width: 120, title: '娴佺▼鍗″彿', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'project', width: 120, title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'reporting_work_id', width: 100,title: '鎶ュ伐缂栧彿',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'batch', width: 80, title: '鎵规', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'order_sort', width: 80, title: '搴忓彿', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'product_name', width: 120, title: '鍗曠墖鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'building_number',width: 120, title: '妤煎眰缂栧彿', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'technology_number', width: 80, title: '鏍囪', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'glass_address', width: 90, title: '鐗囨爣璁�', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'patch_num', width: 80, title: '鏁伴噺', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'width', width: 80, title: '瀹�', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'height', width: 80, title: '楂�', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'shape', width: 80, title: '褰㈢姸', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'patch_type', width: 100, title: '杩斿伐绫诲瀷', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'patch_reason', width: 120, title: '杩斿伐鍘熷洜', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'responsible_equipment', width: 120, title: '璐ｄ换璁惧', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'responsible_team', width: 120, title: '璐ｄ换鐝粍', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'patch_area', width: 120, title: '闈㈢Н', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'patch_processes', width: 120, title: '鎶ュ伐宸ュ簭', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'quality_inspector', width: 100, title: '璐ㄦ鍛�', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'reviewer', width: 100, title: '瀹℃牳鍛�', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+    {field: 'create_time', width: 100, title: '琛ョ墖鏃堕棿'},
+    {field: 'update_time', width: 120, title: '琛ョ墖瀹℃牳鏃堕棿'}
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
-    // buttons: [{
-    //
-    // }],
-    import: false,
+    buttons: [{
+      'name': '瀹℃牳',status: 'primary',
+      'code':'add'
+    }],
+    /*import: false,
     export: true,
-    print: true,
+    print: true,*/
     zoom: true,
     custom: true
   },
-  data:  [
-    {
-      reportingWorkTime:'2021-01-01',
-      salesOrderNo:'NG23010101',
-      processCardNo:'NG23010101A01',
-      entryName:'xxxx',
-      productName:"xxxxxxxxx",
-      reportingWorkNo:"BG2301010001",
-      floorNumber:"D4-010-01",
-      area:'23.11',
-      reportingProcess:'閽㈠寲',
-      qualityInspector:"寮犱笁",
-      serialNumber:'1',
-      singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
-      marking: '1',
-      pieces: '(澶�)',
-      processCardNumber: '11',
-      width: '575',
-      height:"2241",
-      shape: '鏅舰',
-      upCompletedQuantity: '12',
-      completedQuantity: '1',
-      numberBroken:'2',
-      availableUse:'',
-      returnProcess:'',
-
-      reasonType: '鏈哄櫒',
-      reasonDamage:'姘旀场瓒呮爣',
-      available:'',
-      reworkProcess:'',
-      responsibilityProcess:'涓┖',
-      responsibilityTeams:'涓┖涓�鐝�',
-      responsibilityPersonnel:'',
-      responsibilityDevice:'涓┖3#绾�',
-      completed:'',
-      onceBroken:'',
-    },
-    {
-      reportingWorkTime:'2021-01-01',
-      salesOrderNo:'NG23010101',
-      processCardNo:'NG23010101A01',
-      entryName:'xxxx',
-      productName:"xxxxxxxxx",
-      reportingWorkNo:"BG2301010001",
-      floorNumber:"D4-010-01",
-      area:'23.11',
-      reportingProcess:'閽㈠寲',
-      qualityInspector:"寮犱笁",
-      serialNumber:'1',
-      singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
-      marking: '1',
-      pieces: '(澶�)',
-      processCardNumber: '11',
-      width: '575',
-      height:"2241",
-      shape: '鏅舰',
-      upCompletedQuantity: '12',
-      completedQuantity: '1',
-      numberBroken:'2',
-      availableUse:'',
-      returnProcess:'',
-
-      reasonType: '鏈哄櫒',
-      reasonDamage:'姘旀场瓒呮爣',
-      available:'',
-      reworkProcess:'',
-      responsibilityProcess:'涓┖',
-      responsibilityTeams:'涓┖涓�鐝�',
-      responsibilityPersonnel:'',
-      responsibilityDevice:'涓┖3#绾�',
-      completed:'',
-      onceBroken:'',
-    },
-    {
-      reportingWorkTime:'2021-01-01',
-      salesOrderNo:'NG23010101',
-      processCardNo:'NG23010101A01',
-      entryName:'xxxx',
-      productName:"xxxxxxxxx",
-      reportingWorkNo:"BG2301010001",
-      floorNumber:"D4-010-01",
-      area:'23.11',
-      reportingProcess:'閽㈠寲',
-      qualityInspector:"寮犱笁",
-      serialNumber:'1',
-      singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
-      marking: '1',
-      pieces: '(澶�)',
-      processCardNumber: '11',
-      width: '575',
-      height:"2241",
-      shape: '鏅舰',
-      upCompletedQuantity: '12',
-      completedQuantity: '1',
-      numberBroken:'2',
-      availableUse:'',
-      returnProcess:'',
-
-      reasonType: '鏈哄櫒',
-      reasonDamage:'姘旀场瓒呮爣',
-      available:'',
-      reworkProcess:'',
-      responsibilityProcess:'涓┖',
-      responsibilityTeams:'涓┖涓�鐝�',
-      responsibilityPersonnel:'',
-      responsibilityDevice:'涓┖3#绾�',
-      completed:'',
-      onceBroken:'',
-    },
-    {
-      reportingWorkTime:'2021-01-01',
-      salesOrderNo:'NG23010101',
-      processCardNo:'NG23010101A01',
-      entryName:'xxxx',
-      productName:"xxxxxxxxx",
-      reportingWorkNo:"BG2301010001",
-      floorNumber:"D4-010-01",
-      area:'23.11',
-      reportingProcess:'閽㈠寲',
-      qualityInspector:"寮犱笁",
-      serialNumber:'1',
-      singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
-      marking: '1',
-      pieces: '(澶�)',
-      processCardNumber: '11',
-      width: '575',
-      height:"2241",
-      shape: '鏅舰',
-      upCompletedQuantity: '12',
-      completedQuantity: '1',
-      numberBroken:'2',
-      availableUse:'',
-      returnProcess:'',
-
-      reasonType: '鏈哄櫒',
-      reasonDamage:'姘旀场瓒呮爣',
-      available:'',
-      reworkProcess:'',
-      responsibilityProcess:'涓┖',
-      responsibilityTeams:'涓┖涓�鐝�',
-      responsibilityPersonnel:'',
-      responsibilityDevice:'涓┖3#绾�',
-      completed:'',
-      onceBroken:'',
-    },
-  ],//table body瀹為檯鏁版嵁
   //鑴氶儴姹傚拰
   footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
     let footList=['processCardNumber','numberBroken']
     return[
       columns.map((column, columnIndex) => {
         if (columnIndex === 0) {
-          return '鍚堣:'
+          return '鍚堣'
         }
         if (footList.includes(column.field)) {
           return sumNum(data, column.field)
@@ -265,31 +170,111 @@
 
 })
 
+const gridEvents = {
+  toolbarButtonClick ({ code }) {
+    const $grid = xGrid.value
+    if ($grid) {
+      switch (code) {
+        case 'add': {
+          const $table = xGrid.value
+          if ($table) {
+            const selectRecords = $table.getCheckboxRecords()
+
+            let flowData = ref({
+
+              userId:userid,
+              userName:username,
+              patchLog:selectRecords
+
+            })
+            request.post("/Replenish/updateReplenish",flowData.value).then((res) => {
+              if(res.code==200){
+                ElMessage.success("瀹℃牳鎴愬姛")
+                location.reload();
+
+              }else{
+                ElMessage.warning(res.msg)
+                router.push("/login")
+              }
+            })
+          }
+          return;
+
+        }
+
+
+      }
+    }
+  },
+
+}
+
+
+const selectOrderList = ()=>{
+  request.post(`/Replenish/SelectReplenish/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+    if(res.code==200){
+      selectDate.value = res.data.selectDate
+
+      produceList = deepClone(res.data.data)
+      xGrid.value.loadData(produceList)
+      gridOptions.loading=false
+    }else{
+      ElMessage.warning(res.msg)
+      router.push("/login")
+    }
+  })
+}
+
+const changeDate =  ()=>{
+  selectOrderList()
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+  total.pageTotal = pageSize
+  pageNum.value=currentPage
+
+  selectOrderList()
+}
+
+const checkBoxConfig = {
+  checkMethod: ({ row }) => {
+    if (row['review_status']===1){
+      return row.disable
+    }else{
+      return !row.disable
+    }
+
+  },
+  reserve:true
+}
+
 
 
 </script>
 
 <template>
   <div class="main-div-customer">
-    <div id="head" >
-      <el-row :gutter="0">
+    <el-header height="auto" style="padding: 0;margin:0">
       <el-date-picker
-          v-model="value"
+          v-model="selectDate"
           type="daterange"
-          start-placeholder="鎶ュ伐寮�濮嬫椂闂�"
+          start-placeholder="寮�濮嬫椂闂�"
           end-placeholder="缁撴潫鏃堕棿"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+
       />
-      &nbsp;
-      <el-button type="primary">鏌ヨ</el-button>
-      </el-row>
-    </div>
+      <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
+    </el-header>
 
     <vxe-grid
         max-height="100%"
-        @filter-change="filterChanged"
         class="mytable-scrollbar"
         ref="xGrid"
         v-bind="gridOptions"
+        v-on="gridEvents"
+        :checkbox-config="checkBoxConfig"
 
     >
       <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -316,6 +301,23 @@
         </div>
       </template>
 
+      <template #state="{ row,column}">
+        <el-checkbox @click.native.prevent  :checked="row[column.field]===1"/>
+      </template>
+
+      <template #pager>
+        <!--浣跨敤 pager 鎻掓Ы-->
+        <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>
   </div>

--
Gitblit v1.8.0