Browse Source

采购入库-字段修改

jingbb 4 months ago
parent
commit
a4ca80e90d

+ 2 - 2
src/views/inventiry/purchaseIn/components/purchaseInForm.vue

@@ -46,12 +46,12 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="货位(goods allocation)" v-bind="validateInfos.goodsAllocation" id="SaleOrderForm-goodsAllocation" name="goodsAllocation">
-								<a-input v-model:value="formData.goodsAllocation" placeholder="请输入货位(goods allocation)"  allow-clear ></a-input>
+								<JDictSelectTag v-model:value="formData.goodsAllocation" placeholder="请选择" dictCode="goods_allocation"/>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="仓库(warehouse)" v-bind="validateInfos.warehouse" id="SaleOrderForm-warehouse" name="warehouse">
-								<a-input v-model:value="formData.warehouse" placeholder="请输入仓库(warehouse)"  allow-clear ></a-input>
+                <JDictSelectTag v-model:value="formData.warehouse" placeholder="请选择" dictCode="warehouse"/>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">

+ 1 - 1
src/views/inventiry/purchaseIn/puechaseInForm.data.ts

@@ -60,7 +60,7 @@ export const columns: BasicColumn[] = [
    {
     title: '提交(submit)',
     align:"center",
-    dataIndex: 'submit',
+    dataIndex: 'submit_dictText',
    },
 ];
 

+ 1 - 0
src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -463,6 +463,7 @@
           })
       }
       function addFromQuotation(data){
+
         data.map(item=>{
           item.model = item.childModel
           item.sourceId = 'Quo'+item.childId