客户管理

config/index.js

@@ -10,9 +10,9 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/': {
-                target: 'http://47.108.151.62:80/pre', //后端接口地址     中间人运营平台
+                // target: 'http://47.108.151.62:80/pre', //后端接口地址     中间人运营平台
                 // target: 'http://127.0.0.1:28080', //后端接口地址   
-                // target: 'http://192.168.3.8:7001', //后端接口地址   
+                target: 'http://192.168.3.12:7001', //后端接口地址   
                 changeOrigin: true, //是否跨域
                 pathRewrite: {
                     '^/': '/', //重写,
@@ -22,7 +22,7 @@ module.exports = {
         },
 
         // 本地开发使用   192.168.0.126  localhost
-        host: '127.0.0.1',
+        host: '192.168.3.226',
         // host: '192.168.124.14',
         port: 8081,
         autoOpenBrowser: true,

src/api/record.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { method } from 'lodash'
 
 // 获取所有配置价格
 export function customerList(parms) {
@@ -49,3 +50,20 @@ export function userRoles() {
   })
 }
 
+// 获取下载模板URL
+
+export function apiFile(){
+  return request({
+    url:"/file/template/customer",
+    method:"get"
+  })
+}
+
+// 批量上传客户
+export function addBatch(data){
+  return request({
+    url:"/customer/batch",
+    method:"post",
+    data:data
+  })
+}

src/views/client/record.vue

@@ -71,19 +71,33 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="公司类型" align="center" width="250" :show-overflow-tooltip="true">
+      <el-table-column label="投标类型" align="center" width="250" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <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.customerBidType === 1" size="small">物流</span>
+            <span v-if="scope.row.customerBidType === 2" size="small">原料</span>
+            <span v-if="scope.row.customerBidType === 3" size="small">销售</span>
+            <span v-if="scope.row.customerBidType === 4" size="small">加工承揽</span>
+            <span v-if="scope.row.customerBidType === 0" 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="公司类型" align="center" width="250" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <!-- <span>{{ scope.row.customerTypeDetails }}</span> -->
+          <span v-if="scope.row.type === 1" size="small">有限责任公司（自然人独资）</span>
+            <span v-if="scope.row.type === 2" size="small">有限责任公司(自然人投资或控股)</span>
+            <span v-if="scope.row.type === 3" size="small">股份有限公司</span>
+            <span v-if="scope.row.type === 4" size="small">有限合伙企业</span>
+            <span v-if="scope.row.type === 5" size="small">外商独资公司</span>
+            <span v-if="scope.row.type === 6" size="small">个人独资企业</span>
+            <span v-if="scope.row.type === 7" size="small">国有独资公司</span>
+            <span v-if="scope.row.type === 8" size="small">其他</span>
+            <span v-if="scope.row.type === 0" size="small">未知</span>
+        </template>
+      </el-table-column>
       <el-table-column label="法定代表人" width="250" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.legalPerson }}</span>
@@ -188,7 +202,7 @@
                 <div>2、上传填写好的文件</div>
                 <i class="el-icon-document"></i>
                 <el-upload
-                  :action="BASE_API+'/tender/upload'"
+                  :action="BASE_API+'/customer/batch'"
                   :on-preview="handlePreview"
                   :on-change="handleChange"
                   :on-remove="handleRemove"
@@ -368,7 +382,7 @@
 
 <script>
 import { Listarea } from '@/api/dataForm'
-import { customerList, addCustomer, editCustomer, deleteCustomer,userRoles } from '@/api/record'
+import { customerList, addCustomer, editCustomer, deleteCustomer,userRoles,apiFile } from '@/api/record'
 import { parseTime } from '@/utils/index'
 import { getUserInfo,vailUserName } from '@/api/user'
 
@@ -453,18 +467,22 @@ export default {
         //   { required: true, message: "请选择角色", trigger: "change" },
         // ],
       },
+
+
       loading: false,
       dialogVisible: false,
       batchVisible:false,
        BASE_API: process.env.BASE_API,
        fileList: [],
-      roles:[]
+      roles:[],
+      fileUrl:"",
 
     }
   },
   created() {
     this.getTenantList()
     this.onRoles()
+    this.getFile()  //获取模板地址
     console.log('res')
   },
   methods: {
@@ -484,6 +502,13 @@ export default {
         console.log('1' + response.data.data.records)
         this.total = response.data.data.total
       })
