修改价格管理界面

config/dev.env.js

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://120.224.213.150/thware/"'
-	//BASE_API: '"http://localhost:8080/thware/"'
+  // BASE_API: '"http://120.224.213.150/thware/"'
+	BASE_API: '"http://localhost:8080/thware/"'
 	// BASE_API: '"http://47.104.245.159:8081/thware/"'
 })

src/view/maint/price.vue

@@ -2,14 +2,9 @@
 	<div>
 		<el-row>
 			<el-form :model="query" label-width="100px" inline="">
-				<el-form-item label="物料名称">
-					<el-input v-model="query.materialName" size="small" style="width: 300px;">
-						<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="钢种">
-					<el-input v-model="query.standard" size="small" style="width: 300px;">
-						<el-button slot="append" icon="el-icon-search" @click="showMaterial"></el-button>
+				<el-form-item label="客户名称">
+					<el-input v-model="query.customerName" size="small" style="width: 300px;">
+						<el-button slot="append" icon="el-icon-search" @click="showCustomer"></el-button>
 					</el-input>
 				</el-form-item>
 				<el-button type="info" @click="search" size="small">查询</el-button>
@@ -19,11 +14,10 @@
 
 		<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="storagePrice" label="价格" width="100" show-overflow-tooltip align="right"></el-table-column>
-				<el-table-column prop="weightPrice" label="价格" width="100" show-overflow-tooltip align="right"></el-table-column>
+			<el-table-column prop="customer.name" label="客户名称" width="180" show-overflow-tooltip ></el-table-column>
+			<el-table-column prop="keepDay" label="保存天数" width="180" show-overflow-tooltip ></el-table-column>
+			<el-table-column prop="ordPrice" label="价格" width="180" show-overflow-tooltip ></el-table-column>
+			<el-table-column prop="outOrdPrice" label="超期价格" width="180" 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">
@@ -42,32 +36,24 @@
 
 		<!-- 弹出框  另起名字  var json = JSON.stringify(this.自己起的名字)
         var url = 后台对应的url 'MaintPrice/save.do' -->
-		<el-dialog title="物料明细" :visible.sync="dialogVisible" width="500px">
+		<el-dialog title="价格配置" :visible.sync="dialogVisible" width="500px">
 			<el-form :model="obj" label-width="100px">
 				<el-form-item label="id" v-if="isShow">
 					<el-input v-model="obj.id"></el-input>
 				</el-form-item>
-				<el-form-item label="物料">
-					<el-input v-model="obj.material.name" style="width: 300px;">
-						<el-button slot="append" icon="el-icon-search" @click="showMaterialDialog"></el-button>
+				<el-form-item label="客户名称">
+					<el-input v-model="obj.customer.name" style="width: 300px;">
+						<el-button slot="append" icon="el-icon-search" @click="showCustomerDialog"></el-button>
 					</el-input>
 				</el-form-item>
-				<el-form-item label="钢种">
-					<el-input v-model="obj.material.standard" style="width: 300px;">
-						<el-button slot="append" icon="el-icon-search" @click="showMaterialDialog"></el-button>
-					</el-input>
+				<el-form-item label="保存时间">
+					<el-input v-model="obj.keepDay" style="width: 300px;"></el-input>
 				</el-form-item>
-				<el-form-item label="类型">
-					<el-select v-model="obj.storageType" placeholder="请选择" style="width: 300px;">
-						<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-						</el-option>
-					</el-select>
+				<el-form-item label="价格">
+					<el-input v-model="obj.ordPrice" style="width: 300px;"></el-input>
 				</el-form-item>
-				<el-form-item label="库存单价">
-					<el-input v-model="obj.storagePrice" style="width: 300px;"></el-input>
-				</el-form-item>
-				<el-form-item label="过磅单价">
-					<el-input v-model="obj.weightPrice" style="width: 300px;"></el-input>
+				<el-form-item label="超期价格">
+					<el-input v-model="obj.outOrdPrice" style="width: 300px;"></el-input>
 				</el-form-item>
 				<el-form-item>
 					<el-button type="success" @click="handleSave">保存</el-button>
