Переглянути джерело

营销-协议单位(客户信息)

WIN-B904R0U0NNS\Administrator 2 роки тому
батько
коміт
cf1cf9d612

+ 22 - 13
src/views/markets/agreementunit.vue

@@ -12,17 +12,18 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator">
             <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-            <a-button type="primary" icon="download" @click="handleExportXls('协议单位')">导出</a-button>
-            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-                <a-button type="primary" icon="import">导入</a-button>
-            </a-upload>
-            <!-- 高级查询区域 -->
-            <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--            <a-button type="primary" icon="download" @click="handleExportXls('协议单位')">导出</a-button>-->
+<!--            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--                <a-button type="primary" icon="import">导入</a-button>-->
+<!--            </a-upload>-->
+<!--            &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--            <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
             <a-dropdown v-if="selectedRowKeys.length > 0">
-                <a-menu slot="overlay">
-                    <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-                </a-menu>
-                <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+<!--                <a-menu slot="overlay">-->
+<!--                    <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--                </a-menu>-->
+<!--                <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+                <a-button @click="batchDel" type="danger" icon="delete">批量删除</a-button>
             </a-dropdown>
         </div>
 
@@ -75,7 +76,7 @@
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
+                <a @click="handleDetails(record)">详情</a>
               </a-menu-item>
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -90,6 +91,7 @@
         </div>
 
         <agreement-unit-modal ref="modalForm" @ok="modalFormOk"></agreement-unit-modal>
+        <agreement-unit-detail-modal ref="modalDetailForm" @ok="modalFormOk"></agreement-unit-detail-modal>
     </a-card>
 </template>
 
@@ -99,11 +101,13 @@
     import { mixinDevice } from '@/utils/mixin'
     import { JeecgListMixin } from '@/mixins/JeecgListMixin'
     import agreementUnitModal from './modules/agreementUnit/agreementUnitModal'
+    import AgreementUnitDetailModal from './modules/agreementUnit/agreementUnitDetailModal'
 
     export default {
         name: 'agreementunit',
         mixins:[JeecgListMixin, mixinDevice],
         components: {
+            AgreementUnitDetailModal,
             agreementUnitModal
         },
         data () {
@@ -154,7 +158,7 @@
                     {
                         title:'备注',
                         align:"center",
-                        dataIndex: 'remark'
+                        dataIndex: 'remarks'
                     },
                     {
                         title:'账号状态',
@@ -243,7 +247,12 @@
                 fieldList.push({type:'string',value:'remark',text:'备注'})
                 fieldList.push({type:'int',value:'delFlag',text:'删除状态'})
                 this.superFieldList = fieldList
-            }
+            },
+            handleDetails:function(record){
+                this.$refs.modalDetailForm.edit(record);
+                this.$refs.modalDetailForm.title="详情";
+                this.$refs.modalDetailForm.disableSubmit = true;
+            },
         }
     }
 </script>

+ 678 - 0
src/views/markets/modules/agreementUnit/agreementUnitDetailForm.vue

