From 178befbc644f1dd3f9c9a9eff8a5f41092fb76f2 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 6 Aug 2024 14:33:02 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workorder/index.vue   |   4 +-
 src/views/plan/workorder/printID.vue | 135 +++++++++++++++------------
 2 files changed, 77 insertions(+), 62 deletions(-)

diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 4d4defe..7b140cb 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -1987,8 +1987,10 @@ export default {
 
     /**打印标识卡弹出框**/
     printIdCard() {
-      this.$refs.printID.printDialogVisible = true;
       this.$refs.printID.init("20021221552");
+      this.$refs.printID.showPrint();
+      this.$refs.printID.printDialogVisible = true;
+      
     },
     //标识卡选择确认
     printIdFunc(obj) {
diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue
index 1832859..3abe6e6 100644
--- a/src/views/plan/workorder/printID.vue
+++ b/src/views/plan/workorder/printID.vue
@@ -1,15 +1,9 @@
 <template>
-	<div class="app-container">
-		<!-- 打印预览弹出层 -->
-		<el-dialog title="" :visible.sync="printDialogVisible" width="990px">
-      <div>
-        <el-input v-model="idCardsNum" placeholder="请输入板次数量" style="width:100px"/>
-        <el-button type="primary" icon="el-icon-check" circle @click="showPrint()"/>
-      </div>
-			<div id="printFrom" class="my-print-box">
-       <div v-for="(item, index) in printData.idCardList" :key="index">
-          <el-form>
-            <!-- 表头-工单信息 -->
+  <div class="app-container">
+    <el-dialog title="" :visible.sync="printDialogVisible" width="990px">
+      <div id="printFrom" class="my-print-box">
+        <div v-for="(item, index) in printData.idCardList" :key="index">
+          <el-form  class="print-card">
             <el-row>
               <el-col :span="7">
                 <img src="@/assets/logo/lanjv.png" class="report-logo" />
@@ -17,34 +11,34 @@
               <el-col :span="10" class="center-text">
                 <span>产品标识卡</span>
               </el-col>
-              
-            </el-row>
-            <el-row class="my-print-head">
-              <el-col><el-divider/></el-col>
             </el-row>
-
+            <div class="custom-divider"></div>
+            
             <el-row class="my-print-foot">
               <el-col :offset="1" :span="10">
-                <div>产品名称:{{ printData.factory }}</div><br/>
-                <div>批次号:{{ printData.factory }}</div><br/>
-                <div>生产日期:{{ printData.factory }}</div><br/>
-                <div>板次:{{ printData.factory }}</div><br/>
-                <div>数量:{{ printData.factory }}</div>
+                <div>产品名称: {{ printData.factory }}</div><br />
+                <div>批次号: {{ printData.factory }}</div><br />
+                <div>生产日期: {{ printData.factory }}</div><br />
+                <div>板次: {{ printData.factory }}</div><br />
+                <div>数量: {{ printData.factory }}</div>
               </el-col>
-              <el-col :offset="1" :span="10"> 
-                <canvas ref="qrCanvas"></canvas>
+              <el-col :offset="1" :span="10">
+                <canvas :id="'qrcode-' + index" class="qrcode"></canvas>
               </el-col>
             </el-row>
           </el-form>
+          <div style="clear: both; margin-bottom: 30px;"></div>
+          <div v-if="(index + 1) % 2 === 0" class="print-page"></div>
         </div>
-			</div>
-			<span slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="handlePrint(printData)">打 印</el-button>
-			</span>
-		</el-dialog>
-	</div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handlePrint(printData)">打 印</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
+
 <script>
 import {
   getIdCardList,
@@ -79,7 +73,8 @@ export default {
         ignore: ["no-print"],
         workCenter: "暂无数据",
         factory: null,
-        idCardList: []
+        idCardList: [],
+        //gridStyle:'border: 1px solid lightgray; margin-bottom: -1px;'
       },
       workorderCode: '',
       //工单重新渲染表格
@@ -92,6 +87,10 @@ export default {
     };
   },
   created() {
+  },
+  mounted() {
+   //this.showPrint();
+
   },
   methods: {
       init(workorderCode){
@@ -101,41 +100,33 @@ export default {
     // 打印预览-浏览器打印
     handlePrint(params) {
       printJS({
-        printable: params.printable, // 'printFrom', // 标签元素id
-        type: params.type || "html",
-        maxWidth: 1500, // 最大宽度
-        font_size: "", // 设置字体大小
-        header: params.header, // '表单',
-        targetStyles: ["*"],
-        style: "@page {margin:0 10mm};", // 可选-打印时去掉眉页眉尾
-        ignoreElements: params.ignore || [], // ['no-print']
-        properties: params.properties || null,
-      });
+      printable: params.printable,
+      type: params.type || 'html',
+      maxWidth: 1500,
+      font_size: "", // 设置字体大小
+      header: params.header, // '表单',
+      targetStyles: ['*'],
+      style: `
+        @page { margin: 30mm 10mm; }
+        .print-page { page-break-after: always; }
+      `,
+      ignoreElements: params.ignore || [],
+    });
     },
     // 打印预览-点击打印预览按钮
-    showPrint() {
-      // 清楚缓存
-      //this.printData.workCenter = "暂无数据";
-      getIdCardList(this.workorderCode,this.idCardNum).then((response) => {
-        debugger
-        //this.reset();
-        this.printData.idCardList = response.idCards;
-        // 使用 Vue 的 nextTick 来确保 DOM 已经更新
-        this.$nextTick(() => {
-
-          //for(var i=0;0<response.idCards.length;i++){
-            let qrCanvasIndex = "qrCanvas"+0;
-            const canvas = this.$refs.qrCanvas;
-            const options = {
-              width: 350,  // 设定二维码的宽度
-              height: 350  // 设定二维码的高度
-            };
-            QRCode.toCanvas(canvas,response.idCards[0], options, error => {
-              if (error) console.error(error);
-            });
-          //}
+   async showPrint() {
+      console.log('执行了打印预览');
+     let response = await getIdCardList(this.workorderCode,this.idCardNum);
+     this.printData.idCardList = response.idCards;
+     this.$nextTick(() => {
+      this.printData.idCardList.forEach((item, index) => {
+        const canvas = document.getElementById('qrcode-' + index);
+        QRCode.toCanvas(canvas, item, { width: 350,margin:1 }, function (error) {
+          if (error) console.error(error);
+          console.log('success!');
         });
       });
+    })
     }
   },
 };
@@ -150,6 +141,7 @@ export default {
   text-align: left;
   font-size: 63px;
   font-weight: 800;
+  color: black;
 }
 
 .report-logo {
@@ -178,4 +170,25 @@ export default {
 .my-print-box{
   width:100%
 }
+.custom-divider {
+    width: 100%;
+    height: 1px;
+    background-color: #a5a4a4 !important;
+    margin: 20px 0 !important;
+    -webkit-print-color-adjust: exact;
+  }
+
+.print-page {
+  page-break-after: always;
+}
+@media print {
+  .custom-divider {
+    width: 100%;
+    height: 1px;
+    background-color: #a5a4a4 !important;
+    margin: 20px 0 !important;
+    -webkit-print-color-adjust: exact;
+  }
+}
+
 </style>

From 1765a6a2c2c41418383ebae06dd6d454b25026b6 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 6 Aug 2024 15:01:10 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/unitPrice.js                      |   1 -
 src/api/mes/unitPriceReport.js                |  24 +-
 src/api/system/user.js                        |   8 +
 src/assets/icons/svg/print.svg                |   5 +
 src/views/mes/unitpriceReport/index.vue       | 407 ++++++++++++++----
 src/views/mes/unitpriceReport/selectOrder.vue | 158 +++++++
 6 files changed, 513 insertions(+), 90 deletions(-)
 create mode 100644 src/assets/icons/svg/print.svg
 create mode 100644 src/views/mes/unitpriceReport/selectOrder.vue

diff --git a/src/api/mes/unitPrice.js b/src/api/mes/unitPrice.js
index f39eeee..a7a492e 100644
--- a/src/api/mes/unitPrice.js
+++ b/src/api/mes/unitPrice.js
@@ -16,7 +16,6 @@ export function getUnitPrice(picId) {
 		method: 'get'
 		});
 }
-
 // 新增unitPrice
 export function addUnitPrice(data) {
 	return request({
diff --git a/src/api/mes/unitPriceReport.js b/src/api/mes/unitPriceReport.js
index 847ccf5..417d7c8 100644
--- a/src/api/mes/unitPriceReport.js
+++ b/src/api/mes/unitPriceReport.js
@@ -8,12 +8,7 @@ export function listUnitPriceReport(query) {
     params: query
   });
 }
-// export function getReport(id) {
-//     return request({
-//       url: '/mes/unitPriceReport/' + id,
-//       method: 'get'
-//     });
-// }
+
 // 查询【计件工资】详细
 export function getReport(id) {
   return request({
@@ -29,3 +24,20 @@ export function updateUnitPriceReport(data) {
     data: data
   });
 }
+// 新增
+// 计件工资统计
+export function addUnitPriceReport(data) {
+  return request({
+    url: '/mes/unitPriceReport',
+    method: 'post',
+    data: data
+  });
+}
+// 查询生产工单列表--顶级母
+export function listWorkorderLevel0(query) {
+  return request({
+    url: '/plan/pro/workorder/listLevel0',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 3b071f9..c464094 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -17,6 +17,14 @@ export function getUser(userId) {
     method: 'get'
   })
 }
+// 查询用户详细-通过工号
+export function getUserByUserName(data) {
+  return request({
+    url: '/system/user/getInfoByUserName/',
+    method: 'post',
+    data: data
+  })
+}
 
 // 新增用户
 export function addUser(data) {
diff --git a/src/assets/icons/svg/print.svg b/src/assets/icons/svg/print.svg
new file mode 100644
index 0000000..3f17cb3
--- /dev/null
+++ b/src/assets/icons/svg/print.svg
@@ -0,0 +1,5 @@
+<svg t="1720683721767" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1481" width="200" height="200"><path d="M819.2 364.8h-44.8V128c0-17.066667-14.933333-32-32-32H281.6c-17.066667 0-32 14.933333-32 32v236.8H204.8c-59.733333 0-108.8 49.066667-108.8 108.8v192c0 59.733333 49.066667 108.8 108.8 108.8h44.8V896c0 17.066667 14.933333 32 32 32h460.8c17.066667 0 32-14.933333 32-32v-121.6h44.8c59.733333 0 108.8-49.066667 108.8-108.8v-192c0-59.733333-49.066667-108.8-108.8-108.8zM313.6 160h396.8v204.8H313.6V160z m396.8 704H313.6V620.8h396.8v243.2z m153.6-198.4c0 25.6-19.2 44.8-44.8 44.8h-44.8v-121.6c0-17.066667-14.933333-32-32-32H281.6c-17.066667 0-32 14.933333-32 32v121.6H204.8c-25.6 0-44.8-19.2-44.8-44.8v-192c0-25.6 19.2-44.8 44.8-44.8h614.4c25.6 0 44.8 19.2 44.8 44.8v192z" fill="#1296db" p-id="1482"></path></svg>
+
+
+
+
diff --git a/src/views/mes/unitpriceReport/index.vue b/src/views/mes/unitpriceReport/index.vue
index 498d4e9..6faaa9e 100644
--- a/src/views/mes/unitpriceReport/index.vue
+++ b/src/views/mes/unitpriceReport/index.vue
@@ -42,10 +42,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="员工姓名" prop="nickName">
+      <el-form-item label="员工姓名/工号" prop="nickName" label-width="100px">
         <el-input
-          v-model="queryParams.equipmentName"
-          placeholder="请输入员工姓名"
+          v-model="queryParams.nickName"
+          placeholder="请输入员工姓名/工号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -69,16 +69,15 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['unitPriceReport:report:edit']"-->
-<!--        >修改-->
-<!--        </el-button>-->
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="openSelectOrder"
+          v-hasPermi="['device:item:add']"
+        >补录
+        </el-button>
         <el-button
           type="success"
           plain
@@ -156,7 +155,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改unitPrice对话框 -->
+    <!-- 修改unitPrice对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form"  label-width="100px">
 
@@ -281,16 +280,243 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+    <!-- 新增unitPrice对话框 -->
+    <el-dialog :title="addtitle" :visible.sync="addopen" width="680px" append-to-body>
+      <el-form ref="addform" :model="addform" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工单号" prop="workorderCode" >
+              <el-input v-model="addform.workorderCode" >
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="SAP订单号" prop="workorderCodeSap" >
+              <el-input v-model="addform.workorderCodeSap" >
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工单生产日期" prop="workOrderProductDate" >
+
+              <el-date-picker
+                v-model="addform.workOrderProductDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择生产日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料码" prop="productCode" >
+              <el-input v-model="addform.productCode" >
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="产品描述" prop="productName" >
+              <el-input v-model="addform.productName" >
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="工序" prop="childprocessName" >
+              <el-select v-model="addform.childprocessName" single placeholder="请选择工序">
+                <el-option
+                  v-for="item in childprocessNameOptions"
+                  :key="item.picId"
+                  :label="item.childprocessName"
+                  :value="item.childprocessCode"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="产线编码" prop="workorderName" >
+              <el-input v-model="addform.workorderName" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select v-model="addform.post" multiple placeholder="请选择岗位">
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工号" prop="userName" >
+              <el-input v-model="addform.userName"  @keyup.enter.native="handleQueryUser">
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="员工姓名" prop="nickName" >
+              <el-input v-model="addform.nickName" >
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="产量" prop="attr1" >
+              <el-input v-model="addform.attr1" >
+                <template #suffix>PC</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工时" prop="attr2" >
+              <el-input v-model="addform.attr2" >
+                <template #suffix>小时</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="扣款" prop="kk" >
+              <el-input v-model="addform.kk" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="保底" prop="bd" >
+              <el-input v-model="addform.bd" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="转岗" prop="zg" >
+              <el-input v-model="addform.zg" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="返工费用" prop="fg" >
+              <el-input v-model="addform.fg" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="试产" prop="sc" >
+              <el-input v-model="addform.sc" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="试机" prop="sj" >
+              <el-input v-model="addform.sj" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="特殊费用" prop="tsfy" >
+              <el-input v-model="addform.tsfy" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="夜班补贴" prop="ybbt" >
+              <el-input v-model="addform.ybbt" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="协产补贴" prop="xcbt" >
+              <el-input v-model="addform.xcbt" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <!--              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>-->
+            <el-select
+              v-model="addform.remark"
+              placeholder="备注"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.unit_price"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="addsubmitForm">确 定</el-button>
+        <el-button @click="addcancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <select-order ref="orderselect" :datasourceId="queryParams.datasourceId" @ok="handleQuery"  @showAddDialog="showAddDialog" />
   </div>
 </template>
 <script>
-// import { ElEditable } from 'element-plus';
-import { getToken } from "@/utils/auth";
-import { listUnitPriceReport,getReport,updateUnitPriceReport } from "@/api/mes/unitPriceReport";
-
+import { listUnitPriceReport,getReport,updateUnitPriceReport,addUnitPriceReport } from "@/api/mes/unitPriceReport";
+import { listUnitPrice } from "@/api/mes/unitPrice";
+import { getUserByUserName } from "@/api/system/user";
+import selectOrder from "./selectOrder";
 export default {
-  name: "UnitPrice",
+  name: "UnitPriceReport",
   dicts: ['unit_price'],
+  components: { selectOrder },  // 确保正确注册
   data() {
     return {
       // 遮罩层
@@ -307,10 +533,15 @@ export default {
       total: 0,
       // unitPrice表格数据
       unitPriceList: [],
+      // 岗位选项
+      postOptions: [],
+      childprocessNameOptions: [],
       // 弹出层标题
       title: "",
+      addtitle: "",
       // 是否显示弹出层
       open: false,
+      addopen: false,
       value: '',
       // 日期范围
       dateRange: [],
@@ -319,6 +550,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         factoryId: null,
+        datasourceId: undefined,
         workorderCodeSap: null,
         productCode: null,
         productName: null,
@@ -333,11 +565,14 @@ export default {
         attr4: null,
       },
       productQueryParams:{
+        pageNum: 1,
+        pageSize: 10,
         productCode: null,
         productName: null,
       },
       // 表单参数
       form: {},
+      addform:{},
       // 表单校验
       productCodeList: [],
       state: '',
@@ -346,58 +581,22 @@ export default {
       tableData: [],
       MesUnitPriceInfo: [],
       // 表单校验
-      // rules: {
-      //   attr2: [
-      //     { required: true, message: "工时不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      //   attr1: [
-      //     { required: true, message: "生产数量不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      //   bd: [
-      //     { required: true, message: "保底不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      //   zg: [
-      //     { required: true, message: "转岗不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      //   fg: [
-      //     { required: true, message: "返工费用不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      //   sc: [
-      //     { required: true, message: "试产不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      //   sj: [
-      //     { required: true, message: "试机不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      //   tsfy: [
-      //     { required: true, message: "特殊费用不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      //   ybbt: [
-      //     { required: true, message: "夜班补贴不能为空", trigger: "blur" },
-      //     { validator: validateNumberOrDecimal, trigger: "blur" }
-      //   ],
-      // }
+      rules: {
+        userName: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+        ],
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        childprocessName: [
+          { required: true, message: "工序不能为空", trigger: "blur" }
+        ],
+      }
     };
-    // 自定义验证函数，确保输入的是数字或小数
-    // const validateNumberOrDecimal = (rule, value, callback) => {
-    //   const regex = /^(\d+(\.\d{1,2})?)?$/;
-    //   if (!regex.test(value)) {
-    //     callback(new Error('请输入有效的数字'));
-    //   } else {
-    //     callback();
-    //   }
-    // };
+
   },
   created() {
-    this.getList();
-    // this.fetchProcessOptions();
+      this.getList();
   },
   methods: {
     handleEdit(index, row) {
@@ -418,6 +617,14 @@ export default {
       this.open = false;
       this.reset();
     },
+    addcancel(){
+      this.addopen = false;
+      this.addreset();
+    },
+    addreset(){
+      this.addform = {};
+      this.resetForm("addform");
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -448,6 +655,15 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+
+    handleQueryUser(){
+      getUserByUserName(this.addform).then(response => {
+        this.postOptions = response.posts;
+        this.$set(this.addform, "post", response.postIds);
+        this.addform.nickName=response.data.nickName;
+      });
+    },
+
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
@@ -460,23 +676,31 @@ export default {
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加计件薪酬信息";
+    openSelectOrder() {
+      this.$refs.orderselect.show();
     },
-    /** 修改按钮操作 */
-    // handleUpdate(row) {
-    //   console.log(row)
-    //   this.reset();
-    //   const picId = row.id || this.ids
-    //   getReport(picId).then(response => {
-    //     this.form = response.data.MesUnitpriceReport;
-    //     this.open = true;
-    //     this.MesUnitPriceInfo=response.data.MesUnitPriceInfo;
-    //   });
-    // },
+    /** 新增按钮操作 */
+    showAddDialog(currentRow) {
+      this.reset();
+      //查询此产品下的工序信息
+      this.productQueryParams.productCode=currentRow.productCode.slice(7, 18);
+      this.productQueryParams.lineCode=currentRow.sapCode;
+      listUnitPrice(this.productQueryParams).then(response => {
+
+        this.childprocessNameOptions = response.rows;
+        // this.$set(this.addform, "post", response.rows);
+
+      });
+      this.addopen = true;
+      this.addform.workorderCode=currentRow.workorderCode;
+      this.addform.workorderCodeSap=currentRow.workorderCodeSap;
+      this.addform.workOrderProductDate=currentRow.productDate;
+      this.addform.productCode=currentRow.productCode;
+      this.addform.productName=currentRow.productName;
+      this.addform.workorderName=currentRow.sapCode;
 
+
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -513,6 +737,23 @@ export default {
         }
       });
     },
+    /** 新增提交按钮 */
+    addsubmitForm() {
+      this.$refs["addform"].validate(valid => {
+        if (valid) {
+          console.log(this.addform)
+          const post=this.addform.post[0]
+          this.addform.post=null;
+          this.addform.post=post;
+          addUnitPriceReport(this.addform).then(response => {
+            this.$modal.msgSuccess("新增成功");
+            this.addopen = false;
+            this.addform = {};
+            this.getList();
+          })
+        }
+      })
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('mes/unitPriceReport/export', {
diff --git a/src/views/mes/unitpriceReport/selectOrder.vue b/src/views/mes/unitpriceReport/selectOrder.vue
new file mode 100644
index 0000000..dccf614
--- /dev/null
+++ b/src/views/mes/unitpriceReport/selectOrder.vue
@@ -0,0 +1,158 @@
+<template>
+  <!-- 授权用户 -->
+  <el-dialog title="选择订单" :visible.sync="visible" width="1200px" top="5vh" append-to-body>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+      <el-form-item label="生产日期" prop="productDate">
+            <el-date-picker
+               v-model="queryParams.productDate"
+               type="date"
+               value-format="yyyy-MM-dd"
+               placeholder="选择生产日期">
+            </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="产线编码" prop="workorderName">
+        <el-select clearable v-model="queryParams.workorderName">
+          <el-option
+            v-for="item in prodLineList"
+            :key="item.lineCode"
+            :label="item.lineName"
+            :value="item.lineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="物料编码" prop="productCode">
+        <el-input
+          v-model="queryParams.productCode"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row>
+<!--      <el-table-->
+<!--        ref="singleTable"-->
+<!--        :data="userList"-->
+<!--        highlight-current-row-->
+<!--        @selection-change="handleSelectionChange">-->
+      <el-table
+        ref="table"
+        :data="userList"
+        highlight-current-row
+        @current-change="handleCurrentChange"
+        height="260px">
+        <el-table-column label="工单号" prop="workorderCode" :show-overflow-tooltip="true" />
+        <el-table-column label="SAP订单号" prop="workorderCodeSap" :show-overflow-tooltip="true" />
+        <el-table-column label="产品编码" width="200" prop="productCode" :show-overflow-tooltip="true" />
+        <el-table-column label="产品名称" width="200" prop="productName" :show-overflow-tooltip="true" />
+        <el-table-column label="生产日期" prop="productDate" :show-overflow-tooltip="true" />
+        <el-table-column label="产线" prop="sapName" :show-overflow-tooltip="true" />
+        <el-table-column label="产线编码" prop="sapCode" :show-overflow-tooltip="true" />
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="handleSelectUser">确 定</el-button>
+      <el-button @click="visible = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+
+import {
+ listWorkorderLevel0,
+  getProdLineList
+} from '@/api/plan/workorder'
+export default {
+
+  dicts: ['sys_normal_disable'],
+  props: {
+    // 角色编号
+    datasourceId: {
+      type: [Number, String]
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      visible: false,
+      // 选中数组值
+      orderId: null,
+      // 总条数
+      total: 0,
+      // 未授权用户数据
+      userList: [],
+      prodLineList:[],
+      currentRow: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        datasourceId: undefined,
+        userName: undefined,
+        phonenumber: undefined,
+
+      }
+    };
+  },
+  created() {
+    getProdLineList().then(response => {
+      this.prodLineList = response
+    })
+  },
+  methods: {
+    // 显示弹框
+    show() {
+      this.queryParams.datasourceId = this.datasourceId;
+      this.getList();
+      this.visible = true;
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleCurrentChange(val) {
+      this.currentRow = val;
+    },
+    // 查询表数据
+    getList() {
+      this.queryParams.parentOrder= '0';
+      listWorkorderLevel0(this.queryParams).then(res => {
+        console.log(res)
+        this.userList = res.rows;
+        this.total = res.total;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 选择授权用户操作 */
+    handleSelectUser() {
+      this.visible = false;
+      this.$emit('showAddDialog',this.currentRow); // 触发自定义事件
+    }
+  }
+};
+</script>

From 7fe067ed37a12a6b3ac954a500dc547abe35f293 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 6 Aug 2024 17:20:01 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E6=89=93?=
 =?UTF-8?q?=E5=8D=B02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workorder/index.vue   | 15 +++++++++++----
 src/views/plan/workorder/printID.vue | 20 ++++++++++----------
 src/views/wms/product/index.vue      | 20 +++++++++-----------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 7b140cb..c1abe9a 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -1838,7 +1838,7 @@ export default {
         this.$modal.msgError("还未派发请到工单变更进行调整！");
         return;
       }
-      
+
 
       this.batchLoading = true;
       const workOrdercode = this.codes[0];
@@ -1987,10 +1987,17 @@ export default {
 
     /**打印标识卡弹出框**/
     printIdCard() {
-      this.$refs.printID.init("20021221552");
-      this.$refs.printID.showPrint();
+
+      //var statusesArray = this.statuses;
+      //for (var i = 0; i < statusesArray.length; i++) {
+      //  if (statusesArray[i] != 'w0') {//已经下达的不允许操作
+      //    this.$modal.msgError("工单只有未派发和已派发才可变更！");
+      //    return
+      //  }
+      //}
+
+      this.$refs.printID.init(this.selectWork.workorderCode);
       this.$refs.printID.printDialogVisible = true;
-      
     },
     //标识卡选择确认
     printIdFunc(obj) {
diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue
index 3abe6e6..cd0f695 100644
--- a/src/views/plan/workorder/printID.vue
+++ b/src/views/plan/workorder/printID.vue
@@ -16,11 +16,11 @@
             
             <el-row class="my-print-foot">
               <el-col :offset="1" :span="10">
-                <div>产品名称: {{ printData.factory }}</div><br />
-                <div>批次号: {{ printData.factory }}</div><br />
-                <div>生产日期: {{ printData.factory }}</div><br />
-                <div>板次: {{ printData.factory }}</div><br />
-                <div>数量: {{ printData.factory }}</div>
+                <div>产品名称: {{ item.productName  }}</div><br />
+                <div>批次号: {{ item.batchCode }}</div><br />
+                <div>生产日期: {{ item.productDateStr }}</div><br />
+                <div>板次: {{ item.PalletNo }}</div><br />
+                <div>数量: {{ item.batchQuantity }}</div>
               </el-col>
               <el-col :offset="1" :span="10">
                 <canvas :id="'qrcode-' + index" class="qrcode"></canvas>
@@ -89,12 +89,13 @@ export default {
   created() {
   },
   mounted() {
-   //this.showPrint();
+  
 
   },
   methods: {
       init(workorderCode){
         this.workorderCode = workorderCode;
+        this.showPrint();
       },
 
     // 打印预览-浏览器打印
@@ -115,13 +116,12 @@ export default {
     },
     // 打印预览-点击打印预览按钮
    async showPrint() {
-      console.log('执行了打印预览');
-     let response = await getIdCardList(this.workorderCode,this.idCardNum);
-     this.printData.idCardList = response.idCards;
+     let response = await getIdCardList(this.workorderCode);
+     this.printData.idCardList = response;
      this.$nextTick(() => {
       this.printData.idCardList.forEach((item, index) => {
         const canvas = document.getElementById('qrcode-' + index);
-        QRCode.toCanvas(canvas, item, { width: 350,margin:1 }, function (error) {
+        QRCode.toCanvas(canvas, item.palletCode, { width: 350,margin:1 }, function (error) {
           if (error) console.error(error);
           console.log('success!');
         });
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index f93ae87..234985d 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -384,6 +384,11 @@
             style="width: 320px"
           />
         </el-form-item>
+
+         <el-form-item label="标准模板" prop="mvgr5">
+					<el-input v-model="form.mvgr5" placeholder="请输入建议标准模板" />
+				</el-form-item> 
+
         <el-form-item label="是否启用" prop="activeFlag">
           <el-select
             v-model="form.activeFlag"
@@ -448,22 +453,15 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <!--
-        <el-form-item label="标准效率" prop="iei">
+        <el-form-item label="仓库检验周期" prop="warehouseCycle">
           <el-input-number
-            v-model="form.iei"
+            v-model="form.warehouseCycle"
             style="width: 320px"
           />
         </el-form-item>
-        <el-form-item label="标准用人" prop="manStandar">
+        <el-form-item label="每托盘最大箱数" prop="palletNum">
           <el-input-number
-            v-model="form.manStandar"
-            style="width: 320px"
-          />
-        </el-form-item>-->
-        <el-form-item label="仓库检验周期" prop="warehouseCycle">
-          <el-input-number
-            v-model="form.warehouseCycle"
+            v-model="form.palletNum"
             style="width: 320px"
           />
         </el-form-item>

From b6d96f5544b6b71cd0d742cc0ede4dfd62c446a5 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 6 Aug 2024 17:53:43 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A5=E6=89=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/plan/workorder.js            |  5 +----
 src/views/plan/workorder/printID.vue | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js
index 298c59c..f3c2697 100644
--- a/src/api/plan/workorder.js
+++ b/src/api/plan/workorder.js
@@ -181,10 +181,7 @@ export function getProdLineList() {
         params: {}
 	});
 }
-export function getIdCardList(workorderCode){
-	const data={
-		workorderCode
-	}
+export function getIdCardList(data){
 	return request({
 	  url:'/plan/pro/workorder/getIdCardList',
 	  method:'post',
diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue
index cd0f695..4f83b05 100644
--- a/src/views/plan/workorder/printID.vue
+++ b/src/views/plan/workorder/printID.vue
@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
     <el-dialog title="" :visible.sync="printDialogVisible" width="990px">
+      <div>
+        <el-form inline>
+          <el-form-item label="补打版次" prop="factory">
+            <el-input v-model="idCardsNum" placeholder="请输入补打版次" style="width:100px"/>
+          </el-form-item> 
+          <el-button type="primary" icon="el-icon-check" circle @click="showPrint()"/>
+        </el-form>
+       
+      </div>
       <div id="printFrom" class="my-print-box">
         <div v-for="(item, index) in printData.idCardList" :key="index">
           <el-form  class="print-card">
@@ -51,7 +60,7 @@ export default {
   },
   data() {
     return {
-      idCardsNum: 1,
+      idCardsNum: null,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -116,7 +125,13 @@ export default {
     },
     // 打印预览-点击打印预览按钮
    async showPrint() {
-     let response = await getIdCardList(this.workorderCode);
+      console.log('执行了打印预览');
+      let params = {
+      };
+      if(this.idCardsNum!=null){
+        params.palletNo=this.idCardsNum;
+      }
+     let response = await getIdCardList({workorderCode:this.workorderCode,...params});
      this.printData.idCardList = response;
      this.$nextTick(() => {
       this.printData.idCardList.forEach((item, index) => {

From b63f08e654c8d5beb92b02174a4b1f879a28ea33 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 6 Aug 2024 21:56:43 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E6=89=93?=
 =?UTF-8?q?=E5=8D=B03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workorder/index.vue   |  2 +-
 src/views/plan/workorder/printID.vue | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index c1abe9a..87f2c7d 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -1990,7 +1990,7 @@ export default {
 
       //var statusesArray = this.statuses;
       //for (var i = 0; i < statusesArray.length; i++) {
-      //  if (statusesArray[i] != 'w0') {//已经下达的不允许操作
+      //  if (statusesArray[i] == 'w0') {//已经下达的不允许操作
       //    this.$modal.msgError("工单只有未派发和已派发才可变更！");
       //    return
       //  }
diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue
index 4f83b05..19c4832 100644
--- a/src/views/plan/workorder/printID.vue
+++ b/src/views/plan/workorder/printID.vue
@@ -25,11 +25,11 @@
             
             <el-row class="my-print-foot">
               <el-col :offset="1" :span="10">
-                <div>产品名称: {{ item.productName  }}</div><br />
-                <div>批次号: {{ item.batchCode }}</div><br />
-                <div>生产日期: {{ item.productDateStr }}</div><br />
-                <div>板次: {{ item.PalletNo }}</div><br />
-                <div>数量: {{ item.batchQuantity }}</div>
+                <div class="card-div1">产品名称: {{ item.productName  }}</div><br />
+                <div class="card-div1">批次号: {{ item.batchCode }}</div><br />
+                <div class="card-div2">生产日期: {{ item.productDateStr }}</div><br />
+                <div class="card-div2">板次: {{ item.palletNo }}</div><br />
+                <div class="card-div2">数量: {{ item.batchQuantity }}</div>
               </el-col>
               <el-col :offset="1" :span="10">
                 <canvas :id="'qrcode-' + index" class="qrcode"></canvas>
@@ -205,5 +205,14 @@ export default {
     -webkit-print-color-adjust: exact;
   }
 }
-
+.card-div1{
+  font-size: 20px;
+  font-weight: 600;
+  padding-top: 14px;
+}
+.card-div2{
+  font-size: 22px;
+  font-weight: 700;
+  padding-top: 14px;
+}
 </style>