fuxingfan
/
smartCommunity
Watch 1
Star 0
Fork 0
Code Issues 1 Pull Requests 0 Releases 4 Activity
Browse Source

提交

魏熙美 6 years ago
parent
14ae912727
commit
4ef38518f0
4 changed files with 41 additions and 46 deletions
Unified View Show Diff Stats
  1. 9
    3
      CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseServiceImpl.java
  2. 0
    10
      VUECODE/smart-property-manage/src/views/systemResources/homeIndex/index.html
  3. 30
    31
      VUECODE/smart-property-manage/src/views/ticket/details.vue
  4. 2
    2
      VUECODE/smart-property-manage/src/views/ticket/index.vue

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

142 
         taUserLicense.setLicenseType(dataType);
 142 
         taUserLicense.setLicenseType(dataType);
143
143
144 
         taUserLicense.setLicensePlate(carNo);
 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 
         taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
 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 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 156 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
151 
         try {
 157 
         try {

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

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 View File

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

+ 2
- 2
VUECODE/smart-property-manage/src/views/ticket/index.vue View File

56 
       <el-table-column prop="ticketTitle" label="标题" align="center">
 56 
       <el-table-column prop="ticketTitle" label="标题" align="center">
57 
       <template slot-scope="scope" >
 57 
       <template slot-scope="scope" >
58 
         <a :title="scope.row.ticketTitle" @click="clickTitle(scope.row.id)">
 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 
            {{ scope.row.ticketTitle.length>='15'?scope.row.ticketTitle.substring(0,15)+'..':scope.row.ticketTitle }}
 60 
            {{ scope.row.ticketTitle.length>='15'?scope.row.ticketTitle.substring(0,15)+'..':scope.row.ticketTitle }}
61 
           </span>
 61 
           </span>
62 
         </a>
 62 
         </a>
227 
 .button {
 227 
 .button {
228 
   margin-left: 20px;
 228 
   margin-left: 20px;
229 
 }
 229 
 }
230 
-</style>
230 
+</style>