入库条码打印修改 生成入库作业 手动完成入库作业

ruoyi-ui/src/views/bas/BasProductCode/index.vue

@@ -106,6 +106,7 @@
                     :correctLevel="2"
                     error-correction-level="M"
                   />
+                  <div class="qrcode-label">{{ previewData.spare4 }}</div>
                 </div>
               </div>
             </div>
@@ -163,6 +164,7 @@
                       :correctLevel="2"
                       error-correction-level="M"
                     />
+                    <div class="qrcode-label">{{ previewData.spare4 }}</div>
                   </div>
                 </div>
               </div>
@@ -239,6 +241,7 @@ import {addBasProductCode, delBasProductCode, listBasProductCode, updateBasProdu
 
 // 常量配置
 const FORM_FIELDS = [
+  { prop: 'spare4', label: '品号', placeholder: '请输入品号', required: true },
   { prop: 'model', label: '型号', placeholder: '请输入型号', required: true },
   { prop: 'serial', label: '序列号', placeholder: '请输入序列号', required: true },
   { prop: 'color', label: '颜色', placeholder: '请输入颜色', required: true },
@@ -253,6 +256,7 @@ const FORM_FIELDS = [
 ]
 
 const TABLE_COLUMNS = [
+  { prop: 'spare4', label: '品号', width: 140 },
   { prop: 'model', label: '型号', width: 120 },
   { prop: 'color', label: '颜色', width: 100 },
   { prop: 'serial', label: '序列号', width: 150 },
@@ -284,7 +288,8 @@ const DEFAULT_FORM = {
   type: '1',
   spare1: '',
   spare2: '',
-  spare3: ''
+  spare3: '',
+  spare4: ''
 }
 
 const DEFAULT_PREVIEW_DATA = {
@@ -345,8 +350,8 @@ export default {
       return "MODEL:" + this.previewData.model + " COLOR:" + this.previewData.color
         + " SERIAL:" + this.previewData.serial + " V:" + this.previewData.v
         + " Hz:" + this.previewData.hz + " PH:" + this.previewData.ph
-        + " N.W.:" + this.previewData.nW + " G.W.:" + this.previewData.gW
-        + " @:" + bm + "@"
+        + " N.W.:" + this.previewData.nW + " G.W.:" + this.previewData.gW+" ITEM_CODE:"+this.previewData.spare4+ " @:" + bm + "@"
+
     },
     // 是否有选中项
     hasSelection() {
@@ -849,6 +854,15 @@ export default {
   padding: 0;
   background-color: transparent;
   border: none;
+  text-align: center;
+}
+
+.qrcode-label {
+  margin-top: 8px;
+  font-size: 14px;
+  font-weight: 600;
+  color: #303133;
+  text-align: center;
 }
 
 /* 响应式设计 */

ruoyi-ui/src/views/in/job/index.vue

@@ -128,7 +128,7 @@
     <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
       max-height="400">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务ID" align="left" prop="jobId" fixed />
+      <el-table-column label="任务ID" align="left" prop="jobId" fixed width="140" />
       <el-table-column label="任务状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -146,8 +146,8 @@
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" />
       <el-table-column label="批号" align="left" prop="lotNo" fixed />
-      <el-table-column label="托盘码" align="left" prop="trayCode" />
-      <el-table-column label="货位" align="left" prop="cargoSpaceName" />
+      <el-table-column label="托盘码" align="left" prop="trayCode" width="140" />
+      <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" />
       <el-table-column label="优先级" align="left" prop="priority" />
       <el-table-column label="执行阶段" align="left" prop="executionPhase">
         <template slot-scope="scope">
@@ -173,11 +173,11 @@
               max-height="300"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" />
-      <el-table-column label="任务ID" align="left" prop="jobId" />
+      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="150" />
+      <el-table-column label="任务ID" align="left" prop="jobId" width="140" />
       <el-table-column label="单据ID" align="left" prop="inOrOutId" />
       <el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
-      <el-table-column label="物料编码" align="left" prop="productId" />
+      <el-table-column label="物料编码" align="left" prop="productId" width="140" />
       <el-table-column label="物料名称" align="left" prop="productName" />
       <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
       <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
@@ -185,7 +185,7 @@
       <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
       <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
       <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
-      <el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
+      <el-table-column label="序列号" align="left" prop="spare4" width="130"/><!--序列号-->
       <el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
       <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
       <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->