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

陈婷婷

2025-12-03 9acb94a83fdb65678c08b25a310fe41af6f8fca2

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://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_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

 .env.production

@@ -5,7 +5,7 @@
ENV = 'production'

# 智云迈思L-MOM管理系统/生产环境
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/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/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue

@@ -377,7 +377,8 @@
    this.getdata()
  },
  beforeDestroy() {
    this.$destroy()
    // 下面的代码会导致页面崩溃，先注释掉
    // this.$destroy()
  },
  methods: {
    //#region 表单数据初始化

 src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue

@@ -8,7 +8,7 @@
                    </el-select>
                </el-form-item>
                <el-form-item label="开始日期">
                    <el-date-picker v-model="query.HBeginDate" type="date" placeholder="开始日期" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-mm-dd" format="yyyy-mm-dd"/>
                    <el-date-picker v-model="query.HBeginDate" type="date" placeholder="开始日期" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-MM-dd" format="yyyy-MM-dd"/>
                </el-form-item>
                <el-form-item label="结束日期">
                    <el-date-picker v-model="query.HEndDate" type="date" placeholder="结束日期" style="width:160px" :disabled="timeCycleDisabled" value-format="yyyy-MM-dd" format="yyyy-MM-dd"/>
@@ -220,6 +220,7 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
import dayjs from 'dayjs';


export default {
@@ -322,6 +323,7 @@
            const yyyy = d.getFullYear();
            const mm = String(d.getMonth() + 1).padStart(2, '0');
            const dd = String(d.getDate()).padStart(2, '0');
			
            return `${yyyy}-${mm}-${dd}`;
        },
        onTimeCycleChange() {
@@ -392,8 +394,8 @@
            if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2) 
                sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2));
            
            if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) >= '${q.HBeginDate}'`);
            if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) <= '${q.HEndDate}'`);
            if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) >= '${dayjs(q.HBeginDate).format("YYYY-MM-DD")}'`);
            if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) <= '${dayjs(q.HEndDate).format("YYYY-MM-DD")}'`);
            if (q.HBillNo) sWhereParts.push(` and 单据号 like '%${q.HBillNo}%'`);
            if (q.HDeptID) sWhereParts.push(` and 部门 like '%${q.HDeptID}%'`);
            if (q.MaterialCode) sWhereParts.push(` and 物料代码 like '%${q.MaterialCode}%'`);

 src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue

@@ -505,7 +505,8 @@
    this.getdata()
  },
  beforeDestroy() {
    this.$destroy()
    // 会导致页面崩溃 先注释掉
    // this.$destroy()
  },
  methods: {
    //#region 表单数据初始化

 src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue

@@ -175,7 +175,7 @@
        @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column align="center" label="序号" type="index" width="80" />
        <el-table-column align="center" label="源单单号" width="120">
        <!-- <el-table-column align="center" label="源单单号" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HSourceBillNo }}</span>
          </template>
@@ -194,7 +194,7 @@
          <template slot-scope="scope">
            <span>{{ scope.row.HSourceEntryID }}</span>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column align="center" label="HMaterID" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HMaterID }}</span>
@@ -426,7 +426,8 @@
    this.getdata()
  },
  beforeDestroy() {
    this.$destroy()
    
    // this.$destroy()
  },
  methods: {
    //#region 表单数据初始化

 src/views/ProductInBill/Kf_ProductInBillEdit.vue

@@ -164,7 +164,7 @@
        @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column align="center" label="序号" type="index" width="80" />
        <el-table-column align="center" label="源单单号" width="120">
        <!-- <el-table-column align="center" label="源单单号" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HSourceBillNo }}</span>
          </template>
@@ -183,7 +183,7 @@
          <template slot-scope="scope">
            <span>{{ scope.row.HSourceEntryID }}</span>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column align="center" label="HMaterID" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HMaterID }}</span>
@@ -770,10 +770,10 @@
          HSalePrice: 0,
          HSeOrderInterID: 741,
          HSeOrderEntryID: 18,
          HSeOrderBillNo: 'XSFH00000747',
          HSourceInterID: 741,
          HSourceEntryID: 18,
          HSourceBillNo: 'XSFH00000747',
          HSeOrderBillNo: '',
          HSourceInterID: 0,
          HSourceEntryID: 0,
          HSourceBillNo: '',
          HSourceBillType: 1402,
          HRelationQty: 0,
          HRelationMoney: 0,

 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue

