From 3c372b6c53e2091fbed2bde69fda8df382e10cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 12 Mar 2025 17:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bydlms/BydWorkorder.vue | 32 +++++++++++++++----------------
 src/views/login.vue               | 20 +++++++++----------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/views/bydlms/BydWorkorder.vue b/src/views/bydlms/BydWorkorder.vue
index 6b158fa..def29c8 100644
--- a/src/views/bydlms/BydWorkorder.vue
+++ b/src/views/bydlms/BydWorkorder.vue
@@ -57,7 +57,6 @@
           <dict-tag :options="options.orderStatusOptions" :value="scope.row.orderStatus" />
         </template>
       </el-table-column>
-
       <el-table-column prop="scheduleCode" label="排程编码" align="center" v-if="columns.showColumn('scheduleCode')" />
       <el-table-column prop="scheduleQty" label="排程数量" align="center" v-if="columns.showColumn('scheduleQty')" />
       <el-table-column prop="scheduleStatus" label="排程状态" align="center" v-if="columns.showColumn('scheduleStatus')">
@@ -117,7 +116,10 @@
 
           <el-col :lg="12">
             <el-form-item label="产线编码" prop="lineCode">
-              <el-input v-model="form.lineCode" placeholder="请输入产线编码" />
+              <el-select v-model="form.lineCode">
+                <el-option v-for="item in lineOptions" :key="item.key" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -135,9 +137,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-
-
           <el-col :lg="12">
             <el-form-item label="⼯单编号" prop="orderCode">
               <el-input v-model="form.orderCode" placeholder="请输入⼯单编号" />
@@ -177,29 +176,21 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-
           <el-col :lg="12">
             <el-form-item label="优先级" prop="priority">
               <el-input v-model.number="form.priority" placeholder="请输入优先级" />
             </el-form-item>
           </el-col>
-
           <el-col :lg="12">
             <el-form-item label="排程编码" prop="scheduleCode">
               <el-input v-model="form.scheduleCode" placeholder="请输入排程编码" />
             </el-form-item>
           </el-col>
-
           <el-col :lg="12">
             <el-form-item label="排程数量" prop="scheduleQty">
               <el-input v-model="form.scheduleQty" placeholder="请输入排程数量" />
             </el-form-item>
           </el-col>
-
-
-
-
-
           <el-col :lg="12">
             <el-form-item label="排程状态" prop="scheduleStatus">
               <el-radio-group v-model="form.scheduleStatus">
@@ -209,9 +200,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-
-
-
           <el-col :lg="12">
             <el-form-item label="计划开始时间" prop="orderStartTime">
               <el-input v-model="form.orderStartTime" placeholder="请输入计划开始时间" />
@@ -376,7 +364,17 @@ const state = reactive({
   },
   options: {
     // ⼯单类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-    orderTypeOptions: []
+    orderTypeOptions: [],
+    // 排程状态（0：新建，1、下达，2、开线，3、⽣ 产、4、暂停、5、取消、6、完成、）
+    scheduleStatusOptions: [
+      { dictLabel: '新建', dictValue: '0' },
+      { dictLabel: '下达', dictValue: '1' },
+      { dictLabel: '开线', dictValue: '2' },
+      { dictLabel: '⽣产', dictValue: '3' },
+      { dictLabel: '暂停', dictValue: '4' },
+      { dictLabel: '取消', dictValue: '5' },
+      { dictLabel: '完成', dictValue: '6' },
+    ]
   }
 })
 
diff --git a/src/views/login.vue b/src/views/login.vue
index 4d4f7a2..66821e0 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -23,20 +23,16 @@
           </el-input>
         </el-form-item>
         <el-form-item prop="password">
-          <el-input
-            v-model="loginForm.password"
-            show-password
-            type="password"
-            auto-complete="off"
-            :placeholder="$t('login.password')"
-            @keyup.enter="handleLogin">
+          <el-input v-model="loginForm.password" show-password type="password" auto-complete="off"
+            :placeholder="$t('login.password')" @keyup.enter="handleLogin">
             <template #prefix>
               <svg-icon name="password" class="input-icon" />
             </template>
           </el-input>
         </el-form-item>
         <el-form-item prop="code" v-if="captchaOnOff != 'off'">
-          <el-input v-model="loginForm.code" auto-complete="off" :placeholder="$t('login.captcha')" style="width: 63%" @keyup.enter="handleLogin">
+          <el-input v-model="loginForm.code" auto-complete="off" :placeholder="$t('login.captcha')" style="width: 63%"
+            @keyup.enter="handleLogin">
             <template #prefix>
               <svg-icon name="validCode" class="input-icon" />
             </template>
@@ -47,7 +43,8 @@
         </el-form-item>
 
         <el-form-item style="width: 100%" :style="{ 'margin-top': captchaOnOff == 'off' ? '40px' : '' }">
-          <el-button :loading="loading" size="default" round type="primary" style="width: 100%" @click.prevent="handleLogin">
+          <el-button :loading="loading" size="default" round type="primary" style="width: 100%"
+            @click.prevent="handleLogin">
             <span v-if="!loading">{{ $t('login.btnLogin') }}</span>
             <span v-else>登 录 中...</span>
           </el-button>
@@ -114,7 +111,7 @@ const loginType = computed({
 const codeUrl = ref('')
 const loading = ref(false)
 // 验证码开关
-const captchaOnOff = ref('')
+const captchaOnOff = ref('off')
 // 注册开关
 const register = ref(false)
 const redirect = ref()
@@ -177,6 +174,7 @@ function handleLogin() {
 }
 
 function getCode() {
+  return
   getCodeImg().then((res) => {
     codeUrl.value = 'data:image/gif;base64,' + res.data.img
     loginForm.value.uuid = res.data.uuid
@@ -229,6 +227,7 @@ getCookie()
 
 <style lang="scss" scoped>
 @import '@/assets/styles/login.scss';
+
 .forget-pwd {
   color: #ccc;
   margin-left: 10px;
@@ -236,6 +235,7 @@ getCookie()
   border-left: 1px solid;
   padding-left: 10px;
 }
+
 .qrCode {
   width: 160px;
   height: 160px;