| manifest.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/shoujianjianyan/firstCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/index/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
manifest.json
@@ -2,8 +2,8 @@ "name" : "智云LMES", "appid" : "__UNI__B002F49", "description" : "", "versionName" : "2.0.60", "versionCode" : 260, "versionName" : "2.0.61", "versionCode" : 261, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -51,7 +51,7 @@ <view class="right disabled"> <input type="text" :value="hform.HICMOBillNo" disabled /> </view> </view> <view class="form-item"> @@ -59,7 +59,7 @@ <view class="right disabled"> <input type="text" :value="hform.HProcExchBillNo" disabled /> </view> </view> <view class="form-item"> <view class="left">取样单号</view> @@ -74,8 +74,7 @@ <input type="text" disabled :value="hform.HMaterNumber" /> </view> <view class="icon-wrapper-big"> :disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons> <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons> </view> </view> <view class="form-item"> @@ -1178,7 +1177,7 @@ let res = await CommonUtils.doRequest2Async({ url: "/Gy_Employee/list", data: { sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' `, user: getUserInfo()["Czymc"], Organization: uni.getStorageSync("Organization"), }, @@ -1959,7 +1958,8 @@ try { console.log('this.$refs: ', this.$refs); // 检查是否有未切换的检验值模块(是否包含set_SaveValue方法),如果有，则运行一次保存检验值的方法，根据检验值是否保存成功再执行下一步 if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules.length > if (typeof this.$refs.InspectValueModules != "undefined" && this.$refs.InspectValueModules .length > 0) { // 加载有检验值模块 await this.$refs.InspectValueModules[0].set_SaveValue(); @@ -1982,7 +1982,7 @@ checkItemsArray.push(checkItem); } console.log('checkItemsArray: ', checkItemsArray); console.log("this.checkItems: ", this.checkItems); let res = await CommonUtils.doRequest2Sync({ @@ -2014,9 +2014,9 @@ }); } else if (res.cancel) { console.log("用户点击取消"); setTimeout(() => { uni.navigateBack(); }, 50) setTimeout(() => { uni.navigateBack(); }, 50) } }, }); @@ -2256,6 +2256,11 @@ this.hform.HInterID = e.linterid || 0; if (this.operationType == 1) { await this.getMaxBillNo(); if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") { this.HSourceBillType = "工序出站汇报单"; // 显示名称 this.hform.HSourceBillType = "3791"; // 对应的值 } } else if (this.operationType == 2) { //有源单下推 await this.getMaxBillNo(); @@ -2264,6 +2269,7 @@ if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") { this.HSourceBillType = "取样单"; // 显示名称 this.hform.HSourceBillType = "7521"; // 对应的值 this.hform.HSourceBillNo = e.HBillNo; } this.hform.HTakeSampleCheckBillNo = e.HBillNo; this.hform.HTakeSampleCheckBillID = e.linterid; @@ -2273,10 +2279,7 @@ } else if (this.operationType == 3) { await this.RoadBillMain(); } if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") { this.HSourceBillType = "工序出站汇报单"; // 显示名称 this.hform.HSourceBillType = "3791"; // 对应的值 } await this.InitHSource(); await this.InitHWorkShift(); await this.InitHEmp(); @@ -2415,7 +2418,7 @@ } .btn-c { background-color: #FFA500; background-color: #FFA500; color: #fff; // position: absolute; // right: 120rpx; pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -1249,6 +1249,7 @@ this.hform.HQCSchemeName = data[0].检验方案名称; this.hform.HQCSchemeID = data[0].检验方案ID; this.hform.HProcName = data[0].当前工序; this.hform.HCheckQty = data[0].取样数量 this.hasSourceBill = true this.get_CheckItem(); } catch (err) { @@ -2275,7 +2276,8 @@ if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") { this.HSourceBillType = "取样单"; // 显示名称 this.hform.HSourceBillType = "7521"; // 对应的值 } this.hform.HSourceBillNo = e.HBillNo } this.hform.HTakeSampleCheckBillNo=e.HBillNo; this.hform.HTakeSampleCheckBillID=e.linterid; pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -79,7 +79,7 @@ </view> </view> <view class="form-item"> <view class="left required">检验数量</view> <view class="right"> <input type="number" v-model="hform.HCheckQty" /> @@ -957,7 +957,7 @@ let res = await CommonUtils.doRequest2Async({ url: "/Gy_Employee/list", data: { sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' order by 部门代码`, sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' `, user: getUserInfo()["Czymc"], Organization: uni.getStorageSync("Organization"), }, @@ -1771,9 +1771,9 @@ }); } else if (res.cancel) { console.log("用户点击取消"); setTimeout(() => { uni.navigateBack(); }, 50) setTimeout(() => { uni.navigateBack(); }, 50) } }, }); @@ -1823,7 +1823,7 @@ return; } this.hform.HProcExchBillNo = data[0].流转卡号; this.hform.HSourceBillNo = data[0].流转卡号; // this.hform.HSourceBillNo = data[0].流转卡号; this.hform.HProcExchInterID = data[0].HProcExchInterID; this.hform.HProcExchEntryID = data[0].HProcExchEntryID; this.hform.HProcExchQty = data[0].流转卡数量 || 0; @@ -2015,32 +2015,37 @@ this.hform.HInterID = e.linterid || 0; if (this.operationType == 1) { await this.getMaxBillNo(); if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") { this.HSourceBillType = "工序流转卡"; // 显示名称 this.hform.HSourceBillType = "3772"; // 对应的值 } } else if (this.operationType == 2) { //有源单下推 await this.getMaxBillNo(); if (e.HSouceBillType == "7521") { await this.LoadingInformation_TakeSampleCheckBill(e.linterid); await this.$nextTick() if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") { this.HSourceBillType = "取样单"; // 显示名称 this.hform.HSourceBillType = "7521"; // 对应的值 this.hform.HSourceBillNo = e.HBillNo } this.hform.HTakeSampleCheckBillNo = e.HBillNo; this.hform.HTakeSampleCheckBillID = e.linterid; //取样单查询数据 await this.LoadingInformation_TakeSampleCheckBill(e.linterid); } } else if (this.operationType == 3) { await this.RoadBillMain(); } await this.InitHSource(); await this.InitHWorkShift(); await this.InitHEmp(); if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") { this.HSourceBillType = "工序流转卡"; // 显示名称 this.hform.HSourceBillType = "3772"; // 对应的值 } }, }; @@ -2176,8 +2181,8 @@ } .btn-c { // background-color: #acacac; background-color: #FFA500; // background-color: #acacac; background-color: #FFA500; color: #fff; // position: absolute; // right: 120rpx; pages/index/login.vue
@@ -110,7 +110,7 @@ "杭州凯贝奈特外网": 'http://erp.hzcabinet.cn:9090/API/', "翁涛涛本地测试": 'http://localhost:81/API/', "陈镐哲本地测试": 'http://192.168.0.121:81/API/', "陈镐哲本地测试2": 'http://192.168.0.103:81/API/', "陈镐哲本地测试2": 'http://192.168.89.27:81/API/', "张瑞广本地测试": 'http://localhost:8082/API/', "余思杰本地测试": 'http://localhost:8082/LuBaoAPI/', // 小卫内外网 @@ -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: '',