@@ -0,0 +1,678 @@
+<template>
+    <div class="container">
+        <div class="left">
+            <a-button type="primary" style="margin-bottom: 16px" @click="toggleCollapsed">
+<!--                <a-icon :type="collapsed ? 'menu-unfold' : 'menu-fold'" />-->
+                {{collapsed ? '展开':'收起'}}
+            </a-button>
+            <a-menu
+                    :default-selected-keys="['1']"
+                    mode="inline"
+                    :inline-collapsed="collapsed"
+                    @click="handleMneuClick"
+            >
+                <a-menu-item key="1">
+                    <a-icon type="team" />
+                    <span>客户信息</span>
+                </a-menu-item>
+                <a-menu-item key="2">
+                    <a-icon type="file-text" />
+                    <span>客户协议</span>
+                </a-menu-item>
+                <a-menu-item key="3">
+                    <a-icon type="phone" />
+                    <span>联系人</span>
+                </a-menu-item>
+                <a-menu-item key="4">
+                    <a-icon type="property-safety" />
+                    <span>佣金</span>
+                </a-menu-item>
+                <a-menu-item key="5">
+                    <a-icon type="file-done" />
+                    <span>入住记录</span>
+                </a-menu-item>
+<!--                <a-sub-menu key="sub1">-->
+<!--                    <span slot="title"><a-icon type="mail" /><span>Navigation One</span></span>-->
+<!--                    <a-menu-item key="5">-->
+<!--                        Option 5-->
+<!--                    </a-menu-item>-->
+<!--                    <a-menu-item key="6">-->
+<!--                        Option 6-->
+<!--                    </a-menu-item>-->
+<!--                    <a-menu-item key="7">-->
+<!--                        Option 7-->
+<!--                    </a-menu-item>-->
+<!--                    <a-menu-item key="8">-->
+<!--                        Option 8-->
+<!--                    </a-menu-item>-->
+<!--                </a-sub-menu>-->
+            </a-menu>
+        </div>
+<!--        <a-divider type="vertical" style="height: inherit;margin-left: 20px;" />-->
+        <div class="right">
+            <div class="content">
+                <div v-if="activeMneu == 1">
+                    <a-spin :spinning="confirmLoading">
+                        <j-form-container>
+                            <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+                                <a-row :gutter="[16,16]">
+                                    <a-col :span="24">
+                                        <a-form-model-item label="选择日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                                            <div class="item-content">
+                                                <div class="list-container">
+                                                    <div class="list-item" v-for="(item, index) in dateList" :key="index" :class="{active: activeIndex === index}" @click="handleClick(index)">
+                                                        {{ item }}
+                                                    </div>
+                                                </div>
+                                                <div>
+                                                    <a-range-picker v-show="activeIndex==3" @change="onChange" size="large"/>
+                                                </div>
+                                            </div>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="客户全称" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="customerName">
+                                            <a-input disabled="disabled" v-model="model.customerName" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="客户简称" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="customerShortName">
+                                            <a-input disabled="disabled" v-model="model.customerShortName" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="系统类型" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="systemType_dictText">
+                                            <a-input disabled="disabled" v-model="model.systemType_dictText" ></a-input>
+<!--                                            <a-select-->
+<!--                                                    disabled="disabled"-->
+<!--                                                    v-model="model.systemType"-->
+<!--                                                    placeholder="请选择系统类型"-->
+<!--                                                    :allowClear="true"-->
+<!--                                            >-->
+<!--                                                <a-select-option :value="item.id" v-for="(item,index) in systemTypeList" :key="index">{{ item.itemText }}</a-select-option>-->
+<!--                                            </a-select>-->
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="客户编号" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="customerNo">
+                                            <a-input disabled="disabled" v-model="model.customerNo"></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="主联系人" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="contactsName">
+                                            <a-input disabled="disabled" v-model="model.contactsName"></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="客户类型" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="customerType_dictText">
+                                            <a-input disabled="disabled" v-model="model.customerType_dictText" ></a-input>
+<!--                                            <a-select-->
+<!--                                                    v-model="model.customerType"-->
+<!--                                                    placeholder="请选择客户类型"-->
+<!--                                                    :allowClear="true"-->
+<!--                                            >-->
+<!--                                                <a-select-option :value="item.id" v-for="(item,index) in customerTypeList" :key="index">{{ item.itemText }}</a-select-option>-->
+<!--                                            </a-select>-->
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="销售人员" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="sellerId_dictText">
+                                            <a-input disabled="disabled" v-model="model.sellerId_dictText"></a-input>
+<!--                                            <a-select-->
+<!--                                                    v-model="model.sellerId"-->
+<!--                                                    placeholder="请选择销售人员"-->
+<!--                                                    :allowClear="true"-->
+<!--                                            >-->
+<!--                                                <a-select-option :value="item.id" v-for="(item,index) in saleList" :key="index">{{ item.name }}</a-select-option>-->
+<!--                                            </a-select>-->
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="手机号" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="phone">
+                                            <a-input disabled="disabled" v-model="model.phone" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="客户状态" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="status_dictText">
+                                            <a-input disabled="disabled" v-model="model.status_dictText" ></a-input>
+<!--                                            <a-select-->
+<!--                                                    v-model="model.status"-->
+<!--                                                    placeholder="请选择客户状态"-->
+<!--                                                    :allowClear="true"-->
+<!--                                            >-->
+<!--                                                <a-select-option :value="item.id" v-for="(item,index) in customerStatusList" :key="index">{{ item.itemText }}</a-select-option>-->
+<!--                                            </a-select>-->
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="地区" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="region">
+                                            <a-input disabled="disabled" v-model="model.region" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="邮编" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="postalCode">
+                                            <a-input disabled="disabled" v-model="model.postalCode" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="地址" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="address">
+                                            <a-input disabled="disabled" v-model="model.address" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="公司电话" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="companyPhone">
+                                            <a-input disabled="disabled" v-model="model.companyPhone" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="传真" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="fax">
+                                            <a-input disabled="disabled" v-model="model.fax" placeholder="请输入传真"  ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="客户来源" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="customerSource_dictText">
+                                            <a-input disabled="disabled" v-model="model.customerSource_dictText"></a-input>
+<!--                                            <a-select-->
+<!--                                                    v-model="model.customerSource"-->
+<!--                                                    placeholder="请选择客户来源"-->
+<!--                                                    :allowClear="true"-->
+<!--                                            >-->
+<!--                                                <a-select-option :value="item.id" v-for="(item,index) in customerSourceList" :key="index">{{ item.itemText }}</a-select-option>-->
+<!--                                            </a-select>-->
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="主页" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="homepage">
+                                            <a-input disabled="disabled" v-model="model.homepage" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="Email" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="email">
+                                            <a-input disabled="disabled" v-model="model.email" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="客户行业" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="customerIndustry_dictText">
+                                            <a-input disabled="disabled" v-model="model.customerIndustry_dictText" ></a-input>
+<!--                                            <a-select-->
+<!--                                                    v-model="model.customerIndustry"-->
+<!--                                                    placeholder="请选择客户行业"-->
+<!--                                                    :allowClear="true"-->
+<!--                                            >-->
+<!--                                                <a-select-option :value="item.id" v-for="(item,index) in customerIndustryList" :key="index">{{ item.itemText }}</a-select-option>-->
+<!--                                            </a-select>-->
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="累计入住天数" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="email">
+                                            <a-input disabled="disabled" v-model="otherModel.email" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="累计NoShow次数" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="email">
+                                            <a-input disabled="disabled" v-model="otherModel.email" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="累计取消预计" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="email">
+                                            <a-input disabled="disabled" v-model="otherModel.email" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="同类客户排名" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="email">
+                                            <a-input disabled="disabled" v-model="otherModel.email" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="未结算佣金" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="email">
+                                            <a-input disabled="disabled" v-model="otherModel.email" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="已结算佣金" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="email">
+                                            <a-input disabled="disabled" v-model="otherModel.email" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+
+                                    <a-col :span="8">
+                                        <a-form-model-item label="记账限额" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="bookkeeping">
+                                            <a-input-number style="width: 100%;margin: auto" v-model="model.bookkeeping" :min="0" :precision="2" placeholder="请输入记账限额" />
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item label="备注" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="remark">
+                                            <a-input v-model="model.remarks" placeholder="请输入备注" ></a-input>
+                                        </a-form-model-item>
+                                    </a-col>
+                                    <a-col :span="8">
+                                        <a-form-model-item >
+                                            <a-checkbox @change="onReceptionChange" v-model="model.commissionValue">
+                                                是否返佣
+                                            </a-checkbox>
+                                            <a-checkbox @change="onReceptionChange" v-model="model.receptionValue">
+                                                前台是否查询
+                                            </a-checkbox>
+                                            <a-checkbox @change="onReceptionChange" v-model="model.bookkStatusValue">
+                                                不允许该单位记账
+                                            </a-checkbox>
+                                        </a-form-model-item>
+                                    </a-col>
+                                </a-row>
+                                <div style="width:100%;display: flex;">
+                                    <a-button type="primary" @click="submitOtherData" style="margin: auto;">保存</a-button>
+                                </div>
+                            </a-form-model>
+                        </j-form-container>
+                    </a-spin>
+                </div>
+                <div v-if="activeMneu == 2">
+                    <a-card :bordered="false">
+                        <!-- 查询区域 -->
+                        <div class="table-page-search-wrapper">
+                            <a-form layout="inline" @keyup.enter.native="searchQuery">
+                                <a-row :gutter="24">
+                                </a-row>
+                            </a-form>
+                        </div>
+                        <!-- 查询区域-END -->
+
+                        <!-- 操作按钮区域 -->
+                        <div class="table-operator">
+                            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--                            <a-button type="primary" icon="download" @click="handleExportXls('协议单位-客户协议')">导出</a-button>-->
+<!--                            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--                                <a-button type="primary" icon="import">导入</a-button>-->
+<!--                            </a-upload>-->
+<!--                            &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--                            <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+                            <a-dropdown v-if="selectedRowKeys.length > 0">
+<!--                                <a-menu slot="overlay">-->
+<!--                                    <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--                                </a-menu>-->
+<!--                                <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+                                <a-button @click="batchDel" type="danger" icon="delete">批量删除</a-button>
+                            </a-dropdown>
+                        </div>
+
+                        <!-- table区域-begin -->
+                        <div>
+                            <a-table
+                                    ref="table"
+                                    size="middle"
+                                    :scroll="{x:true}"
+                                    bordered
+                                    rowKey="id"
+                                    :columns="columnsCustomer"
+                                    :dataSource="dataSource"
+                                    :pagination="ipagination"
+                                    :loading="loading"
+                                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                                    class="j-table-force-nowrap"
+                                    @change="handleTableChange">
+
+                                <template slot="htmlSlot" slot-scope="text">
+                                    <div v-html="text"></div>
+                                </template>
+                                <template slot="priceSlot" slot-scope="text, record">
+                                    <a-button type="primary">
+                                        查看
+                                    </a-button>
+                                </template>
+                                <template slot="imgSlot" slot-scope="text,record">
+                                    <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+                                    <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+                                </template>
+                                <template slot="fileSlot" slot-scope="text">
+                                    <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+                                    <a-button
+                                            v-else
+                                            :ghost="true"
+                                            type="primary"
+                                            icon="download"
+                                            size="small"
+                                            @click="downloadFile(text)">
+                                        下载
+                                    </a-button>
+                                </template>
+                                <span slot="action" slot-scope="text, record">
+                                    <a @click="handleEdit(record)">编辑</a>
+                                    <a-divider type="vertical" />
+                                    <a-dropdown>
+                                        <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+                                        <a-menu slot="overlay">
+                                            <a-menu-item>
+                                            <a @click="handleDetail(record)">详情</a>
+                                          </a-menu-item>
+                                          <a-menu-item>
+                                              <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                                                  <a>删除</a>
+                                              </a-popconfirm>
+                                          </a-menu-item>
+                                        </a-menu>
+                                      </a-dropdown>
+                                </span>
+                            </a-table>
+                        </div>
+
+<!--                        <bus-market-agreement-customer-modal ref="modalForm" @ok="modalFormOk"></bus-market-agreement-customer-modal>-->
+                    </a-card>
+                </div>
+                <div v-if="activeMneu == 3">
+                    联系人
+                </div>
+                <div v-if="activeMneu == 4">
+                    佣金
+                </div>
+                <div v-if="activeMneu == 5">
+                    入住记录
+                </div>
+            </div>
+        </div>
+
+    </div>
+</template>
+
+<script>
+    import { httpAction, getAction } from '@/api/manage'
+    import '@/assets/less/TableExpand.less'
+    import { mixinDevice } from '@/utils/mixin'
+    import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+    export default {
+        name: 'agreementUnitDetailForm',
+        mixins:[JeecgListMixin, mixinDevice],
+        computed: {
+            formDisabled(){
+                return this.disabled
+            },
+        },
+        data() {
+            return {
+                collapsed: false,
+                activeMneu: 1,
+                dateList: ['今天', '昨日', '本周', '更多'],
+                activeIndex: 0,
+                model:{
+                    receptionValue:false,
+                    commissionValue:false,
+                    bookkStatusValue:false,
+                },
+                otherModel:{
+
+                },
+                labelCol: {
+                    xs: { span: 24 },
+                    sm: { span: 2 },
+                },
+                wrapperCol: {
+                    xs: { span: 24 },
+                    sm: { span: 20 },
+                },
+                labelCol1: {
+                    xs: { span: 24 },
+                    sm: { span: 8 },
+                },
+                wrapperCol1: {
+                    xs: { span: 24 },
+                    sm: { span: 14 },
+                },
+                confirmLoading: false,
+                validatorRules:{
+                    customerName: [
+                        { required: true, message: '请输入客户全称!'},
+                    ],
+                    customerShortName: [
+                        { required: true, message: '请输入客户简称!'},
+                    ],
+                    systemType_dictText: [
+                        { required: true, message: '请选择系统类型!'},
+                    ],
+                    customerNo: [
+                        { required: true, message: '请输入客户编号!'},
+                    ],
+                    contactsName: [
+                        { required: true, message: '请输入主联系人!'},
+                    ],
+                    customerType_dictText: [
+                        { required: true, message: '请选择客户类型!'},
+                    ],
+                    sellerId_dictText: [
+                        { required: true, message: '请选择销售人员!'},
+                    ],
+                    phone: [
+                        { required: true, message: '请输入手机号!'},
+                    ],
+                    status_dictText: [
+                        { required: true, message: '请选择状态!'},
+                    ],
+                    customerSource_dictText: [
+                        { required: true, message: '请选择客户来源!'},
+                    ],
+                    customerIndustry_dictText: [
+                        { required: true, message: '请选择客户行业!'},
+                    ],
+                },
+                url: {
+                    editOther: "/business/busMarketAgreementUnit/editOther",
+                    queryById: "/business/busMarketAgreementUnit/queryById",
+                    query_saleList: "/business/busSalesPerson/queryList",
+                    list: "/business/busMarketAgreementCustomer/list",
+                    delete: "/business/busMarketAgreementCustomer/delete",
+                    deleteBatch: "/business/busMarketAgreementCustomer/deleteBatch",
+                },
+                columnsCustomer: [
+                    {
+                        title:'协议类型',
+                        align:"center",
+                        dataIndex: 'type'
+                    },
+                    {
+                        title:'协议主题',
+                        align:"center",
+                        dataIndex: 'name'
+                    },
+                    {
+                        title:'客户签约人',
+                        align:"center",
+                        dataIndex: 'customerSignatory'
+                    },
+                    {
+                        title:'本司签约人',
+                        align:"center",
+                        dataIndex: 'companySignatory'
+                    },
+                    {
+                        title:'协议单号',
+                        align:"center",
+                        dataIndex: 'number'
+                    },
+                    {
+                        title:'签约时间',
+                        align:"center",
+                        dataIndex: 'signTime',
+                        customRender:function (text) {
+                            return !text?"":(text.length>10?text.substr(0,10):text)
+                        }
+                    },
+                    {
+                        title:'折扣值',
+                        align:"center",
+                        dataIndex: 'discount'
+                    },
+                    {
+                        title:'更新时间',
+                        align:"center",
+                        dataIndex: 'updateTime',
+                        customRender:function (text) {
+                            return !text?"":(text.length>10?text.substr(0,10):text)
+                        }
+                    },
+                    {
+                        title:'协议房价',
+                        align:"center",
+                        dataIndex: 'id',
+                        scopedSlots: { customRender: "priceSlot" },
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align:"center",
+                        fixed:"right",
+                        width:147,
+                        scopedSlots: { customRender: 'action' }
+                    }
+                ],
+            };
+        },
+        created() {
+            // this.getSuperFieldList();
+        },
+        computed: {
+            importExcelUrl: function(){
+                // return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            },
+        },
+        methods: {
+            add() {
+                this.edit(this.modelDefault);
+            },
+            edit(record) {
+                this.model = Object.assign({}, record);
+                this.visible = true;
+
+                this.model.receptionValue = record.reception == 1?true:false;
+                this.model.commissionValue = record.commission == 1?true:false;
+                this.model.bookkStatusValue = record.bookkStatus == 1?true:false;
+            },
+            toggleCollapsed() {
+                this.collapsed = !this.collapsed;
+            },
+            handleMneuClick(e) {
+                console.log('click', e);
+                console.log('click', e.key);
+                this.activeMneu = e.key;
+            },
+            handleClick(index) {
+                this.activeIndex = index
+                // this.searchQuery()
+                console.log(index)
+                switch (index) {
+                    case 0:
+                        console.log('今天')
+                        break;
+                    case 1:
+                        console.log('昨天')
+                        break;
+                    case 2:
+                        console.log('本周')
+                        break;
+                }
+            },
+            onChange(date, dateString) {
+                console.log(date, dateString)
+            },
+            onReceptionChange(e){
+                // console.log(e)
+                //
+                // console.log(this.model)
+                // var newModel = this.model
+                // newModel.receptionValue = e.target.checked
+                // newModel.reception = 1
+                // this.$nextTick(() => {
+                //     this.$set(this.model, 'receptionValue', e.target.checked)
+                //     this.$set(this.model, 'reception', e.target.checked?1:0)
+                // })
+                this.$forceUpdate();
+            },
+            submitOtherData(){
+                var that = this;
+                that.confirmLoading = true;
+                let httpurl = this.url.editOther;
+                let method = 'put';
+                var param = {
+                    id:that.model.id,
+                    bookkeeping:that.model.bookkeeping,
+                    remarks:that.model.remarks,
+                    reception:that.model.receptionValue?1:0,
+                    commission:that.model.commissionValue?1:0,
+                    bookkStatus:that.model.bookkStatusValue?1:0,
+                };
+                console.log(param);
+                httpAction(httpurl,param,method).then((res)=>{
+                    if(res.success){
+                        that.$message.success(res.message);
+                        that.$emit('ok');
+                    }else{
+                        that.$message.warning(res.message);
+                    }
+                }).finally(() => {
+                    that.confirmLoading = false;
+                })
+            },
+            initDictConfig(){
+            },
+            getSuperFieldList(){
+                let fieldList=[];
+                fieldList.push({type:'string',value:'tenantId',text:'关联租户'})
+                fieldList.push({type:'string',value:'agreementId',text:'关联协议'})
+                fieldList.push({type:'string',value:'hotelId',text:'关联酒店'})
+                fieldList.push({type:'string',value:'name',text:'协议主题'})
+                fieldList.push({type:'string',value:'type',text:'协议类型'})
+                fieldList.push({type:'string',value:'number',text:'协议单号'})
+                fieldList.push({type:'date',value:'signTime',text:'签约时间'})
+                fieldList.push({type:'date',value:'effective',text:'有效期'})
+                fieldList.push({type:'int',value:'secrecy',text:'佣金信息保密'})
+                fieldList.push({type:'string',value:'customerSignatory',text:'客户签约人'})
+                fieldList.push({type:'string',value:'companySignatory',text:'本司签约人'})
+                fieldList.push({type:'string',value:'content',text:'内容'})
+                fieldList.push({type:'string',value:'remarks',text:'备注'})
+                fieldList.push({type:'int',value:'delFlag',text:'删除状态(0-正常,1-已删除)'})
+                this.superFieldList = fieldList
+            }
+        },
+    }
+</script>
+
+<style scoped>
+    .container{
+        display: flex;
+        flex-direction: row;
+    }
+    .right{
+        flex: 3;
+    }
+    .content{
+        width: 100%;
+        margin: auto;
+        margin-top: 60px;
+    }
+    .item-content{
+        display: flex;
+        flex-direction: row;
+        /*align-items: center;*/
+        /*justify-items: center;*/
+    }
+    .list-container {
+        display: grid;
+        grid-template-columns: 1fr 1fr 1fr 1fr;
+        border: solid 1px #d9d9d9;
+        width: 260px;
+        border-radius: 5px;
+        margin-right: 10px;
+        overflow: hidden;
+        /*height: 32px;*/
+        /*line-height: 32px;*/
+    }
+
+    .list-item {
+        padding: 0px;
+        border-right: solid 1px #d9d9d9;
+        cursor: pointer;
+        text-align: center;
+    }
+
+    .list-item.active {
+        background-color: #1890ff;
+        color: #fff;
+    }
+</style>

+ 62 - 0
src/views/markets/modules/agreementUnit/agreementUnitDetailModal.vue

@@ -0,0 +1,62 @@
+<template>
+    <j-modal
+            :title="title"
+            :width="width"
+            :visible="visible"
+            switchFullscreen
+            :footer="null"
+            @ok="handleOk"
+            :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+            @cancel="handleCancel"
+            cancelText="关闭">
+        <agreement-unit-detail-form ref="realDetailForm" @ok="submitCallback" :disabled="disableSubmit"></agreement-unit-detail-form>
+    </j-modal>
+</template>
+
+<script>
+
+    import agreementUnitDetailForm from './agreementUnitDetailForm'
+    export default {
+        name: 'agreementUnitDetailModal',
+        components: {
+            agreementUnitDetailForm
+        },
+        data () {
+            return {
+                title:'',
+                width:1400,
+                visible: false,
+                disableSubmit: false
+            }
+        },
+        methods: {
+            add () {
+                this.visible=true
+                this.$nextTick(()=>{
+                    this.$refs.realDetailForm.add();
+                })
+            },
+            edit (record) {
+                this.visible=true
+                this.$nextTick(()=>{
+                    this.$refs.realDetailForm.edit(record);
+                })
+            },
+            close () {
+                this.$emit('close');
+                this.visible = false;
+            },
+            handleOk () {
+                this.$refs.realDetailForm.submitForm();
+            },
+            submitCallback(){
+                this.$emit('ok');
+                this.visible = false;
+            },
+            handleCancel () {
+                this.close()
+            }
+        }
+    }
+</script>
+

+ 3 - 3
src/views/markets/modules/agreementUnit/agreementUnitForm.vue

@@ -190,6 +190,9 @@
             customerType: [
                 { required: true, message: '请选择客户类型!'},
             ],
+            sellerId: [
+                { required: true, message: '请选择销售人员!'},
+            ],
             phone: [
                 { required: true, message: '请输入手机号!'},
             ],
@@ -202,9 +205,6 @@
             customerIndustry: [
                 { required: true, message: '请选择客户行业!'},
             ],
-           hotelId: [
-              { required: true, message: '请输入关联酒店!'},
-           ],
         },
         url: {
           add: "/business/busMarketAgreementUnit/add",