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

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 12 months ago
parent
b425c959ba 2f907b0660
commit
72369fd2ea
7 changed files with 231 additions and 155 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 90
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  2. 93
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  3. 83
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  4. 110
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  5. 5
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  6. 2
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  7. 3
      src/views/distribution/inventory/distrilbutionBillLadingView.vue

90
src/views/distribution/inventory/delivery/distributionStockArticle.vue
Unescape View File

@ -199,9 +199,10 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormService" title="修改服务类型"> <el-dialog v-model="dialogFormService" title="修改服务类型">
<el-form :model="formService"> <el-form :model="formService" :rules="loginRules" ref="formServiceRef">
<el-form-item label="服务类型" :label-width="formLabelWidth"> <el-form-item label="服务类型" :label-width="formLabelWidth" prop="typeService">
<!-- <el-input v-model="formService.typeService" autocomplete="off" />--> <!-- <el-input v-model="formService.typeService" autocomplete="off" />-->
<el-select v-model="formService.typeService" clearable placeholder="请选择服务类型"> <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
<el-option <el-option
@ -213,10 +214,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="费用" :label-width="formLabelWidth"> <el-form-item label="费用" :label-width="formLabelWidth" prop="cost">
<el-input v-model="formService.cost" autocomplete="off" placeholder="请填写费用 " /> <el-input v-model="formService.cost" autocomplete="off" placeholder="请填写费用 " />
</el-form-item> </el-form-item>
<el-form-item label="原因" :label-width="formLabelWidth"> <el-form-item label="原因" :label-width="formLabelWidth" prop="cause">
<el-input <el-input
v-model="formService.cause" v-model="formService.cause"
:rows="2" :rows="2"
@ -233,15 +234,16 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormCustomer" title="修改客户信息"> <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer"> <el-form :model="formCustomer" :rules="rules" ref="formCustomerRef">
<el-form-item label="姓名" :label-width="formLabelWidth"> <el-form-item label="姓名" :label-width="formLabelWidth" prop="name">
<el-input v-model="formCustomer.name" autocomplete="off" /> <el-input v-model="formCustomer.name" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item label="电话" :label-width="formLabelWidth"> <el-form-item label="电话" :label-width="formLabelWidth" prop="phone">
<el-input v-model="formCustomer.phone" autocomplete="off" /> <el-input v-model="formCustomer.phone" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item label="地址" :label-width="formLabelWidth"> <el-form-item label="地址" :label-width="formLabelWidth" prop="address">
<el-input <el-input
v-model="formCustomer.address" v-model="formCustomer.address"
:rows="2" :rows="2"
@ -254,7 +256,9 @@
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="dialogFormCustomer = false">取消</el-button> <el-button @click="dialogFormCustomer = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>--> <!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button> <el-button type="primary" @click="callFordelivery('3', 'formCustomerRef')">
确定
</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -519,6 +523,16 @@ export default {
}, },
}, },
], ],
rules: {
address: [{ required: true, message: '请输入收货人地址', trigger: ['blur', 'change'] }],
phone: [{ required: true, message: '请输入收货人电话', trigger: ['blur', 'change'] }],
name: [{ required: true, message: '请输入收货人名称', trigger: ['blur', 'change'] }],
},
loginRules: {
typeService: [{ required: true, message: '请选择服务类型', trigger: ['blur', 'change'] }],
cost: [{ required: true, message: '请输入费用', trigger: ['blur', 'change'] }],
cause: [{ required: true, message: '请输入原因', trigger: ['blur', 'change'] }],
},
/** loading */ /** loading */
loadingObj: { loadingObj: {
/** 页面loading */ /** 页面loading */
@ -898,39 +912,47 @@ export default {
}); });
break; break;
case '2': case '2':
this.formService.stockArticleId = this.ids; this.$refs.formServiceRef.validate(valid => {
// console.log("服务类型",this.formService); if (!valid) {
return;
}
addService(this.formService).then(() => { this.formService.stockArticleId = this.ids;
this.$message({ // console.log("服务类型",this.formService);
type: 'success', addService(this.formService).then(() => {
message: '操作成功!', this.$message({
type: 'success',
message: '操作成功!',
});
this.dialogFormService = false;
this.formService = {};
this.onLoad(this.page);
}); });
this.dialogFormService = false;
this.formService = {};
this.onLoad(this.page);
}); });
break; break;
case '3': case '3':
console.log('客户信息！！！', this.formCustomer); this.$refs.formCustomerRef.validate(valid => {
for (const key in this.formCustomer) { if (!valid) {
const value = this.formCustomer[key]; return;
if (!value) return this.$message.warning('请完善客户信息再提交'); }
}
if (!this.dialogFormCustomerOwn) { console.log('客户信息！！！', this.formCustomer);
this.formCustomer.stockArticleId = this.ids; if (!this.dialogFormCustomerOwn) {
} this.formCustomer.stockArticleId = this.ids;
addClient(this.formCustomer).then(() => { }
this.$message({ addClient(this.formCustomer).then(() => {
type: 'success', this.$message({
message: '操作成功!', type: 'success',
message: '操作成功!',
});
this.dialogFormCustomer = false;
this.dialogFormCustomerOwn = false;
this.formCustomer = {};
this.onLoad(this.page);
}); });
this.dialogFormCustomer = false;
this.dialogFormCustomerOwn = false;
this.formCustomer = {};
this.onLoad(this.page);
}); });
break; break;
} }
}, },

