客户管理

config/index.js

@@ -10,8 +10,8 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/': {
-                target: 'http://127.0.0.1:7001', //后端接口地址     中间人运营平台
-                // target: 'http://192.168.2.61:9000', //后端接口地址   
+                // target: 'http://43.136.176.26:7001', //后端接口地址     中间人运营平台
+                target: 'http://127.0.0.1:7001', //后端接口地址   
                 changeOrigin: true, //是否跨域
                 pathRewrite: {
                     '^/': '/', //重写,
@@ -21,7 +21,8 @@ module.exports = {
         },
 
         // 本地开发使用   192.168.0.126  localhost
-        host: '192.168.124.14',
+        host: '192.168.3.43',
+        // host: '192.168.124.14',
         port: 8080,
         autoOpenBrowser: true,
         errorOverlay: true,

src/App.vue

@@ -9,3 +9,19 @@ export default {
   name: 'App'
 }
 </script>
+
+<style >
+::-webkit-scrollbar {
+  width: 7px; 
+  height: 7px;
+ 
+}
+
+::-webkit-scrollbar-thumb {
+  /* background-color: #0f5ef080; */
+  background: linear-gradient(to left,#32e4c663,#0c6ceb71);
+  border-radius: 5px;
+  box-shadow: 0 2px 12px 0 rgba(204, 201, 201, 0.1)
+}
+
+</style>

src/api/bid.js

@@ -33,3 +33,11 @@ export function getQueryAdd(parms) {
     data: parms
   })
 }
+// 作废列表
+export function getQueryDelete(parms) {
+  return request({
+    url: '/tender/delete',
+    method: 'post',
+    data: parms
+  })
+}

src/api/record.js

@@ -1,35 +1,25 @@
 import request from '@/utils/request'
 
 //获取所有配置价格
