| components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| components/BillListPopup/BillListPopupMouldConkBookBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
components/BillListPopup/BillListPopuMouldRepairRecordPopup.vue
@@ -225,7 +225,7 @@ sWhere += ` and (单据号 like '%${this.HBillNo}%' `; } sWhere += ` and isnull(维修人,'')!='${uni.getStorageSync('HUserName')}$' ` sWhere += ` and isnull(关闭人,'')!='' ` sWhere += ` and isnull(关闭人,'') ='' ` return sWhere; },
@@ -139,6 +139,15 @@ type: Boolean, default: false, required: false }, // 新增：是否忽略关闭人过滤条件 ignoreClosePersonFilter: { type: Boolean, default: false }, HMouldID: { type: Number, default: 0 } }, model: { @@ -242,11 +251,16 @@ if (this.HName) { sWhere += ` and 产品模具 like '%${this.HName}%'` } if (this.HMouldID && this.HMouldID > 0) { sWhere += ` and HMouldID = ${this.HMouldID}` } if (this.HBillNo) { sWhere += ` and 单据号 like '%${this.HBillNo}%'` } sWhere += ` and isnull(关闭人,'')!='' ` // 关键修改：只有当不忽略过滤时，才添加关闭人条件 if (!this.ignoreClosePersonFilter) { sWhere += ` and isnull(关闭人,'') ='' ` } return sWhere }, getBillList() { pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -99,7 +99,7 @@ </zxz-uni-data-select> </view> <view class="form-item"> <view class="title">验收项目:</view> <view class="title required">验收项目:</view> <zxz-uni-data-select class="right" :localdata="HRepairCheckList" dataKey="维修验收项目" dataValue="hitemid" v-model="hform.HRepairCheckMainID"> </zxz-uni-data-select> @@ -210,8 +210,9 @@ <button class="btn-c" size="mini" @tap="goBack">退出</button> </view> <!-- 弹出模具故障登记单的选择列表 --> <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"> <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HMouldID="hform.HMouldID" :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID" :ignore-close-person-filter="true"> </BillListPopupMouldConkBookBillVue> <!-- 弹出模具维修记录单的选择列表 --> <RepairRecordPopup ref="repairRecordList" :HBillType="hform.HBillType" :HStockOrgID="hform.HStockOrgID"> @@ -324,36 +325,42 @@ methods: { // 提交数据有效性校验 ValidCheck() { if (this.hform.HEquipID == 0) { if (this.hform.HEquipID == 0 || this.hform.HEquipID === undefined) { return { Message: "未录入模具信息，请先录入模具信息!", state: false } } if (this.hform.HDeptID == 0) { if (this.hform.HDeptID == 0 || this.hform.HDeptID === undefined) { return { Message: "部门不得为空!", state: false } } if (this.hform.HEmpID == 0) { if (this.hform.HEmpID == 0 || this.hform.HEmpID === undefined) { return { Message: "验收人不得为空!", state: false } } // if (this.hform.HRepairCheckMainID == 0) { // return { // Message: "验证项目不得为空!", // state: false // } // } if (this.hform.HManagerID == 0) { if (this.hform.HRepairCheckMainID == 0 || this.hform.HRepairCheckMainID === undefined) { return { Message: "验收项目不得为空!", state: false } } if (this.hform.HManagerID == 0 || this.hform.HManagerID === undefined) { return { Message: "负责人不得为空!", state: false } } if (this.hform.HMouldRepairWorkID == 0 || this.hform.HMouldRepairWorkID === undefined) { return { Message: "维修记录不得为空!", state: false } } return { Message: "", pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -281,8 +281,9 @@ </view> <!-- 新增弹窗组件 --> <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"> <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HMouldID="hform.HMouldID" :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID" :ignore-close-person-filter="false"> </BillListPopupMouldConkBookBillVue> </view> </template> @@ -828,7 +829,7 @@ if (res.confirm) { console.log('用户点击确定'); uni.redirectTo({ // url: './Sc_MouldRepairSendWorkBill?operationType=1' url: './Sc_MouldRepairSendWorkBill?operationType=1' }) } else if (res.cancel) { console.log('用户点击取消'); pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
@@ -79,26 +79,6 @@ </view> </view> <view class="form-item"> <view class="title">维修内容</view> <view class="right"> <textarea v-model="hform.HRepairContent" style="height: 6em;" maxlength="2000" placeholder="请输入维修内容..." /> </view> </view> <view class="form-item"> <view class="title required">计划维修工时</view> <view class="right"> <input type="number" name="HPlanTimes" v-model="hform.HPlanTimes" @focus="hform.HPlanTimes = ''" /> </view> </view> <view class="form-item"> <view class="title required">实际维修工时</view> <view class="right"> <input type="number" name="HTimes" v-model="hform.HTimes" @focus="hform.HTimes = ''" /> </view> </view> <view class="form-item"> <view class="title">单据号</view> <view class="righton"> <input name="HInterID" disabled v-model="hform.HBillNo" /> @@ -120,13 +100,6 @@ </view> </view> <view class="form-item"> <view class="title required">维修人</view> <view class="right"> <uni-combox :candidates="EmpNameList" placeholder="请选择发现人" v-model="hform.HEmpName" @input="EmpChange"></uni-combox> </view> </view> <view class="form-item"> <view class="title required">负责人</view> <view class="right"> <uni-combox :candidates="EmpNameList" placeholder="请选择负责人" v-model="hform.HManagerName" @@ -134,10 +107,38 @@ </view> </view> <view class="form-item"> <view class="title">维修项目</view> <view class="title required">维修人</view> <view class="right"> <uni-combox :candidates="EmpNameList" placeholder="请选择发现人" v-model="hform.HEmpName" @input="EmpChange"></uni-combox> </view> </view> <view class="form-item"> <view class="title required">维修项目</view> <view class="right"> <uni-combox :candidates="RepairNameNameList" placeholder="请选择维修项目" v-model="hform.HRepairName" @input="RepairNameChange"></uni-combox> </view> </view> <view class="form-item"> <view class="title">计划维修工时</view> <view class="right"> <input type="number" name="HPlanTimes" v-model="hform.HPlanTimes" @focus="hform.HPlanTimes = ''" /> </view> </view> <view class="form-item"> <view class="title">实际维修工时</view> <view class="right"> <input type="number" name="HTimes" v-model="hform.HTimes" @focus="hform.HTimes = ''" /> </view> </view> <view class="form-item"> <view class="title">维修内容</view> <view class="right"> <textarea v-model="hform.HRepairContent" style="height: 6em;" maxlength="2000" placeholder="请输入维修内容..." /> </view> </view> <view class="form-item"> @@ -255,8 +256,9 @@ <button class="btn-c" size="mini" @tap="goBack">退出</button> </view> </view> <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"> <BillListPopupMouldConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HMouldID="hform.HMouldID" :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID" :ignore-close-person-filter="false"> </BillListPopupMouldConkBookBillVue> <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue> <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue> @@ -1086,17 +1088,17 @@ let message = '' if (!this.hform.HMainSourceBillNo && this.hform.HMainSourceBillType != '1') { message = '未填写故障登记单' message = '请选择故障登记单' } else if (!this.hform.HDeptName) { message = '未填写部门' message = '请选择部门' } else if (!this.hform.HEmpName) { message = '未填写维修人' message = '请选择维修人' } else if (!this.hform.HManagerName) { message = '未填写负责人' message = '请选择负责人' } // else if (!this.hform.HRepairName) { // message = '未填写维修项目' // } else if (!this.hform.HRepairName) { message = '请选择维修项目' } if (!message) { return true
