Prechádzať zdrojové kódy

配件采购入库单 文字错误
辅材采购退货单 导辅材采购退货单,把配件订单一起导出来了,应区分开
辅材销售订单 导辅材销售订单,把配件订单一起导出来了,应区分开

linwenxin 1 rok pred
rodič
commit
84404f1fb7

+ 6 - 3
src/components/template/template-page-1.vue

@@ -499,7 +499,7 @@ export default {
           item.param = item.param.replace(/<=/g, '')
           if (
             // item.compare === '=' &&
-            typeof item.value == 'string' &&
+            typeof item.value === 'string' &&
             (~item.value.indexOf(',') || ~item.value.indexOf(','))
           ) {
             // 去除换行
@@ -514,14 +514,17 @@ export default {
           return item
         })
       }
-
-      var res = await this.getList(pms)
+      var newPms = {} 
+      var res = await this.getList(pms, (data)=>{
+        newPms = data
+      })
       // alert('接收到数据断点')
       if (res.code == 200) {
         if (res?.data?.records?.length) {
           this.exportList(
             {
               ...pms,
+              ...newPms,
               pageSize: -1,
               exportFields: data
             },

+ 4 - 4
src/views/auxiliaryFittings/purchasingManagement/mixins/form_tpl.js

@@ -24,7 +24,7 @@ export default {
         [
           [
             {
-              isRole: !!~['auxiliaryMaterialsStorage'].indexOf(this?.$route?.name),
+              isRole: !!~['auxiliaryMaterialsStorage', 'partsStorage'].indexOf(this?.$route?.name),
               name: '采购入库模板',
               click: () => {
                 commonTemplateDownload({ name: '采购入库模板.xlsx' }, `${this.$route.meta.title}`)
@@ -42,7 +42,7 @@ export default {
           ],
           [
             {
-              isRole: !!~['auxiliaryMaterialsStorage'].indexOf(this?.$route?.name),
+              isRole: !!~['auxiliaryMaterialsStorage', 'partsStorage'].indexOf(this?.$route?.name),
               name: '导入模板',
               render: () => {
                 return this.importButton(websitPurchaseInImport, '导入模板', { goodsType: this.storageType })
@@ -53,7 +53,7 @@ export default {
         [
           [
             {
-              isRole: !!~['partsStorage'].indexOf(this?.$route?.name),
+              isRole: !!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this?.$route?.name),
               name: '采购退货模板',
               click: () => {
                 commonTemplateDownload({ name: '采购退货模板.xlsx' }, `${this.$route.meta.title}`)
@@ -71,7 +71,7 @@ export default {
           ],
           [
             {
-              isRole: !!~['partsStorage'].indexOf(this?.$route?.name),
+              isRole: !!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this?.$route?.name),
               name: '导入模板',
               render: () => {
                 return this.importButton(websitPurchaseRetImport, '导入模板', { goodsType: this.storageType })