Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

llj

2025-12-02 9cbf7cdb2d4d48eac1878651668055b7e6d1dd1a

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 .env.development

@@ -5,8 +5,8 @@
ENV = 'development'

# 智云迈思L-MOM管理系统/开发环境
# VUE_APP_BASE_API = 'http://localhost:81/API/'
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
VUE_APP_BASE_API = 'http://localhost:81/API/'
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

 src/views/basic/gyEmployee/gyEmployeeEdit.vue

@@ -1702,8 +1702,6 @@
      window.open(row.url, "_self");
    },
    async uploadDataUpload(row, index) {
      console.log(row.raw instanceof File);
      console.log(row.raw);
      try {
        let blob = await this.fileToBlob(row.raw);
        console.log(blob);

 src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue

@@ -1388,6 +1388,7 @@
    },
    /** 删除按钮操作 */
    handleDelete() {
      console.log("this.rowForm", this.rowForm)
      this.$modal
        .confirm("确认要删除吗，删除后不能恢复")
        .then(() => {
@@ -1395,20 +1396,21 @@
            axios
              .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
                params: {
                  HInter: this.rowForm.hmainid.toString(),
                  HsupId: this.rowForm.HsupId,
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,
                  HSourceEntryID: this.rowForm.HSourceEntryID,
                  HInterID: this.rowForm.hmainid.toString(),
                  HsupId: this.rowForm.HSupID,
                  HQty: this.rowForm['数量'],
                  HSourceInterID: this.rowForm['源单主内码'],
                  HSourceEntryID: this.rowForm['源单子内码'],
                  user: sessionStorage["HUserName"],
                },
              })
              .then((res) => {
                
                if (res.data.count == 1) {
                  this.handleQuery();
                  this.$modal.msgSuccess("删除成功");
                } else {
                  this.$modal.msgError("错误:" + result.code + result.Message);
                  this.$modal.msgError("错误:" + res.data.code + res.data.Message);
                }
              })
              .catch((error) => {

 src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue

@@ -62,8 +62,8 @@
            <el-option
              v-for="(item, index) in organizationList"
              :key="index"
              :label="item.label"
              :value="item.value"
              :label="item.Name"
              :value="item.ID"
            >
            </el-option>
          </el-select>

 src/views/sell/XsSeOutStockBill.vue

@@ -300,6 +300,7 @@
          >复制</el-button
        >
      </el-col>
      -->
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -310,6 +311,7 @@
          >删除
        </el-button>
      </el-col>
      <!-- 
      <el-col :span="1.5">
        <el-button
          type="primary"

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue

@@ -9,7 +9,7 @@
            <el-button type="primary" @click="ToolBatch">批次</el-button>
            <el-button type="primary" @click="close">退 出</el-button>
        </div>
        <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">器具档案编辑</div>
        <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">条码生成</div>
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
            <el-row>
                <el-col :span="6">