始宁农业管理后台：农产品管理-上架申请

htmldev/shiningManage/src/store/modules/common.js

@@ -55,6 +55,34 @@ const state = {
       value: 2,
       name: '仅图片'
     }
+  ],
+  arrProductSaleType: [
+    {
+      name: '预售',
+      value: '1'
+    },
+    {
+      name: '现货',
+      value: '2'
+    }
+  ],
+  arrProductStatus: [
+    {
+      name: '未上架',
+      value: '0'
+    },
+    {
+      name: '已上架',
+      value: '1'
+    },
+    {
+      name: '审核中',
+      value: '2'
+    },
+    {
+      name: '审核未通过',
+      value: '3'
+    }
   ]
 }
 

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

@@ -2,25 +2,38 @@
   <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-item label="姓名:">
-          <el-input v-model="searchForm.department_name" placeholder="请输入姓名" clearable></el-input>
+        <el-form-item label="农户编号:">
+          <el-input v-model="searchForm.shop_id" 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 label="农户姓名:">
+          <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="请输入身份证后6位" clearable></el-input>
+        <el-form-item label="农产品名字:">
+          <el-input v-model="searchForm.product_title" placeholder="请输入农产品名字" clearable></el-input>
         </el-form-item>
-        <el-form-item label="申请时间:">
-          <el-date-picker
-            :editable="false"
-            v-model="time"
-            @change="timearr => {timearr ? (searchForm.start_time = timearr[0] + ' 00:00:00', searchForm.end_time = timearr[1] + ' 23:59:59') : searchForm.start_time = searchForm.end_time = undefined}"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          ></el-date-picker>
+        <el-form-item label="类型:">
+          <el-select
+            clearable
+            placeholder="请选择类型"
+            v-model="searchForm.type">
+            <el-option
+              :label="item.name"
+              :value="item.value"
+              v-for="item in arrProductSaleType"
+              :key="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核状态:">
+          <el-select
+            clearable
+            placeholder="请选择审核状态"
+            v-model="searchForm.product_status">
+            <el-option
+              :label="item.name"
+              :value="item.value"
+              v-for="item in arrProductStatus"
+              :key="item.value"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item class="ml-10">
           <el-button icon="el-icon-search" type="primary" @click="searchSubmit">查询</el-button>
@@ -35,29 +48,26 @@
       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_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="department_project_name">
+      <el-table-column label="农产品名字" prop="product_title"></el-table-column>
+      <el-table-column label="类型" prop="product_sale_at">
+        <template slot-scope="scope">{{ scope.row.product_sale_at > 0 ? '现货' : '预售' }}</template>
+      </el-table-column>
+      <el-table-column label="批发价(元)" prop="product_all_price">
+        <template slot-scope="scope">{{ scope.row.product_all_price | fen2Yuan }}</template>
+      </el-table-column>
+      <el-table-column label="零售价(元)" prop="product_price">
+        <template slot-scope="scope">{{ scope.row.product_price | fen2Yuan }}</template>
+      </el-table-column>
+      <el-table-column label="申请人" prop="user_id" show-overflow-tooltip>
         <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="[]">
-          </el-image>
+          {{ scope.row.user_id }}{{ scope.row.user_name ? scope.row.user_name + '/' : '' }}
         </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"></el-table-column>
+      <el-table-column label="审核状态" prop="product_status">
+        <template slot-scope="scope">{{ getProductStatusText(scope.row.product_status) }}</template>
+      </el-table-column>
+      <el-table-column label="申请时间" prop="created_at" min-width="120"></el-table-column>
+      <el-table-column label="审核人" prop="product_check_name"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" @click="edit(scope.row)">操作</el-button>
@@ -101,7 +111,15 @@ export default {
       time: [],
       searchForm: {},
       tableData: [],
-      tableUrl: '/department/list'
+      tableUrl: '/api/admin/un/product/list'
+    }
+  },
+  computed: {
+    arrProductSaleType() {
+      return this.$store.state.common.arrProductSaleType
+    },
+    arrProductStatus() {
+      return this.$store.state.common.arrProductStatus
     }
   },
   methods: {
@@ -125,6 +143,13 @@ export default {
           this.init()
         }
       }).catch(() => {})
+    },
+    getProductStatusText(val) {
+      const index = this.arrProductStatus.findIndex(item => item.value === val)
+      if (index > -1) {
+        return this.arrProductStatus[index].name
+      }
+      return ''
     }
   },
   mounted() {