@@ -247,12 +247,12 @@
            <span>{{ scope.row.计量单位 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="应收数量" width="120">
        <el-table-column align="center" label="应退数量" width="120">
          <template slot-scope="scope">
              <span>{{ scope.row.HQtyMust }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="实收数量" width="120">
        <el-table-column align="center" label="实退数量" width="120">
          <template slot-scope="scope">
            <el-input-number v-model="scope.row.HQty" :min="0" style="width: 90px;"
              controls-position="right"></el-input-number>
@@ -515,7 +515,7 @@
                    , "规格型号": dataArray[i].规格型号
                    , "HUnitID": dataArray[i].HUnitID
                    , "计量单位": dataArray[i].计量单位
                    , "HQtyMust": dataArray[i].数量.toFixed(6)
                    , "HQtyMust": dataArray[i].应发数量.toFixed(6)
                    , "HQty": dataArray[i].数量.toFixed(6)
                    , "HPieceQty": "0"
                    , "HPrice": dataArray[i].单价.toFixed(4)
@@ -737,8 +737,8 @@
                , "规格型号": result.data[i].规格型号
                , "HUnitID": result.data[i].HUnitID
                , "计量单位": result.data[i].计量单位
                , "HQtyMust": result.data[i].应收数量
                , "HQty": result.data[i].实收数量
                , "HQtyMust": result.data[i].应发数量
                , "HQty": result.data[i].数量
                , "HRemark": result.data[i].表体备注
                , "HPrice": result.data[i].单价
                , "HMoney": result.data[i].金额
@@ -853,8 +853,8 @@
              "规格型号": result.data[i].规格型号,
              "HUnitID": result.data[i].HUnitID,
              "计量单位": result.data[i].计量单位,
              "HQtyMust": result.data[i].应收数量,
              "HQty": result.data[i].实收数量,
              "HQtyMust": result.data[i].应发数量,
              "HQty": result.data[i].数量,
              "HRemark": (result.data[i].表体备注 || "") + " (复制)",
              "HPrice": result.data[i].单价,
              "HMoney": result.data[i].金额,

 src/views/sell/XsSeOutStockBackBillEdit.vue

@@ -320,7 +320,7 @@
        </el-table-column>
        <el-table-column align="center" label="发货仓库" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.计量单位 }}</span>
            <span>{{ scope.row.发货仓库 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="收货仓库" width="120">

 src/views/sell/XsSeOutStockBackBillList.vue

@@ -1403,7 +1403,7 @@
    //打开新增组件弹窗
    handleAddEdit() {
      this.rowForm.HItemID = 0;
      this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${0}&OperationType=${1}&copyType=${-1}`;
      this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=0&OperationType=1&CopyType=2`;
      this.$nextTick(() => {
        this.openEdit = true;
        this.editShow = true;
@@ -1411,7 +1411,7 @@
    },
    //打开修改组件弹窗
    handleEdit(row, OperationType, copyType) {
      this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&copyType=${copyType}`;
      this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&CopyType=${copyType}`;
      this.$nextTick(() => {
        this.openEdit = true;
        this.editShow = true;

 src/views/sell/sellOut/sellOutBill.vue

@@ -305,7 +305,14 @@
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">条码明细</el-button>
        <el-button
          type="primary"
          icon="el-icon-printer"
          size="mini"
          :disabled="single"
          @click="get_BarCodeDetail"
          >条码明细</el-button
        >
      </el-col>
    </el-row>
    <div class="tableBox" v-loading="loading">
@@ -426,7 +433,7 @@
import RowSettings from "@/views/component/rowSettings";
import Edit from "@/views/sell/sellOut/sellOutBillEdit";
import PrintList from "@/views/component/printList";
import BarCodeDetail from '@/views/component/BarCodeDetail'               //条码明细组件
import BarCodeDetail from "@/views/component/BarCodeDetail"; //条码明细组件
import moment from "moment";

export default {
@@ -1055,6 +1062,7 @@
        .confirm("确认要删除吗，删除后不能恢复")
        .then(() => {
          if (this.rowForm.状态 == "创建") {
            this.loading = true;
            axios
              .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
                params: {
@@ -1065,13 +1073,16 @@
              .then((response) => {
                if (response.data.count == 1) {
                  this.getList();
                  this.$modal.msgSuccess("删除成功");
                  this.$modal.msgSuccess(response.data.Message);
                } else {
                  this.$modal.msgError("错误:" + result.code + result.Message);
                }
              })
              .catch((error) => {
                this.$modal.msgError("接口请求失败!");
              })
              .finally(() => {
                this.loading = false;
              });
          } else {
            this.$modal.msgError("此条数据不是创建状态,无法删除!");
@@ -1144,13 +1155,12 @@
      //   this.$message.warning('请选择一行数据查看条码明细！')
      //   return
      // }
      this.barCodeDetailShow = true
      this.barCodeDetailShow = true;
      this.$nextTick(() => {
        this.$refs.barcodeDetail.open(this.rowForm)
      })
        this.$refs.barcodeDetail.open(this.rowForm);
      });
        },
    //#endregion


    //#region 获取公司名，根据公司进行定制化开发
    defaintOperationByCompanyName() {

 src/views/sell/xsSeOrderBill/xsSeOrderBill.vue

@@ -683,7 +683,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage["organizationList"]), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
@@ -1390,7 +1390,8 @@
    },
    //打开新增组件弹窗
    handleAddEdit() {
      this.rowForm.HItemID = 0;
      // this.rowForm.HItemID = 0;
      this.iframeUrl = `/iframe/XsSeOrderBillEdit?HInterID=0&OperationType=1&copyType=-1`;
      this.$nextTick(() => {
        this.openEdit = true;
        this.editShow = true;
@@ -1417,13 +1418,9 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
              .get(this.baseURL + "Xs_SeOrderBill/DropXs_SeOrderBill", {
                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(),
                  user: sessionStorage["HUserName"],
                },
              })

 src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue

@@ -435,18 +435,18 @@
        </el-table-column>
        <el-table-column align="center" label="仓库" width="120">
          <template slot-scope="scope">
            <el-input-number
              v-model="scope.row.HQty"
            <el-input
              v-model="scope.row.仓库"
              :min="1"
              style="width: 90px"
              controls-position="right"
            ></el-input-number>
            ></el-input>
          </template>
        </el-table-column>
        <el-table-column align="center" label="数量2" width="120">
          <template slot-scope="scope">
            <el-input-number
              v-model="scope.row.HPrice"
              v-model="scope.row.HQty"
              :min="0"
              style="width: 90px"
              controls-position="right"
@@ -455,22 +455,22 @@
        </el-table-column>
        <el-table-column align="center" label="单价" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HTaxPrice }}</span>
            <span>{{ scope.row.HPrice }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="加税合计" width="120">
        <el-table-column align="center" label="价税合计" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HTaxRate }}</span>
            <span>{{ scope.row.HTaxMoney }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="客户规格型号" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
            <span>{{ scope.row.HPrice * scope.row.规格型号 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="交货日期" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
            <span>{{ scope.row.HTaxPrice * scope.row.HDate }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="备注" width="120">
@@ -648,8 +648,8 @@
    getdata() {
      this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
      this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
      this.CopyType2 = this.$route.query.copyType || this.copyType || -1;
      console.log(this.CopyType2, this.OperationType2, this.HInterID2);
      this.CopyType2 = this.$route.query.CopyType || this.copyType || -1;
      console.log("传递的参数",this.$route.query.CopyType,this.$route.query.OperationType, this.$route.query.HInterID);
      this.formShow = false;
      this.formLoading = true;

@@ -712,7 +712,7 @@
                    HMoney: dataArray[i].金额.toFixed(2),
                    HTaxMoney: dataArray[i].价税合计.toFixed(2),
                    HWHID: dataArray[i].HWHID,
                    发货仓库: dataArray[i].HWHName,
                    仓库: dataArray[i].HWHName,
                    HRemark: "",
                    HQty_Full: "0",
                    HQty_Empty: "0",

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue

@@ -23,7 +23,7 @@
                </el-col>
                <el-col :span="6">
                    <el-form-item label="工厂代码" prop="HWorksNumber">
                        <el-select v-model="form.HWorksNumber" placeholder="请选择组织" style="width: 100%">
                        <el-select v-model="form.HWorksNumber" placeholder="请选择工厂" style="width: 100%">
                            <el-option v-for="(item, index) in HWorksNumberList" :key="index" :label="item"
                                :value="item">
                            </el-option>

 src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue

@@ -484,7 +484,7 @@
          this.warehouseShow = false
          this.openData = false
        } else if (num == 3){
          console.log(deptRow)

            this.editData[this.zbIndex].HMaterID = deptRow.HItemID
            this.editData[this.zbIndex].物料代码 = deptRow.物料代码
            this.editData[this.zbIndex].物料名称 = deptRow.物料名称