+    },
+    // 获取模板url
+    getFile(){
+      apiFile().then((res)=>{
+        console.log(res)
+        this.fileUrl = res.data.data.path
+      })
     },
      // 文件移除的时候
     handleRemove(file, fileList) {
@@ -496,7 +521,7 @@ export default {
       if (file.response) {
         console.log(file.response, 'file')
         if (file.response.code == '200') {
-          this.form.appendix = file.response.data
+          // this.form.appendix = file.response.data
         } else {
           Notification.error({
             title: file.response.msg,
@@ -530,7 +555,8 @@ export default {
       })
     },
     onFile(){
-      Window.location.href = ""
+        // let url = "https://fire-development.oss-cn-beijing.aliyuncs.com/bid/dev/客户批量上传模板.xlsx"
+        window.open(this.fileUrl, '_self');
     },
     // 验证手机号
     checkMobile(str) {

src/views/tender/index.vue

@@ -80,10 +80,10 @@
 
     <!-- 投标详情 -->
     <el-dialog :append-to-body="true" fullscreen :visible.sync="dialog" title="投标详情" center>
-        <el-steps :active="active" align-center finish-status="success">
+        <!-- <el-steps :active="active" align-center finish-status="success">
           <el-step title="选择标" ></el-step>
           <el-step title="投递标"></el-step>
-        </el-steps>
+        </el-steps> -->
       <ckTable ref="ckTable" @click="handleSelectionChange" v-show="active == 0"></ckTable>
 
     <div style="height:20px"></div>
@@ -99,7 +99,7 @@
             <td style="width:30%">邀请招标</td>
         </tr>
     </table>
-      <el-table  :data="dialogTableData" border v-show="active == 1">
+      <!-- <el-table  :data="dialogTableData" border v-show="active == 1">
             <el-table-column label="货物" width="275px" fixed="left" align="center" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <span>散稻</span>
@@ -128,7 +128,9 @@
         </template>
       </el-table-column>
 
-      </el-table>
+      </el-table> -->
+
+    <!-- <div style="height:10px"></div> -->
 
         <table border="1px" cellpadding="10" cellspacing="0" class="ckTable">
         <tr>
@@ -139,8 +141,8 @@
                 3、运输过程中投标方需按国林源诚要求提供固定车队，所有车辆/船舶均安装GPS定位系统，主动配合完成车（船）载摄像头安装，并按照国林源诚相关要求完成物流监管系统的监管任务，自愿接受国林源诚统一运输管理；<br/>
                 4、如需转存、倒仓等操作需提前三个工作日以书面形式上报至国林源诚审批备案。作业价格为包干单价，含提送货费、保险费、税金以及市场风险全包等一切费用，报价一旦发出，视为报价有效，不做任何更改说明。
                 5、中标方需提供的增值税专用发票为 9  %；若提供其它税率的发票，按中标价折扣运费税差。<br/>
-                6.如发生运输作业，运输损耗标准按照：按每车计算，省内不得超过每车货物数量的1 ‰，省外不得超过每车货物数量的2‰。<br/>
-                7.在储存库点作业时，中标公司应有能力提供翻转平台或吊装机至储存库点作业<br/>
+                6、如发生运输作业，运输损耗标准按照：按每车计算，省内不得超过每车货物数量的1 ‰，省外不得超过每车货物数量的2‰。<br/>
+                7、在储存库点作业时，中标公司应有能力提供翻转平台或吊装机至储存库点作业<br/>
                 8、中标方需按照国林源诚要求保证运输货物完好、不撒漏、防偷盗、防雨湿，如发生任何质量问题，将追究投标方违约责任；
             </td>
         </tr>

src/views/tender/table.vue

@@ -104,6 +104,14 @@
           <span>保证金500 运输完成之后返还</span>
         </template>
       </el-table-column>
+        <el-table-column label="操作" width="250" fixed="right" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">投标</el-button>
+          <el-button v-if="scope.row.tenderStatus == 1 && scope.row.status == null" slot="reference" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">投标</el-button>
+          <el-button v-if="scope.row.tenderStatus == 1 && scope.row.status == 0" slot="reference" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">改标</el-button>
+          <el-button v-if="scope.row.tenderStatus == 2 || scope.row.tenderStatus == 3" slot="reference" icon="el-icon-view" type="text" @click="handleView(scope.row)">投标详情</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <!--分页-->