-export function priceList(parms){
+export function customerList(parms){
     return request({
-        url:"/price/list",
+        url:"/customer/page",
         method:"get",
         params:parms
     })
 }
 
 // 删除配置价格
-export function deletePrice(id) {
+export function deleteCustomer(id) {
     return request({
-        url: '/price/' + id,
+        url: '/customer/' + id,
         method: 'delete',
     })
 }
 
-//编辑配置价格
-export function editperform(data) {
-    return request({
-        url: '/price/update',
-        method: 'put',
-        data: data
-    })
-}
-
-
 
 // 新增
-export function addRecord(data) {
+export function addCustomer(data) {
     return request({
         url: '/customer/add',
         method: 'post',
@@ -38,45 +28,10 @@ export function addRecord(data) {
 } 
 
 // 编辑
-export function editRecord(data) {
+export function editCustomer(data) {
     return request({
-        url: '/part/id',
+        url: '/customer',
         method: 'put',
         data: data
     })
-}
-
-// 删除
-export function deleteRecord(uuid) {
-    return request({
-        url: '/part/' + uuid,
-        method: 'delete',
-    })
-}
-
-// 获取所有数据
-export function getList(parms) {
-    return request({
-        url: '/customer/list',
-        method: 'get',
-        params: parms
-    })
-}
-
-//账号所有人员
-export function userOrder(data) {
-    return request({
-        url: '/user/1',
-        method: 'get',
-        data: data
-    })
-  }
-
-  //授权用户
-  export function editOrder(data) {
-    return request({
-        url: 'cu/usr/add',
-        method: 'post',
-        data: data
-    })
-}
+} 

src/api/user.js

@@ -9,6 +9,13 @@ export function addUser(data) {
     })
 }
 
+// 获取客户信息
+export function getCustomerList() {
+    return request({
+        url: '/customer/info',
+        method: 'get',
+    })
+}
 // 获取用户列表
 export function getUserList(parms) {
     return request({

src/views/admin/user.vue

@@ -70,6 +70,11 @@
               <div>{{ scope.row.deptName }}</div>
             </template>
           </el-table-column>
+          <el-table-column label="公司" align="center">
+            <template slot-scope="scope">
+              <div>{{ scope.row.customerName }}</div>
+            </template>
+          </el-table-column>
 
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
@@ -130,6 +135,17 @@
               />
             </el-form-item>
 
+            <el-form-item label="公司" :label-width="formLabelWidth" prop="customerId" >
+                <el-select v-model="dataForm.customerId" clearable value-key="customerId" style="width: 100%" filterable placeholder="请选择公司名称" >
+                    <el-option
+                    v-for="item in customerNameList"
+                    :key="item.customerId"
+                    :label="item.customerName"
+                    :value="item.customerId">
+                  </el-option>
+              </el-select>
+            </el-form-item>
+
             <el-form-item label="角色" prop="roleList" label-width="120px" >
               <el-select v-model="dataForm.roleList" multiple placeholder="请选择" style="width: 100%;">
                 <el-option
@@ -164,7 +180,7 @@
 </template>
 
 <script>
-import { addUser, getUserList, editUser, deleteUser, restPass, registerUser } from '@/api/user'
+import { addUser, getUserList, editUser, deleteUser, restPass, registerUser,getCustomerList } from '@/api/user'
 import { getRoleList } from '@/api/roles'
 import { getDept } from '@/api/dept'
 import PopupTreeInput from '@/components/PopupTreeInput'
@@ -222,8 +238,8 @@ export default {
       jobName: '',
       rules2: {
         username: [{ required: true, message: '请输入用户名', trigger: 'blur' }, {
-          pattern: /^[a-zA-Z0-9_]{4,8}$/,
-          message: '以字母开头，长度在4-8之间， 只能包含字符、数字和下划线'
+          // pattern: /^[a-zA-Z0-9_]{4,8}$/,
+          // message: '以字母开头，长度在4-8之间， 只能包含字符、数字和下划线'
         }],
         phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }, { validator: checkTel, trigger: 'change' }],
         roleList: [{ required: true, message: '请选择角色', trigger: 'blur',trigger: 'change'}],
@@ -231,7 +247,8 @@ export default {
         email: [{ required: true, message: '请输入邮箱', trigger: 'blur' }, {
           pattern: /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/, message: '输入邮箱不合法'
         }]
-      }
+      },
+      customerNameList:[]
 
     }
   },
@@ -241,8 +258,15 @@ export default {
     this.findDeptTree()
     // 加载数据字典
     this.getDict('用户状态')
+    // 获取客户名称
+    this.findCustomer()
   },
   methods: {
+    findCustomer(){
+      getCustomerList().then((res)=>{
+        this.customerNameList = res.data.data
+      })
+    },
     // 加载用户角色信息
     findUserRoles: function() {
       const params = new URLSearchParams()

src/views/bid/index.vue

@@ -24,9 +24,9 @@
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" border style="width: 100%;">
 
-      <el-table-column prop="title" label="标题" align="center" />
+      <el-table-column prop="title" label="标题" :show-overflow-tooltip="true"  width="250" align="center" />
 
-      <el-table-column label="状态"  align="center">
+      <el-table-column label="状态"  align="center" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status ==1">进行中</el-tag>
           <el-tag type="info" v-if="scope.row.status ==2">已结束</el-tag>
@@ -34,32 +34,32 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="description" :show-overflow-tooltip="true" label="报价式" align="center" >
+      <el-table-column prop="description" :show-overflow-tooltip="true" label="报价方式" width="100" align="center" >
         <template slot-scope="scope">
             <span v-if="scope.row.priceQuotes == 1">总价</span>
             <span v-if="scope.row.priceQuotes == 2">单价</span>
         </template>
       </el-table-column>
-      <el-table-column prop="remarks" label="备注" align="center" />
-      <el-table-column prop="appendix" label="附件" align="center" >
+      <el-table-column prop="remarks" label="备注" :show-overflow-tooltip="true" align="center" />
+      <el-table-column prop="appendix" label="附件" align="center" width="100" >
         <template slot-scope="scope">
             <el-link type="primary" :href="scope.row.appendix">查看</el-link>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="开始时间" align="center" />
-      <el-table-column prop="endTime" label="截止时间" align="center" />
+      <el-table-column prop="createTime" label="开始时间" align="center" width="160"/>
+      <el-table-column prop="endTime" label="截止时间" align="center" width="160"/>
 
-      <el-table-column label="操作" width="250" align="center">
+      <el-table-column label="操作" width="150"  fixed="right" align="center">
         <template slot-scope="scope">
           <el-button slot="reference" type="text" icon="el-icon-edit" v-if="scope.row.status == 1" @click="handleEdit(scope.row)">编辑</el-button>
           <el-popover
-            :ref="scope.row.dictName"
+            :ref="scope.row.id"
             placement="bottom"
             width="180"
           >
             <p>此操作将作废该标，确定要作废吗？</p>
             <div style="text-align: right; margin: 0">
-              <el-button size="mini"  @click="$refs[scope.row.dictName].doClose()">取消</el-button>
+              <el-button size="mini"  @click="$refs[scope.row.id].doClose()">取消</el-button>
               <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定
               </el-button>
             </div>
@@ -73,9 +73,11 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :current-page.sync="currentPage"
+         @size-change="handleSizeChange"
+         :current-page.sync="currentPage"
+          :page-sizes="[1,10, 20, 30, 50]"
         :page-size="pageSize"
-        layout="total, prev, pager, next, jumper"
+        layout="total, sizes, prev, pager, next, jumper"
         :total="total"
         background
         @current-change="handleCurrentChange"
@@ -83,15 +85,15 @@
     </div>
 
     <!--新增-->
-    <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '发布新标' : '修改新标'" width="50%">
+    <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '发布新标' : '修改新标'" width="40%">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" style="width: 370px;" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="备注" prop="remarks">
+        <el-form-item label="备注" prop="remarks" >
           <el-input
             type="textarea"
-            style="width: 50%;"
+            style="width: 370px;"
             :autosize="{ minRows: 2, maxRows: 10}"
             placeholder="请输入内容"
             v-model="form.remarks">
@@ -108,25 +110,48 @@
             :before-remove="beforeRemove"
             :on-exceed="handleExceed"
             action="/tender/upload"
+            list-type="text"
             :file-list="fileList"
             multiple>
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+            <!-- <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div> -->
           </el-upload>
         </el-form-item>
-        <el-form-item label="报价方式">
+        <el-form-item label="报价方式" prop="priceQuotes">
             <el-radio v-model="form.priceQuotes" :label="1">总价</el-radio>
             <el-radio v-model="form.priceQuotes" :label="2">单价</el-radio>
         </el-form-item>
-        <el-form-item label="发布时间">
+        <el-form-item label="发布时间" prop="startTime">
+            <!-- <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            @change="oncustom"
+            size="mini"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            default-time="00:00:00"
+            placeholder="开始日期"
+             >
+            </el-date-picker>
+            <span> ~ </span>
+            <el-date-picker
+            v-model="form.endTime"
+            type="datetime"
+            size="mini"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            default-time="15:00:00"
+            placeholder="截止日期"
+             >
+            </el-date-picker> -->
             <el-date-picker
-            v-model="form.date"
+            v-model="bidDate"
             type="datetimerange"
             size="mini"
             range-separator="~"
             @change="oncustom"
-            value-format="yyyy-MM-dd hh:mm:ss"
+             @clear="onClear"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '15:00:00']"
             start-placeholder="开始日期"
             end-placeholder="结束日期">
             </el-date-picker>
@@ -140,36 +165,50 @@
 
   <!-- 详情 -->
   <el-dialog :append-to-body="true" :visible.sync="viewDialog" title="投标详情" width="90%" center>
-     <el-table v-loading="loading" center :data="Paramdata" border style="width: 100%;">
+     <el-table  center :data="Paramdata" border style="width: 100%;">
 
-      <el-table-column prop="dictName" label="客户名称" />
+      <el-table-column prop="customerName" label="客户名称" align="center"/>
 
       <el-table-column label="报价方式"  align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.gwStatus}}</span>
+          <span v-if="scope.row.priceQuotes == 1">总价</span>
+            <span v-if="scope.row.priceQuotes == 2">单价</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="price" :show-overflow-tooltip="true" label="报价金额" align="center" />
+      <el-table-column prop="remarks" label="备注" :show-overflow-tooltip="true" align="center" />
+      <el-table-column prop="appendix" label="附件" align="center" width="100" >
+        <template slot-scope="scope">
+            <el-link type="primary" :href="scope.row.appendix">查看</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="投极时间" align="center"/>
+      <el-table-column prop="userId" label=" 投标帐号" align="center"/>
+      <el-table-column prop="status" label=" 投标结果" align="center" >
+         <template slot-scope="scope">
+          <span v-if="scope.row.status == 0">已提交</span>
+          <span v-if="scope.row.status == 1">中标</span>
+          <span v-if="scope.row.status == 2">未中标</span>
         </template>
       </el-table-column>
 
-      <el-table-column prop="description" :show-overflow-tooltip="true" label="报价金额" />
-      <el-table-column prop="remark" label="备注" />
-      <el-table-column prop="remark" label="附件" />
-      <el-table-column prop="createTime" label="投极时间" />
-      <el-table-column prop="createTime" label=" 投标帐号" />
-      <el-table-column prop="createTime" label=" 投标结果" />
     </el-table>
      <div class="pagination">
       <el-pagination
         :current-page.sync="param.page"
         :page-size="param.size"
-        layout="total, prev, pager, next, jumper"
+        layout="total, sizes, prev, pager, next, jumper"
         :total="total1"
+        :page-sizes="[10, 20, 30, 50]"
         background
+        @size-change="handleSizeChangeParam"
         @current-change="handleCurrentChangeParam"
       />
     </div>
       <div slot="footer" class="dialog-footer">
         <el-button  @click="viewDialog = false">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+        <el-button :loading="loading" type="primary" @click="viewDialog = false">确认</el-button>
       </div>
   </el-dialog>
   </div>
@@ -177,7 +216,7 @@
 </template>
 
 <script>
-import { getTableList,getQueryId,getQueryAdd,getQueryEdit } from '@/api/bid'
+import { getTableList,getQueryId,getQueryAdd,getQueryEdit,getQueryDelete } from '@/api/bid'
 
 export default {
   data() {
@@ -194,15 +233,15 @@ export default {
       pageSize: 10,
       total: 0, // 总数量
       rules: {
-        dictName: [
-          { required: true, message: '字典名称不为空', trigger: 'blur' }
+        title: [
+          { required: true, message: '标题不为空', trigger: 'blur' }
         ],
-        dictCode: [
-          { required: true, message: '字典编码不为空', trigger: 'blur' }
+        priceQuotes: [
+          { required: true, message: "请选择报价方式", trigger: 'blur' }
         ],
-        description: [
-          // { required: true, message: '描述不为空', trigger: 'blur' }
-        ]
+        // startTime: [
+        //   { type:"array",required: true, message: '发布时间不为空', trigger: 'blur' }
+        // ]
       },
       queryTypeOptions: [
         { key: 'name', display_name: '字典名称' },
@@ -217,7 +256,8 @@ export default {
         size:10
       },
       total1:0,
-      Paramdata:[]
+      Paramdata:[],
+      bidDate:[]
     }
   },
   created() {
@@ -227,6 +267,15 @@ export default {
     // 发布时间
     oncustom(){
 
+console.log(this.bidDate)
+      if (this.bidDate != null) {
+          this.form.startTime = this.bidDate[0]
+            this.form.endTime = this.bidDate[1]
+      }
+    },
+    onClear(){
+      this.bidDate =[]
+      console.log(this.form)
     },
     // 搜索
       handleFind: function() {
@@ -240,7 +289,7 @@ export default {
       // params.append('current', this.currentPage)
       // params.append('size', this.pageSize)
       const data = {
-        current:this.currentPage,
+        page:this.currentPage,
         size:this.pageSize,
         title:this.query.value
       }
@@ -253,15 +302,21 @@ export default {
     },
     // 文件移除的时候
      handleRemove(file, fileList) {
-        console.log(file, fileList);
+        this.form.appendix = ""
+        console.log(file, fileList,this.fileList,"移出");
       },
       // 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
       handleChange(file,fileList){
-        console.log(file,fileList)
+        console.log(file,fileList,"上传")
+        if(file.response){
+          console.log(file.response,"file")
+          this.form.appendix=file.response.data
+        }
       },
       // 点击文件列表中已上传的文件时的钩子
       handlePreview(file) {
         console.log(file,"file1");
+        window.location.href = file.url
       },
       handleExceed(files, fileList) {
         this.$message.warning(`当前限制选择 1 个附件，本次选择了 ${files.length} 个文件`);
@@ -276,6 +331,7 @@ export default {
         if (valid) {
           if (this.isAdd) {
             // 新增字典
+            
             getQueryAdd(this.form).then((res) => {
               if (res.data.code === 200) {
                 this.$message({ message: '操作成功', type: 'success' })
@@ -301,62 +357,108 @@ export default {
         }
       })
     },
+    formatDate(date) {
+      var myyear = date.getFullYear()
+      var mymonth = date.getMonth() + 1
+      var myweekday = date.getDate()
+
+      if (mymonth < 10) {
+        mymonth = '0' + mymonth
+      }
+      if (myweekday < 10) {
+        myweekday = '0' + myweekday
+      }
+      return myyear + '-' + mymonth + '-' + myweekday
+    },
     // 添加字典
     handleAdd: function() {
-      this.dialog = true
       this.isAdd = true
       this.form = {}
+      if(this.$refs['form']){
+        this.$refs["form"].resetFields();
+      }
+      const end = new Date()
+      const start = new Date()
+       end.setTime(start.getTime() + 3600 * 1000 * 24 * 1)
+       console.log(this.formatDate(end))
+      this.form.startTime = this.formatDate(start) + ' 00:00:00'
+       this.form.endTime = this.formatDate(end) + ' 15:00:00'
+      this.bidDate=[this.form.startTime,this.form.endTime]
+      this.fileList = []
+      this.dialog = true
 
     },
     // 编辑字典
     handleEdit: function(row) {
-      this.form = row
-      this.form.date = [row.createTime,row.endTime]
-      // this.fileList = row.appendix
+      if(this.$refs['form']){
+      this.$refs["form"].resetFields();
+      }
+      let data =JSON.parse(JSON.stringify(row)) 
+      this.form = data
+      this.bidDate = [data.createTime,data.endTime]
+      // this.form.
+      // let name = data.appendix.lastIndexOf('/') ;
+      let name = data.appendix.split("\\") ;
+      name = name.pop()
+      // let name = data.appendix.replace(/(.*\/)*([^.]+).*/ig, "$2");
+      this.fileList = [{name:name,url:data.appendix}]
       this.dialog = true
       this.isAdd = false
 
-      console.log(row)
+      console.log(data)
     },
     // 详情
     handleView(row){
-      this.param.tenderId = row.tenderId
+      this.param.tenderId = row.id
       this.getParam()
       this.viewDialog =true
     },
     getParam(){
       let data = this.param
       getQueryId(data).then((res)=>{
-        this.paramdata = res.data.data.records
+        console.log(res.data.data.records,"")
+        this.Paramdata = res.data.data.records
         this.total1 = res.data.data.total
       })
     },
     // 删除操作
     subDelete(val) {
-      deleteDict(val).then(res => {
+      let data ={
+        id:val
+      }
+      getQueryDelete(data).then(res => {
         if (res.data.code === 200) {
-          this.delLoading = false
           this.$message({ message: '删除成功', type: 'success' })
           this.getDictData()
         }
       }).catch(err => {
-        this.delLoading = false
         console.log(err.response.data.message)
       })
+      this.$refs[val].doClose()
+
     },
     // 换页
     handleCurrentChange: function(val) {
       this.currentPage = val
       this.getDictData()
     },
+    handleSizeChange(val){
+      this.pageSize = val
+      this.getDictData()
+    },
     handleCurrentChangeParam(val){
       this.param.page = val
       this.getParam()
+    },
+    handleSizeChangeParam(val){
+      this.param.size = val
+      this.getParam()
     }
   }
 }
 </script>
 
 <style scoped>
-
+/* 去掉上传附件时候的过度效果 */
+  ::v-deep .el-upload-list__item{transition: none !important;}
 </style>

src/views/client/record.vue

@@ -2,13 +2,23 @@
   <div class="app-container">
     <!-- 查询和其他操作 -->
     <div>
-       <span >公司名称：</span>
-        <el-select style="margin-bottom:20px" @focus="oncityList" v-model="customerName"  size="medium" clearable value-key="areaId" filterable placeholder="请选择公司名称" >
+       <span style="font-size:14px">公司名称：</span>
+       <el-input
+        v-model="customerName"
+        clearable
+        placeholder="请输入公司名称"
+        style="width: 200px;margin-bottom:20px"
+        size="small"
+        class="filter-item"
+      />
+
+        <span style="font-size:14px">公司类型：</span>
+        <el-select style="margin-bottom:20px"  v-model="typeId"  size="medium" clearable value-key="areaId" filterable placeholder="请选择公司名称" >
               <el-option
-              v-for="item in areaList"
-              :key="item.customerId"
-              :label="item.linkmanName"
-              :value="item.customerId">
+              v-for="item in customerType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
             </el-option>
         </el-select>
      
@@ -25,74 +35,93 @@
     </div>
     <el-table v-loading="loading" :data="tableData" border style="width: 100%">
 
-      <el-table-column label="公司编号"  align="center">
+      <el-table-column label="公司编号"  align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.customerId }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="公司公司名称" width="300" align="center">
+      <el-table-column label="客户名称" width="300" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ scope.row.linkmanName }}</span>
+          <span>{{ scope.row.customerName }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="公司联系人" width="200" align="center">
+      <el-table-column label="联系电话" width="200" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ scope.row.linkmanMobile }}</span>
+          <span>{{ scope.row.phone }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="公司邮箱" width="250" align="center">
+      <el-table-column label="邮箱" width="250" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ scope.row.linkmanEmail }}</span>
+          <span>{{ scope.row.email }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="状态"  align="center">
+      <el-table-column label="公司类型"  align="center" width="250" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-           <el-tag v-if="scope.row.status === 1" size="small">商用</el-tag>
-            <el-tag v-if="scope.row.status === 2" size="small" type="danger">暂停</el-tag>
+          <span>{{scope.row.customerTypeDetails}}</span>
+           <!-- <span v-if="scope.row.customerTypeDetails === 1" size="small">有限责任公司（自然人独资）</span>
+            <span v-if="scope.row.customerTypeDetails === 2" size="small">有限责任公司(自然人投资或控股)</span>
+            <span v-if="scope.row.customerTypeDetails === 3" size="small">股份有限公司</span>
+            <span v-if="scope.row.customerTypeDetails === 4" size="small">有限合伙企业</span>
+            <span v-if="scope.row.customerTypeDetails === 5" size="small">外商独资公司</span>
+            <span v-if="scope.row.customerTypeDetails === 6" size="small">个人独资企业</span>
+            <span v-if="scope.row.customerTypeDetails === 7" size="small">国有独资公司</span>
+            <span v-if="scope.row.customerTypeDetails === 8" size="small">其他</span> -->
         </template>
       </el-table-column>
-
-  <!-- <el-table-column label="地址">
-    <template slot-scope="scope">        
-      <div v-for="(item,index) in scope.row.customerUsers" :key="index"> -->
-        <el-table-column label="客户名称"  align="center">
+        <el-table-column label="法定代表人" width="250" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <div v-for="(item,index) in scope.row.customerUsers" :key="index">
-          <span>{{ item.customerName}}</span>
-          </div>
+          <span>{{ scope.row.legalPerson}}</span>
         </template>
         </el-table-column>
-
-        <el-table-column label="客户电话" width="250"  align="center">
-          <template slot-scope="scope">
-          <div v-for="(item,index) in scope.row.customerUsers" :key="index">
-            <span>{{item.customerTel}}</span>
-          </div>
-          </template>
+        <el-table-column label="经营范围" width="250" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.businessScope}}</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="注册资本" width="250" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.registeredCapital}}</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="成立日期" width="250" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.dateOfEstablishment}}</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="营业日期" width="250" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.businessDate}}</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="住所" width="250" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.residence}}</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="创建日期" width="250" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createDate}}</span>
+        </template>
+        </el-table-column>
+        <el-table-column label="修改日期" width="250" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.updateTime}}</span>
+        </template>
         </el-table-column>
