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

增加领料审核页面状态查询

This commit is contained in:
BianLzhaoMin 2024-06-12 16:53:33 +08:00
parent b5c59ac97a
commit a9a42f4421
6 changed files with 80 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,23 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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="申请日期" prop="time"> <el-form-item label="申请日期" prop="time">
<el-date-picker <el-date-picker
@ -493,6 +510,7 @@ export default {
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined, status: undefined,
taskStatus: '',
}, },
user: {}, user: {},
unitList: [], unitList: [],
@ -542,6 +560,15 @@ export default {
// 当前用户所属部门Id // 当前用户所属部门Id
currentDeptId: parseInt(sessionStorage.getItem('deptId')), currentDeptId: parseInt(sessionStorage.getItem('deptId')),
taskStatusList: [
{ name: '待分公司审核', id: 30 },
{ name: '待分管部门审核', id: 31 },
{ name: '待内部审核', id: 32 },
{ name: '待出库', id: 33 },
{ name: '出库进行中', id: 34 },
{ name: '已完成', id: 35 },
],
} }
}, },
created() { created() {
@ -567,6 +594,7 @@ export default {
const params = { const params = {
unitId: this.queryParams.unitId, unitId: this.queryParams.unitId,
projectId: this.queryParams.proId, projectId: this.queryParams.proId,
taskStatus: this.queryParams.taskStatus,
keyWord: this.queryParams.keyWord, keyWord: this.queryParams.keyWord,
startTime: this.queryParams.time && this.queryParams.time[0], startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1], endTime: this.queryParams.time && this.queryParams.time[1],

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

@ -6,14 +6,16 @@
:pageContent="pageContent" :pageContent="pageContent"
@goBack="goBack" @goBack="goBack"
/> />
<component <keep-alive include="Home">
:is="isShowComponent" <component
:isView="isView" :is="isShowComponent"
:auditingTaskId="auditingTaskId" :isView="isView"
@pickingView="pickingView" :auditingTaskId="auditingTaskId"
@pickingAuditing="pickingAuditing" @pickingView="pickingView"
@goBackPage="goBack" @pickingAuditing="pickingAuditing"
/> @goBackPage="goBack"
/>
</keep-alive>
</div> </div>
</template> </template>

2
sgzb-ui/src/views/newLogin.vue
View File

@ -655,7 +655,7 @@ export default {
} }
/* 解决验证码输入框与密码输入框对齐问题 */ /* 解决验证码输入框与密码输入框对齐问题 */
.code-container .el-form-item__content { ::v-deep .code-container .el-form-item__content {
display: flex; display: flex;
} }

8
sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
View File

@ -113,11 +113,7 @@
:config="dialogConfig" :config="dialogConfig"
> >
<template slot="imgPreview"> <template slot="imgPreview">
<ImagePreview <ScrapImg />
:src="``"
:width="`30px`"
:height="`30px`"
/>
</template> </TableModel </template> </TableModel
></template> ></template>
@ -151,6 +147,7 @@ import SelDepart from '../../component/selDepart.vue'
import ScrapSource from '../../component/scrapSource.vue' import ScrapSource from '../../component/scrapSource.vue'
import AuditingReturn from '../auditingReturn/index.vue' // 退料驳回页面 import AuditingReturn from '../auditingReturn/index.vue' // 退料驳回页面
import AuditingDetails from '../../component/auditingDetails.vue' import AuditingDetails from '../../component/auditingDetails.vue'
import ScrapImg from '../../component/scrapImg.vue'
import { import {
getPreScrapListApi, getPreScrapListApi,
getDialogListApi, getDialogListApi,
@ -166,6 +163,7 @@ export default {
ScrapSource, ScrapSource,
AuditingReturn, AuditingReturn,
AuditingDetails, AuditingDetails,
ScrapImg,
}, },
data() { data() {
return { return {

70
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
View File

@ -38,22 +38,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="采购状态" prop="taskState"> <el-form-item label="采购状态" prop="taskState">
<el-select <el-select
v-model="queryParams.taskState" v-model="queryParams.taskState"
placeholder="请选择采购状态" placeholder="请选择采购状态"
clearable clearable
filterable filterable
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
v-for="statusItem in statusList" v-for="statusItem in statusList"
:key="statusItem.taskState" :key="statusItem.taskState"
:label="statusItem.label" :label="statusItem.label"
:value="statusItem.taskState" :value="statusItem.taskState"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字" prop="keyWord">
<el-input <el-input
@ -207,7 +207,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if=" v-if="
(scope.row.purchasingStatus == '验收合格') && scope.row.purchasingStatus == '验收合格' &&
scope.row.manageType != '1' scope.row.manageType != '1'
" "
@click="handleCode(scope.row)" @click="handleCode(scope.row)"
@ -220,7 +220,8 @@
icon="el-icon-edit" icon="el-icon-edit"
v-if=" v-if="
scope.row.purchasingStatus == '验收合格' || scope.row.purchasingStatus == '验收合格' ||
scope.row.purchasingStatus == '综合服务中心审核中' || scope.row.purchasingStatus ==
'综合服务中心审核中' ||
scope.row.purchasingStatus == '入库审核中' || scope.row.purchasingStatus == '入库审核中' ||
scope.row.purchasingStatus == '入库审核未通过' || scope.row.purchasingStatus == '入库审核未通过' ||
scope.row.purchasingStatus == '部分已入库' || scope.row.purchasingStatus == '部分已入库' ||
@ -231,7 +232,7 @@
> >
<el-button <el-button
size="mini" size="mini"
type="success" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.purchasingStatus == '验收合格'" v-if="scope.row.purchasingStatus == '验收合格'"
@click="handleSubmit(scope.row)" @click="handleSubmit(scope.row)"
@ -245,7 +246,8 @@
v-if=" v-if="
scope.row.purchasingStatus == '待通知' || scope.row.purchasingStatus == '待通知' ||
scope.row.purchasingStatus == '验收未通过' || scope.row.purchasingStatus == '验收未通过' ||
scope.row.purchasingStatus == '综合服务中心未通过' || scope.row.purchasingStatus ==
'综合服务中心未通过' ||
scope.row.purchasingStatus == '入库审核未通过' scope.row.purchasingStatus == '入库审核未通过'
" "
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
@ -506,20 +508,20 @@ export default {
//搜索下拉数据 //搜索下拉数据
typesList: [], typesList: [],
modelList: [], modelList: [],
// 采购状态下拉数据 // 采购状态下拉数据
statusList: [ statusList: [
{ label: '全部', taskState: null }, { label: '全部', taskState: null },
{ label: '待通知', taskState: 24 }, { label: '待通知', taskState: 24 },
{ label: '待验收', taskState: 25 }, { label: '待验收', taskState: 25 },
{ label: '验收合格', taskState: 26 }, { label: '验收合格', taskState: 26 },
{ label: '验收未通过', taskState: 27 }, { label: '验收未通过', taskState: 27 },
{ label: '综合服务中心审核中', taskState: 122 }, { label: '综合服务中心审核中', taskState: 122 },
{ label: '综合服务中心未通过', taskState: 106 }, { label: '综合服务中心未通过', taskState: 106 },
{ label: '入库审核中', taskState: 105 }, { label: '入库审核中', taskState: 105 },
{ label: '入库审核未通过', taskState: 107 }, { label: '入库审核未通过', taskState: 107 },
{ label: '部分已入库', taskState: 123 }, { label: '部分已入库', taskState: 123 },
{ label: '已全部入库', taskState: 28 } { label: '已全部入库', taskState: 28 },
], ],
// 字典表格数据 // 字典表格数据
typeList: [], typeList: [],
// 弹出层标题 // 弹出层标题

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

@ -43,11 +43,11 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
// target: `http://10.40.92.50:28080`, //超 target: `http://10.40.92.51:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
// target: `http://10.40.92.148:28080`, //帅 // target: `http://10.40.92.148:28080`, //帅
target: `http://10.40.92.253:28080`, //福 // target: `http://10.40.92.253:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;