doway-coms 2.11.30 → 2.11.32

package/packages/BaseGrid/index.js

@@ -1,10 +1,10 @@
-// 导入组件，组件必须声明 name
-import BaseGrid from './src/index.vue';
-import VXETable from 'vxe-table'
-// 为组件提供 install 安装方法，供按需引入
-BaseGrid.install = function(Vue) {
-    Vue.use(VXETable)
-    Vue.component(BaseGrid.name, BaseGrid);
-};
-// 默认导出组件
+// 导入组件，组件必须声明 name
+import BaseGrid from './src/index.vue';
+import VXETable from 'vxe-table'
+// 为组件提供 install 安装方法，供按需引入
+BaseGrid.install = function(Vue) {
+    Vue.use(VXETable)
+    Vue.component(BaseGrid.name, BaseGrid);
+};
+// 默认导出组件
 export default BaseGrid;

package/packages/BaseGrid/src/SeqSetting.vue

@@ -147,6 +147,7 @@ export default {
         }
         const column = {
           currentKey: item.currentKey,
+          type:item.type,
           field: item.field,
           title: item.title,
           visible: item.visible,
@@ -154,6 +155,7 @@ export default {
           width: item.width,
           filters: item.filters,
           order: item.order,
+          fixed:item.fixed
         }
         this.columns.push(column);
       })
@@ -219,6 +221,9 @@ export default {
           width: tempObject.width,
           extraInfo:{}
         }
+        if(tempObject.fixed){//设置固定列20250407 davis添加
+          tempData.extraInfo.fixed = tempObject.fixed
+        }
         if (tempObject.filters && tempObject.filters[0].data && tempObject.filters[0].data.bindingValues.length) {
           tempObject.filters[0].checked = true;
           tempData.extraInfo.filterExpression = tempObject.filters

package/packages/BaseGrid/src/exportCmp.vue

@@ -1,106 +1,106 @@
-<template>
-    <div>
-      <vxe-modal
-        v-model="showExport"
-        :title="exportTitle"
-        show-zoom
-        resize
-        showFooter
-        show-close
-        :mask-closable="true"
-        width="400px"
-        height="400px"
-        :destroyOnClose="true"
-      >
-      <template #default>
-      <draggable ref="dragView" v-model="exportFields">
-          <div v-for="loopField in exportFields" :key="loopField.code">
-            <a-checkbox v-model="loopField.selected">{{ loopField.title }}</a-checkbox>
-          </div>
-        </draggable>
-      </template>
-        <template #footer>
-          <Button type="primary" size="small" @click="confirmExport">确认导出</Button>
-        </template>
-      </vxe-modal>
-    </div>
-  </template>
-  
-  <script>
-import { commonExportApi } from './gridApi';
-import XEUtils from 'xe-utils';
-import { controlType } from '../../utils/enum';
-import draggable from 'vuedraggable';
-import { Button } from 'ant-design-vue';
-
-export default {
-  name: 'commonExportCmp',
-  components: {
-    draggable,
-    Button
-  },
-  props: {
-    objectService: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      showExport: false,
-      exportTitle: '',
-      exportFields: [],
-      moduleCode: '',
-      dataCode: '',
-      fieldCode: '',
-      searchParam: {}
-    };
-  },
-  methods: {
-    show(moduleCodeParam, dataCodeParam, dataNameParam, fieldCodeParam, searchParamParam, fields) {
-      this.exportFields = [];
-      this.moduleCode = moduleCodeParam;
-      this.dataCode = dataCodeParam;
-      this.fieldCode = fieldCodeParam;
-      this.searchParam = searchParamParam;
-      
-      XEUtils.arrayEach(fields, (loopField) => {
-        if (loopField.ignoreExport === true || loopField.controlType === controlType.buttons) {
-          return;
-        }
-        this.exportFields.push({
-          code: loopField.field,
-          title: loopField.title,
-          selected: true
-        });
-      });
-      
-      this.exportTitle = dataNameParam + '导出字段选择';
-      this.showExport = true;
-    },
-    confirmExport() {
-      let postData = {
-        moduleCode: this.moduleCode,
-        dataCode: this.dataCode,
-        fieldCode: this.fieldCode,
-        fields: [],
-        searchParam: this.searchParam
-      };
-
-      XEUtils.arrayEach(this.exportFields, (loopField) => {
-        if (loopField.selected === true) {
-          postData.fields.push(loopField.code);
-        }
-      });
-
-      console.debug('export post data', postData);
-      commonExportApi(this.objectService, postData);
-    }
-  }
-};
-  </script>
-  
-  <style scoped>
-   
-  </style>
+<template>
+    <div>
+      <vxe-modal
+        v-model="showExport"
+        :title="exportTitle"
+        show-zoom
+        resize
+        showFooter
+        show-close
+        :mask-closable="true"
+        width="400px"
+        height="400px"
+        :destroyOnClose="true"
+      >
+      <template #default>
+      <draggable ref="dragView" v-model="exportFields">
+          <div v-for="loopField in exportFields" :key="loopField.code">
+            <a-checkbox v-model="loopField.selected">{{ loopField.title }}</a-checkbox>
+          </div>
+        </draggable>
+      </template>
+        <template #footer>
+          <Button type="primary" size="small" @click="confirmExport">确认导出</Button>
+        </template>
+      </vxe-modal>
+    </div>
+  </template>
+  
+  <script>
+import { commonExportApi } from './gridApi';
+import XEUtils from 'xe-utils';
+import { controlType } from '../../utils/enum';
+import draggable from 'vuedraggable';
+import { Button } from 'ant-design-vue';
+
+export default {
+  name: 'commonExportCmp',
+  components: {
+    draggable,
+    Button
+  },
+  props: {
+    objectService: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      showExport: false,
+      exportTitle: '',
+      exportFields: [],
+      moduleCode: '',
+      dataCode: '',
+      fieldCode: '',
+      searchParam: {}
+    };
+  },
+  methods: {
+    show(moduleCodeParam, dataCodeParam, dataNameParam, fieldCodeParam, searchParamParam, fields) {
+      this.exportFields = [];
+      this.moduleCode = moduleCodeParam;
+      this.dataCode = dataCodeParam;
+      this.fieldCode = fieldCodeParam;
+      this.searchParam = searchParamParam;
+      
+      XEUtils.arrayEach(fields, (loopField) => {
+        if (loopField.ignoreExport === true || loopField.controlType === controlType.buttons) {
+          return;
+        }
+        this.exportFields.push({
+          code: loopField.field,
+          title: loopField.title,
+          selected: true
+        });
+      });
+      
+      this.exportTitle = dataNameParam + '导出字段选择';
+      this.showExport = true;
+    },
+    confirmExport() {
+      let postData = {
+        moduleCode: this.moduleCode,
+        dataCode: this.dataCode,
+        fieldCode: this.fieldCode,
+        fields: [],
+        searchParam: this.searchParam
+      };
+
+      XEUtils.arrayEach(this.exportFields, (loopField) => {
+        if (loopField.selected === true) {
+          postData.fields.push(loopField.code);
+        }
+      });
+
+      console.debug('export post data', postData);
+      commonExportApi(this.objectService, postData);
+    }
+  }
+};
+  </script>
+  
+  <style scoped>
+   
+  </style>
   