+
   <!--     </div>
     </template>
   </el-table-column> -->
       
 
-      <el-table-column label="操作" fixed="right" width="235" min-width="150" align="center" v-if="type == 0">
+      <el-table-column label="操作" fixed="right" width="235" min-width="150" align="center" >
         <template slot-scope="scope">
-          <el-dropdown placement="bottom-start" trigger="click"  class="dropdown"  @command="handleCommand" >
-            <span class="el-dropdown-link"  @click="onuser">
-              <i  class="el-icon-aim"></i> 绑定账号<i class="el-icon-arrow-down el-icon--right"></i>
-            </span>
-            <el-dropdown-menu slot="dropdown">
-               <el-scrollbar style="height:150px;	max-height: 300px;" :wrapStyle="[{'overflow-x':'hidden'}]">
-                 <el-dropdown-item style="width:150px;text-align:center"  v-for="(item,index) in orderlist" :key="index" :command="beforeHandleCommand(scope.row,item.userId)">{{item.username}}</el-dropdown-item>
-               </el-scrollbar>
-             </el-dropdown-menu>
-          </el-dropdown>
           <!-- <el-button type="text" icon="el-icon-view"  @click="lookRecord(scope.row)">查看</el-button> -->
-          <!-- <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button> -->
-          <!-- <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button> -->
+          <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -123,7 +152,7 @@
      <!-- 新增修改界面 -->
     <el-dialog
       :title="isEditForm ? '编辑' : '新增'"
