111

src/view/ware/store.vue

@@ -170,6 +170,8 @@
 				</el-table-column>
 				<el-table-column prop="货主" label="货主" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
+				<el-table-column prop="收货地址" label="收货地址" width="100" show-overflow-tooltip header-align="center">
+				</el-table-column>
 				<el-table-column prop="产地" label="产地" width="100" show-overflow-tooltip header-align="center">
 				</el-table-column>
 				<el-table-column prop="计重方式" label="计重方式" width="100" show-overflow-tooltip header-align="center">

src/view/ware/storechange.vue

@@ -72,6 +72,7 @@
 							<el-button type="danger" size="small"> 其他操作<i class="el-icon-arrow-down el-icon--right"></i></el-button>
 							<el-dropdown-menu slot="dropdown">
 								<el-dropdown-item command="handleInBack" style="background-color: #f5f5f5;">取消入库</el-dropdown-item>
+								<el-dropdown-item command="handleChangeCustomer" style="background-color: #f5f5f5;">修改客户</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
 						
@@ -94,7 +95,7 @@
 		</div>
 		<div class="tabledata-grid">
 			<el-table :data="tableData" height="100%"   border style="width: 97%;" v-loading="loading" ref="multipleTable"	@select="handleTableSelect"	 @selection-change="handleSelectionChange" @select-all = "selectAll">
-				<el-table-column type="selection" width="40" header-align="center" align="center"></el-table-column>
+				<el-table-column type="selection" width="40" header-align="center" align="center" fixed></el-table-column>
 				<el-table-column prop="layer" label="层数" width="60" show-overflow-tooltip header-align="center" align="center">
 				</el-table-column>
 				<el-table-column prop="stack.name" label="垛位" width="120" show-overflow-tooltip header-align="center" align="center">
@@ -185,12 +186,38 @@
 					<el-input v-model="newRemark1">
 					</el-input>
 				</el-form-item>
+				<el-form-item label="新备注信息">
+					<el-input v-model="newRemark">
+					</el-input>
+				</el-form-item>
 				<el-form-item label=" ">
 					<el-button type="success" @click="handleStackSave">保存</el-button>
 					<el-button type="danger" @click="handleStackCancelSave">取消</el-button>
 				</el-form-item>
 			</el-form>
 		</el-dialog>
+
+		<el-dialog title="修改客户信息" :visible.sync="changeCUSTDialogVisible" width="500px">
+			<el-form>
+				<el-form-item label="新订单客户" >
+					<el-select v-model="newCustomername" filterable placeholder="请选择客户名称" clearable size="small" >
+						<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="新客户名称" >
+					<el-select v-model="newFKCustomername" filterable placeholder="请选择客户名称" clearable size="small" >
+						<el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
+						</el-option>
+					</el-select>
+				</el-form-item>
+				
+				<el-form-item label=" ">
+					<el-button type="success" @click="handleChangeCUSTSave">保存</el-button>
+					<el-button type="danger" @click="handleChangeCUSTCancelSave">取消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
 		<el-dialog title="库房明细" :visible.sync="importDialogVisible" width="1000px">
 
 			<el-upload class="upload-demo" action="" :on-change="handleChange" :on-exceed="handleExceed" :on-remove="handleRemove"
@@ -227,6 +254,7 @@
 			</el-table>
 
 		</el-dialog>
+		
 	</div>
 </template>
 
@@ -321,6 +349,10 @@
 				newWare:'',
 				newStack:'',
 				newRemark1:'',
+				newRemark:'',
+				changeCUSTDialogVisible: false,
+				newCustomername:'',
+				newFKCustomername:''
 			};
 		},
 		mounted() {
@@ -341,6 +373,9 @@
 					case "handleInBack":
 						this.handleInBack();
 						break;
+					case "handleChangeCustomer":
+						this.handleChangeCustomer();
+						break;
 				}
 			},
 
@@ -455,6 +490,11 @@
 				this.$refs.PopupDistribution.show()
 
 			},
+			handleChangeCustomer(){
+				this.newCustomername = '',
+				this.newFKCustomername='',
+				this.changeCUSTDialogVisible= true
+			},
 			showOut() {
 				this.$refs.PopupOut.show()
 			},
@@ -594,6 +634,29 @@
 				this.stackDialogVisible= true;
 				this.newStack='';
 				this.newRemark1='';
+				this.newRemark = '';
+			},
+			handleChangeCUSTSave(){
+				var url = 'WareStore/changeCustName.do'
+				var param = {
+					json: JSON.stringify(this.multipleSelection),
+					newCustomername: this.newCustomername,
+					newFKCustomername: this.newFKCustomername,
+				}
+				axios.post(url, param).then(response => {
+					if (response.data.code == 0) {
+						this.getTableData()
+						this.changeCUSTDialogVisible = false
+					} else {
+						this.$message({
+							type: 'error',
+							message: '操作失败；' + response.data.msg,
+						});
+					}
+				});
+			},
+			handleChangeCUSTCancelSave(){
+				this.changeCUSTDialogVisible = false
 			},
 			handleStackSave(){
 				var url = 'WareStore/changeStack.do'
@@ -602,7 +665,8 @@
 					json: JSON.stringify(this.multipleSelection),
 					newWare: this.newWare,
 					newStack: this.newStack,
-					newRemark1: this.newRemark1
+					newRemark1: this.newRemark1,
+					newRemark: this.newRemark
 				}
 				axios.post(url, param).then(response => {
 					if (response.data.code == 0) {