始宁农业管理后台：农户管理-入驻申请

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

@@ -14,7 +14,7 @@
         <el-form-item
           prop="user_name"
           :rules="formRules.required"
-          label="农户姓名：">
+          label="单位及个人：">
           <el-input
             v-model="form.user_name"
             placeholder="请输入农户姓名"
@@ -69,7 +69,7 @@
         <el-form-item
           prop="country_msg"
           :rules="formRules.required"
-          label="村信息：">
+          label="行政村：">
           <el-input
             v-model="form.country_msg"
             placeholder="请输入村信息"
@@ -107,7 +107,7 @@
           size="small"
           prop="shop_address">
           <template #label>
-            地址：
+            经营地址：
             <el-button type="text" @click="jumpQQLBS">(获取维度经度)</el-button>
           </template>
           <el-input
@@ -144,7 +144,6 @@
             v-model="form.shop_remark">
           </el-input>
         </el-form-item>
-
         <el-form-item
           prop="company_name"
           label="企业名称：">
@@ -193,14 +192,6 @@
             v-model="form.company_jingying_fanwei">
           </el-input>
         </el-form-item>
-        <el-form-item
-          prop="company_address"
-          label="经营地址：">
-          <el-input
-            v-model="form.company_address"
-            placeholder="请输入经营地址"
-            clearable></el-input>
-        </el-form-item>
         <el-form-item
           prop="company_phone"
           label="公司电话：">
@@ -210,6 +201,48 @@
             clearable
             @input="form.company_phone = form.company_phone.replace(/[^\d]$/, '').replace(/^0/, '').replace(/(\d{11})(.*)/, '$1')"></el-input>
         </el-form-item>
+        <el-form-item
+          prop="company_hangye"
+          label="从事行业：">
+          <el-input
+            v-model="form.company_hangye"
+            placeholder="请输入从事行业"
+            clearable></el-input>
+        </el-form-item>
+        <el-form-item
+          prop="company_hangye"
+          label="基地规模：">
+          <el-input
+            v-model="form.company_hangye"
+            placeholder="请输入基地规模"
+            clearable></el-input>
+        </el-form-item>
+        <el-form-item
+          prop="company_hangye"
+          label="产品上市时间：">
+          <el-input
+            v-model="form.company_hangye"
+            placeholder="请输入产品上市时间"
+            clearable></el-input>
+        </el-form-item>
+        <el-form-item
+          prop="shop_img_url"
+          label="注册商标：">
+          <el-upload
+            :on-remove="(file) => {handleRemove(file, 'shop_img_url')}"
+            :on-success="(file) => {handleAvatarSuccess(file, 'shop_img_url')}"
+            :before-upload="beforeAvatarUpload"
+            :on-exceed="hadnleExceed"
+            :accept="'image/*'"
+            :limit="1"
+            :file-list="shop_img_url"
+            list-type="picture-card"
+            action="/api/upload/img"
+            multiple>
+            <i class="el-icon-plus"></i>
+            <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过5M</div>
+          </el-upload>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer text-center">
         <el-button @click="dialog = false">取 消</el-button>

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

@@ -24,8 +24,21 @@
             type="daterange"
             value-format="yyyy-MM-dd"
             start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          ></el-date-picker>
+            end-placeholder="结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="农户类型：">
+          <el-select
+            style="width: 100%;"
+            clearable
+            v-model="searchForm.shop_type"
+            placeholder="请选择农户类型">
+            <el-option
+              :label="item.name"
+              :value="item.value"
+              v-for="item in arrShopType"
+              :key="item.value"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item class="ml-10">
           <el-button
@@ -46,8 +59,8 @@
       :max-height="vheight">
       <el-table-column label="农户编号" prop="user_id"></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="user_card" min-width="140"></el-table-column>
+      <el-table-column label="手机号" prop="shop_phone" min-width="120"></el-table-column>
       <el-table-column label="村信息" prop="country_msg" show-overflow-tooltip></el-table-column>
       <el-table-column label="详细地址" prop="shop_address" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -60,7 +73,7 @@
       <el-table-column label="农户状态" prop="shop_status" show-overflow-tooltip>
         <template slot-scope="scope">{{ getShopStatusText(scope.row.shop_status) }}</template>
       </el-table-column>
-      <el-table-column label="入驻时间" prop="shop_check_at"></el-table-column>
+      <el-table-column label="入驻时间" prop="shop_check_at" min-width="140"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" @click="edit(scope.row)">操作</el-button>
@@ -108,19 +121,6 @@ export default {
     }
   },
   computed: {
-    // 店铺类型
-    shopType() {
-      return [
-        {
-          name: '普通',
-          value: '0'
-        },
-        {
-          name: '优秀',
-          value: '1'
-        }
-      ]
-    },
     arrShopStatus() {
       return [
         {
@@ -136,6 +136,9 @@ export default {
           value: '2'
         }
       ]
+    },
+    arrShopType() {
+      return this.$store.state.common.arrShopType
     }
   },
   methods: {
@@ -151,9 +154,9 @@ export default {
       return ''
     },
     getShopTypeText(val) {
-      const index = this.shopType.findIndex(item => item.value === val + '')
+      const index = this.arrShopType.findIndex(item => item.value === val || item.value === val + '')
       if (index > -1) {
-        return this.shopType[index].name
+        return this.arrShopType[index].name
       }
       return ''
     }

htmldev/shiningManage/src/views/productManage/recommend/details.vue

@@ -105,6 +105,16 @@ export default {
   mounted() {
     if (this.exData.id) {
       this.$set(this.form, 'id', this.exData.id)
+      let productRecommendLable = this.exData.product_recommend_lable
+      if (productRecommendLable) {
+        productRecommendLable = productRecommendLable.split(',')
+        this.$set(this.form, 'product_recommend_lable', productRecommendLable.map(item => {
+          return {
+            value: item
+          }
+        }))
+      }
+
     }
   },
   watch: {

htmldev/shiningManage/src/views/productManage/recommend/index.vue

@@ -95,9 +95,9 @@
       <el-table-column label="审核通过时间" prop="product_check_at" min-width="160"></el-table-column>
       <el-table-column label="创建时间" prop="created_at" min-width="160"></el-table-column>
       <el-table-column label="更新时间" prop="updated_at" min-width="160"></el-table-column>
-      <el-table-column label="操作" width="120">
+      <el-table-column label="操作" width="160">
         <template slot-scope="scope">
-          <el-button type="text" @click="edit(scope.row)">操作</el-button>
+          <el-button type="text" @click="edit(scope.row)">标签设置</el-button>
           <el-button type="text" @click="del(scope.row)" v-if="scope.row.product_is_recommend === 1">取消推荐
           </el-button>
         </template>