duhe
5 天以前 62a80e2210bbd71ca23a425499f7d42068839ef6
锦隆:条码生成调整
4个文件已修改
49 ■■■■ 已修改文件
.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/static/grf/物料条码.grf 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.development
@@ -5,10 +5,10 @@
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://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://192.168.1.11/API/'
VUE_APP_BASE_API = 'http://192.168.1.11/API/'
# è·¯ç”±æ‡’加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
public/static/grf/ÎïÁÏÌõÂë.grf
@@ -1,5 +1,5 @@
{
    "Version":"6.8.9.5",
    "Version":"6.8.2.2",
    "Font":{
        "Name":"微软雅黑",
        "Size":120000,
@@ -47,6 +47,9 @@
                },
                {
                    "Name":"数量"
                },
                {
                    "Name":"产品型号"
                }
            ]
        },
@@ -142,7 +145,7 @@
                                    "row":1,
                                    "col":3,
                                    "TextAlign":"MiddleCenter",
                                    "Text":"[#额外字段#]",
                                    "Text":"[#产品型号#]",
                                    "ColSpan":2
                                },
                                {
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -128,6 +128,16 @@
            </el-row>
            <el-row>
                <el-col :span="6">
                    <el-form-item label="客户订单号">
                        <el-input v-model="initMainData.HSeOrderBillNo" disabled></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                    <el-form-item label="产品型号">
                        <el-input v-model="initMainData.HCusModel" disabled></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                    <el-form-item label="组织" @change="onChangeMethod_HOrganization">
                        <el-select v-model="initMainData.HOrganizationID" placeholder="请选择组织" style="width: 100%">
                            <el-option v-for="(item, index) in HOrganizationList" :key="index" :value="item.ID" :label="item.Name"></el-option>
@@ -211,6 +221,8 @@
                ,HInspectionCycle:0                                     //复检周期(天)
                ,HReInspectionDate:null                                 //复检日期
                ,HPOOrderBillMTO:""                                     //采购跟踪号
                ,HSeOrderBillNo:""                                      //客户订单号
                ,HCusModel:""                                           //产品型号
                
                ,HOrganizationID:0                                      //组织ID
                ,HOrganization:""                                       //组织名称
@@ -271,7 +283,7 @@
            tableData_BarCode:[],                                       //条码列表table æ•°æ®
            RowIndex_BarCode:0,                                         //条码列表table è¡Œç´¢å¼•
            openPrintList:true,                                         //打印弹窗显示标记
            openPrintList:false,                                         //打印弹窗显示标记
            printListShow:false,                                        //打印模板数据显示标记
            selectedData_BarCode:0,                                     //条码列表table é€‰ä¸­æ•°æ®é›†åˆ
        };
@@ -639,6 +651,8 @@
            this.initMainData.HInspectionDate = dataArray[0].复检标记==1?moment(dataArray[0].检验日期).format('YYYY-MM-DD'):null;
            this.initMainData.HReInspectionDate = dataArray[0].复检标记==1?moment(dataArray[0].检验日期).add(dataArray[0].复检周期,"days").format('YYYY-MM-DD') :null;
            this.initMainData.HPOOrderBillMTO = dataArray[0].采购跟踪号;
            this.initMainData.HSeOrderBillNo = dataArray[0].客户订单号;
            this.initMainData.HCusModel = dataArray[0].产品型号;
            this.initMainData.HMinQty = 0;
            if(this.initMainData.HMinQty>0){
                this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -10,7 +10,7 @@
            <el-row>
                <el-col :span="6">
                    <el-form-item label="日期">
                        <el-date-picker v-model="initMainData.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT" style="width: 100%"> </el-date-picker>
                        <el-date-picker v-model="initMainData.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
@@ -112,7 +112,7 @@
            <el-row>
                <el-col :span="6">
                    <el-form-item label="生产日期">
                        <el-date-picker v-model="initMainData.HInspectionDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT" style="width: 100%"> </el-date-picker>
                        <el-date-picker v-model="initMainData.HInspectionDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
@@ -122,11 +122,21 @@
                </el-col>
                <el-col :span="6">
                    <el-form-item label="复检日期">
                        <el-date-picker v-model="initMainData.HReInspectionDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT" style="width: 100%" disabled> </el-date-picker>
                        <el-date-picker v-model="initMainData.HReInspectionDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 100%" disabled> </el-date-picker>
                    </el-form-item>
                </el-col>
            </el-row>
            <el-row>
                <el-col :span="6">
                    <el-form-item label="客户订单号">
                        <el-input v-model="initMainData.HSeOrderBillNo" disabled></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                    <el-form-item label="产品型号">
                        <el-input v-model="initMainData.HCusModel" disabled></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                    <el-form-item label="组织" @change="onChangeMethod_HOrganization">
                        <el-select v-model="initMainData.HOrganizationID" placeholder="请选择组织" style="width: 100%">
@@ -211,6 +221,8 @@
                ,HInspectionCycle:0                                     //复检周期(天)
                ,HReInspectionDate:null                                 //复检日期
                ,HPOOrderBillMTO:""                                     //采购跟踪号
                ,HSeOrderBillNo:""                                      //客户订单号
                ,HCusModel:""                                       //产品型号
                
                ,HOrganizationID:0                                      //组织ID
                ,HOrganization:""                                       //组织名称
@@ -271,7 +283,7 @@
            tableData_BarCode:[],                                       //条码列表table æ•°æ®
            RowIndex_BarCode:0,                                         //条码列表table è¡Œç´¢å¼•
            openPrintList:true,                                         //打印弹窗显示标记
            openPrintList:false,                                         //打印弹窗显示标记
            printListShow:false,                                        //打印模板数据显示标记
            selectedData_BarCode:0,                                     //条码列表table é€‰ä¸­æ•°æ®é›†åˆ
        };
@@ -640,6 +652,8 @@
            this.initMainData.HInspectionDate = dataArray[0].复检标记==1?moment(dataArray[0].检验日期).format('YYYY-MM-DD'):null;
            this.initMainData.HReInspectionDate = dataArray[0].复检标记==1?moment(dataArray[0].检验日期).add(dataArray[0].复检周期,"days").format('YYYY-MM-DD') :null;
            this.initMainData.HPOOrderBillMTO = dataArray[0].采购跟踪号;
            this.initMainData.HSeOrderBillNo = dataArray[0].客户订单号;
            this.initMainData.HCusModel = dataArray[0].产品型号;
            this.initMainData.HMinQty = 0;
            if(this.initMainData.HMinQty>0){
                this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);