From 2c91419e04830b5482fcade94a758e1e221930b0 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Mon, 23 Oct 2023 17:01:29 +0800
Subject: [PATCH] update

---
 src/layouts/footer/PageFooter.vue             |  3 +
 .../MoldProductionOrder/ComponentDetail.vue   | 72 +++++++++----------
 src/pages/login/Login.vue                     |  8 +--
 3 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/layouts/footer/PageFooter.vue b/src/layouts/footer/PageFooter.vue
index 5e2edb3..42a3b9e 100644
--- a/src/layouts/footer/PageFooter.vue
+++ b/src/layouts/footer/PageFooter.vue
@@ -17,6 +17,9 @@ export default {
       Project: [],
     }
   },
+  
+  loading() { // 页面正在加载中
+  },
   created() { // 页面创建完成
   },
   
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
index b7c2962..028974a 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
@@ -5,10 +5,23 @@
     <vxe-table border show-overflow keep-source ref="xTable" :data="detailsData" @pulldownSelected="onPulldownSelected"
       @popupSelected="onPopupSelected" :export-config="{}" @edit-closed="afterEditEvent" @edit-actived="beforeEditEvent"
       :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: beforeEditMethod }">
+      <vxe-column title="图片" width="110" align="center">
+        <template #default="{ row }">
+          <img v-if="row.component_img" style="width:50px;height:50px;" :src="row.component_img"
+            @click.stop="$hevueImgPreview(row.component_img)" />
+          <span v-else>
+            <a-upload name="file" accept="image/*" :before-upload="beforeUpload" :show-upload-list="false">
+              <a-button type="link" @click="uploadClick({ row })">上传图片</a-button>
+            </a-upload>
 
-      <vxe-column field="component_num" title="部件数量" width="160"
+          </span>
+
+        </template>
+      </vxe-column>
+
+      <vxe-column field="component_num" title="数量" width="80" align="center"
         :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
-      <vxe-column field="production_type" title="布产类型" width="160" :edit-render="{}">
+      <vxe-column field="production_type" title="布产类型" width="100" align="center" :edit-render="{}">
         <template #default="{ row }">
           <span>{{ $mk.formatEnum(row.production_type, options_production_type) }}</span>
         </template>
@@ -24,13 +37,13 @@
         formatter="formatRef" :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
 
 
-      <vxe-column field="prepare_process_time" title="预备加工日期" width="160" formatter="formatDate"
+      <vxe-column field="prepare_process_time" title="预备加工日期" width="130" formatter="formatDate" align="center"
         :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
-      <vxe-column field="plan_complete_time" title="计划完成日期" width="160" formatter="formatDate"
+      <vxe-column field="plan_complete_time" title="计划完成日期" width="130" formatter="formatDate" align="center"
         :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
 
 
-      <vxe-column title="完成" width="160" v-if="getDataId()">
+      <vxe-column title="完成" width="160"   align="center" v-if="getDataId()">
         <template #default="{ row }">
           <div v-if="row.id">
             <div v-if="row.complete_time">{{ $mk.getDateString(row.complete_time) }}</div>
@@ -42,28 +55,15 @@
 
 
 
-      <vxe-column field="complete_type" v-if="getDataId() && isDetails1Complete()" title="完工人员类型" width="160"
-        :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
+      <!-- <vxe-column field="complete_type" v-if="getDataId() && isDetails1Complete()" title="完工人员类型" width="160"
+        :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column> -->
 
 
-      <vxe-column field="spec" title="规格" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
-      <vxe-column field="surface" title="表面工艺" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
-      <vxe-column field="inlay" title="镶件材料" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
+      <vxe-column field="spec" title="规格"   align="center" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
+      <vxe-column field="surface" title="表面工艺"  align="center" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
+      <vxe-column field="inlay" title="镶件材料"  align="center" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
-      <vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
-      <vxe-column title="图片" width="90">
-        <template #default="{ row }">
-          <img v-if="row.component_img" style="width:50px;height:50px;" :src="row.component_img"
-            @click.stop="$hevueImgPreview(row.component_img)" />
-          <span v-else>
-            <a-upload name="file" accept="image/*" :before-upload="beforeUpload" :show-upload-list="false">
-              <a-button type="link" @click="uploadClick({ row })">上传图片</a-button>
-            </a-upload>
-
-          </span>
-
-        </template>
-      </vxe-column>
+      <vxe-column field="remark" title="备注"  align="center" width="auto" :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
 
 
@@ -85,9 +85,9 @@
           </div>
         </template>
       </vxe-column>
