feat:优化部分问题

@@ -9,4 +9,6 @@ VITE_APP_BASE_URL = ''
 # 七星分拣管理系统/开发环境
 # VITE_APP_BASE_API = '/api'
 # VITE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
-VITE_APP_BASE_API = 'http://qixing-dws.boosal.com'
+# VITE_APP_BASE_API = 'http://qixing-dws.boosal.com'
+VITE_APP_BASE_API = 'http://192.168.16.22:8082'
+

@@ -9,5 +9,6 @@ VITE_APP_BASE_URL = '/admin/'
 # 七星分拣管理系统/生产环境
 # VITE_APP_BASE_API = '/api'
 VITE_APP_BASE_API = 'http://qixing-dws.boosal.com'
+# VITE_APP_BASE_API = 'http://127.0.0.1'
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
\ No newline at end of file

@@ -41,7 +41,13 @@ export function scanTaskdetal(id) {
   });
 }
 
-
+export function scanResultTypeList(query) {
+  return request({
+    url: "/sorting/queryScanResultType",
+    method: "GET",
+    params: query,
+  });
+}
 
 
 export function deviceTypeQueryList(query) {
@@ -85,6 +91,14 @@ export function editSortingStation(query) {
   });
 }
 
+export function addSortingStation(query) {
+  return request({
+    url: "/sorting",
+    method: "POST",
+    data: query,
+  });
+}
+
 export function editScanSpec(query) {
   return request({
     url: "/scanSpec",

@@ -266,7 +266,7 @@ const columnList = ref([
   {
     label: "序号",
     prop: "id",
-    width: 200,
+    width: 70,
   },
   {
     label: "区县",
@@ -275,35 +275,43 @@ const columnList = ref([
   {
     label: "分中心名称",
     prop: "subName",
+    width: 200,
   },
   {
     label: "营业厅名称",
     prop: "name",
+    width: 300,
   },
   {
     label: "营业厅编号",
     prop: "number",
+    width: 200,
   },
   {
     label: "地址",
     prop: "address",
+    width: 300,
   },
   {
     label: "联系人",
     prop: "contact",
+    width: 100,
   },
   {
     label: "联系电话",
     prop: "contactNumber",
+    width: 100,
+
   },
   {
     label: "备注",
     prop: "remark",
+    width: 200,
   },
-  {
-    label: "正则表达",
-    prop: "regular",
-  },
+  // {
+  //   label: "正则表达",
+  //   prop: "regular",
+  // },
 ]);
 console.log(route);
 const data = reactive({

@@ -35,13 +35,9 @@
         <el-button icon="Refresh" @click="resetQuery">Reset</el-button>
       </el-form-item>
     </el-form>
+    <div class="title">分拣口管理</div>
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          >新建</el-button
-        >
-      </el-col> -->
-      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -55,7 +51,11 @@
         :search="false"
         @queryTable="getList"
       >
-      <div class="title">分拣口管理</div>
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            >新建分检口</el-button
+          >
+        </el-col>
       </right-toolbar>
     </el-row>
 
@@ -71,10 +71,23 @@
         :width="column.width || 'auto'"
       >
         <template #default="scope">
-          <span
-            v-if="column.prop === 'deviceTypeList'"
-          >
-            {{  scope.row[column.prop] ? scope.row[column.prop].map(item => item.deviceTypeName).join(',') : ''}}
+          <span v-if="column.prop === 'deviceTypeList'">
+            {{
+              scope.row[column.prop]
+                ? scope.row[column.prop]
+                    .map((item) => item.deviceTypeName)
+                    .join(",")
+                : ""
+            }}
+          </span>
+          <span v-else-if="column.prop === 'sortingScanResultTypeList'">
+            {{
+              scope.row[column.prop]
+                ? scope.row[column.prop]
+                    .map((item) => item.scanResultTypeName)
+                    .join(",")
+                : ""
+            }}
           </span>
           <span
             v-else-if="column.prop === 'status'"
@@ -127,11 +140,11 @@
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <template #header>
-          <span class="my-header">
-            <div style="text-align: center">{{ title }}</div>
-          </span>
-        </template>
-      <el-form :model="form" :rules="rules" ref="userRef" label-width="120px">
+        <span class="my-header">
+          <div style="text-align: center">{{ title }}</div>
+        </span>
+      </template>
+      <el-form :model="form" :rules="rules" ref="userRef" label-width="140px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="分检口编号" prop="no">
@@ -143,16 +156,45 @@
               <el-input v-model="form.name" placeholder="请输入分检口名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="关联设备类型" prop="deviceTypeIdList">
-              <el-select v-model="form.deviceTypeIdList" placeholder="请选择关联设备类型" multiple>
-                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select
+                v-model="form.deviceTypeIdList"
+                placeholder="请选择关联设备类型"
+                multiple
+              >
+                <el-option
+                  v-for="item in deviceTypeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="关联扫描结果类型" prop="scanResultTypeList">
+              <el-select
+                v-model="form.scanResultTypeList"
+                placeholder="请选择关联扫描结果类型"
+                multiple
+              >
+                <el-option
+                  v-for="item in scanResultTypeOptionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="满袋数量" prop="fullQuantity">
-              <el-input type="number" v-model="form.fullQuantity" placeholder="请输入满袋数量" />
+              <el-input
+                type="number"
+                v-model="form.fullQuantity"
+                placeholder="请输入满袋数量"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -224,10 +266,11 @@ import { getToken } from "@/utils/auth";
 import { onMounted, ref } from "vue";
 import {
   sortingStationQueryList,
-  // addSortingStation,
+  addSortingStation,
   editSortingStation,
   // deleteSortingStation,
-  deviceTypeQueryList
+  deviceTypeQueryList,
+  scanResultTypeList,
 } from "@/api/system/scan";
 import { ElMessageBox } from "element-plus";
 
@@ -242,28 +285,36 @@ const showSearch = ref(true);
 const total = ref(0);
 const dateRange = ref([]);
 const deviceTypeList = ref([]);
+const scanResultTypeOptionList = ref([]);
 
 const columnList = ref([
   {
     label: "分检口编号",
     prop: "no",
-    width: 200,
+    width: 100,
   },
   {
     label: "分检口名称",
-    prop: "name"
+    prop: "name",
+    width: 200,
   },
+  // {
+  //   label: "关联设备类型",
+  //   prop: "deviceTypeList",
+  //   width: 300,
+  // },
   {
-    label: "关联设备类型",
-    prop: "deviceTypeList"
+    label: "关联扫描结果类型",
+    prop: "sortingScanResultTypeList",
+    width: 300,
   },
   {
     label: "满袋数量",
-    prop: "fullQuantity"
+    prop: "fullQuantity",
   },
   {
     label: "备注",
-    prop: "remark"
+    prop: "remark",
   },
 ]);
 console.log(route);
@@ -279,8 +330,15 @@ const data = reactive({
   rules: {
     no: [{ required: true, message: "请输入分检口编号", trigger: "blur" }],
     name: [{ required: true, message: "请输入分检口名称", trigger: "blur" }],
-    deviceTypeIdList: [{ required: true, message: "请选择关联设备类型", trigger: "blur" }],
-    fullQuantity: [{ required: true, message: "请输入满袋数量", trigger: "blur" }],
+    deviceTypeIdList: [
+      { required: true, message: "请选择关联设备类型", trigger: "blur" },
+    ],
+    scanResultTypeList: [
+      { required: true, message: "请选择扫描结果类型", trigger: "blur" },
+    ],
+    fullQuantity: [
+      { required: true, message: "请输入满袋数量", trigger: "blur" },
+    ],
   },
 });
 
@@ -299,11 +357,11 @@ function submitForm() {
           getList();
         });
       } else {
-        // addSortingStation(form.value).then((response) => {
-        //   proxy.$modal.msgSuccess("新建成功！");
-        //   open.value = false;
-        //   getList();
-        // });
+        addSortingStation(form.value).then((response) => {
+          proxy.$modal.msgSuccess("新建成功！");
+          open.value = false;
+          getList();
+        });
       }
     }
   });
@@ -321,7 +379,7 @@ function reset() {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "Add SortingStation";
+  title.value = "新增分检口";
 }
 
 const clickEdit = (row) => {
@@ -329,11 +387,15 @@ const clickEdit = (row) => {
   form.value.id = row.id;
   form.value.no = row.no;
   form.value.name = row.name;
-  form.value.deviceTypeIdList = row.deviceTypeList.map(item => item.deviceTypeId + '');
+  // form.value.deviceTypeIdList = row.deviceTypeList.map(
+  //   (item) => item.deviceTypeId + ""
+  // );
+  form.value.scanResultTypeList = row.sortingScanResultTypeList.map(
+    (item) => item.scanResultType
+  );
   form.value.fullQuantity = row.fullQuantity;
   form.value.remark = row.remark;
 
-
   open.value = true;
   title.value = "编辑分检口";
 };
@@ -365,7 +427,7 @@ const getList = () => {
     proxy.addDateRange(queryParams.value, dateRange.value)
   ).then((res) => {
     loading.value = false;
-    dataList.value = res.data.records
+    dataList.value = res.data.records;
     console.log(res, 111);
     total.value = res.data.total;
   });
@@ -378,7 +440,17 @@ const getDeviceTypeList = () => {
     console.log(res, 111);
     deviceTypeList.value = res.data;
   });
-}
+};
+
+const getScanResultTypeList = () => {
+  scanResultTypeList().then((res) => {
+    console.log(res, 111);
+    scanResultTypeOptionList.value = Object.keys(res.data).map((key) => ({
+      label: res.data[key],
+      value: key,
+    }));
+  });
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -447,7 +519,8 @@ const enterDetail = (row) => {
 
 onMounted(() => {
   getList();
-  getDeviceTypeList()
+  getDeviceTypeList();
+  getScanResultTypeList();
 });
 </script>
 
@@ -456,8 +529,8 @@ onMounted(() => {
   margin: 10px 0 24px;
 }
 
-:deep(.is-disabled ){
-  color: rgb(192, 196, 204)  !important;
+:deep(.is-disabled) {
+  color: rgb(192, 196, 204) !important;
 }
 
 .title {

@@ -120,7 +120,9 @@
               <el-button
                 link
                 type="primary"
-                :disabled="scope.row.status !== 'WAITING'"
+                :disabled="
+                  scope.row.status !== 'WAITING' && scope.row.status !== 'PAUSE'
+                "
                 @click="editTask(scope.row)"
                 >编辑</el-button
               >
@@ -129,7 +131,9 @@
               <el-button
                 link
                 type="primary"
-                :disabled="scope.row.status !== 'PAUSE'"
+                :disabled="
+                  scope.row.status !== 'WAITING' && scope.row.status !== 'PAUSE'
+                "
                 @click="handleStart(scope.row)"
                 >开始</el-button
               >
@@ -138,11 +142,7 @@
               <el-button
                 link
                 type="primary"
-                :disabled="
-                  (scope.row.status !== 'WAITING' &&
-                    scope.row.status == 'ONGOING') ||
-                  scope.row.status == 'PAUSE'
-                "
+                :disabled="scope.row.status !== 'ONGOING'"
                 @click="handlePause(scope.row)"
                 >暂停</el-button
               >
@@ -215,6 +215,7 @@ import { ElMessageBox } from "element-plus";
 import { getToken } from "@/utils/auth";
 import { onMounted, ref } from "vue";
 import { taskList, startTask, pauseTask } from "@/api/system/scan";
+import { formatDate } from "@/utils/index";
 const route = useRoute();
 const router = useRouter();
 
@@ -230,28 +231,32 @@ const columnList = ref([
   {
     label: "任务ID",
     prop: "id",
-    width: 200,
+    width: 70,
   },
   {
     label: "任务名称",
     prop: "name",
+    width: 150,
   },
   {
     label: "对应营业厅",
     prop: "businessName",
-    width: 200,
+    width: 400,
   },
   {
     label: "分拣数量",
-    prop: "completedSpecCount",
+    prop: "totalItemCount",
+    width: 200,
   },
   {
     label: "创建时间",
     prop: "createTime",
+    width: 200,
   },
   {
     label: "状态",
     prop: "status",
+    width: 100,
   },
 ]);
 
@@ -293,7 +298,10 @@ const getList = () => {
   taskList(proxy.addDateRange(queryParams.value, dateRange.value)).then(
     (res) => {
       loading.value = false;
-      dataList.value = res.data.records;
+      dataList.value = res.data.records.map((item) => ({
+        ...item,
+        createTime: formatDate(item.createTime),
+      }));
       console.log(res, 111);
       total.value = res.data.total;
     }
@@ -371,10 +379,10 @@ const enterDetail = (row) => {
 
 const handleStart = (row) => {
   proxy.$modal
-    .confirm("确认重新开始此任务？")
+    .confirm("确认开始此任务？")
     .then(() => {
       startTask(row.id).then((res) => {
-        proxy.$modal.msgSuccess("重新开始成功");
+        proxy.$modal.msgSuccess("开始成功");
         getList();
       });
     })

@@ -24,7 +24,7 @@
         detailData.businessName
       }}</el-descriptions-item>
       <el-descriptions-item label="分拣数量:">{{
-        detailData.totalSpecCount
+        detailData.totalItemCount
       }}</el-descriptions-item>
       <el-descriptions-item label="创建时间:">{{
         detailData.createTime
@@ -141,6 +141,9 @@
           >
             {{ scope.row[column.prop] }}
           </span>
+          <span v-else-if="column.prop === 'id'">
+            {{ scope.row.hideId ? "" : scope.row[column.prop] }}
+          </span>
           <span v-else>{{ scope.row[column.prop] }}</span>
         </template>
       </el-table-column>
@@ -156,7 +159,9 @@
             <el-button
               link
               type="primary"
-              :disabled="scope.row.status !== 'WAITING'"
+              :disabled="
+                scope.row.status !== 'WAITING' && scope.row.status !== 'PAUSE'
+              "
               @click="handleEdit(scope.row)"
               >编辑</el-button
             >
@@ -166,7 +171,9 @@
             <el-button
               link
               type="primary"
-              :disabled="scope.row.status !== 'WAITING'"
+              :disabled="
+                scope.row.status !== 'WAITING' && scope.row.status !== 'PAUSE'
+              "
               @click="handleDelete(scope.row)"
               >删除</el-button
             >
@@ -224,6 +231,7 @@
           <el-col :span="24">
             <el-form-item label="条码" prop="barcode">
               <el-input
+                ref="barcodeRef"
                 v-model="form.barcode"
                 placeholder="请输入条码"
                 @change="handleBarcodeChange"
@@ -232,7 +240,11 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="类型" prop="deviceTypeId">
-              <el-select v-model="form.deviceTypeId" placeholder="请选择类型">
+              <el-select
+                v-model="form.deviceTypeId"
+                placeholder="请选择类型"
+                @change="handleDeviceType"
+              >
                 <el-option
                   v-for="item in deviceTypeList"
                   :key="item.id"
@@ -303,7 +315,8 @@
 
 <script setup>
 import { getToken } from "@/utils/auth";
-import { onMounted, ref } from "vue";
+import { formatDate } from "@/utils/index";
+import { nextTick, onMounted, onUnmounted, ref } from "vue";
 import {
   scanSpecQueryList,
   deviceTypeQueryList,
@@ -328,15 +341,18 @@ const showSearch = ref(true);
 const total = ref(0);
 const dateRange = ref([]);
 
+const barcodeRef = ref();
+
 const columnList = ref([
   {
     label: "序号",
     prop: "id",
-    width: 200,
+    width: 70,
   },
   {
     label: "条码",
     prop: "barcode",
+    width: 300,
   },
   {
     label: "类型",
@@ -403,9 +419,23 @@ const getDeviceTypeList = () => {
   });
 };
 
-const handleBarcodeChange = () => {
+const handleDeviceType = (e) => {
+  if (e) {
+    form.value.deviceTypeName = deviceTypeList.value.find(
+      (item) => item.id == e
+    ).name;
+  } else {
+    form.value.deviceTypeName = undefined;
+  }
+};
+
+const handleBarcodeChange = (e) => {
   form.value.businessName = undefined;
   form.value.businessId = undefined;
+  console.log(e);
+  if (e) {
+    searchBusiness();
+  }
 };
 
 const searchBusiness = () => {
@@ -540,6 +570,11 @@ function handleAdd() {
   reset();
   open.value = true;
   title.value = "扫码录入";
+  nextTick(() => {
+    setTimeout(() => {
+      barcodeRef.value.focus();
+    }, 100);
+  });
 }
 
 // 递归调用接口，直至设备有所返回
@@ -586,6 +621,11 @@ const handleEdit = (row) => {
     form.value.businessName = detailData.value.businessName;
     form.value.businessId = detailData.value.businessId;
   }
+  nextTick(() => {
+    setTimeout(() => {
+      barcodeRef.value.focus();
+    }, 100);
+  });
 };
 
 const goBack = () => {
@@ -664,9 +704,13 @@ const confirmAddTask = () => {
 
 // Query list
 const getList = () => {
-  const localStoreTableData = localStorage.getItem("localStoreTableData")
+  let localStoreTableData = localStorage.getItem("localStoreTableData")
     ? JSON.parse(localStorage.getItem("localStoreTableData"))
     : [];
+  localStoreTableData = localStoreTableData.map((item) => ({
+    ...item,
+    hideId: true,
+  }));
   if (!proxy.$route.query.scanTaskId) {
     loading.value = false;
 
@@ -732,6 +776,7 @@ const getDetail = () => {
   scanTaskdetal(proxy.$route.query.scanTaskId).then((res) => {
     detailData.value = res.data;
     taskForm.value.taskName = detailData.value.name;
+    detailData.value.createTime = formatDate(detailData.value.createTime);
   });
 };
 
@@ -784,6 +829,15 @@ const enterDetail = (row) => {
   });
 };
 
+const handleKeydown = (e) => {
+  if (e.key === "Enter") {
+    e.preventDefault();
+    if (open.value) {
+      searchBusiness();
+    }
+  }
+};
+
 onMounted(() => {
   getList();
   getDeviceTypeList();
@@ -791,6 +845,11 @@ onMounted(() => {
   if (proxy.$route.query.scanTaskId) {
     getDetail();
   }
+  window.addEventListener("keydown", handleKeydown);
+});
+
+onUnmounted(() => {
+  window.removeEventListener("keydown", handleKeydown);
 });
 </script>
 

@@ -11,7 +11,7 @@
         detailData.createTime
       }}</el-descriptions-item>
       <el-descriptions-item label="分拣数量:">{{
-        detailData.totalSpecCount
+        detailData.totalItemCount
       }}</el-descriptions-item>
       <!-- <el-descriptions-item label="营业厅代码:">{{
         route.query.bookingRef
@@ -271,6 +271,8 @@
 
 <script setup>
 import { getToken } from "@/utils/auth";
+import { formatDate } from "@/utils/index";
+
 import { onMounted, ref } from "vue";
 import { addScanOrder, scanTaskdetal,  scanTaskQueryList, } from "@/api/system/scan";
 
@@ -288,43 +290,52 @@ const columnList = ref([
   {
     label: "设备类型",
     prop: "deviceTypeName",
-    width: 200,
+    width: 100,
   },
   {
     label: "规格型号",
     prop: "model",
+    width: 150,
   },
   {
     label: "串码",
     prop: "barcode",
+    width: 150,
   },
   {
     label: "重量",
     prop: "weight",
+    width: 150,
   },
   {
     label: "状态",
     prop: "status",
+    width: 150,
   },
   {
     label: "分拣时间",
     prop: "scanTime",
+    width: 150,
   },
   {
     label: "分拣结果",
     prop: "scanResult",
+    width: 150
   },
   {
     label: "备注",
     prop: "remark",
+    width: 150
   },
   {
     label: "分拣人",
     prop: "scanBy",
+    width: 150,
   },
   {
     label: "袋码",
     prop: "sortingNo",
+    width: 150
   },
 ]);
 
@@ -427,7 +438,10 @@ const getList = () => {
   scanTaskQueryList(proxy.addDateRange(queryParams.value, dateRange.value)).then(
     (res) => {
       loading.value = false;
-      dataList.value = res.data.records
+      dataList.value = res.data.records.map(item => ({
+        ...item,
+        scanTime:formatDate(item.scanTime)
+      }))
       total.value = res.data.total;
     }
   );
@@ -501,6 +515,7 @@ const detailData = ref({});
 const getDetail = () => {
   scanTaskdetal(proxy.$route.query.scanTaskId).then((res) => {
     detailData.value = res.data;
+    detailData.value.createTime = formatDate(detailData.value.createTime)
   });
 };