93
src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
Unescape View File

@ -157,8 +157,8 @@
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormService" title="修改服务类型"> <el-dialog v-model="dialogFormService" title="修改服务类型">
<el-form :model="formService"> <el-form :model="formService" :rules="serveRules" ref="formServiceRef">
<el-form-item label="服务类型" :label-width="formLabelWidth"> <el-form-item label="服务类型" :label-width="formLabelWidth" prop="typeService">
<!-- <el-input v-model="formService.typeService" autocomplete="off" />--> <!-- <el-input v-model="formService.typeService" autocomplete="off" />-->
<el-select v-model="formService.typeService" clearable placeholder="请选择服务类型"> <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
<el-option <el-option
@ -170,10 +170,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="费用" :label-width="formLabelWidth"> <el-form-item label="费用" :label-width="formLabelWidth" prop="cost">
<el-input v-model="formService.cost" autocomplete="off" /> <el-input v-model="formService.cost" autocomplete="off" placeholder="请填写费用 " />
</el-form-item> </el-form-item>
<el-form-item label="原因" :label-width="formLabelWidth"> <el-form-item label="原因" :label-width="formLabelWidth" prop="cause">
<el-input <el-input
v-model="formService.cause" v-model="formService.cause"
:rows="2" :rows="2"
@ -191,14 +191,14 @@
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormCustomer" title="修改客户信息"> <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer"> <el-form :model="formCustomer" :rules="rules" ref="formCustomerRef">
<el-form-item label="姓名" :label-width="formLabelWidth"> <el-form-item label="姓名" :label-width="formLabelWidth" prop="name">
<el-input v-model="formCustomer.name" autocomplete="off" /> <el-input v-model="formCustomer.name" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item label="电话" :label-width="formLabelWidth"> <el-form-item label="电话" :label-width="formLabelWidth" prop="phone">
<el-input v-model="formCustomer.phone" autocomplete="off" /> <el-input v-model="formCustomer.phone" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item label="地址" :label-width="formLabelWidth"> <el-form-item label="地址" :label-width="formLabelWidth" prop="address">
<el-input <el-input
v-model="formCustomer.address" v-model="formCustomer.address"
:rows="2" :rows="2"
@ -413,12 +413,16 @@ export default {
columnList: _newCol, columnList: _newCol,
columnListedit: [], columnListedit: [],
loginRules: { loginRules: {
consigneeAddress: [{ required: true, message: '请输入收货人地址', trigger: 'blur' }], consigneeAddress: [
{ required: true, message: '请输入收货人地址', trigger: ['blur', 'change'] },
],
consigneeMobile: [ consigneeMobile: [
{ required: true, message: '请输入收货人电话', trigger: 'change' }, { required: true, message: '请输入收货人电话', trigger: 'change' },
{ min: 11, max: 11, message: '请输入11位电话号码', trigger: 'blur' }, { min: 11, max: 11, message: '请输入11位电话号码', trigger: ['blur', 'change'] },
],
consigneePerson: [
{ required: true, message: '请输入收货人名称', trigger: ['blur', 'change'] },
], ],
consigneePerson: [{ required: true, message: '请输入收货人名称', trigger: 'blur' }],
}, },
drawerShow: false, drawerShow: false,
height: 0, height: 0,
@ -443,6 +447,16 @@ export default {
pageSize: 30, pageSize: 30,
total: 40, total: 40,
}, },
rules: {
address: [{ required: true, message: '请输入收货人地址', trigger: ['blur', 'change'] }],
phone: [{ required: true, message: '请输入收货人电话', trigger: ['blur', 'change'] }],
name: [{ required: true, message: '请输入收货人名称', trigger: ['blur', 'change'] }],
},
serveRules: {
typeService: [{ required: true, message: '请选择服务类型', trigger: ['blur', 'change'] }],
cost: [{ required: true, message: '请输入费用', trigger: ['blur', 'change'] }],
cause: [{ required: true, message: '请输入原因', trigger: ['blur', 'change'] }],
},
// 表单数据 // 表单数据
form: {}, form: {},
formCall: {}, // 通知 formCall: {}, // 通知
@ -807,33 +821,46 @@ export default {
}); });
break; break;
case '2': case '2':
this.formService.stockArticleId = this.ids; this.$refs.formServiceRef.validate(valid => {
console.log('服务类型', this.formService); if (!valid) {
addService(this.formService).then(() => { return;
this.$message({ }
type: 'success',
message: '操作成功!', this.formService.stockArticleId = this.ids;
console.log('服务类型', this.formService);
addService(this.formService).then(() => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.dialogFormService = false;
this.formService = {};
this.onLoad(this.page);
}); });
this.dialogFormService = false;
this.formService = {};
this.onLoad(this.page);
}); });
break; break;
case '3': case '3':
console.log('客户信息！！！', this.formCustomer); this.$refs.formCustomerRef.validate(valid => {
if (!this.dialogFormCustomerOwn) { if (!valid) {
this.formCustomer.stockArticleId = this.ids; return;
} }
addClient(this.formCustomer).then(() => {
this.$message({ console.log('客户信息！！！', this.formCustomer);
type: 'success', if (!this.dialogFormCustomerOwn) {
message: '操作成功!', this.formCustomer.stockArticleId = this.ids;
}
addClient(this.formCustomer).then(() => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.dialogFormCustomer = false;
this.dialogFormCustomerOwn = false;
this.formCustomer = {};
this.onLoad(this.page);
}); });
this.dialogFormCustomer = false;
this.dialogFormCustomerOwn = false;
this.formCustomer = {};
this.onLoad(this.page);
}); });
break; break;
} }
}, },

