xiongchao 3 years ago
parent
commit
84650175a7

+ 9 - 3
src/views/repair/application-form/modules/DetailCheck.vue

@@ -4,8 +4,12 @@
       <a-row :gutter="48" slot="extra">
         <a-col :md="48" :sm="48">
           <span class="table-page-search-submitButtons" style="float: right">
-            <a-button v-if="$auth('repair-application-forms-approve') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="primary" @click="handleApprove()">接受</a-button>
-            <a-button v-if="$auth('repair-application-forms-reback') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" style="margin-left: 8px" type="danger" @click="handleReturn()">拒绝</a-button>
+            <a-popconfirm v-if="$auth('repair-application-forms-approve') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" title="是否要接受?" @confirm="handleApprove">
+              <a-button :loading="confirmLoading" style="margin-left: 8px" type="primary">接受</a-button>
+            </a-popconfirm>
+            <a-popconfirm v-if="$auth('repair-application-forms-reback') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ACCEPTANCE === model.status" title="是否要拒绝?" @confirm="handleReturn">
+              <a-button style="margin-left: 8px" type="primary">拒绝</a-button>
+            </a-popconfirm>
             <a-button style="margin-left: 8px" @click="handleCancel">返回</a-button>
           </span>
         </a-col>
@@ -497,9 +501,11 @@ export default {
       })
     },
     handleApprove () {
+      this.confirmLoading = true
       approve(this.model).then(() => {
         this.$message.info('操作成功')
-        this.handleOk()
+        this.confirmLoading = false
+        this.handleCancel()
       })
     },
     handleReturn () {

+ 1 - 1
src/views/sb/info/modules/SbInfoSelectModal.vue

@@ -181,7 +181,7 @@ export default {
           ...this.queryParam,
           ...this.extraQueryParam,
           dataScope: {
-            sortBy: 'desc',
+            sortBy: 'asc',
             sortName: 'no'
           }
         }

+ 1 - 1
src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -59,7 +59,7 @@
             </template>
           </span>
           <a slot="name" slot-scope="text" v-html="text"> {{ text }}</a>
-          <span slot="content" slot-scope="text" v-html="text">
+            <span slot="content" slot-scope="text" v-html="text">
           </span>
         </s-table>
       </div>

+ 3 - 1
src/views/workplace/backlog/modules/Detail.vue

@@ -7,7 +7,7 @@
   >
     <detail-list title="" :col="1">
       <detail-list-item term="类型">{{ typeDict[model.detailType] }}</detail-list-item>
-      <detail-list-item term="内容">{{ model.content }}</detail-list-item>
+      <detail-list-item term="内容"><div v-html="content"></div></detail-list-item>
       <detail-list-item term="时间">{{ model.createdTime }}</detail-list-item>
     </detail-list>
 
@@ -34,6 +34,7 @@ export default {
       modalTitle: null,
       visible: false,
       typeDict: {},
+      content: null,
       model: {
         'detailType': null,
         'createdTime': null,
@@ -48,6 +49,7 @@ export default {
     base (record) {
       this.visible = true
       this.modalTitle = '详情'
+      this.content = record.content
       if (this.BaseTool.Object.isBlank(record)) {
         this.model = {}
       } else {