From f0a6cdb12a24e21f810468c7f76295503fbe475a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 8 Sep 2023 16:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=A9=BF=E6=A2=AD=E6=A1=86?=
 =?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/api/mes/reportWork.js                     |   8 +
 src/api/technology/routeprodproduct.js        |  11 +-
 src/views/plan/order/index.vue                |  16 ++
 .../technology/proroute/routeprodproduct.vue  | 165 +++++++++++++++++-
 4 files changed, 190 insertions(+), 10 deletions(-)

diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 70aeca6..a25651a 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -59,3 +59,11 @@ export function getProductionList(query) {
 		params: query
 	});
 }
+//成品产量报表
+export function getDailyReport(query) {
+	return request({
+		url: '/mes/reportWork/getDailyReport',
+		method: 'get',
+		params: query
+	});
+}
diff --git a/src/api/technology/routeprodproduct.js b/src/api/technology/routeprodproduct.js
index 82dff97..d3dc763 100644
--- a/src/api/technology/routeprodproduct.js
+++ b/src/api/technology/routeprodproduct.js
@@ -43,7 +43,7 @@ export function delProduct(recordId) {
 	});
 }
 
-// 查询工艺线体关联列表
+// 查询工艺产品关联列表
 export function getListProduct(query) {
 	return request({
 		url: '/technology/pro/routeprodproduct/getList',
@@ -51,3 +51,12 @@ export function getListProduct(query) {
 		params: query
 	});
 }
+
+// 查询工艺已经关联的产品列表
+export function getRightList(query) {
+	return request({
+		url: '/technology/pro/routeprodproduct/getRightList',
+		method: 'get',
+		params: query
+	});
+}
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index db2d600..3853498 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -692,6 +692,20 @@ export default {
     changeRoute(routeCode) {
       getProEquipment(routeCode).then(response => {
         this.eRouteOptions = response.data
+        //默认全选
+        let selectAll = [];
+        this.eRouteOptions.forEach(it => {
+            var children  = it.children;
+            if(children != null){
+               children.forEach(it2=>{
+                 let arr = []
+                 arr.push(it.value)
+                 arr.push(it2.value)
+                 selectAll.push(arr)
+               })
+            }
+        })
+        this.splitForm.prodLineCodeArray = selectAll
       })
     },
     // 选择线体改变
@@ -1189,7 +1203,9 @@ export default {
     },
     /** 拆分表单重置 */
     resetBatch() {
+      this.eRouteOptions= [],
       this.splitForm = {
+        prodLineCodeArray: [],
         id: null,
         prodLineCode: [],
         splitNum: null,
diff --git a/src/views/technology/proroute/routeprodproduct.vue b/src/views/technology/proroute/routeprodproduct.vue
index 8feb154..2124d65 100644
--- a/src/views/technology/proroute/routeprodproduct.vue
+++ b/src/views/technology/proroute/routeprodproduct.vue
@@ -1,11 +1,83 @@
 <template>
   <el-transfer v-model="rightList" :data="leftList" :titles="titles" :filterable=true
   @change="handleChange"
-  ></el-transfer>
+  >
+   <!-- 左侧栏分页 -->
+        <el-button
+          type="text"
+          style="color:#606266"
+          v-if="leftLength != 0"
+          class="transfer-footer"
+          slot="left-footer"
+          size="small"
+        >共{{ Ltotal }}条</el-button>
+        <el-button
+          v-if="leftLength != 0"
+          class="transfer-footer"
+          slot="left-footer"
+          size="small"
+          @click="leftPageNumChange"
+          :disabled="LPageNum - 1 < 1"
+        >上一页</el-button>
+        <el-input
+          v-if="leftLength != 0"
+          v-model="LPageNum"
+          size="mini"
+          class="transfer-footer"
+          slot="left-footer"
+          :placeholder="LPageNum"
+          style="width: 67px;padding: 1px 3px"
+          disabled
+        ></el-input>
+        <el-button
+          class="transfer-footer"
+          slot="left-footer"
+          size="small"
+          @click="leftAddPageNumChange"
+          v-if="leftLength != 0"
+          :disabled="LNextPage>LPages"
+        >下一页</el-button>
+
+        <!-- 右侧栏分页 -->
+        <el-button
+          type="text"
+          style="color:#606266"
+          v-if="rightLength != 0"
+          class="transfer-footer"
+          slot="right-footer"
+          size="small"
+        >共{{ Rtotal }}条</el-button>
+        <el-button
+          v-if="rightLength != 0"
+          class="transfer-footer"
+          slot="right-footer"
+          size="small"
+          @click="rightPageNumChange"
+          :disabled="RPageNum - 1 < 1"
+        >上一页</el-button>
+        <el-input
+          v-if="rightLength != 0"
+          v-model="RPageNum"
+          size="mini"
+          class="transfer-footer"
+          slot="right-footer"
+          :placeholder="RPageNum"
+          style="width: 43px"
+        ></el-input>
+        <el-button
+          class="transfer-footer"
+          slot="right-footer"
+          size="small"
+          @click="rightAddPageNumChange"
+          v-if="rightLength != 0"
+          :disabled="RNextPage>RPages"
+        >下一页</el-button>
+
+  </el-transfer>
 </template>
 
 <script>
-import { getListProduct, addProduct , updateProduct, getProduct, delProduct} from "@/api/technology/routeprodproduct";
+import { getListProduct,getRightList ,addProduct , updateProduct, getProduct, delProduct} from "@/api/technology/routeprodproduct";
 
 export default {
   name: "Routeprodproduct",
@@ -52,7 +124,31 @@ export default {
       //--------------------->
       leftList: [],
       rightList: [],
-      titles:['未关联产品','已关联产品']
+      titles:['未关联产品','已关联产品'],
+      // 左侧分页数据
+      Ltotal: "",
+      LPageNum: "1",
+      LPageSize: "20",
+      LNextPage: null,
+      LPages: null,
+      leftLength: null,
+      leftQueryParams: {
+        routeId: this.routeId,
+        pageNum: 1,
+        pageSize: 20
+       },
+      // 右侧分页数据
+      Rtotal: "",
+      RPageNum: "1",
+      RPageSize: "20",
+      RPages: null,
+      rightLength: null,
+      RNextPage: null,
+      rightQueryParams: {
+        routeId: this.routeId,
+        pageNum: 1,
+        pageSize: 20
+       },
     };
   },
   props :{
@@ -61,23 +157,69 @@ export default {
   },
   created() {
     this.getList();
+    this.getRightListFun();
   },
   methods: {
-    /** 查询未分配线体列表 */
+    /** 查询未分配产品列表 */
     getList() {
-      debugger
       this.loading = true;
-      getListProduct(this.queryParams).then(response => {
-        this.leftList = response.unSelect;
+      getListProduct(this.leftQueryParams).then(response => {
+        this.LPages = Math.ceil(response.total/this.LPageSize)
+        this.leftList = response.rows;
+				this.Ltotal = response.total;
+        this.LPageNum = this.leftQueryParams.pageNum;
+        this.LNextPage = this.leftQueryParams.pageNum+1;
+        this.loading = false;
+      });
+    },
+    /**左边上一页**/
+    leftPageNumChange(){
+      this.leftQueryParams.pageNum = this.LPageNum-1;
+      this.loading = true;
+      this.getList();
+      this.getRightListFun();
+    },
+    /**左边下一页**/
+    leftAddPageNumChange(){
+      this.leftQueryParams.pageNum = this.LNextPage;
+      this.loading = true;
+      this.getList();
+      this.getRightListFun();
+    },
+
+    /** 查询已分配产品列表 -------------------------------*/
+    getRightListFun() {
+      this.loading = true;
+      getRightList(this.rightQueryParams).then(response => {
+        this.RPages = Math.ceil(response.total/this.RPageSize);
+
         const dataright = [];
-        for(let i in response.selected){
+        for(let i in response.rows){
           // 将返回的列表赋值于穿梭框左边列表
-          dataright.push(response.selected[i].key)
+          dataright.push(response.rows[i].key)
         }
         this.rightList = dataright;
+
+				this.Rtotal = response.total;
+        this.RPageNum = this.rightQueryParams.pageNum;
+        this.RNextPage = this.rightQueryParams.pageNum+1;
         this.loading = false;
       });
     },
+    /**右边上一页**/
+    rightPageNumChange(){
+      this.rightQueryParams.pageNum = this.RPageNum-1;
+      this.loading = true;
+      this.getRightListFun();
+    },
+    /**右边下一页**/
+    rightAddPageNumChange(){
+      this.rightQueryParams.pageNum = this.RNextPage;
+      this.loading = true;
+      this.getRightListFun();
+    },
+     
+
     // 取消按钮
     cancel() {
       this.open = false;
@@ -116,3 +258,8 @@ export default {
   }
 };
 </script>
+<style>
+.el-transfer-panel {
+    width: 350px;
+   };
+</style>