83
src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
Unescape View File

@ -188,8 +188,8 @@
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormService" title="修改服务类型"> <el-dialog v-model="dialogFormService" title="修改服务类型">
<el-form :model="formService"> <el-form :model="formService" :rules="serveRules" ref="formServiceRef">
<el-form-item label="服务类型" :label-width="formLabelWidth"> <el-form-item label="服务类型" :label-width="formLabelWidth" prop="typeService">
<!-- <el-input v-model="formService.typeService" autocomplete="off" />--> <!-- <el-input v-model="formService.typeService" autocomplete="off" />-->
<el-select v-model="formService.typeService" clearable placeholder="请选择服务类型"> <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
<el-option <el-option
@ -201,10 +201,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="费用" :label-width="formLabelWidth"> <el-form-item label="费用" :label-width="formLabelWidth" prop="cost">
<el-input v-model="formService.cost" autocomplete="off" /> <el-input v-model="formService.cost" autocomplete="off" placeholder="请填写费用 " />
</el-form-item> </el-form-item>
<el-form-item label="原因" :label-width="formLabelWidth"> <el-form-item label="原因" :label-width="formLabelWidth" prop="cause">
<el-input <el-input
v-model="formService.cause" v-model="formService.cause"
:rows="2" :rows="2"
@ -222,14 +222,14 @@
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormCustomer" title="修改客户信息"> <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer"> <el-form :model="formCustomer" :rules="rules" ref="formCustomerRef">
<el-form-item label="姓名" :label-width="formLabelWidth"> <el-form-item label="姓名" :label-width="formLabelWidth" prop="name">
<el-input v-model="formCustomer.name" autocomplete="off" /> <el-input v-model="formCustomer.name" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item label="电话" :label-width="formLabelWidth"> <el-form-item label="电话" :label-width="formLabelWidth" prop="phone">
<el-input v-model="formCustomer.phone" autocomplete="off" /> <el-input v-model="formCustomer.phone" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item label="地址" :label-width="formLabelWidth"> <el-form-item label="地址" :label-width="formLabelWidth" prop="address">
<el-input <el-input
v-model="formCustomer.address" v-model="formCustomer.address"
:rows="2" :rows="2"
@ -421,6 +421,16 @@ export default {
pageSize: 30, pageSize: 30,
total: 40, total: 40,
}, },
rules: {
address: [{ required: true, message: '请输入收货人地址', trigger: ['blur', 'change'] }],
phone: [{ required: true, message: '请输入收货人电话', trigger: ['blur', 'change'] }],
name: [{ required: true, message: '请输入收货人名称', trigger: ['blur', 'change'] }],
},
serveRules: {
typeService: [{ required: true, message: '请选择服务类型', trigger: ['blur', 'change'] }],
cost: [{ required: true, message: '请输入费用', trigger: ['blur', 'change'] }],
cause: [{ required: true, message: '请输入原因', trigger: ['blur', 'change'] }],
},
// 表单数据 // 表单数据
form: {}, form: {},
formCall: {}, // 通知 formCall: {}, // 通知
@ -835,34 +845,47 @@ export default {
}); });
break; break;
case '2': case '2':
this.formService.stockArticleId = this.ids; this.$refs.formServiceRef.validate(valid => {
// console.log("服务类型",this.formService); if (!valid) {
return;
}
addService(this.formService).then(() => { this.formService.stockArticleId = this.ids;
this.$message({ // console.log("服务类型",this.formService);
type: 'success', addService(this.formService).then(() => {
message: '操作成功!', this.$message({
type: 'success',
message: '操作成功!',
});
this.dialogFormService = false;
this.formService = {};
this.onLoad(this.page);
}); });
this.dialogFormService = false;
this.formService = {};
this.onLoad(this.page);
}); });
break; break;
case '3': case '3':
console.log('客户信息！！！', this.formCustomer); this.$refs.formCustomerRef.validate(valid => {
if (!this.dialogFormCustomerOwn) { if (!valid) {
this.formCustomer.stockArticleId = this.ids; return;
} }
addClient(this.formCustomer).then(() => {
this.$message({ console.log('客户信息！！！', this.formCustomer);
type: 'success', if (!this.dialogFormCustomerOwn) {
message: '操作成功!', this.formCustomer.stockArticleId = this.ids;
}
addClient(this.formCustomer).then(() => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.dialogFormCustomer = false;
this.dialogFormCustomerOwn = false;
this.formCustomer = {};
this.onLoad(this.page);
}); });
this.dialogFormCustomer = false;
this.dialogFormCustomerOwn = false;
this.formCustomer = {};
this.onLoad(this.page);
}); });
break; break;
} }
}, },

