bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-nx' into dev-nx

This commit is contained in:
csyue 2024-06-18 10:58:46 +08:00
parent d9e69d21b6 01aa8c72b2
commit 292d9dc820
6 changed files with 80 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -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

27
sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
View File

@ -57,6 +57,24 @@
</el-select>
</el-form-item>
<el-form-item label="任务状态" prop="taskStatus">
<el-select
v-model="queryParams.taskStatus"
filterable
clearable
style="width: 240px"
placeholder="请选择"
>
<el-option
v-for="item in taskStatusList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker
v-model="queryParams.time"
@ -379,6 +397,14 @@ export default {
unitList: [], //来往单位集合
proList: [], //工程集合
currentUserName: sessionStorage.getItem('userName'),
taskStatusList: [
{ name: '待分公司审核', id: 30 },
{ name: '待分管部门审核', id: 31 },
{ name: '待内部审核', id: 32 },
{ name: '待出库', id: 33 },
{ name: '出库进行中', id: 34 },
{ name: '完成', id: 35 },
],
}
},
created() {
@ -404,6 +430,7 @@ export default {
souceBy: 0,
pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum,
taskStatus: this.queryParams.taskStatus,
}
const res = await getLeaseAuditListAll(params)

38
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue
View File

@ -2,7 +2,10 @@
<!-- 领料审核页面 -->
<div id="ReceiveExamine">
<el-row :gutter="10" class="mb8">
<h3>{{ queryParams.applyFor }}提交的领料申请</h3>
<h3
><span class="apply-user">{{ queryParams.applyFor }}</span>
提交的领料申请</h3
>
<div>领料单号：{{ queryParams.code }}</div>
</el-row>
<el-row :gutter="24" class="mb8">
@ -99,7 +102,7 @@
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请人"
label="领料申请人"
align="center"
prop="applyFor"
:show-overflow-tooltip="true"
@ -215,35 +218,35 @@
<el-button
type="primary"
@click="subAuditLeaseByCompany(9)"
v-if="queryParams.taskStatus == 30"
v-show="queryParams.taskStatus == 30"
v-hasPermi="['picking:auditing:fgs']"
>确 定</el-button
>
<el-button
type="primary"
@click="subAuditLeaseByCompany(5)"
v-if="queryParams.taskStatus == 31"
v-show="queryParams.taskStatus == 31"
v-hasPermi="['picking:auditing:sgb']"
>确 定</el-button
>
<el-button
type="primary"
@click="subAuditLeaseByCompany(7)"
v-if="queryParams.taskStatus == 31"
v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:ajb']"
>确 定</el-button
>
<el-button
type="primary"
@click="subAuditLeaseByCompany(1)"
v-if="queryParams.taskStatus == 32"
v-show="queryParams.taskStatus == 32"
v-hasPermi="['picking:auditing:jjnb']"
>确 定</el-button
>
<el-button
type="primary"
@click="subAuditLeaseByCompany(3)"
v-if="queryParams.taskStatus == 32"
v-show="queryParams.taskStatus == 32"
v-hasPermi="['picking:auditing:tsnb']"
>确 定</el-button
>
@ -268,35 +271,35 @@
<el-button
type="primary"
@click="refuseAuditLeaseByCompany(10)"
v-if="queryParams.taskStatus == 30"
v-show="queryParams.taskStatus == 30"
v-hasPermi="['picking:auditing:fgs']"
>确 定</el-button
>
<el-button
type="primary"
@click="refuseAuditLeaseByCompany(6)"
v-if="queryParams.taskStatus == 31"
v-show="queryParams.taskStatus == 31"
v-hasPermi="['picking:auditing:sgb']"
>确 定</el-button
>
<el-button
type="primary"
@click="refuseAuditLeaseByCompany(8)"
v-if="queryParams.taskStatus == 31"
v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:ajb']"
>确 定</el-button
>
<el-button
type="primary"
@click="refuseAuditLeaseByCompany(2)"
v-if="queryParams.taskStatus == 32"
v-show="queryParams.taskStatus == 32"
v-hasPermi="['picking:auditing:jjnb']"
>确 定</el-button
>
<el-button
type="primary"
@click="refuseAuditLeaseByCompany(4)"
v-if="queryParams.taskStatus == 32"
v-show="queryParams.taskStatus == 32"
v-hasPermi="['picking:auditing:tsnb']"
>确 定</el-button
>
@ -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;
}
</style>

27
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -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()
}
},
}
</script>

13
sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
View File

@ -7,11 +7,12 @@
@goBack="goBack"
/>
<!-- 6.17 新增组件缓存 因客户需要查询或审核后返回列表时保留页面状态 -->
<keep-alive>
<keep-alive include="Home">
<component
ref="componentRef"
:is="isShowComponent"
:isView="isView"
:isRefresh="isRefresh"
:auditingTaskId="auditingTaskId"
@pickingView="pickingView"
@pickingAuditing="pickingAuditing"
@ -37,7 +38,7 @@ export default {
pageContent: '',
auditingTaskId: '',
isView: false,
includeCom: '',
isRefresh: false,
}
},
methods: {
@ -56,13 +57,11 @@ export default {
this.isShowComponent = 'AuditingPage'
},
goBack(val) {
this.isRefresh = false
this.isShowComponent = 'Home'
// 判断 val 为1时 表示领料单审核完毕 返回主列表时 需刷新列表 更新审批状态
if (val === 1) {
this.$nextTick(() => {
this.$refs.componentRef.refreshList()
})
if (val == 1) {
this.isRefresh = true
}
},
},

6
sgzb-ui/vue.config.js
View File

@ -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;