Merge remote-tracking branch 'origin/master'

cy

2023-11-30 870a9499eb65de0031ef8e8f70607e5dfb64b806

 admin-web/src/views/stock/accessStock/outbound/edit.vue

@@ -169,24 +169,19 @@
    </el-form>
    <div slot="footer" align="center" class="dialog-footer">
      <my-button name="取消" site="form" @click="close" />
      <my-button name="保存" site="form" @click="handleSubmit" />
      <el-button name="保存" type="primary" size="medium" :loading="btnloading" @click="handleSubmit">保存</el-button>
    </div>
  </win-md>
</template>
<script>
import {
  goodsTemplate,
  goodsModel,
  selectTenantWarehouse,
  warehouseSelectNumber,
} from '@/api/baseSetting/finsystenant';
import { outputAdd } from '@/api/stock/accessStock';
import { getTree } from '@/api/foudation/classification';
import {goodsModel, goodsTemplate, selectTenantWarehouse, warehouseSelectNumber,} from '@/api/baseSetting/finsystenant';
import {outputAdd} from '@/api/stock/accessStock';
import {getTree} from '@/api/foudation/classification';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
import upload from '@/components/upload/index';
import { getUploadUrl } from '@/utils/base';
import { mapGetters } from 'vuex';
import {getUploadUrl} from '@/utils/base';
import {mapGetters} from 'vuex';

export default {
  components: { MyButton, winMd, upload },
@@ -211,6 +206,7 @@
    };
    return {
      loading: false,
      btnloading: false,
      warehouseOptions: [], // 出库仓库列表
      categoryOptions: [], // 物品分类列表
      modelList: [], //型号列表
@@ -432,19 +428,23 @@
    handleSubmit() {
      this.$refs['ruleForm'].validate((valid) => {
        if (valid) {
          this.btnloading = true;
          console.log('this.formData', this.formData);
          outputAdd(this.formData)
            .then((res) => {
              this.$message.success('保存成功！');
              this.btnloading = false;
              this.close();
              this.$emit('search');
            })
            .catch((err) => {
              console.log('edit err', err);
              this.btnloading = false;
              this.$message.error('保存失败');
            });
        } else {
          this.$message.error('校验未通过，请检查。');
          this.btnloading = false;
        }
      });
    },