| pages.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/awaitCheckBillList/awaitCheckBillList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/shoujianjianyan/firstCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/index/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/index/tab3.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/index/tab4.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pages.json
@@ -1676,6 +1676,13 @@ "style": { "navigationBarTitleText": "设备维修记录单列表" } }, { "path" : "pages/ZLGL/awaitCheckBillList/awaitCheckBillList", "style" : { "navigationBarTitleText" : "待检验列表" } }
@@ -555,7 +555,7 @@ }, toScanCode() { MpaasScan.scanCode(cb => { this.hfrom.HBarCode = cb this.hform.HBarCode = cb this.GetMessageByBarCode(cb) }) }, pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -536,6 +536,7 @@ this.hform.HBarSpec = data[0].HModel this.hform.HBarModel = data[0].HModel2 this.hform.HQty = 1 this.tabs = 1 // 获取检验规程 this.GetItemByMouldFile() } catch (err) { pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -11,14 +11,14 @@ </view> </view> <view class="form-item"> <view class="title">工序:</view> <view class="title required">工序:</view> <view class="right"> <uni-combox :candidates="HProcNameArray" name="HProcName" id="HProcName" placeholder="请选择工序号" v-model="hform.HProcName" @input="onHProcNameChangeHandler"></uni-combox> </view> </view> <view class="form-item"> <view class="title">取样数量:</view> <view class="title required">取样数量:</view> <view class="right"> <input type="number" name="HQty" id="HQty" v-model="hform.HQty" /> </view> @@ -31,7 +31,7 @@ </view> </view> <view class="form-item"> <view class="title">送测类型:</view> <view class="title required">送测类型:</view> <view class="right"> <uni-combox :candidates="TestTypeArray" v-model="hform.TestType" @input="TestTypeChange"></uni-combox> @@ -51,14 +51,14 @@ </view> </view> <view class="form-item"> <view class="title">生产班次:</view> <view class="title required">生产班次:</view> <view class="right"> <uni-combox :candidates="HShiftsNameArray" name="HShiftsName" id="HShiftsName" placeholder="请选择生产班次" v-model="hform.HShiftsName" @input="HShiftsNameChangeHandler"></uni-combox> </view> </view> <view class="form-item"> <view class="title">生产班组:</view> <view class="title required">生产班组:</view> <view class="right"> <uni-combox :candidates="HGroupNameArray" name="HShiftsName" id="HShiftsName" placeholder="请选择生产班组" v-model="hform.HGroupName" @input="HGroupNameChangeHandler"></uni-combox> @@ -772,7 +772,7 @@ } .title { width: 5em; width: 6em; font-size: 30rpx; flex-shrink: 0; text-align: right; @@ -843,4 +843,11 @@ .placeholder__view { flex: 1; } .required::after{ content: "*"; color: red; margin-left: 4px; font-weight: bold; } </style> pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBillList.vue
@@ -596,7 +596,6 @@ width: 100%; box-sizing: border-box; padding: 32rpx 10rpx; } </style> pages/ZLGL/awaitCheckBillList/awaitCheckBillList.vue
New file @@ -0,0 +1,240 @@ <template> <view> <view class="tabs" id="tabs"> <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">首件检验单</view> <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">巡检检验单</view> <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">末件检验单</view> </view> <!-- 待检验列表 --> <view class="list" v-for="(item,index) in reportBillsDisplay" :key="index"> <uni-card :title="item.单据号" :extra="`日期: ${dayjs(item.日期).format('YYYY-MM-DD')}`" style="margin: 10px;"> <view class="card-detail"> <template v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)"> <view class="detail" v-if="HBillField.ColmType == 'DateTime'"> <text>{{ HBillField.ColmCols }}：</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }} </view> <view class="detail" v-else> <text>{{ HBillField.ColmCols }}：</text>{{ item[HBillField.ColmCols] }} </view> </template> </view> <view class="card-detail" v-if="showDetail == index"> <view class="card-detail"> <template v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)"> <view class="detail" v-if="HBillField.ColmType == 'DateTime'"> <text>{{ HBillField.ColmCols }}：</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }} </view> <view class="detail" v-else> <text>{{ HBillField.ColmCols }}：</text>{{ item[HBillField.ColmCols] }} </view> </template> </view> </view> <view class="more" v-if="showDetail == index && operations != index"> <view class="part" style="border-right: 1px solid #eee;"> <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>收起 </view> <view class="part" @tap.stop="operations = operations==index?-1:index"> <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>操作 </view> </view> <view class="more" v-if="showDetail != index && operations != index"> <view class="part" style="border-right: 1px solid #eee;"> <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>更多信息 </view> <view class="part" @tap.stop="operations = operations==index?-1:index"> <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>操作 </view> </view> <view class="op" v-if="operations == index"> <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">编辑</button> --> <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button> --> <button v-if="tabs == 0" class="op3" size="mini" plain @tap.stop="pushFirstCheckBill(item)">下推首检单</button> <button v-if="tabs == 1" class="op3" size="mini" plain @tap.stop="pushPatrolCheckBill(item)">下推巡检单</button> <button v-if="tabs == 2" class="op3" size="mini" plain @tap.stop="pushProcessCheckBill(item)">下推末检单</button> <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button> </view> </uni-card> </view> <view class="over" v-if="reportBillsDisplay.length == 0">暂无数据</view> </view> </template> <script> import { getUserInfo } from '../../../utils/auth'; import { CommonUtils } from '../../../utils/common'; import dayjs from 'dayjs'; export default { // 设备维修任务 模块 name: 'Sb_EquipRepairTaskReport', data() { return { dayjs, CommonUtils, tabs: 0, reportBillsDisplay: [], reportBillsAwaitRepair: [], // 待维修 reportBillsRepaired: [], // 已维修 reportBillsAll: [], // 全部任务 HFieldList: [], // 字段列表 sWhere: "", showDetail: -1, operations: -1, }; }, methods: { switchTab(tabIndex) { this.tabs = tabIndex switch (tabIndex) { case 0: this.reportBillsDisplay = this.reportBillsAwaitRepair; break; case 1: this.reportBillsDisplay = this.reportBillsRepaired; break; case 2: this.reportBillsDisplay = this.reportBillsAll; break; } }, async getRepairList() { try { let res = await CommonUtils.doRequest2Async({ url: 'WEBSController/AwaitCheckSampleBillList', data: { user: getUserInfo()["Czymc"] } }) let { count, data, Message, list } = res.data if (count == 1) { console.log('data: ', data); this.reportBillsAwaitRepair = data[0] this.reportBillsRepaired = data[1] this.reportBillsAll = data[2] let fieldList = CommonUtils.fieldListFilterRole({ ExcludeKeys: ['单据号', '日期'], FieldList: list }) if (fieldList.status == false) { CommonUtils.showTips({ title: '温馨提示', message: `获取表单结构失败: ${fieldList.Message}` }) } this.HFieldList = fieldList.data this.switchTab(0) } else { CommonUtils.showTips({ title: '温馨提示', message: `获取维修单异常: ${Message}` }) } } catch (err) { CommonUtils.showTips({ title: '温馨提示', message: `获取维修单异常: ${err}` }) } }, pushFirstCheckBill(item) { uni.navigateTo({ url: '/pages/ZLGL/shoujianjianyan/firstCheckBill?operationType=2&linterid=' + item.hmainid + '&HBillNo=' + item.单据号 + '&HSouceBillType=7521', // success: () => { // // 跳转成功后触发查询 // this.onSearchClickHandler() // } }) }, pushProcessCheckBill(item) { uni.navigateTo({ url: '/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=2&linterid=' + item.hmainid + '&HBillNo=' + item.单据号 + '&HSouceBillType=7521', // success: () => { // // 跳转成功后触发查询 // this.onSearchClickHandler() // } }) }, pushPatrolCheckBill(item) { uni.navigateTo({ url: '/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=2&linterid=' + item.hmainid + '&HBillNo=' + item.单据号 + '&HSouceBillType=7521', // success: () => { // // 跳转成功后触发查询 // this.onSearchClickHandler() // } }) } }, onLoad() {}, onShow() { this.getRepairList() } } </script> <style lang="scss"> @import "@/pages/MJGL/style/MJBillStyle.scss"; .op { display: flex; justify-content: space-around; margin-top: 20rpx; button { padding: 0; width: 150rpx; font-size: 25rpx; } .op1 { border: 1px solid #41a863; color: #41a863; } .op2 { border: 1px solid #d98d00; color: #d98d00; } .op3 { border: 1px solid #3a78ff; color: #3a78ff; } .op4 { border: 1px solid #da0000; color: #da0000; } .op5 { border: 1px solid #888; color: #888; } } </style> pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
Diff too large pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -88,13 +88,13 @@ </view> </view> <view class="form-item"> <view class="left">检验数量</view> <view class="left required">检验数量</view> <view class="right"> <input type="number" v-model="hform.HCheckQty" /> </view> </view> <view class="form-item"> <view class="left">检验员</view> <view class="left required">检验员</view> <view class="right"> <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="请选择检验员" v-model="hform.HFirstCheckEmpName" @@ -784,6 +784,33 @@ this.hform.HTakeSampleCheckBillNo = data[0].单据号 this.hform.HTakeSampleCheckBillID = data[0].HInterID } else if(this.hform.HSourceBillType=="3790"){ this.hform.HMaterID = data[0]['HMaterID'] this.hform.HMaterName = data[0]['产品名称'] this.hform.HMaterNumber = data[0]['产品代码'] this.hform.HMainSourceBillNo = data[0].单据号 this.hform.HSourceBillNo = data[0].单据号 this.hform.HMainSourceInterID = data[0].HInterID this.hform.HMainSourceEntryID = data[0].HEntryID this.hform.HQCSchemeName = data[0].检验方案名称 this.hform.HQCSchemeID = data[0].检验方案ID this.hform.HSourceBillQty = data[0].检验数量 this.hform.HICMOBillNo = data[0].任务单号 this.hform.HICMOInterID = data[0].HICMOInterID this.hform.HICMOEntryID = data[0].HICMOEntryID this.hform.HICMOQty = data[0].生产数量 this.hform.HCheckQty = data[0].进站数量 this.hform.HProcExchBillNo = data[0].HProcExchBillNo this.hform.HProcExchInterID = data[0].HProcExchInterID this.hform.HProcExchEntryID = data[0].HProcExchEntryID this.hform.HProcExchQty = data[0].流转卡数量 this.hform.HSourceName = data[0].生产资源 this.hform.HSourceID = data[0].HSourceID this.hform.HProcID = data[0].HProcID this.hform.HProcName = data[0].当前工序 this.hform.HTakeSampleCheckBillNo = data[0].单据号 this.hform.HTakeSampleCheckBillID = data[0].HInterID } else{ this.hform.HMaterID = data[0]['HMaterID'] this.hform.HMaterName = data[0]['产品名称'] @@ -1935,6 +1962,12 @@ }); return false; } if (this.hform.HCheckQty == 0) { CommonUtils.showTips({ message: "检验数量不得为0！", }); return false; } for (let key in this.checkItems) { if (!this.checkItems[key].HQCCheckItemID) { @@ -2243,6 +2276,7 @@ this.HSourceBillType = "取样单"; // 显示名称 this.hform.HSourceBillType = "7521"; // 对应的值 } this.hform.HTakeSampleCheckBillNo=e.HBillNo; this.hform.HTakeSampleCheckBillID=e.linterid; //取样单查询数据 @@ -2550,4 +2584,11 @@ border-radius: 100%; pointer-events: none; } .required::after{ content: "*"; color: red; margin-left: 4px; font-weight: bold; } </style> pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
Diff too large 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.102:81/API/', "陈镐哲本地测试2": 'http://192.168.0.103:81/API/', "张瑞广本地测试": 'http://localhost:8082/API/', "余思杰本地测试": 'http://localhost:8082/LuBaoAPI/', // 小卫内外网 pages/index/tab3.vue
@@ -43,15 +43,14 @@ menuListName: 'tab3', canEdit: false, serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API', itemData: [ { img: '../../static/icon/icon8.png', text: '器具档案查询', url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`, id: 1, hidden: false, }, { itemData: [{ img: '../../static/icon/icon8.png', text: '器具档案查询', url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`, id: 1, hidden: false, }, { img: '../../static/icon/icon6.png', text: '器具状态分析', tip: '查看详情', @@ -184,11 +183,11 @@ }, { "img": "../../static/icon/icon8.png", "text": "设备故障登记单", "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=1", "id": 20, "hidden": false }, "text": "设备故障登记单", "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=1", "id": 20, "hidden": false }, { "img": "../../static/icon/icon8.png", "text": "设备维修派工单", @@ -199,11 +198,11 @@ { "text": "设备维修验收单", "img": "../../static/icon/icon8.png", "text": "设备维修记录单", "url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill", "id": 22, "hidden": false }, "text": "设备维修记录单", "url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill", "id": 22, "hidden": false }, { "img": "../../static/icon/icon8.png", "text": "设备保养任务", pages/index/tab4.vue
@@ -175,6 +175,13 @@ "id": 18, "hidden": false }, { "img": "../../static/icon/icon15.png", "text": "待检验列表", "url": "/pages/ZLGL/awaitCheckBillList/awaitCheckBillList", "id": 19, "hidden": false } ] }
