|  | @@ -40,7 +40,7 @@
 | 
	
		
			
				|  |  |          </el-button>
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |      </div>
 | 
	
		
			
				|  |  | -    <div style="margin-top: 60px">
 | 
	
		
			
				|  |  | +    <div class="customer-main">
 | 
	
		
			
				|  |  |        <el-form :model="form" ref="form" label-width="130px" class="demo-ruleForm">
 | 
	
		
			
				|  |  |          <containerTitle title="基础资料"></containerTitle>
 | 
	
		
			
				|  |  |          <basic-container style="margin-bottom: 10px">
 | 
	
	
		
			
				|  | @@ -945,8 +945,8 @@ export default {
 | 
	
		
			
				|  |  |                }
 | 
	
		
			
				|  |  |              ]
 | 
	
		
			
				|  |  |            }, {
 | 
	
		
			
				|  |  | -            label: '付款方式',
 | 
	
		
			
				|  |  | -            prop: 'paymentType',
 | 
	
		
			
				|  |  | +            label: '到货地址',
 | 
	
		
			
				|  |  | +            prop: 'arrivalAddress',
 | 
	
		
			
				|  |  |              rules: [
 | 
	
		
			
				|  |  |                {
 | 
	
		
			
				|  |  |                  required: true,
 | 
	
	
		
			
				|  | @@ -955,8 +955,8 @@ export default {
 | 
	
		
			
				|  |  |                }
 | 
	
		
			
				|  |  |              ]
 | 
	
		
			
				|  |  |            }, {
 | 
	
		
			
				|  |  | -            label: '到货地址',
 | 
	
		
			
				|  |  | -            prop: 'arrivalAddress',
 | 
	
		
			
				|  |  | +            label: '付款方式',
 | 
	
		
			
				|  |  | +            prop: 'paymentType',
 | 
	
		
			
				|  |  |              rules: [
 | 
	
		
			
				|  |  |                {
 | 
	
		
			
				|  |  |                  required: true,
 | 
	
	
		
			
				|  | @@ -1080,6 +1080,7 @@ export default {
 | 
	
		
			
				|  |  |      })
 | 
	
		
			
				|  |  |      this.$set(this.form, 'orderStatus', '录入')
 | 
	
		
			
				|  |  |      this.$set(this.form, 'overPayment', 0)
 | 
	
		
			
				|  |  | +    this.$set(this.form, 'orderAmount', 0)
 | 
	
		
			
				|  |  |      if (this.detailData.id) {
 | 
	
		
			
				|  |  |        this.queryData(this.detailData.id)
 | 
	
		
			
				|  |  |      }
 | 
	
	
		
			
				|  | @@ -1101,6 +1102,7 @@ export default {
 | 
	
		
			
				|  |  |        this.$set(row, 'priceType', '一般')
 | 
	
		
			
				|  |  |        row.code = event.code
 | 
	
		
			
				|  |  |        row.typeno = event.typeno
 | 
	
		
			
				|  |  | +      row.itemType = event.typeno
 | 
	
		
			
				|  |  |        row.itemId = event.id
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      queryData(id, isCopy = false){
 | 
	
	
		
			
				|  | @@ -1380,11 +1382,11 @@ export default {
 | 
	
		
			
				|  |  |        this.removeGoodsRepeat()
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      getRow(event,row) {
 | 
	
		
			
				|  |  | -      console.log(event,row)
 | 
	
		
			
				|  |  |        row.priceCategory = event[0].goodsTypeName
 | 
	
		
			
				|  |  |        this.$set(row, 'priceType', '一般')
 | 
	
		
			
				|  |  |        row.code = event[0].code
 | 
	
		
			
				|  |  |        row.typeno = event[0].typeno
 | 
	
		
			
				|  |  | +      row.itemType = event[0].typeno
 | 
	
		
			
				|  |  |        row.itemId = event[0].id
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      //点击商品明细选择触发
 | 
	
	
		
			
				|  | @@ -1401,12 +1403,12 @@ export default {
 | 
	
		
			
				|  |  |          this.contactsData[this.choiceIndexT].cname = this.tableData[0].cname
 | 
	
		
			
				|  |  |          this.contactsData[this.choiceIndexT].code = this.tableData[0].code
 | 
	
		
			
				|  |  |          this.contactsData[this.choiceIndexT].typeno = this.tableData[0].typeno
 | 
	
		
			
				|  |  | -        this.contactsData[this.choiceIndexT].specificationAndModel = this.tableData[0].specificationAndModel
 | 
	
		
			
				|  |  | +        this.contactsData[this.choiceIndexT].itemType = this.tableData[0].typeno
 | 
	
		
			
				|  |  |          this.contactsData[this.choiceIndexT].itemId = this.tableData[0].id
 | 
	
		
			
				|  |  |          this.contactsData[this.choiceIndexT].priceCategory = this.tableData[0].goodsTypeName
 | 
	
		
			
				|  |  |          selectGoodsNum({
 | 
	
		
			
				|  |  |            goodsId: this.tableData[0].id,
 | 
	
		
			
				|  |  | -          typeno: this.tableData[0].typeno
 | 
	
		
			
				|  |  | +          itemType: this.tableData[0].typeno
 | 
	
		
			
				|  |  |          }).then(res => {
 | 
	
		
			
				|  |  |            this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
 | 
	
		
			
				|  |  |          })
 | 
	
	
		
			
				|  | @@ -1452,17 +1454,17 @@ export default {
 | 
	
		
			
				|  |  |            // this.$set(this.tableData[item], 'storageQuantity', 0)
 | 
	
		
			
				|  |  |            selectGoodsNum({
 | 
	
		
			
				|  |  |              goodsId: this.tableData[item].id,
 | 
	
		
			
				|  |  | -            typeno: this.tableData[item].typeno
 | 
	
		
			
				|  |  | +            itemType: this.tableData[item].typeno
 | 
	
		
			
				|  |  |            }).then(res => {
 | 
	
		
			
				|  |  |              this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
 | 
	
		
			
				|  |  |              this.tableData[item].storageQuantity =  res.data.data
 | 
	
		
			
				|  |  |              delete this.tableData[item].goodsTypeName
 | 
	
		
			
				|  |  |              this.tableData[item].itemId = this.tableData[item].id
 | 
	
		
			
				|  |  | -            this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].specificationAndModel)
 | 
	
		
			
				|  |  | +            this.$set(this.tableData[item], 'itemType', this.tableData[item].typeno)
 | 
	
		
			
				|  |  |              this.$set(this.tableData[item], 'priceType', '一般')
 | 
	
		
			
				|  |  |              this.$set(this.tableData[item], 'orderQuantity', 0)
 | 
	
		
			
				|  |  |              this.$set(this.tableData[item], 'actualQuantity', 0)
 | 
	
		
			
				|  |  | -            this.$set(this.tableData[item], 'purchaseAmount', 0)
 | 
	
		
			
				|  |  | +            this.$set(this.tableData[item], 'purchaseAmount', '0')
 | 
	
		
			
				|  |  |              this.tableData[item].price = '0'
 | 
	
		
			
				|  |  |              this.tableData[item].amount = 0
 | 
	
		
			
				|  |  |              this.tableData[item].sort = this.maxGoodsNum + 1
 | 
	
	
		
			
				|  | @@ -1569,7 +1571,7 @@ export default {
 | 
	
		
			
				|  |  |        for (let item in list) {
 | 
	
		
			
				|  |  |          selectGoodsNum({
 | 
	
		
			
				|  |  |            goodsId: list[item].itemId,
 | 
	
		
			
				|  |  | -          typeno: list[item].typeno
 | 
	
		
			
				|  |  | +          itemType: list[item].typeno
 | 
	
		
			
				|  |  |          }).then(res => {
 | 
	
		
			
				|  |  |            this.$set(list[item], 'storageQuantity', res.data.data)
 | 
	
		
			
				|  |  |            if (this.policyDataTwo.length > 0) {
 | 
	
	
		
			
				|  | @@ -1582,7 +1584,9 @@ export default {
 | 
	
		
			
				|  |  |            this.$set(list[item], 'price', list[item].salesPrice)
 | 
	
		
			
				|  |  |            this.$set(buyFree[item], 'price', '0')
 | 
	
		
			
				|  |  |            this.$set(buyFree[item], 'orderQuantity',  list[item].salesVolume)
 | 
	
		
			
				|  |  | +          this.$set(buyFree[item], 'itemType',  list[item].typeno)
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +        this.$set(list[item], 'itemType',  list[item].typeno)
 | 
	
		
			
				|  |  |          this.$set(list[item], 'actualQuantity', 0)
 | 
	
		
			
				|  |  |          this.$set(list[item], 'orderQuantity', 0)
 | 
	
		
			
				|  |  |          this.$set(list[item], 'amount', 0)
 | 
	
	
		
			
				|  | @@ -1886,6 +1890,7 @@ export default {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      priceChange(row) {
 | 
	
		
			
				|  |  | +      console.log(row.price)
 | 
	
		
			
				|  |  |        if (!row.price) {
 | 
	
		
			
				|  |  |          row.price = 0;
 | 
	
		
			
				|  |  |        } else {
 | 
	
	
		
			
				|  | @@ -1946,26 +1951,26 @@ export default {
 | 
	
		
			
				|  |  |  </script>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <style lang="scss" scoped>
 | 
	
		
			
				|  |  | -.customer-head {
 | 
	
		
			
				|  |  | -  position: fixed;
 | 
	
		
			
				|  |  | -  top: 105px;
 | 
	
		
			
				|  |  | -  width: 100%;
 | 
	
		
			
				|  |  | -  margin-left: -10px;
 | 
	
		
			
				|  |  | -  height: 62px;
 | 
	
		
			
				|  |  | -  background: #ffffff;
 | 
	
		
			
				|  |  | -  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
 | 
	
		
			
				|  |  | -  z-index: 999;
 | 
	
		
			
				|  |  | -  /* display: flex;
 | 
	
		
			
				|  |  | -  justify-content: left; */
 | 
	
		
			
				|  |  | -}
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -.customer-back {
 | 
	
		
			
				|  |  | -  cursor: pointer;
 | 
	
		
			
				|  |  | -  line-height: 62px;
 | 
	
		
			
				|  |  | -  font-size: 16px;
 | 
	
		
			
				|  |  | -  color: #323233;
 | 
	
		
			
				|  |  | -  font-weight: 400;
 | 
	
		
			
				|  |  | -}
 | 
	
		
			
				|  |  | +//.customer-head {
 | 
	
		
			
				|  |  | +//  position: fixed;
 | 
	
		
			
				|  |  | +//  top: 105px;
 | 
	
		
			
				|  |  | +//  width: 100%;
 | 
	
		
			
				|  |  | +//  margin-left: -10px;
 | 
	
		
			
				|  |  | +//  height: 62px;
 | 
	
		
			
				|  |  | +//  background: #ffffff;
 | 
	
		
			
				|  |  | +//  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
 | 
	
		
			
				|  |  | +//  z-index: 999;
 | 
	
		
			
				|  |  | +//  /* display: flex;
 | 
	
		
			
				|  |  | +//  justify-content: left; */
 | 
	
		
			
				|  |  | +//}
 | 
	
		
			
				|  |  | +//
 | 
	
		
			
				|  |  | +//.customer-back {
 | 
	
		
			
				|  |  | +//  cursor: pointer;
 | 
	
		
			
				|  |  | +//  line-height: 62px;
 | 
	
		
			
				|  |  | +//  font-size: 16px;
 | 
	
		
			
				|  |  | +//  color: #323233;
 | 
	
		
			
				|  |  | +//  font-weight: 400;
 | 
	
		
			
				|  |  | +//}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  .back-icon {
 | 
	
		
			
				|  |  |    line-height: 64px;
 | 
	
	
		
			
				|  | @@ -1973,11 +1978,11 @@ export default {
 | 
	
		
			
				|  |  |    margin-right: 8px;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -.add-customer-btn {
 | 
	
		
			
				|  |  | -  position: fixed;
 | 
	
		
			
				|  |  | -  right: 36px;
 | 
	
		
			
				|  |  | -  top: 115px;
 | 
	
		
			
				|  |  | -}
 | 
	
		
			
				|  |  | +//.add-customer-btn {
 | 
	
		
			
				|  |  | +//  position: fixed;
 | 
	
		
			
				|  |  | +//  right: 36px;
 | 
	
		
			
				|  |  | +//  top: 115px;
 | 
	
		
			
				|  |  | +//}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  ::v-deep .el-form-item {
 | 
	
		
			
				|  |  |    margin-bottom: 0;
 |