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

Compare commits

base: bonus:6757122d6e33dab1b5409c180e7c64c2c72b020d
Branches Tags
bonus:main
bonus:material-ui
bonus:anhui-mall-ui-test
bonus:bonus-jyy-smart-canteen
bonus:ah-sbd-h5
bonus:1555555
bonus:anhui-mall-ui-test-cq
bonus:gz-ma-mall-ui
bonus:ma-mall-ui
bonus:bonus-ai
bonus:ganzhe-material-ui
bonus:bonus-jyy-canteen
bonus:bonus-houqin
bonus:smart-site-ui
bonus:safetyWarning-shanghai-ui
bonus:bonus-chat-ui
bonus:yn-img-tool-ui
bonus:addcompany0105
bonus:work-site
bonus:bonus-green-smart-cafeteria
bonus:guizhiwuzi-ui
bonus:safetywarning-ui
bonus:safetymachine-ui
bonus:dev
..
compare: bonus:bc8a230f047bc6497cdfed194e16af1a831e33c2
Branches Tags
bonus:material-ui
bonus:anhui-mall-ui-test
bonus:bonus-jyy-smart-canteen
bonus:ah-sbd-h5
bonus:1555555
bonus:anhui-mall-ui-test-cq
bonus:gz-ma-mall-ui
bonus:ma-mall-ui
bonus:bonus-ai
bonus:ganzhe-material-ui
bonus:bonus-jyy-canteen
bonus:bonus-houqin
bonus:smart-site-ui
bonus:safetyWarning-shanghai-ui
bonus:bonus-chat-ui
bonus:main
bonus:yn-img-tool-ui
bonus:addcompany0105
bonus:work-site
bonus:bonus-green-smart-cafeteria
bonus:guizhiwuzi-ui
bonus:safetywarning-ui
bonus:safetymachine-ui
bonus:dev

No commits in common. "6757122d6e33dab1b5409c180e7c64c2c72b020d" and "bc8a230f047bc6497cdfed194e16af1a831e33c2" have entirely different histories.
6757122d6e ... bc8a230f04

6 changed files with 60 additions and 104 deletions
Show Stats Expand all files Collapse all files

9
src/api/foodManage/supplierManage.js
View File

