石广澎
2023-12-12 fa3a13b43cdcd3bcc42abae4d9c0a67e48ebea41
feat: bug修复
12536
13个文件已修改
31 ■■■■ 已修改文件
admin-web/src/components/myTree/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/components/upload/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemdis/distribution/edit.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemdis/distribution/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/foundation/classification/edit.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/foundation/classification/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/accessStock/outbound/edit.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/procure/purchaseOrder/edit.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/scrap/itemScrapping/edit.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/transfer/transferApplication/edit.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/systemSetting/department/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/components/myTree/index.vue
@@ -23,6 +23,7 @@
        @node-click='onSelect'
        :expand-on-click-node='false'
        :default-expand-all='autoExpandParent'
        :default-expanded-keys="expandedKeys"
        :filter-node-method='filterNode'
        :highlight-current='true'
      >
@@ -80,7 +81,7 @@
  },
  methods: {
    onExpand(expandedKeys) {
      this.expandedKeys = expandedKeys;
      this.expandedKeys.push(expandedKeys.id);
      this.autoExpandParent = false;
    },
    filterNode(value, data) {
admin-web/src/components/upload/index.vue
@@ -85,12 +85,13 @@
        title: '附件上传',
        max: 100, // 最大大小,单位M
        num: 10, // 支持上传图片个数
        accept: '.jpg,.jpeg,.png,.pdf,.doc,.docx,.xls,.xlsx', // 限制格式
        // accept: '.jpg,.jpeg,.png,.pdf,.doc,.docx,.xls,.xlsx', // 限制格式
        accept: '.jpg,.jpeg,.png,.webp,.bmp', // 限制格式
        tip: '', // 提示 默认:`只能上传${this.defaultSettings.num}个${this.defaultSettings.accept}文件,且不超过${this.defaultSettings.max}kb`
        uploadUrl: '', // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'text' // text/picture
        type: 'picture' // text/picture
      }
    }
  },
admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
@@ -364,7 +364,6 @@
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
    };
  },
admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -172,7 +172,6 @@
        qryType: 1,
        pageNum: this.pageNum,
        pageSize: this.pageSize,
        departmentId: this.userInfo.tenantId,
        outAgencyId: this.userInfo.tenantId,
        ...this.filterFrom,
      }).then((res) => {
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -303,12 +303,11 @@
        title: '上传',
        max: 20, // 最大大小,单位M
        num: 10, // 支持上传图片个数
        accept: '.jpg,.png', // 限制格式
        accept: '', // 限制格式
        tip: '', // 提示 默认:`只能上传${this.defaultSettings.num}个${this.defaultSettings.accept}文件,且不超过${this.defaultSettings.max}kb`
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
    };
  },
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -331,7 +331,6 @@
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
      scrapReasonOptions: [] // 报废原因
    };
admin-web/src/views/foundation/classification/edit.vue
@@ -134,7 +134,6 @@
            });
          } else {
            params.orgId = this.setting.orgId;
            console.log(params);
            finsystenant
                .add(params)
                .then((res) => {
admin-web/src/views/foundation/classification/index.vue
@@ -208,11 +208,7 @@
    initTreeData() {
      getTree().then((res) => {
        const content = res || [];
        // this.treeDataList.splice(0, this.treeDataList.length)
        this.treeDataList = content;
        // if (content.length > 0) {
        //   this.importSetting.fileSettings.data = {pid: content[0].id}
        // }
      });
    },
    updState(row) {
@@ -238,14 +234,11 @@
        })
        .then((res) => {
          this.$message.success('删除成功!');
          this.search();
          this.refreshData();
        })
        .catch(() => {});
    },
    showAdd() {
      // if (!this.editSetting.orgId) {
      //   this.$message.warning('请先选择左侧机构')
      // } else {
      if (this.p && this.p) {
        this.editSetting.pid = this.p.id;
      }
@@ -253,7 +246,6 @@
      this.editSetting.info = null;
      this.editSetting.title = '新增';
      this.editSetting.show = true;
      // }
    },
    showAudit(row) {
      this.editSetting.id = row.id;
admin-web/src/views/stock/accessStock/outbound/edit.vue
@@ -259,7 +259,6 @@
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
    };
  },
admin-web/src/views/stock/procure/purchaseOrder/edit.vue
@@ -326,8 +326,6 @@
        tip: '', // 提示 默认:`只能上传${this.defaultSettings.num}个${this.defaultSettings.accept}文件,且不超过${this.defaultSettings.max}kb`
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
    };
  },
admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -257,7 +257,6 @@
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
    };
  },
admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -255,7 +255,6 @@
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
    };
  },
admin-web/src/views/systemSetting/department/index.vue
@@ -187,7 +187,6 @@
      });
    },
    nodeClick(param) {
      console.log(param, 'param');
      this.p = Object.assign(
        {},
        {