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

上传接口对接

This commit is contained in:
zhouzy062 2023-12-21 10:00:48 +08:00
parent dd36503472
commit 0ceae5c33b
4 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
View File

@ -61,7 +61,7 @@
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="dictId" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="机具类型名称" align="center" prop="machineTypeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="管理模式" align="center" prop="manageType" :show-overflow-tooltip="true" >
@ -71,6 +71,7 @@
</template>
</el-table-column>
<el-table-column label="机具厂家" align="center" prop="supplier" :show-overflow-tooltip="true" />
<el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" />
<el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
<el-table-column label="是否已具备设备自编号" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="验收图片" align="center" prop="checkUrl" :show-overflow-tooltip="true" />
@ -154,7 +155,7 @@
<!-- <el-table-column type="selection" width="50" align="center" /> -->
<el-table-column label="序号" align="center" key="userId" prop="userId" />
<el-table-column label="人员名称" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="所属机构" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="所属机构" align="center" key="deptName" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="角色" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
<el-table-column label="联系电话" align="center" key="phonenumber" prop="phonenumber" width="120" />
<el-table-column
@ -446,7 +447,9 @@ export default {
// const dictId = row.dictId || this.ids
// getType(dictId).then(response => {
console.log(row)
this.form = row;
let rowData = row
rowData.checkNum = rowData.purchaseNum;
this.form = rowData;
this.open = true;
this.title = "验收";
// });

62
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-row :gutter="24" class="mb8">
<el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col>
<!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
<el-col :span="16">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" >
<el-form-item label="机具类型" prop="equipmentId">
@ -33,32 +33,10 @@
/>
</el-select>
</el-form-item>
</el-form>
</el-form>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:role:add']"
>保存</el-button>
</el-col>
<el-col :span="3">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
@click="jumpList"
>采购验收管理</el-button>
</el-col>
<el-form :model="dataForm" ref="dataForm" :rules="rules" size="small" :inline="true">
<el-form :model="dataForm" ref="dataForm" :rules="rules" size="small" :inline="true">
<el-row>
<el-form-item label="采购日期" prop="purchaseTime">
<el-date-picker
@ -87,7 +65,7 @@
<el-option
v-for="item in userList"
:key="item.userId"
:label="item.nickName"
:label="item.userName"
:value="item.userId"
v-if="item.status !='1'"
></el-option>
@ -103,7 +81,29 @@
/>
</el-form-item>
</el-row>
</el-form>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>保存</el-button>
</el-col>
<el-col :span="3">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
@click="jumpList"
>采购验收管理</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@ -291,9 +291,9 @@ export default {
arrivalTime: [
{ required: true, message: "到货日期不能为空", trigger: "blur" }
],
purchaser: [
{ required: true, message: "采购员不能为空", trigger: "blur" }
]
// purchaser: [
// { required: true, message: "采购员不能为空", trigger: "blur" }
// ]
}
};
},
@ -308,7 +308,7 @@ export default {
methods: {
/** 查询用户列表--采购员 */
getUserList() {
getUserByRoleList().then(response => {
getUserByRoleList({roleId:'104'}).then(response => {
this.userList = response.data;
}
);

8
sgzb-ui/src/views/store/tools/toolsSupplier.vue
View File

@ -155,8 +155,8 @@
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove">
<!-- <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" class="avatar"> -->
<img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" class="avatar">
<img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" style="width: 140px;height: 140px;" class="avatar">
<!-- <img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<!-- <el-input v-model="form.businessLicense" placeholder="请上传营业执照" /> -->
@ -354,8 +354,8 @@ export default {
},
//图片查看
openImg(url){
// this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
// this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
this.dialogVisible = true;
},
/** 删除按钮操作 */

19
sgzb-ui/src/views/store/tools/toolsType.vue
View File

@ -98,7 +98,12 @@
<el-table-column label="库管员" align="center" key="keeperUserName" prop="keeperUserName"
:show-overflow-tooltip="true"/>
<el-table-column label="管理模式" align="center" key="manageType" prop="manageType"
:show-overflow-tooltip="true"/>
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.manageType=='0'">编码管理</span>
<span v-if="scope.row.manageType=='1'">数量管理</span>
</template>
</el-table-column>
@ -112,8 +117,8 @@
<el-table-column label="文档资料" align="center" key="documentName" prop="documentName"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- <a :href="'http://192.168.0.14:21624/system'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a> -->
<a :href="'http://10.40.92.140:9201'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a>
<a :href="'http://192.168.0.14:21624/system'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a>
<!-- <a :href="'http://10.40.92.140:9201'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a> -->
</template>
</el-table-column>
<el-table-column label="资产属性" align="center" key="propName" prop="propName"
@ -278,8 +283,8 @@
:on-success="handleAvatarSuccess"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove">
<!-- <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" class="avatar"> -->
<img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 100px;height: 100px;" class="avatar">
<img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" style="width: 140px;height: 140px;" class="avatar">
<!-- <img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
@ -740,8 +745,8 @@ export default {
},
//图片查看
openImg(url){
// this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
// this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
this.dialogVisible = true;
},
//文件上传