diff --git a/oms_web/oms_vue/src/api/inventory/outer.js b/oms_web/oms_vue/src/api/inventory/outer.js
index e3101715..17dd3d55 100644
--- a/oms_web/oms_vue/src/api/inventory/outer.js
+++ b/oms_web/oms_vue/src/api/inventory/outer.js
@@ -73,6 +73,12 @@ export function queryInfo(id) {
     method: 'get'
   })
 }
+export function exportDownloadTemplate() {
+  return request({
+    url: '/inventory/outer/importTemplate',
+    method: 'get'
+  })
+}
 export function importSnData(formData) {
   return request({
     url: '/inventory/outer/vue/importData',
diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
index b04e7b73..b7077a90 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
@@ -80,7 +80,7 @@
 
 <script>
 import { addDelivery, listProductSn } from '@/api/inventory/delivery';
-import {importSnData} from '@/api/inventory/outer'
+import {importSnData,exportDownloadTemplate} from '@/api/inventory/outer'
 export default {
   name: "GenerateDeliveryForm",
   dicts: ['delivery_type', 'logistics_company'],
@@ -156,7 +156,13 @@ export default {
       this.selectedSnList = selection;
     },
     handleDownloadTemplate() {
-        this.download('/inventory/outer/vue/importTemplate', {}, `sn_import_template.xlsx`);
+
+      exportDownloadTemplate().then(response => {
+        const fileName = response.msg;
+        window.location.href = process.env.VUE_APP_BASE_API + "/common/download?fileName=" + encodeURIComponent(fileName) + "&delete=" + true;
+      }).catch(() => {
+      });
+
     },
     handleImport() {
       this.$refs.uploadInput.click();
diff --git a/oms_web/oms_vue/src/views/inventory/stock/index.vue b/oms_web/oms_vue/src/views/inventory/stock/index.vue
index 6746a808..12ec91a7 100644
--- a/oms_web/oms_vue/src/views/inventory/stock/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/stock/index.vue
@@ -318,8 +318,8 @@ export default {
         orderCode: null,
         stockStatus: null,
         deliveryTimeRange: [], // For el-date-picker daterange
-        orderByColumn: null,
-        isAsc: null,
+        orderByColumn: 't2.deliveryTime',
+        isAsc: 'desc',
       },
       // 表单参数
       form: {},
diff --git a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
index 446575d2..dac3ad97 100644
--- a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
+++ b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
@@ -96,11 +96,11 @@
                           <el-table-column label="操作" width="200">
                             <template slot-scope="scope">
                                                             <el-button
-                                                              v-if="scope.row.id === -1 && ((canUpdate && scope.row.fileSort !== '3') || (uploadFinalFile && scope.row.fileSort === '3'))"
+                                                              v-if="scope.row.id === -1 && ((updateFile && scope.row.fileSort !== '3') || (uploadFinalFile && scope.row.fileSort === '3'))"
                                                               type="text"
                                                               icon="el-icon-upload"
                                                               @click="importList(scope.$index)"
-                                                              :disabled="isOrderApprovedOrInReview || !form.id"
+                                                              :disabled="form.orderStatus === '2'"
                                                             >上传
                                                             </el-button>                            <el-button
                                 v-if="scope.row.id !== -1"
@@ -119,11 +119,11 @@
                               >下载
                               </el-button>
                               <el-button
-                                v-if="scope.row.id !== -1 && activeContractVersionTab == form.versionCode && ((canUpdate && scope.row.fileSort !== '3') || (uploadFinalFile && scope.row.fileSort === '3'))"
+                                v-if="scope.row.id !== -1 && activeContractVersionTab == form.versionCode && ((updateFile && scope.row.fileSort !== '3') || (uploadFinalFile && scope.row.fileSort === '3'))"
                                 type="text"
                                 icon="el-icon-delete"
                                 @click="delUploadRow(scope.$index, scope.row.id)"
-                                :disabled="isOrderApprovedOrInReview"
+                                :disabled="form.orderStatus === '2'"
                               >删除
                               </el-button>
                             </template>