Merge branch 'master' of http://115.159.85.185:8098/r/MingHeZhiNeng/DuiDuoJ...

yangpeixing

2025-12-04 25c71bc8a6015bf4885374e75576f3dc75d1424e

Merge branch 'master' of http://115.159.85.185:8098/r/MingHeZhiNeng/DuiDuoJiLiKu

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.jsx

@@ -858,7 +858,7 @@
    if (!(await this.initBox())) return
    this.resetDetailTable(row)
    this.setEditForm(row)
    this.setContinueAdd(false)
    this.setContinueAddNew()
    //设置远程查询表单的默认key/value
    this.getRemoteFormDefaultKeyValue()
    //点击编辑按钮弹出框后，可以在此处写逻辑，如，从后台获取数据
@@ -887,6 +887,11 @@
      _button.name = isAdd ? this.continueAddName : '保 å­˜'
    }
  },
  setContinueAddNew() {
    this.boxButtons.forEach((btn) => {
        btn.hidden=true
      })
  },
  resetAdd() {
    if (this.hasDetail) {
      this.$refs.detail &&

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/components/basic/VolTable.vue

@@ -194,8 +194,7 @@
              @click="dowloadFile(file)">{{ file.name }}</a>
            <span v-else-if="column.type == 'date'">{{ formatterDate(scope.row, column) }}</span>
            <div v-else-if="column.type == 'jsx'" @click="formatterClick(scope.row, column, $event)">
              <el-button v-for="item in column.formatter(scope.row, column) " :key="item" :type="item.type">{{
                item.name
              <el-button v-for="item in column.formatter(scope.row, column)" :key="item" :type="item.type">{{ item.name
              }}</el-button>
            </div>
            <div v-else-if="column.formatter" @click="formatterClick(scope.row, column, $event)"

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/Dt_BillGroupStock.jsx

@@ -71,7 +71,7 @@
        type: 'danger',
        icon: 'el-icon-check',
        disabled: false,
        plain: true,
        plain: false,
        onClick: function () {
          if (this.editFormFields.remark == '其他出库') {
            this.$confirm('是否其他出库', '警告', {
@@ -201,11 +201,11 @@
      })
      //示例：设置修改新建、编辑弹出框字段标签的长度
      this.boxOptions.labelWidth = 150
      this.buttons.forEach((btn) => {
        if (btn.name == '编辑') {
          btn.hidden = true
        }
      })
      // this.buttons.forEach((btn) => {
      //   if (btn.name == '编辑') {
      //     btn.hidden = true
      //   }
      // })
      this.boxButtons.forEach((btn) => {
        if (btn.name == '保 å­˜') {
          btn.hidden = true