diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue index 2f3f49ba..7daf30c7 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue @@ -2,7 +2,10 @@
-

{{ queryParams.applyFor }}提交的领料申请

+

{{ queryParams.applyFor }} + 提交的领料申请

领料单号:{{ queryParams.code }}
@@ -99,7 +102,7 @@ :show-overflow-tooltip="true" /> 确 定 确 定 确 定 确 定 确 定 @@ -268,35 +271,35 @@ 确 定 确 定 确 定 确 定 确 定 @@ -784,4 +787,9 @@ export default { font-size: 13px; } } + +.apply-user { + margin-right: 2px; + letter-spacing: 1px; +} diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue index ba71d5df..c333093f 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue @@ -234,7 +234,7 @@ type="text" @click="handleExamine(scope.row)" v-hasPermi="['picking:auditing:fgs']" - v-if=" + v-show=" Number(scope.row.examineStatusId) == 30 && scope.row.deptId == currentDeptId " @@ -245,7 +245,7 @@ type="text" @click="handleExamine(scope.row)" v-hasPermi="['picking:auditing:sgb']" - v-if=" + v-show=" Number(scope.row.examineStatusId) == 31 && (scope.row.leaseApplyInfoList[0].status == '0' || scope.row.leaseApplyInfoList[0].status == '7' || @@ -273,7 +273,7 @@ type="text" @click="handleExamine(scope.row, 'jjfgs')" v-hasPermi="['picking:auditing:jjnb']" - v-if=" + v-show=" Number(scope.row.examineStatusId) == 32 && (scope.row.leaseApplyInfoList[0].status == '5' || scope.row.leaseApplyInfoList[0].status == '7' || @@ -288,7 +288,7 @@ type="text" @click="handleExamine(scope.row, 'sbfgs')" v-hasPermi="['picking:auditing:tsnb']" - v-if=" + v-show=" Number(scope.row.examineStatusId) == 32 && (scope.row.leaseApplyInfoList[0].status == '5' || scope.row.leaseApplyInfoList[0].status == '7' || @@ -475,6 +475,12 @@ import { getInfo } from '@/api/login' import vueEasyPrint from 'vue-easy-print' export default { // name: "ReceiveManage", + props: { + isRefresh: { + type: Boolean, + default: () => false, + }, + }, data() { return { // 遮罩层 @@ -588,11 +594,6 @@ export default { // console.log(this.user) this.getList() }, - - /* 刷新列表 */ - refreshList() { - this.getList() - }, /** 查询列表 */ async getList() { this.loading = true @@ -611,7 +612,7 @@ export default { const res = await getLeaseManageListAll(params) this.loading = false - console.log('getList ============', res) + console.log('getList ============', res, '列表查询') this.leaseAuditList = res.data.rows // this.leaseAuditList.forEach((item,index)=>{ // console.log(item.leaseApplyInfoList) @@ -786,6 +787,12 @@ export default { }) }, }, + + activated() { + if (this.isRefresh) { + this.getList() + } + }, } diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue index 444bad96..a7cd0f61 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue @@ -7,11 +7,12 @@ @goBack="goBack" /> - + { - this.$refs.componentRef.refreshList() - }) + if (val == 1) { + this.isRefresh = true } }, }, diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index 8506dc44..b3665771 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -43,11 +43,11 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - // target: `http://10.40.92.51:28080`, //超 + // target: `http://10.40.92.60:28080`, //超 // target: `http://10.40.92.81:8080`, //韩/ // 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.140:28080`, //帅 + target: `http://10.40.92.253:28080`, //福 //******** 注意事项 ********* */ //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;