Commit 03cd3525 authored by 季圣华's avatar 季圣华
Browse files

给订单去除仓库

parent cbfdb3b8
...@@ -39,15 +39,6 @@ ...@@ -39,15 +39,6 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24">
<a-form-item label="仓库名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="请选择仓库" showSearch optionFilterProp="children" v-model="queryParam.depotId">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator"> <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
...@@ -206,7 +197,6 @@ ...@@ -206,7 +197,6 @@
}, },
created() { created() {
this.initSupplier() this.initSupplier()
this.getDepotData()
this.initUser() this.initUser()
}, },
computed: { computed: {
......
...@@ -40,15 +40,6 @@ ...@@ -40,15 +40,6 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24">
<a-form-item label="仓库名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="请选择仓库" showSearch optionFilterProp="children" v-model="queryParam.depotId">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator"> <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
...@@ -206,7 +197,6 @@ ...@@ -206,7 +197,6 @@
}, },
created() { created() {
this.initCustomer() this.initCustomer()
this.getDepotData()
this.initUser() this.initUser()
}, },
computed: { computed: {
......
...@@ -998,7 +998,6 @@ ...@@ -998,7 +998,6 @@
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
purchaseOrderColumns: [ purchaseOrderColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'}, { title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'}, { title: '规格', dataIndex: 'standard', width: '5%'},
...@@ -1062,7 +1061,6 @@ ...@@ -1062,7 +1061,6 @@
{ title: '备注', dataIndex: 'remark', width: '5%'} { title: '备注', dataIndex: 'remark', width: '5%'}
], ],
saleOrderColumns: [ saleOrderColumns: [
{ title: '仓库名称', dataIndex: 'depotName', width: '8%'},
{ title: '条码', dataIndex: 'barCode', width: '10%'}, { title: '条码', dataIndex: 'barCode', width: '10%'},
{ title: '名称', dataIndex: 'name', width: '8%'}, { title: '名称', dataIndex: 'name', width: '8%'},
{ title: '规格', dataIndex: 'standard', width: '5%'}, { title: '规格', dataIndex: 'standard', width: '5%'},
......
...@@ -112,9 +112,6 @@ ...@@ -112,9 +112,6 @@
loading: false, loading: false,
dataSource: [], dataSource: [],
columns: [ columns: [
{ title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true, { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]
}, },
......
...@@ -115,9 +115,6 @@ ...@@ -115,9 +115,6 @@
loading: false, loading: false,
dataSource: [], dataSource: [],
columns: [ columns: [
{ title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true, { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, multi: true,
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]
}, },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment