Răsfoiți Sursa

3.0.45 修改抽盘样式

liuyanpeng 2 ani în urmă
părinte
comite
342f142ecb
2 a modificat fișierele cu 24 adăugiri și 22 ștergeri
  1. 1 1
      package.json
  2. 23 21
      src/components/customer/AssetInventoryStep5.vue

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.43",
+  "version": "3.0.45",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

+ 23 - 21
src/components/customer/AssetInventoryStep5.vue

@@ -50,30 +50,29 @@
 
       <div class="grid-item-row1-column2">
         <a-form-item label="盘点单名称">
-          <a-input v-model:value="inventorySheetName" size="default" style="width: 766px" />
-          <!--          <a-button type="dashed" style="height: 33.5px; margin-left: 10px"> 上传 </a-button>-->
+          <a-input v-model:value="inventorySheetName" size="default" style="width: 70%" />
           <a-button type="primary" style="height: 33.5px; margin-left: 30px" @click="showModal">上传</a-button>
-          <a-modal
-            v-model:visible="visible" title="上传盘点资产数据" ok-text="确认" cancel-text="取消"
-            @ok="handleOk"
-          >
-            <p>1、请点击【下载】按钮,下载所有的资产数据。</p>
-            <a-button style="height: 33.5px" type="primary" @click="downloadFile">
-              下载
-            </a-button>
-            <p>2、使用Excel打开下载的数据,删除不要盘点的数据,保存Excel。</p>
-            <p>3、点击上传按钮,上传数据。</p>
-            <a-upload
-              v-model:file-list="fileList"
-              :show-upload-list="false"
-              :before-upload="beforeUpload"
-              @change="uploadFileChange"
-            >
-              <a-button type="primary" style="height: 33.5px"> 上传</a-button>
-            </a-upload>
-          </a-modal>
         </a-form-item>
       </div>
+      <a-modal
+        v-model:visible="visible" title="上传盘点资产数据" ok-text="确认" cancel-text="取消"
+        @ok="handleOk"
+      >
+        <p>1、请点击【下载】按钮,下载所有的资产数据。</p>
+        <a-button style="height: 33.5px" type="primary" @click="downloadFile">
+          下载
+        </a-button>
+        <p>2、使用Excel打开下载的数据,删除不要盘点的数据,保存Excel。</p>
+        <p>3、点击上传按钮,上传数据。</p>
+        <a-upload
+          v-model:file-list="fileList"
+          :show-upload-list="false"
+          :before-upload="beforeUpload"
+          @change="uploadFileChange"
+        >
+          <a-button type="primary" style="height: 33.5px"> 上传</a-button>
+        </a-upload>
+      </a-modal>
       <div class="grid-item-row3-column1">
         <div>
           <div class="panel panel-default m-panel">
@@ -1322,4 +1321,7 @@ table.fixed-table td {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+:deep(.ant-form-item-control-input-content){
+  display: flex;
+}
 </style>