Merge branch 'bonus-jyy-smart-canteen' of http://192.168.30.2:3000/bonus/bonus-ui into bonus-jyy-smart-canteen
This commit is contained in:
		
						commit
						c6b51fea1a
					
				| 
						 | 
					@ -379,7 +379,7 @@ export default {
 | 
				
			||||||
    // 筛选节点 - 左侧树
 | 
					    // 筛选节点 - 左侧树
 | 
				
			||||||
    filterNode(value, data) {
 | 
					    filterNode(value, data) {
 | 
				
			||||||
      if (!value) return true;
 | 
					      if (!value) return true;
 | 
				
			||||||
      return data.materialTypeName.indexOf(value) !== -1;
 | 
					      return data.categoryName.indexOf(value) !== -1;
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    /** 查询新增页面-上级类型下拉树结构 */
 | 
					    /** 查询新增页面-上级类型下拉树结构 */
 | 
				
			||||||
    getTreeData() {
 | 
					    getTreeData() {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -451,7 +451,7 @@ export default {
 | 
				
			||||||
            let param = {
 | 
					            let param = {
 | 
				
			||||||
                "pageSize": this.queryParams.pageSize,
 | 
					                "pageSize": this.queryParams.pageSize,
 | 
				
			||||||
                "pageNum": this.queryParams.pageNum,
 | 
					                "pageNum": this.queryParams.pageNum,
 | 
				
			||||||
                "areaId": this.queryParams.areaId,
 | 
					                "areaId": this.baseInfo.areaId,
 | 
				
			||||||
                "materialName": this.queryParams.materialName,
 | 
					                "materialName": this.queryParams.materialName,
 | 
				
			||||||
                "materialCode": this.queryParams.materialCode,  
 | 
					                "materialCode": this.queryParams.materialCode,  
 | 
				
			||||||
                "materialTypeIds": this.queryParams.materialTypeIds,
 | 
					                "materialTypeIds": this.queryParams.materialTypeIds,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -15,6 +15,7 @@
 | 
				
			||||||
                    <span v-if="baseInfo.status==1">未开始</span>
 | 
					                    <span v-if="baseInfo.status==1">未开始</span>
 | 
				
			||||||
                    <span v-if="baseInfo.status==2">进行中</span>
 | 
					                    <span v-if="baseInfo.status==2">进行中</span>
 | 
				
			||||||
                    <span v-if="baseInfo.status==3">已结束</span>
 | 
					                    <span v-if="baseInfo.status==3">已结束</span>
 | 
				
			||||||
 | 
					                    <span v-if="baseInfo.status==4">未决标</span>
 | 
				
			||||||
                    <span v-if="baseInfo.status==5">已取消</span>
 | 
					                    <span v-if="baseInfo.status==5">已取消</span>
 | 
				
			||||||
                </el-descriptions-item>
 | 
					                </el-descriptions-item>
 | 
				
			||||||
                <el-descriptions-item>
 | 
					                <el-descriptions-item>
 | 
				
			||||||
| 
						 | 
					@ -71,7 +72,7 @@
 | 
				
			||||||
                          <span v-if="scope.row.bidStatus==3">已选中</span>
 | 
					                          <span v-if="scope.row.bidStatus==3">已选中</span>
 | 
				
			||||||
                      </template>
 | 
					                      </template>
 | 
				
			||||||
                    </el-table-column>
 | 
					                    </el-table-column>
 | 
				
			||||||
                    <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
 | 
					                    <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" v-if="baseInfo.status==2">
 | 
				
			||||||
                        <template slot-scope="scope">
 | 
					                        <template slot-scope="scope">
 | 
				
			||||||
                            <el-button
 | 
					                            <el-button
 | 
				
			||||||
                                size="mini"  
 | 
					                                size="mini"  
 | 
				
			||||||
| 
						 | 
					@ -230,7 +231,7 @@ export default {
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            editInquirySupplierApi(param).then((response) => {
 | 
					            editInquirySupplierApi(param).then((response) => {
 | 
				
			||||||
                console.log('response',response); 
 | 
					                console.log('response',response); 
 | 
				
			||||||
                
 | 
					                this.getContractInfo()
 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -79,29 +79,30 @@
 | 
				
			||||||
        <el-table-column label="询价标题" align="center" prop="title" :show-overflow-tooltip="true" />
 | 
					        <el-table-column label="询价标题" align="center" prop="title" :show-overflow-tooltip="true" />
 | 
				
			||||||
        <el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
 | 
					        <el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
 | 
				
			||||||
        <el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" />
 | 
					        <el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" />
 | 
				
			||||||
        <el-table-column label="询价状态" align="center" prop="inquiryState" :show-overflow-tooltip="true" width="100">
 | 
					        <el-table-column label="询价状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
 | 
				
			||||||
            <template slot-scope="scope">
 | 
					            <template slot-scope="scope">
 | 
				
			||||||
                <span v-if="scope.row.status==1">--</span>
 | 
					                <span v-if="scope.row.status==1">待提交</span>
 | 
				
			||||||
                <span v-if="scope.row.status==3">进行中</span>
 | 
					 | 
				
			||||||
                <span v-if="scope.row.status==2">已决价</span>
 | 
					                <span v-if="scope.row.status==2">已决价</span>
 | 
				
			||||||
 | 
					                <span v-if="scope.row.status==3">进行中</span>
 | 
				
			||||||
 | 
					                <span v-if="scope.row.status==4">未决标</span> 
 | 
				
			||||||
                <span v-if="scope.row.status==5">已取消</span>
 | 
					                <span v-if="scope.row.status==5">已取消</span>
 | 
				
			||||||
            </template>
 | 
					            </template>
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column>
 | 
				
			||||||
        <el-table-column label="提交状态" align="center" prop="orderStatus" :show-overflow-tooltip="true" width="100">
 | 
					        <!-- <el-table-column label="提交状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
 | 
				
			||||||
            <template slot-scope="scope">
 | 
					            <template slot-scope="scope">
 | 
				
			||||||
                <span v-if="scope.row.status==1">待提交</span>
 | 
					                <span v-if="scope.row.status==1">待提交</span>
 | 
				
			||||||
                <span v-if="scope.row.status!=1">已提交</span>
 | 
					                <span v-if="scope.row.status!=1">已提交</span>
 | 
				
			||||||
            </template>
 | 
					            </template>
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column> -->
 | 
				
			||||||
        <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
 | 
					        <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
 | 
				
			||||||
        <el-table-column label="邀请供应商(家)" align="center" prop="inquirySupplierNum" :show-overflow-tooltip="true" />
 | 
					        <el-table-column label="邀请供应商(家)" align="center" prop="inquirySupplierNum" :show-overflow-tooltip="true" />
 | 
				
			||||||
        <el-table-column label="已报价供应商(家)" align="center" prop="supplierNum" :show-overflow-tooltip="true" />
 | 
					        <el-table-column label="已报价供应商(家)" align="center" prop="supplierNum" :show-overflow-tooltip="true" />
 | 
				
			||||||
        <el-table-column label="中选状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
 | 
					        <!-- <el-table-column label="中选状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
 | 
				
			||||||
            <template slot-scope="scope">
 | 
					            <template slot-scope="scope">
 | 
				
			||||||
                <span v-if="scope.row.status==3">已中选</span>
 | 
					                <span v-if="scope.row.status==3">已中选</span>
 | 
				
			||||||
                <span v-if="scope.row.status!=3">未中选</span>
 | 
					                <span v-if="scope.row.status!=3">未中选</span>
 | 
				
			||||||
            </template>
 | 
					            </template>
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column> -->
 | 
				
			||||||
        <el-table-column label="中选供应商" align="center" prop="" :show-overflow-tooltip="true" />
 | 
					        <el-table-column label="中选供应商" align="center" prop="" :show-overflow-tooltip="true" />
 | 
				
			||||||
        <el-table-column label="中选金额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120">
 | 
					        <el-table-column label="中选金额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120">
 | 
				
			||||||
            <!-- <template slot-scope="scope">
 | 
					            <!-- <template slot-scope="scope">
 | 
				
			||||||
| 
						 | 
					@ -284,10 +285,10 @@ export default {
 | 
				
			||||||
                "pageNum": this.queryParams.pageNum,
 | 
					                "pageNum": this.queryParams.pageNum,
 | 
				
			||||||
                "pageSize": this.queryParams.pageSize,
 | 
					                "pageSize": this.queryParams.pageSize,
 | 
				
			||||||
                "searchValue": this.queryParams.searchValue,
 | 
					                "searchValue": this.queryParams.searchValue,
 | 
				
			||||||
                "areaId": this.queryParams.areaId,
 | 
					                // "areaId": this.queryParams.areaId,
 | 
				
			||||||
                "inquiryState": this.queryParams.inquiryState,
 | 
					                // "inquiryState": this.queryParams.inquiryState,
 | 
				
			||||||
                "status": this.queryParams.status,
 | 
					                // "status": this.queryParams.status,
 | 
				
			||||||
                "orderStatus": this.queryParams.orderStatus
 | 
					                // "orderStatus": this.queryParams.orderStatus
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            if(this.dateRange&&this.dateRange.length>0){
 | 
					            if(this.dateRange&&this.dateRange.length>0){
 | 
				
			||||||
                param.startTime=this.formatDateTime(this.dateRange[0])
 | 
					                param.startTime=this.formatDateTime(this.dateRange[0])
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -96,7 +96,7 @@
 | 
				
			||||||
                    <div class="body-card">
 | 
					                    <div class="body-card">
 | 
				
			||||||
                        <div v-for="dish in item.dishesList" :key="dish.dishesId" style="width: 100%;display: flex;justify-content: space-between;align-items: center;">
 | 
					                        <div v-for="dish in item.dishesList" :key="dish.dishesId" style="width: 100%;display: flex;justify-content: space-between;align-items: center;">
 | 
				
			||||||
                            <span>{{dish.dishesName}}</span> 
 | 
					                            <span>{{dish.dishesName}}</span> 
 | 
				
			||||||
                            <el-input v-model="dish.dishesNum" placeholder="份数" maxlength="10" clearable 
 | 
					                            <el-input v-model="dish.dishesNum" placeholder="份数" maxlength="8" clearable 
 | 
				
			||||||
                                    @input="(v)=>(dish.dishesNum=v.replace(/[^\d]/g,''))" style="width: 100px;"/>
 | 
					                                    @input="(v)=>(dish.dishesNum=v.replace(/[^\d]/g,''))" style="width: 100px;"/>
 | 
				
			||||||
                            <!-- <i class="el-icon-delete" style="color: red;cursor: pointer;" @click="deleteDishes(item,dish)"  v-if="dialogType==1"></i> -->
 | 
					                            <!-- <i class="el-icon-delete" style="color: red;cursor: pointer;" @click="deleteDishes(item,dish)"  v-if="dialogType==1"></i> -->
 | 
				
			||||||
                        </div>
 | 
					                        </div>
 | 
				
			||||||
| 
						 | 
					@ -181,7 +181,7 @@
 | 
				
			||||||
                        </el-table-column> 
 | 
					                        </el-table-column> 
 | 
				
			||||||
                        <el-table-column label="份数" align="center" prop="dishesNum">
 | 
					                        <el-table-column label="份数" align="center" prop="dishesNum">
 | 
				
			||||||
                            <template slot-scope="scope">
 | 
					                            <template slot-scope="scope">
 | 
				
			||||||
                                <el-input  v-model="scope.row.dishesNum" placeholder="份数" maxlength="10" clearable @input="(v)=>(scope.row.dishesNum=v.replace(/[^\d]/g,''))"/>
 | 
					                                <el-input  v-model="scope.row.dishesNum" placeholder="份数" maxlength="8" clearable @input="(v)=>(scope.row.dishesNum=v.replace(/[^\d]/g,''))"/>
 | 
				
			||||||
                            </template>
 | 
					                            </template>
 | 
				
			||||||
                        </el-table-column> 
 | 
					                        </el-table-column> 
 | 
				
			||||||
                        <el-table-column label="操作" align="center">
 | 
					                        <el-table-column label="操作" align="center">
 | 
				
			||||||
| 
						 | 
					@ -833,7 +833,12 @@ export default {
 | 
				
			||||||
                        if(param.productionPlanDetailVOList&¶m.productionPlanDetailVOList.length>0){
 | 
					                        if(param.productionPlanDetailVOList&¶m.productionPlanDetailVOList.length>0){
 | 
				
			||||||
                            addList.forEach(item=>{ 
 | 
					                            addList.forEach(item=>{ 
 | 
				
			||||||
                                let index = param.productionPlanDetailVOList.findIndex(v=>(v.detailDate==item.detailDate&&v.mealtimeType==item.mealtimeType&&v.dishesId==item.dishesId))
 | 
					                                let index = param.productionPlanDetailVOList.findIndex(v=>(v.detailDate==item.detailDate&&v.mealtimeType==item.mealtimeType&&v.dishesId==item.dishesId))
 | 
				
			||||||
 | 
					                                if(index>-1){
 | 
				
			||||||
                                    param.productionPlanDetailVOList[index].dishesNum = item.dishesNum
 | 
					                                    param.productionPlanDetailVOList[index].dishesNum = item.dishesNum
 | 
				
			||||||
 | 
					                                }else{
 | 
				
			||||||
 | 
					                                    item.goodsType=1;
 | 
				
			||||||
 | 
					                                    param.productionPlanDetailVOList.push(item)
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
                            })
 | 
					                            })
 | 
				
			||||||
                            param.productionPlanDetailAddList = param.productionPlanDetailVOList 
 | 
					                            param.productionPlanDetailAddList = param.productionPlanDetailVOList 
 | 
				
			||||||
                        }else{
 | 
					                        }else{
 | 
				
			||||||
| 
						 | 
					@ -947,7 +952,12 @@ export default {
 | 
				
			||||||
                        if(param.productionPlanDetailVOList&¶m.productionPlanDetailVOList.length>0){ 
 | 
					                        if(param.productionPlanDetailVOList&¶m.productionPlanDetailVOList.length>0){ 
 | 
				
			||||||
                            addList.forEach(item=>{ 
 | 
					                            addList.forEach(item=>{ 
 | 
				
			||||||
                                let index = param.productionPlanDetailVOList.findIndex(v=>(v.detailDate==item.detailDate&&v.mealtimeType==item.mealtimeType&&v.dishesId==item.dishesId))
 | 
					                                let index = param.productionPlanDetailVOList.findIndex(v=>(v.detailDate==item.detailDate&&v.mealtimeType==item.mealtimeType&&v.dishesId==item.dishesId))
 | 
				
			||||||
 | 
					                                if(index>-1){
 | 
				
			||||||
                                    param.productionPlanDetailVOList[index].dishesNum = item.dishesNum
 | 
					                                    param.productionPlanDetailVOList[index].dishesNum = item.dishesNum
 | 
				
			||||||
 | 
					                                }else{
 | 
				
			||||||
 | 
					                                    item.goodsType=1;
 | 
				
			||||||
 | 
					                                    param.productionPlanDetailVOList.push(item)
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
                            }) 
 | 
					                            }) 
 | 
				
			||||||
                            param.productionPlanDetailAddList = param.productionPlanDetailVOList 
 | 
					                            param.productionPlanDetailAddList = param.productionPlanDetailVOList 
 | 
				
			||||||
                        }else{
 | 
					                        }else{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -69,7 +69,7 @@
 | 
				
			||||||
        <el-table-column label="送货人" align="center" prop="deliveryMan" :show-overflow-tooltip="true"/>
 | 
					        <el-table-column label="送货人" align="center" prop="deliveryMan" :show-overflow-tooltip="true"/>
 | 
				
			||||||
        <el-table-column label="送货人电话" align="center" prop="deliveryPhone" :show-overflow-tooltip="true"/>
 | 
					        <el-table-column label="送货人电话" align="center" prop="deliveryPhone" :show-overflow-tooltip="true"/>
 | 
				
			||||||
        <!-- <el-table-column label="送货仓库" align="center" prop="deliveryWarehouseId" :show-overflow-tooltip="true"/> -->
 | 
					        <!-- <el-table-column label="送货仓库" align="center" prop="deliveryWarehouseId" :show-overflow-tooltip="true"/> -->
 | 
				
			||||||
         <el-table-column label="送货日期" align="center" prop="deliveryDate" :show-overflow-tooltip="true"/>
 | 
					         <el-table-column label="验货日期" align="center" prop="inspectDate" :show-overflow-tooltip="true"/>
 | 
				
			||||||
        <el-table-column label="送货总数量" align="center" prop="deliveryTotalNum" :show-overflow-tooltip="true"/>
 | 
					        <el-table-column label="送货总数量" align="center" prop="deliveryTotalNum" :show-overflow-tooltip="true"/>
 | 
				
			||||||
        <el-table-column label="验收总数量" align="center" prop="inspectQualifiedNum" :show-overflow-tooltip="true"/>  
 | 
					        <el-table-column label="验收总数量" align="center" prop="inspectQualifiedNum" :show-overflow-tooltip="true"/>  
 | 
				
			||||||
        <!-- <el-table-column label="提交状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
 | 
					        <!-- <el-table-column label="提交状态" align="center" prop="status" :show-overflow-tooltip="true" width="100">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -606,7 +606,7 @@ export default {
 | 
				
			||||||
            let param = {
 | 
					            let param = {
 | 
				
			||||||
                "pageSize": this.queryParams.pageSize,
 | 
					                "pageSize": this.queryParams.pageSize,
 | 
				
			||||||
                "pageNum": this.queryParams.pageNum,
 | 
					                "pageNum": this.queryParams.pageNum,
 | 
				
			||||||
                "areaId": this.queryParams.areaId,
 | 
					                "areaId": this.baseInfo.areaId,
 | 
				
			||||||
                "materialName": this.queryParams.materialName,
 | 
					                "materialName": this.queryParams.materialName,
 | 
				
			||||||
                "materialCode": this.queryParams.materialCode,  
 | 
					                "materialCode": this.queryParams.materialCode,  
 | 
				
			||||||
                "materialTypeIds": this.queryParams.materialTypeIds,
 | 
					                "materialTypeIds": this.queryParams.materialTypeIds,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,10 +1,7 @@
 | 
				
			||||||
<template>
 | 
					<template>
 | 
				
			||||||
  <div class="app-container">
 | 
					  <div class="app-container">
 | 
				
			||||||
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
 | 
					    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
 | 
				
			||||||
        <el-form-item label="采购订单号" prop="orderGoodsCode">
 | 
					        <el-form-item label="日期">
 | 
				
			||||||
            <el-input v-model="queryParams.orderGoodsCode" placeholder="请输入采购单编号" maxlength="20" clearable style="width: 240px"/>
 | 
					 | 
				
			||||||
        </el-form-item>
 | 
					 | 
				
			||||||
        <el-form-item label="采购日期">
 | 
					 | 
				
			||||||
            <el-date-picker
 | 
					            <el-date-picker
 | 
				
			||||||
                v-model="dateRange"
 | 
					                v-model="dateRange"
 | 
				
			||||||
                type="datetimerange"
 | 
					                type="datetimerange"
 | 
				
			||||||
| 
						 | 
					@ -18,6 +15,9 @@
 | 
				
			||||||
                :picker-options="pickerOptions" >
 | 
					                :picker-options="pickerOptions" >
 | 
				
			||||||
            </el-date-picker>
 | 
					            </el-date-picker>
 | 
				
			||||||
        </el-form-item>
 | 
					        </el-form-item>
 | 
				
			||||||
 | 
					        <el-form-item label="采购订单号" prop="orderGoodsCode">
 | 
				
			||||||
 | 
					            <el-input v-model="queryParams.orderGoodsCode" placeholder="请输入采购单编号" maxlength="20" clearable style="width: 240px"/>
 | 
				
			||||||
 | 
					        </el-form-item>
 | 
				
			||||||
        <el-form-item label="供应商" prop="supplierId">
 | 
					        <el-form-item label="供应商" prop="supplierId">
 | 
				
			||||||
            <el-select v-model="queryParams.supplierId" placeholder="请选择供应商" style="width: 240px;">
 | 
					            <el-select v-model="queryParams.supplierId" placeholder="请选择供应商" style="width: 240px;">
 | 
				
			||||||
                <el-option v-for="item in supplierOptions"
 | 
					                <el-option v-for="item in supplierOptions"
 | 
				
			||||||
| 
						 | 
					@ -120,6 +120,8 @@
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column>
 | 
				
			||||||
        <el-table-column label="采购订单号" align="center" prop="orderGoodsCode" :show-overflow-tooltip="true" width="180"/>
 | 
					        <el-table-column label="采购订单号" align="center" prop="orderGoodsCode" :show-overflow-tooltip="true" width="180"/>
 | 
				
			||||||
        <el-table-column label="采购订单标题" align="center" prop="orderTitle" :show-overflow-tooltip="true" width="180"/> 
 | 
					        <el-table-column label="采购订单标题" align="center" prop="orderTitle" :show-overflow-tooltip="true" width="180"/> 
 | 
				
			||||||
 | 
					        <el-table-column label="采购订单时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="160"/> 
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
        <!-- <el-table-column label="提交状态" align="center" prop="orderStatus" :show-overflow-tooltip="true" width="100">
 | 
					        <!-- <el-table-column label="提交状态" align="center" prop="orderStatus" :show-overflow-tooltip="true" width="100">
 | 
				
			||||||
            <template slot-scope="scope">
 | 
					            <template slot-scope="scope">
 | 
				
			||||||
                <span v-if="scope.row.orderStatus==1">待提交</span>
 | 
					                <span v-if="scope.row.orderStatus==1">待提交</span>
 | 
				
			||||||
| 
						 | 
					@ -133,7 +135,6 @@
 | 
				
			||||||
                <span v-if="scope.row.supplierConfirmStatus==3">已拒绝</span> 
 | 
					                <span v-if="scope.row.supplierConfirmStatus==3">已拒绝</span> 
 | 
				
			||||||
            </template>  
 | 
					            </template>  
 | 
				
			||||||
        </el-table-column> --> 
 | 
					        </el-table-column> --> 
 | 
				
			||||||
     
 | 
					 | 
				
			||||||
        <el-table-column label="订单总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
 | 
					        <el-table-column label="订单总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
 | 
				
			||||||
            <template slot-scope="scope">
 | 
					            <template slot-scope="scope">
 | 
				
			||||||
               <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
 | 
					               <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -82,12 +82,12 @@
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                    <el-table-column label="参考价(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
 | 
					                    <el-table-column label="参考价(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
 | 
				
			||||||
                        <template slot-scope="scope">
 | 
					                        <template slot-scope="scope">
 | 
				
			||||||
                            <el-input  v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
 | 
					                            <el-input  v-model="scope.row.unitPrice" placeholder="请输入" maxlength="9" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                    <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true">
 | 
					                    <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true">
 | 
				
			||||||
                        <template slot-scope="scope">
 | 
					                        <template slot-scope="scope">
 | 
				
			||||||
                            <el-input  v-model.number="scope.row.purchaseNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.purchaseNum=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
 | 
					                            <el-input  v-model.number="scope.row.purchaseNum" placeholder="请输入" maxlength="7" clearable @input="(v)=>(scope.row.purchaseNum=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                    <el-table-column label="预计采购金额(元)" align="center" prop="" :show-overflow-tooltip="true">
 | 
					                    <el-table-column label="预计采购金额(元)" align="center" prop="" :show-overflow-tooltip="true">
 | 
				
			||||||
| 
						 | 
					@ -378,7 +378,7 @@ export default {
 | 
				
			||||||
            let param = {
 | 
					            let param = {
 | 
				
			||||||
                "pageSize": this.queryParams.pageSize,
 | 
					                "pageSize": this.queryParams.pageSize,
 | 
				
			||||||
                "pageNum": this.queryParams.pageNum,
 | 
					                "pageNum": this.queryParams.pageNum,
 | 
				
			||||||
                "areaId": this.queryParams.areaId,
 | 
					                "areaId": this.baseInfo.areaId,
 | 
				
			||||||
                "materialName": this.queryParams.materialName,
 | 
					                "materialName": this.queryParams.materialName,
 | 
				
			||||||
                "materialCode": this.queryParams.materialCode,  
 | 
					                "materialCode": this.queryParams.materialCode,  
 | 
				
			||||||
                "materialTypeIds": this.queryParams.materialTypeIds,
 | 
					                "materialTypeIds": this.queryParams.materialTypeIds,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -239,7 +239,15 @@ export default {
 | 
				
			||||||
                ],
 | 
					                ],
 | 
				
			||||||
                warehouseCode: [
 | 
					                warehouseCode: [
 | 
				
			||||||
                    { required: true, message: "仓库编码不能为空", trigger: "blur" }
 | 
					                    { required: true, message: "仓库编码不能为空", trigger: "blur" }
 | 
				
			||||||
                ]
 | 
					                ],
 | 
				
			||||||
 | 
					                managerPhone: [
 | 
				
			||||||
 | 
					                    {
 | 
				
			||||||
 | 
					                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
 | 
				
			||||||
 | 
					                        message: '请输入正确的手机号码',
 | 
				
			||||||
 | 
					                        trigger: 'blur',
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                ],
 | 
				
			||||||
 | 
					                
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -81,9 +81,9 @@
 | 
				
			||||||
      <el-table-column label="最大库存" align="center" prop="maxNum" :show-overflow-tooltip="true" width="120"/>
 | 
					      <el-table-column label="最大库存" align="center" prop="maxNum" :show-overflow-tooltip="true" width="120"/>
 | 
				
			||||||
      <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
 | 
					      <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
 | 
				
			||||||
        <template slot-scope="scope">
 | 
					        <template slot-scope="scope">
 | 
				
			||||||
          <span v-if="scope.row.inventoryStatus==1">正常</span>
 | 
					          <span v-if="scope.row.inventoryStatus==1" style="color: #1890ff;">正常</span>
 | 
				
			||||||
          <span v-if="scope.row.inventoryStatus==2">即将缺货</span>
 | 
					          <span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">即将缺货</span>
 | 
				
			||||||
          <span v-if="scope.row.inventoryStatus==3">超额</span>
 | 
					          <span v-if="scope.row.inventoryStatus==3" style="color: red;">超额</span>
 | 
				
			||||||
        </template>
 | 
					        </template>
 | 
				
			||||||
      </el-table-column>
 | 
					      </el-table-column>
 | 
				
			||||||
      <!-- <el-table-column label="总库存数" align="center" prop="totalNum" :show-overflow-tooltip="true" width="120"/> -->
 | 
					      <!-- <el-table-column label="总库存数" align="center" prop="totalNum" :show-overflow-tooltip="true" width="120"/> -->
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -101,12 +101,12 @@
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                    <el-table-column label="单价(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
 | 
					                    <el-table-column label="单价(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
 | 
				
			||||||
                        <template slot-scope="scope">
 | 
					                        <template slot-scope="scope">
 | 
				
			||||||
                            <el-input  v-model="scope.row.unitPrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
 | 
					                            <el-input  v-model="scope.row.unitPrice" placeholder="请输入" maxlength="8" clearable @input="(v)=>(scope.row.unitPrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                    <el-table-column label="入库数量" align="center" prop="purNum" :show-overflow-tooltip="true">
 | 
					                    <el-table-column label="入库数量" align="center" prop="purNum" :show-overflow-tooltip="true">
 | 
				
			||||||
                        <template slot-scope="scope">
 | 
					                        <template slot-scope="scope">
 | 
				
			||||||
                            <el-input  v-model.number="scope.row.purNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.purNum=v.replace(/[^\d]/g,''))"/>
 | 
					                            <el-input  v-model.number="scope.row.purNum" placeholder="请输入" maxlength="8" clearable @input="(v)=>(scope.row.purNum=v.replace(/[^\d]/g,''))"/>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column>  
 | 
					                    </el-table-column>  
 | 
				
			||||||
                </el-table>
 | 
					                </el-table>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -74,7 +74,7 @@
 | 
				
			||||||
                    <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
 | 
					                    <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
 | 
				
			||||||
                    <el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
 | 
					                    <el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
 | 
				
			||||||
                        <template slot-scope="scope">
 | 
					                        <template slot-scope="scope">
 | 
				
			||||||
                            <el-input  v-model.number="scope.row.fetchNum" placeholder="请输入" maxlength="10" clearable @change="patternValue(scope.row)"/>
 | 
					                            <el-input  v-model.number="scope.row.fetchNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column>  
 | 
					                    </el-table-column>  
 | 
				
			||||||
                </el-table>
 | 
					                </el-table>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -84,7 +84,7 @@
 | 
				
			||||||
        <el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true" width="120"/>
 | 
					        <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">
 | 
					        <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true" width="120">
 | 
				
			||||||
            <template slot-scope="scope">
 | 
					            <template slot-scope="scope">
 | 
				
			||||||
                <el-switch v-model="scope.row.status" active-value="1" inactive-value="2"
 | 
					                <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2"
 | 
				
			||||||
                            @change="handleStatusChange(scope.row)"
 | 
					                            @change="handleStatusChange(scope.row)"
 | 
				
			||||||
                ></el-switch>
 | 
					                ></el-switch>
 | 
				
			||||||
            </template>
 | 
					            </template>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue