优化

src/pinia/modules/user.js

@@ -119,8 +119,15 @@ const getMachineMaclist = async (macAddress) => {
   try {
     console.log("Fetching MAC details for:", macAddress);
     const response = await getMachineMac({ sys_sbID: macAddress });
-console.log(response)
-
+	console.log(response)
+	
+	// 直接返回，避免处理未登录或非法访问的提示
+    if (response.code === 7) {
+      console.warn("未登录或非法访问，已忽略该提示");
+      return; // 如果是 code7, 直接返回，不执行后续逻辑
+    }
+	
+	
     if (response?.data?.机台号) {
       Machine.value = response.data.机台号;
       console.log("获取到的机台号:", Machine.value);

src/view/dashboard/dashboardTable/dashboardTable.vue

@@ -1,119 +1,7 @@
 <template>
-  <div class="commit-table">
-    <div class="commit-table-title">
-      质量投诉
-    </div>
-    <div class="log">
-      <div
-        v-for="(item, index) in dataTimeline"
-        :key="index"
-        class="log-item"
-      >
-        <div class="flex-1 flex key-box">
-          <span
-            class="key"
-            :class="index < 3 && 'top'"
-          >{{ index + 1 }}</span>
-        </div>
-        <div class="flex-5 flex message">{{ item.客诉描述 }}</div>
-        <div class="flex-3 flex form">{{ item.日期 }}</div>
-      </div>
-    </div>
-  </div>
+  
 </template>
 
-<script setup>
-import { ref } from 'vue'
-import {
- index
-} from '@/api/jixiaoguanli/jitairibaobiao'
 
-const dataTimeline = ref([])
 
-const getindex = async () => {
-   
-	// // 模拟接口返回的数据
-	// const responseData = await index();
-	// console.log(responseData)
-	
-	// // 提取客诉数据
-	// const customerData = responseData.data.customer
-	// customerData.forEach((item, index) => {
-	//   dataTimeline.value.push({
-	//     客诉描述: item['客诉描述'],
-	//     日期: item['日期']
-	//   })
-	// })
-}
-getindex()
 
-
-</script>
-
-
-<style lang="scss" scoped>
-.commit-table{
-    background-color: #fff;
-    height: 400px;
-	margin-right: 3000px;
-	width:150%;	
-    &-title{
-        font-weight: 900;
-        margin-bottom: 10px;
-    }
-    .log{
-      &-item{
-        display: flex;
-        justify-content: space-between;
-        margin-top: 10px;
-		width: 80%;
-        .key-box{
-          justify-content: center;
-        }
-        .key{
-          &.top{
-            background: #314659;
-            color: #FFFFFF;;
-          }
-          display: inline-flex;
-          justify-content: center;
-          align-items: center;
-          width: 20px;
-          height: 20px;
-          border-radius: 50%;
-          background: #F0F2F5;
-          text-align: center;
-          color:rgba($color: #000000, $alpha: 0.65)
-        }
-        .message{
-          color: rgba(0, 0, 0, 0.65);
-        }
-        .form{
-          color: rgba(0, 0, 0, 0.65);
-          margin-left: 12px;
-        }
-        .flex{
-          line-height: 20px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-        .flex-1{
-          flex:1;
-        }
-        .flex-2{
-          flex:2;
-        }
-        .flex-3{
-          flex:3;
-        }
-        .flex-4{
-          flex:4;
-        }
-        .flex-5{
-          flex:5;
-        }
-      }
-    }
-}
-</style>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -289,7 +289,7 @@
                   </el-col>  
                   <el-col :span="10">  
                     <el-form-item label="制单日期" prop="deliveryDate" class="mab" label-width="150">
-                      <el-date-picker v-model="edit_ddformData['接单日期']" type="date"  style="width: 150px;"  id="制单日期"  @keydown="add_gdzlent($event, '制单人', '制单日期', '审核人')"/>
+                      <el-date-picker v-model="edit_ddformData['接单日期']"  type="date"  style="width: 150px;"  id="制单日期"  @keydown="add_gdzlent($event, '制单人', '制单日期', '审核人')"/>
                     </el-form-item>
                   </el-col>  
                 </el-row>  
@@ -405,118 +405,199 @@
 			</el-dialog>
 			
 			<!-- 新增订单资料弹窗 -->
-            <el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog"  style="width: 60%; height: 55%;margin-top: 4%" :title="'新增订单资料'" destroy-on-close>
-                <el-row :gutter="24" class="form-row">  
-                  <el-col :span="10">  
-                    <el-form-item label="订单编号" label-width="110px">  
-                      <el-input v-model="add_gdscgdformData.订单编号" disabled style="width: 150px"/>  
-                    </el-form-item>  
-                  </el-col>  
-                  <el-col :span="10">  
-                    <el-form-item label="客户编号" label-width="150px">  
-                      <el-input v-model="add_gdscgdformData.客户编号" disabled style="width: 150px"/>  
-                    </el-form-item>  
-                  </el-col>  
-                </el-row>  
-
-                <el-row :gutter="24" class="form-row">  
-                  <el-col :span="10">  
-                    <el-form-item label="生产款号" prop="customerCode" class="mab" label-width="110">
-                      <el-input v-model="add_gdscgdformData['生产款号']" style="width: 150px;" id="生产款号"  @keydown="add_gdzlent($event, '订单编号', '生产款号', '款式')"/>
-                    </el-form-item>
-                  </el-col>  
-                </el-row>  
-
-                <el-row :gutter="24" class="form-row">  
-                  <el-col :span="10">  
-                    <el-form-item label="款式" prop="customerCode" class="mab" label-width="110">
-                      <el-input v-model="add_gdscgdformData['款式']" style="width: 150px;" id="款式"  @keydown="add_gdzlent($event, '生产款号', '款式', '客户编号')"/>
-                    </el-form-item> 
-                  </el-col>  
-                  <el-col :span="10">  
-                    <el-form-item label="落货日期" prop="deliveryDate" class="mab" label-width="150">
-                      <el-date-picker v-model="add_gdscgdformData['落货日期']" type="date"  style="width: 150px;"  id="落货日期"  @keydown="add_gdzlent($event, '客户编号', '落货日期', '面料')"/>
-                    </el-form-item>
-                  </el-col>  
-                </el-row>  
-
-                <el-row  class="form-row">  
-                  <el-col :span="20">  
-                    <el-form-item label="面料" prop="customerCode" class="mab" label-width="110">
-                        <el-input type="textarea" v-model="add_gdscgdformData['面料']" rows="2" resize="none" id="面料"   @keydown="add_gdzlent($event, '落货日期', '面料', '要求')" />
-                      </el-form-item>
-                  </el-col>  
-                </el-row>
-
-                <el-row class="form-row">  
-                  <el-col :span="20">  
-                    <el-form-item label="要求" prop="customerCode" class="mab" label-width="110">
-                        <el-input type="textarea" v-model="add_gdscgdformData['要求']" rows="2" resize="none" id="要求"  @keydown="add_gdzlent($event, '面料', '要求', '船样描述')" />
-                      </el-form-item>
-                  </el-col>  
-                </el-row>
-
-                <el-row :gutter="24" class="form-row">  
-                  <el-col :span="10">  
-                    <el-form-item label="船样描述" prop="customerCode" class="mab" label-width="110">
-                      <el-input v-model="add_gdscgdformData['船样描述']"  style="width: 150px;" id="船样描述"  @keydown="add_gdzlent($event, '要求', '船样描述', '船样合计')"/>
-                    </el-form-item>
-                  </el-col>  
-                  <el-col :span="10">  
-                    <el-form-item label="船样合计" prop="customerCode" class="mab" label-width="150">
-                      <el-input v-model="add_gdscgdformData['船样合计']"  style="width: 150px;" id="船样合计"  @keydown="add_gdzlent($event, '船样描述', '船样合计', '箱唛要求')"/>
-                    </el-form-item>
-                  </el-col>  
-                </el-row>  
-
-                <el-row :gutter="24" class="form-row">  
-                  <el-col :span="10">  
-                    <el-form-item label="箱唛要求" prop="customerCode" class="mab" label-width="110">
-                      <el-input v-model="add_gdscgdformData['箱唛要求']" style="width: 150px;" id="箱唛要求"  @keydown="add_gdzlent($event, '船样合计', '箱唛要求', '粘衬')"/>
-                    </el-form-item>
-                  </el-col>  
-                  <el-col :span="10">  
-                    <el-form-item label="粘衬" prop="customerCode" class="mab" label-width="150">
-                      <el-input v-model="add_gdscgdformData['粘衬']"  style="width: 150px;" id="粘衬"  @keydown="add_gdzlent($event, '箱唛要求', '粘衬', '订单数量')"/>
-                    </el-form-item>
-                  </el-col>  
-                </el-row>  
-
-                <el-row :gutter="24" class="form-row">  
-                  <el-col :span="10">  
-                    <el-form-item label="订单数量" prop="customerCode" class="mab" label-width="110">
-                      <el-input v-model="add_gdscgdformData['订单数量']"  style="width: 150px;" id="订单数量"  @keydown="add_gdzlent($event, '粘衬', '订单数量', '单位')"/>
-                    </el-form-item>
-                  </el-col>  
-                  <el-col :span="10">  
-                    <el-form-item label="单位" prop="customerCode" class="mab" label-width="150">
-                      <el-input v-model="add_gdscgdformData['单位']"  style="width: 150px;" id="单位"  @keydown="add_gdzlent($event, '订单数量', '单位', '制单人')"/>
-                    </el-form-item>
-                  </el-col>  
-                </el-row>  
-                
-                <el-row :gutter="24" class="form-row">  
-                  <el-col :span="10">  
-                    <el-form-item label="制单人" prop="customerCode" class="mab" label-width="110">
-                      <el-input v-model="add_gdscgdformData['制单人']" disabled style="width: 150px;" id="制单人"  @keydown="add_gdzlent($event, '单位', '制单人', '制单日期')"/>
-                    </el-form-item>
-                  </el-col>  
-                  <el-col :span="10">  
-                    <el-form-item label="制单日期" prop="deliveryDate" class="mab" label-width="150">
-                      <el-date-picker v-model="add_gdscgdformData['制单日期']" type="date"  style="width: 150px;"  id="制单日期"  @keydown="add_gdzlent($event, '制单人', '制单日期', '审核人')"/>
-                    </el-form-item>
-                  </el-col>  
-                </el-row>  
-                               
-               
-              
+            <el-dialog 
+              v-model="add_gddialogFormVisible" 
+              :before-close="add_gdcloseDialog"  
+              :title="'新增订单资料'" 
+              width="60%"
+              top="4%"
+              destroy-on-close
+            >
+              <el-row :gutter="24" class="form-row">  
+                <el-col :span="12">  
+                  <el-form-item label="订单编号" label-width="110px">  
+                    <el-input v-model="add_gdscgdformData.订单编号" disabled style="width: 100%;"/>  
+                  </el-form-item>  
+                </el-col>  
+                <el-col :span="12">  
+                  <el-form-item label="客户编号" label-width="110px">  
+                    <el-input v-model="add_gdscgdformData.客户编号" disabled style="width: 100%;"/>  
+                  </el-form-item>  
+                </el-col>  
+              </el-row>  
+            
+              <el-row :gutter="24" class="form-row">  
+                <el-col :span="12">  
+                  <el-form-item label="生产款号" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['生产款号']" 
+                      style="width: 100%;" 
+                      id="生产款号"  
+                      @keydown="add_gdzlent($event, '订单编号', '生产款号', '款式')"
+                    />
+                  </el-form-item>
+                </el-col>  
+              </el-row>  
+            
+              <el-row :gutter="24" class="form-row">  
+                <el-col :span="12">  
+                  <el-form-item label="款式" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['款式']" 
+                      style="width: 100%;" 
+                      id="款式"  
+                      @keydown="add_gdzlent($event, '生产款号', '款式', '客户编号')"
+                    />
+                  </el-form-item> 
+                </el-col>  
+                <el-col :span="12">  
+                  <el-form-item label="落货日期" label-width="110px">
+                    <el-date-picker 
+                      v-model="add_gdscgdformData['落货日期']" 
+                      type="date"  
+                      style="width: 100%;"  
+                      id="落货日期"  
+                      @keydown="add_gdzlent($event, '客户编号', '落货日期', '面料')"
+                    />
+                  </el-form-item>
+                </el-col>  
+              </el-row>  
+            
+              <el-row class="form-row">  
+                <el-col :span="24">  
+                  <el-form-item label="面料" label-width="110px">
+                    <el-input 
+                      type="textarea" 
+                      v-model="add_gdscgdformData['面料']" 
+                      rows="2" 
+                      resize="none" 
+                      style="width: 100%;"  
+                      id="面料"   
+                      @keydown="add_gdzlent($event, '落货日期', '面料', '要求')"
+                    />
+                  </el-form-item>
+                </el-col>  
+              </el-row>
+            
+              <el-row class="form-row">  
+                <el-col :span="24">  
+                  <el-form-item label="要求" label-width="110px">
+                    <el-input 
+                      type="textarea" 
+                      v-model="add_gdscgdformData['要求']" 
+                      rows="2" 
+                      resize="none" 
+                      style="width: 100%;" 
+                      id="要求"  
+                      @keydown="add_gdzlent($event, '面料', '要求', '船样描述')"
+                    />
+                  </el-form-item>
+                </el-col>  
+              </el-row>
+            
+              <el-row :gutter="24" class="form-row">  
+                <el-col :span="12">  
+                  <el-form-item label="船样描述" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['船样描述']"  
+                      style="width: 100%;" 
+                      id="船样描述"  
+                      @keydown="add_gdzlent($event, '要求', '船样描述', '船样合计')"
+                    />
+                  </el-form-item>
+                </el-col>  
+                <el-col :span="12">  
+                  <el-form-item label="船样合计" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['船样合计']"  
+                      style="width: 100%;" 
+                      id="船样合计"  
+                      @keydown="add_gdzlent($event, '船样描述', '船样合计', '箱唛要求')"
+                    />
+                  </el-form-item>
+                </el-col>  
+              </el-row>  
+            
+              <el-row :gutter="24" class="form-row">  
+                <el-col :span="12">  
+                  <el-form-item label="箱唛要求" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['箱唛要求']" 
+                      style="width: 100%;" 
+                      id="箱唛要求"  
+                      @keydown="add_gdzlent($event, '船样合计', '箱唛要求', '粘衬')"
+                    />
+                  </el-form-item>
+                </el-col>  
+                <el-col :span="12">  
+                  <el-form-item label="粘衬" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['粘衬']"  
+                      style="width: 100%;" 
+                      id="粘衬"  
+                      @keydown="add_gdzlent($event, '箱唛要求', '粘衬', '订单数量')"
+                    />
+                  </el-form-item>
+                </el-col>  
+              </el-row>  
+            
+              <el-row :gutter="24" class="form-row">  
+                <el-col :span="12">  
+                  <el-form-item label="订单数量" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['订单数量']"  
+                      style="width: 100%;" 
+                      id="订单数量"  
+                      @keydown="add_gdzlent($event, '粘衬', '订单数量', '单位')"
+                    />
+                  </el-form-item>
+                </el-col>  
+                <el-col :span="12">  
+                  <el-form-item label="单位" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['单位']"  
+                      style="width: 100%;" 
+                      id="单位"  
+                      @keydown="add_gdzlent($event, '订单数量', '单位', '制单人')"
+                    />
+                  </el-form-item>
+                </el-col>  
+              </el-row>  
+            
+              <el-row :gutter="24" class="form-row">  
+                <el-col :span="12">  
+                  <el-form-item label="制单人" label-width="110px">
+                    <el-input 
+                      v-model="add_gdscgdformData['制单人']" 
+                      disabled 
+                      style="width: 100%;" 
+                      id="制单人"  
+                      @keydown="add_gdzlent($event, '单位', '制单人', '制单日期')"
+                    />
+                  </el-form-item>
+                </el-col>  
+                <el-col :span="12">  
+                  <el-form-item label="制单日期" label-width="110px">
+                    <el-date-picker 
+                      v-model="add_gdscgdformData['制单日期']" 
+					  disabled
+                      type="date"  
+                      style="width: 100%;"  
+                      id="制单日期"  
+                      @keydown="add_gdzlent($event, '制单人', '制单日期', '审核人')"
+                    />
+                  </el-form-item>
+                </el-col>  
+              </el-row>
+            
               <template #footer>
                 <div class="dialog-footer" style="text-align: right;">
                   <el-button @click="add_gdcloseDialog">取 消</el-button>
-                  <el-button type="primary"  @click="add_gdenterDialog">确 定</el-button>
+                  <el-button type="primary" @click="add_gdenterDialog">确 定</el-button>
                 </div>
               </template>
             </el-dialog>
+
             
         <!-- 新增颜色资料 -->
 			<el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog"