Merge remote-tracking branch 'origin/master'

src/api/my/jnbImg.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询图片管理列表
+export function listImg(query) {
+  return request({
+    url: '/my/img/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询图片管理详细
+export function getImg(id) {
+  return request({
+    url: '/my/img/' + id,
+    method: 'get'
+  })
+}
+
+// 新增图片管理
+export function addImg(data) {
+  return request({
+    url: '/my/img',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改图片管理
+export function updateImg(data) {
+  return request({
+    url: '/my/img',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除图片管理
+export function delImg(id) {
+  return request({
+    url: '/my/img/' + id,
+    method: 'delete'
+  })
+}
+
+//确实是否存在状态为开启的封面图片
+export function isCover(){
+  return request({
+    url: '/my/img/isCover',
+    method: 'get'
+  })
+}

src/api/my/nameAuthentication.js

@@ -35,6 +35,15 @@ export function updateNameAuthentication(data) {
   })
 }
 
+// 审核
+export function through(data) {
+  return request({
+    url: '/nameAuthentication/through',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除实名认证
 export function delNameAuthentication(id) {
   return request({

src/api/my/officialAuthentication.js

@@ -42,3 +42,12 @@ export function delOfficialAuthentication(id) {
     method: 'delete'
   })
 }
+
+// 审核
+export function through(data) {
+  return request({
+    url: '/officialAuthentication/through',
+    method: 'put',
+    data: data
+  })
+}

src/api/quotations/config.js

@@ -12,7 +12,7 @@ export function listConfig(query) {
 // 查询行情产品配置详细
 export function getConfig(id) {
   return request({
-    url: '/quotationsConfig/' + id,
+    url: '/quotationsConfig/' + id ,
     method: 'get'
   })
 }
@@ -38,7 +38,7 @@ export function updateConfig(data) {
 // 删除行情产品配置
 export function delConfig(id) {
   return request({
-    url: '/quotationsConfig/' + id,
+    url: '/quotationsConfig/' + id ,
     method: 'delete'
   })
 }

src/api/quotations/quotations.js

@@ -10,9 +10,9 @@ export function listQuotations(query) {
 }
 
 // 查询行情详细
-export function getQuotations(id,type) {
+export function getQuotations(id) {
   return request({
-    url: '/quotations/' + id + '/' + type,
+    url: '/quotations/' + id ,
     method: 'get'
   })
 }
@@ -36,9 +36,20 @@ export function updateQuotations(data) {
 }
 
 // 删除行情
-export function delQuotations(id,type) {
+export function delQuotations(id) {
   return request({
-    url: '/quotations/' + id + '/' + type,
+    url: '/quotations/' + id ,
     method: 'delete'
   })
 }
+
+// 修改审核状态
+export function updateStatus(data) {
+  return request({
+    url: '/quotations/status',
+    method: 'post',
+    data: data
+  })
+}
+
+

src/views/handleAffairs/gridType/index.vue

@@ -116,7 +116,7 @@
           <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
         </el-form-item>
         <el-form-item label="岗位描述" prop="jobDescription">
-          <el-input v-model="form.jobDescription" placeholder="请输入岗位描述" maxlength="255" type="textarea" rows="4"/>
+          <el-input v-model="form.jobDescription" placeholder="请输入岗位描述" maxlength="1000" type="textarea" rows="4"/>
         </el-form-item>
         <el-form-item label="图片路径" prop="fileUrl">
           <image-upload v-model="form.fileUrl" :fileSize="10" :limit="1"/>

src/views/matter/matter.vue

@@ -55,14 +55,12 @@
           @click="handleDelete"
         >删除</el-button>
       </el-col>
-
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="deptList" @selection-change="handleSelectionChange">
       <el-table-column label="事项标题" align="center" prop="title" />
       <el-table-column label="主题类型" align="center" prop="type" />
       <el-table-column label="所属部门" align="center" prop="department" />
-
       <el-table-column label="是否展示" align="center" key="operation">
         <template slot-scope="scope">
           <el-switch
@@ -103,7 +101,6 @@
             @click="handleDelete(scope.row)"
           >删除</el-button>
           <el-button
-            v-if="scope.row.examine != 1"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -166,11 +163,11 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="电话" prop="address" style="width: 300px;">
-          <el-input v-model="form.address" placeholder="请输入电话" />
+        <el-form-item label="电话" prop="phone" style="width: 300px;">
+          <el-input v-model="form.phone" placeholder="请输入电话" />
         </el-form-item>
-        <el-form-item label="地址" prop="phone" style="width: 300px;">
-          <el-input v-model="form.phone" placeholder="请输入地址" />
+        <el-form-item label="地址" prop="address" style="width: 300px;">
+          <el-input v-model="form.address" placeholder="请输入地址" />
         </el-form-item>
         <el-form-item label="图片" prop="picture">
           <image-upload v-model="form.picture" :fileSize="10" :limit="1"/>
@@ -238,11 +235,11 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="电话" prop="address" style="width: 300px;" >
-          <el-input v-model="form.address" placeholder="请输入电话" :readonly="true" />
+        <el-form-item label="电话" prop="phone" style="width: 300px;" >
+          <el-input v-model="form.phone" placeholder="请输入电话" :readonly="true" />
         </el-form-item>
-        <el-form-item label="地址" prop="phone" style="width: 300px;" >
-          <el-input v-model="form.phone" placeholder="请输入地址" :readonly="true" />
+        <el-form-item label="地址" prop="address" style="width: 300px;" >
+          <el-input v-model="form.address" placeholder="请输入地址" :readonly="true" />
         </el-form-item>
         <el-form-item label="图片" prop="picture" >
           <image-upload v-model="form.picture" :fileSize="10" :limit="1"  />
@@ -377,14 +374,7 @@
           this.title = "详情";
         });
       },
-  //     getDept(row.id).then(response => {
-  //   this.form = response.data;
-  //   this.$nextTick(() => {
-  //     this.form.operation = this.form.operation.toString();
-  //   });
-  //   this.open = true;
-  //   this.title = "修改事项";
-  // });
+
       // 取消按钮
       cancel() {
         this.open = false;
@@ -453,6 +443,7 @@
                 this.getList();
               });
             } else {
+              this.form.examine = 3
               addDept(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
@@ -487,13 +478,13 @@
       },
       // 用户状态修改
       handleStatusChange(row) {
-        let text = row.operation === "0" ? "启用" : "停用";
-        this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+        let text = row.operation == "0" ? "展示" : "取消展示";
+        this.$modal.confirm('确认要"' + text  + "该" + '事项吗？').then(function() {
           return updateDept(row);
         }).then(() => {
           this.$modal.msgSuccess(text + "成功");
         }).catch(function() {
-          row.operation = row.operation === "0" ? "1" : "0";
+          row.operation = row.operation == "0" ? "1" : "0";
         });
       },
       /** 删除按钮操作 */

src/views/my/jnbImg.vue

@@ -0,0 +1,322 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="图片名称" prop="imgName">
+        <el-input
+          v-model="queryParams.imgName"
+          placeholder="请输入图片名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:jnbImg:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:jnbImg:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:jnbImg:del']"
+        >删除
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="imgList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="图片名称" align="center" prop="imgName"/>
+      <el-table-column label="图片" align="center" prop="imgUrl">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.imgUrl" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="imgSwitch">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.jnb_img_switch" :value="scope.row.imgSwitch"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="图片类型" align="center" prop="imgType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.jnb_img_type" :value="scope.row.imgType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:jnbImg:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:jnbImg:del']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改图片管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="图片类型" prop="imgType">
+              <el-select v-model="form.imgType" placeholder="请选择图片类型">
+                <el-option
+                  v-for="dict in dict.type.jnb_img_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="图片名称" prop="imgName">
+              <el-input v-model="form.imgName" placeholder="请输入图片名称"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="图片状态" prop="imgSwitch">
+          <el-radio-group v-model="form.imgSwitch">
+            <el-radio
+              v-for="dict in dict.type.jnb_img_switch"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="图片路径" prop="imgUrl">
+          <image-upload v-model="form.imgUrl" limit="1"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listImg, getImg, delImg, addImg, updateImg, isCover} from "@/api/my/jnbImg";
+
+export default {
+  name: "Img",
+  dicts: ['jnb_img_type', 'jnb_img_switch'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 图片管理表格数据
+      imgList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        imgUrl: null,
+        imgName: null,
+        imgSwitch: null,
+        imgType: null
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {
+        imgUrl: [
+          {required: true, message: "图片路径不能为空", trigger: "blur"}
+        ],
+        imgName: [
+          {required: true, message: "图片名称不能为空", trigger: "blur"}
+        ],
+        imgSwitch: [
+          {required: true, message: "请选择图片状态", trigger: "change"}
+        ],
+        imgType: [
+          {required: true, message: "图片类型不能为空", trigger: "change"}
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询图片管理列表 */
+    getList() {
+      this.loading = true;
+      listImg(this.queryParams).then(response => {
+        this.imgList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        imgUrl: null,
+        imgName: null,
+        imgSwitch: null,
+        imgType: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.form.imgSwitch  =  "switch_off";
+      this.title = "添加图片管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getImg(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改图片管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      let flag = true;
+      //如果图片类型为封面图片, 切图片状态为开, 则查询后台是否存在图片状态为开的数据, 不存在返回true, 存在返回false
+      if (this.form.imgType === "1" && this.form.imgSwitch === "switch_on") {
+        isCover().then(res => {
+          if (res.data) {
+            flag = false;
+            this.$modal.msgError("封面图片只能存在一张, 请先关闭其他封面图片");
+          }else{
+            this.isSubmit();
+          }
+        })
+      }else{
+        this.isSubmit();
+      }
+    },
+    isSubmit(){
+      //如果为true, 则继续执行后续代码, 否则停止执行.
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateImg(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addImg(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除图片管理编号为"' + ids + '"的数据项？').then(function () {
+        return delImg(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('my/img/export', {
+        ...this.queryParams
+      }, `img_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/my/nameAuthentication.vue

@@ -172,7 +172,7 @@
 </template>
 
 <script>
-import { listNameAuthentication, getNameAuthentication, delNameAuthentication, addNameAuthentication, updateNameAuthentication } from "@/api/my/nameAuthentication";
+import { listNameAuthentication, getNameAuthentication, delNameAuthentication, addNameAuthentication, updateNameAuthentication,through } from "@/api/my/nameAuthentication";
 
 export default {
   name: "NameAuthentication",
@@ -318,7 +318,7 @@ export default {
     /** 审核通过 */
     through(status) {
       this.form1.status = status;
-      updateNameAuthentication(this.form1).then(response => {
+      through(this.form1).then(response => {
         this.open1 = false;
         this.getList();
       });

src/views/my/officialAuthentication.vue

@@ -181,7 +181,7 @@
 </template>
 
 <script>
-import { listOfficialAuthentication, getOfficialAuthentication, delOfficialAuthentication, addOfficialAuthentication, updateOfficialAuthentication } from "@/api/my/officialAuthentication";
+import { listOfficialAuthentication, getOfficialAuthentication, delOfficialAuthentication, addOfficialAuthentication, updateOfficialAuthentication,through } from "@/api/my/officialAuthentication";
 
 export default {
   name: "OfficialAuthentication",
@@ -318,7 +318,7 @@ export default {
     /** 审核通过 */
     through(status) {
       this.form1.status = status;
-      updateOfficialAuthentication(this.form1).then(response => {
+      through(this.form1).then(response => {
         this.open1 = false;
         this.getList();
       });

src/views/quotations/conf.vue

@@ -281,7 +281,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除行情产品配置编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除此行情产品配置').then(function () {
         return delConfig(ids);
       }).then(() => {
         this.getList();

src/views/quotations/index.vue

@@ -32,7 +32,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['jnb:quotations:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -43,7 +44,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['jnb:quotations:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -54,34 +56,58 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['jnb:quotations:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="quotationsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="产品名称" align="center" prop="productName" />
-      <el-table-column label="地区" align="center" prop="area" />
-      <el-table-column label="类型" align="center" prop="type" />
-      <el-table-column label="价格" align="center" prop="price" />
-      <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="产品名称" align="center" prop="productName"/>
+      <el-table-column label="地区" align="center" prop="area"/>
+      <el-table-column label="类型" align="center" prop="type"/>
+      <el-table-column label="价格" align="center" prop="price"/>
+      <el-table-column label="地址" align="center" prop="address"/>
+      <el-table-column label="审核状态" align="center" prop="status"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.status !== '通过'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="updateStatus(scope.row)"
+            v-hasPermi="['jnb:quotations:edit']"
+          >审核
+          </el-button>
+          <el-button
+            v-if="scope.row.status !== '通过'"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['jnb:quotations:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
+            v-if="scope.row.status !== '通过'"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['jnb:quotations:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
+          <el-button
+            v-if="scope.row.status == '通过'"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleUpdateStatus(scope.row)"
+            v-hasPermi="['jnb:quotations:remove']"
+          >查看
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -93,11 +119,29 @@
       @pagination="getList"
     />
 
+    <el-dialog :title="title" :visible.sync="staK" width="500px" append-to-body>
+      <el-form ref="forms" :model="forms" :rules="sta" label-width="80px">
+        <el-form-item label="审核" prop="status">
+          <el-select v-model="forms.status">
+            <el-option
+              v-for="item in statusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
     <!-- 添加或修改行情对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="产品名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入产品名称" />
+          <el-input v-model="form.productName" placeholder="请输入产品名称"/>
         </el-form-item>
         <el-form-item label="类型" prop="type">
           <el-cascader
@@ -110,22 +154,22 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="地区" prop="area">
-          <el-input v-model="form.area" placeholder="请输入地区" />
+          <el-input v-model="form.area" placeholder="请输入地区"/>
         </el-form-item>
         <el-form-item label="价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入价格" />
+          <el-input v-model="form.price" placeholder="请输入价格"/>
         </el-form-item>
         <el-form-item label="手机号" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入手机号" />
+          <el-input v-model="form.phone" placeholder="请输入手机号"/>
         </el-form-item>
         <el-form-item label="地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入地址" />
+          <el-input v-model="form.address" placeholder="请输入地址"/>
         </el-form-item>
-        <el-form-item label="图片" prop="imgUrlList">
-          <image-upload v-model="form.imgUrlList"/>
+        <el-form-item label="图片" prop="url">
+          <image-upload v-model="form.url"/>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" v-if="poppn">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -134,7 +178,14 @@
 </template>
 
 <script>
-import { listQuotations, getQuotations, delQuotations, addQuotations, updateQuotations } from "@/api/quotations/quotations";
+import {
+  addQuotations,
+  delQuotations,
+  getQuotations,
+  listQuotations,
+  updateQuotations,
+  updateStatus
+} from "@/api/quotations/quotations";
 import {listConfig} from "@/api/quotations/config";
 
 export default {
@@ -151,7 +202,16 @@ export default {
     }
     return {
       // 类型下拉框选项
-      options:[],
+      options: [],
+      statusList: [{
+        label: '审核通过',
+        value: '1'
+      },
+        {
+          label: '审核未通过',
+          value: '2'
+        },
+      ],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -170,6 +230,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      staK: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -180,20 +241,28 @@ export default {
         price: null,
         phone: null,
         address: null,
-        configId: null
+        url: null,
+        urlArray: null
       },
       // 表单参数
       form: {},
+      //审核参数
+      forms: {},
+      poppn: true,
+      sta: {
+        status: [{required: true, message: "请选择审核状态", trigger: "blur"}]
+      },
       // 表单校验
       rules: {
-        productName: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
-        area: [{ required: true, message: "请输入地区", trigger: "blur" }],
+        productName: [{required: true, message: "请输入产品名称", trigger: "blur"}],
+        area: [{required: true, message: "请输入地区", trigger: "blur"}],
         price: [
-          { required: true, message: "请输入价格", trigger: "blur" },
-          { validator: validateNumber, trigger: 'blur' }
+          {required: true, message: "请输入价格", trigger: "blur"},
+          {validator: validateNumber, trigger: 'blur'}
         ],
-        phone: [{ required: true, message: "请输入手机号", trigger: "blur", pattern: /^1[34578]\d{9}$/}],
-        address: [{ required: true, message: "请输入地址", trigger: "blur" }]
+        phone: [{required: true, message: "请输入手机号", trigger: "blur", pattern: /^1[34578]\d{9}$/}],
+        address: [{required: true, message: "请输入地址", trigger: "blur"}],
+        url: [{required: true, message: "请输入图片", trigger: "blur"}]
       }
     };
   },
@@ -206,6 +275,7 @@ export default {
       this.loading = true;
       listQuotations(this.queryParams).then(response => {
         this.quotationsList = response.rows;
+        this.quotationsList.url = response.rows.urlArray
         this.total = response.total;
         this.loading = false;
       });
@@ -246,6 +316,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.staK = false;
       this.reset();
     },
     // 表单重置
@@ -258,6 +329,7 @@ export default {
         price: null,
         phone: null,
         address: null,
+        url: null,
         createBy: null,
         createTime: null,
         updateBy: null,
@@ -267,6 +339,10 @@ export default {
         configId: null
       };
       this.resetForm("form");
+      this.forms = {
+        status: null
+      }
+      this.resetForm("forms");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -281,7 +357,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -294,19 +370,60 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getQuotations(id,13).then(response => {
+      getQuotations(id).then(response => {
         this.form = response.data;
         this.form.type = this.getParentsById(this.options, this.form.type)
         this.open = true;
+        this.poppn = true;
         this.title = "修改行情";
       });
     },
+    handleUpdateStatus(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getQuotations(id).then(response => {
+        this.form = response.data;
+        this.form.type = this.getParentsById(this.options, this.form.type)
+        this.open = true;
+        this.poppn = false;
+        this.title = "查看行情";
+      });
+    },
+    /** 审核按钮*/
+    updateStatus(row) {
+      this.reset();
+      this.forms.id = row.id
+      this.forms.productName = row.productName
+      this.forms.createTime = row.createTime
+      this.staK = true;
+      this.title = "行情审核";
+    },
+    submit() {
+      this.$refs["forms"].validate(valid => {
+        if (valid) {
+          // 将createTime转换为Date对象
+          let date = new Date(this.forms.createTime);
+          // 使用toLocaleString方法将Date对象转换为"YYYY-MM-DD HH:MM:SS"格式
+          this.forms.createTime = date.getFullYear() + '-' +
+            ('0' + (date.getMonth() + 1)).slice(-2) + '-' +
+            ('0' + date.getDate()).slice(-2) + ' ' +
+            ('0' + date.getHours()).slice(-2) + ':' +
+            ('0' + date.getMinutes()).slice(-2) + ':' +
+            ('0' + date.getSeconds()).slice(-2);
+          updateStatus(this.forms).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.staK = false;
+            this.getList();
+          });
+        }
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-    //判断this.form.type是否是数组，如果是数组则取数组的最后一个值
+            //判断this.form.type是否是数组，如果是数组则取数组的最后一个值
             if (Array.isArray(this.form.type)) {
               this.form.type = this.form.type[this.form.type.length - 1]
             }
@@ -328,12 +445,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除所选的数据项？').then(function() {
-        return delQuotations(ids,13);
+      this.$modal.confirm('是否确认删除所选的数据项？').then(function () {
+        return delQuotations(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
   }
 };