始宁农业管理后台：农户管理

htmldev/shiningManage/src/mixin/page.js

@@ -33,6 +33,14 @@ export default {
       })
       this.tableLoading = false
       if (this.tableData && code === 200 && data && (Array.isArray(data) || Array.isArray(data.data) || Array.isArray(data.list))) {
+        if (this.tableUrl === '/api/admin/shop/apply/list') {
+          data.list = data.list.map(item => {
+            return {
+              ...item,
+              shop_address: item.shop_address ? JSON.parse(item.shop_address) : {}
+            }
+          })
+        }
         this.tableData = data.data || data.list || data
         this.totalCount = Number(data.total || data.count)
 

htmldev/shiningManage/src/views/businessManage/toBeReviewed/details.vue

@@ -7,38 +7,45 @@
       :close-on-click-modal="false"
       top="50px">
       <el-form
-        ref="formOfForbid"
+        ref="form"
         :rules="formRules"
         :model="form"
         label-width="120px">
         <el-form-item
           label="审核："
-          prop="crash_status">
-          <el-radio-group v-model="form.crash_status">
+          prop="shop_status"
+          :rules="formRules.select">
+          <el-radio-group
+            v-model="form.shop_status">
             <el-radio
               :label="item.value"
-              v-for="item in statusOptions"
+              v-for="item in reviewStatus"
               :key="item.value">{{ item.name }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item
           label="备注："
-          prop="user_ids"
-          :rules="formRules.required">
+          prop="shop_check_remark">
           <el-input
             type="textarea"
             :rows="6"
-            placeholder="请输入未通过理由"
-            v-model="form.user_ids"
+            placeholder="请输入备注"
+            v-model="form.shop_check_remark"
             maxlength="1000"
             show-word-limit>
           </el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" style="text-align: center">
-        <el-button @click="dialog = false">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit" :disabled="booLock">保存</el-button>
+        <el-button
+          @click="dialog = false">取 消
+        </el-button>
+        <el-button
+          type="primary"
+          @click="handleSubmit"
+          :disabled="booLock">保存
+        </el-button>
       </div>
     </el-dialog>
   </div>
@@ -62,14 +69,15 @@ export default {
     return {
       dialog: !!this.value,
       form: {
-        user_ids: ''
+        // 'shop_id': 1, // 店铺ID
+        'shop_check_remark': '', // 审核备注
+        'shop_status': '1' // 状态(1通过2未通过)
       },
       booLock: false
     }
   },
   computed: {
-    paymentInformationReviewStatus() {
-      // return this.$store.state.common.paymentInformationReviewStatus
+    reviewStatus() {
       return [
         {
           name: '通过',
@@ -80,33 +88,18 @@ export default {
           value: '2'
         }
       ]
-    },
-    statusOptions() {
-      return this.paymentInformationReviewStatus
     }
   },
   methods: {
     async handleSubmit() {
-      this.$refs.formOfForbid.validate(async valid => {
+      this.$refs.form.validate(async valid => {
         if (valid) {
           this.booLock = true
-          const postData = {
-            user_ids: this.form.user_ids
-          }
-          const data = await this.$fetch('/v1/user/special/account/open', postData)
+          const data = await this.$fetch('/api/admin/shop/check', this.form)
           if (data.code === 200) {
             this.dialog = false
-            this.$message.success('添加成功')
+            this.$message.success('已审核')
             this.$emit('success')
-          } else if (data.code === 500) {
-            // 新增失败
-            this.$alert(data.msg, '提示', {
-              confirmButtonText: '确定',
-              type: 'error',
-              callback: action => {
-
-              }
-            })
           }
           this.booLock = false
         }
@@ -114,6 +107,9 @@ export default {
     }
   },
   mounted() {
+    if (this.exData.id) {
+      this.$set(this.form, 'shop_id', this.exData.id)
+    }
   },
   watch: {
     dialog(val) {

htmldev/shiningManage/src/views/businessManage/toBeReviewed/index.vue

@@ -1,15 +1,20 @@
 <template>
   <div class="padding-20">
     <div class="search-box">
-      <el-form ref="form" :inline="true" :model="searchForm" clearable label-width="100px" class="mt-10">
+      <el-form
+        ref="form"
+        :inline="true"
+        :model="searchForm"
+        clearable
+        label-width="80px"
+        class="mt-10">
         <el-form-item label="姓名:">
-          <el-input v-model="searchForm.department_name" placeholder="请输入姓名" clearable></el-input>
+          <el-input v-model="searchForm.user_name" placeholder="请输入姓名" clearable></el-input>
         </el-form-item>
-        <el-form-item label="手机号:">
-          <el-input v-model="searchForm.department_name" placeholder="请输入手机号后4位" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="身份证:">
-          <el-input v-model="searchForm.department_name" placeholder="请输入身份证后6位" clearable></el-input>
+        <el-form-item
+          class="key-word"
+          label="关键词:">
+          <el-input v-model="searchForm.key_word" placeholder="请输入手机号后4位或身份证后6位" clearable></el-input>
         </el-form-item>
         <el-form-item label="申请时间:">
           <el-date-picker
@@ -23,7 +28,11 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item class="ml-10">
-          <el-button icon="el-icon-search" type="primary" @click="searchSubmit">查询</el-button>
+          <el-button
+            icon="el-icon-search"
+            type="primary"
+            @click="searchSubmit">查询
+          </el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -35,24 +44,32 @@
       class="marginT-10 order-table"
       border
       :max-height="vheight">
-      <el-table-column label="农户姓名" prop="id"></el-table-column>
-      <el-table-column label="身份证号" prop="created_at"></el-table-column>
-      <el-table-column label="手机号" prop="department_name"></el-table-column>
-      <el-table-column label="村信息" prop="department_desc" show-overflow-tooltip></el-table-column>
-      <el-table-column label="微信号" prop="department_project_name" show-overflow-tooltip></el-table-column>
+      <el-table-column label="农户姓名" prop="user_name"></el-table-column>
+      <el-table-column label="身份证号" prop="user_card"></el-table-column>
+      <el-table-column label="手机号" prop="shop_phone"></el-table-column>
+      <el-table-column label="村信息" prop="country_msg" show-overflow-tooltip></el-table-column>
+      <el-table-column label="微信号" prop="user_wechat_code" show-overflow-tooltip></el-table-column>
       <el-table-column label="个人二维码" prop="department_project_name">
         <template slot-scope="scope">
           <el-image
             style="display: block;width: 80px; height: 80px;font-size: 0;"
-            :src="scope.row.element_img_url"
-            :preview-src-list="[]">
+            :src="scope.row.user_code_url"
+            :preview-src-list="[scope.row.user_code_url]">
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column label="详细地址" prop="department_project_name" show-overflow-tooltip></el-table-column>
-      <el-table-column label="备注" prop="department_project_name" show-overflow-tooltip></el-table-column>
-      <el-table-column label="申请时间" prop="department_project_name"></el-table-column>
-      <el-table-column label="状态" prop="department_project_name"></el-table-column>
+      <el-table-column label="详细地址" prop="department_project_name" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.shop_address.address_name }}{{ scope.row.shop_address.name }}
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" prop="shop_remark" show-overflow-tooltip></el-table-column>
+      <el-table-column label="申请时间" prop="created_at"></el-table-column>
+      <el-table-column label="状态" prop="shop_status">
+        <template slot-scope="scope">
+          {{ getShopStatusText(scope.row.shop_status) }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" @click="edit(scope.row)">操作</el-button>
@@ -99,27 +116,35 @@ export default {
       tableUrl: '/api/admin/shop/apply/list'
     }
   },
+  computed: {
+    arrShopStatus() {
+      return [
+        {
+          name: '审核中',
+          value: '0'
+        },
+        {
+          name: '审核通过',
+          value: '1'
+        },
+        {
+          name: '未通过',
+          value: '2'
+        }
+      ]
+    }
+  },
   methods: {
-    add() {
-      this.detailsDialog.exData = {}
-      this.detailsDialog.show = true
-    },
     edit(row) {
       this.detailsDialog.exData = row
       this.detailsDialog.show = true
     },
-    del(row) {
-      this.$confirm('确定要删除吗', '确认', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(async () => {
-        const data = await this.$fetch('/api/auth/department/del', { id: row.id })
-        if (data.code === 200) {
-          this.$message.success('删除成功')
-          this.init()
-        }
-      }).catch(() => {})
+    getShopStatusText(val) {
+      const index = this.arrShopStatus.findIndex(item => item.value === val + '')
+      if (index > -1) {
+        return this.arrShopStatus[index].name
+      }
+      return ''
     }
   },
   mounted() {
@@ -129,4 +154,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.key-word {
+  ::v-deep .el-form-item__content {
+    width: 260px;
+  }
+}
 </style>