1111

src/view/maint/price.vue

@@ -17,13 +17,12 @@
 
 		<el-table v-loading="loading" :data="tableData" border>
 			<el-table-column prop="id" label="编号" width="60" v-if="isShow"></el-table-column>
-			<!-- <el-table-column prop="material.name" label="物料" width="180" show-overflow-tooltip ></el-table-column>
-			<el-table-column prop="material.standard" label="钢种" width="180" show-overflow-tooltip ></el-table-column>
-			<el-table-column prop="storageType" label="类型" width="180" show-overflow-tooltip align="center" :formatter="typeFormatter"></el-table-column> -->
 			<el-table-column prop="customer.name" 		label="客户名称" 	width="180" show-overflow-tooltip ></el-table-column>
+			<el-table-column prop="materialName" 		label="品名" 	width="180" show-overflow-tooltip ></el-table-column>
 			<el-table-column prop="keepDay" 			label="免堆时间（天）" 	width="200" show-overflow-tooltip ></el-table-column>
 			<el-table-column prop="ordPrice" 			label="免堆期价格（元/吨）" 	width="200" show-overflow-tooltip align="right"></el-table-column>
-			<el-table-column prop="outOrdPrice" 		label="超期价格（元/吨）" 	width="200" show-overflow-tooltip align="right"></el-table-column>
+			<el-table-column prop="outOrdPrice" 		label="超期价格（元/天/吨）" 	width="200" show-overflow-tooltip align="right"></el-table-column>
+			<el-table-column prop="payWay" 				label="支付方式" 	width="200" show-overflow-tooltip ></el-table-column>
 			<el-table-column prop="addUser.userDesc" 	label="添加人" 		width="120" show-overflow-tooltip ></el-table-column>
 			<el-table-column prop="addTime" 			label="添加时间" 	width="200" show-overflow-tooltip ></el-table-column>
 			<el-table-column label="操作" width="200">
@@ -53,15 +52,27 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
+				<el-form-item label="品名">
+					<el-select v-model="obj.materialName" filterable placeholder="请选择品名" clearable style="width: 300px;">
+						<el-option v-for="item in optionsmaterialName" :key="item.name" :label="item.name" :value="item.name" >
+						</el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="免堆时间">
 					<el-input v-model="obj.keepDay" type="number" style="width: 300px;"></el-input>
 				</el-form-item>
-				<el-form-item label="免堆期价格">
+				<el-form-item label="免堆期单价">
 					<el-input v-model="obj.ordPrice" type="number" style="width: 300px;"></el-input>
 				</el-form-item>
-				<el-form-item label="超期价格">
+				<el-form-item label="超期单价">
 					<el-input v-model="obj.outOrdPrice" type="number" style="width: 300px;"></el-input>
 				</el-form-item>
+				<el-form-item label="支付方式">
+					<el-radio-group v-model="obj.payWay">
+						<el-radio label="月结"></el-radio>
+						<el-radio label="现金"></el-radio>
+					</el-radio-group>
+				</el-form-item>
 				<el-form-item>
 					<el-button type="success" @click="handleSave">保存</el-button>
 					<el-button @click="handleCancelSave">取消</el-button>
@@ -112,15 +123,19 @@
 					keepDay: '',
 					ordPrice: '',
 					outOrdPrice: '',
+					materialName:'',
+					payWay:'月结',
 				},
 				optionsCust: [],
+				optionsmaterialName: [],
 
 			}
 		},
 		//界面渲染完毕调用   初始化表格参数
 		mounted() {
-			this.getTableData()
-			this.getAllCustomer()
+			this.getTableData();
+			this.getAllCustomer();
+			this.getmaterialName();
 		},
 		methods: {
 			typeFormatter: function(row, column) {
@@ -141,6 +156,13 @@
 					this.optionsCust = response.data.data
 				});
 			},
+			getmaterialName() {
+				var url = 'MaintMaterial/queryMaterialName.do'
+				var param = {}
+				axios.get(url, param).then(response => {
+					this.optionsmaterialName = response.data.data
+				});
+			},
 			
 			showMaterial() {
 				this.$refs.PopupMaterial.show()

src/view/record/outrecord.vue

@@ -62,7 +62,7 @@
 						<el-form-item label=" " style="margin-top: -15px;margin-left: -60px">
 							<el-button @click="handleSearch" type="primary" size="small">查询</el-button>
 							<el-button @click="handlePrintOut" type="primary" size="small" style="width:90px;text-align: left">打印出库单</el-button>
-							<el-button @click="handleOutBack" type="danger" size="small" style="width:70px">取消出库</el-button>
+							<el-button @click="handleOutBack" type="danger" size="small">取消出库</el-button>
 							<el-button @click="handleVerifyAcc" type="primary" size="small" style="width:70px">对账</el-button>
 							<el-button @click="handleModifyPrice" type="primary" size="small" >批量改价</el-button>
 						</el-form-item>