package/packages/BaseGrid/src/gridApi.js

@@ -1,33 +1,33 @@
-import store from '../../utils/store'
-
-export function commonExportApi(objectService, data) {
-    const formExport = document.createElement('form');
-    formExport.method = 'post';
-    (formExport.action =
-      getServiceUrl(objectService) + '/v1/commonOperation/exportGridExcel?token=' + store.state.token),
-      (formExport.target = 'exportFrame');
-    const inputValue = document.createElement('input');
-    inputValue.type = 'text';
-    inputValue.name = 'exportData';
-    inputValue.value = JSON.stringify(data);
-    formExport.appendChild(inputValue);
-    document.body.appendChild(formExport);
-    formExport.submit();
-    document.body.removeChild(formExport);
-  }
-  export function getServiceUrl(objectService) {
-    let url =  process.env.VUE_APP_ERP_SERVICE_URL;
-    if (objectService === 'base') {
-      url = process.env.VUE_APP_BASE_SERVICE_URL;
-    }
-    if (objectService === 'mes') {
-      url =  process.env.VUE_APP_MES_SERVICE_URL;
-    }
-    if (objectService === 'aps') {
-      url =  process.env.VUE_APP_APS_SERVICE_URL;
-    }
-    if (objectService === 'wms') {
-      url =  process.env.VUE_APP_WMS_SERVICE_URL;
-    }
-    return url;
+import store from '../../utils/store'
+
+export function commonExportApi(objectService, data) {
+    const formExport = document.createElement('form');
+    formExport.method = 'post';
+    (formExport.action =
+      getServiceUrl(objectService) + '/v1/commonOperation/exportGridExcel?token=' + store.state.token),
+      (formExport.target = 'exportFrame');
+    const inputValue = document.createElement('input');
+    inputValue.type = 'text';
+    inputValue.name = 'exportData';
+    inputValue.value = JSON.stringify(data);
+    formExport.appendChild(inputValue);
+    document.body.appendChild(formExport);
+    formExport.submit();
+    document.body.removeChild(formExport);
+  }
+  export function getServiceUrl(objectService) {
+    let url =  process.env.VUE_APP_ERP_SERVICE_URL;
+    if (objectService === 'base') {
+      url = process.env.VUE_APP_BASE_SERVICE_URL;
+    }
+    if (objectService === 'mes') {
+      url =  process.env.VUE_APP_MES_SERVICE_URL;
+    }
+    if (objectService === 'aps') {
+      url =  process.env.VUE_APP_APS_SERVICE_URL;
+    }
+    if (objectService === 'wms') {
+      url =  process.env.VUE_APP_WMS_SERVICE_URL;
+    }
+    return url;
   }