فهرست منبع

1.0.1 AGV盘点页面优化

liuyanpeng 9 ماه پیش
والد
کامیت
f21552ba4a

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v5",
   "description": "Leanwo Prodog Client",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry=http://wuzhixin.vip:4873",

+ 16 - 39
src/components/customer/AssetInventoryStep10.vue

@@ -1,18 +1,10 @@
 <template>
   <div>
-    <a-result
-      v-if="isShow"
-      status="success"
-      title="操作成功!"
-      sub-title="恭喜您,AGV抽盘生成盘点单成功."
-    >
+    <a-result v-if="isShow" status="success" title="操作成功!" sub-title="恭喜您,AGV抽盘生成盘点单成功.">
       <template #extra>
         <div style="text-align: left; margin-bottom: 20px;">
-          <a-table
-            :columns="columns"
-            :data-source="dataSource"
-          >
-            <template #bodyCell="{ column,record }">
+          <a-table :columns="columns" :data-source="dataSource">
+            <template #bodyCell="{ column, record }">
               <template v-if="column.key === 'name'">
                 <span>
                   {{ record.name }}
@@ -24,10 +16,7 @@
                 </span>
               </template>
               <template v-else-if="column.key === 'operation'">
-                <a-button
-                  type="primary"
-                  @click="openCurdWindow(record.id)"
-                >
+                <a-button type="primary" @click="openCurdWindow(record.id)">
                   查看盘点单
                 </a-button>
               </template>
@@ -36,31 +25,20 @@
         </div>
       </template>
     </a-result>
-    <a-button
-      v-if="!isShow"
-      key="console"
-      style="float: left"
-      type="primary"
-      @click="end"
-    >
-      AGV抽盘生成盘点单
-    </a-button>
+
+    <a-result v-else title="AGV抽盘生成盘点单">
+      <template #extra>
+        <a-button key="console" type="primary" @click="end">确认生成盘点单</a-button>
+      </template>
+    </a-result>
+
     <a-divider style="margin:20px 0 !important;" />
     <Loading v-if="loading" />
-    <a-button
-      key="console"
-      type="primary"
-      @click="previous"
-    >
+    <a-button key="console" type="primary" @click="previous">
       上一步
     </a-button>
-    <a-button
-      key="console"
-      style="float: right;"
-      type="primary"
-      @click="next"
-    >
-      下一步
+    <a-button key="console" style="float: right;" type="primary" @click="next">
+      返回
     </a-button>
   </div>
 </template>
@@ -147,7 +125,7 @@ export default {
                    */
     openCurdWindow: function (data) {
       let url = Common.getRedirectUrl('#/desktop/window1/window-read/view/041101/0/' + data +
-                '?currPage=1&currIndex=1&totalCount=1&uuid=' + Uuid.createUUID());
+        '?currPage=1&currIndex=1&totalCount=1&uuid=' + Uuid.createUUID());
       window.open(url);
     },
     end: function () {
@@ -191,5 +169,4 @@ export default {
   },
 };
 </script>
-<style>
-</style>
+<style></style>

+ 1 - 1
src/components/customer/AssetInventoryStep9.vue

@@ -15,7 +15,7 @@
         </a-col>
 
         <!-- 盘点单名称输入 -->
-        <a-col :xxl="8" :xl="8" :lg="8" :md="12" :sm="24" :xs="24" style="margin-top: 8px;">
+        <a-col :xxl="8" :xl="8" :lg="8" :md="12" :sm="24" :xs="24" style="margin-top: 8px; margin-left: 16px;">
           <a-form-item label="盘点单名称" class="mb-0">
             <a-input v-model:value="inventorySheetName" />
           </a-form-item>

+ 1 - 1
src/components/customer/InventoryDataProcessingStep2.vue

@@ -198,7 +198,7 @@ export default {
 
 <style scoped>
 .footer {
-  margin-top: 20px;
+  margin-top: 6px;
   display: flex;
   justify-content: space-between;
 }

+ 1 - 1
src/components/customer/InventoryDataProcessingStep4.vue

@@ -209,6 +209,6 @@ input {
 }
 .previousBtn {
     position: fixed;
-    top: 93%;
+    top: 95%;
   }
 </style>

+ 1 - 1
src/components/customer/ManuallyConfirmCountingDataStep1.vue

@@ -283,7 +283,7 @@ input {
 }
 .previousBtn {
   position: fixed;
-  top: 94%;
+  top: 95%;
 }
 .grid-item-row2-column2 {
   overflow: hidden !important;