-      width="50%"
+      width="45%"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
     >
@@ -136,37 +165,44 @@
         style="text-align:left;"
         @keyup.enter.native="submitForm()"
       >
-        <el-form-item width="50px" label="客户名称" prop="name"  :label-width="formLabelWidth">
-          <el-input style="width:50%"  v-model="dataForm.customerName" placeholder="请输入优惠券名称" />
+        <el-form-item  label="客户名称" prop="customerName"  :label-width="formLabelWidth">
+          <el-input style="width:65%"  v-model="dataForm.customerName" placeholder="请输入客户名称" />
         </el-form-item>
-        <el-form-item style="width:50%"  label="手机" prop="name"  :label-width="formLabelWidth">
-          <el-input style="width:50%"  v-model="dataForm.phone" placeholder="请输入优惠券名称" />
+        <el-form-item   label="手机" prop="phone"  :label-width="formLabelWidth">
+          <el-input style="width:65%"  v-model="dataForm.phone" placeholder="请输入手机" />
         </el-form-item>
-        <el-form-item label="邮箱" prop="coupon" :label-width="formLabelWidth">
-          <el-input style="width:50%" v-model="dataForm.email" placeholder="请输入优惠券金额" />
+        <el-form-item label="邮箱" prop="email" :label-width="formLabelWidth">
+          <el-input style="width:65%" v-model="dataForm.email" placeholder="请输入邮箱" />
         </el-form-item>
