增加牌号

src/views/billet/shippingBill/components/editForm.vue

@@ -8,6 +8,11 @@
             <JSearchSelect placeholder="请选择" disabled v-model:value="model.ccmNo" dict="lg_zj" defaultValue="5" />
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="牌号">
+            <JSearchSelect type="list" v-model:value="model.brandNum" dict="billet_spec" placeholder="请选择" allowClear />
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
@@ -43,7 +48,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="规格">
-            <JSearchSelect type="list" v-model:value="model.spec" dict="billet_spec" placeholder="请选择" allowClear />
+            <a-input v-model:value="model.spec" placeholder="请输入" allowClear />
           </a-form-item>
         </a-col>
       </a-row>
@@ -87,7 +92,15 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="总支数">
-            <a-input-number :disabled="!model.outTime" style="width: 100%" v-model:value="model.amountTotal" placeholder="请输入" allowClear :min="0" :max="100" />
+            <a-input-number
+              :disabled="!model.outTime"
+              style="width: 100%"
+              v-model:value="model.amountTotal"
+              placeholder="请输入"
+              allowClear
+              :min="0"
+              :max="100"
+            />
           </a-form-item>
         </a-col>
       </a-row>
@@ -190,6 +203,7 @@
       destination,
       typeConfigId,
       licensePlateStatus,
+      brandNum,
       remarks,
     } = model.value;
     let objParams = {
@@ -210,6 +224,7 @@
       destination,
       typeConfigId,
       remarks,
+      brandNum,
     };
     confirmLoading.value = true;
     const newTypeConfigId = destination ? machineConfig.value[ccmNo].find((item) => item.label == destination).id : null;

src/views/billet/shippingBill/shippingBill.data.ts

@@ -93,6 +93,15 @@ export const columns: BasicColumn[] = computed(() => [
     width: 80,
     dataIndex: 'shift_dictText',
   },
+  {
+    title: '牌号',
+    align: 'center',
+    width: 80,
+    dataIndex: 'brandNum',
+    customRender(opt) {
+      return render.renderDict(opt.record.brandNum, 'billet_spec');
+    },
+  },
   {
     title: '钢种',
     align: 'center',

src/views/billet/storageAndTransportation/index.vue

@@ -59,7 +59,7 @@
                       <a-descriptions-item label="车号">{{ sval.licensePlate }}</a-descriptions-item>
                       <a-descriptions-item label="类型"><component :is="renderDictTag(sval.btype, 'lg_btype')" /></a-descriptions-item>
                       <a-descriptions-item label="定尺">{{ sval.size }}</a-descriptions-item>
-                      <a-descriptions-item label="牌号">{{ sval.spec }}</a-descriptions-item>
+                      <a-descriptions-item label="牌号"><component :is="renderDictTag(sval.brandNum, 'billet_spec')" /></a-descriptions-item>
                       <a-descriptions-item label="支数">{{ sval.amount }}</a-descriptions-item>
                       <a-descriptions-item label="重量">{{ sval.weight }}</a-descriptions-item>
                     </a-descriptions>
@@ -359,7 +359,7 @@
 
     /* 基础票据样式 */
     .ticket {
-      width: 666px;
+      width: 672px;
       background: #fff;
       border-radius: 8px;
       box-shadow: 5px 0px 6px 2px rgba(0, 0, 0, 0.25);