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

Merge remote-tracking branch 'origin/material-ui' into material-ui 

# Conflicts:
#	src/views/material/lease/protocol/index.vue
This commit is contained in:
mashuai 2025-01-08 14:32:44 +08:00
parent 7fbd7b9adc 6a2a644b1c
commit 522c598f87
7 changed files with 103 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
src/views/material/back/component/home.vue
View File

@ -1,13 +1,6 @@
<template>
<div>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="退料申请时间" prop="time">
<el-date-picker
v-model="queryParams.time"
@ -51,7 +44,7 @@
</el-select>
</el-form-item>
<br>
<el-form-item label="退料单位" prop="unitId">
<el-form-item label="退料单位" prop="unitId">
<treeselect
v-model="queryParams.unitId"
:options="unitList" :normalizer="normalizer"
@ -89,113 +82,35 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" plain size="mini" @click="handleAdd">退料接收</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="success"
plain icon="el-icon-refresh"
size="mini"
>提交</el-button>
</el-col> -->
</el-col>
<el-col :span="1.5">
<el-button
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<el-button icon="el-icon-download" size="mini" @click="handleExport" >导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="typeList" border
@selection-change="handleSelectionChange"
>
<el-table v-loading="loading" :data="typeList" border @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column
label="序号"
align="center"
width="80"
type="index"
>
<!-- <el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column> -->
<el-table-column
align="center"
label="序号"
type="index"
/>
<el-table-column
label="退料单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料工程"
align="center"
prop="proName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料单号"
align="center"
prop="code"
:show-overflow-tooltip="true"
/>
<el-table-column
label="物资类型"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料人"
align="center"
prop="backPerson"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料人电话"
align="center"
prop="phone"
:show-overflow-tooltip="true"
/>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="创建人"
align="center"
prop="createBy"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="协议号"
align="center"
prop="agreementCode"
:show-overflow-tooltip="true"
/> -->
<el-table-column
label="状态"
align="center"
:show-overflow-tooltip="true"
prop="taskStatus"
>
<el-table-column width="60" align="center" label="序号" type="index" >
<template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="退料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="退料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="物资类型" align="center" prop="typeName" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="退料人" align="center" prop="backPerson" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="退料人电话" align="center" prop="phone" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/>
<!-- <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/> -->
<el-table-column label="状态" align="center" :show-overflow-tooltip="true" prop="taskStatus" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.back_task_status" :value="scope.row.taskStatus"/>
<!-- <el-button type="text" v-if="scope.row.taskStatus == '0'">未完成</el-button>
@ -203,70 +118,31 @@
<el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '1'">已驳回</el-button> -->
</template>
</el-table-column>
<el-table-column
label="打印状态"
align="center"
prop="printStatus"
:show-overflow-tooltip="true"
>
<el-table-column label="打印状态" align="center" prop="printStatus" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<div v-if="scope.row.printStatus==1">已打印</div>
<div v-if="scope.row.printStatus==0">未打印</div>
</template>
</el-table-column>
<el-table-column
label="备注"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="250"
>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
plain
icon="el-icon-zoom-in"
@click="handleSee(scope.row)"
>查看</el-button
>
<el-button
size="mini"
type="primary"
plain
icon="el-icon-edit"
v-if="scope.row.taskStatus!=2"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
<el-button
size="mini"
type="success"
plain
icon="el-icon-refresh"
v-if="scope.row.taskStatus!=2"
@click="handleSubmit(scope.row)"
>提交</el-button
>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
<el-button size="mini" plain icon="el-icon-zoom-in"
@click="handleSee(scope.row)"
>查看</el-button>
<el-button size="mini" type="primary" plain icon="el-icon-edit"
v-if="scope.row.taskStatus!=2" @click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button size="mini" type="success" plain icon="el-icon-refresh"
v-if="scope.row.taskStatus!=2" @click="handleSubmit(scope.row)"
>提交</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete"
v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1"
@click="handleDelete(scope.row)"
>删除</el-button
>
<el-button
size="mini"
type="info" icon="el-icon-zoom-in"
>删除</el-button>
<el-button size="mini" type="info" icon="el-icon-zoom-in"
@click="handlePrint(scope.row)"
>退料单</el-button
>
>退料单</el-button>
</template>
</el-table-column>
</el-table>
@ -280,26 +156,13 @@
/>
<!-- 退料单 -->
<dialogFormByCq
:dialogTitle="title"
:isShowFlag.sync="isShowOneFlag"
:priKey="priKey"
:rowObj="rowObj"
></dialogFormByCq>
<dialogFormByCq :dialogTitle="title" :isShowFlag.sync="isShowOneFlag" :priKey="priKey" :rowObj="rowObj"></dialogFormByCq>
<!-- 提交 -->
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
:title="title"
:visible.sync="openOne"
append-to-body
width="400px"
>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openOne" append-to-body width="400px">
<div class="submit_box">
<div>
<i
class="el-icon-circle-check"
style="color: #ff9900; font-size: 30px"
></i>
<i class="el-icon-circle-check" style="color: #ff9900; font-size: 30px"></i>
</div>
<div class="submit_box_title">
<div>{{ openTextOne }}</div>
@ -309,18 +172,11 @@
<div slot="footer" class="dialog-footer">
<el-button @click="openOne=false">返回</el-button>
<el-button type="primary" @click="submitOpenOneForm()"
>确定</el-button
>
>确定</el-button>
</div>
</el-dialog>
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
:title="title"
:visible.sync="openTwo"
append-to-body
width="400px"
>
<el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openTwo" append-to-body width="400px">
<div class="submit_box_two">
<div>
<i