-        <el-form-item label="公司类型" prop="coupon" :label-width="formLabelWidth">
-          <el-input style="width:50%" v-model="dataForm.email" placeholder="请输入优惠券金额" />
+        <el-form-item label="公司类型" prop="type" :label-width="formLabelWidth">
+         <el-select style="width:65%" v-model="dataForm.type"  size="medium" clearable value-key="areaId" filterable placeholder="请选择公司类型" >
+              <el-option
+              v-for="item in customerType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+        </el-select>
         </el-form-item>
-        <el-form-item label="法定代表人" prop="coupon" :label-width="formLabelWidth">
-          <el-input style="width:50%" v-model="dataForm.legalPerson" placeholder="请输入优惠券金额" />
+        <el-form-item label="法定代表人" prop="legalPerson" :label-width="formLabelWidth">
+          <el-input style="width:65%" v-model="dataForm.legalPerson" placeholder="请输入优惠券金额" />
         </el-form-item>
-        <el-form-item label="经营范围" prop="coupon" :label-width="formLabelWidth">
-          <el-input style="width:50%" v-model="dataForm.businessScope" placeholder="请输入优惠券金额" />
+        <el-form-item label="经营范围" prop="businessScope" :label-width="formLabelWidth">
+          <el-input style="width:65%" v-model="dataForm.businessScope" placeholder="请输入优惠券金额" />
         </el-form-item>
