直接调拨单 生产调拨单校验 修复 扫描仓位后,仓位下拉框中没有值的问题
7个文件已修改
49 ■■■■■ 已修改文件
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchandiaobo/MoveStockBill.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/zhijiediaobo/MoveStockBill.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.0.69",
    "versionCode" : 269,
    "versionName" : "2.0.71",
    "versionCode" : 271,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
@@ -450,7 +450,7 @@
            },
            addNew() {
                uni.redirectTo({
                    url: './Sb_EquipRepairSendWorkBill?operationType=1'
                    url: './Sb_EqpMaintenanceBill?operationType=1'
                })
            },
            goBack() {
@@ -581,11 +581,15 @@
            },
            // 获取职员数据
            async getEmpList() {
                let sWhere=  " where 1=1"
                if(this.hform.HDeptName){
                    // sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
                }
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/PublicPageMethod/UserList',
                        data: {
                            sWhere: " where 1=1",
                            sWhere: sWhere
                        }
                    })
@@ -654,8 +658,11 @@
            },
            async GetMessageByHMainSourceBillNo(HSouceBillNo) {
                try {
                    let url = ''
                    let dataField = ''
                    // 根据源单类型选择不同的接口
                    if (this.hform.HMainSourceBillType === '设备维修登记单') {
                    if (this.hform.HMainSourceBillType === '设备维修登记单')
                    {
                        url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
                        dataField = {
                            sWhere: ` and 单据号 = '${HSouceBillNo}'`,
@@ -796,7 +803,6 @@
                    let sSubStr = JSON.stringify(this.HDetailList);
                    let sMainSub = oMain + ';' + sSubStr;
                    console.log('sMainSub: ',sMainSub);
                    let res = await CommonUtils.doRequest2Sync({
                        url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
                        data: {
@@ -845,7 +851,7 @@
                                if (res.confirm) {
                                    console.log('用户点击确定');
                                    uni.redirectTo({
                                        url: './Sb_EquipRepairSendWorkBill?operationType=1'
                                        url: './Sb_EqpMaintenanceBill?operationType=1'
                                    })
                                } else if (res.cancel) {
                                    console.log('用户点击取消');
pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
@@ -305,6 +305,8 @@
            <button class="btn-a" v-if="operationType!=4" size="mini" @tap="addNew">新增</button>
            <button class="btn-c" size="mini" @tap="goBack">退出</button>
        </view>
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
            :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="handleSourceBill"></BillListPopupVue>
    </view>
</template>
@@ -323,11 +325,13 @@
        getUserStockRelation
    } from '@/utils/userRelationManager';
    import FIFOListComponentVue from "@/components/FIFOListModule/FIFOListComponent.vue";
    import BillListPopupVue from "@/components/BillListPopup/BillListPopup.vue";
    export default {
        // 销售出库单(验证)
        name: 'Kf_SellOutBill_CusBar_APP',
        components: {
            FIFOListComponentVue
            FIFOListComponentVue,
            BillListPopupVue
        },
        data() {
            return {
@@ -455,6 +459,10 @@
            }
        },
        methods: {
            // 接收源单
            handleSourceBill(e){
            },
            // 条码删除
            async delMater(item) {
                uni.showModal({
@@ -1485,7 +1493,7 @@
                }
                try {
                    console.log('HStockPlaceID: ',this.hform.HStockPlaceID);
                    console.log('HStockPlaceID: ', this.hform.HStockPlaceID);
                    let oMain = JSON.stringify(this.hform)
                    console.log('oMain: ', oMain);
                    let res = await CommonUtils.doRequest2Sync({
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -642,6 +642,7 @@
                    HMainSourceEntryID: "1",
                    HMainSourceBillNo: "",
                    HStockOrgID: uni.getStorageSync('OrganizationID'),
                    HRemarkSN: '' // SN码记录
                },
                // 检验项目和抽样检验 值
                checkItems: {},
@@ -689,6 +690,7 @@
                });
            },
            async getSourceBillInfo(HBarCode) {
                let HBarCodeOld = HBarCode
                console.log('HBarCode: ', HBarCode);
                let res = await CommonUtils.doRequest2Async({
                    url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
@@ -767,6 +769,7 @@
                        this.hform.HProcID = data[0].HProcID
                        this.hform.HProcName = data[0].当前工序
                    }
                    this.hform.HRemarkSN = HBarCodeOld // 所扫描的条码存SN字段
                    this.get_CheckItem();
                } else {
                    CommonUtils.showTips({
@@ -855,7 +858,7 @@
                            this.hform.HProcID = data[0].HProcID
                            this.hform.HProcName = data[0].当前工序
                        }
                        this.get_CheckItem();
                        this.hasSourceBill = true
                        this.$refs['billList'].exit()
pages/index/login.vue
@@ -127,7 +127,7 @@
                    "宁波华舟包装2": "http://192.168.88.167:8082/API_NW/",
                    "宁波华舟包装": "http://61.164.64.222:8082/API_WW/",
                },
                serverUrlName: uni.getStorageSync('serverUrlName') || '宁波四维尔-外网',
                serverUrlName: uni.getStorageSync('serverUrlName') || '锦隆-智能家居-外网',
                arrayOrganization: [],
                Organization: '',
pages/shengchandiaobo/MoveStockBill.vue
@@ -498,7 +498,7 @@
                        this.hform.HOutStockPlaceID = res.data.data[0].HMainID
                        this.hform.HOutStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HSCWHID = res.data.data[0].HWHID
                        this.hform.HSCWHName = res.data.data[0].所属仓库
                        this.HSCWHNameChange(res.data.data[0].所属仓库)
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
@@ -548,7 +548,7 @@
                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        this.hform.HWHName = res.data.data[0].所属仓库
                        this.HWHInNameChange(res.data.data[0].所属仓库)
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
pages/zhijiediaobo/MoveStockBill.vue
@@ -694,7 +694,8 @@
                        this.hform.HOutStockPlaceID = res.data.data[0].HMainID
                        this.hform.HOutStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HSCWHID = res.data.data[0].HWHID
                        this.hform.HSCWHName = res.data.data[0].所属仓库
                        // this.hform.HSCWHName = res.data.data[0].所属仓库
                        this.HSCWHNameChange(res.data.data[0].所属仓库)
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',
@@ -744,7 +745,8 @@
                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
                        this.hform.HWHName = res.data.data[0].所属仓库
                        // this.hform.HWHName = res.data.data[0].所属仓库
                        this.HWHInNameChange(res.data.data[0].所属仓库)
                    } else {
                        uni.showToast({
                            title: '仓位数据请求失败',