Browse Source

是否为下级

chenrui 2 years ago
parent
commit
a9e43a0915

+ 1 - 1
src/views/customerManagement/customerInfo/detailModal.vue

@@ -19,7 +19,7 @@
           <a-descriptions-item label="客户地址:" :span="3">{{ addressStr }}</a-descriptions-item>
           <a-descriptions-item label="客户传真:">{{ detailData&&detailData.fax || '--' }}</a-descriptions-item>
           <a-descriptions-item label="配送方式:">{{ detailData&&detailData.dispatchTypeDictValue || '--' }}</a-descriptions-item>
-          <a-descriptions-item label="是否卫星仓客户:">{{ detailData&&detailData.satelliteFlagDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="是否为下级:">{{ detailData&&detailData.satelliteFlagDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="价格类型:">{{ detailData&&detailData.priceTypeDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="收款方式:">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="客户类型:">{{ detailData&&detailData.customerTypeName || '--' }}</a-descriptions-item>

+ 4 - 1
src/views/customerManagement/customerInfo/edit.vue

@@ -97,7 +97,10 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="8">
-              <a-form-model-item label="是否卫星仓客户" prop="satelliteFlag">
+              <!-- <a-form-model-item label="是否卫星仓客户" prop="satelliteFlag">
+                <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
+              </a-form-model-item> -->
+              <a-form-model-item label="是否为下级" prop="satelliteFlag">
                 <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
               </a-form-model-item>
             </a-col>

+ 9 - 2
src/views/customerManagement/customerInfo/list.vue

@@ -22,7 +22,7 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="是否卫星仓客户">
+                <a-form-item label="是否为下级">
                   <v-select code="FLAG" id="customerManagementList-satelliteFlag" v-model="queryParam.satelliteFlag" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
               </a-col>
@@ -104,6 +104,13 @@
             class="button-success"
             @click="handleDetail(record)"
             id="customerManagementList-detail-btn">详情</a-button>
+          <a-button
+            size="small"
+            v-if="$hasPermissions('B_customer_customerInfo_edit')"
+            type="link"
+            class="button-primary"
+            @click="handleEdit(record)"
+            id="customerManagementList-edit-btn">合并</a-button>
           <span v-if="!$hasPermissions('B_customer_customerInfo_edit') && !$hasPermissions('B_customer_customerInfo_detail')">--</span>
         </template>
         <template slot="enableAction" slot-scope="text, record">
@@ -154,7 +161,7 @@ export default {
         { title: '联系手机', dataIndex: 'contactMobile', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '是否卫星仓', dataIndex: 'satelliteFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '是否为下级', dataIndex: 'satelliteFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: '8%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],