-        <el-form-item label="注册资本" prop="coupon" :label-width="formLabelWidth">
-          <el-input style="width:50%" v-model="dataForm.registeredCapital" placeholder="请输入优惠券金额" />
+        <el-form-item label="注册资本" prop="registeredCapital" :label-width="formLabelWidth">
+          <el-input style="width:65%" v-model="dataForm.registeredCapital" placeholder="请输入优惠券金额" />
         </el-form-item>
-        <el-form-item label="住所" prop="coupon" :label-width="formLabelWidth">
-          <el-input style="width:50%" v-model="dataForm.residence" placeholder="请输入优惠券金额" />
+        <el-form-item label="住所" prop="residence" :label-width="formLabelWidth">
+          <el-input style="width:65%" v-model="dataForm.residence" placeholder="请输入优惠券金额" />
         </el-form-item>
         <el-form-item label="成立日期" prop="dateOfEstablishment" :label-width="formLabelWidth">
           <el-date-picker
             v-model="dataForm.dateOfEstablishment"
             type="datetime"
-            style="width:50%" 
+            style="width:65%" 
             format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-ddTHH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择开始日期时间"
           />
         </el-form-item>
@@ -174,16 +210,16 @@
           <el-date-picker
             v-model="dataForm.businessDate"
             type="datetime"
-            style="width:50%" 
+            style="width:65%" 
             format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-ddTHH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择结束日期时间"
           />
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button :size="size" @click="dialogVisible = false">取消</el-button>
-        <el-button :size="size" type="primary" :loading="editLoading" @click="submitEditForm">确定</el-button>
+        <el-button :size="size" type="primary" @click="submitEditForm">确定</el-button>
       </span>
     </el-dialog>
 
@@ -192,8 +228,8 @@
 </template>
 
 <script>
-import {Listarea} from '@/api/dataForm'
-import { getList,addRecord,editRecord,deleteRecord,priceList,deletePrice,editperform,userOrder,editOrder} from '@/api/record'
+import {Listarea,} from '@/api/dataForm'
+import { customerList,addCustomer,editCustomer,deleteCustomer} from '@/api/record'
 import { parseTime } from '@/utils/index'
 import { getUserInfo} from '@/api/user'
 
