测试问题修改

precision-effect-system/src/main/java/com/zehong/system/domain/TDebitCredit.java

@@ -66,13 +66,13 @@ public class TDebitCredit extends BaseEntity
     private BigDecimal dayRate;
 
     /** 计息日 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "计息日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计息日", width = 30, dateFormat = "yyyy-MM-dd")
     private Date sumInterestDate;
 
     /** 预计还款日 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "预计还款日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预计还款日", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expectedRepaymentDate;
 
     /** 审核人 */

precision-effect-web/src/layout/components/Message/Message.vue

@@ -13,7 +13,7 @@
           <el-dropdown-item v-if="this.msgInfo.length == 0">
             <span>暂无消息</span>
           </el-dropdown-item>
-          <div v-if="this.msgInfo.length >= 0">
+          <div v-if="this.msgInfo.length > 0">
             <el-row>
               <el-col :span="12">
                 <el-dropdown-item>标题</el-dropdown-item>
@@ -49,13 +49,15 @@
     },
     created(){
       //登录成功后创建websocket
-      this.$websocket.initWebSocket("ws://36.139.131.221:8668/precisionEffect/webSocket/" + this.$store.state.user.roles.join(",") + "/" + this.$store.state.user.userId);
-      this.$websocket.addEvent("onmessage",(msg) =>{
-        if(msg.data){
-          console.log("您有新的消息请注意接收:", JSON.parse(msg.data));
-          this.msgInfo = JSON.parse(msg.data);
-        }
-      })
+      if(!this.$websocket.isExsitWebsocket()){
+        this.$websocket.initWebSocket("ws://36.139.131.221:8668/precisionEffect/webSocket/" + this.$store.state.user.roles.join(",") + "/" + this.$store.state.user.userId);
+        this.$websocket.addEvent("onmessage",(msg) =>{
+          if(msg.data){
+            console.log("您有新的消息请注意接收:", JSON.parse(msg.data));
+            this.msgInfo = JSON.parse(msg.data);
+          }
+        });
+      }
     },
     methods:{
 

precision-effect-web/src/utils/websocket.js

@@ -48,6 +48,7 @@ function webSocketSend(agentData) {
 
 //重连机制
 function reconnect(){
+  console.log("-------websocket开始重连----------------")
   if(lockReconnect){
     return
   }
@@ -78,6 +79,11 @@ function addEvent(type,event){
   }
 }
 
+//判断是否存在websocket
+export function isExsitWebsocket() {
+  return socket?true:false;
+}
+
 export default {
-  initWebSocket, close, addEvent
+  initWebSocket, close, addEvent, isExsitWebsocket
 }

precision-effect-web/src/views/debit/components/OperatorButton.vue

 <template>
-    <div style="display: inline-block;width: 50px">
+    <div style="display: inline-block;margin: 0px 5px">
       <el-button type="text" @click="openDialog" size="mini">{{getOperatorName()}}</el-button>
       <el-dialog :title="getOperatorName()" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" destroy-on-close>
         <component :is="currentTabComponent" :debitData="debitData" ref="currentCom" v-if="open"></component>

precision-effect-web/src/views/debit/components/TableList.vue

@@ -9,17 +9,17 @@
           <span>{{ parseTime(scope.row.registerTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="使用说明" align="center" prop="useDescribe" />
+      <el-table-column label="使用说明" align="center" prop="useDescribe" :show-overflow-tooltip="true"/>
       <el-table-column label="使用人" align="center" prop="useName" />
       <el-table-column label="小写合计" align="center" prop="littleTotal" />
       <el-table-column label="计息日" align="center" prop="sumInterestDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.sumInterestDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.sumInterestDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="预计还款日" align="center" prop="expectedRepaymentDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.expectedRepaymentDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.expectedRepaymentDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="借贷状态" align="center" prop="debitStatus" :formatter="debitStatusFormatter" :show-overflow-tooltip="true"/>

precision-effect-web/src/views/debit/index.vue

@@ -200,7 +200,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="小写合计" prop="littleTotal">
-              <el-input-number v-model="form.littleTotal" :precision="2" @blur="getCapitalTotal" style="width: 100%"/>
+              <el-input-number v-model="form.littleTotal" :precision="2" @change="getCapitalTotal" style="width: 100%"/>
               <!--<el-input v-model="form.littleTotal" placeholder="请输入小写合计(精确到分)" @blur="getCapitalTotal"
                         oninput="value=value.replace(/^\D*([0-9]+\.[0-9]{0,2}).*$/,'$1')"/>-->
             </el-form-item>
@@ -345,7 +345,8 @@ export default {
           { required: true, message: "请输入使用说明", trigger: "blur" },
         ],
         littleTotal: [
-          { required: true, message: "请输入小写合计", trigger: "blur" },
+          { required: true, message: "请输入小写合计", trigger: "blur"},
+          {type: 'number',min: 1.00 , message: "输入金额不能小于1"}
         ],
         sumInterestDate: [
           { required: true, message: "请选择计息日期", trigger: "change" },

precision-effect-web/src/views/purchase/components/OperatorButton.vue

 <template>
-    <div style="display: inline-block;width: 50px">
+    <div style="display: inline-block;margin: 0px 5px">
       <el-button type="text" @click="openPurchaseDialog" size="mini">{{getOperatorName()}}</el-button>
       <el-dialog :title="getOperatorName()" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" destroy-on-close>
         <component :is="currentTabComponent" :purchaseData="purchaseData" ref="currentCom" v-if="open"></component>

precision-effect-web/src/views/purchase/index.vue

@@ -502,7 +502,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const purchaseIds = row.purchaseId || this.ids;
-      this.$confirm('是否确认删除外部采购（报销）申请编号为"' + purchaseIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除外部采购（报销）申请编号为"' + row.purchaseName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

precision-effect-web/src/views/trade/components/OperatorButton.vue

 <template>
-    <div style="display: inline-block;width: 50px">
+    <div style="display: inline-block;margin: 0px 5px">
       <el-button type="text" @click="openDialog" size="mini">{{getOperatorName()}}</el-button>
       <el-dialog :title="getOperatorName()" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false" destroy-on-close>
         <component :is="currentTabComponent" :tradeData="tradeData" ref="currentCom" v-if="open"></component>