liyuanpeng hace 3 años
padre
commit
0e6a69d6f3

+ 2 - 1
public/static/views/monthExcel.html

@@ -260,7 +260,8 @@
                             }
                         },
                     },
-                })
+                }),
+				luckysheet.hideColumn(data[0].data[0].length-1,data[0].data[0].length)
             } catch (err) {
                 console.log(err)
             }

+ 2 - 1
public/static/views/projectExcel.html

@@ -245,7 +245,8 @@
                             }
                         },
                     },
-                })
+                }),
+				luckysheet.hideColumn(data[0].data[0].length-1,data[0].data[0].length)
             } catch (err) {
                 console.log(err)
             }

+ 2 - 1
public/static/views/quarterExcel.html

@@ -276,7 +276,8 @@
                             }
                         },
                     },
-                })
+                }),
+				luckysheet.hideColumn(data[0].data[0].length-1,data[0].data[0].length)
             } catch (err) {
                 console.log(err)
             }

+ 3 - 2
public/static/views/yearExcel.html

@@ -181,7 +181,7 @@
                         deleteColumn: true, // 删除选中列
                         deleteCell: false, // 删除单元格
                         hideRow: false, // 隐藏选中行和显示选中行
-                        hideColumn: false, // 隐藏选中列和显示选中列
+                        hideColumn: true, // 隐藏选中列和显示选中列
                         rowHeight: false, // 行高
                         columnWidth: false, // 列宽
                         clear: false, // 清除内容
@@ -245,7 +245,8 @@
                             }
                         },
                     },
-                })
+                }),
+				luckysheet.hideColumn(data[0].data[0].length-1,data[0].data[0].length)
             } catch (err) {
                 console.log(err)
             }

+ 103 - 28
src/pages/main/advertising/contractCap.vue

@@ -14,9 +14,13 @@
                     </el-table-column>
                     <el-table-column prop="regionCode" label="地市编码">
                     </el-table-column>
-                    <el-table-column prop="preAccount" label="预算金额">
+                    <el-table-column prop="preAccount" label="一采预算">
                     </el-table-column>
-					<el-table-column prop="costAccount" label="累计使用">
+					<el-table-column prop="secbuyPreAccount" label="二采预算">
+                    </el-table-column>
+					<el-table-column prop="costAccount" label="一采累计使用">
+                    </el-table-column>
+					<el-table-column prop="secbuyCostAccount" label="二采累计使用">
                     </el-table-column>
 					<el-table-column prop="advYearn" label="统计周期">
 					</el-table-column>
@@ -40,7 +44,7 @@
                 <el-form :model="infolist" ref="infolist" :rules="rules">
 					
                     <div class="info-line">
-                        <el-form-item prop="regionName">
+                        <el-form-item prop="regionCode">
                             <span>地市名称</span>
 							<el-select :popper-append-to-body="false" v-model="infolist.regionCode" placeholder="地市名称" @change="verifcheck" :disabled="disableStatus">
 							    <el-option v-for="item in regionOpt" :key="item.compId" :label="item.compName"
@@ -52,13 +56,33 @@
                             <span>地市编码</span>
                             <el-input v-model="infolist.regionCode" placeholder="地市编码" disabled></el-input>
                         </el-form-item>
+						<el-form-item prop="areaCode">
+                            <span>区县名称</span>
+							<el-select :popper-append-to-body="false" v-model="areaCode" placeholder="区县名称" @change="verifcheck(2)" :disabled="disableStatus">
+							    <el-option v-for="item in countyOpt" :key="item.compId" :label="item.compName"
+							        :value="item.compId">
+							    </el-option>
+							</el-select>
+                        </el-form-item>
+                       <el-form-item>
+                            <span>区县编码</span>
+                            <el-input v-model="areaCode" placeholder="区县编码" disabled></el-input>
+                        </el-form-item>
 						<el-form-item prop="preAccount">
-                            <span>预算金额</span>
-                            <el-input v-model="infolist.preAccount" placeholder="预算金额" :disabled="disableStatus"></el-input>
+                            <span>一采预算</span>
+                            <el-input v-model="infolist.preAccount" placeholder="一采预算" :disabled="disableStatus"></el-input>
                         </el-form-item>
 						<el-form-item prop="costAccount">
-                            <span>累计使用</span>
-                            <el-input v-model="infolist.costAccount" placeholder="累计使用" disabled></el-input>
+						    <span>一采使用</span>
+						    <el-input v-model="infolist.costAccount" placeholder="一采累计使用" disabled></el-input>
+						</el-form-item>
+						<el-form-item prop="secbuyPreAccount">
+                            <span>二采预算</span>
+                            <el-input v-model="infolist.secbuyPreAccount" placeholder="二采预算" :disabled="disableStatus"></el-input>
+                        </el-form-item>
+						<el-form-item prop="secbuyCostAccount">
+                            <span>二采使用</span>
+                            <el-input v-model="infolist.secbuyCostAccount" placeholder="二采累计使用" disabled></el-input>
                         </el-form-item>
 						<el-form-item>
 						    <span>统计周期</span>
