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

测试问题修改6

This commit is contained in:
zzyuan 2025-08-08 15:09:28 +08:00
parent 188b5d5f53
commit 74408cbb24
5 changed files with 334 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/foodManage/stockManage/inventoryCount/edit.vue
View File

@ -213,6 +213,9 @@ export default {
firstCheckDate: [
{ required: true, message: "盘点开始时间不能为空", trigger: "change" }
],
firstCheckUser: [
{ required: true, message: "盘点员不能为空", trigger: "change" }
],
secondCheckDate: [
{ required: true, message: "盘点结束时间不能为空", trigger: "change" }
],

10
src/views/foodManage/stockManage/warehouseIn/index.vue
View File

@ -47,11 +47,7 @@
<el-select v-model="queryParams.intoType" placeholder="请选择入库类型" style="width: 240px;">
<el-option label="采购入库" :value="1"></el-option>
<el-option label="退料入库" :value="2"></el-option>
<el-option label="调拨入库" :value="3"></el-option>
<el-option label="即入即出" :value="4"></el-option>
<el-option label="超市退单入库" :value="5"></el-option>
<el-option label="盘点入库" :value="6"></el-option>
<el-option label="期初入库" :value="7"></el-option>
<el-option label="调拨入库" :value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item>
@ -93,10 +89,6 @@
<span v-if="scope.row.intoType==1">采购入库</span>
<span v-if="scope.row.intoType==2">退料入库</span>
<span v-if="scope.row.intoType==3">调拨入库</span>
<span v-if="scope.row.intoType==4">即入即出</span>
<span v-if="scope.row.intoType==5">超市退单入库</span>
<span v-if="scope.row.intoType==6">盘点入库</span>
<span v-if="scope.row.intoType==7">期初入库</span>
</template>
</el-table-column>
<!-- <el-table-column label="质检报告" align="center" prop="" :show-overflow-tooltip="true" width="100">

6
src/views/foodManage/stockManage/warehouseOut/index.vue
View File

@ -49,9 +49,6 @@
<el-option label="报损出库" :value="2"></el-option>
<el-option label="退货出库" :value="3"></el-option>
<el-option label="调拨出库" :value="4"></el-option>
<el-option label="即入即出" :value="5"></el-option>
<el-option label="超市出库" :value="6"></el-option>
<el-option label="盘点出库" :value="7"></el-option>
</el-select>
</el-form-item>
<el-form-item>
@ -95,9 +92,6 @@
<span v-if="scope.row.outType==2">报损出库</span>
<span v-if="scope.row.outType==3">退货出库</span>
<span v-if="scope.row.outType==4">调拨出库</span>
<span v-if="scope.row.outType==5">即入即出</span>
<span v-if="scope.row.outType==6">超市出库</span>
<span v-if="scope.row.outType==7">盘点出库</span>
</template>
</el-table-column>
<!-- <el-table-column label="质检报告" align="center" prop="status" :show-overflow-tooltip="true" width="100">

14
src/views/foodManage/stockReport/inoutDetails/index.vue
View File

@ -50,13 +50,13 @@
<el-table-column label="数据来源" align="center" prop="" :show-overflow-tooltip="true" />
<el-table-column label="出入库类型" align="center" prop="outType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.outType==1">领取出库</span>
<span v-if="scope.row.outType==2">报损出库</span>
<span v-if="scope.row.outType==3">退货出库</span>
<span v-if="scope.row.outType==4">调拨出库</span>
<span v-if="scope.row.outType==5">即入即出</span>
<span v-if="scope.row.outType==6">超市出库</span>
<span v-if="scope.row.outType==7">盘点出库</span>
<span v-if="scope.row.recordType==1&&scope.row.outType==1">采购入库</span>
<span v-if="scope.row.recordType==1&&scope.row.outType==2">退料入库</span>
<span v-if="scope.row.recordType==1&&scope.row.outType==3">调拨入库</span>
<span v-if="scope.row.recordType==2&&scope.row.outType==1">领取出库</span>
<span v-if="scope.row.recordType==2&&scope.row.outType==2">报损出库</span>
<span v-if="scope.row.recordType==2&&scope.row.outType==3">退货出库</span>
<span v-if="scope.row.recordType==2&&scope.row.outType==4">调拨出库</span>
</template>
</el-table-column>
<el-table-column label="业务单据" align="center" prop="recordId" :show-overflow-tooltip="true" width="180"/>

409
src/views/foodManage/supplierManage/supplierList/index.vue
View File

@ -80,7 +80,7 @@
<el-table-column label="用户手机号" align="center" prop="telephone" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="营业执照编号" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="食品经营许可证编号" align="center" prop="" :show-overflow-tooltip="true" width="180"/>
<el-table-column label="供应类别" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="供应类别" align="center" prop="categoryModelStr" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
@ -252,8 +252,7 @@
<el-form-item label="邮箱" prop="standbyEmail">
<el-input v-model="form.standbyEmail" placeholder="请输入邮箱" maxlength="30" clearable/>
</el-form-item>
</el-col>
</el-col>
<el-col :span="12">
<el-form-item label="企业法人/负责人身份证复印件(正面)" prop="">
<el-upload
@ -300,7 +299,7 @@
<el-row style="height: 550px;overflow-y: auto;">
<el-col :span="12">
<el-form-item label="注册资金(万元)" prop="registFund">
<el-input v-model.number="form.registFund" placeholder="请输入注册资金" maxlength="9" clearable/>
<el-input v-model.number="form.registFund" placeholder="请输入注册资金" maxlength="8" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -314,12 +313,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="职工人数" prop="workersNum">
<el-input v-model.number="form.workersNum" placeholder="请输入职工人数" maxlength="9" clearable/>
<el-input v-model.number="form.workersNum" placeholder="请输入职工人数" maxlength="8" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="目前服务的客户数量" prop="clientNum">
<el-input v-model.number="form.clientNum" placeholder="请输入目前服务的客户数量" maxlength="9" clearable/>
<el-input v-model.number="form.clientNum" placeholder="请输入目前服务的客户数量" maxlength="8" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -364,18 +363,19 @@
</el-tab-pane>
<el-tab-pane label="主要资质" name="qualification">
<el-row style="height: 550px;overflow-y: auto;">
<div v-for="(item,index) in mainQualificationList" :key="index">
<div>
<el-col :span="24">
<div>{{ item.qualificationName }}</div>
<div>{{ mainQualificationList[0].qualificationName }}</div>
</el-col>
<el-col :span="12">
<el-form-item label="证书编号">
<el-input v-model="item.qualificationCode" placeholder="请输入供应商全称" maxlength="30" clearable/>
<el-input v-model="mainQualificationList[0].qualificationCode" placeholder="请输入证书编号" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效期" prop="">
<el-date-picker v-model="item.expirationDate"
<el-date-picker v-model="mainQualificationList[0].expirationDate"
type="date" align="right" clearable
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 100%">
@ -383,18 +383,18 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="item.qualificationName+'照片'" prop="">
<el-form-item :label="mainQualificationList[0].qualificationName+'照片'" prop="">
<el-upload
:http-request="(obj) => imgUpLoadMain(obj,index)"
:http-request="(obj) => imgUpLoadMain0(obj)"
action="#"
:limit="1"
:show-file-list="true"
:file-list="item.fileList"
:file-list="mainQualificationList[0].fileList"
list-type="picture-card"
accept=".png, .jpg, .jpeg"
:on-exceed="handleExceed"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemoveMain(index)"
:on-remove="handleRemoveMain0"
>
<i
class="el-icon-plus avatar-uploader-icon"
@ -403,6 +403,166 @@
</el-form-item>
</el-col>
</div>
<div>
<el-col :span="24">
<div>{{ mainQualificationList[1].qualificationName }}</div>
</el-col>
<el-col :span="12">
<el-form-item label="证书编号">
<el-input v-model="mainQualificationList[1].qualificationCode" placeholder="请输入证书编号" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效期" prop="">
<el-date-picker v-model="mainQualificationList[1].expirationDate"
type="date" align="right" clearable
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="mainQualificationList[1].qualificationName+'照片'" prop="">
<el-upload
:http-request="(obj) => imgUpLoadMain1(obj)"
action="#"
:limit="1"
:show-file-list="true"
:file-list="mainQualificationList[1].fileList"
list-type="picture-card"
accept=".png, .jpg, .jpeg"
:on-exceed="handleExceed"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemoveMain1"
>
<i
class="el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
</div>
<div>
<el-col :span="24">
<div>{{ mainQualificationList[2].qualificationName }}</div>
</el-col>
<el-col :span="12">
<el-form-item label="证书编号">
<el-input v-model="mainQualificationList[2].qualificationCode" placeholder="请输入证书编号" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效期" prop="">
<el-date-picker v-model="mainQualificationList[2].expirationDate"
type="date" align="right" clearable
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="mainQualificationList[2].qualificationName+'照片'" prop="">
<el-upload
:http-request="(obj) => imgUpLoadMain2(obj)"
action="#"
:limit="1"
:show-file-list="true"
:file-list="mainQualificationList[2].fileList"
list-type="picture-card"
accept=".png, .jpg, .jpeg"
:on-exceed="handleExceed"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemoveMain2"
>
<i
class="el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
</div>
<div>
<el-col :span="24">
<div>{{ mainQualificationList[3].qualificationName }}</div>
</el-col>
<el-col :span="12">
<el-form-item label="证书编号">
<el-input v-model="mainQualificationList[3].qualificationCode" placeholder="请输入证书编号" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效期" prop="">
<el-date-picker v-model="mainQualificationList[3].expirationDate"
type="date" align="right" clearable
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="mainQualificationList[3].qualificationName+'照片'" prop="">
<el-upload
:http-request="(obj) => imgUpLoadMain3(obj)"
action="#"
:limit="1"
:show-file-list="true"
:file-list="mainQualificationList[3].fileList"
list-type="picture-card"
accept=".png, .jpg, .jpeg"
:on-exceed="handleExceed"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemoveMain3"
>
<i
class="el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
</div>
<div>
<el-col :span="24">
<div>{{ mainQualificationList[4].qualificationName }}</div>
</el-col>
<el-col :span="12">
<el-form-item label="证书编号">
<el-input v-model="mainQualificationList[4].qualificationCode" placeholder="请输入证书编号" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效期" prop="">
<el-date-picker v-model="mainQualificationList[4].expirationDate"
type="date" align="right" clearable
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="mainQualificationList[4].qualificationName+'照片'" prop="">
<el-upload
:http-request="(obj) => imgUpLoadMain4(obj)"
action="#"
:limit="1"
:show-file-list="true"
:file-list="mainQualificationList[4].fileList"
list-type="picture-card"
accept=".png, .jpg, .jpeg"
:on-exceed="handleExceed"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemoveMain4"
>
<i
class="el-icon-plus avatar-uploader-icon"
></i>
</el-upload>
</el-form-item>
</el-col>
</div>
</el-row>
</el-tab-pane>
<!-- <el-tab-pane label="附件管理" name="attachment">
@ -542,43 +702,48 @@ export default {
idCardImgZNameList: [],//身份证正图片
fileList2: [],
idCardImgF: [],//身份证反图片
idCardImgFNameList: [],//身份证反图片
idCardImgFNameList: [],//身份证反图片
mainQualificationList:[
// {
// "qualificationCode": "",
// "qualificationName": "营业执照",
// "expirationDate": "",
// "imgUrl": "",
// "mainFlag": 1,
// },
// {
// "qualificationCode": "",
// "qualificationName": "ISO9001国际质量体系认证",
// "expirationDate": "",
// "imgUrl": "",
// "mainFlag": 1,
// },
// {
// "qualificationCode": "",
// "qualificationName": "食品经营许可证",
// "expirationDate": "",
// "imgUrl": "",
// "mainFlag": 1,
// },
// {
// "qualificationCode": "",
// "qualificationName": "烟草经营许可证",
// "expirationDate": "",
// "imgUrl": "",
// "mainFlag": 1,
// },
// {
// "qualificationCode": "",
// "qualificationName": "HACCP认证",
// "expirationDate": "",
// "imgUrl": "",
// "mainFlag": 1,
// }
{
"qualificationCode": "",
"qualificationName": "营业执照",
"qualificationType": 1,
"expirationDate": "",
"imgUrl": "",
"mainFlag": 1,
},
{
"qualificationCode": "",
"qualificationName": "ISO9001国际质量体系认证",
"qualificationType": 2,
"expirationDate": "",
"imgUrl": "",
"mainFlag": 1,
},
{
"qualificationCode": "",
"qualificationName": "食品经营许可证",
"qualificationType": 3,
"expirationDate": "",
"imgUrl": "",
"mainFlag": 1,
},
{
"qualificationCode": "",
"qualificationName": "烟草经营许可证",
"qualificationType": 4,
"expirationDate": "",
"imgUrl": "",
"mainFlag": 1,
},
{
"qualificationCode": "",
"qualificationName": "HACCP认证",
"qualificationType": 5,
"expirationDate": "",
"imgUrl": "",
"mainFlag": 1,
}
],
fileList3:[],
attachmentList:[],
@ -642,10 +807,18 @@ export default {
"categoryIdList": this.queryParams.categoryIdList,
"areaIdList": [this.queryParams.areaId],
"linkman": this.queryParams.linkman,
"status": this.queryParams.status
"status": this.queryParams.status,
"isPaging":2
}
supplierPageApi(param).then(response => {
this.tableListData = response.rows;
this.tableListData.forEach(item=>{
if(item.categoryModelList&&item.categoryModelList.length>0){
let arr = item.categoryModelList.map(item=>item.categoryName)
let str= arr.join(",")
item.categoryModelStr = str
}
})
this.total = Number(response.total);
this.loading = false;
});
@ -667,13 +840,24 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.reset();
this.attachmentList=[]
this.open = true;
this.title = "新增";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.reset();
this.mainQualificationList=[]
row.mainQualificationList.forEach(item=>{
let obj = Object.assign({},item)
if(obj.imgUrl&&obj.imgUrl!=''){
this.$set(obj,"fileList",[{url:obj.imgUrl}])
}else{
this.$set(obj,"fileList",[])
}
this.mainQualificationList.push(obj)
})
if(row.idCardImgZ){
this.fileList1=[{url:row.idCardImgZ}]
this.idCardImgZ=[row.idCardImgZ]
@ -687,21 +871,13 @@ export default {
}else{
this.fileList2=[]
this.idCardImgF=[]
}
}
this.form = Object.assign({}, row)
let arr = ['2']
let arr = []
this.form.categoryModelList.forEach(item=>{
arr.push(item.categoryId)
})
this.$set(this.form,"categoryIdList",arr)
this.form.mainQualificationList.forEach(item=>{
if(item.imgUrl&&item.imgUrl!=''){
item.fileList = [{url:item.imgUrl}]
}else{
item.fileList=[]
}
})
this.mainQualificationList = this.form.mainQualificationList;
this.$set(this.form,"categoryIdList",arr)
this.open = true;
this.title = "修改";
},
@ -718,7 +894,8 @@ export default {
this.idCardImgZNameList=[]
this.fileList2=[]
this.idCardImgF=[]
this.idCardImgFNameList=[]
this.idCardImgFNameList=[]
this.fileList3=[]
this.mainQualificationList=[
{
"qualificationCode": "",
@ -771,14 +948,8 @@ export default {
isShowUpload:false
}
]
this.fileList3=[]
this.attachmentList=[]
this.form = {
mainQualificationList:[],
otherQualificationList:[],
attachmentList:[],
deliverVOList:[]
};
this.form = {};
this.resetForm("form");
},
/** 提交按钮 */
@ -794,9 +965,10 @@ export default {
this.form.idCardImgF = this.idCardImgF[0]
}else{
this.form.idCardImgF = null
}
this.form.mainQualificationList = this.mainQualificationList
this.form.attachmentList = this.attachmentList
}
console.log(this.mainQualificationList)
this.form.mainQualificationList = this.mainQualificationList;
this.form.attachmentList = this.attachmentList
if (this.form.supplierId != undefined) {
editSupplierApi(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
@ -823,6 +995,7 @@ export default {
}).catch(() => {});
},
// 图片上传
//企业法人/负责人身份证复印件(正面)
imgUpLoad(param, name, index) {
param.type = 'canteen'
imgUpLoadTwo(param).then((res) => {
@ -847,6 +1020,7 @@ export default {
this.idCardImgZ.splice(sum, 1)
this.idCardImgZNameList.splice(sum, 1)
},
//企业法人/负责人身份证复印件(反面)
imgUpLoad2(param, name, index) {
param.type = 'canteen'
imgUpLoadTwo(param).then((res) => {
@ -870,28 +1044,91 @@ export default {
})
this.idCardImgF.splice(sum, 1)
this.idCardImgFNameList.splice(sum, 1)
},
},
//主要资质
imgUpLoadMain(param,index){
imgUpLoadMain0(param) {
param.type = 'canteen'
imgUpLoadTwo(param).then((res) => {
if (res.code == 200) {
this.mainQualificationList[index].imgUrl = res.data.url;
this.mainQualificationList[index].isShowUpload = true;
if (res.code == 200) {
this.mainQualificationList[0].imgUrl = res.data.url;
// this.mainQualificationList[0].isShowUpload = true;
} else {
this.$modal.msgError(res.msg)
}
})
.catch((error) => {
this.$modal.msgError(error)
})
})
},
handleRemoveMain0(file, fileList) {
this.mainQualificationList[0].imgUrl=""
},
imgUpLoadMain1(param) {
param.type = 'canteen'
imgUpLoadTwo(param).then((res) => {
if (res.code == 200) {
this.mainQualificationList[1].imgUrl = res.data.url;
} else {
this.$modal.msgError(res.msg)
}
})
.catch((error) => {
this.$modal.msgError(error)
})
},
handleRemoveMain1(file, fileList) {
this.mainQualificationList[1].imgUrl=""
},
imgUpLoadMain2(param) {
param.type = 'canteen'
imgUpLoadTwo(param).then((res) => {
if (res.code == 200) {
this.mainQualificationList[2].imgUrl = res.data.url;
} else {
this.$modal.msgError(res.msg)
}
})
.catch((error) => {
this.$modal.msgError(error)
})
},
handleRemoveMain2(file, fileList) {
this.mainQualificationList[2].imgUrl=""
},
imgUpLoadMain3(param) {
param.type = 'canteen'
imgUpLoadTwo(param).then((res) => {
if (res.code == 200) {
this.mainQualificationList[3].imgUrl = res.data.url;
} else {
this.$modal.msgError(res.msg)
}
})
.catch((error) => {
this.$modal.msgError(error)
})
},
handleRemoveMain3(file, fileList) {
this.mainQualificationList[3].imgUrl=""
},
imgUpLoadMain4(param) {
param.type = 'canteen'
imgUpLoadTwo(param).then((res) => {
if (res.code == 200) {
this.mainQualificationList[4].imgUrl = res.data.url;
} else {
this.$modal.msgError(res.msg)
}
})
.catch((error) => {
this.$modal.msgError(error)
})
},
handleRemoveMain4(file, fileList) {
this.mainQualificationList[4].imgUrl=""
},
handleExceed(files, fileList){
this.$modal.msgError('资质照片最多上传一个')
},
handleRemoveMain(index) {
this.mainQualificationList[index].imgUrl="";
this.mainQualificationList[index].isShowUpload = false;
this.$modal.msgError('资质照片每项最多上传一个')
},
//附件上传