diff --git a/src/api/claimAndRefund/receive.js b/src/api/claimAndRefund/receive.js index 31d555e..b57fbcd 100644 --- a/src/api/claimAndRefund/receive.js +++ b/src/api/claimAndRefund/receive.js @@ -300,6 +300,14 @@ export function auditAll(params) { }) } +// 获取费用承担方 +export function getCostBearingApi() { + return request({ + url: '/material/base/dic/pid', + method: 'get', + }) +} + diff --git a/src/api/cost/cost.js b/src/api/cost/cost.js index a9dc86c..c84f066 100644 --- a/src/api/cost/cost.js +++ b/src/api/cost/cost.js @@ -55,6 +55,39 @@ export function settlementReview(query) { params: query }) } +/** + * 7.29 + */ + +/** 完工结算查询 */ +export const getComSellQueryApi = (params) => { + return request.post('/material/sltAgreementInfo/getSltInfo', params) +} +/** 编辑后保存接口 */ +export const editSaveApi = (params) => { + return request.post('/material/sltAgreementInfo/updateTrimDay', params) +} +/** 确认结算接口 01和03费用承担方单独结算接口*/ +export const submitFeeBearApi = (params) => { + return request.post('/material/sltAgreementInfo/submitFeeBear', params) +} +/** 获取月结记录接口*/ +export const getMonthRecordApi = (params) => { + return request.post('/material/sltAgreementInfo/getSltInfoMonth', params) +} + +/** 确认结算接口所有结算*/ +export const submitAllFeeBearApi = (params) => { + return request.post('/material/sltAgreementInfo/submitFee', params) +} +/** 结算审核通过接口*/ +export const costAuditingPassApi = (params) => { + return request.get('/material/sltAgreementInfo/settlementReview', { + params + }) +} + + diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue index d76380f..fe95a43 100644 --- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue +++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue @@ -17,6 +17,7 @@ clearable style="width: 240px" :disabled="isEdit" + @change="leaseTypeChange" > + + + + + - diff --git a/src/views/claimAndreturn/picking/apply/component/home1.vue b/src/views/claimAndreturn/picking/apply/component/home1.vue index 973da7e..19a9c61 100644 --- a/src/views/claimAndreturn/picking/apply/component/home1.vue +++ b/src/views/claimAndreturn/picking/apply/component/home1.vue @@ -16,6 +16,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + style="width: 240px" > @@ -525,7 +526,7 @@ export default { /** 导出按钮操作 */ handleExport() { this.download( - '/material/base/tm_task/applyExport', + 'material/base/tm_task/applyExport', { ...this.queryParams, }, diff --git a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue index b3f1fe9..fc8ebcc 100644 --- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue +++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue @@ -54,6 +54,15 @@ @keyup.enter.native="handleQuery" /> + + + - - - - - - - - - diff --git a/src/views/cost/csotSettlement/component/exportDialog.vue b/src/views/cost/csotSettlement/component/exportDialog.vue new file mode 100644 index 0000000..d628b3f --- /dev/null +++ b/src/views/cost/csotSettlement/component/exportDialog.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue new file mode 100644 index 0000000..a90ad2b --- /dev/null +++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue @@ -0,0 +1,414 @@ + + + + + diff --git a/src/views/cost/csotSettlement/component/finishTable.vue b/src/views/cost/csotSettlement/component/finishTable.vue new file mode 100644 index 0000000..df04fca --- /dev/null +++ b/src/views/cost/csotSettlement/component/finishTable.vue @@ -0,0 +1,420 @@ + + + + + diff --git a/src/views/cost/csotSettlement/component/monthRecord.vue b/src/views/cost/csotSettlement/component/monthRecord.vue new file mode 100644 index 0000000..0d242a3 --- /dev/null +++ b/src/views/cost/csotSettlement/component/monthRecord.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/views/cost/csotSettlement/costApplyAdd.vue b/src/views/cost/csotSettlement/costApplyAdd.vue index f52d00c..7b29782 100644 --- a/src/views/cost/csotSettlement/costApplyAdd.vue +++ b/src/views/cost/csotSettlement/costApplyAdd.vue @@ -34,8 +34,9 @@
结算费用合计：¥{{ costAll }}，租赁费用¥{{ leaseCost }}，维修费用¥{{ repairCost - }}，报废费用¥{{ scrapCost }}，丢失费用{{ loseCost }} + }}，报废费用¥{{ scrapCost }}，丢失费用{{ loseCost }}。
+
- + - + @@ -351,7 +352,7 @@ title="费用结算提交" align="center" :visible.sync="applyVisible" - width="80%" + width="1200px" >
@@ -501,407 +472,322 @@ diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue index a4b7f93..c40313c 100644 --- a/src/views/cost/csotSettlement/costApplyList.vue +++ b/src/views/cost/csotSettlement/costApplyList.vue @@ -1,213 +1,217 @@ +
- diff --git a/src/views/cost/csotSettlement/costExame.vue b/src/views/cost/csotSettlement/costExame.vue index 1a48c4e..5435963 100644 --- a/src/views/cost/csotSettlement/costExame.vue +++ b/src/views/cost/csotSettlement/costExame.vue @@ -1,668 +1,383 @@ + \ No newline at end of file diff --git a/src/views/cost/csotSettlement/costList.vue b/src/views/cost/csotSettlement/costList.vue index 56bec74..3fe35ac 100644 --- a/src/views/cost/csotSettlement/costList.vue +++ b/src/views/cost/csotSettlement/costList.vue @@ -80,29 +80,35 @@ v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange" + border > - - - + + --> + - + diff --git a/src/views/repairTest/repair/index.vue b/src/views/repairTest/repair/index.vue index 483524c..553e710 100644 --- a/src/views/repairTest/repair/index.vue +++ b/src/views/repairTest/repair/index.vue @@ -917,7 +917,7 @@ export default { handleExport() { const dataCondition = this.selectionList.map((item) => item.taskId) this.download( - '/material/base/repair/export', + 'material/base/repair/export', { ...this.queryParams, dataCondition, diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue index cdfe73a..b09a6ec 100644 --- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue +++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue @@ -414,7 +414,7 @@ export default { methods: { /** 查询用户列表--采购员 */ getUserList() { - getUserByRoleList({ roleId: '104' }).then((response) => { + getUserByRoleList({ roleIds: [152] }).then((response) => { this.userList = response.data }) }, @@ -697,4 +697,4 @@ export default { ::v-deep input[type='number'] { -moz-appearance: textfield !important; } - \ No newline at end of file + diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue index 16b2507..97a9339 100644 --- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue +++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue @@ -155,61 +155,55 @@ - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - 填充 - - + + 填充 + + + + + 剩余待编码数量：{{ + surplusNoBindNum + }} @@ -253,10 +252,12 @@ > @@ -296,7 +297,11 @@
- 确 定 取 消 @@ -381,6 +386,9 @@ export default { str1: '', fixCode: '1', typeId: '', + + suffixOneCode: 0, + suffixTwoCode: 0, }, codeList: [], //弹窗列表list getCodeList: [], //已成过的编码list @@ -397,7 +405,37 @@ export default { // { required: true, message: "设备编号不能为空", trigger: "blur" } // ], }, + + codeRules: { + suffixOneCode: [ + { + required: true, + message: '请输入后缀范围', + trigger: 'blur', + }, + // { + // pattern: /^[1-9]\d*$/, + // message: '请输入正整数', + // trigger: 'blur', + // }, + ], + suffixTwoCode: [ + { + required: true, + message: '请输入后缀范围', + trigger: 'blur', + }, + // { + // pattern: /^[1-9]\d*$/, + // message: '请输入正整数', + // trigger: 'blur', + // }, + ], + }, isDetail: false, + + surplusNoBindNum: 0, + codingLoading: false, } }, mounted() { @@ -415,7 +453,6 @@ export default { }) }, selectType(id) { - console.log(id) getListByMaType({ typeId: id }).then((response) => { this.modelList = response.data }) @@ -466,7 +503,7 @@ export default { this.multiple = !selection.length }, //getCodeList newCodeList /** 编码按钮操作 */ handleCode(row) { - console.log(row, '编码管理---') + console.log(row) this.reset() this.form = row @@ -488,7 +525,7 @@ export default { this.$set( this.form, 'exCode', - 'CSJJ' + + 'NSJJ' + this.form.typeCode + this.form.specsCode + arr[0][2] + @@ -509,6 +546,9 @@ export default { // this.codeList = response.data; // }); + + this.surplusNoBindNum = + parseInt(this.form.checkNum) - parseInt(this.form.bindNum) }, //生成列表codeList createCodeList() { @@ -532,15 +572,91 @@ export default { }, //填充按钮 fillingCodeList() { - console.log(Number(this.form.str)) - this.codeList = [] - let num = Number(this.form.str) - // 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) + // console.log(Number(this.form.str)) + // this.codeList = [] + // let num = Number(this.form.str) + // // 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 (this.codeList.length === this.surplusNoBindNum) { + this.$modal.msgError('当前编码已填充，不可重复操作！') + return + } + + this.$refs['formCodeRef'].validate((valid) => { + if (valid) { + if ( + isNaN(this.form.suffixOneCode) || + isNaN(this.form.suffixTwoCode) || + parseInt(this.form.suffixOneCode) > + parseInt(this.form.suffixTwoCode) + ) { + this.$modal.msgError('编码后缀范围输入格式不正确') + return + } + let suffixOneCode = parseInt(this.form.suffixOneCode) + let suffixTwoCode = parseInt(this.form.suffixTwoCode) + let sumNum = suffixTwoCode - suffixOneCode + 1 + + if (sumNum > this.surplusNoBindNum) { + this.$modal.msgError( + '当前选择的编码数量已超过剩余未编码数量！', + ) + + return + } + + if (this.codeList.length === 0) { + for (let i = 0; i < sumNum; i++) { + let obj = { + typeName: this.form.typeName, + specificationType: this.form.specificationType, + typeId: this.form.typeId, + taskId: this.form.taskId, + maCode: + this.form.exCode + + ('00000' + (suffixOneCode + i)).slice(-4), + assetsCode: '', + fixCode: this.form.fixCode, + id: ('00000' + (suffixOneCode + i)).slice(-4), + } + this.codeList.push(obj) + } + + this.surplusNoBindNum -= this.codeList.length + } else { + for (let i = 0; i < sumNum; i++) { + let obj = { + typeName: this.form.typeName, + specificationType: this.form.specificationType, + typeId: this.form.typeId, + taskId: this.form.taskId, + maCode: + this.form.exCode + + ('00000' + (suffixOneCode + i)).slice(-4), + assetsCode: '', + fixCode: this.form.fixCode, + id: ('00000' + (suffixOneCode + i)).slice(-4), + } + + const isRepeat = this.codeList.every( + (e) => e.id != obj.id, + ) + if (isRepeat) { + this.codeList.push(obj) + this.surplusNoBindNum -= 1 + } + } + } + } + }) + + if (true) { + return + } if (sum > this.form.checkNum) { this.$modal.msgError( '已绑定编码' + @@ -572,12 +688,23 @@ export default { /** 提交按钮 */ submitForm: function () { // console.log(this.codeList) - if (this.form.fixCode == 0) { - if (this.hasDuplicateField(this.codeList, 'assetsCode')) { - this.$modal.msgError('固定资产编码不能为空') - return false - } + // if (this.form.fixCode == 0) { + // if (this.hasDuplicateField(this.codeList, 'assetsCode')) { + // this.$modal.msgError('固定资产编码不能为空') + // return false + // } + // } + + let noCode = this.codeList.filter((e) => e.maCode === '') + if (noCode.length > 0) { + this.$modal.msgError('编码不可为空') + noCode.map((e, index) => { + if (index === 0) { + this.$refs[`inputRef-${e.id}`].focus() + } + }) } + if (this.codeList.length == 0) { this.$modal.msgError('无新增编码绑定') } else { @@ -587,32 +714,36 @@ export default { for (const item of this.codeList) { const maCode = item.maCode + console.log(maCodeSet.has(maCode), '是否有编码') if (maCodeSet.has(maCode)) { hasDuplicates = true break } maCodeSet.add(maCode) } - console.log('codeList:', this.codeList) if (hasDuplicates) { this.$modal.msgError( '编码绑定失败,存在重复编码，请重新输入', ) return // 停止提交流程 } - editPurchaseMacode(this.codeList).then((response) => { - console.log(this.codeList) - if (response.data && response.data.length > 0) { - this.codeList = response.data - this.$modal.msgError( - '编码绑定失败,存在重复编码，请重新输入', - ) - } else { - this.$modal.msgSuccess('编码绑定成功') - this.open = false - this.getList() - } - }) + this.codingLoading = true + editPurchaseMacode(this.codeList) + .then((response) => { + if (response.data && response.data.length > 0) { + this.codeList = response.data + this.$modal.msgError( + '编码绑定失败,存在重复编码，请重新输入', + ) + } else { + this.$modal.msgSuccess('编码绑定成功') + this.open = false + this.getList() + } + }) + .finally(() => { + this.codingLoading = false + }) } }, hasDuplicateField(array, field) { @@ -644,6 +775,8 @@ export default { this.codeList.splice(index, 1) } }) + + this.surplusNoBindNum += 1 // const maCode = row.maCode ; // this.$modal.confirm('是否确认删除该数据项？').then(function() { // return delMacodeList(maCode); @@ -658,20 +791,33 @@ export default { this.$tab.closeOpenPage(obj) }, async handleBindDetails(row) { - console.log('🚀 ~ handleBindDetails ~ row:', row.taskId) + console.log('🚀 ~ handleBindDetails ~ row:', row.taskId, row) + this.surplusNoBindNum = row.checkNum - row.bindNum this.open = true this.isDetail = true this.title = '编码绑定详情' this.codeList = [] - // const res = await getBindCodeDetails({ taskId: row.taskId }) const res = await getBindCodeDetails({ - typeId: row.typeId, taskId: row.taskId, + typeId: row.typeId, }) console.log('🚀 ~ handleBindDetails ~ res:', res) this.codeList = res.data }, }, + + watch: { + open: { + handler(newValue) { + if (!newValue) { + this.form.suffixOneCode = '' + this.form.suffixTwoCode = '' + this.form.fixCode = '1' + } + }, + deep: true, + }, + }, } @@ -685,4 +831,10 @@ export default { width: 60px !important; margin-bottom: 10px; } + +.surplus-code { + padding-bottom: 10px; + padding-left: 8px; + font-size: 16px; +} diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue index 85bc78e..9ee2240 100644 --- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue +++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue @@ -323,7 +323,7 @@ > 供应商：{{ - printTableData[0].supplier + supplierStr }}
@@ -493,6 +493,8 @@ export default { openPrint: false, printData: {}, printTableData: [], + // 供应商 + supplierStr: '', } }, created() { @@ -558,7 +560,6 @@ export default { // .then(() => { // this.$tab.refreshPage() // }) - this.$emit('queryTools', row.taskId) }, /** 修改按钮操作 */ @@ -605,6 +606,13 @@ export default { getAcceptanceForm({ taskId: taskId }).then((response) => { this.printData = response.data this.printTableData = response.data.checkDetailsList + let supplierStr = '' + this.printTableData.forEach((e) => { + if (e.supplier) { + supplierStr += e.supplier + ',' + } + }) + this.supplierStr = supplierStr.slice(0, -1) }) }, //查看验收单 diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue index 1f0062e..389fc1c 100644 --- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue +++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue @@ -190,6 +190,7 @@ > 验收 + +
请上传png、jpg、jpeg类型文件，文件个数不能超过5个，且单个文件不能超过5M
@@ -274,6 +279,7 @@ @@ -305,6 +311,9 @@ > +
请上传png、jpg、jpeg类型文件，文件个数不能超过5个，且单个文件不能超过5M
@@ -320,6 +329,7 @@ @@ -414,6 +424,7 @@ @@ -424,13 +435,7 @@ height="450" > - + { if (response.code == 200) { @@ -994,8 +1003,7 @@ export default { }, //图片查看 openImg(url) { - // this.dialogImageUrl = this.uploadUrl + url - this.dialogImageUrl = url + this.dialogImageUrl = this.uploadUrl + url this.dialogVisible = true }, //验收后禁止勾选 diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue index 0a0cac8..e70377c 100644 --- a/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue +++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue @@ -71,6 +71,7 @@ export default { /* 查询工机具 */ queryTools(taskId) { this.isView = true + this.pageContent = '详情信息' this.queryTaskId = taskId this.isShowComponent = 'QueryTools' diff --git a/src/views/warehouseManage/warehousing/newTools/index.vue b/src/views/warehouseManage/warehousing/newTools/index.vue index 0a12d2e..4c6c053 100644 --- a/src/views/warehouseManage/warehousing/newTools/index.vue +++ b/src/views/warehouseManage/warehousing/newTools/index.vue @@ -247,15 +247,15 @@ 批量通过确认入库 - + @@ -279,8 +279,8 @@ - 通过 不通过 - + --> { if (response.code == 200) { - this.$modal.msgSuccess('审批成功') + this.$modal.msgSuccess('入库成功') + this.open = false this.getDialogTable() this.getList() } else { - this.$modal.msgSuccess('审批失败') + this.$modal.msgSuccess('入库失败') } }) }, passAll() { - console.log(this.query.taskId) - console.log(this.ids) + // const params = { + // pageNum: 1, + // pageSize: 9999, + // taskId: this.query.taskId, + // dictName: this.query.dictName, + // } + + if (this.ids.length < 1) { + this.$message.error('请勾选需要入库的数据！') + return + } + this.ids.forEach((item) => { item.taskId = this.query.taskId item.typeId = item.typeId @@ -750,15 +758,24 @@ export default { checkResult: '1', inputRecordList: this.ids, } - changePutinStatus(param).then((response) => { - if (response.code == 200) { - this.$modal.msgSuccess('审批成功') - this.getDialogTable() - this.getList() - } else { - this.$modal.msgSuccess('审批失败') - } - }) + this.passLoading = true + changePutinStatus(param) + .then((response) => { + if (response.code == 200) { + this.$modal.msgSuccess('入库成功') + this.getDialogTable() + this.getList() + } else { + this.$modal.msgSuccess('入库失败') + } + }) + .finally(() => { + this.passLoading = false + }) + // getPutinDetailsList(params).then((res) => { + // let deviceList = res.rows + + // }) }, //拒绝 refused(row) { @@ -771,6 +788,7 @@ export default { maCode: row.maCode, inputNum: row.checkNum, typeId: row.typeId, + manageType: row.manageType, } let param = { diff --git a/vue.config.js b/vue.config.js index 5576e82..0605a7e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -42,9 +42,9 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - // target: `http://192.168.2.151:48080`, //超 + target: `http://192.168.2.135:49080`, //超 // target: `http://10.40.92.81:8080`, //韩/ - target: `http://192.168.2.82:49080`,//旭/ + // target: `http://192.168.2.82:49080`,//旭/ // target: `http://192.168.2.248:28080`, //帅 // target: `http://192.168.2.216:49080`, //福