Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online

src/views/configManage/memberRetailRegion/index.vue

@@ -25,22 +25,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+
-            <el-form-item label="签呈来源">
-              <el-select
-                v-model="queryParams.source"
-                clearable
-                :placeholder="'请选择'"
-              >
-                <el-option
-                  v-for="item in sourceList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('收益区域')" prop="accountStatus">
               <el-cascader
@@ -103,13 +88,13 @@
     <div class="main">
       <div class="maintop">
         <div class="mainbtn">
-          <!-- <el-button
+          <el-button
             v-hasButtons="['memberRetailRegionAdd']"
             size="small"
             style="background-color: #48b2fd"
             class="thebtn1"
-            @click="addRules"
+            @click="handleAdd"
-          >{{ '添加' }}</el-button> -->
+          >{{ '添加' }}</el-button>
           <el-button
             v-hasButtons="['memberRetailRegionExport']"
             size="small"
@@ -258,7 +243,7 @@
             @change="flChange1"
           />
         </el-form-item>
-        <el-form-item :label="$t('生效结束时间')" prop="effectiveEndDate">
+        <!-- <el-form-item :label="$t('生效结束时间')" prop="effectiveEndDate">
           <el-date-picker
             v-model="table.effectiveEndDate"
             :picker-options="pickerOptions"
@@ -266,7 +251,7 @@
             type="datetime"
             @change="changeTime3"
           />
-        </el-form-item>
+        </el-form-item> -->
         <div style="padding-top: 30px; display: flex; justify-content: center">
           <el-button
             type="text"
@@ -453,15 +438,12 @@ export default {
         this.sourceList = res.data
       })
     },
-    addRules() {
+    handleAdd() {
       this.types = 1
       this.ruleShow = true
       this.title = '添加'
     },
-    submitBtn() {
+
-      // 添加角色
-      this.ruleSubmit()
-    },
     updateShow(item) {
       this.types = 2
       this.title = '修改'
@@ -496,7 +478,7 @@ export default {
         })
       })
     },
-    ruleSubmit() {
+    submitBtn() {
       const datas = {}
       const that = this
       this.$refs['forms'].validate((valid) => {
@@ -506,9 +488,16 @@ export default {
           if (this.types === 1) {
             datas.pkMember = this.table.pkMember
             datas.province = this.table.addressd[0]
-            datas.city = this.table.addressd[1]
+            datas.city = this.table.addressd[1] || 0
-            datas.county = this.table.addressd[2]
+            datas.county = this.table.addressd[2] || 0
             datas.effectiveEndDate = this.table.effectiveEndDate
+            let type = 1
+            if (datas.city && !datas.county) {
+              type = 2
+            } else if (datas.city && datas.county) {
+              type = 3
+            }
+            datas.type = type
             con.retailRegionAdd(datas).then((res) => {
               if (res.code === 200) {
                 Message({
@@ -528,9 +517,16 @@ export default {
             datas.pkMember = this.table.pkMember
             datas.pkId = this.pkIds
             datas.province = this.table.addressd[0]
-            datas.city = this.table.addressd[1]
+            datas.city = this.table.addressd[1] || 0
-            datas.county = this.table.addressd[2]
+            datas.county = this.table.addressd[2] || 0
             datas.effectiveEndDate = this.table.effectiveEndDate
+            let type = 1
+            if (datas.city && !datas.county) {
+              type = 2
+            } else if (datas.city && datas.county) {
+              type = 3
+            }
+            datas.type = type
             con.retailRegionUpdate(datas).then((res) => {
               if (res.code === 200) {
                 Message({