@ -1,14 +1,5 @@
import request from '@/utils/request'
// 查询用户列表-全量查询
export function listUserAll(query) {
return request({
url: '/system/user/list_all',
method: 'get',
params: query
})
}
// 分页查询 列表
export function supplierPageApi(data) {
return request({

10
src/views/canteen/dish/nutritionInfo/index.vue
View File

@ -143,7 +143,7 @@
<el-input v-model="typeForm.parentName" placeholder="请输入父节点名称" maxlength="30" disabled/>
</el-form-item>
<el-form-item label="类别名称" prop="nutritionTypeName">
<el-input v-model="typeForm.nutritionTypeName" placeholder="请输入类别名称" maxlength="15"/>
<el-input v-model="typeForm.nutritionTypeName" placeholder="请输入类别名称" maxlength="30"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -840,7 +840,7 @@ export default {
},
// 表单参数
form: {
nutritionTypeId: undefined, // 营养信息类别
categoryId: undefined, // 营养信息类别
nutritionName: undefined, // 营养信息名称
nutritionCode: undefined, // 食材编码
processingTime: undefined, // 加工时间
@ -874,7 +874,7 @@ export default {
formTable:[],
// 表单校验
rules: {
nutritionTypeId: [
categoryId: [
{ required: true, message: "请选择营养信息类别", trigger: "change" }
],
nutritionName: [
@ -899,7 +899,7 @@ export default {
typeRules: {
name: [
{ required: true, message: "类别名称不能为空", trigger: "change" }
],
],
// nutritionName: [
// { required: true, message: "营养信息名称不能为空", trigger: "blur" }
// ],
@ -1058,7 +1058,7 @@ export default {
// 表单重置
reset() {
this.form = {
nutritionTypeId: undefined, // 营养信息类别
categoryId: undefined, // 营养信息类别
nutritionName: undefined, // 营养信息名称
nutritionCode: undefined, // 食材编码
processingTime: undefined, // 加工时间

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

@ -316,12 +316,6 @@ export default {
},
handleUpdate(row) {
this.form = Object.assign({}, row);
let param= {
areaId:row.areaId
}
getCanteenByAreaApi(param).then((response) => {
this.canteenOptions=response.rows||[]
});
this.open = true;
this.title = "修改";
},

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

@ -599,8 +599,7 @@ export default {
"pageSize": this.queryParams2.pageSize,
"pageNum": this.queryParams2.pageNum,
"areaId": this.baseInfo.areaId,
"warehouseId": this.baseInfo.warehouseId,
"fetchStatus":2 //1已领取,2未领取
"warehouseId": this.baseInfo.warehouseId
}
fetchMaterialPageApi(param).then(response => {
this.tableListData2 = response.rows;

16
src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
View File

@ -48,25 +48,23 @@
{{ baseInfo.inquiryNotes }}
</el-descriptions-item>
<el-descriptions-item label="所属区域" prop="areaId">
{{ baseInfo.areaName }}
<!-- <el-cascader v-model="baseInfo.areaId"
<el-cascader v-model="baseInfo.areaId"
:options="treeAreaOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
:props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
value:'id',label:'label'
}" @change="handleAreaChange">
</el-cascader> -->
</el-cascader>
</el-descriptions-item>
<el-descriptions-item label="邀请供应商" prop="supplierId">
{{ baseInfo.supplierName }}
<!-- <el-select v-model="baseInfo.supplierId" @change="handleSupplierChange" placeholder="请选择供应商" style="width: 100%;">
<el-descriptions-item label="邀请供应商" prop="supplierId">
<el-select v-model="baseInfo.supplierId" @change="handleSupplierChange" placeholder="请选择供应商" style="width: 100%;">
<el-option v-for="item in supplierOptions"
:key="item.supplierId"
:label="item.supplierName"
:value="item.supplierId"
></el-option>
</el-select> -->
</el-select>
</el-descriptions-item>
</el-descriptions>
</div>
@ -352,7 +350,7 @@ export default {
delMaterial(){
this.batchIds.forEach(ID=>{
let index = this.materialList.findIndex(v=>v.materialId==ID)
if(index>-1){
if(index>-1){
this.materialList.splice(index,1)
}
})
@ -371,6 +369,7 @@ export default {
}else{
this.$modal.msgError("请先选择区域");
}
},
/** 搜索按钮操作 */
handleQuery() {
@ -427,7 +426,6 @@ export default {
let param = Object.assign({},this.baseInfo);
param.arrivalTime = this.formatDateTime(this.baseInfo.arrivalTime)
param.detailList = []
console.log(param.arrivalTime)
if(param.arrivalTime.includes('1970')){
this.$modal.msgError("请选择交货时间！");
return;

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

@ -72,39 +72,39 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="供应商编号" align="center" prop="supplierCode" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="供应商评分" align="center" prop="supplierScore" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="主要联系人" align="center" prop="linkman" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="联系人手机号" align="center" prop="linkmanPhone" :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="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">
<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
<el-table-column label="供应商编号" align="center" prop="supplierCode" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="供应商评分" align="center" prop="supplierScore" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="主要联系人" align="center" prop="linkman" :show-overflow-tooltip="true" width="120"/>
<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="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">
<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
@ -131,38 +131,26 @@
<el-input v-model="form.supplierSimpleName" placeholder="请输入供应商简称" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商地址" prop="regionProvince">
<el-input v-model="form.regionProvince" placeholder="请输入供应商地址" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="绑定供应商用户" prop="supplierUserId">
<el-select v-model="form.supplierUserId" placeholder="请选择绑定供应商用户" style="width: 100%;" clearable>
<el-option v-for="item in supplierUserList"
:key="item.userId"
:label="item.userName"
:value="item.userId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商电话" prop="telephone">
<el-input v-model="form.telephone" placeholder="请输入供应商电话" maxlength="11" clearable/>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-col :span="12">
<el-form-item label="公司网站" prop="companyWeb">
<el-input v-model="form.companyWeb" placeholder="请输入公司网站" maxlength="30" clearable/>
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
</el-col>
<el-col :span="12">
<el-form-item label="供应商地址" prop="regionProvince">
<el-input v-model="form.regionProvince" placeholder="请输入供应商地址" maxlength="30" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" maxlength="30" clearable/>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="12">
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="form.areaId"
@ -203,7 +191,7 @@
<el-input v-model="form.bankAccount" placeholder="请输入银行账号" maxlength="30" clearable/>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-col :span="12">
<el-form-item label="税率" prop="taxRate">
<el-select v-model="form.taxRate" placeholder="请选择税率" style="width: 100%;">
<el-option label="3%" :value="1"></el-option>
@ -224,7 +212,7 @@
<el-option label="年" :value="7"></el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="12">
<el-form-item label="主要联系人" prop="linkman">
<el-input v-model="form.linkman" placeholder="请输入主要联系人" maxlength="30" clearable/>
@ -603,7 +591,7 @@
<el-tab-pane label="账户通知配置" name="notice">
</el-tab-pane> -->
</el-tabs>
</el-tabs>
</el-form>
<div slot="footer" class="dialog-footer">
@ -630,7 +618,8 @@
import { systemAreaTreeApi } from "@/api/base/stall";
import { systemMaterialTreeApi } from "@/api/dish/material";
import { imgUpLoadTwo } from '@/api/system/upload'
import { listUserAll,supplierPageApi,addSupplierApi, editSupplierApi, removeSupplierApi, editStatusSupplierApi } from "@/api/foodManage/supplierManage";
import { supplierPageApi,addSupplierApi, editSupplierApi, removeSupplierApi, editStatusSupplierApi } from "@/api/foodManage/supplierManage";
export default {
name: "",
dicts: [],
@ -686,9 +675,6 @@ export default {
categoryIdList: [
{ required: true, message: "主要供应类别不能为空", trigger: "change" }
],
supplierUserId: [
{ required: true, message: "供应商用户不能为空", trigger: "change" }
],
telephone: [
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@ -763,7 +749,6 @@ export default {
attachmentList:[],
dialogVisible:false,//图片弹窗
dialogImageUrl:"",//图片弹窗
supplierUserList:[],
};
},
computed: {
@ -782,7 +767,6 @@ export default {
this.getTypeTreeData();
this.getTreeData();
this.getList();
this.getSupplierUserList();
},
methods: {
@ -799,15 +783,6 @@ export default {
this.treeOptions = response.data;
});
},
getSupplierUserList(){
let param = {
deptId:225
}
listUserAll(param).then((response) => {
this.supplierUserList = response.rows
// this.total = response.total
})
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@ -903,7 +878,6 @@ export default {
arr.push(item.categoryId)
})
this.$set(this.form,"categoryIdList",arr)
this.$set(this.form,"supplierUserId",Number(row.supplierUserId))
this.open = true;
this.title = "修改";
},