魏熙美 před 6 roky
rodič
revize
4ef38518f0

+ 9
- 3
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseServiceImpl.java Zobrazit soubor

@@ -142,10 +142,16 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
142 142
         taUserLicense.setLicenseType(dataType);
143 143
 
144 144
         taUserLicense.setLicensePlate(carNo);
145
-        String price = String.valueOf(Double.valueOf(((BigDecimal) jsonParam.get("Cost")).toString()) * 100);
146
-        taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
145
+        Object cost = jsonParam.get("Cost");
146
+        if (null != cost) {
147
+            String price = String.valueOf(Double.valueOf(((BigDecimal) cost).toString()) * 100);
148
+            taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
149
+        }
147 150
         taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
148
-        taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(jsonParam.get("RenewTime"))));
151
+        Object renewTime = jsonParam.get("RenewTime");
152
+        if (null != renewTime) {
153
+            taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(renewTime)));
154
+        }
149 155
 
150 156
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
151 157
         try {

+ 0
- 10
VUECODE/smart-property-manage/src/views/systemResources/homeIndex/index.html Zobrazit soubor

@@ -1,10 +0,0 @@
1
-<!DOCTYPE html>
2
-<html lang="en">
3
-<head>
4
-    <meta charset="UTF-8">
5
-    <title>$Title$</title>
6
-</head>
7
-<body>
8
-$END$
9
-</body>
10
-</html>

+ 30
- 31
VUECODE/smart-property-manage/src/views/ticket/details.vue Zobrazit soubor

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div id="app" style="margin-top:30px;font-size: 14px; color: #606266;">
3
-    <el-form :inline="true" :model="listQuery" class="form-listQuery">
3
+    <el-form :inline="true" :model="listQuery" class="form-listQuery" style="margin-right: 15px;">
4 4
       <div style="transform:translateY(-70%); margin-top:5px;">
5 5
         <span style="padding-left:0.8%;font-size: 16px;color: rgb(96, 98, 102);font-weight: bold;">工单详情</span>
6 6
       </div>
@@ -103,7 +103,7 @@
103 103
                     <tr>
104 104
                       <td>
105 105
                         <div class="processing_content_detail" style="float:left;width:70%">
106
-                          <span>{{ itemContent.userName }}:{{ itemContent.content }}
106
+                          <span>{{ itemContent.userName }}: {{ itemContent.content }}
107 107
                             <span style="color:#219AFF"/>
108 108
                           </span>
109 109
                         </div>
@@ -112,11 +112,10 @@
112 112
                     <tr>
113 113
                       <td>
114 114
                         <div class="processing_content_detail" style="float:left;width:90%">
115
-                          <div style="float:left;width: 2px;height: 20px; background:#C7D4E9;margin-left:10px;margin-right:10px"/>
116 115
                           <!-- <img :src="contentImgURL.imageUrl"  v-for="contentImgURL in itemContent.imgURL" preview preview-text="描述"  width="200" style="margin:5px;"> -->
117 116
                           <img v-for="contentImgURL in itemContent.imgURL" :src="contentImgURL.imageUrl" preview width="100" height="100" style="margin:5px;"/>
118 117
                           <div><span ><i class="el-icon-time"/>{{ formatDate(itemContent.createDate) }}</span> </div>
119
-                          <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;" width="200%"></div>
118
+                          <div> <hr style="height:1px;border:none;border-top:1px solid #99a9bf;" width="200%"></div>
120 119
                         </div>
121 120
                       </td>
122 121
                     </tr>
@@ -126,15 +125,15 @@
126 125
             </el-step>
127 126
           </el-steps>
128 127
         </div>
129
-        <div v-if="listQuery.status==='0'||listQuery.status==='3'">
128
+        <div v-if="listQuery.status==='0'||listQuery.status==='3'" style="margin-left: -5px; margin-top: 30px;">
130 129
           <div>
131
-            <span>参与沟通</span>
130
+            <span style="font-size: 16px;color: rgb(96, 98, 102);font-weight: bold;">参与沟通</span>
132 131
           </div>
133 132
           <br>
134 133
           <div>
135 134
             <textarea id="message_textarea" v-model="listQuery.textContent" placeholder="回复TA或向TA提问" class="textarea-inherit" rows="4"/>
136 135
           </div>
137
-          <div>
136
+          <div style="margin-top: 10px;">
138 137
             <el-form-item label="图片附件">
139 138
               <el-upload
140 139
                 :limit="8"
@@ -155,15 +154,15 @@
155 154
             <el-button type="primary" style="margin-left: 90%;transform:translateY(-340%);" @click="submitContent">提交</el-button>
156 155
           </div>
157 156
         </div>
158
-        <div v-if="listQuery.status==='3'">
157
+        <div v-if="listQuery.status==='3'" style="margin-left: -5px;">
159 158
           <div>
160
-            <span>流程操作</span>
159
+            <span style="font-size: 16px;color: rgb(96, 98, 102);font-weight: bold;">流程操作</span>
161 160
           </div>
162 161
           <br>
163 162
           <div>
164 163
             <textarea id="message_textarea" v-model="listQuery.relationContent" placeholder="处理完了?在此填写处理结果,发送给户主让TA给好评~" class="textarea-inherit" rows="4"/>
165 164
           </div>
166
-          <div>
165
+          <div style="margin-top: 10px;">
167 166
             <el-form-item label="图片附件">
168 167
               <el-upload
169 168
                 :limit="8"
@@ -186,15 +185,15 @@
186 185
         </div>
187 186
 
188 187
         <div v-if="listQuery.status==='0'">
189
-          <el-form-item style="width:1000px;" >
190
-            <el-select v-model="listQuery.selectVale" placeholder="请选择工单由谁负责,然后点击受理分配" >
188
+          <el-form-item>
189
+            <el-select v-model="listQuery.selectVale" placeholder="请选择工单由谁负责,然后点击受理分配" style="width: 300px;">
191 190
               <el-option label="请选择工单由谁负责,然后点击受理分配" value="-1" />
192 191
               <el-option :value="listQuery.currentUserName" label="我自己"/>
193 192
               <el-option v-for="user in listQuery.userList" :label="user.userName" :value="user.id"/>
194 193
             </el-select>
194
+            <el-button style="margin-left: 30px;" type="primary" @click="addRecord">受理分配</el-button>
195 195
           </el-form-item>
196
-          <el-button type="primary" @click="addRecord">受理分配</el-button>
197
-          <a><span style="margin-left: 600px;color: #009FCC" @click="noAccept">{{ '拒绝受理?' }}&nbsp;&nbsp;&nbsp;&nbsp;</span></a><span>{{ '拒绝受理即关闭此工单,不再进行后续任何流程,请谨慎' }}</span>
196
+          <a><span style="color: #009FCC;margin-left: 300px;margin-top: 10px;" @click="noAccept">{{ '拒绝受理?' }}&nbsp;&nbsp;&nbsp;&nbsp;</span></a><span>{{ '拒绝受理即关闭此工单,不再进行后续任何流程,请谨慎' }}</span>
198 197
         </div>
199 198
       </div>
200 199
     </el-form>
@@ -429,19 +428,18 @@ export default {
429 428
     },
430 429
     // 回复
431 430
     submitContent() {
431
+      if (this.listQuery.textContent === undefined || this.listQuery.textContent === '') {
432
+        this.$message.error('请输入内容')
433
+        return
434
+      }
432 435
       const loading = this.$loading({
433 436
         lock: true,
434 437
         text: 'Loading',
435 438
         spinner: 'el-icon-loading',
436 439
         background: 'rgba(0, 0, 0, 0.7)'
437 440
       })
438
-      if (this.listQuery.textContent === undefined || this.listQuery.textContent === '') {
439
-        this.$message.error('请输入内容')
440
-        loading.close()
441
-        return
442
-      }
443 441
       this.listQuery.img = this.contentImgAA
444
-      this.$store.dispatch('AddRecordComment', this.listQuery,).then((res) => {
442
+      this.$store.dispatch('AddRecordComment', this.listQuery).then((res) => {
445 443
         this.Ass = false
446 444
         this.contentImgAA = []
447 445
         this.dataQuery()
@@ -513,18 +511,17 @@ export default {
513 511
     },
514 512
     // 流程提交
515 513
     succeedClick() {
514
+      if (this.listQuery.relationContent === undefined || this.listQuery.relationContent === '') {
515
+        this.$message.error('请输入处理结果')
516
+        return
517
+      }
518
+
516 519
       const loading = this.$loading({
517 520
         lock: true,
518 521
         text: 'Loading',
519 522
         spinner: 'el-icon-loading',
520 523
         background: 'rgba(0, 0, 0, 0.7)'
521 524
       })
522
-
523
-      if (this.listQuery.relationContent === undefined || this.listQuery.relationContent === '') {
524
-        this.$message.error('请填写内容')
525
-        loading.close()
526
-        return
527
-      }
528 525
       this.listQuery.imgIO = this.contentImgIO
529 526
       this.$store.dispatch('UpdateTicket', this.listQuery).then((res) => {
530 527
         this.Ass = false
@@ -568,11 +565,13 @@ export default {
568 565
     background-color: #D9E5F9;
569 566
   } */
570 567
   .processing_content_detail{
571
-     margin-left: 10px;
572
-     margin-top: 3.5px;
573
-     margin-bottom: 3.5px;
574
-	   width:200px;
575
-     display:inline-block;
568
+    margin-left: 10px;
569
+    margin-top: 3.5px;
570
+    margin-bottom: 3.5px;
571
+    width:200px;
572
+    display:inline-block;
573
+    font-size: 14px;
574
+    color: rgb(96, 98, 102);
576 575
   }
577 576
   .step-row{
578 577
      min-width:400px;

+ 2
- 2
VUECODE/smart-property-manage/src/views/ticket/index.vue Zobrazit soubor

@@ -56,7 +56,7 @@
56 56
       <el-table-column prop="ticketTitle" label="标题" align="center">
57 57
       <template slot-scope="scope" >
58 58
         <a :title="scope.row.ticketTitle" @click="clickTitle(scope.row.id)">
59
-          <span style="color: #009FCC	">
59
+          <span style="color: rgb(64, 158, 255);">
60 60
            {{ scope.row.ticketTitle.length>='15'?scope.row.ticketTitle.substring(0,15)+'..':scope.row.ticketTitle }}
61 61
           </span>
62 62
         </a>
@@ -227,4 +227,4 @@ export default {
227 227
 .button {
228 228
   margin-left: 20px;
229 229
 }
230
-</style>
230
+</style>