diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue index 5b0177b9..04568889 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue @@ -108,7 +108,7 @@ - +
-
@@ -146,10 +146,14 @@ - + + + =this.form.checkNum){ - this.$modal.msgError("生成编码数量不可超过采购验收数量！！！"); - }else{ - for(let i = 0; i < this.form.count; i++) { - let obj = { - typeName:this.form.typeName, - specificationType:this.form.specificationType, - typeId: this.form.typeId, - taskId: this.form.taskId, - assetsCode:'', - isFixed:this.form.isFixed, - } - this.newCodeList.push(obj) - } - console.log(this.newCodeList,'this.newCodeList') - this.codeList = this.getCodeList.concat(this.newCodeList) - } + // if(this.codeList.length>=this.form.checkNum){ + // this.$modal.msgError("生成编码数量不可超过采购验收数量！！！"); + // }else{ + // for(let i = 0; i < this.form.count; i++) { + // let obj = { + // typeName:this.form.typeName, + // specificationType:this.form.specificationType, + // typeId: this.form.typeId, + // taskId: this.form.taskId, + // assetsCode:'', + // isFixed:this.form.isFixed, + // } + // this.newCodeList.push(obj) + // } + // console.log(this.newCodeList,'this.newCodeList') + // this.codeList = this.getCodeList.concat(this.newCodeList) + // } }, //填充按钮 fillingCodeList(){ console.log(Number(this.form.str)) this.codeList = [] let num = Number(this.form.str) - console.log(Number(this.form.str1)) + // console.log(Number(this.form.str1)) let num1 = Number(this.form.str1) let count= num1-num+1;//生成数量 - + console.log() let sum = count + this.form.bindNum; console.log(sum) - if(sum>this.form.checkNum){ - this.$modal.msgError("编码数量已超过验收数量"); - }else{ + // if(sum>this.form.checkNum){ + // this.$modal.msgError("已绑定编码"+this.form.bindNum+"个,总数量已超过验收数量，请调整后缀范围。"); + // }else{ if(num1>num){ for(let i = 0; i < count; i++) { let obj = { @@ -380,14 +389,16 @@ export default { specificationType:this.form.specificationType, typeId: this.form.typeId, taskId: this.form.taskId, - maCode:this.form.exCode+(i+num), + maCode:this.form.exCode+("00000" + (num+i)).slice(-4), assetsCode:'', isFixed:this.form.isFixed, } this.codeList.push(obj) } + }else{ + this.$modal.msgError("编码后缀范围输入格式不正确"); } - } + // } }, /** 提交按钮 */ @@ -407,15 +418,14 @@ export default { }else{ editPurchaseMacode(this.codeList).then(response => { console.log(response.data) - if(response.data && response.length>0){ + if(response.data && response.data.length>0){ this.codeList = response.data; + this.$modal.msgError("编码绑定失败,存在重复编码，请重新输入"); }else{ - this.$modal.msgSuccess("绑定成功"); + this.$modal.msgSuccess("编码绑定成功"); this.open = false; this.getList(); - } - - + } }); } @@ -434,13 +444,19 @@ export default { }); }, delCode(row) { - const maCode = row.maCode ; - this.$modal.confirm('是否确认删除该数据项？').then(function() { - return delMacodeList(maCode); - }).then(() => { - this.getdetailmaCodeList(row); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); + console.log(row) + this.codeList.forEach((item,index) => { + if(item.maCode==row.maCode){ + this.codeList.splice(index,1) + } + }); + // const maCode = row.maCode ; + // this.$modal.confirm('是否确认删除该数据项？').then(function() { + // return delMacodeList(maCode); + // }).then(() => { + // this.getdetailmaCodeList(row); + // this.$modal.msgSuccess("删除成功"); + // }).catch(() => {}); }, // 返回列表页 jumpList(){ diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue index d3121124..43a300e6 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue @@ -76,7 +76,19 @@ - + + + + + + + diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue index 9cb19e2b..ce1b6287 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue @@ -118,9 +118,10 @@ - + @@ -135,6 +136,7 @@ size="mini" type="text" icon="el-icon-edit" + v-if="scope.row.taskStatus=='26'" @click="handleUpdate(scope.row)" >审核 @@ -253,12 +255,15 @@ - + - + @@ -266,11 +271,13 @@ 通过 不通过 @@ -453,16 +460,17 @@ export default { row.taskId = this.query.taskId; let obj = { taskId:this.query.taskId, - checkResult:'1',//1 审核通过 2 驳回 -必填 maId:row.maId, + inputNum:row.checkNum, maCode:row.maCode, typeId:row.typeId, - - // remark:row.remark, - // repairNum:row.repairNum, } - let param =[obj] + let param ={ + taskId:this.query.taskId, + checkResult:'1', + inputRecordList:[obj] + } changePutinStatus(param).then(response => { if(response.code==200){ this.$modal.msgSuccess("审批成功"); @@ -477,11 +485,17 @@ export default { console.log(this.ids) this.ids.forEach(item => { item.taskId = this.query.taskId; - item.checkType = '1' - item.type= item.manageType//0.编号 1.计数 + item.typeId= item.typeId + item.maId= item.maId + item.inputNum= item.checkNum + item.maCode= item.maCode }); - - changePutinStatus(this.ids).then(response => { + let param ={ + taskId:this.query.taskId, + checkResult:'1', + inputRecordList:this.ids + } + changePutinStatus(param).then(response => { if(response.code==200){ this.$modal.msgSuccess("审批成功"); this.getDialogTable(); @@ -497,16 +511,17 @@ export default { row.taskId = this.query.taskId; let obj = { taskId:this.query.taskId, - id:row.id, - checkType:'2',//1 审核通过 2 驳回 -必填 - type:row.manageType,//0.编号 1.计数 maId:row.maId, + maCode:row.maCode, + inputNum:row.checkNum, typeId:row.typeId, - remark:row.remark, - repairNum:row.repairNum, } - let param =[obj] + let param ={ + taskId:this.query.taskId, + checkResult:'2', + inputRecordList:[obj] + } changePutinStatus(param).then(response => { if(response.code==200){ this.$modal.msgSuccess("审批成功"); @@ -521,11 +536,18 @@ export default { console.log(this.ids) this.ids.forEach(item => { item.taskId = this.query.taskId; - item.checkType = '2' - item.type=item.manageType + item.typeId= item.typeId + item.maId= item.maId + item.inputNum= item.checkNum + item.maCode= item.maCode }); + let param ={ + taskId:this.query.taskId, + checkResult:'2', + inputRecordList:this.ids + } - changePutinStatus(this.ids).then(response => { + changePutinStatus(param).then(response => { if(response.code==200){ this.$modal.msgSuccess("审批成功"); this.getDialogTable(); diff --git a/sgzb-ui/src/views/store/shelves/shelvesConfig.vue b/sgzb-ui/src/views/store/shelves/shelvesConfig.vue index c3d26f7c..a9c85bd8 100644 --- a/sgzb-ui/src/views/store/shelves/shelvesConfig.vue +++ b/sgzb-ui/src/views/store/shelves/shelvesConfig.vue @@ -99,17 +99,17 @@ - + - - - - - + + + + + - 删除 + >删除 --> @@ -355,16 +355,7 @@ export default { status: undefined, deptId: undefined }, - // 列信息 - columns: [ - { key: 0, label: `用户编号`, visible: true }, - { key: 1, label: `用户名称`, visible: true }, - { key: 2, label: `用户昵称`, visible: true }, - { key: 3, label: `部门`, visible: true }, - { key: 4, label: `手机号码`, visible: true }, - { key: 5, label: `状态`, visible: true }, - { key: 6, label: `创建时间`, visible: true } - ], + // 表单校验 rules: { userName: [ @@ -432,8 +423,8 @@ export default { }, // 节点单击事件 handleNodeClick(data) { - this.queryParams.deptId = data.id; - this.handleQuery(); + // this.queryParams.deptId = data.id; + // this.handleQuery(); }, // 取消按钮 diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue index 0b48c134..e8178f5b 100644 --- a/sgzb-ui/src/views/store/tools/devices.vue +++ b/sgzb-ui/src/views/store/tools/devices.vue @@ -1,57 +1,72 @@ + - - + + @@ -104,12 +120,13 @@