110
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
Unescape View File

@ -217,8 +217,8 @@
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormService" title="修改服务类型"> <el-dialog v-model="dialogFormService" title="修改服务类型">
<el-form :model="formService"> <el-form :model="formService" :rules="serveRules" ref="formServiceRef">
<el-form-item label="服务类型" :label-width="formLabelWidth"> <el-form-item label="服务类型" :label-width="formLabelWidth" prop="typeService">
<!-- <el-input v-model="formService.typeService" autocomplete="off" />--> <!-- <el-input v-model="formService.typeService" autocomplete="off" />-->
<el-select v-model="formService.typeService" clearable placeholder="请选择服务类型"> <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
<el-option <el-option
@ -230,10 +230,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="费用" :label-width="formLabelWidth"> <el-form-item label="费用" :label-width="formLabelWidth" prop="cost">
<el-input v-model="formService.cost" autocomplete="off" /> <el-input v-model="formService.cost" autocomplete="off" placeholder="请填写费用 " />
</el-form-item> </el-form-item>
<el-form-item label="原因" :label-width="formLabelWidth"> <el-form-item label="原因" :label-width="formLabelWidth" prop="cause">
<el-input <el-input
v-model="formService.cause" v-model="formService.cause"
:rows="2" :rows="2"
@ -251,14 +251,14 @@
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormCustomer" title="修改客户信息"> <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer"> <el-form :model="formCustomer" :rules="rules" ref="formCustomerRef">
<el-form-item label="姓名" :label-width="formLabelWidth"> <el-form-item label="姓名" :label-width="formLabelWidth" prop="name">
<el-input v-model="formCustomer.name" autocomplete="off" /> <el-input v-model="formCustomer.name" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item label="电话" :label-width="formLabelWidth"> <el-form-item label="电话" :label-width="formLabelWidth" prop="phone">
<el-input v-model="formCustomer.phone" autocomplete="off" /> <el-input v-model="formCustomer.phone" autocomplete="off" />
</el-form-item> </el-form-item>
<el-form-item label="地址" :label-width="formLabelWidth"> <el-form-item label="地址" :label-width="formLabelWidth" prop="address">
<el-input <el-input
v-model="formCustomer.address" v-model="formCustomer.address"
:rows="2" :rows="2"
@ -391,31 +391,7 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer">
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input v-model="formCustomer.name" autocomplete="off" />
</el-form-item>
<el-form-item label="电话" :label-width="formLabelWidth">
<el-input v-model="formCustomer.phone" autocomplete="off" />
</el-form-item>
<el-form-item label="地址" :label-width="formLabelWidth">
<el-input
v-model="formCustomer.address"
:rows="2"
type="textarea"
placeholder="请填写地址"
/>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormCustomer = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
</span>
</template>
</el-dialog>
<el-dialog v-model="waybillrecipient" title="修改运单收货人"> <el-dialog v-model="waybillrecipient" title="修改运单收货人">
<el-form <el-form
v-loading="loadingwaybillrecipient" v-loading="loadingwaybillrecipient"
@ -587,6 +563,16 @@ export default {
view: false, view: false,
// 查询信息 // 查询信息
query: {}, query: {},
rules: {
address: [{ required: true, message: '请输入收货人地址', trigger: ['blur', 'change'] }],
phone: [{ required: true, message: '请输入收货人电话', trigger: ['blur', 'change'] }],
name: [{ required: true, message: '请输入收货人名称', trigger: ['blur', 'change'] }],
},
serveRules: {
typeService: [{ required: true, message: '请选择服务类型', trigger: ['blur', 'change'] }],
cost: [{ required: true, message: '请输入费用', trigger: ['blur', 'change'] }],
cause: [{ required: true, message: '请输入原因', trigger: ['blur', 'change'] }],
},
// 分页信息 // 分页信息
page: { page: {
currentPage: 1, currentPage: 1,
@ -1127,33 +1113,47 @@ export default {
}); });
break; break;
case '2': case '2':
this.formService.stockArticleId = this.ids; this.$refs.formServiceRef.validate(valid => {
// console.log("服务类型",this.formService); if (!valid) {
addService(this.formService).then(() => { return;
this.$message({ }
type: 'success',
message: '操作成功!', this.formService.stockArticleId = this.ids;
// console.log("服务类型",this.formService);
addService(this.formService).then(() => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.dialogFormService = false;
this.formService = {};
this.onLoad(this.page);
}); });
this.dialogFormService = false;
this.formService = {};
this.onLoad(this.page);
}); });
break; break;
case '3': case '3':
// console.log("客户信息！！！",this.formCustomer); this.$refs.formCustomerRef.validate(valid => {
if (!this.dialogFormCustomerOwn) { if (!valid) {
this.formCustomer.stockArticleId = this.ids; return;
} }
addClient(this.formCustomer).then(() => {
this.$message({ console.log('客户信息！！！', this.formCustomer);
type: 'success', if (!this.dialogFormCustomerOwn) {
message: '操作成功!', this.formCustomer.stockArticleId = this.ids;
}
addClient(this.formCustomer).then(() => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.dialogFormCustomer = false;
this.dialogFormCustomerOwn = false;
this.formCustomer = {};
this.onLoad(this.page);
}); });
this.dialogFormCustomer = false;
this.dialogFormCustomerOwn = false;
this.formCustomer = {};
this.onLoad(this.page);
}); });
break; break;
} }
}, },

