| manifest.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/gongxuOut/form.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/tiaomadaying/tiaomadaying.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
manifest.json
@@ -2,8 +2,8 @@ "name": "智云LMES", "appid": "__UNI__B002F49", "description": "", "versionName": "1.0.34", "versionCode": 134, "versionName": "1.0.36", "versionCode": 136, "transformPx": false, /* 5+App特有相关 */ "app-plus": { pages/gongxuOut/form.vue
@@ -87,6 +87,21 @@ </view> </view> <view class="form-item"> <view class="title">工时:</view> <view class="right"> <input v-model="hform.HWorkTimes" placeholder="请输入工时" /> </view> </view> <view class="form-item"> <view class="title">是否计时</view> <checkbox-group name="checkboxGroup" @change="onCGChangeHandler"> <label> <checkbox :checked="hform.HIsTimeFlag == 1" value="1" /> </label> </checkbox-group> </view> <view class="tab_area"></view> <view class="form-item"> @@ -147,14 +162,7 @@ <input v-model="hform.HPRDOrg" disabled /> </view> </view> <view class="form-item has-ticking"> <checkbox-group name="checkboxGroup"> <label> <checkbox disabled :checked="hform.HHasTickingSync == 1" :value="hform.HHasTickingSync" /> <text>是否计时</text> </label> </checkbox-group> </view> <!-- <view class="form-item"> @@ -217,12 +225,7 @@ <view class="tab_area"></view> <view class="form-item"> <view class="title">工时:</view> <view class="right"> <input v-model="hform.HWorkTimes" placeholder="请输入工时" /> </view> </view> <view class="form-item"> <view class="title">操作员2:</view> <view class="right"> @@ -432,7 +435,6 @@ <view class="bottom-btn"> <button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">提交</button> <button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">修改</button> <button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">提交</button> <button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini" @tap="check">审核</button> <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini" @@ -483,7 +485,7 @@ HProcNo: '', HQty: 0, HNotReportQty: 0, HHasTickingSync: 0, HIsTimeFlag: 0, // HPieceQty:'', HWasterQty: 0, HSourceName: '', @@ -597,6 +599,11 @@ this.getDefValByUser() }, methods: { onCGChangeHandler({ detail }) { this.hform.HIsTimeFlag = detail.value[0] || 0 }, //通过登录用户获取默认值 getDefValByUser() { uni.request({ @@ -1180,7 +1187,7 @@ this.hform.HProcNo = data.HProcNo // this.hform.HQty = data.HQty // this.hform.HPieceQty= data.HPieceQty this.HHasTickingSync = data.HHasTickingSync || 0 this.HIsTimeFlag = data.HIsTimeFlag || 0 this.HNotReportQty = data.HNotReportQty this.hform.HWasterQty = data.HWasterQty this.hform.HSourceID = data.HSourceID @@ -1316,8 +1323,8 @@ this.hform.HCenterName = data.工作中心 this.hform.HCenterID = data.HCenterID this.hform.NoOutboundHqty = (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量) this.HNotReportQty = data['未报工数量'] this.HHasTickingSync = data['是否计时'] this.hform.HNotReportQty = data['未报工数量'] this.hform.HIsTimeFlag = data['是否计时'] ? 1 : 0 // this.hform.HQty = data.合格数量 if (data.首道工序 == "是") { this.FirstEndHProcNo = 1 pages/tiaomadaying/tiaomadaying.vue
@@ -182,19 +182,19 @@ this.$refs.labelPrinter.openPopup() } else { let HBarCodeNoStr = `${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${parseFloat(this.lailiaoInfo.HQty||0).toFixed(10)}@${this.lailiaoInfo.HSupNumber || ''}` // `${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${parseFloat(this.lailiaoInfo.HQty||0).toFixed(10)}@${this.lailiaoInfo.HSupNumber || ''}` `${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${this.lailiaoInfo.HQty||0}@${this.lailiaoInfo.HSupNumber || ''}` let pcsInfo = this.lailiaoInfo.HPcsName ? '(' + this.lailiaoInfo.HPcsName + ')' : '' this.printInfo = `! 0 200 200 400 1 PAGE-WIDTH 608 SETQRVER 3 B QR 480 30 Q 0 U 3 B QR 475 15 Q 0 U 3 LA,${HBarCodeNoStr} ENDQR T 24 0 0 30 供应商: ${this.lailiaoInfo.HSupName} T 55 0 0 55 (Supplier) T 24 0 0 75 供应商料号: ${this.lailiaofo.HMaterNumber} T 24 0 0 75 供应商料号: ${this.lailiaoInfo.HMaterNumber} T 55 0 0 100 (Supplier Sku No.) T 24 0 0 120 物料名称: ${this.lailiaoInfo.HMaterName} T 55 0 0 145 (Material Code) @@ -202,11 +202,11 @@ T 55 0 0 190 (Style No.) T 24 0 300 165 客户编号: ${this.lailiaoInfo.HCustomNo} T 55 0 300 190 (Consumer No.) T 24 0 0 210 分组: ${this.lailiaoInfo.HGroup} T 24 0 0 210 分组: ${this.lailiaoInfo.HGroup || ''} T 55 0 0 235 (Group) T 24 0 300 210 规格: ${this.lailiaoInfo.HMaterModel} T 55 0 300 235 (SKU NO.) T 24 0 0 255 数量: ${this.lailiaoInfo.HQty} ${pcsInfo} T 24 0 0 255 数量: ${ parseFloat(this.lailiaoInfo.HQty || 0).toFixed(0) } ${pcsInfo} T 55 0 0 280 (Quantity) T 24 0 300 255 日期: ${this.lailiaoInfo.HDate || ''} T 55 0 300 280 (Date) @@ -232,15 +232,7 @@ }) } }, setLailiaoInfo(data, row) { if (row > data.length) { CommonUtils.playSound(0) return uni.showToast({ icon: 'none', title: '查询的单据号不存在...' }) } setLailiaoInfo(data, row, HQty) { let d = data[0] console.log('数量: ', parseFloat(d['数量']).toFixed(10)); this.lailiaoInfo = Object.assign(this.lailiaoInfo, { @@ -248,7 +240,7 @@ HMaterName: d['物料名称'], HMaterModel: d['规格型号'], // HBatchNo: d['批号'], HQty: d['数量'], HQty: !CommonUtils.isEmpty(HQty) ? HQty : d['数量'], HMinQty: d['数量'], HBQty: d['数量'], HSupID: d['HSupID'], @@ -320,7 +312,7 @@ }) } let barCodeInfo = barCode.split("@") let [PurchaseBillNo, Row] = barCodeInfo let [PurchaseBillNo, Row, MaterNumber, MTO, HQty, HSupNumber] = barCodeInfo this.lailiaoInfo.HBillNo = PurchaseBillNo this.lailiaoInfo.HSourceBillNo = PurchaseBillNo this.lailiaoInfo.HBillLineNo = Row @@ -342,7 +334,7 @@ } = res.data if (count > 0) { console.log('data: ', data); this.setLailiaoInfo(data, Row) this.setLailiaoInfo(data, Row, HQty) // uni.showToast({ // icon: 'none', // title: Message @@ -421,7 +413,7 @@ }, GenereateBarCode() { let HBarCodeNoStr = `${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${parseFloat(this.lailiaoInfo.HQty || 0).toFixed(10)}@${this.lailiaoInfo.HSupNumber || ''}` `${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${this.lailiaoInfo.HQty || 0}@${this.lailiaoInfo.HSupNumber || ''}` let sMain = [] sMain[0] = this.lailiaoInfo let sMainStr = JSON.stringify(sMain);