-      <vxe-column field="process_detail" title="工序" width="160" :params="editor_processes" formatter="formatRef"
+      <vxe-column field="process_detail" title="工序" width="130" :params="editor_processes" formatter="formatRef"
         :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
-      <vxe-column field="department_detail" title="部门" width="160" :params="editor_department" formatter="formatRef"
+      <vxe-column field="department_detail" title="部门" width="120" :params="editor_department" formatter="formatRef"
         :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
       <vxe-column field="progress" title="进度" width="160" :cellRender="{ name: 'progress' }"></vxe-column>
 
@@ -99,9 +99,9 @@
 
       <vxe-column field="progress" v-if="isEdit" :cellRender="{ name: 'progress' }" title="进度" width="180"></vxe-column>
 
-      <vxe-column field="prepare_process_time" title="预备加工日期" width="160" formatter="formatDate"
+      <vxe-column field="prepare_process_time" title="预备加工日期" width="130" formatter="formatDate" align="center"
         :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
-      <vxe-column field="plan_complete_time" title="计划完成日期" width="160" formatter="formatDate"
+      <vxe-column field="plan_complete_time" title="计划完成日期" width="130" formatter="formatDate" align="center"
         :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
 
 
@@ -130,13 +130,13 @@
         </template>
       </vxe-column>
 
-      <vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员类型" width="160"
+      <vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员" width="80" align="center"
         :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
 
 
-      <vxe-column field="complete_type" v-if="getDataId() && readonly" title="完工人员类型" width="160"
+      <vxe-column field="complete_type" v-if="getDataId() && readonly" title="完工人员" width="80" align="center"
         :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
-      <vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
+      <vxe-column field="remark" title="备注" width="auto" :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
 
     </vxe-table>
@@ -680,16 +680,16 @@ export default {
     beforeUpload(file) {
 
       var suffix = file.name.substring(file.name.lastIndexOf(".") + 1);
-      this.$mk.uploadFile(file, suffix, (url) => { 
-        this.currentRow.component_img = url; 
-        this.$forceUpdate(); 
+      this.$mk.uploadFile(file, suffix, (url) => {
+        this.currentRow.component_img = url;
+        this.$forceUpdate();
         if (this.currentRow.id) {
           this.$mk.post({
             url: `${BASE_URL.BASE_URL}/MoldProductionOrder/v1/mold/production/order/upload`,
             data: { id: this.currentRow.id, image: url },
             useBigInt: true
-          }).then(a => { 
-            console.log(a); 
+          }).then(a => {
+            console.log(a);
           });
         }
       });
diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue
index cde71d3..26c41e4 100644
--- a/src/pages/login/Login.vue
+++ b/src/pages/login/Login.vue
@@ -104,8 +104,8 @@ export default {
   components: { CommonLayout, LoginActions },
   data() {
     return {
-      logging: false,
-      error: '',
+      logging: false, // 是否正在登录
+      error: '', // 登录错误信息
       form: this.$form.createForm(this),
       mobileTest: "",
       user: {
@@ -121,7 +121,7 @@ export default {
   },
   computed: {
   },
-  beforeMount() {
+  beforeMount() { // 页面挂载之前
 
     getProject().then(result => { // 获取项目信息
       this.Project = result.data.data
@@ -135,7 +135,7 @@ export default {
     Cookie.set(process.env.VUE_APP_THEME_COLOR_KEY, '#fa541c')
 
   },
-  created() {
+  created() { // 页面创建完成
     if (this.company != []) {
       // console.log("company:",this.company)
     }