5
src/views/distribution/inventory/distributionStockArticleDetails.vue
Unescape View File

@ -400,7 +400,7 @@ export default {
consigneeAddress: [{ required: true, message: '请输入收货人地址', trigger: 'blur' }], consigneeAddress: [{ required: true, message: '请输入收货人地址', trigger: 'blur' }],
consigneeMobile: [ consigneeMobile: [
{ required: true, message: '请输入收货人电话', trigger: 'blur' }, { required: true, message: '请输入收货人电话', trigger: 'blur' },
{ min: 11, max: 11, message: '请输入11位电话号码', trigger: 'blur' }, // { min: 11, max: 11, message: '请输入11位电话号码', trigger: 'blur' },
], ],
consigneePerson: [{ required: true, message: '请输入收货人名称', trigger: 'blur' }], consigneePerson: [{ required: true, message: '请输入收货人名称', trigger: 'blur' }],
}, },
@ -1046,6 +1046,9 @@ export default {
}); });
break; break;
case '3': case '3':
for (const key in this.formCustomer) {
if (!this.formCustomer[key]) return this.$message.warning('请完善客户信息!!');
}
// console.log("客户信息！！！",this.formCustomer); // console.log("客户信息！！！",this.formCustomer);
this.formCustomer.stockArticleId = this.$route.query.id; this.formCustomer.stockArticleId = this.$route.query.id;
console.log('客户信息！！！', this.formCustomer); console.log('客户信息！！！', this.formCustomer);

2
src/views/distribution/inventory/distrilbutionBillLadingList.vue
Unescape View File

@ -543,7 +543,7 @@ export default {
label: '操作', label: '操作',
type: 6, type: 6,
values: '', values: '',
width: '200', width: '250',
checkarr: [], checkarr: [],
fixed: 'right', fixed: 'right',
hide: true, hide: true,

3
src/views/distribution/inventory/distrilbutionBillLadingView.vue
Unescape View File

@ -192,6 +192,7 @@ import {
getOrderDetail, getOrderDetail,
$_checkBillLadingIsRelease, $_checkBillLadingIsRelease,
} from '@/api/distribution/distrilbutionBillLading'; } from '@/api/distribution/distrilbutionBillLading';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import { getLodop } from '@/utils/LodopFuncs.js'; import { getLodop } from '@/utils/LodopFuncs.js';
@ -1508,7 +1509,7 @@ export default {
} }
this.html = ''; this.html = '';
getPrintTemplate({ showOrderPackgeCode({
ids: qr, ids: qr,
}).then(res => { }).then(res => {
// this.orderPackageCode = res.data // this.orderPackageCode = res.data

Write Preview
Loading…
Cancel
Save