标协会员修改、会议新增页面

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -1,153 +1,245 @@
 <template>
   <a-card :bordered="false">
+    <section class="project-base-info-title">
+      <span @click="handleReback" class="back"><a-icon type="left"/></span>
+      <h2 class="title">{{ title }}</h2>
+    </section>
+    <div class="line"></div>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
+        <!-- 会议信息begin-->
+        <div class="item-title">会议信息</div>
+        <a-row :gutter="24">
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入会议名称"
+                       :maxLength='50'
+                       @change="event => event.target.value = event.target.value.trim()"
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag style="width: 100%" dict-code="meeting_type" placeholder="请选择会议类型"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+          <!--          <a-col :xl="6"  :md="8" :sm="24">-->
+          <!--            <a-form-item label="标协会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--              <j-dict-select-tag style="width: 100%" placeholder="请选择标协会议类型"></j-dict-select-tag>-->
+          <!--            </a-form-item>-->
+          <!--          </a-col>-->
+          <a-col :xl="12" :md="12" :sm="24">
+            <a-form-item label="召开时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                  format="YYYY-MM-DD HH:mm:00"
+                  :show-time="{ format: 'HH:mm' }"
+                  v-decorator="['convokeTime',validatorRules.convokeTime]"
+                  :trigger-change="true"
+                  style="width: 100%"/>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入会议名称"
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-        </a-form-item>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-year-date placeholder="请选择年份" style="width: 100%"></j-year-date>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="预计参加人数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入预计参加人数"
+                       @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag placeholder="请选择会议类型"></j-dict-select-tag>
-        </a-form-item>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="会议通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload></j-upload>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="标协会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag placeholder="请选择标协会议类型"></j-dict-select-tag>
-        </a-form-item>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="报名截止时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择报名截止时间" style="width: 100%;" v-decorator="['beginDate']" :trigger-change="true"
+                      date-format="YYYY-MM-DD"/>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="召开时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-range-picker
-              format="YYYY-MM-DD HH:mm:00"
-              :show-time="{ format: 'HH:mm' }"
-              v-decorator="['convokeTime',validatorRules.convokeTime]"
-              :trigger-change="true"
-              style="width: 100%"/>
-        </a-form-item>
+          <a-col :xl="12" :md="8" :sm="24">
+            <a-form-item label="会议内容" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+              <a-textarea
+                  placeholder="请输入会议内容"
+                  :auto-size="{ minRows: 3, maxRows: 6 }"
+                  v-decorator="['']"
+                  :maxLength='200'
+                  @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-year-date placeholder="请选择年份" style="width: 100%"></j-year-date>
-        </a-form-item>
+        </a-row>
 
-        <a-form-item label="注册签到" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-range-picker
-              format="YYYY-MM-DD HH:mm:00"
-              :show-time="{ format: 'HH:mm' }"
-              v-decorator="['convokeTime',validatorRules.convokeTime]"
-              :trigger-change="true"
-              style="width: 100%"/>
-        </a-form-item>
+        <a-row :gutter="24">
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="召开地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-area-linkage
+                  type="cascader"
+                  placeholder="请选择省市"></j-area-linkage>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入详细地址"
+                       @change="event => event.target.value = event.target.value.trim()"
+                       :maxLength='50'
+              ></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--会议信息end-->
 
-        <a-form-item label="召开地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-year-date placeholder="请选择召开地点" style="width: 100%"></j-year-date>
-        </a-form-item>
 
-        <a-form-item label="预计参加人数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入预计参加人数"
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-        </a-form-item>
+        <!--        <a-form-item label="注册签到" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--          <a-range-picker-->
+        <!--              format="YYYY-MM-DD HH:mm:00"-->
+        <!--              :show-time="{ format: 'HH:mm' }"-->
+        <!--              v-decorator="['convokeTime',validatorRules.convokeTime]"-->
+        <!--              :trigger-change="true"-->
+        <!--              style="width: 100%"/>-->
+        <!--        </a-form-item>-->
 
