bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面调整和结算导出

This commit is contained in:
hongchao 2025-03-26 17:39:38 +08:00
parent 2ef9518b23
commit 4ceeaa26a6
7 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/store/newBuy.js
View File

@ -377,3 +377,13 @@ export function getBindCodeDetails(query) {
export const postAcceptImgUploadApi = (data) => { export const postAcceptImgUploadApi = (data) => {
return request.post('/material/purchaseCheckDetails/uploadPic', data) return request.post('/material/purchaseCheckDetails/uploadPic', data)
} }
//新增机具模板下载
export function downLoadTypeModel(data) {
return request({
url: '/material/purchaseMacode/downLoadTypeModel',
method: 'post',
data: data,
})
}

2
src/views/claimAndreturn/picking/apply/component/home.vue
View File

@ -9,7 +9,7 @@
v-show="showSearch" v-show="showSearch"
label-width="80px" label-width="80px"
> >
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字1" prop="keyWord">
<el-input <el-input
v-model="queryParams.keyWord" v-model="queryParams.keyWord"
placeholder="请输入关键字" placeholder="请输入关键字"

11
src/views/claimAndreturn/picking/apply/component/home1.vue
View File

@ -152,6 +152,7 @@
align="center" align="center"
prop="code" prop="code"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="150"
/> />
<el-table-column <el-table-column
label="领料类型" label="领料类型"
@ -171,48 +172,56 @@
align="center" align="center"
prop="unitName" prop="unitName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="150"
/> />
<el-table-column <el-table-column
label="领料工程" label="领料工程"
align="center" align="center"
prop="proName" prop="proName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="150"
/> />
<el-table-column <el-table-column
label="协议号" label="协议号"
align="center" align="center"
prop="agreementCode" prop="agreementCode"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="150"
/> />
<el-table-column <el-table-column
label="领料人" label="领料人"
align="center" align="center"
prop="leasePerson" prop="leasePerson"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="100"
/> />
<el-table-column <el-table-column
label="联系电话" label="联系电话"
align="center" align="center"
prop="leasePhone" prop="leasePhone"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="110"
/> />
<el-table-column <el-table-column
label="申请人" label="申请人"
align="center" align="center"
prop="applyFor" prop="applyFor"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="100"
/> />
<el-table-column <el-table-column
label="预计领料时间" label="预计领料时间"
align="center" align="center"
prop="estimateLeaseTime" prop="estimateLeaseTime"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="200"
/> />
<el-table-column <el-table-column
label="申请时间" label="申请时间"
align="center" align="center"
prop="createTimes" prop="createTimes"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="200"
/> />
<el-table-column <el-table-column
label="任务状态" label="任务状态"
@ -275,7 +284,7 @@
<span v-if="scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList.length > 0 && scope.row.leaseApplyInfoList[0].remark">{{ scope.row.leaseApplyInfoList[0].remark }}</span> <span v-if="scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList.length > 0 && scope.row.leaseApplyInfoList[0].remark">{{ scope.row.leaseApplyInfoList[0].remark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="160"> <el-table-column label="操作" align="center" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"

19
src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -107,26 +107,27 @@
type="index" type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
/> />
<el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" /> <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true"> <el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.leaseType == 0">工程租赁</span> <span v-if="scope.row.leaseType == 0">工程租赁</span>
<span v-if="scope.row.leaseType == 1">长期领用</span> <span v-if="scope.row.leaseType == 1">长期领用</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="130"/>
<el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" /> <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="130"/>
<el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" /> <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" /> <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" /> <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" /> <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" width="100"/>
<el-table-column <el-table-column
label="预计领料时间" label="预计领料时间"
align="center" align="center"
prop="estimateLeaseTime" prop="estimateLeaseTime"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="200"
/> />
<el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" /> <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" width="200"/>
<el-table-column <el-table-column
label="任务状态" label="任务状态"
align="center" align="center"
@ -147,7 +148,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="160" align="center"> <el-table-column label="操作" width="160" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button> <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
<el-button <el-button

7
src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -70,6 +70,7 @@
align="center" align="center"
prop="preCountNum" prop="preCountNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="90"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="申请时间" label="申请时间"
@ -77,10 +78,10 @@
prop="createTimes" prop="createTimes"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true"></el-table-column> <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true" width="90"></el-table-column>
<el-table-column label="出库状态" align="center" prop="taskName" :show-overflow-tooltip="true"></el-table-column> <el-table-column label="出库状态" align="center" prop="taskName" :show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" @click="handleView(scope.row)" v-hasPermi="['picking:outbound:view']">查看</el-button> <el-button size="mini" @click="handleView(scope.row)" v-hasPermi="['picking:outbound:view']">查看</el-button>
<el-button <el-button

7
src/views/cost/csotSettlement/component/finishAndDetails.vue
View File

@ -402,10 +402,13 @@ export default {
exportTitle = '工机具待报废清单' exportTitle = '工机具待报废清单'
break break
} }
const params = []
this.currRowInfo.forEach((e) => {
params.push({ ...e });
})
this.downloadJson( this.downloadJson(
exportUrl, exportUrl,
JSON.stringify([{ agreementId: this.currRowInfo.agreementId }]), JSON.stringify(params),
`${exportTitle}-${new Date().getTime()}.xlsx`, `${exportTitle}-${new Date().getTime()}.xlsx`,
) )
}, },

6
src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
View File

@ -158,6 +158,12 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave">保存</el-button> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave">保存</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-download" size="mini" >模板下载</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-upload2" size="mini" >模板上传</el-button>
</el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">