YL2767 2 週之前
父節點
當前提交
abde038de4
共有 4 個檔案被更改,包括 898 行新增274 行删除
  1. 3
    3
      src/components/PopupDistribution.vue
  2. 2
    2
      src/components/PopupOut.vue
  3. 877
    267
      src/view/customer/storequery.vue
  4. 16
    2
      src/view/ware/storechange.vue

+ 3
- 3
src/components/PopupDistribution.vue 查看文件

121
 					driverPhone: '',
121
 					driverPhone: '',
122
 					sumWeight: '',
122
 					sumWeight: '',
123
 					sumCount: '',
123
 					sumCount: '',
124
-					suttle: '',
124
+					suttle: 0,
125
 					deliveryCompany:'',
125
 					deliveryCompany:'',
126
 					listDetail: []
126
 					listDetail: []
127
 				},
127
 				},
209
 					driverPhone: '',
209
 					driverPhone: '',
210
 					sumWeight: this.sumWeight,
210
 					sumWeight: this.sumWeight,
211
 					sumCount: this.sumCount,
211
 					sumCount: this.sumCount,
212
-					suttle: '',
212
+					suttle: 0,
213
 					listDetail: []
213
 					listDetail: []
214
 				}
214
 				}
215
 				this.tableData = []
215
 				this.tableData = []
287
 					driverPhone: '',
287
 					driverPhone: '',
288
 					sumWeight: 0,
288
 					sumWeight: 0,
289
 					sumCount: 0,
289
 					sumCount: 0,
290
-					suttle: '',
290
+					suttle: 0,
291
 					listDetail: []
291
 					listDetail: []
292
 				}
292
 				}
293
 				this.tableData = []
293
 				this.tableData = []

+ 2
- 2
src/components/PopupOut.vue 查看文件

212
 					driverPhone: '',
212
 					driverPhone: '',
213
 					sumWeight: this.sumWeight,
213
 					sumWeight: this.sumWeight,
214
 					sumCount: this.sumCount,
214
 					sumCount: this.sumCount,
215
-					suttle: '',
215
+					suttle: 0,
216
 					listDetail: []
216
 					listDetail: []
217
 				}
217
 				}
218
 				this.tableData = []
218
 				this.tableData = []
261
 					driverPhone: '',
261
 					driverPhone: '',
262
 					sumWeight: 0,
262
 					sumWeight: 0,
263
 					sumCount: 0,
263
 					sumCount: 0,
264
-					suttle: '',
264
+					suttle: 0,
265
 					listDetail: []
265
 					listDetail: []
266
 				}
266
 				}
267
 				this.tableData = []
267
 				this.tableData = []

+ 877
- 267
src/view/customer/storequery.vue
文件差異過大導致無法顯示
查看文件


+ 16
- 2
src/view/ware/storechange.vue 查看文件

148
 		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
148
 		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
149
 		<el-dialog title="货权转移" :visible.sync="customerDialogVisible" width="500px">
149
 		<el-dialog title="货权转移" :visible.sync="customerDialogVisible" width="500px">
150
 			<el-form>
150
 			<el-form>
151
-				<el-form-item label="旧货主">
151
+				<!-- <el-form-item label="旧货主">
152
 					<el-input v-model="oldCustomer">
152
 					<el-input v-model="oldCustomer">
153
 					</el-input>
153
 					</el-input>
154
+				</el-form-item> -->
155
+				<el-form-item label="新客户">
156
+					<el-select v-model="newCustomer.name" filterable placeholder="请选择客户名称" clearable>
157
+						<el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id" >
158
+						</el-option>
159
+					</el-select>
154
 				</el-form-item>
160
 				</el-form-item>
155
 				<el-form-item label="新货主">
161
 				<el-form-item label="新货主">
156
-					<el-select v-model="newCustomer.name" filterable placeholder="请选择订单客户" clearable>
162
+					<el-select v-model="newfkCustomer.name" filterable placeholder="请选择货权单位" clearable>
157
 						<el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id" >
163
 						<el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id" >
158
 						</el-option>
164
 						</el-option>
159
 					</el-select>
165
 					</el-select>
338
 					id: '',
344
 					id: '',
339
 					name: ''
345
 					name: ''
340
 				},
346
 				},
347
+				newfkCustomer: {
348
+					id: '',
349
+					name: ''
350
+				},
341
 				newAddress: '',
351
 				newAddress: '',
342
 
352
 
343
 				currentPage: 1,
353
 				currentPage: 1,
640
 					//this.newAddress = this.multipleSelection[0].receiveAddress
650
 					//this.newAddress = this.multipleSelection[0].receiveAddress
641
 					this.newCustomer.name = "",
651
 					this.newCustomer.name = "",
642
 					this.newCustomer.id = "",
652
 					this.newCustomer.id = "",
653
+					this.newfkCustomer.name="",
654
+					this.newfkCustomer.id = "",
643
 					this.customerDialogVisible = true
655
 					this.customerDialogVisible = true
644
 					
656
 					
645
 				} else {
657
 				} else {
652
 
664
 
653
 			handleCustomerSave() {
665
 			handleCustomerSave() {
654
 				this.newCustomer.id = this.newCustomer.name;
666
 				this.newCustomer.id = this.newCustomer.name;
667
+				this.newfkCustomer.id = this.newfkCustomer.name;
655
 				var url = 'WareChange/changeCustomer.do'
668
 				var url = 'WareChange/changeCustomer.do'
656
 				var param = {
669
 				var param = {
657
 
670
 
658
 					json: JSON.stringify(this.multipleSelection),
671
 					json: JSON.stringify(this.multipleSelection),
659
 					customer: JSON.stringify(this.newCustomer),
672
 					customer: JSON.stringify(this.newCustomer),
673
+					fkcustomer: JSON.stringify(this.newfkCustomer),
660
 					address: this.newAddress
674
 					address: this.newAddress
661
 				}
675
 				}
662
 				axios.post(url, param).then(response => {
676
 				axios.post(url, param).then(response => {

Loading…
取消
儲存