Kaynağa Gözat

feature/首页参数优化

dy 1 yıl önce
ebeveyn
işleme
dae52b6a68

+ 1 - 1
src/api/auth/index.ts

@@ -15,7 +15,7 @@ export function loginApi(data: LoginData): AxiosPromise<LoginResult> {
   // formData.append("captchaKey", data.captchaKey || "");
   // formData.append("captchaCode", data.captchaCode || "");
   return request({
-    url: "/api/auth/backLogin",
+    url: "/api/auth/aioLogin",
     method: "post",
     data: data,
     // headers: {

+ 6 - 2
src/components/ScanCodeInput/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-input v-model="scanCode" placeholder="Please input" class="scanInput">
+  <el-input v-model="scanCode" placeholder="Please input" class="scanInput" @change="enter">
     <template #prefix>
       <img src="@/assets/icons/shaoma.svg" />
     </template>
@@ -14,11 +14,15 @@ const props = defineProps({
     type: String,
   },
 });
-const emit = defineEmits(["setinputvalue"]);
+const emit = defineEmits(["setinputvalue", "enterfnc"]);
 const scanCode = ref("");
+const enter = () => {
+  emit("enterfnc");
+};
 onMounted(() => {
   scanCode.value = props.inputValue;
 });
+
 watch(scanCode, (newVal) => {
   emit("setinputvalue", newVal);
 });

+ 2 - 7
src/views/process/components/order.vue

@@ -8,13 +8,11 @@
         <span class="msgValue">{{ item.materialModel }}</span>
       </div>
       <div class="productMsg">
-        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'">计划编号</span>
+        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'">工单编号</span>
         <span class="msgValue">{{ item.workOrderCode }}</span>
       </div>
       <div class="productMsg">
-        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'">
-          订单编号
-        </span>
+        <span :class="hoverStatus ? 'msgName msgNameHover' : 'msgName'">计划编号</span>
         <span class="msgValue">{{ item.orderCode }}</span>
       </div>
     </div>
@@ -44,10 +42,7 @@
 
 <script lang="ts" setup>
 import { reactive, ref } from "vue";
-import { useProcessStore } from "@/store";
 
-const store = useProcessStore();
-const router = useRouter();
 defineProps<{
   hoverStatus?: boolean;
   item: object;

+ 10 - 2
src/views/process/components/scanCode.vue

@@ -2,16 +2,24 @@
   <!-- 扫码板块 -->
   <div class="commonTitle">扫码</div>
   <div class="icon">
-    <img class="imgIcon" src="@/assets/icons/shaoma.svg" />
+    <img class="imgIcon" src="@/assets/icons/shaoma.svg" @click="toProSteps" />
   </div>
   <div class="body">
-    <ScanCodeInput :inputValue="inputValue" @setinputvalue="setInputValue" />
+    <ScanCodeInput :inputValue="inputValue" @setinputvalue="setInputValue" @enterfnc="toProSteps" />
   </div>
 </template>
 
 <script lang="ts" setup>
 import ScanCodeInput from "@/components/ScanCodeInput/index.vue";
+import { useProcessStore } from "@/store";
+
+const store = useProcessStore();
+const router = useRouter();
 const inputValue = ref("12020100000052404100011");
+const toProSteps = () => {
+  //判定是否选择了未完成订单以及工序
+  router.push({ path: "/pro-steps" });
+};
 const setInputValue = (value: any) => {
   inputValue.value = value;
 };

+ 1 - 0
src/views/process/components/steps.vue

@@ -43,6 +43,7 @@ defineProps<{
 }>();
 const emit = defineEmits(["setstepindex"]);
 const boxClick = (item, index) => {
+  //第二层参数赋值
   store.odersData.operationId = item.operationId;
   store.processInfo.operationCode = item.operationCode;
   store.processInfo.operationName = item.operationName;

+ 3 - 5
src/views/process/currentProduction.vue

@@ -1,8 +1,7 @@
 <template>
-  <!-- 包含当前订单 操作扫码板块 -->
   <div class="setFlex">
     <el-row :gutter="20">
-      <el-col :span="12" class="elColClasss" style="height: 310px" @click="click">
+      <el-col :span="12" class="elColClasss" style="height: 310px" @click="setOdersData">
         <CurrentOrderInfo />
       </el-col>
       <el-col :span="12" class="elColClasss" style="height: 310px">
@@ -20,10 +19,9 @@ import { useProcessStore } from "@/store";
 
 const store = useProcessStore();
 const router = useRouter();
-const orderData = { name: 2, id: 44 };
-const click = (itemValue) => {
+const orderData = {};
+const setOdersData = () => {
   store.setOdersData(orderData);
-  router.push({ path: "/pro-steps" });
 };
 </script>
 

+ 1 - 2
src/views/process/orders.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- 待完成板块 -->
   <div class="commonTitle">待完成订单[{{ ordersSum }}]</div>
   <el-scrollbar class="barHeight">
     <Order v-for="(item, index) in ordersDataArray" :key="index" @click="setSlectIndex(index)"
@@ -17,7 +16,7 @@ defineProps<{
 }>();
 const emit = defineEmits(["getindex"]);
 const ordersDataArray = inject("ordersDataArray");
-const selectIndex = ref(NaN);
+const selectIndex = ref(0);
 const setSlectIndex = (value: number) => {
   selectIndex.value = value;
   //状态设置参数