@@ -91,15 +115,29 @@
             toolList
         },
         data() {
-            const regionName = (rule, value, callback) => {
-                if (!this.infolist.regionName) {
+            const regionCode = (rule, value, callback) => {
+                if (!this.infolist.regionCode) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+            const areaCode = (rule, value, callback) => {
+                if (!this.areaCode) {
                     callback(new Error('不能为空'))
                 } else {
                     callback()
                 }
             }
-            const advTypeDesc = (rule, value, callback) => {
-                if (!this.infolist.advTypeDesc) {
+			const preAccount = (rule, value, callback) => {
+                if (!this.infolist.preAccount) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+			const secbuyPreAccount = (rule, value, callback) => {
+                if (!this.infolist.secbuyPreAccount) {
                     callback(new Error('不能为空'))
                 } else {
                     callback()
@@ -107,16 +145,26 @@
             }
             return {
                 rules: {
-                    regionName: [{
+                    regionCode: [{
                         required: true,
                         trigger: 'change',
-                        validator: regionName
+                        validator: regionCode
                     }],
-                    advTypeDesc: [{
+                    areaCode: [{
                         required: true,
                         trigger: 'change',
-                        validator: advTypeDesc
+                        validator: areaCode
                     }],
+					preAccount: [{
+                        required: true,
+                        trigger: 'change',
+                        validator: preAccount
+                    }],
+					secbuyPreAccount: [{
+                        required: true,
+                        trigger: 'change',
+                        validator: secbuyPreAccount
+                    }]
                 },
                 searchList: [
                     {
@@ -130,14 +178,7 @@
                 fullscreen: false,
                 total: 0,
                 pageSize: 1,
-                tableData: [{
-					regionName:'哈尔滨',
-					regionCode:'wl001',
-					advYearn:'年',
-					advTypeDesc:'地市公司',
-					preAccount:'5000',
-					costAccount:'10000',
-				}],
+                tableData: [],
                 dialogStatus: false,
                 disableStatus: false,
                 titname: '',
@@ -159,6 +200,9 @@
 						name: '地市公司'
 					},
 				],
+				countyOpt:[],
+				areaCode:'',
+				areaName:'',
             }
         },
         methods: {
@@ -201,13 +245,17 @@
             dialogCheck(v, n) {
                 this.dialogStatus = true;
                 this.infolist = Object.assign({}, n);
+				this.areaCode = this.infolist.areaCode;
+				this.areaName = this.infolist.areaName;
                 if (v === 1) {
                     this.titname = '查看';
                     this.disableStatus = true;
+					this.getComp(v.regionCode);
                     return
                 } else if (v === 2) {
                     this.titname = '修改';
                     this.disableStatus = false;
+					this.getComp(v.regionCode);
                 } else if (v === 3) {
                     this.titname = '添加';
                     this.disableStatus = false;
@@ -223,6 +271,8 @@
                     return
                 } else {
                     this.infolist.opTime = this.$formatDate(new Date(), "YYYY-MM-DD HH:mm:ss");
+					this.infolist.areaCode = this.areaCode;
+					this.infolist.areaName = this.areaName;
                     if (this.titname === '添加') {
                         this.submitInfo("/market/cadvContract/add");
                     } else if (this.titname === '修改') {
@@ -312,13 +362,38 @@
                     this.fullscreen = !this.fullscreen
                 }
             },
-			verifcheck(){
-				for (let i = 0; i < this.regionOpt.length; i++) {
-				    if (this.regionOpt[i].compId === this.infolist.regionCode) {
-				        this.infolist.regionName = this.regionOpt[i].compName
-				    }
+			verifcheck(v) {
+				if(v == 2){
+					for (let i = 0; i < this.countyOpt.length; i++) {
+						if (this.countyOpt[i].compId === this.areaCode) {
+							this.areaName = this.countyOpt[i].compName
+						}
+					}
+				}else{
+					for (let i = 0; i < this.regionOpt.length; i++) {
+						if (this.regionOpt[i].compId === this.infolist.regionCode) {
+							this.infolist.regionName = this.regionOpt[i].compName;
+							this.areaCode = '';
+							this.areaName = '';
+							this.getComp(this.regionOpt[i].compId);
+						}
+					}
 				}
 			},
+			getComp(v){
+				this.$http({
+					url: "/sysmgr/regionComp/queryList",
+					method: "post",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					data: {
+						parentCompId: v
+					},
+				}).then((res) => {
+					this.countyOpt = res.data;
+				});
+			},
             getUser() {
                 this.userInfo = JSON.parse(window.sessionStorage.userInfo);
 				this.$http({

+ 14 - 4
src/pages/main/advertising/index.vue

@@ -38,15 +38,19 @@
 			</div>
 			<h2 style="margin-top: 20px;">基础数据管理</h2>
 			<div class="adv-type">
-			    <div class="wfive" @click="jumpinfo('/materiel','物料类型管理')">
+			    <div class="wfive" @click="jumpinfo('/materielPick','一采物料类型管理')" v-if="province">
 			        <span><i class="el-icon-folder-opened"></i></span>
-			        <span>物料类型管理</span>
+			        <span>一采物料类型管理</span>
+			    </div>
+				<div class="wfive" @click="jumpinfo('/materiel','二采物料类型管理')" v-if="province">
+			        <span><i class="el-icon-folder-opened"></i></span>
+			        <span>二采物料类型管理</span>
 			    </div>
 				<div class="wfive" @click="jumpinfo('/contractCap','地市预算上限')">
 			        <span><i class="el-icon-folder-opened"></i></span>
 			        <span>地市预算及上限</span>
 			    </div>
-				<div class="wfive" @click="jumpinfo('/supplier','供应商管理')">
+				<div class="wfive" @click="jumpinfo('/supplier','供应商管理')" v-if="province">
 				    <span><i class="el-icon-folder-opened"></i></span>
 				    <span>供应商管理</span>
 				</div>
@@ -82,7 +86,8 @@
           
             return {
                 fullscreen: false,
-				lockFlag:'see'
+				lockFlag:'see',
+				province:false
             }
         },
         methods: {
@@ -130,6 +135,11 @@
 						i = Menus.length;
 					}
 				}
+				for (let i = 0; i < Menus.length; i++) {
+					if(Menus[i].systemflag == 1 && Menus[i].jspUrl == '/province'){
+						this.province = true;//省公司
+					}
+				}
             }
         },
         mounted() {

+ 195 - 45
src/pages/main/advertising/materiel.vue

@@ -12,7 +12,9 @@
 					tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
 					<el-table-column prop="sceneName" label="场景">
 					</el-table-column>
-					<el-table-column prop="metirialName" label="物料类别">
+					<el-table-column prop="metirialType" label="物料类别">
+					</el-table-column>
+					<el-table-column prop="metirialName" label="物料名称">
 					</el-table-column>
 					<el-table-column prop="metirialCode" label="物料编码" show-overflow-tooltip>
 					</el-table-column>
@@ -43,12 +45,31 @@
 		<el-dialog :title="titname + '物料类型'" :visible.sync="dialogStatus" width="50%" :destroy-on-close="true"
 			:modal-append-to-body="false" :close-on-click-modal="false" :before-close="closedia">
 			<div v-loading="loadinged">
-				<el-form :model="infolist" ref="infolist" :rules="rules">
+				<el-form :model="infolist" ref="infolist" :rules="rules" style="height: 50vh;overflow-y: scroll;">
 
 					<div class="info-line">
+						<el-form-item prop="scene">
+							<span>使用场景</span>
+							<el-select :disabled="disableStatus" :popper-append-to-body="false"
+								v-model="infolist.scene" placeholder="使用场景" @change="usePlance">
+								<el-option v-for="item in sceneopt" :key="item.dataCode" :label="item.dataName"
+									:value="item.dataCode">
+								</el-option>
+							</el-select>
+						</el-form-item>
 						<el-form-item prop="metirialName">
+							<span>物料名称</span>
+							<el-select :disabled="disableStatus" :popper-append-to-body="false"
+								v-model="infolist.metirialName" placeholder="物料名称">
+								<el-option v-for="item in nameopt" :key="item.dataCode" :label="item.dataName"
+									:value="item.dataName">
+								</el-option>
+							</el-select>
+							</el-input>
+						</el-form-item>
+						<el-form-item prop="metirialType">
 							<span>物料类别</span>
-							<el-input v-model="infolist.metirialName" placeholder="物料类别" :disabled="disableStatus">
+							<el-input v-model="infolist.metirialType" placeholder="物料类别" :disabled="disableStatus">
 							</el-input>
 						</el-form-item>
 						<el-form-item prop="metirialCode">
@@ -56,15 +77,6 @@
 							<el-input v-model="infolist.metirialCode" placeholder="物料编码" :disabled="disableStatus">
 							</el-input>
 						</el-form-item>
-						<el-form-item prop="metirialCode">
-							<span>使用场景</span>
-							<el-select :disabled="disableStatus" :popper-append-to-body="false"
-								v-model="infolist.scene" placeholder="使用场景">
-								<el-option v-for="item in sceneopt" :key="item.dataCode" :label="item.dataName"
-									:value="item.dataCode">
-								</el-option>
-							</el-select>
-						</el-form-item>
 						<el-form-item prop="proviceFlag">
 							<span>申请权限</span>
 							<el-select :disabled="disableStatus" :popper-append-to-body="false"
@@ -74,17 +86,26 @@
 								</el-option>
 							</el-select>
 						</el-form-item>
-						<el-form-item>
+						<el-form-item prop="supplierCode">
+							<span>供应商</span>
+							<el-select :disabled="disableStatus" :popper-append-to-body="false"
+								v-model="infolist.supplierCode" placeholder="供应商" @change="verifall">
+								<el-option v-for="item in suppOpt" :key="item.code" :label="item.name"
+									:value="item.code">
+								</el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item prop="size">
 							<span>规格尺寸</span>
 							<el-input v-model="infolist.size" placeholder="规格尺寸" :disabled="disableStatus"></el-input>
 						</el-form-item>
-						<el-form-item>
+						<el-form-item prop="unit">
 							<span>单位</span>
 							<el-input v-model="infolist.unit" placeholder="单位" :disabled="disableStatus"></el-input>
 						</el-form-item>
-						<el-form-item>
+						<el-form-item prop="price">
 							<span>单价</span>
-							<el-input v-model="infolist.price" placeholder="不含税单价" :disabled="disableStatus"></el-input>
+							<el-input type="number" v-model="infolist.price" placeholder="不含税单价" :disabled="disableStatus"></el-input>
 						</el-form-item>
 						<el-form-item>
 							<span>税率</span>
@@ -95,7 +116,7 @@
 							<el-input v-model="infolist.install" placeholder="是否需要安装" :disabled="disableStatus"></el-input>
 						</el-form-item>
 					</div>
-					<el-form-item class="info-line online">
+					<el-form-item class="info-line online" prop="quality">
 						<span>物料材质</span>
 						<el-input v-model="infolist.quality" placeholder="物料材质" :disabled="disableStatus"
 							type="textarea" :rows="4"></el-input>
@@ -127,6 +148,13 @@
 			toolList
 		},
 		data() {
+			const scene = (rule, value, callback) => {
+				if (!this.infolist.scene) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
 			const metirialName = (rule, value, callback) => {
 				if (!this.infolist.metirialName) {
 					callback(new Error('不能为空'))
@@ -134,6 +162,20 @@
 					callback()
 				}
 			}
+			const metirialType = (rule, value, callback) => {
+				if (!this.infolist.metirialType) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const metirialCode = (rule, value, callback) => {
+				if (!this.infolist.metirialCode) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
 			const proviceFlag = (rule, value, callback) => {
 				if (!this.infolist.proviceFlag) {
 					callback(new Error('不能为空'))
@@ -141,18 +183,93 @@
 					callback()
 				}
 			}
+			const supplierCode = (rule, value, callback) => {
+				if (!this.infolist.supplierCode) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const size = (rule, value, callback) => {
+				if (!this.infolist.size) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const unit = (rule, value, callback) => {
+				if (!this.infolist.unit) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const price = (rule, value, callback) => {
+				if (!this.infolist.price) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const quality = (rule, value, callback) => {
+				if (!this.infolist.quality) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
 			return {
 				rules: {
+					scene: [{
+						required: true,
+						trigger: 'change',
+						validator: scene
+					}],
 					metirialName: [{
 						required: true,
-						trigger: 'blur',
+						trigger: 'change',
 						validator: metirialName
 					}],
+					metirialType: [{
+						required: true,
+						trigger: 'blur',
+						validator: metirialType
+					}],
+					metirialCode: [{
+						required: true,
+						trigger: 'blur',
+						validator: metirialCode
+					}],
 					proviceFlag: [{
 						required: true,
 						trigger: 'change',
 						validator: proviceFlag
 					}],
+					supplierCode: [{
+						required: true,
+						trigger: 'change',
+						validator: supplierCode
+					}],
+					size: [{
+						required: true,
+						trigger: 'blur',
+						validator: size
+					}],
+					unit: [{
+						required: true,
+						trigger: 'blur',
+						validator: unit
+					}],
+					price: [{
+						required: true,
+						trigger: 'change',
+						validator: price
+					}],
+					quality: [{
+						required: true,
+						trigger: 'change',
+						validator: quality
+					}],
 				},
 				searchList: [{
 					type: 'input',
@@ -176,6 +293,7 @@
 				delid: '',
 				loading: false,
 				loadinged: false,
+				//申请权限
 				proviceopt: [{
 						id: '0',
 						name: '省公司'
@@ -189,34 +307,54 @@
 						name: '省+地市'
 					},
 				],
+				//使用场景
 				sceneopt: [{
-					dataName: '门面区',
-					dataCode: 'A'
-				}, {
-					dataName: '主广告区',
-					dataCode: 'B'
-				}, {
-					dataName: '业务办理区',
-					dataCode: 'C'
-				}, {
-					dataName: '终端销售区',
-					dataCode: 'D'
-				}, {
-					dataName: '和家庭体验区',
-					dataCode: 'E'
-				}, {
-					dataName: '公告区',
-					dataCode: 'F'
+					dataName: '小区',
+					dataCode: '1'
 				}, {
-					dataName: '其他区域(地贴、桌前挡板)',
-					dataCode: 'G'
+					dataName: '校园',
+					dataCode: '2'
 				}, {
-					dataName: '各类专区(携转、全球通、关爱台席等)',
-					dataCode: 'H'
-				}, ],
+					dataName: '营业厅',
+					dataCode: '3'
+				}],
+				//物料名称
+				nameopt:[],
+				//供应商
+				suppOpt:[],
 			}
 		},
 		methods: {
+			//处理所需数据
+			verifall(v) {
+			    for (let j = 0; j < this.suppOpt.length; j++) {
+			        if (this.suppOpt[j].code == v) {
+			            this.infolist.supplierName = this.suppOpt[j].name
+			        }
+			    }
+			},
+			usePlance(v){
+				let value = ''
+				if(v == '1'){
+					value = 'house';
+				}else if(v == '2'){
+					value = 'school';
+				}else if(v == '3'){
+					value = 'serviceHall';
+				}
+				this.$http({
+				    url: "/market/cfgDataDict/queryList",
+				    method: "post",
+				    headers: {
+				        "Content-Type": "application/json",
+				    },
+				    data: {
+				        dictCode: value
+				    },
+				}).then((res) => {
+				    this.nameopt = res.data;
+				});
+			},
 			closedia() {
 				this.infolist = {};
 				this.dialogStatus = false;
@@ -224,7 +362,7 @@
 			//搜索数据
 			searchInfo(v) {
 				this.params = {};
-				v[0] ? this.params.metirialName = v[0] : '';
+				v[0] ? this.params.metirialType = v[0] : '';
 				this.getList(this.params, this.pageSize);
 			},
 			//获取列表
@@ -234,7 +372,7 @@
 				this.loading = true;
 				this.tableData = [];
 				this.$http({
-					url: "/market/cadvMetirial/queryPage",
+					url: "/market/cadvSecbuyMetirial/queryPage",
 					method: "post",
 					headers: {
 						"Content-Type": "application/json",
@@ -270,6 +408,7 @@
 				} else if (v === 2) {
 					this.titname = '修改';
 					this.disableStatus = false;
+					this.usePlance(n.scene);
 				} else if (v === 3) {
 					this.titname = '添加';
 					this.disableStatus = false;
@@ -289,9 +428,9 @@
 					this.infolist.stsDesc = "在用";
 					this.infolist.proviceFlagName = this.infolist.proviceFlag == "0"?'省公司':'地市公司';
 					if (this.titname === '添加') {
-						this.submitInfo("/market/cadvMetirial/add");
+						this.submitInfo("/market/cadvSecbuyMetirial/add");
 					} else if (this.titname === '修改') {
-						this.submitInfo("/market/cadvMetirial/update", v);
+						this.submitInfo("/market/cadvSecbuyMetirial/update", v);
 					}
 
 				}
@@ -334,7 +473,7 @@
 				let _this = this;
 				if (v === 1) {
 					_this.$http({
-						url: "/market/cadvMetirial/del",
+						url: "/market/cadvSecbuyMetirial/del",
 						method: "post",
 						headers: {
 							"Content-Type": "application/json",
@@ -379,6 +518,17 @@
 			},
 			getUser() {
 				this.userInfo = JSON.parse(window.sessionStorage.userInfo);
+				
+				this.$http({
+					url: "/market/cadvSupplier/queryValidSupplierList",
+					method: "post",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					data: {"buyTypeCode":"2"},
+				}).then((res) => {
+					this.suppOpt = res.data;
+				});
 
 			}
 		},

+ 619 - 0
src/pages/main/advertising/materielPick.vue

@@ -0,0 +1,619 @@
+<template>
+	<fullscreen :fullscreen.sync="fullscreen" class="container">
+		<div class="container-box">
+			<toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
+			<div class="search">
+				<mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
+				<el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)">添加
+				</el-button>
+			</div>
+			<div class="tabbox">
+				<el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
+					tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
+					<el-table-column prop="sceneName" label="场景">
+					</el-table-column>
+					<el-table-column prop="metirialType" label="物料类别">
+					</el-table-column>
+					<el-table-column prop="metirialName" label="物料名称">
+					</el-table-column>
+					<el-table-column prop="metirialCode" label="物料编码" show-overflow-tooltip>
+					</el-table-column>
+					<el-table-column prop="quality" label="材质" width="200" show-overflow-tooltip>
+					</el-table-column>
+					<el-table-column prop="size" label="规格" show-overflow-tooltip>
+					</el-table-column>
+					<el-table-column prop="unit" label="单位">
+					</el-table-column>
+					<el-table-column prop="price" label="单价">
+					</el-table-column>
+					<el-table-column prop="proviceFlagName" label="申请权限">
+					</el-table-column>
+					<el-table-column label="操作" width="160px" align="center">
+						<template slot-scope="scope">
+							<el-button size="mini" type="primary" @click="dialogCheck(1,scope.row)">查看</el-button>
+							<el-button size="mini" type="primary" @click="dialogCheck(2,scope.row)">修改</el-button>
+							<el-button size="mini" type="danger" @click="delLine(scope.row)">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
+					:total="total">
+				</el-pagination>
+			</div>
+		</div>
+
+		<el-dialog :title="titname + '物料类型'" :visible.sync="dialogStatus" width="50%" :destroy-on-close="true"
+			:modal-append-to-body="false" :close-on-click-modal="false" :before-close="closedia">
+			<div v-loading="loadinged">
+				<el-form :model="infolist" ref="infolist" :rules="rules" style="height: 50vh;overflow-y: scroll;">
+
+					<div class="info-line">
+						<el-form-item prop="scene">
+							<span>使用场景</span>
+							<el-select :disabled="disableStatus" :popper-append-to-body="false"
+								v-model="infolist.scene" placeholder="使用场景" @change="usePlance">
+								<el-option v-for="item in sceneopt" :key="item.dataCode" :label="item.dataName"
+									:value="item.dataCode">
+								</el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item prop="metirialName">
+							<span>物料名称</span>
+							<el-select :disabled="disableStatus" :popper-append-to-body="false"
+								v-model="infolist.metirialName" placeholder="物料名称">
+								<el-option v-for="item in nameopt" :key="item.dataCode" :label="item.dataName"
+									:value="item.dataName">
+								</el-option>
+							</el-select>
+							</el-input>
+						</el-form-item>
+						<el-form-item prop="metirialType">
+							<span>物料类别</span>
+							<el-input v-model="infolist.metirialType" placeholder="物料类别" :disabled="disableStatus">
+							</el-input>
+						</el-form-item>
+						<el-form-item prop="metirialCode">
+							<span>物料编码</span>
+							<el-input v-model="infolist.metirialCode" placeholder="物料编码" :disabled="disableStatus">
+							</el-input>
+						</el-form-item>
+						<el-form-item prop="proviceFlag">
+							<span>申请权限</span>
+							<el-select :disabled="disableStatus" :popper-append-to-body="false"
+								v-model="infolist.proviceFlag" placeholder="申请权限">
+								<el-option v-for="item in proviceopt" :key="item.id" :label="item.name"
+									:value="item.id">
+								</el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item prop="supplierCode">
+							<span>供应商</span>
+							<el-select :disabled="disableStatus" :popper-append-to-body="false"
+								v-model="infolist.supplierCode" placeholder="供应商" @change="verifall">
+								<el-option v-for="item in suppOpt" :key="item.code" :label="item.name"
+									:value="item.code">
+								</el-option>
+							</el-select>
+						</el-form-item>
+						<el-form-item prop="size">
+							<span>规格尺寸</span>
+							<el-input v-model="infolist.size" placeholder="规格尺寸" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item prop="unit">
+							<span>单位</span>
+							<el-input v-model="infolist.unit" placeholder="单位" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item prop="price">
+							<span>单价</span>
+							<el-input type="number" v-model="infolist.price" placeholder="不含税单价" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item>
+							<span>税率</span>
+							<el-input v-model="infolist.tax" placeholder="税率" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item>
+							<span>安装</span>
+							<el-input v-model="infolist.install" placeholder="是否需要安装" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item>
+							<span>起订量</span>
+							<el-input type="number" v-model="infolist.minOrder" placeholder="起订量" :disabled="disableStatus"></el-input>
+						</el-form-item>
+					</div>
+					<el-form-item class="info-line online" prop="quality">
+						<span>物料材质</span>
+						<el-input v-model="infolist.quality" placeholder="物料材质" :disabled="disableStatus"
+							type="textarea" :rows="4"></el-input>
+					</el-form-item>
+				</el-form>
+
+				<div slot="footer" class="dialog-footer myfooter">
+					<el-button type="primary" @click="dialogCli(2)" v-if="titname !== '查看'">确 定</el-button>
+					<el-button @click="dialogCli(1)" v-if="titname === '查看'">确 定</el-button>
+					<el-button @click="dialogCli(1)">取 消</el-button>
+				</div>
+			</div>
+		</el-dialog>
+
+		<myMessage :messTit='messTit' @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
+			v-if="centerDialogVisible"></myMessage>
+	</fullscreen>
+
+</template>
+<script>
+	import mySearch from "../../../components/search.vue";
+	import myMessage from "../../../components/myMessage.vue"
+	import toolList from '../../../components/toolList'
+
+	export default {
+		components: {
+			mySearch,
+			myMessage,
+			toolList
+		},
+		data() {
+			const scene = (rule, value, callback) => {
+				if (!this.infolist.scene) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const metirialName = (rule, value, callback) => {
+				if (!this.infolist.metirialName) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const metirialType = (rule, value, callback) => {
+				if (!this.infolist.metirialType) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const metirialCode = (rule, value, callback) => {
+				if (!this.infolist.metirialCode) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const proviceFlag = (rule, value, callback) => {
+				if (!this.infolist.proviceFlag) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const supplierCode = (rule, value, callback) => {
+				if (!this.infolist.supplierCode) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const size = (rule, value, callback) => {
+				if (!this.infolist.size) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const unit = (rule, value, callback) => {
+				if (!this.infolist.unit) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const price = (rule, value, callback) => {
+				if (!this.infolist.price) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			const quality = (rule, value, callback) => {
+				if (!this.infolist.quality) {
+					callback(new Error('不能为空'))
+				} else {
+					callback()
+				}
+			}
+			return {
+				rules: {
+					scene: [{
+						required: true,
+						trigger: 'change',
+						validator: scene
+					}],
+					metirialName: [{
+						required: true,
+						trigger: 'change',
+						validator: metirialName
+					}],
+					metirialType: [{
+						required: true,
+						trigger: 'blur',
+						validator: metirialType
+					}],
+					metirialCode: [{
+						required: true,
+						trigger: 'blur',
+						validator: metirialCode
+					}],
+					proviceFlag: [{
+						required: true,
+						trigger: 'change',
+						validator: proviceFlag
+					}],
+					supplierCode: [{
+						required: true,
+						trigger: 'change',
+						validator: supplierCode
+					}],
+					size: [{
+						required: true,
+						trigger: 'blur',
+						validator: size
+					}],
+					unit: [{
+						required: true,
+						trigger: 'blur',
+						validator: unit
+					}],
+					price: [{
+						required: true,
+						trigger: 'change',
+						validator: price
+					}],
+					quality: [{
+						required: true,
+						trigger: 'change',
+						validator: quality
+					}],
+				},
+				searchList: [{
+					type: 'input',
+					tit: '物料名称',
+					value: '',
+					width: '98%',
+				}, ],
+				tooltit: '物料类型管理',
+				fullscreen: false,
+				total: 0,
+				pageSize: 1,
+				tableData: [],
+				dialogStatus: false,
+				disableStatus: false,
+				titname: '',
+				infolist: {},
+				userInfo: {},
+				params: {},
+				centerDialogVisible: false,
+				messTit: '',
+				delid: '',
+				loading: false,
+				loadinged: false,
+				//申请权限
+				proviceopt: [{
+						id: '0',
+						name: '省公司'
+					},
+					{
+						id: '1',
+						name: '地市公司'
+					},
+					{
+						id: '2',
+						name: '省+地市'
+					},
+				],
+				//使用场景
+				sceneopt: [{
+					dataName: '小区',
+					dataCode: '1'
+				}, {
+					dataName: '校园',
+					dataCode: '2'
+				}, {
+					dataName: '营业厅',
+					dataCode: '3'
+				}],
+				//物料名称
+				nameopt:[],
+				//供应商
+				suppOpt:[],
+			}
+		},
+		methods: {
+			//处理所需数据
+			verifall(v) {
+			    for (let j = 0; j < this.suppOpt.length; j++) {
+			        if (this.suppOpt[j].code == v) {
+			            this.infolist.supplierName = this.suppOpt[j].name
+			        }
+			    }
+			},
+			//场景物料获取
+			usePlance(v){
+				let value = ''
+				if(v == '1'){
+					value = 'house';
+				}else if(v == '2'){
+					value = 'school';
+				}else if(v == '3'){
+					value = 'serviceHall';
+				}
+				this.$http({
+				    url: "/market/cfgDataDict/queryList",
+				    method: "post",
+				    headers: {
+				        "Content-Type": "application/json",
+				    },
+				    data: {
+				        dictCode: value
+				    },
+				}).then((res) => {
+				    this.nameopt = res.data;
+				});
+			},
+			closedia() {
+				this.infolist = {};
+				this.dialogStatus = false;
+			},
+			//搜索数据
+			searchInfo(v) {
+				this.params = {};
+				v[0] ? this.params.metirialType = v[0] : '';
+				this.getList(this.params, this.pageSize);
+			},
+			//获取列表
+			getList(v, n) {
+				this.pageSize = n;
+				let _this = this;
+				this.loading = true;
+				this.tableData = [];
+				this.$http({
+					url: "/market/cadvFirbuyMetirial/queryPage",
+					method: "post",
+					headers: {
+						"Content-Type": "application/json",
+						"page": '{"pageNo":"' + n + '","pageSize":"10"}'
+					},
+					data: v,
+				}).then((res) => {
+					res.data.data.forEach(item=>{
+						for (let i = 0; i < this.sceneopt.length; i++) {
+							if(this.sceneopt[i].dataCode == item.scene){
+								item.sceneName = this.sceneopt[i].dataName;
+							}
+						}
+					})
+					this.tableData = res.data.data;
+					this.total = res.data.totalRecord;
+					this.loading = false;
+				});
+			},
+			// 分页
+			currchange(v) {
+				this.pageSize = v;
+				this.getList(this.params, this.pageSize);
+			},
+			//申请
+			dialogCheck(v, n) {
+				this.dialogStatus = true;
+				this.infolist = Object.assign({}, n);
+				if (v === 1) {
+					this.titname = '查看';
+					this.disableStatus = true;
+					return
+				} else if (v === 2) {
+					this.titname = '修改';
+					this.disableStatus = false;
+					this.usePlance(n.scene);
+				} else if (v === 3) {
+					this.titname = '添加';
+					this.disableStatus = false;
+				}
+				this.infolist.opNo = this.userInfo.loginNo;
+				this.infolist.opName = this.userInfo.loginName;
+			},
+			//添加
+			dialogCli(v) {
+				if (v === 1) {
+					this.infolist = {};
+					this.dialogStatus = false;
+					return
+				} else {
+					this.infolist.opTime = this.$formatDate(new Date(), "YYYY-MM-DD HH:mm:ss");
+					this.infolist.sts = "0";
+					this.infolist.stsDesc = "在用";
+					this.infolist.proviceFlagName = this.infolist.proviceFlag == "0"?'省公司':'地市公司';
+					if (this.titname === '添加') {
+						this.submitInfo("/market/cadvFirbuyMetirial/add");
+					} else if (this.titname === '修改') {
+						this.submitInfo("/market/cadvFirbuyMetirial/update", v);
+					}
+
+				}
+			},
+			submitInfo(u) {
+				let _this = this;
+				this.$refs.infolist.validate(valid => {
+					if (valid) {
+						this.loadinged = true;
+						this.$http({
+							url: u,
+							method: "post",
+							headers: {
+								"Content-Type": "application/json",
+							},
+							data: this.infolist,
+						}).then((res) => {
+							this.loadinged = false;
+							if (res.data.result === 1) {
+								_this.$message({
+									message: res.data.desc,
+									type: 'error'
+								});
+							} else {
+								_this.$message({
+									message: '成功',
+									type: 'success'
+								});
+								_this.infolist = {};
+								_this.dialogStatus = false;
+								_this.getList({}, _this.pageSize);
+							}
+
+						});
+					}
+				})
+			},
+			closeMessage(v) {
+				this.centerDialogVisible = false;
+				let _this = this;
+				if (v === 1) {
+					_this.$http({
+						url: "/market/cadvFirbuyMetirial/del",
+						method: "post",
+						headers: {
+							"Content-Type": "application/json",
+						},
+						data: {
+							id: this.delid
+						},
+					}).then((res) => {
+						if (res.data.result === 1) {
+							_this.$message({
+								message: res.data.desc,
+								type: 'error'
+							});
+						} else {
+							_this.$message({
+								message: '删除成功',
+								type: 'success'
+							});
+							_this.getList(this.params, this.pageSize);
+						}
+					});
+				}
+			},
+			//删除
+			delLine(v) {
+				this.centerDialogVisible = true;
+				this.messTit = '即将删除此条数据, 是否删除?';
+				this.delid = v.id;
+			},
+			//文件返回值
+			uploadBack(v) {
+				console.log(v)
+			},
+			//功能栏
+			iconCli(v) {
+				if (v === 1) {
+					this.getList(this.params, this.pageSize);
+				}
+				if (v === 2) {
+					this.fullscreen = !this.fullscreen
+				}
+			},
+			getUser() {
+				this.userInfo = JSON.parse(window.sessionStorage.userInfo);
+				
+				this.$http({
+					url: "/market/cadvSupplier/queryValidSupplierList",
+					method: "post",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					data: {"buyTypeCode":"1"},
+				}).then((res) => {
+					this.suppOpt = res.data;
+				});
+
+			}
+		},
+		mounted() {
+			this.getList({}, 1);
+			this.getUser();
+		},
+		created() {
+
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.onetab {
+		margin-bottom: 20px;
+		padding: 0 20px;
+	}
+
+	.titbox {
+		div {
+			float: right;
+
+			i {
+				font-size: 22px;
+				margin-left: 20px;
+				cursor: pointer;
+			}
+		}
+	}
+
+	.tabbox {
+		margin-top: 15px;
+	}
+
+	.pageBox {
+		text-align: right;
+		margin-top: 10px;
+	}
+
+	.info-line {
+		width: 100%;
+		display: block;
+		padding-left: 20px;
+
+		div {
+			width: 50%;
+			display: inline-block;
+		}
+
+		span {
+			width: 80px;
+			display: inline-block;
+			text-align: left;
+
+			i {
+				color: red;
+				display: inline-block;
+				padding-right: 5px;
+			}
+		}
+
+		.el-select,
+		.el-input {
+			width: calc(100% - 100px);
+		}
+	}
+
+	.online {
+		width: 100%;
+
+		.el-select {
+			width: calc(100% - 100px);
+		}
+
+		span {
+			vertical-align: top;
+		}
+
+		.el-textarea {
+			width: calc(100% - 100px);
+		}
+	}
+</style>

+ 138 - 32
src/pages/main/advertising/supplier.vue

@@ -14,14 +14,18 @@
                     </el-table-column>
                     <el-table-column prop="code" label="供应商编码">
                     </el-table-column>
-                    <el-table-column prop="opNo" label="配置工号">
-                    </el-table-column>
-                    <el-table-column prop="opName" label="配置姓名">
+					
+					<el-table-column prop="frameContractName" label="合同名称">
                     </el-table-column>
-                    <el-table-column prop="opTime" label="配置时间">
+                    <el-table-column prop="frameContractNo" label="合同编号">
                     </el-table-column>
-					<el-table-column prop="cost" label="剩余预算">
+ 
+					<el-table-column prop="cost" label="框架总额">
                     </el-table-column>
+					<el-table-column prop="buyTypeName" label="采购类型">
+					</el-table-column>
+					<el-table-column prop="contractEndTime" label="截止时间">
+					</el-table-column>
                     <el-table-column label="操作" width="160px" align="center">
                         <template slot-scope="scope">
                             <el-button size="mini" type="primary" @click="dialogCheck(1,scope.row)">查看</el-button>
@@ -42,7 +46,7 @@
                 <el-form :model="infolist" ref="infolist" :rules="rules">
 					
                     <div class="info-line">
-                        <el-form-item>
+                        <el-form-item prop="name">
                             <span>供应商</span>
                             <el-input v-model="infolist.name" placeholder="供应商名称" :disabled="disableStatus"></el-input>
                         </el-form-item>
@@ -50,23 +54,37 @@
                             <span>供应商编码</span>
                             <el-input v-model="infolist.code" placeholder="供应商编码" disabled></el-input>
                         </el-form-item>
-						<el-form-item>
-						    <span>剩余预算</span>
-						    <el-input v-model="infolist.cost" placeholder="剩余预算" :disabled="disableStatus"></el-input>
+						<el-form-item prop="cost">
+						    <span>框架总额</span>
+						    <el-input v-model="infolist.cost" placeholder="框架总额" :disabled="disableStatus"></el-input>
 						</el-form-item>
-						<el-form-item>
-						    <span>创建时间</span>
-						    <el-date-picker v-model="infolist.opTime" type="date" placeholder="创建时间" disabled>
+						<el-form-item prop="frameContractName">
+						    <span>合同名称</span>
+						    <el-input v-model="infolist.frameContractName" placeholder="合同名称" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item prop="frameContractNo">
+						    <span>合同编号</span>
+						    <el-input v-model="infolist.frameContractNo" placeholder="合同编号" :disabled="disableStatus"></el-input>
+						</el-form-item>
+						<el-form-item prop="contractSignTime">
+						    <span>签订时间</span>
+						    <el-date-picker v-model="infolist.contractSignTime" type="date" placeholder="签订时间">
 						    </el-date-picker>
 						</el-form-item>
-                        <el-form-item>
-                            <span>创建工号</span>
-                            <el-input v-model="infolist.opNo" placeholder="创建工号" disabled></el-input>
-                        </el-form-item>
-                        <el-form-item>
-                            <span>创建姓名</span>
-                            <el-input v-model="infolist.opName" placeholder="创建姓名" disabled></el-input>
-                        </el-form-item>
+						<el-form-item prop="contractEndTime">
+						    <span>截止时间</span>
+						    <el-date-picker v-model="infolist.contractEndTime" type="date" placeholder="截止时间">
+						    </el-date-picker>
+						</el-form-item>
+						<el-form-item prop="type">
+						    <span>采购类型</span>
+						    <el-select :disabled="disableStatus" :popper-append-to-body="false"
+						    	v-model="infolist.buyTypeName" placeholder="采购类型">
+						    	<el-option v-for="item in meterOpt" :key="item.id" :label="item.name"
+						    		:value="item.name">
+						    	</el-option>
+						    </el-select>
+						</el-form-item>
                     </div>
                 </el-form>
 
@@ -94,15 +112,50 @@
             toolList
         },
         data() {
-            const metirialName = (rule, value, callback) => {
-                if (!this.infolist.metirialName) {
+            const name = (rule, value, callback) => {
+                if (!this.infolist.name) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+            const buyTypeName = (rule, value, callback) => {
+                if (!this.infolist.buyTypeName) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+			const cost = (rule, value, callback) => {
+                if (!this.infolist.cost) {
                     callback(new Error('不能为空'))
                 } else {
                     callback()
                 }
             }
-            const proviceFlagName = (rule, value, callback) => {
-                if (!this.infolist.proviceFlagName) {
+            const frameContractName = (rule, value, callback) => {
+                if (!this.infolist.frameContractName) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+			const frameContractNo = (rule, value, callback) => {
+                if (!this.infolist.frameContractNo) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+			const contractSignTime = (rule, value, callback) => {
+                if (!this.infolist.contractSignTime) {
+                    callback(new Error('不能为空'))
+                } else {
+                    callback()
+                }
+            }
+            const contractEndTime = (rule, value, callback) => {
+                if (!this.infolist.contractEndTime) {
                     callback(new Error('不能为空'))
                 } else {
                     callback()
@@ -110,15 +163,40 @@
             }
             return {
                 rules: {
-                    metirialName: [{
+                    name: [{
+                        required: true,
+                        trigger: 'blur',
+                        validator: name
+                    }],
+                    cost: [{
+                        required: true,
+                        trigger: 'blur',
+                        validator: cost
+                    }],
+					frameContractName: [{
+                        required: true,
+                        trigger: 'blur',
+                        validator: frameContractName
+                    }],
+                    frameContractNo: [{
                         required: true,
                         trigger: 'blur',
-                        validator: metirialName
+                        validator: frameContractNo
                     }],
-                    proviceFlagName: [{
+					contractSignTime: [{
                         required: true,
                         trigger: 'change',
-                        validator: proviceFlagName
+                        validator: contractSignTime
+                    }],
+					contractEndTime: [{
+                        required: true,
+                        trigger: 'change',
+                        validator: contractEndTime
+                    }],
+                    buyTypeName: [{
+                        required: true,
+                        trigger: 'change',
+                        validator: buyTypeName
                     }],
                 },
                 searchList: [
@@ -126,8 +204,23 @@
                         type: 'input',
                         tit: '供应商名称',
                         value: '',
-                        width: '98%',
-                    },
+                        width: '48%',
+                    },{
+                        type: 'sel',
+                        tit: '采购类型',
+                        value: '',
+                        width: '48%',
+						options:[
+							{
+								dataCode:'1',
+								dataName:'一采'
+							},
+							{
+								dataCode:'2',
+								dataName:'二采'
+							}
+						]
+                    }
                 ],
                 tooltit:'供应商管理',
                 fullscreen: false,
@@ -155,6 +248,16 @@
 						name:'地市公司'
 					},
 				],
+				meterOpt:[
+					{
+						id:'1',
+						name:'一采'
+					},
+					{
+						id:'2',
+						name:'二采'
+					}
+				]
             }
         },
         methods: {
@@ -165,7 +268,8 @@
             //搜索数据
             searchInfo(v) {
                 this.params = {};
-                v[0] ? this.params.metirialName = v[0] : '';
+                v[0] ? this.params.name = v[0] : '';
+                v[1] ? this.params.buyTypeCode = v[1] : '';
                 this.getList(this.params, this.pageSize);
             },
             //获取列表
@@ -218,13 +322,15 @@
                     this.dialogStatus = false;
                     return
                 } else {
+					this.infolist.buyTypeCode = this.infolist.buyTypeName == '一采'?'1':'2';
                     this.infolist.opTime = this.$formatDate(new Date(), "YYYY-MM-DD HH:mm:ss");
+                    this.infolist.contractSignTime = this.$formatDate(this.infolist.contractSignTime, "YYYY-MM-DD HH:mm:ss");
+                    this.infolist.contractEndTime = this.$formatDate(this.infolist.contractEndTime, "YYYY-MM-DD HH:mm:ss");
                     if (this.titname === '添加') {
                         this.submitInfo("/market/cadvSupplier/add");
                     } else if (this.titname === '修改') {
                         this.submitInfo("/market/cadvSupplier/update", v);
                     }
-
                 }
             },
             submitInfo(u) {

+ 5 - 10
src/pages/main/leader/processInitiation.vue

@@ -196,7 +196,7 @@
 
 			.f-box-info {
 				display: inline-block;
-				height: 70px;
+				height: 100px;
 				width: 33%;
 				text-align: center;
 
@@ -209,24 +209,19 @@
 					text-align: center;
 					line-height: 40px;
 					cursor: pointer;
-					margin: 0 20px;
+					margin: 0 30px;
 				}
 
 				span {
 					font-size: 12px;
 					display: block;
 					text-align: center;
-					width: 80px;
-					height: 18px;
+					width: 100px;
+					height: 40px;
+					line-height: 20px;
 					margin-top: 5px;
 					overflow: hidden;
 					text-overflow: ellipsis;
-					display: -webkit-box;
-					/* 将对象作为弹性伸缩盒子模型显示 */
-					-webkit-line-clamp: 1;
-					/* 控制最多显示几行 */
-					-webkit-box-orient: vertical;
-					/* 设置或检索伸缩盒对象的子元素的排列方式 */
 				}
 
 				.mybadge {

+ 6 - 0
src/router/index.js

@@ -22,6 +22,12 @@ const routes = [{
             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/materiel.vue'], resolve)
         },
 		{
+            meta: { name:  '一采物料类型管理', keepAlive: false },
+            path: '/materielPick',
+            name: 'materielPick',
+            component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/advertising/materielPick.vue'], resolve)
+        },
+		{
             meta: { name:  '宣传费台账', keepAlive: false },
             path: '/publicityAccount',
             name: 'publicityAccount',