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

dytyqx

18 小时以前 b63d096b24ad28ce7c9f4dfc7112046a4f854be7

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

 src/views/component/printList/index.vue

@@ -8,7 +8,7 @@
            <el-table v-loading="loading" :data="printdata" ref="printTable" max-height="540"
                @selection-change="handleSelectionChange" :row-class-name="rowSysIndex" border>
                <el-table-column type="selection" width="55" align="center" />
                <el-table-column align="center" label="模块代码" prop="HNumber" />
                <el-table-column align="center" label="模块代码" prop="HNumber" v-if="hideFlag" />
                <el-table-column align="center" label="模板名称" prop="模板名称" />
            </el-table>
        </el-form>
@@ -57,7 +57,8 @@
            colTitleName: '',
            tableIns: null,
            option: {},
            tableData: []
            tableData: [],
            hideFlag:false,                             //隐藏标记。用于设置某些不希望显示的标签                                          // 当前选中的行
        }
    },
    created() {

 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue

@@ -1274,6 +1274,10 @@
                var existingData = this.editData || [];
                var orginHQTY = 0;





                // 创建物料ID映射
                var materialMap = {};
                for (var i = 0; i < dataArray.length; i++) {
@@ -1503,6 +1507,7 @@
                return null;
            }
        },
        //#endregion
        //#region 工具栏按钮操作
        //#region 编辑提交保存
        submitForm() {

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue

@@ -83,7 +83,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                    <el-form-item label="标准包装数">
                    <el-form-item label="数量/箱">
                        <el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
                    </el-form-item>
                </el-col>

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue

@@ -83,7 +83,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                    <el-form-item label="标准包装数">
                    <el-form-item label="数量/箱">
                        <el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
                    </el-form-item>
                </el-col>