@@ -75,18 +61,26 @@
 				</el-form-item>
 			</el-form>
 		</el-dialog>
+
+
 		<popup-material ref="PopupMaterial" @receviceFromChild="receviceFromMaterial"></popup-material>
+		<popup-customer ref="PopupCustomer" @receviceFromChild="receviceFromCustomer"></popup-customer>
 		<popup-material-dialog ref="PopupMaterialDialog" @receviceFromChild="receviceFromMaterialDialog"></popup-material-dialog>
+		<popup-customer-dialog ref="PopupCustomerDialog" @receviceFromChild="receviceFromCustomerDialog"></popup-customer-dialog>
 	</div>
 </template>
 <script>
 	import axios from '@/axios'
 	import PopupMaterial from '@/components/PopupMaterial.vue'
 	import PopupMaterialDialog from '@/components/PopupMaterial.vue'
+	import PopupCustomer from '@/components/PopupCustomer.vue'
+	import PopupCustomerDialog from '@/components/PopupCustomer.vue'
 	export default {
 		components: {
 			PopupMaterial,
-			PopupMaterialDialog
+			PopupCustomer,
+			PopupMaterialDialog,
+			PopupCustomerDialog
 		},
 		data() {
 			return {
@@ -104,22 +98,20 @@
 				pageSize: 50,
 				//查询条件
 				query: {
-					material: '',
-					standard: '',
+					customerName: ''
 				},
 				//录入框
 				dialogVisible: false,
 				isShow: false,
 				loading: true,
 				obj: {
-					material: {
+					customer: {
 						id: '',
 						name: '',
-						standard: '',
 					},
-					storagePrice: '',
-					storageType: '',
-					weightType: '',
+					keepDay: '',
+					ordPrice: '',
+					outOrdPrice: '',
 				},
 
 			}
@@ -143,26 +135,38 @@
 			showMaterial() {
 				this.$refs.PopupMaterial.show()
 			},
+			showCustomer() {
+				this.$refs.PopupCustomer.show()
+			},
 			receviceFromMaterial(material) {
 				this.query.materialName = material.name
 				this.query.standard = material.standard
 			},
+			receviceFromCustomer(customer) {
+				this.query.customerName = customer.name
+			},
 			showMaterialDialog() {
 				this.$refs.PopupMaterialDialog.show()
 			},
+			showCustomerDialog() {
+				this.$refs.PopupCustomerDialog.show()
+			},
 			receviceFromMaterialDialog(material) {
 				this.obj.material.id = material.id
 				this.obj.material.name = material.name
 				this.obj.material.standard = material.standard
 			},
+			receviceFromCustomerDialog(customer) {
+				this.obj.customer.id = customer.id
+				this.obj.customer.name = customer.name
+			},
 			getTableData() {
 				this.loading = true
 				var url = 'MaintPrice/query.do'
 				var param = {
 					page: this.currentPage,
 					rows: this.pageSize,
-					materialName: this.query.material,
-					standard: this.query.standard,
+					materialName: this.query.customerName,
 				}
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
@@ -198,7 +202,7 @@
 					json: json
 				}
 				axios.post(url, param).then(response => {
-					alert(JSON.stringify(response))
+					//alert(JSON.stringify(response))
 					if (response.data.code == 0) {
 						this.$message({
 							type: 'success',
@@ -226,13 +230,13 @@
 			handleAdd() {
 				this.dialogVisible = true
 				this.obj = {
-					material: {
+					customer: {
 						id: '',
 						name: '',
-						standard: '',
 					},
-					storagePrice: '',
-					storageType: '',
+					keepDay: '',
+					ordPrice: '',
+					outOrdPrice: '',
 				}
 
 			},