diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue index de7f293e..5fe98a6a 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue @@ -400,7 +400,9 @@ export default { // this.isEdit = true // this.getTaskInfo() // } + }, + created() { if (this.isEdit) { this.taskId = this.editTaskId this.getTaskInfo() @@ -559,6 +561,24 @@ export default { if (this.equipmentList.length > 0) { this.$refs['maForm'].validate((valid) => { if (valid) { + const productionTime = + this.queryParams.productionTime + ?.split('-') + .join('') - 0 + const purchaseTime = + this.maForm.purchaseTime?.split('-').join('') - 0 + const arrivalTime = + this.maForm.arrivalTime?.split('-').join('') - 0 + + if (productionTime > purchaseTime) { + this.$message.error('出厂日期不可在采购日期之后') + return + } + if (productionTime > arrivalTime) { + this.$message.error('出厂日期不可在到货日期之后') + return + } + // console.log(this.maForm,'maForm') // console.log(this.equipmentList,'equipmentList') let isEmpty = true diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue index 8caba1d2..893569c0 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue @@ -257,6 +257,7 @@ v-model="scope.row.maCode" :disabled="scope.row.statusFlag == 0" οninput="value=value.replace(/[^0-9.]/g,'')" + maxlength="24" > {{ scope.row.maCode }} diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue index ce827f2d..103fe936 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue @@ -360,6 +360,7 @@ type="textarea" :autosize="{ minRows: 4, maxRows: 6 }" placeholder="请输入通知内容" + maxlength="500" style="width: 80%" /> diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index b1eca687..bfdbfdbb 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -44,10 +44,10 @@ module.exports = { // target: `https://z.csgmall.com.cn`, // target: `http://10.40.92.60:28080`, //超 - target: `http://10.40.92.81:28080`, //韩/ + // target: `http://10.40.92.81:28080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.140:28080`, //帅 - // target: `http://10.40.92.253:28080`, //福 + target: `http://10.40.92.253:28080`, //福 //******** 注意事项 ********* */ //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;