From daeb49a9678f6061990d62e6090ff82f934a2456 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 26 Aug 2025 16:43:10 +0800
Subject: [PATCH] =?UTF-8?q?2025-08-26=20=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=92=E4=BA=A7(=E6=89=A9=E5=B1=95)=20=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/inboundNotification.vue  | 30 +++---
 .../schedule/order_schedule_expand.vue        | 95 +++++++++++--------
 2 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/src/views/modules/qc/inboundNotification.vue b/src/views/modules/qc/inboundNotification.vue
index 817af75..fae69af 100644
--- a/src/views/modules/qc/inboundNotification.vue
+++ b/src/views/modules/qc/inboundNotification.vue
@@ -1177,8 +1177,8 @@
       },
 
       updateModal (row) {
-        if (this.currentRow.orderType === '采购入库') {
-          this.$message.warning('采购入库单据不能编辑！')
+        if (this.currentRow.orderType === '采购入库' || '销售退货') {
+          this.$message.warning('该类型单据不能编辑！')
           return
         }
         this.modalData = {
@@ -1241,10 +1241,6 @@
 
       // 删除
       deleteModal () {
-        if (this.currentRow.orderType === '采购入库') {
-          this.$message.warning('采购入库单据不能编辑！')
-          return
-        }
         if (this.inboundSelection.length === 0) {
           this.$message.warning('请勾选要删除的单据！')
           return
@@ -1276,8 +1272,8 @@
 
       // 关闭
       closeModal (row) {
-        if (this.currentRow.orderType === '采购入库') {
-          this.$message.warning('采购入库单据不能编辑！')
+        if (this.currentRow.orderType === '采购入库' || '销售退货') {
+          this.$message.warning('该类型单据不能编辑！')
           return
         }
         closeInboundNotification(row).then(({data}) => {
@@ -1292,8 +1288,8 @@
 
       // 下达
       issueModal (row) {
-        if (this.currentRow.orderType === '采购入库') {
-          this.$message.warning('采购入库单据不能编辑！')
+        if (this.currentRow.orderType === '采购入库' || '销售退货') {
+          this.$message.warning('该类型单据不能编辑！')
           return
         }
         issueInboundNotification(row).then(({data}) => {
@@ -1364,8 +1360,8 @@
 
       // 新增明细
       addInboundDetailModal () {
-        if (this.currentRow.orderType === '采购入库') {
-          this.$message.warning('采购入库单据不能编辑！')
+        if (this.currentRow.orderType === '采购入库' || '销售退货') {
+          this.$message.warning('该类型单据不能编辑！')
           return
         }
         this.detailSearchData = {
@@ -1481,10 +1477,10 @@
         })
       },
 
-      // 删除物料缺陷跟踪
+      // 删除入库明细
       deleteInboundDetail () {
-        if (this.currentRow.orderType === '采购入库') {
-          this.$message.warning('采购入库单据不能编辑！')
+        if (this.currentRow.orderType === '采购入库' || '销售退货') {
+          this.$message.warning('该类型单据不能编辑！')
           return
         }
         if (this.inboundDetailSelection.length === 0) {
@@ -1513,8 +1509,8 @@
 
       // 批量编辑模态框
       editBatchModel() {
-        if (this.currentRow.orderType === '采购入库') {
-          this.$message.warning('采购入库单据不能编辑！')
+        if (this.currentRow.orderType === '采购入库' || '销售退货') {
+          this.$message.warning('该类型单据不能编辑！')
           return
         }
         if (this.editBatchVisible) {
diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index a2607ee..0ec7940 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -4,18 +4,10 @@
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
       <el-row>
         <el-form-item :label=labels.enterDate>
-          <el-date-picker class="el-time-width"
-                          style=""
-                          v-model="pageData.enterTime1"
-                          value-format="yyyy-MM-dd">
-          </el-date-picker>
+          <el-date-picker class="el-time-width" style="" v-model="pageData.enterTime1" value-format="yyyy-MM-dd"></el-date-picker>
         </el-form-item>
         <el-form-item :label="''" style="margin-top: -10px;">
-          <el-date-picker class="el-time-width"
-                          style="margin-top: 30px;"
-                          v-model="pageData.enterTime2"
-                          value-format="yyyy-MM-dd" placeholder="">
-          </el-date-picker>
+          <el-date-picker class="el-time-width" style="margin-top: 30px;" v-model="pageData.enterTime2" value-format="yyyy-MM-dd" placeholder=""></el-date-picker>
         </el-form-item>
         <el-form-item :label=labels.orderNo>
           <el-input v-model="pageData.orderNo" style="width: 120px"></el-input>
@@ -26,18 +18,10 @@
       </el-row>
       <el-row>
         <el-form-item :label=labels.needDate>
-          <el-date-picker class="el-time-width"
-                          style=""
-                          v-model="pageData.needTime1"
-                          value-format="yyyy-MM-dd" placeholder="">
-          </el-date-picker>
+          <el-date-picker class="el-time-width" style="" v-model="pageData.needTime1" value-format="yyyy-MM-dd" placeholder=""></el-date-picker>
         </el-form-item>
         <el-form-item :label="''" style="margin-top: -10px;">
-          <el-date-picker class="el-time-width"
-                          style="margin-top: 30px;"
-                          v-model="pageData.needTime2"
-                          value-format="yyyy-MM-dd" placeholder="">
-          </el-date-picker>
+          <el-date-picker class="el-time-width" style="margin-top: 30px;" v-model="pageData.needTime2" value-format="yyyy-MM-dd" placeholder=""></el-date-picker>
         </el-form-item>
         <el-form-item>
           <span slot="label" style="" @click="getBaseList(88)"><a herf="#">{{ labels.resourceId }}</a></span>
@@ -66,17 +50,14 @@
     </fieldset>
 
     <!--  菜单  -->
-    <el-form :inline="true" label-position="top" label-width="100px"
-             style="margin-left: 660px; margin-top: -40px;">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-left: 660px; margin-top: -40px;">
       <el-row>
         <el-col :span="24">
           <el-form-item :label="''">
             <el-form-item :label="''" style="margin-left: 30px;">
-              <el-button class="customer-bun-min" type="primary" @click="refreshPageTables"
-                         style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.refreshButton }}
+              <el-button class="customer-bun-min" type="primary" @click="refreshPageTables" style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.refreshButton }}
               </el-button>
-              <el-button :disabled="dataListSelections.length <= 0" type="primary" @click="scheduleBatchDialog()"
-                         style="margin-left: 10px; margin-bottom: 5px;">
+              <el-button :disabled="dataListSelections.length <= 0" type="primary" @click="scheduleBatchDialog()" style="margin-left: 10px; margin-bottom: 5px;">
                 {{ buttons.scheduleBatch ? buttons.scheduleBatch : '批量排产' }}
               </el-button>
             </el-form-item>
@@ -95,13 +76,9 @@
             {{ buttons.primaryMenu }}<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item class="customer-li" command="生产工单"
-                              :disabled="primaryMenuButton.shopOrderFlag">{{ buttons.shopOrder }}
-            </el-dropdown-item>
+            <el-dropdown-item class="customer-li" command="生产工单" :disabled="primaryMenuButton.shopOrderFlag">{{ buttons.shopOrder }}</el-dropdown-item>
             <hr width="95%"/>
-            <el-dropdown-item class="customer-li" command="查看物料库存"
-                              :disabled="primaryMenuButton.partStockFlag">{{ buttons.viewPartStock }}
-            </el-dropdown-item>
+            <el-dropdown-item class="customer-li" command="查看物料库存" :disabled="primaryMenuButton.partStockFlag">{{ buttons.viewPartStock }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 <!--        <el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>-->
@@ -138,19 +115,32 @@
           <template slot-scope="scope">
             <span v-if="!item.columnHidden && item.columnProp == 'resourceList'">
               <el-select class="table-select-input" v-model="scope.row.resourceId">
-                <el-option v-for="(item,index) in scope.row.resourceList" :key="index"
-                           :value="item.resourceId" :label="item.resourceDesc">
+                <el-option
+                  v-for="(item,index) in scope.row.resourceList"
+                  :key="index"
+                  :value="item.resourceId"
+                  :label="item.resourceDesc">
                 </el-option>
               </el-select>
             </span>
             <span v-if="!item.columnHidden && item.columnProp == 'qtyToSchedule'">
-              <el-input v-model="scope.row.qtyToSchedule" type="number">
-              </el-input>
+              <el-input v-model="scope.row.qtyToSchedule" type="number"></el-input>
             </span>
             <span v-else> {{ scope.row[item.columnProp] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <!-- 分页栏 -->
+      <el-pagination
+        style="margin-top: 0px"
+        @size-change="sizeChangeHandle"
+        @current-change="currentChangeHandle"
+        :current-page="pageIndex"
+        :page-sizes="[20, 50, 100, 200, 500]"
+        :page-size="pageSize"
+        :total="totalPage"
+        layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
     </el-main>
 
     <!--列表的组件-->
@@ -274,6 +264,9 @@ export default {
   data() {
     return {
       height: 200,
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
       tagNo: '',
       authEdit: false,
       authAdd: false,
@@ -440,7 +433,9 @@ export default {
         calendarId: '',
         calendarDesc: '',
         status: 1,
-        sortField: 'needDate'
+        sortField: 'needDate',
+        page: 1,
+        limit: 10,
       },
       shopOrderList: [],
       dataListLoading: false,
@@ -1265,7 +1260,7 @@ export default {
 
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 205;
+      this.height = window.innerHeight - 235;
     })
   },
   methods: {
@@ -1332,20 +1327,37 @@ export default {
       }
       this.scheduleVisible = true
     },
+
     // 选中记录
     handleSelectionChange(val) {
       this.dataListSelections = val
     },
+
     /*刷新页面table*/
     refreshPageTables() {
       this.getShopOrderList();
     },
 
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getShopOrderList()
+    },
+
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getShopOrderList()
+    },
+
     /*获取工单信息*/
     getShopOrderList() {
+      this.pageData.limit = this.pageSize
+      this.pageData.page = this.pageIndex
       getShopOrderList(this.pageData).then(({data}) => {
         if (this.pageData.resourceId) {
-          this.shopOrderList = data.rows.map(item => {
+          this.shopOrderList = data.page.list.map(item => {
             item.resourceId = this.pageData.resourceId
             item.resourceList = item.resourceList.split(';').map(resItem => {
               let newItem = {
@@ -1357,7 +1369,7 @@ export default {
             return item;
           })
         } else {
-          this.shopOrderList = data.rows.map(item => {
+          this.shopOrderList = data.page.list.map(item => {
             item.resourceList = item.resourceList.split(';').map(resItem => {
               let newItem = {
                 resourceId: resItem.split(':')[0],
@@ -1368,6 +1380,9 @@ export default {
             return item;
           })
         }
+        this.pageIndex = data.page.currPage
+        this.pageSize = data.page.pageSize
+        this.totalPage = data.page.totalCount
         //清空已经选好的行数据
         this.currentRoutingRow = null;
       })