feat: 配货分拣规则添加启用状态、名称字段

src/types/api/order.ts

@@ -310,6 +310,7 @@ export interface SortingList {
 
 
 // 配货分拣 详情
 // 配货分拣 详情
 export interface SortingRuleDetail {
 export interface SortingRuleDetail {
+  name?: string // 配货区名称
   id?: number
   id?: number
   sortNo: number // 分拣序号
   sortNo: number // 分拣序号
   areaDesc: string // 分拣区描述
   areaDesc: string // 分拣区描述
@@ -320,6 +321,7 @@ export interface SortingRuleDetail {
   matchType: 1 | 2 //匹配类型：1=所有条件(且) 2=任一条件(或)
   matchType: 1 | 2 //匹配类型：1=所有条件(且) 2=任一条件(或)
   autoPrint: boolean // 自动打单
   autoPrint: boolean // 自动打单
   defaultFlag: boolean // 默认分拣区
   defaultFlag: boolean // 默认分拣区
+  enable: boolean // 启用状态
   secondScan: boolean // 二次扫码
   secondScan: boolean // 二次扫码
   conditions: SortingRuleCondition[] // 配货规则
   conditions: SortingRuleCondition[] // 配货规则
 }
 }

src/views/order/allocationSortingRule/components/addDialog.vue

@@ -7,6 +7,17 @@
     destroy-on-close
     destroy-on-close
   >
   >
     <el-form ref="formRef" label-width="170px" :model="form" :rules="rules">
     <el-form ref="formRef" label-width="170px" :model="form" :rules="rules">
+      <el-form-item label="配货区名称" prop="name">
+        <el-input
+          v-model="form.name"
+          style="width: 100%"
+          clearable
+          maxlength="20"
+          show-word-limit
+          :disabled="isDisabled"
+          placeholder="请输入配货区名称"
+        />
+      </el-form-item>
       <el-form-item label="配货区说明" prop="areaDesc">
       <el-form-item label="配货区说明" prop="areaDesc">
         <el-input
         <el-input
           v-model="form.areaDesc"
           v-model="form.areaDesc"
@@ -200,11 +211,7 @@
       </el-form-item>
       </el-form-item>
 
 
       <el-form-item label="自动打单" prop="autoPrint">
       <el-form-item label="自动打单" prop="autoPrint">
-        <el-switch
-          v-model="form.autoPrint"
-          size="large"
-          placeholder="请选择是否自动打单"
-        />
+        <el-switch v-model="form.autoPrint" size="large" />
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
         <span v-if="form.autoPrint" class="item-info">
         <span v-if="form.autoPrint" class="item-info">
@@ -214,6 +221,17 @@
           关闭后，配货分拣订单配齐后仍在待配货状态，经过配货打单后订单状态转为待发货。
           关闭后，配货分拣订单配齐后仍在待配货状态，经过配货打单后订单状态转为待发货。
         </span>
         </span>
       </el-form-item>
       </el-form-item>
+      <el-form-item label="启用状态" prop="enable">
+        <el-switch v-model="form.enable" size="large" />
+      </el-form-item>
+      <el-form-item>
+        <span v-if="form.enable" class="item-info">
+          开启后，该配货区正常使用。
+        </span>
+        <span v-else class="item-info" style="color: #f56c6c">
+          关闭后，该配货区暂不使用。
+        </span>
+      </el-form-item>
       <el-form-item label="是否对接二次扫码设备" prop="secondScan">
       <el-form-item label="是否对接二次扫码设备" prop="secondScan">
         <el-select
         <el-select
           v-model="form.secondScan"
           v-model="form.secondScan"
@@ -299,6 +317,7 @@ const areaList = ref<OperatorList[]>([])
 const sortingUserList = ref<OperatorList[]>([])
 const sortingUserList = ref<OperatorList[]>([])
 const categoryList = ref<OperatorList[]>([])
 const categoryList = ref<OperatorList[]>([])
 const form = ref<SortingRuleDetail>({
 const form = ref<SortingRuleDetail>({
+  name: '',
   areaDesc: '',
   areaDesc: '',
   areaCode: '',
   areaCode: '',
   matchType: 1,
   matchType: 1,
@@ -309,6 +328,7 @@ const form = ref<SortingRuleDetail>({
       conditionValue: undefined,
       conditionValue: undefined,
     },
     },
   ],
   ],
+  enable: false,
   secondScan: false,
   secondScan: false,
   sortNo: 1,
   sortNo: 1,
   autoPrint: false,
   autoPrint: false,
@@ -402,6 +422,7 @@ const rules = computed(() => {
     autoPrint: [
     autoPrint: [
       { required: true, message: '请选择是否自动打单', trigger: 'change' },
       { required: true, message: '请选择是否自动打单', trigger: 'change' },
     ],
     ],
+    enable: [{ required: true, message: '请选择启用状态', trigger: 'change' }],
     secondScan: [
     secondScan: [
       {
       {
         required: true,
         required: true,
@@ -519,6 +540,13 @@ const handleSubmit = async () => {
       }),
       }),
     ),
     ),
   }
   }
+
+  if (!submitData.name) {
+    const desc = areaList.value.find(
+      (item) => item.code === submitData.areaCode,
+    )?.desc
+    submitData.name = `${desc}-${props.warehouseName}`
+  }
   if (props.isEdit) {
   if (props.isEdit) {
     submitData.id = props.editData?.id
     submitData.id = props.editData?.id
     try {
     try {

src/views/order/allocationSortingRule/index.vue

@@ -106,6 +106,17 @@
             <template #autoPrint="{ row }">
             <template #autoPrint="{ row }">
               {{ row.autoPrint ? '开启' : '关闭' }}
               {{ row.autoPrint ? '开启' : '关闭' }}
             </template>
             </template>
+            <template #enable="{ row }">
+              <el-icon
+                v-if="row.enable"
+                style="color: #67c23a; font-size: 18px"
+              >
+                <Check />
+              </el-icon>
+              <el-icon v-else style="color: #f56c6c; font-size: 18px">
+                <Close />
+              </el-icon>
+            </template>
             <template #operation="{ row }">
             <template #operation="{ row }">
               <el-button type="primary" link @click="addArea(row)">
               <el-button type="primary" link @click="addArea(row)">
                 编辑
                 编辑
@@ -174,6 +185,7 @@ import {
 import TableView from '@/components/TableView.vue'
 import TableView from '@/components/TableView.vue'
 import LogList from '@/components/LogList.vue'
 import LogList from '@/components/LogList.vue'
 import AddAreaDialog from './components/addDialog.vue'
 import AddAreaDialog from './components/addDialog.vue'
+import { Check, Close } from '@element-plus/icons-vue'
 
 
 const columns: CustomColumn<SortingList>[] = [
 const columns: CustomColumn<SortingList>[] = [
   {
   {
@@ -184,6 +196,13 @@ const columns: CustomColumn<SortingList>[] = [
     align: 'center',
     align: 'center',
   },
   },
   {
   {
+    key: 'name',
+    prop: 'name',
+    label: '配货区名称',
+    minWidth: 200,
+    align: 'center',
+  },
+  {
     key: 'id',
     key: 'id',
     prop: 'id',
     prop: 'id',
     label: '配货区ID',
     label: '配货区ID',
@@ -229,6 +248,14 @@ const columns: CustomColumn<SortingList>[] = [
     align: 'center',
     align: 'center',
   },
   },
   {
   {
+    key: 'enable',
+    prop: 'enable',
+    label: '启用状态',
+    width: 110,
+    align: 'center',
+    slot: 'enable',
+  },
+  {
     key: 'operation',
     key: 'operation',
     label: '操作',
     label: '操作',
     width: 140,
     width: 140,