java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

fix_bug_pro20231227
caoyizhong 2 years ago
parent
9eb0daadd9 b5f1c319e5
commit
ec3d1f7855
3 changed files with 84 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 102
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  2. 4
      src/views/distribution/reservation/reservationAddFrom.vue
  3. 14
      src/views/distribution/turndelivery/deliveryDiscuss.vue

102
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -294,30 +294,75 @@
</el-row>
<el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer">
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input v-model="formCustomer.consignee" autocomplete="off"/>
</el-form-item>
<el-form-item label="电话" :label-width="formLabelWidth">
<el-input v-model="formCustomer.deliveryPhone" autocomplete="off"/>
</el-form-item>
<el-form-item label="地址" :label-width="formLabelWidth">
<el-input
v-model="formCustomer.deliveryAddress"
:rows="2"
type="textarea"
placeholder="请填写地址"
/>
</el-form-item>
<el-form-item label="加急" :label-width="formLabelWidth">
<el-radio-group v-model="formCustomer.isUrgent" >
<el-radio
:label="'1'" :value="'1'"> 否
</el-radio>
<el-radio
:label="'2'" :value="'2'" > 是
</el-radio>
</el-radio-group>
</el-form-item>
<el-row>
<el-col :span="10">
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input v-model="formCustomer.consignee" autocomplete="off"/>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="是否加急" :label-width="formLabelWidth">
<el-radio-group v-model="formCustomer.isUrgent" >
<el-radio
:label="'1'" :value="'1'"> 否
</el-radio>
<el-radio
:label="'2'" :value="'2'" > 是
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="电话" :label-width="formLabelWidth">
<el-input v-model="formCustomer.deliveryPhone" autocomplete="off"/>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="配送方式" :label-width="formLabelWidth">
<!-- v-for="item in this.deliveryWayData"-->
<el-radio-group v-model="formCustomer.deliveryWay">
<el-radio :label="'10'"
:value="'10'">送货&emsp;
</el-radio>
<el-radio :label="'20'"
:value="'20'">送货上楼
</el-radio>
<el-radio :label="'30'"
:value="'30'">送装一体
</el-radio>
<el-radio :label="'40'"
:value="'40'">装
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="地址" :label-width="formLabelWidth">
<el-input
v-model="formCustomer.deliveryAddress"
:rows="1"
type="textarea"
placeholder="请填写地址"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="10">-->
<!-- <el-form-item label="其他费用" :label-width="formLabelWidth">-->
<!-- <el-input v-model="formCustomer.otherFee" autocomplete="off"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<!-- <el-form-item label="加急:" prop="serveType" >-->
<!-- &lt;!&ndash; v-for="item in this.deliveryWayData"&ndash;&gt;-->
<!-- <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">-->
@ -530,6 +575,12 @@
search: true,
width: '100px'
},
{
label: '收货单位',
prop: 'receivingUnit',
search: true,
width: '100px'
},
{
label: '订单自编号',
prop: 'orderIds',
@ -611,7 +662,6 @@
search: true
},
{
label: '收货电话',
prop: 'deliveryPhone',
@ -1254,6 +1304,8 @@
this.formCustomer.deliveryPhone = row.deliveryPhone;
this.formCustomer.deliveryAddress = row.deliveryAddress;
this.formCustomer.remarks = row.remarks;
this.formCustomer.otherFee = row.otherFee;
this.formCustomer.deliveryWay = row.deliveryWay;
if (row.isUrgentName === '否' || row.isUrgentName === '1'){
this.formCustomer.isUrgent = '1'
}else {

4
src/views/distribution/reservation/reservationAddFrom.vue
Unescape View File

@ -83,8 +83,6 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -125,8 +123,6 @@
<!-- </el-checkbox-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="10">
<el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
<el-input

14
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -237,11 +237,11 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="其他费用:" prop="collectFee" label-width="100px">
<el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用"/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="其他费用:" prop="collectFee" label-width="100px">-->
<!-- <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
</div>
@ -1071,8 +1071,8 @@
});
if (this.orderData.length >= 1) {
let newDate1 = this.orderData.map(item => { // map遍历本地数据
if (this.stockArticleList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
let newDate1 = this.stockArticleList.map(item => { // map遍历本地数据
if (this.orderData.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
return item;
}
});

Write Preview
Loading…
Cancel
Save