fix:bug

jshERP-web/src/views/bill/dialog/ImportItemModal.vue

@@ -17,7 +17,7 @@
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="模板">
           <span
-            ><a :href="tmpUrl" target="_blank"><b>明细Excel模板[下载]</b></a></span
+            ><a :href="tmpUrl" ref="myLink" @click="importTemplate"><b>{{ exportTitle }}</b></a></span
           >
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="文件">
@@ -44,6 +44,12 @@ import Vue from 'vue'
 
 export default {
   name: 'ImportItemModal',
+  props:{
+    exportTitle:{
+      type: String,
+      default: '明细Excel模板[下载]',
+    }
+  },
   components: {},
   data() {
     return {
@@ -123,6 +129,10 @@ export default {
         prefixNo: this.prefixNo,
       }
     },
+    importTemplate() {
+      let link = this.$refs.myLink
+      link.setAttribute('download', this.exportTitle.replace('[下载]','') + '.xls')
+    },
   },
 }
 </script>

jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue

@@ -120,7 +120,7 @@
         </a-row>
       </a-form>
     </a-spin>
-    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk" exportTitle="清购单导入模版[下载]"></import-item-modal>
     <history-bill-list ref="historyBillListModalForm"></history-bill-list>
     <workflow-iframe ref="modalWorkflow" @ok="workflowModalFormOk"></workflow-iframe>
     <bill-print-iframe ref="modalPrint"></bill-print-iframe>

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -365,7 +365,7 @@
       </a-form>
     </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
-    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk" exportTitle="采购入库导入模版[下载]"></import-item-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
     <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>

jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -335,7 +335,7 @@
       </a-form>
     </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
-    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk" exportTitle="采购订单导入模版[下载]"></import-item-modal>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -315,7 +315,7 @@
       </a-form>
     </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
-    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk" exportTitle="销售订单导入模版[下载]"></import-item-modal>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <history-bill-list ref="historyBillListModalForm"></history-bill-list>

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -400,7 +400,7 @@
       </a-form>
     </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
-    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk" exportTitle="销售出库导入模版[下载]"></import-item-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
     <depot-modal ref="depotModalForm" @ok="depotModalFormOk"></depot-modal>

jshERP-web/src/views/material/MaterialList.vue

@@ -343,6 +343,7 @@ export default {
         { title: '图片', dataIndex: 'pic', width: 60, scopedSlots: { customRender: 'customPic' } },
         { title: '条码', dataIndex: 'mBarCode', width: 120 },
         { title: '名称', dataIndex: 'name', width: 160, scopedSlots: { customRender: 'customName' } },
+        { title: '系统SKU', dataIndex: 'systemSku', width: 120 },
         { title: '规格', dataIndex: 'standard', width: 120 },
         { title: '型号', dataIndex: 'model', width: 120 },
         { title: '颜色', dataIndex: 'color', width: 70, ellipsis: true },

jshERP-web/src/views/stock/CheckList.vue

@@ -88,10 +88,10 @@ export default {
       // 权限按钮集合
       btnEnableList: [1, 1, 1],
       queryParam: {
-        taskStatus: '',
+        taskStatus: undefined,
         number: '',
-        depotId: '',
-        createBy: '',
+        depotId: undefined,
+        createBy: undefined,
       },
       // stockTable: {
       //   loading: false,

jshERP-web/src/views/stock/components/checkModal.vue

@@ -68,6 +68,7 @@
             size="middle"
             bordered
             rowKey="id"
+            :scroll="{ x: 'max-content' }"
             :columns="columns"
             :dataSource="dataSource"
             :pagination="ipagination"