-        <a-form-item label="会议通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-upload></j-upload>
-        </a-form-item>
+        <!--邀请码begin-->
+        <div class="item-title">邀请码</div>
+        <a-row :gutter="24">
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="VIP" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入邀请码"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="会议内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-textarea
-              placeholder="请输入会议内容"
-              :auto-size="{ minRows: 3, maxRows: 6 }"
-              v-decorator="['remarks']"
-              :maxLength='200'
-              @change="e => {e.target.value = (e.target.value + '').trim()}"/>
-        </a-form-item>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="演讲嘉宾" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入邀请码"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="报名截至时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-date placeholder="请选择报名截至时间"></j-date>
-        </a-form-item>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="特邀嘉宾" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入邀请码"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="VIP" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入邀请码"
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="合作伙伴" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入邀请码"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--邀请码end-->
 
-        <a-form-item label="演讲嘉宾" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入邀请码"
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
+        <!--会议费用begin-->
+        <div class="item-title">会议费用</div>
+        <a-row :gutter="24">
 
-        <a-form-item label="特邀嘉宾" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入邀请码"
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
+          <a-col :xl="8" :md="8" :sm="24">
+            <a-form-item label="会议费用" :labelCol="labelCol" :wrapperCol="{ xs: {span: 24},sm: {span: 16}}">
+              <a-input placeholder="请输入会议费用"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+              <span class="yuan">元/人</span>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="8" :md="8" :sm="24">
+            <a-form-item label="会议费用(标协会员)" :labelCol="labelCol" :wrapperCol="{ xs: {span: 24},sm: {span: 16}}">
+              <a-input placeholder="请输入会议费用"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+              <span class="yuan">元/人</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--会议费用end-->
 
-        <a-form-item label="合作伙伴" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入邀请码"
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
+        <!--联系方式begin-->
+        <div class="item-title">联系方式</div>
+        <a-row :gutter="24">
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="会议负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <select-principal placeholder="请选择会议负责人"
+                                v-decorator="['directorId',validatorRules.directorId]"></select-principal>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入手机号"
+                       disabled
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="会议费用" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入会议费用"
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="酒店名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入酒店名称"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
 
-        <a-form-item label="会议费用(标协会员)" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入会议费用"
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
 
-        <a-form-item label="会议负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <select-principal placeholder="请选择会议负责人"  v-decorator="['directorId',validatorRules.directorId]"></select-principal>
-        </a-form-item>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="酒店地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入酒店地址"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
 
-        <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入手机号"
-                   disabled
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
+        <a-row :gutter="24">
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item label="酒店联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入酒店联系人"
+                       :maxLength='50'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :md="8" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入联系人手机号"
+                       :maxLength='11'
+                       v-decorator="[ '']"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
 
-        <a-form-item label="酒店联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入手机号"
-                   disabled
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
+        <a-row :gutter="24">
+          <a-col :xl="12" :md="8" :sm="24">
+            <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+              <a-textarea
+                  placeholder="请输入备注"
+                  :auto-size="{ minRows: 3, maxRows: 6 }"
+                  v-decorator="['']"
+                  :maxLength='200'
+                  @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
 
-        <a-form-item label="联系人手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入联系人手机号"
-                   disabled
-                   :maxLength='50'
-                   v-decorator="[ 'chargeStandard']"></a-input>
-          <span>元/人</span>
-        </a-form-item>
+        <!--联系方式end-->
 
-        <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-textarea
-              placeholder="请输入备注"
-              :auto-size="{ minRows: 3, maxRows: 6 }"
-              v-decorator="['remarks']"
-              :maxLength='200'
-              @change="e => {e.target.value = (e.target.value + '').trim()}"/>
-        </a-form-item>
       </a-form>
-      <div>
-        <a-button type="primary" @click="handleOk">发布</a-button>
-        <a-button type="primary" @click="handleCancel">取消</a-button>
+      <div class="footer">
+        <a-button type="primary" @click="handleOk" class="submit">发布</a-button>
+        <a-button @click="handleCancel">取消</a-button>
       </div>
     </a-spin>
   </a-card>
@@ -157,8 +249,9 @@
 import JDictSelectTag from "@comp/dict/JDictSelectTag";
 import JYearDate from "@comp/jero/JYearDate";
 import JUpload from "@comp/jero/JUpload";
-import JDate from "@comp/jero/JDate";
+import JDate from "@comp/tools/JDate";
 import SelectPrincipal from "@comp/company/SelectPrincipal";
