Merge remote-tracking branch 'origin/master'

src/api/quality/qcGoalDistribute.js

@@ -59,3 +59,22 @@ export function addSupplier(data) {
         data: data
     });
 }
+
+// 查询用户物料未关联列表
+export function getProductLeftList(query) {
+	return request({
+		url: '/quality/qcGoalDistribute/getProductLeftList',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询用户物料已关联列表
+export function getProductRightList(query) {
+	return request({
+		url: '/quality/qcGoalDistribute/getProductRightList',
+		method: 'get',
+		params: query
+	});
+}
+

src/router/index.js

@@ -132,6 +132,12 @@ export const constantRoutes = [
     component: () => import("@/views/kanban/finishproduct/index"),
     hidden: true,
   },
+  // 包装线产线生产看板
+  {
+    path: "/kanban/Packagingline",
+    component: () => import("@/views/kanban/Packagingline/index"),
+    hidden: true,
+  },
 
 ]
 

src/views/kanban/finishproduct/BottomRightTable1.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="bottom-right-table-1">
-    <dv-border-box-13 :key="borderBoxKey">
+    <dv-border-box-13 :key="borderBoxKey" style="width: 1120px;">
       <div class="table-name">
-        <dv-scroll-board :config="getScrollBoardConfig()" />
+        <dv-scroll-board id="dvscroll" :config="getScrollBoardConfig()" style="font-size: 22px;" />
 <!--        <dv-scroll-board :config="getScrollBoardConfig()"  />-->
       </div>
     </dv-border-box-13>
@@ -27,7 +27,7 @@ export default {
 
         ],
         index: true,
-        columnWidth: [100, 150, 100, 501, 200, 52],
+        columnWidth: [100, 150, 100, 450, 180, 72],
         align: ['center'],
         oddRowBGC: 'rgba(9, 37, 50, 0.4)',
         evenRowBGC: 'rgba(10, 32, 50, 0.3)'
@@ -48,10 +48,12 @@ export default {
           header: ['工单号', '产线名称', '产品名称', '生产数量', '单位'],
           data: this.config.data,
           index: true,
-          columnWidth: [100, 150, 100, 501, 200, 52],
+          columnWidth: [100, 150, 100, 450, 180, 72],
           align: ['center'],
           oddRowBGC: 'rgba(9, 37, 50, 0.4)',
-          evenRowBGC: 'rgba(10, 32, 50, 0.3)'
+          evenRowBGC: 'rgba(10, 32, 50, 0.3)',
+          titleTextStyle: { fontSize: '28px' },
+          contentTextStyle: { fontSize: '28px' }
       }
     },
     // 格式化 tableData 数据
@@ -69,12 +71,13 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped >
 .bottom-right-table-1 {
   width: calc(~"100% + 10px");
   height: 100%;
   margin: 0 -5px;
   
+
   .border-box-content {
     padding: 20px;
     box-sizing: border-box;
@@ -105,4 +108,18 @@ export default {
   }
 
 }
+/deep/ .dv-scroll-board{
+  margin-top: 30px;
+  padding: 0 10px;
+}
+/deep/ .dv-scroll-board .rows .row-item .ceil {
+  font-size: 18px !important;
+  height: 49px !important;
+  line-height: 45px !important;
+}
+/deep/ .dv-scroll-board .header .header-item  {
+  font-size: 18px !important;
+  height: 49px !important;
+  line-height: 45px !important;
+}
 </style>

src/views/kanban/finishproduct/BottomRightechart1.vue

@@ -0,0 +1,384 @@
+<template>
+  <div class="bottom-right-table-1" style=" margin-left: 10px">
+    <dv-border-box-13 style="width: 770px;height: 600px;">
+      <div class="table-name">
+        <div id="echart1" style="margin: auto; width: 770px; height: 600px"></div>
+      </div>
+    </dv-border-box-13>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+export default {
+  name: 'BottomRightechart1',
+  props: {
+    tableData: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      borderBoxKey: 1, // 初始化一个key值
+      tablelist: [],
+    }
+  },
+  watch: {
+    // 监听 tableData 的变化，更新 config 中的 data
+    tableData(newVal) {
+      console.log("newVal-11111",newVal)
+      this.tablelist = newVal;
+      this.initChart1()
+    }
+  },
+  methods: {
+    initChart1() {
+      const _this = this;
+      var existingChart = echarts.getInstanceByDom(document.getElementById('echart1'));
+      if (existingChart) {
+        // 如果已经有实例，先销毁它
+        existingChart.dispose();
+      }
+      var myChart1 = echarts.init(document.getElementById('echart1'));
+      const CubeLeft = echarts.graphic.extendShape({
+        shape: {
+          x: 0,
+          y: 0
+        },
+        buildPath: function (ctx, shape) {
+          const xAxisPoint = shape.xAxisPoint
+          const c0 = [shape.x, shape.y]
+          const c1 = [shape.x - 9, shape.y - 9]
+          const c2 = [xAxisPoint[0] - 9, xAxisPoint[1] - 9]
+          const c3 = [xAxisPoint[0], xAxisPoint[1]]
+          ctx.moveTo(c0[0], c0[1]).lineTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).closePath()
+        }
+      })
+      const CubeRight = echarts.graphic.extendShape({
+        shape: {
+          x: 0,
+          y: 0
+        },
+        buildPath: function (ctx, shape) {
+          const xAxisPoint = shape.xAxisPoint
+          const c1 = [shape.x, shape.y]
+          const c2 = [xAxisPoint[0], xAxisPoint[1]]
+          const c3 = [xAxisPoint[0] + 18, xAxisPoint[1] - 9]
+          const c4 = [shape.x + 18, shape.y - 9]
+          ctx.moveTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).lineTo(c4[0], c4[1]).closePath()
+        }
+      })
+      const CubeTop = echarts.graphic.extendShape({
+        shape: {
+          x: 0,
+          y: 0
+        },
+        buildPath: function (ctx, shape) {
+          const c1 = [shape.x, shape.y]
+          const c2 = [shape.x + 18, shape.y - 9]
+          const c3 = [shape.x + 9, shape.y - 18]
+          const c4 = [shape.x - 9, shape.y - 9]
+          ctx.moveTo(c1[0], c1[1]).lineTo(c2[0], c2[1]).lineTo(c3[0], c3[1]).lineTo(c4[0], c4[1]).closePath()
+        }
+      })
+      echarts.graphic.registerShape('CubeLeft', CubeLeft)
+      echarts.graphic.registerShape('CubeRight', CubeRight)
+      echarts.graphic.registerShape('CubeTop', CubeTop)
+      let xAxisname = []
+      let MAX = []
+      let VALUE = []
+
+      _this.tablelist.forEach((item) => {
+        xAxisname.push(item.equipment_name)
+      });
+      for (let i = 0; i < _this.tablelist.length; i++) {
+        MAX.push(100)
+        VALUE.push(96+Math.floor(Math.random() * 5))
+      }
+      // VALUE = this.generateRandomNumbers(_this.tablelist.length);
+      var option1 = {
+        // backgroundColor: "#010d3a",
+        title: {
+          text: '',
+          top: 32,
+          left: 18,
+          textStyle: {
+            color: '#00F6FF',
+            fontSize: 24
+          }
+        },
+        grid: {
+          left: 20,
+          right: 40,
+          bottom: '19%',
+          top: 107,
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: xAxisname,
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: 'white'
+            }
+          },
+          offset: 20,
+          axisTick: {
+            show: false,
+            length: 9,
+            alignWithLabel: true,
+            lineStyle: {
+              color: '#7DFFFD'
+            }
+          },
+          axisLabel: {
+            fontSize: 10
+          }
+        },
+        yAxis: {
+          type: 'value',
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: 'white'
+            }
+          },
+          max: '100',
+          splitLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            fontSize: 16,
+            formatter: "{value}%",
+          },
+          boundaryGap: ['20%', '20%']
+        },
+        series: [{
+          type: 'custom',
+          renderItem: function (params, api) {
+            const location = api.coord([api.value(0), api.value(1)])
+            return {
+              type: 'group',
+              children: [{
+                type: 'CubeLeft',
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0])
+                },
+                style: {
+                  fill: 'rgba(7,29,97,.6)'
+                }
+              }, {
+                type: 'CubeRight',
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0])
+                },
+                style: {
+                  fill: 'rgba(10,35,108,.7)'
+                }
+              }, {
+                type: 'CubeTop',
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0])
+                },
+                style: {
+                  fill: 'rgba(11,42,106,.8)'
+                }
+              }]
+            }
+          },
+          data: MAX
+        }, {
+          type: 'custom',
+          renderItem: (params, api) => {
+            const location = api.coord([api.value(0), api.value(1)])
+            return {
+              type: 'group',
+              children: [{
+                type: 'CubeLeft',
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0])
+                },
+                style: {
+                  fill: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                    offset: 0,
+                    color: '#3B80E2'
+                  },
+                  {
+                    offset: 1,
+                    color: '#49BEE5'
+                  }
+                  ])
+                }
+              }, {
+                type: 'CubeRight',
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0])
+                },
+                style: {
+                  fill: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                    offset: 0,
+                    color: '#3B80E2'
+                  },
+                  {
+                    offset: 1,
+                    color: '#49BEE5'
+                  }
+                  ])
+                }
+              }, {
+                type: 'CubeTop',
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0])
+                },
+                style: {
+                  fill: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                    offset: 0,
+                    color: '#3B80E2'
+                  },
+                  {
+                    offset: 1,
+                    color: '#49BEE5'
+                  }
+                  ])
+                }
+              }]
+            }
+          },
+          data: VALUE
+        }, {
+          type: 'bar',
+          label: {
+            normal: {
+              show: true,
+              position: 'top',
+              formatter: (e) => {
+                switch (e.name) {
+                  case '10kV线路':
+                    return VALUE[0]
+                  case '公用配变':
+                    return VALUE[1]
+                  case '35kV主变':
+                    return VALUE[2]
+                  case '水':
+
+                }
+              },
+              fontSize: 16,
+              color: '#fff',
+              offset: [4, -25]
+            }
+          },
+          itemStyle: {
+            color: 'transparent'
+          },
+          data: VALUE
+        }]
+      }
+      myChart1.setOption(option1);
+    },
+
+
+    // 格式化 tableData 数据
+  },
+  mounted() {
+    this.initChart1();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.bottom-right-table-1 {
+  width: calc(~"100% + 10px");
+  height: 100%;
+  margin: 0 -5px;
+
+
+  .border-box-content {
+    padding: 20px;
+    box-sizing: border-box;
+  }
+
+  .table-name {
+    height: 330px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 15px;
+
+    img {
+      width: 79px;
+      height: 30px;
+      margin-right: 5px;
+    }
+  }
+
+  .grid-container {
+    display: grid;
+    grid-template-rows: repeat(2, auto);
+    /* 每行的高度为内容的高度 */
+    gap: 10px;
+    /* 调整行之间的垂直间距 */
+  }
+
+  .dv-scroll-board {
+    height: calc(~"100% - 0px");
+  }
+
+}
+
+::v-deep .dv-scroll-board .rows .ceil {
+  border-bottom: 1px solid #ebeef4 !important;
+}
+
+/deep/ .dv-scroll-board {
+  margin-top: 30px;
+  padding: 0 10px;
+}
+
+/deep/ .dv-scroll-board .rows .row-item .ceil {
+  font-size: 18px !important;
+  height: 49px !important;
+  line-height: 45px !important;
+}
+
+/deep/ .dv-scroll-board .header .header-item {
+  font-size: 18px !important;
+  height: 49px !important;
+  line-height: 45px !important;
+}
+</style>

src/views/kanban/finishproduct/TopLeftCmp.vue

@@ -29,7 +29,10 @@
 export default {
   name: 'TopLeftCmp',
   props: {
-    data: []
+    data: {
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {

src/views/kanban/finishproduct/index.vue

@@ -9,11 +9,7 @@
           <img src="../../../assets/images/logo.png" alt="" />
         </div>
         <div class="back">
-          <el-button
+          <el-button @click="back()" type="primary" icon="el-icon-s-home"></el-button>
-            @click="back()"
-            type="primary"
-            icon="el-icon-s-home"
-          ></el-button>
         </div>
       </div>
       <div class="content-top">
@@ -26,17 +22,25 @@
       <div class="content">
         <div class="mc-top">
           <div class="mc-left">
-            <Top-Left-Cmp :data="valueForTopLeftCmp"/>
+            <Top-Left-Cmp :data="valueForTopLeftCmp" />
           </div>
           <div class="mc-middle">
 
           </div>
           <div class="mc-right">
-            <Top-Middle-Cmp :data="valueForTopMiddleCmp"  style="height: 100%;"/>
+            <Top-Middle-Cmp :data="valueForTopMiddleCmp" style="height: 100%;" />
           </div>
         </div>
-        <div class="mc-bottom">
+        <div class="mc-bottom" style="display: flex; justify-content: space-between;">
-          <BottomRightTable1 :tableData="BottomRightTableValue" style="height: 600px; margin-top: 50px"/>
+          <BottomRightTable1 :tableData="BottomRightTableValue" style="height: 600px; margin-top: 50px" />
+          <BottomRightechart1 :tableData="BottomRightTableValue" style="height: 600px; margin-top: 50px" />
+          <!-- <div class="bottom-right-table-1" style="height: 600px; margin-top: 50px">
+            <dv-border-box-13 style="width: 770px;height: 600px;">
+              <div class="table-name">
+                <div id="echart1" style="margin: auto; width: 770px; height: 600px"></div>
+              </div>
+            </dv-border-box-13>
+          </div> -->
           <!-- 设置 .mc-bottom 的高度，你可以根据实际情况调整 -->
         </div>
       </div>
@@ -45,7 +49,7 @@
 </template>
 
 <script>
-
+import * as echarts from "echarts"
 import { finishProductBoard } from "@/api/kanban/finishproduct";
 import TopLeftCmp from './TopLeftCmp'
 import TopMiddleCmp from './TopMiddleCmp'
@@ -53,8 +57,7 @@ import TopRightCmp from './TopRightCmp'
 
 
 import BottomRightTable1 from './BottomRightTable1'
-
+import BottomRightechart1 from './BottomRightechart1'
-
 
 export default {
   name: 'DataView',
@@ -63,8 +66,9 @@ export default {
     TopMiddleCmp,
     TopRightCmp,
     BottomRightTable1,
+    BottomRightechart1,
   },
-  data () {
+  data() {
     return {
       currentDateTime: null,
       // 在这里定义要传递的值
@@ -72,9 +76,9 @@ export default {
         sumplanquantity: 0,
         sumFinshQuantity: 0,
       },
-      valueForTopMiddleCmp:[],
+      valueForTopMiddleCmp: [],
-      BottomRightTableValue:[],
+      BottomRightTableValue: [],
-
+      tablelist:[],
     };
   },
   methods: {
@@ -95,14 +99,15 @@ export default {
         console.log(response.data);
         this.valueForTopLeftCmp.sumplanquantity = response.data.sumplanquantity ?? 0;;
         this.valueForTopLeftCmp.sumFinshQuantity = response.data.sumFinshQuantity ?? 0;;
-        this.valueForTopMiddleCmp=response.data.daySenvenProductionList;
+        this.valueForTopMiddleCmp = response.data.daySenvenProductionList;
         this.BottomRightTableValue = response.data.ProductionInProgress;
-
+        // this.initChart1()
 
       } catch (error) {
         console.error('Error fetching data:', error);
       }
-    }
+    },
+  
 
   },
   mounted() {
@@ -120,52 +125,60 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 .app-container {
   padding: 0px 24px;
   color: #fff;
 }
+
 .home {
   width: 100%;
   height: 100%;
   background: url("../../../assets/images/bg-finishproduct.png") no-repeat;
   background-size: 100% 100%;
   background-color: #050711;
+
   .head {
     width: 100%;
     height: 74px;
     position: relative;
+
     .head-content {
       height: 74px;
       background-image: url("../../../assets/images/bg-head.png");
       background-repeat: no-repeat;
       background-size: 100% 100%;
       text-align: center;
+
       .title {
         font-size: 42px;
         font-weight: 400;
         color: #ffffff;
       }
     }
+
     .head-logo {
       position: absolute;
       left: 0px;
       top: 1px;
+
       img {
         height: 38px;
         // width: ;
       }
     }
+
     .back {
       position: absolute;
       right: 0px;
       top: 5px;
     }
   }
+
   .content-top {
     display: flex;
     justify-content: space-between;
     position: relative;
+
     .timebox {
       width: 480px;
       height: 100px;
@@ -175,6 +188,7 @@ export default {
       position: absolute;
       top: -17px;
       right: 0px;
+
       .time {
         font-size: 30px;
         font-weight: 400;
@@ -183,14 +197,17 @@ export default {
       }
     }
   }
+
   .content {
     margin-top: 63px;
     display: block;
     justify-content: space-between;
+
     .mc-top {
       height: 100%;
       width: 100%;
       display: flex;
+
       .mc-left {
         flex: 2; // 占据剩余的空间
       }
@@ -198,6 +215,7 @@ export default {
       .mc-middle {
         flex: 1; // 占据剩余的空间
       }
+
       .mc-right {
         flex: 2; // 占据剩余的空间
       }
@@ -206,5 +224,4 @@ export default {
   }
 
 }
-
 </style>

src/views/kanban/quality/kanban1.vue

@@ -60,7 +60,7 @@
                                     </span>
                                 </div>
                                 <div class="name2">
-                                    今日已检数量
+                                    今日已抽检数量
                                 </div>
                             </div>
                             <div class="box">
@@ -70,7 +70,7 @@
                                     </span>
                                 </div>
                                 <div class="name2">
-                                    今日异常数量
+                                    今日不良数量
                                 </div>
                             </div>
                         </div>
@@ -92,7 +92,7 @@
                                     </span>
                                 </div>
                                 <div class="name2">
-                                    本月异常数量
+                                    本月不良数量
                                 </div>
                             </div>
                         </div>

src/views/mes/reportWork/index.vue

@@ -523,7 +523,7 @@
 						:formatter="orderCodeFormate"/>
 						<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" />
 						<el-table-column label="物料名称" width="280" align="left" prop="materialName" :show-overflow-tooltip="true" />
-						<el-table-column label="消耗数量" width="120" align="left" prop="quantity" :show-overflow-tooltip="true" >
+						<el-table-column label="实际用量" width="120" align="left" prop="quantity" :show-overflow-tooltip="true" >
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.quantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
 							</template>

src/views/quality/incomeReport/index.vue

@@ -88,6 +88,7 @@
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="检测地点" align="center" prop="checkLoc"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

src/views/quality/inventoryReport/index.vue

@@ -88,6 +88,7 @@
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="检测地点" align="center" prop="checkLoc"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

src/views/quality/produceReport/index.vue

@@ -11,18 +11,18 @@
 					></el-option>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="检验任务" prop="checkNo">
+			<el-form-item label="任务编号" prop="checkNo">
 				<el-input
 					v-model="queryParams.checkNo"
-					placeholder="请输入检测地点"
+					placeholder="请输入任务编号"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="产品编码" prop="materialCode">
+			<el-form-item label="产品名称" prop="materialName">
 				<el-input
-					v-model="queryParams.materialCode"
+					v-model="queryParams.materialName"
-					placeholder="请输入产品编码"
+					placeholder="请输入产品名称"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -100,6 +100,7 @@
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="产线名称" align="center" prop="supplierName" width="120"/>
+			<el-table-column label="检测地点" align="center" prop="checkLoc"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

src/views/quality/productReport/index.vue

@@ -78,6 +78,7 @@
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="仓库名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="检测地点" align="center" prop="checkLoc"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

src/views/quality/qcGoal/distribution.vue

@@ -1,17 +1,12 @@
 <template>
-  <el-dialog 
+  <div>
-    title="分配供应商"
-    :visible.sync="showFlag" 
-    width="1000px" 
-    append-to-body
-    >
 		<el-form ref="form1" label-width="80px">
 			<el-form-item label="目标id" prop="belongGoalId">
 				<el-input v-model="belongGoalId" disabled />
 			</el-form-item>
 		</el-form>
 		<el-tabs type="border-card" v-if="belongGoalId != null">
-				<el-tab-pane label="分配供应商">
+			<el-tab-pane :label="disTitle">
         <div>
           <div class="query">
             <el-input
@@ -74,7 +69,6 @@
               :disabled="LNextPage > LPages"
               >下一页</el-button
             >
-
             <!-- 右侧栏分页 -->
             <el-button
               type="text"
@@ -116,19 +110,15 @@
         </div>
       </el-tab-pane>
 		</el-tabs>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
 	</div>
-		</el-dialog>
 </template>
 
 <script>
-import { getLeftList, getRightList, addSupplier } from "@/api/quality/qcGoalDistribute";
+import { getLeftList, getRightList, addSupplier, getProductLeftList, getProductRightList } from "@/api/quality/qcGoalDistribute";
 
 export default {
   name: "QcGoalDistriBute",
-
+  props: ['belongGoalId','mode','disTitle'],
   data() {
     return {
       // 遮罩层
@@ -145,6 +135,7 @@ export default {
       total: 0,
       // 弹出层标题
       title: "",
+      model: null,
       // 是否显示弹出层
       showFlag: false,
       // 查询参数
@@ -170,7 +161,7 @@ export default {
       //--------------------->
       leftList: [],
       rightList: [],
-      titles: ["未关联供应商", "已关联供应商"],
+      titles: ["未分配", "已分配"],
       // 左侧分页数据
       Ltotal: "",
       LPageNum: "1",
@@ -199,12 +190,23 @@ export default {
       },
     };
   },
-  props: {
+  mounted() {  
-    belongGoalId:undefined,
+    if (this.belongGoalId) { 
-
+      this.getList();
+      this.getRightListFun();
+    }  
   },
   created() {
     
+  },
+  watch: {
+    belongGoalId(newVal,oldVal) {
+      console.log(newVal);
+      if(newVal !== oldVal) {
+        this.getList();
+        this.getRightListFun();
+      }
+    }
   },
   methods: {
     // // 穿梭框搜索
@@ -221,6 +223,7 @@ export default {
     getList() {
       this.loading = true;
       this.leftQueryParams.belongGoalId = this.belongGoalId;
+      if(this.mode) {
         getLeftList(this.leftQueryParams).then((response) => {
           this.LPages = Math.ceil(response.total / this.LPageSize);
           this.leftList = response.rows;
@@ -229,6 +232,17 @@ export default {
           this.LNextPage = this.leftQueryParams.pageNum + 1;
           this.loading = false;
         });
+      }else{
+        getProductLeftList(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() {
@@ -249,6 +263,7 @@ export default {
     getRightListFun() {
       this.loading = true;
       this.rightQueryParams.belongGoalId = this.belongGoalId;
+      if(this.mode) {
         getRightList(this.rightQueryParams).then((response) => {
           this.RPages = Math.ceil(response.total / this.RPageSize);
           let dataright = [];
@@ -261,11 +276,23 @@ export default {
           this.RPageNum = this.rightQueryParams.pageNum;
           this.RNextPage = this.rightQueryParams.pageNum + 1;
           this.loading = false;
-      }).catch((error) => {  
-        console.error('获取右侧列表数据失败:', error);  
-        this.loading = false;  
-        // 可以在这里添加一些错误处理的逻辑  
         });
+      }else{
+        getProductRightList(this.rightQueryParams).then((response) => {
+          this.RPages = Math.ceil(response.total / this.RPageSize);
+          let dataright = [];
+          for (let i in response.rows) {
+            // 将返回的列表赋值于穿梭框左边列表
+            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() {
@@ -280,11 +307,6 @@ export default {
       this.getRightListFun();
     },
 
-    // 取消按钮
-    cancel() {
-      this.showFlag = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
       this.form = {
@@ -322,11 +344,6 @@ export default {
         
       });
     },
-    /** 提交 */
-    submitForm() {
-			this.showFlag = false;
-			this.getList();
-		},
   },
 };
 </script>

src/views/quality/qcGoal/index.vue

@@ -132,12 +132,19 @@
 						v-hasPermi="['quality:qcProjectType:remove']"
 					>删除</el-button>
 					<el-button
-						v-if="scope.row.goalType == 'yyyy' && scope.row.scope == '0'"
+						v-if="scope.row.goalType == 'yyyy' && scope.row.scope == '0' && scope.row.typeCode == 'material'"
 						size="mini"
 						type="text"
 						icon="el-icon-document-add"
-						@click="handleDistribution(scope.row)"
+						@click="handleSupplier(scope.row)"
-					>分配</el-button>
+					>分配供应商</el-button>
+					<el-button
+						v-if="scope.row.goalType == 'yyyy' && scope.row.scope == '0' && scope.row.typeCode != 'material'"
+						size="mini"
+						type="text"
+						icon="el-icon-document-add"
+						@click="handleProduct(scope.row)"
+					>分配产品</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -275,8 +282,17 @@
 				<el-button type="primary" @click="closeGen">确定</el-button>
 			</div>
 		</el-dialog>
-
+		<el-dialog :title="disTitle" :visible.sync="showFlag" width="1000px" append-to-body >
-		<Distribution ref="itemDistribution" :belongGoalId="goalId"  ></Distribution>
+			<Distribution ref="itemDistribution" 
+				:belongGoalId="belongGoalId"
+				:mode="mode"
+				:disTitle="disTitle"
+				v-if="belongGoalId !== null"
+			></Distribution>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="closeDistribution">确 定</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 
@@ -311,7 +327,10 @@ export default {
 			checkTypes: [],
 			genList: [],
 			checked: false,
-			goalId: null,
+			belongGoalId: null,
+			showFlag: false,
+			mode: null,
+			disTitle: "",
 			// 弹出层标题
 			title: "",
 			genTitle: "",
@@ -516,11 +535,22 @@ export default {
 			const checkTypeBody = this.checkTypes.find((item) => item.id === checkType);
     		return checkTypeBody ? checkTypeBody.checkName : '';
 		},
-		handleDistribution(row) {
+		handleSupplier(row) {
-			this.goalId = row.id;
+			this.belongGoalId = row.id;
-			this.$refs.itemDistribution.getRightListFun();
+			this.mode = true;
-			this.$refs.itemDistribution.getList();
+			this.disTitle = "分配供应商";
-			this.$refs.itemDistribution.showFlag = true;
+			this.showFlag = true;
+		},
+		handleProduct(row) {
+			this.belongGoalId = row.id;
+			this.mode = false;
+			this.disTitle = "分配产品";
+			this.showFlag = true;
+		},
+		closeDistribution() {
+			this.showFlag = false;
+			this.$refs.itemDistribution.leftList=[];
+			this.$refs.itemDistribution.rightList=[];
 		},
 
 	},

src/views/wms/equipment/index.vue

@@ -253,6 +253,20 @@
         prop="equipmentTypeName"
         width="150"
       />
+      <el-table-column
+        label="sap线体编码"
+        align="center"
+        prop="sapCode"
+        width="100"
+      >
+      </el-table-column>
+      <el-table-column
+        label="sap线体名称"
+        align="center"
+        prop="sapName"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="所属工作中心编码"
         align="center"
@@ -543,6 +557,22 @@
             </el-col>
           </el-row>
           <el-row :gutter="10" class="mb8">
+            <el-col :span="8">
+              <el-form-item label="sap线体编码" prop="sapCode">
+                <el-input
+                  v-model="form.sapCode"
+                  placeholder="请输入sap线体编码"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="sap线体名称" prop="sapName">
+                <el-input
+                  v-model="form.sapName"
+                  placeholder="请输入sap线体名称"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="设备类别" prop="equipmentCategory">
                 <el-select
@@ -890,6 +920,15 @@
               <el-descriptions-item label="工时单价">{{
                 form.hourlyUnitPrice
               }}</el-descriptions-item>
+              <el-descriptions-item label="sap线体编码">{{
+                form.sapCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="sap线体名称">{{
+                form.sapName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="设备类别">{{
+                form.equipmentCategory
+              }}</el-descriptions-item>
             </el-descriptions>
 
             <el-divider content-position="center">设备使用状况</el-divider>
@@ -1433,6 +1472,8 @@ export default {
         equipmentNumber: null,
         inventoryNumber: null,
         unitMeasurement: null,
+        sapCode: null,
+        sapName: null,
       };
       this.resetForm("form");
     },