diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue index 95482792..2142e258 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue @@ -275,8 +275,7 @@ export default { /** 新增按钮操作 */ handleAdd() { this.$tab.closeOpenPage({ - path:'/claimAndRefund/receive/receiveApplyAddByCq',//重庆 - // path:'/claimAndRefund/receive/receiveApplyAdd', + path:'/claimAndRefund/receive/receiveApplyAdd', query:{ isEdit:true } @@ -291,8 +290,7 @@ export default { }, handleView(row) { this.$tab.closeOpenPage({ - path:'/claimAndRefund/receive/receiveApplyAddByCq',//重庆 - // path:'/claimAndRefund/receive/receiveApplyAdd', + path:'/claimAndRefund/receive/receiveApplyAdd', query:{ taskId:row.taskId, isEdit:false diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue index 28cb9212..83bcb8c1 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue @@ -126,7 +126,7 @@
取 消 - 确 定 + 确 定 确 定 确 定 确 定 @@ -139,7 +139,7 @@
取 消 - 确 定 + 确 定 确 定 确 定 确 定 diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue new file mode 100644 index 00000000..780563ce --- /dev/null +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue @@ -0,0 +1,364 @@ + + + + \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue similarity index 97% rename from sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAddByCq.vue rename to sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue index 69c737ad..40cd6e60 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAddByCq.vue +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue @@ -354,10 +354,12 @@ export default { this.GetDeviceTypeTree() // this.getList(); - if(this.$route.query.taskId){ + if(this.$route.query.taskId&&!this.$route.query.isBack){ + console.log('查看') this.GetTaskDetail(this.$route.query.taskId) } if(this.$route.query.taskId&&this.$route.query.isBack){ + console.log('驳回提交查看') this.GetTaskDetail2(this.$route.query.taskId) } this.taskId = this.$route.query.taskId @@ -445,6 +447,8 @@ export default { this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson this.queryParams.agreementCode = data.agreementCode this.queryParams.agreementId = data.agreementId + this.queryParams.leaseType = data.leaseType + this.$set(this.queryParams,'leaseType',data.leaseType) this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark this.leaseApplyInfoList = data.leaseApplyInfoList this.leaseApplyDetails = data.leaseApplyDetails.map(item => { @@ -472,8 +476,10 @@ export default { this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson this.queryParams.agreementCode = data.agreementCode this.queryParams.agreementId = data.agreementId + this.queryParams.leaseType = data.leaseType + this.$set(this.queryParams,'leaseType',data.leaseType) this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark - this.leaseApplyInfoList = data.leaseApplyInfoList + this.leaseApplyInfoList = data.leaseApplyInfoList this.leaseApplyDetails = data.leaseApplyDetails.map(item => { return this.handelEchoData(item) }) @@ -590,7 +596,7 @@ export default { type:'success', message: '申请成功' }) - this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveApply"}); + this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveApply"}); } } }) @@ -599,7 +605,7 @@ export default { }, /** 修改按钮操作 */ handleBack(row) { - this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveApply"}); + this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveApply"}); }, /** 删除按钮操作 */ handleDelete(row) { diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue new file mode 100644 index 00000000..1cb5222a --- /dev/null +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue new file mode 100644 index 00000000..18d52228 --- /dev/null +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue @@ -0,0 +1,527 @@ + + + + + diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index d2a4e093..049278b8 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -35,14 +35,14 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://112.29.103.165:21626`,//线上环境-重庆 + // target: `http://112.29.103.165:21626`,//线上环境-重庆 // target: `http://112.29.103.165:21624`,//线上环境-宁夏 // target: `http://192.168.0.14:21624`,//线上环境 // target: `http://1.12.248.179:23028`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - // target: `http://10.40.92.12:8080`,//超 + target: `http://10.40.92.12:8080`,//超 // target: `http://10.40.92.2:8080`,//韩 // target: `http://10.40.92.209:8080`,//川/ @@ -52,6 +52,7 @@ module.exports = { //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址，打开大屏项目config/index.js更改请求地址，大屏打包node<16.0.0; //3.只有南网项目产线gl发布打包时候需要注意： // 将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/; + //4. 重庆环境的时候需要将新增领料申请跳转地址改为claimAndRefund/receive/receiveApplyAddByCq //******** 注意事项 ********* */ changeOrigin: true,