+import JAreaLinkage from "@comp/jero/JAreaLinkagePca";
 
 export default {
   name: "AddOrDetailMeet",
@@ -167,12 +260,14 @@ export default {
     JYearDate,
     JUpload,
     JDate,
-    SelectPrincipal
+    SelectPrincipal,
+    JAreaLinkage
   },
   data() {
     return {
       description: '新增会议',
-      confirmLoading:false,
+      title: '新增会议',
+      confirmLoading: false,
       visible: false,
       form: this.$form.createForm(this),
       model: {},
@@ -192,28 +287,96 @@ export default {
         xs: {span: 24},
         sm: {span: 21}
       },
-      validatorRules:{
-
-      }
+      validatorRules: {}
     }
   },
-  methods:{
+  methods: {
     /*
     *  发布会议
     * */
-    handleOk(){
+    handleOk() {
       console.log('发布')
     },
     /*
     *  取消
     * */
-    handleCancel(){
+    handleCancel() {
       console.log('取消')
-    }
+    },
+    /*
+    * 返回上级
+    * */
+    handleReback() {
+      this.$router.go(-1)
+    },
   }
 }
 </script>
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+/deep/ .ant-card-body {
+  padding-top: 0;
+}
+
+.item-title {
+  padding-left: 40px;
+  box-sizing: border-box;
+  height: 46px;
+  line-height: 46px;
+  color: #333;
+  position: relative;
+  font-size: 16px;
+
+  &::before {
+    position: absolute;
+    content: "";
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background: #069f99;
+    top: 50%;
+    margin-top: -5px;
+    left: 15px;
+  }
+}
+
+/* 新建会议 */
+
+.project-base-info-title {
+  height: 50px;
+  line-height: 50px;
+  color: #666;
+
+  .back {
+    cursor: pointer;
+    font-size: 20px;
+    color: #666;
+  }
+
+  .title {
+    display: inline-block;
+    margin-left: 14px;
+    color: #666;
+  }
+}
+
+.line {
+  height: 1px;
+  background-color: #cccccc;
+  margin: 0 -24px;
+}
+
+.footer {
+  text-align: center;
+}
+
+.submit {
+  margin-right: 8px;
+}
+.yuan {
+  position: absolute;
+  right: -40px;
+}
 </style>

src/views/incomePayments/memberManage/SafeguardMemberList.vue

@@ -335,10 +335,4 @@ export default {
   cursor: pointer;
 }
 
-.btn-arrow-left {
-  border-radius: 50%;
-  color: #069f99;
-  border-color: #069f99;
-  margin-bottom: 10px;
-}
 </style>

src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue

@@ -97,83 +97,84 @@ export default {
         {
           title: '会员编号',
           align: "center",
-          dataIndex: 'fieldName',
+          dataIndex: 'memberNo',
         },
         {
           title: '企业名称',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'companyName',
           scopedSlots: {customRender: 'detail'}
         },
         {
           title: '会员类型',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'memberType',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '联系人',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'liaisonMan',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '邮箱',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'email',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '手机',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'mobile',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '会员状态',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'memberStatus',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '注册时间',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'registerTime',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '打包',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'pack',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '需要发票',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'invoiceRequirements',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '到账',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'inAccount',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '开票',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'makeInvoice',
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '邮寄',
           align: "center",
-          dataIndex: ' ',
+          dataIndex: 'mail',
           scopedSlots: {customRender: 'htmlSlot'}
         },
       ],
       url: {
-        list: "/sys/confusion/page",
+        list: "/member/tbMemberProjectSubitem/page",
+        exportXlsUrl: "/member/tbMemberProjectSubitem/exportXls",
       },
     }
   }

src/views/incomePayments/memberManage/StardsMemberProjectList.vue

@@ -89,12 +89,12 @@ export default {
         {
           title: '标协会员项目名称',
           align: "center",
-          dataIndex: 'fieldName',
+          dataIndex: 'projectName',
           scopedSlots:{customRender:'htmlSlot'}
         }
       ],
       url: {
-        list: "/sys/confusion/page",
+        list: "/member/tbMemberProject/page",
       },
     }
   },