修改5、6号机共用2号车位

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

@@ -5,7 +5,7 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="铸机">
-            <JSearchSelect placeholder="请选择" disabled v-model:value="model.ccmNo" dict="lg_zj" defaultValue="5" />
+            <JSearchSelect placeholder="请选择" :disabled="model.positionNum != 2" v-model:value="model.ccmNo" dict="lg_zj" defaultValue="5" />
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -87,7 +87,13 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="车位号">
-            <a-select style="width: 100%" disabled v-model:value="model.positionNum" placeholder="请选择" :options="carPosition" />
+            <a-select
+              style="width: 100%"
+              disabled
+              v-model:value="model.positionNum"
+              placeholder="请选择"
+              :options="model.ccmNo == 6 ? carPosition6 : carPosition5"
+            />
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -121,7 +127,7 @@
   import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
   // import { dictOptions } from '../shippingBill.data';
   import { queryBilletNameList } from '../../hotDelivery/hotDelivery.api';
-  import { carPosition } from '../shippingBill.data';
+  import { carPosition5, carPosition6 } from '../shippingBill.data';
   import { getDictItemsByCode } from '/@/utils/dict/index';
   import dayjs from 'dayjs';
 

src/views/billet/shippingBill/index.vue

@@ -57,7 +57,12 @@
             </a-col>
             <a-col :span="4" v-if="queryParam.ccmNo === '6'">
               <a-form-item label="车位号">
-                <a-select style="width: 100%" v-model:value="queryParam.positionNum" placeholder="请选择" :options="carPosition" />
+                <a-select style="width: 100%" v-model:value="queryParam.positionNum" placeholder="请选择" :options="carPosition6" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="4" v-else>
+              <a-form-item label="车位号">
+                <a-select style="width: 100%" v-model:value="queryParam.positionNum" placeholder="请选择" :options="carPosition5" />
               </a-form-item>
             </a-col>
           </a-row>
@@ -75,7 +80,7 @@
       <template #form-positionNum="{ model, field }">
         <a-radio-group v-model:value="model[field]" button-style="solid" @change="() => reload()">
           <a-radio-button value="1" v-if="Number(machine) === 5">1号车位</a-radio-button>
-          <a-radio-button value="2" v-if="Number(machine) === 6">2号车位</a-radio-button>
+          <a-radio-button value="2">2号车位</a-radio-button>
           <a-radio-button value="3" v-if="Number(machine) === 6">3号车位</a-radio-button>
           <a-radio-button value="4" v-if="Number(machine) === 6">4号车位</a-radio-button>
         </a-radio-group>
@@ -125,7 +130,7 @@
   import { BasicTable, TableAction } from '/@/components/Table';
   import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
   import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, initDictConfig, queryParam, searchFormSchema, carPosition } from './shippingBill.data';
+  import { columns, initDictConfig, queryParam, searchFormSchema, carPosition6, carPosition5 } from './shippingBill.data';
   import { deleteOne, batchDelete } from './shippingBill.api';
   import { defHttp } from '/@/utils/http/axios';
   import { onMounted, ref, reactive } from 'vue';

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

@@ -510,13 +510,17 @@ export const detailColumns: BasicColumn[] = [
 export const detailFormSchema = [];
 
 // 车位号
-export const carPosition = ref([
-  // { label: '1', value: '1' },
+export const carPosition6 = ref([
   { label: '2', value: '2' },
   { label: '3', value: '3' },
   { label: '4', value: '4' },
 ]);
 
+export const carPosition5 = ref([
+  { label: '1', value: '1' },
+  { label: '2', value: '2' },
+]);
+
 //列表数据
 export const baseColums: BasicColumn[] = [
   {