zerp hace 2 años
padre
commit
15a9dd1a7a

+ 2 - 2
config/index.js

@@ -7,10 +7,10 @@ module.exports = {
 
     dev: {
         assetsSubDirectory: 'static',
-        assetsPublicPath: '/bid',
+        assetsPublicPath: '/',
         proxyTable: {
             '/': {
-                // target: 'http://43.136.176.26:7001', //后端接口地址     中间人运营平台
+                // target: 'http://47.108.151.62:80/pre', //后端接口地址     中间人运营平台
                 target: 'http://127.0.0.1:28080', //后端接口地址   
                 changeOrigin: true, //是否跨域
                 pathRewrite: {

+ 17 - 6
src/views/bid/index.vue

@@ -88,7 +88,9 @@
     <el-dialog :append-to-body="true" :close-on-click-modal="false" :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="请输入标题" />
+          <div class="padding" style="width: 370px;">
+          <el-input v-model="form.title"  maxlength="200" show-word-limit placeholder="请输入标题" />
+          </div>
         </el-form-item>
         <el-form-item label="备注" prop="remarks" >
           <el-input
@@ -96,6 +98,8 @@
             style="width: 370px;"
             :autosize="{ minRows: 2, maxRows: 10}"
             placeholder="请输入内容"
+            maxlength="500"
+            show-word-limit
             v-model="form.remarks">
           </el-input>
         </el-form-item>
@@ -109,7 +113,7 @@
             :on-remove="handleRemove"
             :before-remove="beforeRemove"
             :on-exceed="handleExceed"
-            action="/tender/upload"
+            :action="BASE_API+'/tender/upload'"
             list-type="text"
             :file-list="fileList"
             multiple>
@@ -194,9 +198,9 @@
       <el-table-column prop="userName" label=" 投标帐号" align="center"/>
       <el-table-column prop="status" label=" 投标结果" align="center" >
          <template slot-scope="scope">
-           <el-tag type="success" v-if="scope.row.status == 0">已提交</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="warning" v-if="scope.row.status == 0">已提交</el-tag>
+          <el-tag type="success" v-if="scope.row.status == 1">已中标</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == 2">未中标</el-tag>
         </template>
       </el-table-column>
 
@@ -243,6 +247,7 @@ export default {
       },
       data:[],
       fileList:[],
+      BASE_API:process.env.BASE_API,
       dialog:false,
       delLoading:false,
       viewDialog:false,
@@ -306,7 +311,7 @@ console.log(this.bidDate)
       // params.append('path', row)
       let a =document.createElement('a')
       // a.href= /bidding/load
-      let url = window.location.origin + "/bidding/load?path=" + encodeURIComponent(row)
+      let url = window.location.origin + process.env.BASE_API + "/bidding/load?path=" + encodeURIComponent(row)
        a.href = url
        a.click()
     },
@@ -506,4 +511,10 @@ console.log(this.bidDate)
 <style scoped>
 /* 去掉上传附件时候的过度效果 */
   ::v-deep .el-upload-list__item{transition: none !important;}
+   ::v-deep .el-textarea__inner{
+  padding-bottom: 36px;
+}
+.padding /deep/ .el-input--medium .el-input__inner {
+    padding-right: 56px;
+}
 </style>

+ 29 - 16
src/views/client/record.vue

@@ -185,34 +185,34 @@
         </el-select>
         </el-form-item>
         <el-form-item label="法定代表人" prop="legalPerson" :label-width="formLabelWidth">
-          <el-input style="width:65%" v-model="dataForm.legalPerson" placeholder="请输入优惠券金额" />
+          <el-input style="width:65%" v-model="dataForm.legalPerson" placeholder="请输入法人" />
         </el-form-item>
         <el-form-item label="经营范围" prop="businessScope" :label-width="formLabelWidth">
-          <el-input style="width:65%" v-model="dataForm.businessScope" placeholder="请输入优惠券金额" />
+          <el-input style="width:65%" v-model="dataForm.businessScope" placeholder="请输入经营范围" />
         </el-form-item>
         <el-form-item label="注册资本" prop="registeredCapital" :label-width="formLabelWidth">
-          <el-input style="width:65%" v-model="dataForm.registeredCapital" placeholder="请输入优惠券金额" />
+          <el-input style="width:65%" v-model="dataForm.registeredCapital" placeholder="请输入注册资本" />
         </el-form-item>
         <el-form-item label="住所" prop="residence" :label-width="formLabelWidth">
-          <el-input style="width:65%" v-model="dataForm.residence" placeholder="请输入优惠券金额" />
+          <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"
+            type="date"
             style="width:65%" 
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
             placeholder="选择开始日期时间"
           />
         </el-form-item>
         <el-form-item label="营业日期" prop="businessDate" :label-width="formLabelWidth">
           <el-date-picker
             v-model="dataForm.businessDate"
-            type="datetime"
+            type="date"
             style="width:65%" 
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
             placeholder="选择结束日期时间"
           />
         </el-form-item>
@@ -235,6 +235,15 @@ import { getUserInfo} from '@/api/user'
 
 export default {
   data() {
+     const checkTel = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入手机号码'))
+      } else if (!this.checkMobile(value)) {
+        callback(new Error('手机号码不合法'))
+      } else {
+        callback()
+      }
+    }
     return {
       size: 'small',
       tableData: [],
@@ -268,12 +277,12 @@ export default {
         customerName: [
           { required: true, message: "请输入客户名称", trigger: "blur" },
         ],
-        // phone: [
-        //   { required: true, message: "请输入手机号", trigger: "blur" },
-        //   { validator: checkTel, trigger: "change" },
-        // ],
+        phone: [
+          { required: true, message: "请输入手机号", trigger: "blur" },
+          { validator: checkTel, trigger: "change" },
+        ],
         email: [
-          // { required: true, message: "请输入邮箱", trigger: "blur" },
+          { required: true, message: "请输入邮箱", trigger: "blur" },
           {
             pattern:
               /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
@@ -315,7 +324,11 @@ export default {
         this.total = response.data.data.total;
       })
     },
-
+ // 验证手机号
+    checkMobile(str) {
+      const reg = /^1[3456789]\d{9}$/
+      return reg.test(str)
+    },
 
     handleFind: function() {
       this.currentPage="1"

+ 2 - 2
src/views/login/index.vue

@@ -207,8 +207,8 @@ export default {
   name: 'Login',
   data() {
     const validatePassword = (rule, value, callback) => {
-      if (value.length < 2) {
-        callback(new Error('The password can not be less than 6 digits'))
+      if (value.length < 1) {
+        callback(new Error('密码不能为空'))
       } else {
         callback()
       }

+ 14 - 8
src/views/tender/index.vue

@@ -30,9 +30,9 @@
         <template slot-scope="scope">
           <!-- {{scope.row.bidding.status}} -->
           <el-tag type="info" v-if="scope.row.status == null">未参与</el-tag>
-          <el-tag type="success" v-if="scope.row.status == 0">已提交</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="warning" v-if="scope.row.status == 0">已提交</el-tag>
+          <el-tag type="success" v-if="scope.row.status == 1">已中标</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == 2">未中标</el-tag>
         </template>
       </el-table-column>
 
@@ -91,6 +91,8 @@
             type="textarea"
             style="width: 370px;"
             :autosize="{ minRows: 2, maxRows: 10}"
+             maxlength="500"
+             show-word-limit
             placeholder="请输入内容"
             v-model="form.remarks">
           </el-input>
@@ -105,7 +107,7 @@
             :on-remove="handleRemove"
             :before-remove="beforeRemove"
             :on-exceed="handleExceed"
-            action="/bidding/upload"
+            :action="BASE_API+'/bidding/upload'"
             list-type="text"
             :file-list="fileList"
             multiple>
@@ -149,9 +151,9 @@
       <el-table-column prop="status" label=" 投标结果" align="center" >
          <template slot-scope="scope">
            <el-tag type="info" v-if="scope.row.status == null">未参与</el-tag>
-          <el-tag type="success" v-if="scope.row.status == 0">已提交</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="warning" v-if="scope.row.status == 0">已提交</el-tag>
+          <el-tag type="success" v-if="scope.row.status == 1">已中标</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == 2">未中标</el-tag>
           <!-- <span v-if="scope.row.status == 0">已提交</span>
           <span v-if="scope.row.status == 1">中标</span>
           <span v-if="scope.row.status == 2">未中标</span> -->
@@ -200,6 +202,7 @@ export default {
       form: {
       },
       data:[],
+      BASE_API:process.env.BASE_API,
       dialog:false,
       loading:false,
       delLoading:false,
@@ -292,7 +295,7 @@ export default {
       // params.append('path', row)
       let a =document.createElement('a')
       // a.href= /bidding/load
-      let url = window.location.origin + "/bidding/load?path=" + encodeURIComponent(row)
+      let url = window.location.origin + process.env.BASE_API + "/bidding/load?path=" + encodeURIComponent(row)
        a.href = url
        a.click()
     },
@@ -398,5 +401,8 @@ export default {
 <style scoped>
 /* 去掉上传附件时候的过度效果 */
   ::v-deep .el-upload-list__item{transition: none !important;}
+  ::v-deep .el-textarea__inner{
+  padding-bottom: 36px;
+}
 </style>
 

+ 2 - 2
src/views/user/index.vue

@@ -60,9 +60,9 @@
                   <el-form-item label="手机号">
                     <el-input v-model="user.phone" />
                   </el-form-item>
-                  <el-form-item label="用户邮箱">
+                  <!-- <el-form-item label="用户邮箱">
                     <el-input v-model="user.email" :disabled="true" />
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="所属部门">
                     <el-input v-model="user.deptName" :disabled="true" />
                   </el-form-item>