bug修改

.env.dev

@@ -8,9 +8,9 @@ VUE_APP_TITLE = 爱思系统
 # 赵培清
 # VUE_APP_BASE_API = 'http://192.168.100.213:48080'
 # 王东坡
-VUE_APP_BASE_API = 'http://192.168.100.64:48081'
+# VUE_APP_BASE_API = 'http://192.168.100.64:48081'
 # 测试
-# VUE_APP_BASE_API = 'http://47.103.79.143:48081'
+VUE_APP_BASE_API = 'http://47.103.79.143:48081'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/crm/business/index.vue

@@ -60,21 +60,17 @@
 
     <el-table v-loading="loading" :data="dataList">
       <el-table-column label="商机编号" align="center" prop="opportunityCode" min-width="350" />
-      <el-table-column label="商机名称" align="center" prop="opportunityName" min-width="100" />
-      <el-table-column label="客户名称" align="center" prop="customerName" min-width="120" />
+      <el-table-column label="商机名称" align="center" prop="opportunityName" min-width="150" />
+      <el-table-column label="客户名称" align="center" prop="customerName" min-width="150" />
       <el-table-column label="预计赢单机率" align="center" prop="winRate" min-width="100">
         <template v-slot="scope">
           <span>{{ scope.row.winRate == 0 ? '高' : scope.row.winRate == 1 ? '中' : '低' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="预计合同金额" align="center" prop="estimatedContractAmount" min-width="100" />
+      <el-table-column label="预计合同金额(元)" align="center" prop="estimatedContractAmount" min-width="150" />
       <el-table-column label="预计项目毛利" align="center" prop="estimatedProjectMargin" min-width="150" />
       <el-table-column label="预计项目成功率" align="center" prop="estimatedSuccessRate" min-width="150" />
-      <el-table-column label="预计进单时间" align="center" prop="estimatedDealTime" min-width="150">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="预计进单时间" align="center" prop="estimatedDealTime" min-width="150"/>
       <el-table-column label="商机等级" align="center" prop="opportunityLevel" min-width="80">
         <template v-slot="scope">
           <span>{{ scope.row.opportunityLevel == 0 ? '潜在' : scope.row.opportunityLevel == 1 ? '可能' : '重点跟进' }}</span>
@@ -134,8 +130,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="合同金额" prop="estimatedContractAmount">
-              <el-input v-model="form.estimatedContractAmount" placeholder='预计合同金额(元)'
-                oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+              <el-input v-model="form.estimatedContractAmount" placeholder='预计合同金额(元)'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -239,7 +234,7 @@
           <div class="fx-field x-grid-col-12">
             <div class="field-label">
               <span class="field-required">*</span>
-              <div class="field-name">合同金额</div>
+              <div class="field-name">合同金额(元)</div>
             </div>
             <div class="field-component">
               <span :title="form.estimatedContractAmount">{{ form.estimatedContractAmount }}</span>

src/views/crm/customer/index.vue

@@ -103,7 +103,7 @@
           </el-col>
           <el-col :span="24">
               <el-form-item label="注册资金" prop="capital">
-                  <el-input v-model="form.capital" placeholder='请输入注册资本金(万元)' oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+                  <el-input v-model="form.capital" placeholder='请输入注册资本金(万元)'></el-input>
               </el-form-item>
           </el-col>
           <el-col :span="24">

src/views/finance/contract/customer/index.vue

@@ -176,8 +176,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="合同金额" prop="money">
-              <el-input v-model="form.money" placeholder='请输入合同金额(元)'
-                oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+              <el-input v-model="form.money" placeholder='请输入合同金额(元)'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">

src/views/finance/contract/supplier/index.vue

@@ -170,8 +170,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="合同金额" prop="money">
-              <el-input v-model="form.money" placeholder='请输入合同金额(元)'
-                oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+              <el-input v-model="form.money" placeholder='请输入合同金额(元)'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">

src/views/oa/business/edit.vue

@@ -33,7 +33,7 @@
         <el-input v-model="form.day" placeholder='出差天数' oninput="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
       </el-form-item>
       <el-form-item label="预估费用(元)" prop="estimatedCost">
-        <el-input v-model="form.estimatedCost" placeholder='预估费用' oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+        <el-input v-model="form.estimatedCost" placeholder='预估费用'></el-input>
       </el-form-item>
       <el-form-item label="出差事由" prop="reason">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.reason"

src/views/oa/expense/edit.vue

@@ -44,12 +44,12 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column label="金额(元)" width="200">
+        <el-table-column label="金额(元)" width="300">
           <template slot-scope="scope">
             <el-form-item  :prop="'oaExpenseObjs.' + scope.$index + '.money'"
-              :rules="{ required: true, message: '金额不能为空', trigger: 'blur' }">
+              :rules="{ required: true, pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/, message: '请输入合法的金额数字，最多两位小数',trigger: 'blur' }">
               <el-input v-model="form.oaExpenseObjs[scope.$index].money" autocomplete="off" size="small"
-                placeholder="金额" oninput="value=value.match(/\d+\.?\d{0,2}/,'')"  @input="changeMoney(scope.$index)"></el-input>
+                placeholder="金额" @input="changeMoney(scope.$index)"></el-input>
             </el-form-item>
           </template>
         </el-table-column>

src/views/oa/purchase/edit.vue

@@ -41,9 +41,9 @@
         <el-table-column label="预算金额(元)">
           <template slot-scope="scope">
             <el-form-item  :prop="'oaPurchaseObjs.' + scope.$index + '.budget'"
-              :rules="{ required: true, message: '预算金额不能为空', trigger: 'blur' }">
+              :rules="{ required: true, pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,2})?$/, message: '请输入合法的金额数字，最多两位小数', trigger: 'blur' }">
               <el-input v-model="form.oaPurchaseObjs[scope.$index].budget" autocomplete="off" size="small"
-                placeholder="预算金额" onblur="value=value.match(/\d+\.?\d{0,2}/,'')"  @change="changeMoney()"></el-input>
+                placeholder="预算金额" @change="changeMoney()"></el-input>
             </el-form-item>
           </template>
         </el-table-column>

src/views/personnel/attendance/business/index.vue

@@ -161,8 +161,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="预估费用" prop="estimatedCost">
-              <el-input v-model="form.estimatedCost" placeholder='预估费用(元)'
-              oninput="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+              <el-input v-model="form.estimatedCost" placeholder='预估费用(元)'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">

src/views/personnel/relations/entry/index.vue

@@ -74,7 +74,7 @@
       <el-table-column label="入职人" align="center" prop="entryName" min-width="100" />
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
-      <el-table-column label="员工类型" align="center" prop="employeeTypeName" min-width="100"/>
+      <el-table-column label="员工类型" align="center" prop="employeeTypeDesc" min-width="100"/>
       <el-table-column label="性别" align="center" prop="gender" min-width="100">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.gender" />