Browse Source

暂时注掉资源仓字段、出入库增加商品名搜索

liyuan 18 hours ago
parent
commit
f082e5ef06

+ 8 - 2
src/views/storehouse/inStockManage/inStockPlan/index.vue

@@ -287,6 +287,12 @@ export default {
                     prop: "numberRows",
                     overHidden: true,
                 },
+                    {
+                        label: '商品名称',
+                        prop: "shortcutJoin",
+                        search: true,
+                        overHidden: true,
+                    },
                 {
                     label: '数量',
                     prop: "goodsTotalNum",
@@ -317,7 +323,7 @@ export default {
                         value: "dictKey"
                     }
                 },
-                {
+/*                {
                     label: '结算状态',
                     prop: "actualPaymentStatus",
                     searchProp: 'actualPaymentType',
@@ -339,7 +345,7 @@ export default {
                     //   label: "dictValue",
                     //   value: "dictKey"
                     // }
-                },
+                },*/
                 // {
                 //   label: '应结日期',
                 //   prop: "dueDate",

+ 6 - 0
src/views/storehouse/outStockManage/outStockPlan/index.vue

@@ -287,6 +287,12 @@ export default {
           prop: "goodsTotalNum",
           overHidden: true,
         },
+            {
+                label: '商品名称',
+                prop: "shortcutJoin",
+                search: true,
+                overHidden: true,
+            },
 /*            {
           label: '金额',
           prop: "totalMoney",

+ 4 - 4
src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -44,7 +44,7 @@
                 @click="dialogVisibleCK = true"></i>
             </div>
           </template>
-            <template slot="resourceWarehouseList">
+<!--            <template slot="resourceWarehouseList">
                 <div style="display:flex;">
                     <avue-input-tree v-model="form.resourceWarehouseList" :disabled="option.disabled" placeholder="请选择资源仓库"
                                      :dic="resourceWarehouseDataList.filter(item => item.id !== form.deliveryWarehouseId)" :props="propsCk">
@@ -52,7 +52,7 @@
                     <i class="el-icon-circle-plus-outline" style="font-size:18px;line-height: 32px;margin-left:4px"
                        @click="dialogVisibleCK = true"></i>
                 </div>
-            </template>
+            </template>-->
           <template slot="limitAmount">
             <div style="display:flex;">
               <el-input v-model="form.limitAmount" disabled size="small" placeholder="请输入额度"></el-input>
@@ -500,7 +500,7 @@ export default {
               trigger: "blur"
             }]
           },
-            {
+/*            {
                 label: "资源仓库",
                 prop: "resourceWarehouseList",
                 span: 12,
@@ -516,7 +516,7 @@ export default {
                     message: " ",
                     trigger: "blur"
                 }]
-            },
+            },*/
           {
             label: "商城价格",
             prop: "priceSystem",