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

duhe

2025-11-26 bd7f9985d283a7950c2a29f4d8a2d027f8b45b9d

 src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue

@@ -187,7 +187,7 @@
          v-if="rowHideShow" />
      </el-dialog>
      <!-- 编辑 -->
      <el-dialog title="编辑销售出库单" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
      <el-dialog title="编辑器具直接调拨单" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
        <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
          :copyType="copyType" @editClose="editClose" v-if="editShow" />
      </el-dialog>
@@ -402,6 +402,11 @@
          //给空的数组赋值
          for (var key in data1.list) {//循序遍历数组
            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据
            //获取不需要显示的列（H开头的列不显示）
            var patrn = new RegExp(/^h/i);
            if (patrn.test(data1.list[key].ColmCols)) {
                this.titleData[key] = data1.list[key].ColmCols;
            }
          }
          //在列表左边添加勾选框
          col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
@@ -670,19 +675,19 @@
        this.sWhere += " and 组织名称 like '%" + this.queryParams.HStockOrgName + "%'";
      }
      if (this.queryParams.HDept) {
          sWhere += " and 部门 like '%" + this.queryParams.HDept + "%'";
          this.sWhere += " and 部门 like '%" + this.queryParams.HDept + "%'";
      }
      if (this.queryParams.HMaterNumber) {
          sWhere += " and 物料代码 like '%" + this.queryParams.HMaterNumber + "%'";
          this.sWhere += " and 物料代码 like '%" + this.queryParams.HMaterNumber + "%'";
      }
      if (this.queryParams.HModelNumber) {
          sWhere += " and 模具代码 like '%" + this.queryParams.HModelNumber + "%'";
          this.sWhere += " and 模具代码 like '%" + this.queryParams.HModelNumber + "%'";
      }
      if (this.queryParams.HWhName) {
          sWhere += " and 仓库 like '%" + this.queryParams.HWhName + "%'";
          this.sWhere += " and 仓库 like '%" + this.queryParams.HWhName + "%'";
      }
      if (this.queryParams.HSupName) {
          sWhere += " and 往来单位 like '%" + this.queryParams.HSupName + "%'";
          this.sWhere += " and 往来单位 like '%" + this.queryParams.HSupName + "%'";
      }
      this.getList()
    },
@@ -743,22 +748,18 @@
    /** 删除按钮操作 */
    handleDelete() {
      this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
        if (this.rowForm.状态 == "创建") {
          axios.get(this.baseURL + "/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", {
            params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
          }).then(response => {
            if (response.data.count == 1) {
              this.getList()
              this.$modal.msgSuccess("删除成功")
            } else {
              this.$modal.msgError("错误:" + result.code + result.Message);
            }
          }).catch(error => {
            this.$modal.msgError("接口请求失败!");
          });
        } else {
          this.$modal.msgError("此条数据不是创建状态,无法删除!");
        }
        axios.get(this.baseURL + "/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", {
          params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
        }).then(response => {
          if (response.data.count == 1) {
            this.getList()
            this.$modal.msgSuccess("删除成功")
          } else {
            this.$modal.msgError("错误:" + result.code + result.Message);
          }
        }).catch(error => {
          this.$modal.msgError("接口请求失败!");
        });
      }).catch(() => { })
    },
    // 反审核/审核数据