diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index fe5af37a..17cb7e52 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -483,7 +483,7 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,su.nick_name as nickName, bpl.lot_id as proId,bpl.lot_name as proName, bui.unit_id as unitId,bui.unit_name as unitName, - lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime, + lai.lease_person as leasePerson, lai.phone as leasePhone, su.user_name as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime, case when d.id = '31' then lai.company_audit_remark when d.id = '32' then lai.dept_audit_remark when d.id = '33' then lai.direct_audit_remark @@ -496,7 +496,7 @@ tt.create_time as createTimes, tt.update_time as updateTimes FROM tm_task tt - LEFT JOIN sys_user su ON tt.create_by = su.user_name + LEFT JOIN sys_user su ON tt.create_by = su.user_id LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue index e5cfa0ec..c2c2b784 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue @@ -57,6 +57,24 @@ + + + + + + +
-

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

+

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

领料单号：{{ queryParams.code }}
 @@ -99,7 +102,7 @@ :show-overflow-tooltip="true" /> 确 定 确 定 确 定 确 定 确 定 @@ -268,35 +271,35 @@ 确 定 确 定 确 定 确 定 确 定 @@ -614,7 +617,11 @@ export default { this.queryParams.leaseApplyDetails.forEach((v) => { this.$set(v, 'applyFor', this.queryParams.applyFor) this.$set(v, 'updateTimes', this.queryParams.updateTimes) - this.$set(v, 'taskName', v.statusName) + if (!res.rows[0].directAuditRemark) { + this.$set(v, 'taskName', this.queryParams.taskName) + } else { + this.$set(v, 'taskName', v.statusName) + } this.$set(v, 'createTime', this.queryParams.createTimes) this.$set(v, 'updateTime', this.queryParams.updateTimes) }) @@ -784,4 +791,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;