@@ -204,47 +240,61 @@ export default {
       tableData: [],
       priceData:[],
       customerName:"",
+      typeId:"",
+      customerType:[
+        {id:1,name:"有限责任公司（自然人独资）"},
+        {id:2,name: "有限责任公司(自然人投资或控股)"},
+        {id:3,name: "股份有限公司"},
+        {id:4,name: "有限合伙企业"},
+        {id:5,name: "外商独资公司"},
+        {id:6,name: "个人独资企业"},
+        {id:7,name: "国有独资公司"},
+        {id:8,name: "其他"}
+
+      ],
       areaList:[],
       query: {
         name: ''
       },
-      title: '',
-      dialogFormVisible: false, // 控制弹出框
-      recordVisible:false,
       formLabelWidth: '120px',
       isEditForm: false,
       currentPage: "1",
       pageSize: 10,
       total: 0, // 总数量
-      // 分类菜单列表
-      deptData: [],
-      lookCord:[], //查看
-      // tree配置项
-      deptTreeProps: {
-        label: 'name',
-        children: 'children'
-      },
-      applyTime:null,
-      editable:[],
       dataForm: {
       },
       // 表单校验
-      dataRule: {},
+      dataRule: {
+        customerName: [
+          { required: true, message: "请输入客户名称", trigger: "blur" },
+        ],
+        // phone: [
+        //   { required: true, message: "请输入手机号", trigger: "blur" },
+        //   { validator: checkTel, trigger: "change" },
+        // ],
+        email: [
+          // { required: true, message: "请输入邮箱", trigger: "blur" },
+          {
+            pattern:
+              /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
+            message: "输入邮箱不合法",
+          },
+        ],
+        // type: [
+        //   { required: true, message: "请选择用户类型", trigger: "change" },
+        // ],
+        // roleList: [
+        //   { required: true, message: "请选择角色", trigger: "change" },
+        // ],
+      },
       loading: false,
       dialogVisible: false,
-      editLoading: false,
-      priceVisible:false,
-      appId:"",
-      partnerId:"",
-      onOpen:false,
-      userId:"",
-      type:"",
-      orderlist:[]
+
 
     }
   },
   created() {
-    this.findUserInfo()
+    this.getTenantList()
     console.log("res")
   },
   methods: {
@@ -252,13 +302,11 @@ export default {
     getTenantList: function() {
       this.loading = true
       const params = new URLSearchParams()
-      params.append('customerId', this.customerName)
+      params.append('type', this.typeId)
+      params.append('customerName', this.customerName)
       params.append('current', this.currentPage)
       params.append('size', this.pageSize)
-      params.append('appName', this.query.name)
-      params.append('type', this.type)
-      params.append('userId', this.userId)
-      getList(params).then(response => {
+      customerList(params).then(response => {
         // console.log("code")
         console.log(response)
         this.loading = false
@@ -267,62 +315,8 @@ export default {
         this.total = response.data.data.total;
       })
     },
-      oncityList(){
-        const params = new URLSearchParams()
-        params.append('userId', this.userId)
-        params.append('type', this.type)
-        Listarea(params).then(res=>{
-          this.areaList=res.data.data
-        })
-      },
-       // 加载用户个人信息
-    findUserInfo: function() {
-      getUserInfo().then((res) => {
-      this.userId=res.data.data.userId
-      this.type=res.data.data.type
-      this.getTenantList()
-      })
 
-    },
-    //绑定账号
-    userinfo:function(){
-          userOrder().then(res=>{
-            this.orderlist=res.data.data
-            if(res.data.data == [] && res.data.data == null  ){
-                this.$message({
-                  message: '无绑定账号',
-                  type: 'warning'
-                });
-            }
-          })
-    },
-    beforeHandleCommand(row,id){
-       return {
-	        areaManagerId: id, //key 是你自己想要的字段，值自己定义
-	        row: row,
-	      };
-    },
-    onuser:function(){
-      this.userinfo()
-    },
-    handleCommand:function(command){
-      console.log(command)
-              console.log(this.dataForm)
-              let value={"customerId":command.row.customerId,"userId":command.areaManagerId}
-              console.log(value)
-       this.$confirm('确认提交吗？', '提示', {}).then(() => {
-              editOrder(value).then((res) => {
-                if (res.data.code === 200) {
-                  this.$message({ message: '操作成功', type: 'success' }) 
-                  this.getTenantList()
-                } else {
-                  this.$message({ message: res.data.msg, type: 'error' })
-                }
-               
-              })
-            })
-    },
-    // 查找
+
     handleFind: function() {
       this.currentPage="1"
       this.getTenantList()
@@ -348,83 +342,35 @@ export default {
       this.isEditForm = false
       this.dialogVisible = true
       this.dataForm = {}
+      if(this.$refs['dataForm']){
+      this.$refs["dataForm"].resetFields();
+      }
     },
     // 编辑界面
     handleEdit: function(row) {
       this.isEditForm = true
       this.dialogVisible = true
-      this.dataForm = row
-    },
-    //价格调整
-    // priceRecord(row){
-    //   this.priceVisible=true
-    //   this.onOpen=false
-    //   this.appId=row.appId,
-    //   this.partnerId=row.partnerId
-    //   priceList({
-    //       appId:row.appId,
-    //       partnerId:row.partnerId
-    //   }).then(res=>{
-    //     this.priceData=res.data.data
-    //     console.log(this.priceData)
-    //      let len = this.priceData.length;       
-    //      new Array(len)
-    //      this.editable = new Array(len);
-    //   })
-      
-    // },
-
-    //文本框失去焦点
-    onBurl(value,number){
-        if(value && number){
-          this.onOpen=false
-        }
-    },
-    //添加价格
-    priceAdd(row){
-          this.priceData.push({
-            appId: this.appId,
-            facePrice: "",
-            partnerId: this.partnerId,
-            payPrice: "",
-        })
-        let len = this.priceData.length;       
-         new Array(len)
-         this.editable = new Array(len);
-        this.priceEdit(this.priceData.length-1)
-        this.onOpen=true
-        // console.log(this.priceData.slice(-2))
+      this.dataForm = JSON.parse(JSON.stringify(row)) 
+      if(this.$refs['dataForm']){
+      this.$refs["dataForm"].resetFields();
+      }
     },
-    //删除价格
-    priceDelete(row,index){
-       if(row.id==undefined){
-          this.priceData.splice(index)
-          this.onOpen=false
-          console.log(index)
-          console.log(this.priceData)
-       }else{
-        this.$confirm('此操作将删除该价格, 是否继续?', '提示', {
+    //删除
+    handleDelete(row,index){
+  
+        this.$confirm('此操作将删除该公司, 是否继续?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
         })
             .then(() => {
-              deletePrice(row.id).then(response => {
+              deleteCustomer(row.customerId).then(response => {
                 if (response.data.code === 200) {
                   this.$message({
                     type: 'success',
                     message: '操作成功'
                   })
-                       priceList({
-                                appId:this.appId,
-                                partnerId:this.partnerId
-                            }).then(res=>{
-                              this.priceData=res.data.result
-                              console.log(this.priceData)
-                              let len = this.priceData.length;       
-                              new Array(len)
-                              this.editable = new Array(len);
-                            })
+              this.getTenantList()
                 } else {
                   this.$message({
                     type: 'error',
@@ -439,128 +385,40 @@ export default {
                 message: '已取消删除'
               })
             })
-       }
      
     },
-    //编辑
-    priceEdit(row,index){
-      
-        this.editable[row]==true
-        // console.log(this.editable[row])
-        this.editable[row] == !this.editable[row]
-      if(this.editable[row]==undefined || this.editable[row]==false){
-        this.editable[row] = true;
-        this.$set(this.editable,row,true)
-        this.editable[row] == !this.editable[row]
-        // console.log(this.editable[row])
-      }
-      else{
-        this.$set(this.editable,row,false)
-      }
-      
-    },
-    //完成修改
-    perform(){
-      console.log(this.priceData)
-            this.$confirm('确认提交吗？', '提示', {}).then(() => {
-              this.editLoading = true
-              console.log("11223"+ JSON.stringify(this.dataForm))
-               editperform(this.priceData).then((res) => {
-                if (res.data.code === 200) {
-                  this.$message({ message: '操作成功', type: 'success' })
-                } else {
-                  this.$message({ message: res.data.msg, type: 'error' })
-                }
-                this.editLoading = false
-                this.priceVisible = false
-              })
-                this.editLoading = false
-                this.priceVisible = false
+    
+    submitEditForm(){
+       this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          if (this.isEditForm) {
+                // 更新字典
+            editCustomer(this.dataForm).then((res) => {
+              if (res.data.code === 200) {
+                this.$message({ message: '操作成功', type: 'success' })
+              } else {
+                this.$message({ message: res.data.msg, type: 'error' })
+              }
+              this.dialogVisible = false
+              this.getTenantList()
             })
-    },
-
-
-
-
-    handleDelete: function(row) {
-      const that = this
-      this.$confirm('此操作将删除该商户, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          deleteRecord(row.uuid).then(response => {
-            if (response.data.code === 200) {
-              this.$message({
-                type: 'success',
-                message: '操作成功'
-              })
-              that.getTenantList()
-            } else {
-              this.$message({
-                type: 'error',
-                message: response.data.msg
-              })
-            }
-          })
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    },
-    submitEditForm: function() {
-      this.dataForm.activityStatus=false
-      console.log(this.dataForm)
-      if (this.isEditForm) {
-        console.log("编辑")
-        this.$refs['dataForm'].validate((valid) => {
-          console.log("11" + valid)
-          if (valid) {
-            this.$confirm('确认提交吗？', '提示', {}).then(() => {
-              this.editLoading = true
-              console.log("11223"+ JSON.stringify(this.dataForm))
-              editRecord(this.dataForm).then((res) => {
-                if (res.data.code === 200) {
-                  this.$message({ message: '操作成功', type: 'success' })
-                } else {
-                  this.$message({ message: res.data.msg, type: 'error' })
-                }
-                this.editLoading = false
-                this.dataForm = {}
-                this.recordVisible = false
-                this.getTenantList()
-              })
+          } else {
+             // 新增字典
+            addCustomer(this.dataForm).then((res) => {
+              if (res.data.code === 200) {
+                this.$message({ message: '操作成功', type: 'success' })
+              } else {
+                this.$message({ message: res.data.msg, type: 'error' })
+              }
+              this.dialogVisible = false
+              this.getTenantList()
+              this.$refs['dataForm'].resetFields()
             })
           }
-        })
-      } else {
-        this.$refs['dataForm'].validate((valid) => {
-        console.log("11223"+ JSON.stringify(this.dataForm))
-        console.log("新增")
-          if (valid) {
-            this.$confirm('确认提交吗？', '提示', {}).then(() => {
-              console.log("新增加商户"+this.dataForm)
-              addRecord(this.dataForm).then((res) => {
-                this.editLoading = true
-                if (res.data.code === 200) {
-                  this.$message({ message: '操作成功', type: 'success' })
-                } else {
-                  this.$message({ message: res.data.msg, type: 'error' })
-                }
-                this.editLoading = false
-                this.$refs['dataForm'].resetFields()
-                this.recordVisible = false
-                this.getTenantList()
-              })
-            })
-          }
-        })
-      }
+        }
+      })
     }
+
   }
 }
 </script>

src/views/tender/index.vue

@@ -22,27 +22,27 @@
       </el-button>-->
     </div> 
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" border style="width: 100%;">
+    <el-table v-loading="loading" :data="data"  style="width: 100%;">
 
        <el-table-column prop="title" label="标题" align="center" />
 
       <el-table-column label="状态"  align="center">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status ==1">进行中</el-tag>
-          <el-tag type="info" v-if="scope.row.status ==2">已结束</el-tag>
-          <el-tag type="danger" v-if="scope.row.status ==3">已作废</el-tag>
+          <el-tag v-if="scope.row.tenderStatus ==1">进行中</el-tag>
+          <el-tag type="info" v-if="scope.row.tenderStatus ==2">已结束</el-tag>
+          <el-tag type="danger" v-if="scope.row.tenderStatus ==3">已作废</el-tag>
         </template>
       </el-table-column>
 
        <el-table-column label="结果"  align="center">
         <template slot-scope="scope">
-          <el-tag type="info" v-if="scope.row.status ==1">未参与</el-tag>
-          <el-tag type="success" v-if="scope.row.status ==2">已中标</el-tag>
-          <el-tag type="danger" v-if="scope.row.status ==3">未中标</el-tag>
+          <el-tag type="info" v-if="scope.row.status == 1">未参与</el-tag>
+          <el-tag type="success" v-if="scope.row.status == 2">已中标</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == 3">未中标</el-tag>
         </template>
       </el-table-column>
 
-      <el-table-column prop="description" :show-overflow-tooltip="true" label="报价式" align="center" >
+      <el-table-column prop="description" :show-overflow-tooltip="true" label="报价方式" align="center" >
         <template slot-scope="scope">
             <span v-if="scope.row.priceQuotes == 1">总价</span>
             <span v-if="scope.row.priceQuotes == 2">单价</span>
@@ -59,8 +59,8 @@
 
       <el-table-column label="操作" width="250" align="center">
         <template slot-scope="scope">
-          <el-button slot="reference" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">投标</el-button>
-          <el-button slot="reference" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">改标</el-button>
+          <el-button slot="reference" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">投标</el-button>
+          <el-button slot="reference" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">改标</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -81,16 +81,16 @@
     <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '发布新标' : '修改新标'" width="50%">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-form-item label="报价方式">
-            <el-radio v-model="form.radio" label="1">总价</el-radio>
-            <el-radio v-model="form.radio" label="2">单价</el-radio>
+            <el-radio v-model="form.priceQuotes" :label="1">总价</el-radio>
+            <el-radio v-model="form.priceQuotes" :label="2">单价</el-radio>
         </el-form-item>
         <el-form-item label="报价" prop="dictCode">
-          <el-input v-model="form.dictName" style="width: 170px;" placeholder="请输入金额" ><template slot="append">元</template></el-input>
+          <el-input v-model="form.price" style="width: 170px;" placeholder="请输入金额" ><template slot="append">元</template></el-input>
         </el-form-item>
-         <el-form-item label="备注" prop="remarks">
+         <el-form-item label="备注" prop="remarks" >
           <el-input
             type="textarea"
-            style="width: 50%;"
+            style="width: 370px;"
             :autosize="{ minRows: 2, maxRows: 10}"
             placeholder="请输入内容"
             v-model="form.remarks">
@@ -100,11 +100,19 @@
           <el-upload
             class="upload-demo"
             drag
-            action="https://jsonplaceholder.typicode.com/posts/"
+            :limit="1"
+            :on-preview="handlePreview"
+            :on-change="handleChange"
+            :on-remove="handleRemove"
+            :before-remove="beforeRemove"
+            :on-exceed="handleExceed"
+            action="/tender/upload"
+            list-type="text"
+            :file-list="fileList"
             multiple>
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+            <!-- <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div> -->
           </el-upload>
         </el-form-item>