mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mesxc-zjl #231

Merged
juzi merged 2 commits from projects/mesxc-zjl into projects/mesxc-test 2024-03-04 14:10:22 +08:00
Conversation 0 Commits 2 Files Changed 2 +3 -10
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d44f76b641 - Show all commits

11
src/views/order/base/orderGroup/components/orderGroupAdd.vue
View File

@ -60,14 +60,7 @@
</el-col> </el-col>
<el-col :span='6'> <el-col :span='6'>
<el-form-item label="包装要求" prop="packReq"> <el-form-item label="包装要求" prop="packReq">
<el-select v-model="form.packReq" placeholder="请选择" style="width: 100%;" clearable> <el-input v-model="form.packReq"></el-input>
<el-option
v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -127,7 +120,7 @@ export default {
this.form.customerId = res.data.customerId this.form.customerId = res.data.customerId
this.form.planQuantity = res.data.planQuantity this.form.planQuantity = res.data.planQuantity
this.form.deliveTime = res.data.deliveTime ? res.data.deliveTime : null this.form.deliveTime = res.data.deliveTime ? res.data.deliveTime : null
this.form.packReq = res.data.packReq ? res.data.packReq+'' : '' this.form.packReq = res.data.packReq
this.form.remark = res.data.remark this.form.remark = res.data.remark
setTimeout(() => { setTimeout(() => {
this.getSpecifications(this.form.planProductId) this.getSpecifications(this.form.planProductId)

2
src/views/order/base/orderGroup/index.vue
View File

@ -125,7 +125,7 @@ const tableProps = [
{ {
prop: 'packReq', prop: 'packReq',
label: '包装要求', label: '包装要求',
filter: publicFormatter('pack_spec'), // filter: publicFormatter('pack_spec'),
minWidth: 120, minWidth: 120,
showOverflowtooltip: true showOverflowtooltip: true
}, },