1
src/views/material/lease/apply/component/homeApply.vue
View File

@ -232,6 +232,7 @@
style="margin-bottom: 10px"
type="primary"
@click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus != 4"
v-hasPermi="['purchase:info:edit']"
>编辑
</el-button>

72
src/views/material/lease/protocol/index.vue
View File

@ -1,10 +1,10 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item prop="keyWord">
<el-form-item prop="keyWord" label="关键字">
<el-input
v-model="queryParams.keyWord"
placeholder="请输入关键词"
placeholder="请输入关键字"
clearable
@keyup.enter.native="handleQuery"
maxlength="20"
@ -59,22 +59,22 @@
</el-row>
<el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="teamId">
<el-table v-loading="loading" border :data="houseList" ref="multipleTable" row-key="teamId">
<el-table-column label="序号" align="center" width="80" type="index">
<template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="协议签订时间" align="center" prop="signTime" sortable/>
<el-table-column label="协议编号" align="center" prop="agreementCode" sortable/>
<el-table-column label="合同编号" align="center" prop="contractCode" sortable/>
<el-table-column label="租赁单位" align="center" prop="unitName" sortable/>
<el-table-column label="租赁工程" align="center" prop="projectName" sortable/>
<el-table-column label="开始日期" align="center" prop="planStartTime" sortable/>
<!-- <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" sortable/>-->
<el-table-column label="授权人" align="center" prop="authPerson" sortable/>
<el-table-column label="授权人电话" align="center" prop="phone" sortable/>
<el-table-column label="租赁单位类型" align="center">
<el-table-column label="协议签订时间" align="center" prop="signTime" width="150"/>
<el-table-column label="协议编号" align="center" prop="agreementCode" width="180"/>
<el-table-column label="合同编号" align="center" prop="contractCode" width="120"/>
<el-table-column label="租赁单位" align="center" prop="unitName" width="150"/>
<el-table-column label="租赁工程" align="center" prop="projectName" width="150"/>
<el-table-column label="开始日期" align="center" prop="planStartTime" width="120"/>
<el-table-column label="租赁期限(天)" align="center" prop="leaseDay" width="100"/>
<el-table-column label="授权人" align="center" prop="authPerson" width="100"/>
<el-table-column label="授权人电话" align="center" prop="phone" width="120"/>
<el-table-column label="租赁单位类型" align="center" width="100">
<template slot-scope="scope">
<span v-if="scope.row.protocol == '1'">内部单位</span>
<span v-if="scope.row.protocol == '2'">外部单位</span>
@ -82,7 +82,7 @@
</el-table-column>
<el-table-column label="附件图片" align="center" width="180">
<el-table-column label="附件图片" align="center" width="150">
<template slot-scope="scope">
<el-button
size="mini"
@ -94,24 +94,24 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" sortable/>
<el-table-column label="操作" align="center" width="220">
<el-table-column label="备注" align="center" prop="remark" width="100"/>
<el-table-column label="操作" align="center" width="240" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
size="mini"
@click="handleView(scope.row)"
>
查看
</el-button>
<el-button
size="mini" type="primary"
size="mini" type="primary"
@click="handleUpdate(scope.row)"
>
编辑
</el-button>
<el-button
size="mini"
type="danger"
type="danger"
@click="handleDelete(scope.row)"
>
删除
@ -132,7 +132,7 @@
<el-dialog :title="title" :visible.sync="showHouse" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-col :span="12">
<el-form-item label="租赁单位" prop="unitId" >
<treeselect
v-model="form.unitId" :disabled="isEdits"
@ -140,7 +140,7 @@
:show-count="true" style="width: 100%;" :disable-branch-nodes="true"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
placeholder="请选择租赁单位"
/>
/>
<!-- <el-cascader
v-model="unitId"
:show-all-levels="false"
@ -154,8 +154,8 @@
style="width: 100%;"
:disabled="isEdits"
></el-cascader> -->
</el-form-item>
</el-col>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="授权人" prop="authPerson">
<el-input
@ -191,7 +191,7 @@
style="width: 100%;"
:disabled="isEdits"
></el-cascader> -->
</el-form-item>
</el-form-item>
</el-col>
@ -220,7 +220,7 @@
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-col :span="12">
<el-form-item label="租赁期限(天)" prop="leaseDay">
<el-input-number
v-model="form.leaseDay"
@ -232,7 +232,7 @@
:disabled="isEdits"
/>
</el-form-item>
</el-col>-->
</el-col>
</el-row>
<el-row>
@ -339,9 +339,9 @@
<el-descriptions-item label="合同编号">
{{ form.contractCode }}
</el-descriptions-item>
<!-- <el-descriptions-item label="租赁期限(天)">
<el-descriptions-item label="租赁期限(天)">
{{ form.leaseDay }}
</el-descriptions-item>-->
</el-descriptions-item>
<el-descriptions-item label="开始日期">
{{ form.planStartTime }}
</el-descriptions-item>
@ -475,7 +475,7 @@ import {listUser} from "@/api/system/user";
import {getListProject, getListUnite} from "@/api/lease/apply";
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
name: "supplier",
@ -686,7 +686,7 @@ export default {
this.delBusinessFileIdList.push(file.url);
}
console.log('delBusinessFileIdList', this.delBusinessFileIdList)
},
},
isImage(file) {
this.urlTemp = require('@/assets/file.png');
if (this.updataIf(file)) {
@ -714,7 +714,7 @@ export default {
return true
}
}
},
},
handleDownload(file) {
console.log(file)
if (file.status === 'ready') {
@ -724,7 +724,7 @@ export default {
downloadFileData({fileName: file.name, fileUrl: file.url})
// downloadFileData({ fileName: file.name,fileUrl:file.url })
}
},
},
handleChangeBusinessList(file, fileList) {
const fileListTemp = fileList.filter(item => {
return item.uid != file.uid
@ -784,7 +784,7 @@ export default {
this.total = response.total;
this.loading = false;
});
},
},
/** 转换菜单数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
@ -795,20 +795,20 @@ export default {
label: node.name,
children: node.children,
};
},
},
//获取单位类型 ,getUnitList, getProjectList
getUnitList() {
getListUnite({projectId: null}).then((response) => {
this.uniteList = response.data;
});
},
},
getProjectList() {
getListProject({unitId: null}).then((response) => {
this.projectList = response.data;
});
},
uniteChange(val) {
uniteChange(val) {
if (val && val.length > 0) {
this.maForm.unitId = this.unitId[this.unitId.length - 1];
} else if (val && val.length == 0) {

2
src/views/material/purchase/goodsAccept/index.vue
View File

@ -88,7 +88,7 @@
<!-- </template>-->
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="250" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"

10
src/views/material/purchase/goodsArrived/component/home.vue
View File

@ -126,25 +126,25 @@
/>
<el-table-column
label="采购物资"
align="center"
align="center" width="180"
prop="purchaseMaTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购数量"
align="center"
align="center" width="100"
prop="purchaseMaNumber"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购价格(元含税)"
align="center"
align="center" width="100"
prop="purchaseTaxPrice"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购价格(元不含税)"
align="center"
align="center" width="100"
prop="purchasePrice"
:show-overflow-tooltip="true"
/>
@ -209,7 +209,7 @@
prop="remark"
show-overflow-tooltip
/>
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="250" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"

8
src/views/material/purchase/goodsBind/component/home.vue
View File

@ -111,18 +111,18 @@
<el-table-column
align="center"
label="到货时间"
prop="arrivalTime" width="150"
prop="arrivalTime" width="200"
show-overflow-tooltip
/>
<el-table-column
label="采购单号"
align="center"
prop="code" width="150"
prop="code" width="160"
show-overflow-tooltip
/>
<el-table-column
label="采购物资"
align="center"
align="center" width="200"
prop="purchaseMaTypeName"
show-overflow-tooltip
/>
@ -160,7 +160,7 @@
show-overflow-tooltip
/>
<el-table-column label="操作" align="center" width="400">
<el-table-column label="操作" align="center" width="300" fixed="right">
<template slot-scope="{ row }">
<el-button
plain

20
src/views/material/purchase/goodsEntry/index.vue
View File

@ -117,7 +117,7 @@
<el-table-column
label="到货时间"
align="center"
prop="arrivalTime" width="150"
prop="arrivalTime" width="180"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -128,28 +128,28 @@
/>
<el-table-column
label="采购物资"
align="center"
align="center" width="150"
prop="purchaseMaTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购数量"
align="center"
align="center" width="100"
prop="purchaseMaNumber"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购价格(元含税)"
align="center"
align="center"
prop="purchaseTaxPrice"
width="80"
width="100"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购价格（元不含税）"
align="center"
prop="purchasePrice"
width="80"
width="100"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -161,19 +161,19 @@
<el-table-column
label="物资厂家"
align="center"
prop="supplier"
prop="supplier" width="100"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作人"
align="center"
prop="createBy"
prop="createBy" width="100"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作时间"
align="center"
prop="createTime" width="150"
prop="createTime" width="180"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -187,7 +187,7 @@
<!-- </template>-->
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="250" fixed="right">
<template slot-scope="scope">
<el-button size="mini" @click="handleView(scope.row)">
查看